From e1862b42b602d5e4e1226d463b7ba89aaafc2980 Mon Sep 17 00:00:00 2001 From: someone2639 Date: Fri, 7 Feb 2025 17:48:27 -0500 Subject: [PATCH 01/15] enumify models; get rid of ModelID8 --- include/config/config_game.h | 5 - include/model_ids.h | 1094 +++++++++-------- include/types.h | 4 +- src/engine/level_script.c | 10 +- .../behaviors/animated_floor_switch.inc.c | 2 +- src/game/behaviors/bowser_puzzle_piece.inc.c | 4 +- src/game/behaviors/fish.inc.c | 2 +- src/game/behaviors/grill_door.inc.c | 2 +- src/game/behaviors/pokey.inc.c | 2 +- src/game/behaviors/tumbling_bridge.inc.c | 2 +- src/game/object_helpers.c | 10 +- src/game/object_helpers.h | 12 +- src/game/object_list_processor.c | 4 +- tools/migrate_load_models.py | 28 + tools/rename_level_objects.py | 37 + 15 files changed, 640 insertions(+), 578 deletions(-) create mode 100644 tools/migrate_load_models.py create mode 100644 tools/rename_level_objects.py diff --git a/include/config/config_game.h b/include/config/config_game.h index 5df03c88e3..8f5827a8f4 100644 --- a/include/config/config_game.h +++ b/include/config/config_game.h @@ -50,11 +50,6 @@ */ // #define GLOBAL_STAR_IDS -/** - * Number of possible unique model ID's (keep it higher than 256). - */ -#define MODEL_ID_COUNT 256 - /** * Number of supported areas per level. */ diff --git a/include/model_ids.h b/include/model_ids.h index 81e92c6a11..6e2e2eef87 100644 --- a/include/model_ids.h +++ b/include/model_ids.h @@ -1,555 +1,559 @@ #ifndef MODEL_IDS_H #define MODEL_IDS_H -#define MODEL_NONE 0x00 - -/* Global models that are loaded for every level */ - -#define MODEL_MARIO 0x01 // mario_geo -#define MODEL_LUIGI 0x02 // unused - -/* Various static level geometry, the geo layout differs but terrain object presets treat them the same.*/ - -#define MODEL_LEVEL_GEOMETRY_03 0x03 -#define MODEL_LEVEL_GEOMETRY_04 0x04 -#define MODEL_LEVEL_GEOMETRY_05 0x05 -#define MODEL_LEVEL_GEOMETRY_06 0x06 -#define MODEL_LEVEL_GEOMETRY_07 0x07 -#define MODEL_LEVEL_GEOMETRY_08 0x08 -#define MODEL_LEVEL_GEOMETRY_09 0x09 -#define MODEL_LEVEL_GEOMETRY_0A 0x0A -#define MODEL_LEVEL_GEOMETRY_0B 0x0B -#define MODEL_LEVEL_GEOMETRY_0C 0x0C -#define MODEL_LEVEL_GEOMETRY_0D 0x0D -#define MODEL_LEVEL_GEOMETRY_0E 0x0E -#define MODEL_LEVEL_GEOMETRY_0F 0x0F -#define MODEL_LEVEL_GEOMETRY_10 0x10 -#define MODEL_LEVEL_GEOMETRY_11 0x11 -#define MODEL_LEVEL_GEOMETRY_12 0x12 -#define MODEL_LEVEL_GEOMETRY_13 0x13 -#define MODEL_LEVEL_GEOMETRY_14 0x14 -#define MODEL_LEVEL_GEOMETRY_15 0x15 -#define MODEL_LEVEL_GEOMETRY_16 0x16 - -#define MODEL_BOB_BUBBLY_TREE 0x17 // bubbly_tree_geo -#define MODEL_WDW_BUBBLY_TREE 0x17 // bubbly_tree_geo -#define MODEL_CASTLE_GROUNDS_BUBBLY_TREE 0x17 // bubbly_tree_geo -#define MODEL_WF_BUBBLY_TREE 0x17 // bubbly_tree_geo -#define MODEL_THI_BUBBLY_TREE 0x17 // bubbly_tree_geo -#define MODEL_COURTYARD_SPIKY_TREE 0x18 // spiky_tree_geo -#define MODEL_CCM_SNOW_TREE 0x19 // snow_tree_geo -#define MODEL_SL_SNOW_TREE 0x19 // snow_tree_geo -#define MODEL_UNKNOWN_TREE_1A 0x1A // referenced in special presets, undefined -#define MODEL_SSL_PALM_TREE 0x1B // palm_tree_geo -#define MODEL_CASTLE_CASTLE_DOOR_UNUSED 0x1C // castle_door_geo - unused, original id -#define MODEL_CASTLE_WOODEN_DOOR_UNUSED 0x1D // wooden_door_geo - unused, original id -#define MODEL_BBH_HAUNTED_DOOR 0x1D // haunted_door_geo -#define MODEL_HMC_WOODEN_DOOR 0x1D // wooden_door_geo -#define MODEL_UNKNOWN_DOOR_1E 0x1E // referenced in special presets, undefined -#define MODEL_HMC_METAL_DOOR 0x1F // metal_door_geo -#define MODEL_HMC_HAZY_MAZE_DOOR 0x20 // hazy_maze_door_geo -#define MODEL_UNKNOWN_DOOR_21 0x21 // referenced in special presets, undefined -#define MODEL_CASTLE_DOOR_0_STARS 0x22 // castle_door_0_star_geo -#define MODEL_CASTLE_DOOR_1_STAR 0x23 // castle_door_1_star_geo -#define MODEL_CASTLE_DOOR_3_STARS 0x24 // castle_door_3_stars_geo -#define MODEL_CASTLE_KEY_DOOR 0x25 // key_door_geo -#define MODEL_CASTLE_CASTLE_DOOR 0x26 // castle_door_geo - used duplicate -#define MODEL_CASTLE_GROUNDS_CASTLE_DOOR 0x26 // castle_door_geo - used duplicate -#define MODEL_CASTLE_WOODEN_DOOR 0x27 // wooden_door_geo -#define MODEL_COURTYARD_WOODEN_DOOR 0x27 // wooden_door_geo -#define MODEL_CCM_CABIN_DOOR 0x27 // cabin_door_geo -#define MODEL_UNKNOWN_DOOR_28 0x28 // referenced in special presets, undefined -#define MODEL_CASTLE_METAL_DOOR 0x29 // metal_door_geo -#define MODEL_CASTLE_GROUNDS_METAL_DOOR 0x29 // metal_door_geo -#define MODEL_UNKNOWN_DOOR_2A 0x2A // referenced in special presets, undefined -#define MODEL_UNKNOWN_DOOR_2B 0x2B // referenced in special presets, undefined -#define MODEL_WF_TOWER_TRAPEZOID_PLATORM 0x2C // wf_geo_000AF8 - unused -#define MODEL_WF_TOWER_SQUARE_PLATORM 0x2D // wf_geo_000B10 -#define MODEL_WF_TOWER_SQUARE_PLATORM_UNUSED 0x2E // wf_geo_000B38 - unused & duplicated -#define MODEL_WF_TOWER_SQUARE_PLATORM_ELEVATOR 0x2F // wf_geo_000B60 - elevator platorm - -// Level model IDs - -// bbh -#define MODEL_BBH_STAIRCASE_STEP 0x35 // geo_bbh_0005B0 -#define MODEL_BBH_TILTING_FLOOR_PLATFORM 0x36 // geo_bbh_0005C8 -#define MODEL_BBH_TUMBLING_PLATFORM 0x37 // geo_bbh_0005E0 -#define MODEL_BBH_TUMBLING_PLATFORM_PART 0x38 // geo_bbh_0005F8 -#define MODEL_BBH_MOVING_BOOKSHELF 0x39 // geo_bbh_000610 -#define MODEL_BBH_MESH_ELEVATOR 0x3A // geo_bbh_000628 -#define MODEL_BBH_MERRY_GO_ROUND 0x3B // geo_bbh_000640 -#define MODEL_BBH_WOODEN_TOMB 0x3C // geo_bbh_000658 - -// ccm -#define MODEL_CCM_ROPEWAY_LIFT 0x36 // ccm_geo_0003D0 -#define MODEL_CCM_SNOWMAN_HEAD 0x37 // ccm_geo_00040C - -// castle -#define MODEL_CASTLE_BOWSER_TRAP 0x35 // castle_geo_000F18 -#define MODEL_CASTLE_WATER_LEVEL_PILLAR 0x36 // castle_geo_001940 -#define MODEL_CASTLE_CLOCK_MINUTE_HAND 0x37 // castle_geo_001530 -#define MODEL_CASTLE_CLOCK_HOUR_HAND 0x38 // castle_geo_001548 -#define MODEL_CASTLE_CLOCK_PENDULUM 0x39 // castle_geo_001518 - -// hmc -#define MODEL_HMC_METAL_PLATFORM 0x36 // hmc_geo_0005A0 -#define MODEL_HMC_METAL_ARROW_PLATFORM 0x37 // hmc_geo_0005B8 -#define MODEL_HMC_ELEVATOR_PLATFORM 0x38 // hmc_geo_0005D0 -#define MODEL_HMC_ROLLING_ROCK 0x39 // hmc_geo_000548 -#define MODEL_HMC_ROCK_PIECE 0x3A // hmc_geo_000570 - unused -#define MODEL_HMC_ROCK_SMALL_PIECE 0x3B // hmc_geo_000588 - unused -#define MODEL_HMC_RED_GRILLS 0x3C // hmc_geo_000530 - -// ssl -#define MODEL_SSL_PYRAMID_TOP 0x3A // ssl_geo_000618 -#define MODEL_SSL_GRINDEL 0x36 // ssl_geo_000734 -#define MODEL_SSL_SPINDEL 0x37 // ssl_geo_000764 -#define MODEL_SSL_MOVING_PYRAMID_WALL 0x38 // ssl_geo_000794 -#define MODEL_SSL_PYRAMID_ELEVATOR 0x39 // ssl_geo_0007AC - -// bob -#define MODEL_BOB_CHAIN_CHOMP_GATE 0x36 // bob_geo_000440 -#define MODEL_BOB_SEESAW_PLATFORM 0x37 // bob_geo_000458 -#define MODEL_BOB_BARS_GRILLS 0x38 // bob_geo_000470 - -// sl -#define MODEL_SL_SNOW_TRIANGLE 0x36 // sl_geo_000390 -#define MODEL_SL_CRACKED_ICE 0x37 // sl_geo_000360 - unused -#define MODEL_SL_CRACKED_ICE_CHUNK 0x38 // sl_geo_000378 - unused - -// wdw -#define MODEL_WDW_SQUARE_FLOATING_PLATFORM 0x36 // wdw_geo_000580 -#define MODEL_WDW_ARROW_LIFT 0x37 // wdw_geo_000598 -#define MODEL_WDW_WATER_LEVEL_DIAMOND 0x38 // wdw_geo_0005C0 -#define MODEL_WDW_HIDDEN_PLATFORM 0x39 // wdw_geo_0005E8 -#define MODEL_WDW_EXPRESS_ELEVATOR 0x3A // wdw_geo_000610 -#define MODEL_WDW_RECTANGULAR_FLOATING_PLATFORM 0x3B // wdw_geo_000628 -#define MODEL_WDW_ROTATING_PLATFORM 0x3C // wdw_geo_000640 - -// jrb -#define MODEL_JRB_SHIP_LEFT_HALF_PART 0x35 // jrb_geo_000978 -#define MODEL_JRB_SHIP_BACK_LEFT_PART 0x36 // jrb_geo_0009B0 -#define MODEL_JRB_SHIP_RIGHT_HALF_PART 0x37 // jrb_geo_0009E8 -#define MODEL_JRB_SHIP_BACK_RIGHT_PART 0x38 // jrb_geo_000A00 -#define MODEL_JRB_SUNKEN_SHIP 0x39 // jrb_geo_000990 -#define MODEL_JRB_SUNKEN_SHIP_BACK 0x3A // jrb_geo_0009C8 -#define MODEL_JRB_ROCK 0x3B // jrb_geo_000930 -#define MODEL_JRB_SLIDING_BOX 0x3C // jrb_geo_000960 -#define MODEL_JRB_FALLING_PILLAR 0x3D // jrb_geo_000900 -#define MODEL_JRB_FALLING_PILLAR_BASE 0x3E // jrb_geo_000918 -#define MODEL_JRB_FLOATING_PLATFORM 0x3F // jrb_geo_000948 - -// thi -#define MODEL_THI_HUGE_ISLAND_TOP 0x36 // thi_geo_0005B0 -#define MODEL_THI_TINY_ISLAND_TOP 0x37 // thi_geo_0005C8 - -// ttc -#define MODEL_TTC_ROTATING_CUBE 0x36 // ttc_geo_000240 -#define MODEL_TTC_ROTATING_PRISM 0x37 // ttc_geo_000258 -#define MODEL_TTC_PENDULUM 0x38 // ttc_geo_000270 -#define MODEL_TTC_LARGE_TREADMILL 0x39 // ttc_geo_000288 -#define MODEL_TTC_SMALL_TREADMILL 0x3A // ttc_geo_0002A8 -#define MODEL_TTC_PUSH_BLOCK 0x3B // ttc_geo_0002C8 -#define MODEL_TTC_ROTATING_HEXAGON 0x3C // ttc_geo_0002E0 -#define MODEL_TTC_ROTATING_TRIANGLE 0x3D // ttc_geo_0002F8 -#define MODEL_TTC_PIT_BLOCK 0x3E // ttc_geo_000310 - has 2 vertical stripes -#define MODEL_TTC_PIT_BLOCK_UNUSED 0x3F // ttc_geo_000328 - has 3 vertical stripes, unused -#define MODEL_TTC_ELEVATOR_PLATFORM 0x40 // ttc_geo_000340 -#define MODEL_TTC_CLOCK_HAND 0x41 // ttc_geo_000358 -#define MODEL_TTC_SPINNER 0x42 // ttc_geo_000370 -#define MODEL_TTC_SMALL_GEAR 0x43 // ttc_geo_000388 -#define MODEL_TTC_LARGE_GEAR 0x44 // ttc_geo_0003A0 - -// rr -#define MODEL_RR_SLIDING_PLATFORM 0x36 // rr_geo_0008C0 -#define MODEL_RR_FLYING_CARPET 0x37 // rr_geo_000848 -#define MODEL_RR_OCTAGONAL_PLATFORM 0x38 // rr_geo_0008A8 -#define MODEL_RR_ROTATING_BRIDGE_PLATFORM 0x39 // rr_geo_000878 -#define MODEL_RR_TRIANGLE_PLATFORM 0x3A // rr_geo_0008D8 - unused -#define MODEL_RR_CRUISER_WING 0x3B // rr_geo_000890 -#define MODEL_RR_SEESAW_PLATFORM 0x3C // rr_geo_000908 -#define MODEL_RR_L_SHAPED_PLATFORM 0x3D // rr_geo_000940 - unused -#define MODEL_RR_SWINGING_PLATFORM 0x3E // rr_geo_000860 -#define MODEL_RR_DONUT_PLATFORM 0x3F // rr_geo_000920 -#define MODEL_RR_ELEVATOR_PLATFORM 0x40 // rr_geo_0008F0 -#define MODEL_RR_TRICKY_TRIANGLES 0x41 // rr_geo_000958 -#define MODEL_RR_TRICKY_TRIANGLES_FRAME1 0x42 // rr_geo_000970 -#define MODEL_RR_TRICKY_TRIANGLES_FRAME2 0x43 // rr_geo_000988 -#define MODEL_RR_TRICKY_TRIANGLES_FRAME3 0x44 // rr_geo_0009A0 -#define MODEL_RR_TRICKY_TRIANGLES_FRAME4 0x45 // rr_geo_0009B8 - -// castle grounds - -// bitdw -#define MODEL_BITDW_SQUARE_PLATFORM 0x36 // geo_bitdw_000558 -#define MODEL_BITDW_SEESAW_PLATFORM 0x37 // geo_bitdw_000540 -#define MODEL_BITDW_SLIDING_PLATFORM 0x38 // geo_bitdw_000528 -#define MODEL_BITDW_FERRIS_WHEEL_AXLE 0x39 // geo_bitdw_000570 -#define MODEL_BITDW_BLUE_PLATFORM 0x3A // geo_bitdw_000588 -#define MODEL_BITDW_STAIRCASE_FRAME4 0x3B // geo_bitdw_0005A0 -#define MODEL_BITDW_STAIRCASE_FRAME3 0x3C // geo_bitdw_0005B8 -#define MODEL_BITDW_STAIRCASE_FRAME2 0x3D // geo_bitdw_0005D0 -#define MODEL_BITDW_STAIRCASE_FRAME1 0x3E // geo_bitdw_0005E8 -#define MODEL_BITDW_STAIRCASE 0x3F // geo_bitdw_000600 - -// vcutm -#define MODEL_VCUTM_SEESAW_PLATFORM 0x36 // vcutm_geo_0001F0 - -// bitfs -#define MODEL_BITFS_PLATFORM_ON_TRACK 0x36 // bitfs_geo_000758 -#define MODEL_BITFS_TILTING_SQUARE_PLATFORM 0x37 // bitfs_geo_0006C0 -#define MODEL_BITFS_SINKING_PLATFORMS 0x38 // bitfs_geo_000770 -#define MODEL_BITFS_BLUE_POLE 0x39 // bitfs_geo_0006A8 -#define MODEL_BITFS_SINKING_CAGE_PLATFORM 0x3A // bitfs_geo_000690 -#define MODEL_BITFS_ELEVATOR 0x3B // bitfs_geo_000678 -#define MODEL_BITFS_STRETCHING_PLATFORMS 0x3C // bitfs_geo_000708 -#define MODEL_BITFS_SEESAW_PLATFORM 0x3D // bitfs_geo_000788 -#define MODEL_BITFS_MOVING_SQUARE_PLATFORM 0x3E // bitfs_geo_000728 -#define MODEL_BITFS_SLIDING_PLATFORM 0x3F // bitfs_geo_000740 -#define MODEL_BITFS_TUMBLING_PLATFORM_PART 0x40 // bitfs_geo_0006D8 -#define MODEL_BITFS_TUMBLING_PLATFORM 0x41 // bitfs_geo_0006F0 - -// sa - -// bits -#define MODEL_BITS_SLIDING_PLATFORM 0x36 // bits_geo_0005E0 -#define MODEL_BITS_TWIN_SLIDING_PLATFORMS 0x37 // bits_geo_0005F8 -#define MODEL_BITS_OCTAGONAL_PLATFORM 0x39 // bits_geo_000610 -#define MODEL_BITS_BLUE_PLATFORM 0x3C // bits_geo_000628 -#define MODEL_BITS_FERRIS_WHEEL_AXLE 0x3D // bits_geo_000640 -#define MODEL_BITS_ARROW_PLATFORM 0x3E // bits_geo_000658 -#define MODEL_BITS_SEESAW_PLATFORM 0x3F // bits_geo_000670 -#define MODEL_BITS_TILTING_W_PLATFORM 0x40 // bits_geo_000688 -#define MODEL_BITS_STAIRCASE 0x41 // bits_geo_0006A0 -#define MODEL_BITS_STAIRCASE_FRAME1 0x42 // bits_geo_0006B8 -#define MODEL_BITS_STAIRCASE_FRAME2 0x43 // bits_geo_0006D0 -#define MODEL_BITS_STAIRCASE_FRAME3 0x44 // bits_geo_0006E8 -#define MODEL_BITS_STAIRCASE_FRAME4 0x45 // bits_geo_000700 -#define MODEL_BITS_WARP_PIPE 0x49 // warp_pipe_geo - -// lll -#define MODEL_LLL_DRAWBRIDGE_PART 0x38 // lll_geo_000B20 -#define MODEL_LLL_ROTATING_BLOCK_FIRE_BARS 0x3A // lll_geo_000B38 -#define MODEL_LLL_ROTATING_HEXAGONAL_RING 0x3E // lll_geo_000BB0 -#define MODEL_LLL_SINKING_RECTANGULAR_PLATFORM 0x3F // lll_geo_000BC8 -#define MODEL_LLL_SINKING_SQUARE_PLATFORMS 0x40 // lll_geo_000BE0 -#define MODEL_LLL_TILTING_SQUARE_PLATFORM 0x41 // lll_geo_000BF8 -#define MODEL_LLL_BOWSER_PIECE_1 0x43 // lll_geo_bowser_puzzle_piece_1 -#define MODEL_LLL_BOWSER_PIECE_2 0x44 // lll_geo_bowser_puzzle_piece_2 -#define MODEL_LLL_BOWSER_PIECE_3 0x45 // lll_geo_bowser_puzzle_piece_3 -#define MODEL_LLL_BOWSER_PIECE_4 0x46 // lll_geo_bowser_puzzle_piece_4 -#define MODEL_LLL_BOWSER_PIECE_5 0x47 // lll_geo_bowser_puzzle_piece_5 -#define MODEL_LLL_BOWSER_PIECE_6 0x48 // lll_geo_bowser_puzzle_piece_6 -#define MODEL_LLL_BOWSER_PIECE_7 0x49 // lll_geo_bowser_puzzle_piece_7 -#define MODEL_LLL_BOWSER_PIECE_8 0x4A // lll_geo_bowser_puzzle_piece_8 -#define MODEL_LLL_BOWSER_PIECE_9 0x4B // lll_geo_bowser_puzzle_piece_9 -#define MODEL_LLL_BOWSER_PIECE_10 0x4C // lll_geo_bowser_puzzle_piece_10 -#define MODEL_LLL_BOWSER_PIECE_11 0x4D // lll_geo_bowser_puzzle_piece_11 -#define MODEL_LLL_BOWSER_PIECE_12 0x4E // lll_geo_bowser_puzzle_piece_12 -#define MODEL_LLL_BOWSER_PIECE_13 0x4F // lll_geo_bowser_puzzle_piece_13 -#define MODEL_LLL_BOWSER_PIECE_14 0x50 // lll_geo_bowser_puzzle_piece_14 -#define MODEL_LLL_MOVING_OCTAGONAL_MESH_PLATFORM 0x36 // lll_geo_000B08 -#define MODEL_LLL_SINKING_ROCK_BLOCK 0x37 // lll_geo_000DD0 -#define MODEL_LLL_ROLLING_LOG 0x39 // lll_geo_000DE8 -#define MODEL_LLL_WOOD_BRIDGE 0x35 // lll_geo_000B50 -#define MODEL_LLL_LARGE_WOOD_BRIDGE 0x3B // lll_geo_000B68 -#define MODEL_LLL_FALLING_PLATFORM 0x3C // lll_geo_000B80 -#define MODEL_LLL_LARGE_FALLING_PLATFORM 0x3D // lll_geo_000B98 -#define MODEL_LLL_VOLCANO_FALLING_TRAP 0x53 // lll_geo_000EA8 - -// ddd -#define MODEL_DDD_BOWSER_SUB_DOOR 0x36 // ddd_geo_000478 -#define MODEL_DDD_BOWSER_SUB 0x37 // ddd_geo_0004A0 -#define MODEL_DDD_POLE 0x38 // ddd_geo_000450 - -// wf -#define MODEL_WF_BREAKABLE_WALL_RIGHT 0x36 // wf_geo_000B78 -#define MODEL_WF_BREAKABLE_WALL_LEFT 0x37 // wf_geo_000B90 -#define MODEL_WF_KICKABLE_BOARD 0x38 // wf_geo_000BA8 -#define MODEL_WF_TOWER_DOOR 0x39 // wf_geo_000BE0 -#define MODEL_WF_KICKABLE_BOARD_FELLED 0x3A // wf_geo_000BC8 - -// ending - -// castle grounds -#define MODEL_CASTLE_GROUNDS_VCUTM_GRILL 0x36 // castle_grounds_geo_00070C -#define MODEL_CASTLE_GROUNDS_FLAG 0x37 // castle_grounds_geo_000660 -#define MODEL_CASTLE_GROUNDS_CANNON_GRILL 0x38 // castle_grounds_geo_000724 - -// pss - -// cotmc - -// totwc - -// bowser 1 - -// wmotr - -// bowser 2 -#define MODEL_BOWSER_2_TILTING_ARENA 0x36 // bowser_2_geo_000170 - -// bowser 3 -#define MODEL_BOWSER_3_FALLING_PLATFORM_1 0x36 // bowser_3_geo_000290 -#define MODEL_BOWSER_3_FALLING_PLATFORM_2 0x37 // bowser_3_geo_0002A8 -#define MODEL_BOWSER_3_FALLING_PLATFORM_3 0x38 // bowser_3_geo_0002C0 -#define MODEL_BOWSER_3_FALLING_PLATFORM_4 0x39 // bowser_3_geo_0002D8 -#define MODEL_BOWSER_3_FALLING_PLATFORM_5 0x3A // bowser_3_geo_0002F0 -#define MODEL_BOWSER_3_FALLING_PLATFORM_6 0x3B // bowser_3_geo_000308 -#define MODEL_BOWSER_3_FALLING_PLATFORM_7 0x3C // bowser_3_geo_000320 -#define MODEL_BOWSER_3_FALLING_PLATFORM_8 0x3D // bowser_3_geo_000338 -#define MODEL_BOWSER_3_FALLING_PLATFORM_9 0x3E // bowser_3_geo_000350 -#define MODEL_BOWSER_3_FALLING_PLATFORM_10 0x3F // bowser_3_geo_000368 - -// ttm -#define MODEL_TTM_ROLLING_LOG 0x35 // ttm_geo_000730 -#define MODEL_TTM_STAR_CAGE 0x36 // ttm_geo_000710 -#define MODEL_TTM_BLUE_SMILEY 0x37 // ttm_geo_000D14 -#define MODEL_TTM_YELLOW_SMILEY 0x38 // ttm_geo_000D4C -#define MODEL_TTM_STAR_SMILEY 0x39 // ttm_geo_000D84 -#define MODEL_TTM_MOON_SMILEY 0x3A // ttm_geo_000DBC - -// actor model IDs - -// first set of actor bins (0x54-0x63) -// group 1 -#define MODEL_BULLET_BILL 0x54 // bullet_bill_geo -#define MODEL_YELLOW_SPHERE 0x55 // yellow_sphere_geo -#define MODEL_HOOT 0x56 // hoot_geo -#define MODEL_YOSHI_EGG 0x57 // yoshi_egg_geo -#define MODEL_THWOMP 0x58 // thwomp_geo -#define MODEL_HEAVE_HO 0x59 // heave_ho_geo - -// group 2 -#define MODEL_BLARGG 0x54 // blargg_geo -#define MODEL_BULLY 0x56 // bully_geo -#define MODEL_BULLY_BOSS 0x57 // bully_boss_geo - -// group 3 -#define MODEL_WATER_BOMB 0x54 // water_bomb_geo -#define MODEL_WATER_BOMB_SHADOW 0x55 // water_bomb_shadow_geo -#define MODEL_KING_BOBOMB 0x56 // king_bobomb_geo - -// group 4 -#define MODEL_MANTA_RAY 0x54 // manta_seg5_geo_05008D14 -#define MODEL_UNAGI 0x55 // unagi_geo -#define MODEL_SUSHI 0x56 // sushi_geo -#define MODEL_DL_WHIRLPOOL 0x57 // whirlpool_seg5_dl_05013CB8 -#define MODEL_CLAM_SHELL 0x58 // clam_shell_geo - -// group 5 -#define MODEL_POKEY_HEAD 0x54 // pokey_head_geo -#define MODEL_POKEY_BODY_PART 0x55 // pokey_body_part_geo -#define MODEL_TWEESTER 0x56 // tweester_geo -#define MODEL_KLEPTO 0x57 // klepto_geo -#define MODEL_EYEROK_LEFT_HAND 0x58 // eyerok_left_hand_geo -#define MODEL_EYEROK_RIGHT_HAND 0x59 // eyerok_right_hand_geo - -// group 6 -#define MODEL_DL_MONTY_MOLE_HOLE 0x54 // monty_mole_hole_seg5_dl_05000840 -#define MODEL_MONTY_MOLE 0x55 // monty_mole_geo -#define MODEL_UKIKI 0x56 // ukiki_geo -#define MODEL_FWOOSH 0x57 // fwoosh_geo - -// group 7 -#define MODEL_SPINDRIFT 0x54 // spindrift_geo -#define MODEL_MR_BLIZZARD_HIDDEN 0x55 // mr_blizzard_hidden_geo -#define MODEL_MR_BLIZZARD 0x56 // mr_blizzard_geo -#define MODEL_PENGUIN 0x57 // penguin_geo - -// group 8 -#define MODEL_CAP_SWITCH_EXCLAMATION 0x54 // cap_switch_exclamation_seg5_dl_05002E00 -#define MODEL_CAP_SWITCH 0x55 // cap_switch_geo -#define MODEL_CAP_SWITCH_BASE 0x56 // cap_switch_base_seg5_dl_05003120 - -// group 9 -#define MODEL_BOO 0x54 // boo_geo -#define MODEL_BETA_BOO_KEY 0x55 // small_key_geo -#define MODEL_HAUNTED_CHAIR 0x56 // haunted_chair_geo -#define MODEL_MAD_PIANO 0x57 // mad_piano_geo -#define MODEL_BOOKEND_PART 0x58 // bookend_part_geo -#define MODEL_BOOKEND 0x59 // bookend_geo -#define MODEL_HAUNTED_CAGE 0x5A // haunted_cage_geo - -// group 10 -#define MODEL_BIRDS 0x54 // birds_geo -#define MODEL_YOSHI 0x55 // yoshi_geo - -// group 11 -#define MODEL_ENEMY_LAKITU 0x54 // enemy_lakitu_geo -#define MODEL_SPINY_BALL 0x55 // spiny_ball_geo -#define MODEL_SPINY 0x56 // spiny_geo -#define MODEL_WIGGLER_HEAD 0x57 // wiggler_head_geo -#define MODEL_WIGGLER_BODY 0x58 // wiggler_body_geo -#define MODEL_BUBBA 0x59 // bubba_geo - -// referenced in macro presets. Unknown usage. -#define MODEL_UNKNOWN_54 0x54 -#define MODEL_UNKNOWN_58 0x58 - -// second set of actor bins, (0x64-0x73) -// group 12 -#define MODEL_BOWSER 0x64 // bowser_geo -#define MODEL_BOWSER_BOMB_CHILD_OBJ 0x65 // bowser_bomb_geo - Spawns as a chill object in bowser's behavior command, causing an explosion if it touches a bomb -#define MODEL_BOWSER_SMOKE 0x66 // bowser_impact_smoke_geo -#define MODEL_BOWSER_FLAMES 0x67 // bowser_flames_geo -#define MODEL_BOWSER_WAVE 0x68 // invisible_bowser_accessory_geo -#define MODEL_BOWSER_NO_SHADOW 0x69 // bowser_geo_no_shadow - -// group 13 -#define MODEL_BUB 0x64 // cheep_cheep_geo -#define MODEL_TREASURE_CHEST_BASE 0x65 // treasure_chest_base_geo -#define MODEL_TREASURE_CHEST_LID 0x66 // treasure_chest_lid_geo -#define MODEL_CYAN_FISH 0x67 // cyan_fish_geo -#define MODEL_WATER_RING 0x68 // water_ring_geo -#define MODEL_SKEETER 0x69 // skeeter_geo - -// group 14 -#define MODEL_PIRANHA_PLANT 0x64 // piranha_plant_geo -#define MODEL_WHOMP 0x67 // whomp_geo -#define MODEL_KOOPA_WITH_SHELL 0x68 // koopa_with_shell_geo -#define MODEL_METALLIC_BALL 0x65 // metallic_ball_geo -#define MODEL_CHAIN_CHOMP 0x66 // chain_chomp -#define MODEL_KOOPA_FLAG 0x6A // koopa_flag_geo -#define MODEL_WOODEN_POST 0x6B // wooden_post_geo - -// group 15 -#define MODEL_MIPS 0x64 // mips_geo -#define MODEL_BOO_CASTLE 0x65 // boo_castle_geo -#define MODEL_LAKITU 0x66 // lakitu_geo - -// group 16 -#define MODEL_CHILL_BULLY 0x64 // chilly_chief_geo -#define MODEL_BIG_CHILL_BULLY 0x65 // chilly_chief_big_geo -#define MODEL_MONEYBAG 0x66 // moneybag_geo - -// group 17 -#define MODEL_SWOOP 0x64 // swoop_geo -#define MODEL_SCUTTLEBUG 0x65 // scuttlebug_geo -#define MODEL_MR_I_IRIS 0x66 // mr_i_iris_geo -#define MODEL_MR_I_BODY 0x67 // mr_i_geo -#define MODEL_MR_I MODEL_MR_I_BODY // backwards compatibility -#define MODEL_DORRIE 0x68 // dorrie_geo - -// other models -#define MODEL_YELLOW_COIN 0x74 // yellow_coin_geo -#define MODEL_YELLOW_COIN_NO_SHADOW 0x75 // yellow_coin_no_shadow_geo -#define MODEL_BLUE_COIN 0x76 // blue_coin_geo -#define MODEL_BLUE_COIN_NO_SHADOW 0x77 // blue_coin_no_shadow_geo -#define MODEL_HEART 0x78 // heart_geo -#define MODEL_TRANSPARENT_STAR 0x79 // transparent_star_geo -#define MODEL_STAR 0x7A // star_geo -#define MODEL_TTM_SLIDE_EXIT_PODIUM 0x7B // ttm_geo_000DF4 -#define MODEL_WOODEN_SIGNPOST 0x7C // wooden_signpost_geo -#define MODEL_UNKNOWN_7D 0x7D // referenced in macro presets. Unknown usage -// find me -#define MODEL_CANNON_BARREL 0x7F // cannon_barrel_geo -#define MODEL_CANNON_BASE 0x80 // cannon_base_geo -#define MODEL_BREAKABLE_BOX 0x81 // breakable_box_geo -#define MODEL_BREAKABLE_BOX_NO_SHADOW 0x82 // breakable_box_no_shadow_geo -#define MODEL_BREAKABLE_BOX_SMALL MODEL_BREAKABLE_BOX_NO_SHADOW // backwards compatibility -#define MODEL_EXCLAMATION_BOX_OUTLINE 0x83 // exclamation_box_outline_geo -#define MODEL_EXCLAMATION_POINT 0x84 // exclamation_point_seg8_dl_08025F08 -#define MODEL_MARIOS_WINGED_METAL_CAP 0x85 // marios_winged_metal_cap_geo -#define MODEL_MARIOS_METAL_CAP 0x86 // marios_metal_cap_geo -#define MODEL_MARIOS_WING_CAP 0x87 // marios_wing_cap_geo -#define MODEL_MARIOS_CAP 0x88 // marios_cap_geo -#define MODEL_EXCLAMATION_BOX 0x89 // exclamation_box_geo -#define MODEL_DIRT_ANIMATION 0x8A // dirt_animation_geo -#define MODEL_CARTOON_STAR 0x8B // cartoon_star_geo -#define MODEL_BLUE_COIN_SWITCH 0x8C // blue_coin_switch_geo -// find me -#define MODEL_MIST 0x8E // mist_geo -#define MODEL_SPARKLES_ANIMATION 0x8F // sparkles_animation_geo -#define MODEL_RED_FLAME 0x90 // red_flame_geo -#define MODEL_BLUE_FLAME 0x91 // blue_flame_geo -// find me -// find me -#define MODEL_BURN_SMOKE 0x94 // burn_smoke_geo -#define MODEL_SPARKLES 0x95 // sparkles_geo -#define MODEL_SMOKE 0x96 // smoke_geo -// find me -// find me -// find me -// find me -// find me -#define MODEL_BURN_SMOKE_UNUSED 0x9C // burn_smoke_geo - unused & duplicated -// find me -#define MODEL_WHITE_PARTICLE_DL 0x9E // white_particle_dl -#define MODEL_SAND_DUST 0x9F // sand_seg3_dl_particle -#define MODEL_WHITE_PARTICLE 0xA0 // white_particle_dl -#define MODEL_PEBBLE 0xA1 // pebble_seg3_dl_0301CB00 -#define MODEL_LEAVES 0xA2 // leaves_geo -#define MODEL_WAVE_TRAIL 0xA3 // wave_trail_geo -#define MODEL_WHITE_PARTICLE_SMALL 0xA4 // white_particle_small_dl -#define MODEL_SMALL_WATER_SPLASH 0xA5 // small_water_splash_geo -#define MODEL_IDLE_WATER_WAVE 0xA6 // idle_water_wave_geo -#define MODEL_WATER_SPLASH 0xA7 // water_splash_geo -#define MODEL_BUBBLE 0xA8 // bubble_geo -// find me -#define MODEL_PURPLE_MARBLE 0xAA // purple_marble_geo -// find me -#define MODEL_UNKNOWN_AC 0xAC // according to an special preset, it was the original id of the castle floor trap -#define MODEL_WF_SLIDING_PLATFORM 0xAD // wf_geo_000A98 -#define MODEL_WF_SMALL_BOMP 0xAE // wf_geo_000A00 -#define MODEL_WF_ROTATING_WOODEN_PLATFORM 0xAF // wf_geo_000A58 -#define MODEL_WF_TUMBLING_BRIDGE_PART 0xB0 // wf_geo_000AB0 -#define MODEL_WF_LARGE_BOMP 0xB1 // wf_geo_000A40 -#define MODEL_WF_TUMBLING_BRIDGE 0xB2 // wf_geo_000AC8 -#define MODEL_BOWSER_BOMB 0xB3 // bowser_bomb_geo -#define MODEL_WATER_MINE 0xB3 // water_mine_geo -#define MODEL_BOWLING_BALL 0xB4 // bowling_ball_geo -#define MODEL_TRAMPOLINE 0xB5 // springboard_top_geo (unused) -#define MODEL_TRAMPOLINE_CENTER 0xB6 // springboard_spring_geo (unused) -#define MODEL_TRAMPOLINE_BASE 0xB7 // springboard_bottom_geo (unused) -#define MODEL_UNKNOWN_B8 0xB8 // referenced in special presets as a static object. Unknown usage -#define MODEL_FISH 0xB9 // fish_geo - fish without shadow, used -#define MODEL_FISH_SHADOW 0xBA // fish_shadow_geo - fish with shadow, unused -#define MODEL_BUTTERFLY 0xBB // butterfly_geo -#define MODEL_BLACK_BOBOMB 0xBC // black_bobomb_geo -// find me -#define MODEL_KOOPA_SHELL 0xBE // koopa_shell_geo -#define MODEL_KOOPA_WITHOUT_SHELL 0xBF // koopa_without_shell_geo -#define MODEL_GOOMBA 0xC0 // goomba_geo -#define MODEL_SEAWEED 0xC1 // seaweed_geo -#define MODEL_AMP 0xC2 // dAmpGeo -#define MODEL_BOBOMB_BUDDY 0xC3 // bobomb_buddy_geo -// find me -// find me -// find me -#define MODEL_SSL_TOX_BOX 0xC7 // ssl_geo_000630 -#define MODEL_BOWSER_KEY_CUTSCENE 0xC8 // bowser_key_cutscene_geo -#define MODEL_DL_CANNON_LID 0xC9 // cannon_closed_seg8_dl_080048E0 -#define MODEL_CHECKERBOARD_PLATFORM 0xCA // checkerboard_platform_geo -#define MODEL_RED_FLAME_SHADOW 0xCB // red_flame_shadow_geo -#define MODEL_BOWSER_KEY 0xCC // bowser_key_geo -#define MODEL_EXPLOSION 0xCD // explosion_geo -#define MODEL_SNUFIT 0xCE // snufit_geo -#define MODEL_PURPLE_SWITCH 0xCF // purple_switch_geo -#define MODEL_CASTLE_STAR_DOOR_30_STARS 0xD0 // castle_geo_000F00 -#define MODEL_CASTLE_STAR_DOOR_50_STARS 0xD1 // castle_geo_000F00 -#define MODEL_CCM_SNOWMAN_BASE 0xD2 // ccm_geo_0003F0 -// find me -#define MODEL_1UP 0xD4 // mushroom_1up_geo -#define MODEL_CASTLE_STAR_DOOR_8_STARS 0xD5 // castle_geo_000F00 -#define MODEL_CASTLE_STAR_DOOR_70_STARS 0xD6 // castle_geo_000F00 -#define MODEL_RED_COIN 0xD7 // red_coin_geo -#define MODEL_RED_COIN_NO_SHADOW 0xD8 // red_coin_no_shadow_geo -#define MODEL_METAL_BOX 0xD9 // metal_box_geo -#define MODEL_METAL_BOX_DL 0xDA // metal_box_dl -#define MODEL_NUMBER 0xDB // number_geo -#define MODEL_FLYGUY 0xDC // shyguy_geo -#define MODEL_TOAD 0xDD // toad_geo -#define MODEL_PEACH 0xDE // peach_geo -#define MODEL_CHUCKYA 0xDF // chuckya_geo -#define MODEL_WHITE_PUFF 0xE0 // white_puff_geo -#define MODEL_TRAJECTORY_MARKER_BALL 0xE1 // bowling_ball_track_geo - duplicate used in SSL Pyramid small sized and as a track ball +enum ModelIDs { + MODEL_NONE, + + /* Global models that are loaded for every level */ + + MODEL_MARIO, // mario_geo + MODEL_LUIGI, // unused + + /* Various static level geometry, the geo layout differs but terrain object presets treat them the same.*/ + + MODEL_LEVEL_GEOMETRY_03, + MODEL_LEVEL_GEOMETRY_04, + MODEL_LEVEL_GEOMETRY_05, + MODEL_LEVEL_GEOMETRY_06, + MODEL_LEVEL_GEOMETRY_07, + MODEL_LEVEL_GEOMETRY_08, + MODEL_LEVEL_GEOMETRY_09, + MODEL_LEVEL_GEOMETRY_0A, + MODEL_LEVEL_GEOMETRY_0B, + MODEL_LEVEL_GEOMETRY_0C, + MODEL_LEVEL_GEOMETRY_0D, + MODEL_LEVEL_GEOMETRY_0E, + MODEL_LEVEL_GEOMETRY_0F, + MODEL_LEVEL_GEOMETRY_10, + MODEL_LEVEL_GEOMETRY_11, + MODEL_LEVEL_GEOMETRY_12, + MODEL_LEVEL_GEOMETRY_13, + MODEL_LEVEL_GEOMETRY_14, + MODEL_LEVEL_GEOMETRY_15, + MODEL_LEVEL_GEOMETRY_16, + + MODEL_BOB_BUBBLY_TREE, // bubbly_tree_geo + MODEL_WDW_BUBBLY_TREE, // bubbly_tree_geo + MODEL_CASTLE_GROUNDS_BUBBLY_TREE, // bubbly_tree_geo + MODEL_WF_BUBBLY_TREE, // bubbly_tree_geo + MODEL_THI_BUBBLY_TREE, // bubbly_tree_geo + MODEL_COURTYARD_SPIKY_TREE, // spiky_tree_geo + MODEL_CCM_SNOW_TREE, // snow_tree_geo + MODEL_SL_SNOW_TREE, // snow_tree_geo + MODEL_UNKNOWN_TREE_1A, // referenced in special presets, undefined + MODEL_SSL_PALM_TREE, // palm_tree_geo + MODEL_CASTLE_CASTLE_DOOR_UNUSED, // castle_door_geo - unused, original id + MODEL_CASTLE_WOODEN_DOOR_UNUSED, // wooden_door_geo - unused, original id + MODEL_BBH_HAUNTED_DOOR, // haunted_door_geo + MODEL_HMC_WOODEN_DOOR, // wooden_door_geo + MODEL_UNKNOWN_DOOR_1E, // referenced in special presets, undefined + MODEL_HMC_METAL_DOOR, // metal_door_geo + MODEL_HMC_HAZY_MAZE_DOOR, // hazy_maze_door_geo + MODEL_UNKNOWN_DOOR_21, // referenced in special presets, undefined + MODEL_CASTLE_DOOR_0_STARS, // castle_door_0_star_geo + MODEL_CASTLE_DOOR_1_STAR, // castle_door_1_star_geo + MODEL_CASTLE_DOOR_3_STARS, // castle_door_3_stars_geo + MODEL_CASTLE_KEY_DOOR, // key_door_geo + MODEL_CASTLE_CASTLE_DOOR, // castle_door_geo - used duplicate + MODEL_CASTLE_GROUNDS_CASTLE_DOOR, // castle_door_geo - used duplicate + MODEL_CASTLE_WOODEN_DOOR, // wooden_door_geo + MODEL_COURTYARD_WOODEN_DOOR, // wooden_door_geo + MODEL_CCM_CABIN_DOOR, // cabin_door_geo + MODEL_UNKNOWN_DOOR_28, // referenced in special presets, undefined + MODEL_CASTLE_METAL_DOOR, // metal_door_geo + MODEL_CASTLE_GROUNDS_METAL_DOOR, // metal_door_geo + MODEL_UNKNOWN_DOOR_2A, // referenced in special presets, undefined + MODEL_UNKNOWN_DOOR_2B, // referenced in special presets, undefined + MODEL_WF_TOWER_TRAPEZOID_PLATORM, // wf_geo_000AF8 - unused + MODEL_WF_TOWER_SQUARE_PLATORM, // wf_geo_000B10 + MODEL_WF_TOWER_SQUARE_PLATORM_UNUSED, // wf_geo_000B38 - unused & duplicated + MODEL_WF_TOWER_SQUARE_PLATORM_ELEVATOR, // wf_geo_000B60 - elevator platorm + + // Level model IDs + + // bbh + MODEL_BBH_STAIRCASE_STEP, // geo_bbh_0005B0 + MODEL_BBH_TILTING_FLOOR_PLATFORM, // geo_bbh_0005C8 + MODEL_BBH_TUMBLING_PLATFORM, // geo_bbh_0005E0 + MODEL_BBH_TUMBLING_PLATFORM_PART, // geo_bbh_0005F8 + MODEL_BBH_MOVING_BOOKSHELF, // geo_bbh_000610 + MODEL_BBH_MESH_ELEVATOR, // geo_bbh_000628 + MODEL_BBH_MERRY_GO_ROUND, // geo_bbh_000640 + MODEL_BBH_WOODEN_TOMB, // geo_bbh_000658 + + // ccm + MODEL_CCM_ROPEWAY_LIFT, // ccm_geo_0003D0 + MODEL_CCM_SNOWMAN_HEAD, // ccm_geo_00040C + + // castle + MODEL_CASTLE_BOWSER_TRAP, // castle_geo_000F18 + MODEL_CASTLE_WATER_LEVEL_PILLAR, // castle_geo_001940 + MODEL_CASTLE_CLOCK_MINUTE_HAND, // castle_geo_001530 + MODEL_CASTLE_CLOCK_HOUR_HAND, // castle_geo_001548 + MODEL_CASTLE_CLOCK_PENDULUM, // castle_geo_001518 + + // hmc + MODEL_HMC_METAL_PLATFORM, // hmc_geo_0005A0 + MODEL_HMC_METAL_ARROW_PLATFORM, // hmc_geo_0005B8 + MODEL_HMC_ELEVATOR_PLATFORM, // hmc_geo_0005D0 + MODEL_HMC_ROLLING_ROCK, // hmc_geo_000548 + MODEL_HMC_ROCK_PIECE, // hmc_geo_000570 - unused + MODEL_HMC_ROCK_SMALL_PIECE, // hmc_geo_000588 - unused + MODEL_HMC_RED_GRILLS, // hmc_geo_000530 + + // ssl + MODEL_SSL_PYRAMID_TOP, // ssl_geo_000618 + MODEL_SSL_GRINDEL, // ssl_geo_000734 + MODEL_SSL_SPINDEL, // ssl_geo_000764 + MODEL_SSL_MOVING_PYRAMID_WALL, // ssl_geo_000794 + MODEL_SSL_PYRAMID_ELEVATOR, // ssl_geo_0007AC + + // bob + MODEL_BOB_CHAIN_CHOMP_GATE, // bob_geo_000440 + MODEL_BOB_SEESAW_PLATFORM, // bob_geo_000458 + MODEL_BOB_BARS_GRILLS, // bob_geo_000470 + + // sl + MODEL_SL_SNOW_TRIANGLE, // sl_geo_000390 + MODEL_SL_CRACKED_ICE, // sl_geo_000360 - unused + MODEL_SL_CRACKED_ICE_CHUNK, // sl_geo_000378 - unused + + // wdw + MODEL_WDW_SQUARE_FLOATING_PLATFORM, // wdw_geo_000580 + MODEL_WDW_ARROW_LIFT, // wdw_geo_000598 + MODEL_WDW_WATER_LEVEL_DIAMOND, // wdw_geo_0005C0 + MODEL_WDW_HIDDEN_PLATFORM, // wdw_geo_0005E8 + MODEL_WDW_EXPRESS_ELEVATOR, // wdw_geo_000610 + MODEL_WDW_RECTANGULAR_FLOATING_PLATFORM, // wdw_geo_000628 + MODEL_WDW_ROTATING_PLATFORM, // wdw_geo_000640 + + // jrb + MODEL_JRB_SHIP_LEFT_HALF_PART, // jrb_geo_000978 + MODEL_JRB_SHIP_BACK_LEFT_PART, // jrb_geo_0009B0 + MODEL_JRB_SHIP_RIGHT_HALF_PART, // jrb_geo_0009E8 + MODEL_JRB_SHIP_BACK_RIGHT_PART, // jrb_geo_000A00 + MODEL_JRB_SUNKEN_SHIP, // jrb_geo_000990 + MODEL_JRB_SUNKEN_SHIP_BACK, // jrb_geo_0009C8 + MODEL_JRB_ROCK, // jrb_geo_000930 + MODEL_JRB_SLIDING_BOX, // jrb_geo_000960 + MODEL_JRB_FALLING_PILLAR, // jrb_geo_000900 + MODEL_JRB_FALLING_PILLAR_BASE, // jrb_geo_000918 + MODEL_JRB_FLOATING_PLATFORM, // jrb_geo_000948 + + // thi + MODEL_THI_HUGE_ISLAND_TOP, // thi_geo_0005B0 + MODEL_THI_TINY_ISLAND_TOP, // thi_geo_0005C8 + + // ttc + MODEL_TTC_ROTATING_CUBE, // ttc_geo_000240 + MODEL_TTC_ROTATING_PRISM, // ttc_geo_000258 + MODEL_TTC_PENDULUM, // ttc_geo_000270 + MODEL_TTC_LARGE_TREADMILL, // ttc_geo_000288 + MODEL_TTC_SMALL_TREADMILL, // ttc_geo_0002A8 + MODEL_TTC_PUSH_BLOCK, // ttc_geo_0002C8 + MODEL_TTC_ROTATING_HEXAGON, // ttc_geo_0002E0 + MODEL_TTC_ROTATING_TRIANGLE, // ttc_geo_0002F8 + MODEL_TTC_PIT_BLOCK, // ttc_geo_000310 - has 2 vertical stripes + MODEL_TTC_PIT_BLOCK_UNUSED, // ttc_geo_000328 - has 3 vertical stripes, unused + MODEL_TTC_ELEVATOR_PLATFORM, // ttc_geo_000340 + MODEL_TTC_CLOCK_HAND, // ttc_geo_000358 + MODEL_TTC_SPINNER, // ttc_geo_000370 + MODEL_TTC_SMALL_GEAR, // ttc_geo_000388 + MODEL_TTC_LARGE_GEAR, // ttc_geo_0003A0 + + // rr + MODEL_RR_SLIDING_PLATFORM, // rr_geo_0008C0 + MODEL_RR_FLYING_CARPET, // rr_geo_000848 + MODEL_RR_OCTAGONAL_PLATFORM, // rr_geo_0008A8 + MODEL_RR_ROTATING_BRIDGE_PLATFORM, // rr_geo_000878 + MODEL_RR_TRIANGLE_PLATFORM, // rr_geo_0008D8 - unused + MODEL_RR_CRUISER_WING, // rr_geo_000890 + MODEL_RR_SEESAW_PLATFORM, // rr_geo_000908 + MODEL_RR_L_SHAPED_PLATFORM, // rr_geo_000940 - unused + MODEL_RR_SWINGING_PLATFORM, // rr_geo_000860 + MODEL_RR_DONUT_PLATFORM, // rr_geo_000920 + MODEL_RR_ELEVATOR_PLATFORM, // rr_geo_0008F0 + MODEL_RR_TRICKY_TRIANGLES, // rr_geo_000958 + MODEL_RR_TRICKY_TRIANGLES_FRAME1, // rr_geo_000970 + MODEL_RR_TRICKY_TRIANGLES_FRAME2, // rr_geo_000988 + MODEL_RR_TRICKY_TRIANGLES_FRAME3, // rr_geo_0009A0 + MODEL_RR_TRICKY_TRIANGLES_FRAME4, // rr_geo_0009B8 + + // castle grounds + + // bitdw + MODEL_BITDW_SQUARE_PLATFORM, // geo_bitdw_000558 + MODEL_BITDW_SEESAW_PLATFORM, // geo_bitdw_000540 + MODEL_BITDW_SLIDING_PLATFORM, // geo_bitdw_000528 + MODEL_BITDW_FERRIS_WHEEL_AXLE, // geo_bitdw_000570 + MODEL_BITDW_BLUE_PLATFORM, // geo_bitdw_000588 + MODEL_BITDW_STAIRCASE_FRAME4, // geo_bitdw_0005A0 + MODEL_BITDW_STAIRCASE_FRAME3, // geo_bitdw_0005B8 + MODEL_BITDW_STAIRCASE_FRAME2, // geo_bitdw_0005D0 + MODEL_BITDW_STAIRCASE_FRAME1, // geo_bitdw_0005E8 + MODEL_BITDW_STAIRCASE, // geo_bitdw_000600 + + // vcutm + MODEL_VCUTM_SEESAW_PLATFORM, // vcutm_geo_0001F0 + + // bitfs + MODEL_BITFS_PLATFORM_ON_TRACK, // bitfs_geo_000758 + MODEL_BITFS_TILTING_SQUARE_PLATFORM, // bitfs_geo_0006C0 + MODEL_BITFS_SINKING_PLATFORMS, // bitfs_geo_000770 + MODEL_BITFS_BLUE_POLE, // bitfs_geo_0006A8 + MODEL_BITFS_SINKING_CAGE_PLATFORM, // bitfs_geo_000690 + MODEL_BITFS_ELEVATOR, // bitfs_geo_000678 + MODEL_BITFS_STRETCHING_PLATFORMS, // bitfs_geo_000708 + MODEL_BITFS_SEESAW_PLATFORM, // bitfs_geo_000788 + MODEL_BITFS_MOVING_SQUARE_PLATFORM, // bitfs_geo_000728 + MODEL_BITFS_SLIDING_PLATFORM, // bitfs_geo_000740 + MODEL_BITFS_TUMBLING_PLATFORM_PART, // bitfs_geo_0006D8 + MODEL_BITFS_TUMBLING_PLATFORM, // bitfs_geo_0006F0 + + // sa + + // bits + MODEL_BITS_SLIDING_PLATFORM, // bits_geo_0005E0 + MODEL_BITS_TWIN_SLIDING_PLATFORMS, // bits_geo_0005F8 + MODEL_BITS_OCTAGONAL_PLATFORM, // bits_geo_000610 + MODEL_BITS_BLUE_PLATFORM, // bits_geo_000628 + MODEL_BITS_FERRIS_WHEEL_AXLE, // bits_geo_000640 + MODEL_BITS_ARROW_PLATFORM, // bits_geo_000658 + MODEL_BITS_SEESAW_PLATFORM, // bits_geo_000670 + MODEL_BITS_TILTING_W_PLATFORM, // bits_geo_000688 + MODEL_BITS_STAIRCASE, // bits_geo_0006A0 + MODEL_BITS_STAIRCASE_FRAME1, // bits_geo_0006B8 + MODEL_BITS_STAIRCASE_FRAME2, // bits_geo_0006D0 + MODEL_BITS_STAIRCASE_FRAME3, // bits_geo_0006E8 + MODEL_BITS_STAIRCASE_FRAME4, // bits_geo_000700 + MODEL_BITS_WARP_PIPE, // warp_pipe_geo + + // lll + MODEL_LLL_DRAWBRIDGE_PART, // lll_geo_000B20 + MODEL_LLL_ROTATING_BLOCK_FIRE_BARS, // lll_geo_000B38 + MODEL_LLL_ROTATING_HEXAGONAL_RING, // lll_geo_000BB0 + MODEL_LLL_SINKING_RECTANGULAR_PLATFORM, // lll_geo_000BC8 + MODEL_LLL_SINKING_SQUARE_PLATFORMS, // lll_geo_000BE0 + MODEL_LLL_TILTING_SQUARE_PLATFORM, // lll_geo_000BF8 + MODEL_LLL_BOWSER_PIECE_1, // lll_geo_bowser_puzzle_piece_1 + MODEL_LLL_BOWSER_PIECE_2, // lll_geo_bowser_puzzle_piece_2 + MODEL_LLL_BOWSER_PIECE_3, // lll_geo_bowser_puzzle_piece_3 + MODEL_LLL_BOWSER_PIECE_4, // lll_geo_bowser_puzzle_piece_4 + MODEL_LLL_BOWSER_PIECE_5, // lll_geo_bowser_puzzle_piece_5 + MODEL_LLL_BOWSER_PIECE_6, // lll_geo_bowser_puzzle_piece_6 + MODEL_LLL_BOWSER_PIECE_7, // lll_geo_bowser_puzzle_piece_7 + MODEL_LLL_BOWSER_PIECE_8, // lll_geo_bowser_puzzle_piece_8 + MODEL_LLL_BOWSER_PIECE_9, // lll_geo_bowser_puzzle_piece_9 + MODEL_LLL_BOWSER_PIECE_10, // lll_geo_bowser_puzzle_piece_10 + MODEL_LLL_BOWSER_PIECE_11, // lll_geo_bowser_puzzle_piece_11 + MODEL_LLL_BOWSER_PIECE_12, // lll_geo_bowser_puzzle_piece_12 + MODEL_LLL_BOWSER_PIECE_13, // lll_geo_bowser_puzzle_piece_13 + MODEL_LLL_BOWSER_PIECE_14, // lll_geo_bowser_puzzle_piece_14 + MODEL_LLL_MOVING_OCTAGONAL_MESH_PLATFORM, // lll_geo_000B08 + MODEL_LLL_SINKING_ROCK_BLOCK, // lll_geo_000DD0 + MODEL_LLL_ROLLING_LOG, // lll_geo_000DE8 + MODEL_LLL_WOOD_BRIDGE, // lll_geo_000B50 + MODEL_LLL_LARGE_WOOD_BRIDGE, // lll_geo_000B68 + MODEL_LLL_FALLING_PLATFORM, // lll_geo_000B80 + MODEL_LLL_LARGE_FALLING_PLATFORM, // lll_geo_000B98 + MODEL_LLL_VOLCANO_FALLING_TRAP, // lll_geo_000EA8 + + // ddd + MODEL_DDD_BOWSER_SUB_DOOR, // ddd_geo_000478 + MODEL_DDD_BOWSER_SUB, // ddd_geo_0004A0 + MODEL_DDD_POLE, // ddd_geo_000450 + + // wf + MODEL_WF_BREAKABLE_WALL_RIGHT, // wf_geo_000B78 + MODEL_WF_BREAKABLE_WALL_LEFT, // wf_geo_000B90 + MODEL_WF_KICKABLE_BOARD, // wf_geo_000BA8 + MODEL_WF_TOWER_DOOR, // wf_geo_000BE0 + MODEL_WF_KICKABLE_BOARD_FELLED, // wf_geo_000BC8 + + // ending + + // castle grounds + MODEL_CASTLE_GROUNDS_VCUTM_GRILL, // castle_grounds_geo_00070C + MODEL_CASTLE_GROUNDS_FLAG, // castle_grounds_geo_000660 + MODEL_CASTLE_GROUNDS_CANNON_GRILL, // castle_grounds_geo_000724 + + // pss + + // cotmc + + // totwc + + // bowser 1 + + // wmotr + + // bowser 2 + MODEL_BOWSER_2_TILTING_ARENA, // bowser_2_geo_000170 + + // bowser 3 + MODEL_BOWSER_3_FALLING_PLATFORM_1, // bowser_3_geo_000290 + MODEL_BOWSER_3_FALLING_PLATFORM_2, // bowser_3_geo_0002A8 + MODEL_BOWSER_3_FALLING_PLATFORM_3, // bowser_3_geo_0002C0 + MODEL_BOWSER_3_FALLING_PLATFORM_4, // bowser_3_geo_0002D8 + MODEL_BOWSER_3_FALLING_PLATFORM_5, // bowser_3_geo_0002F0 + MODEL_BOWSER_3_FALLING_PLATFORM_6, // bowser_3_geo_000308 + MODEL_BOWSER_3_FALLING_PLATFORM_7, // bowser_3_geo_000320 + MODEL_BOWSER_3_FALLING_PLATFORM_8, // bowser_3_geo_000338 + MODEL_BOWSER_3_FALLING_PLATFORM_9, // bowser_3_geo_000350 + MODEL_BOWSER_3_FALLING_PLATFORM_10, // bowser_3_geo_000368 + + // ttm + MODEL_TTM_ROLLING_LOG, // ttm_geo_000730 + MODEL_TTM_STAR_CAGE, // ttm_geo_000710 + MODEL_TTM_BLUE_SMILEY, // ttm_geo_000D14 + MODEL_TTM_YELLOW_SMILEY, // ttm_geo_000D4C + MODEL_TTM_STAR_SMILEY, // ttm_geo_000D84 + MODEL_TTM_MOON_SMILEY, // ttm_geo_000DBC + + // actor model IDs + + // first set of actor bins (0x54-0x63) + // group 1 + MODEL_BULLET_BILL, // bullet_bill_geo + MODEL_YELLOW_SPHERE, // yellow_sphere_geo + MODEL_HOOT, // hoot_geo + MODEL_YOSHI_EGG, // yoshi_egg_geo + MODEL_THWOMP, // thwomp_geo + MODEL_HEAVE_HO, // heave_ho_geo + + // group 2 + MODEL_BLARGG, // blargg_geo + MODEL_BULLY, // bully_geo + MODEL_BULLY_BOSS, // bully_boss_geo + + // group 3 + MODEL_WATER_BOMB, // water_bomb_geo + MODEL_WATER_BOMB_SHADOW, // water_bomb_shadow_geo + MODEL_KING_BOBOMB, // king_bobomb_geo + + // group 4 + MODEL_MANTA_RAY, // manta_seg5_geo_05008D14 + MODEL_UNAGI, // unagi_geo + MODEL_SUSHI, // sushi_geo + MODEL_DL_WHIRLPOOL, // whirlpool_seg5_dl_05013CB8 + MODEL_CLAM_SHELL, // clam_shell_geo + + // group 5 + MODEL_POKEY_HEAD, // pokey_head_geo + MODEL_POKEY_BODY_PART, // pokey_body_part_geo + MODEL_TWEESTER, // tweester_geo + MODEL_KLEPTO, // klepto_geo + MODEL_EYEROK_LEFT_HAND, // eyerok_left_hand_geo + MODEL_EYEROK_RIGHT_HAND, // eyerok_right_hand_geo + + // group 6 + MODEL_DL_MONTY_MOLE_HOLE, // monty_mole_hole_seg5_dl_05000840 + MODEL_MONTY_MOLE, // monty_mole_geo + MODEL_UKIKI, // ukiki_geo + MODEL_FWOOSH, // fwoosh_geo + + // group 7 + MODEL_SPINDRIFT, // spindrift_geo + MODEL_MR_BLIZZARD_HIDDEN, // mr_blizzard_hidden_geo + MODEL_MR_BLIZZARD, // mr_blizzard_geo + MODEL_PENGUIN, // penguin_geo + + // group 8 + MODEL_CAP_SWITCH_EXCLAMATION, // cap_switch_exclamation_seg5_dl_05002E00 + MODEL_CAP_SWITCH, // cap_switch_geo + MODEL_CAP_SWITCH_BASE, // cap_switch_base_seg5_dl_05003120 + + // group 9 + MODEL_BOO, // boo_geo + MODEL_BETA_BOO_KEY, // small_key_geo + MODEL_HAUNTED_CHAIR, // haunted_chair_geo + MODEL_MAD_PIANO, // mad_piano_geo + MODEL_BOOKEND_PART, // bookend_part_geo + MODEL_BOOKEND, // bookend_geo + MODEL_HAUNTED_CAGE, // haunted_cage_geo + + // group 10 + MODEL_BIRDS, // birds_geo + MODEL_YOSHI, // yoshi_geo + + // group 11 + MODEL_ENEMY_LAKITU, // enemy_lakitu_geo + MODEL_SPINY_BALL, // spiny_ball_geo + MODEL_SPINY, // spiny_geo + MODEL_WIGGLER_HEAD, // wiggler_head_geo + MODEL_WIGGLER_BODY, // wiggler_body_geo + MODEL_BUBBA, // bubba_geo + + // referenced in macro presets. Unknown usage. + MODEL_UNKNOWN_54, + MODEL_UNKNOWN_58, + + // second set of actor bins, (0x64-0x73) + // group 12 + MODEL_BOWSER, // bowser_geo + MODEL_BOWSER_BOMB_CHILD_OBJ, // bowser_bomb_geo - Spawns as a chill object in bowser's behavior command, causing an explosion if it touches a bomb + MODEL_BOWSER_SMOKE, // bowser_impact_smoke_geo + MODEL_BOWSER_FLAMES, // bowser_flames_geo + MODEL_BOWSER_WAVE, // invisible_bowser_accessory_geo + MODEL_BOWSER_NO_SHADOW, // bowser_geo_no_shadow + + // group 13 + MODEL_BUB, // cheep_cheep_geo + MODEL_TREASURE_CHEST_BASE, // treasure_chest_base_geo + MODEL_TREASURE_CHEST_LID, // treasure_chest_lid_geo + MODEL_CYAN_FISH, // cyan_fish_geo + MODEL_WATER_RING, // water_ring_geo + MODEL_SKEETER, // skeeter_geo + + // group 14 + MODEL_PIRANHA_PLANT, // piranha_plant_geo + MODEL_WHOMP, // whomp_geo + MODEL_KOOPA_WITH_SHELL, // koopa_with_shell_geo + MODEL_METALLIC_BALL, // metallic_ball_geo + MODEL_CHAIN_CHOMP, // chain_chomp + MODEL_KOOPA_FLAG, // koopa_flag_geo + MODEL_WOODEN_POST, // wooden_post_geo + + // group 15 + MODEL_MIPS, // mips_geo + MODEL_BOO_CASTLE, // boo_castle_geo + MODEL_LAKITU, // lakitu_geo + + // group 16 + MODEL_CHILL_BULLY, // chilly_chief_geo + MODEL_BIG_CHILL_BULLY, // chilly_chief_big_geo + MODEL_MONEYBAG, // moneybag_geo + + // group 17 + MODEL_SWOOP, // swoop_geo + MODEL_SCUTTLEBUG, // scuttlebug_geo + MODEL_MR_I_IRIS, // mr_i_iris_geo + MODEL_MR_I_BODY, // mr_i_geo + MODEL_MR_I, // backwards compatibility + MODEL_DORRIE, // dorrie_geo + + // other models + MODEL_YELLOW_COIN, // yellow_coin_geo + MODEL_YELLOW_COIN_NO_SHADOW, // yellow_coin_no_shadow_geo + MODEL_BLUE_COIN, // blue_coin_geo + MODEL_BLUE_COIN_NO_SHADOW, // blue_coin_no_shadow_geo + MODEL_HEART, // heart_geo + MODEL_TRANSPARENT_STAR, // transparent_star_geo + MODEL_STAR, // star_geo + MODEL_TTM_SLIDE_EXIT_PODIUM, // ttm_geo_000DF4 + MODEL_WOODEN_SIGNPOST, // wooden_signpost_geo + MODEL_UNKNOWN_7D, // referenced in macro presets. Unknown usage + // find me + MODEL_CANNON_BARREL, // cannon_barrel_geo + MODEL_CANNON_BASE, // cannon_base_geo + MODEL_BREAKABLE_BOX, // breakable_box_geo + MODEL_BREAKABLE_BOX_NO_SHADOW, // breakable_box_no_shadow_geo + MODEL_BREAKABLE_BOX_SMALL, // backwards compatibility + MODEL_EXCLAMATION_BOX_OUTLINE, // exclamation_box_outline_geo + MODEL_EXCLAMATION_POINT, // exclamation_point_seg8_dl_08025F08 + MODEL_MARIOS_WINGED_METAL_CAP, // marios_winged_metal_cap_geo + MODEL_MARIOS_METAL_CAP, // marios_metal_cap_geo + MODEL_MARIOS_WING_CAP, // marios_wing_cap_geo + MODEL_MARIOS_CAP, // marios_cap_geo + MODEL_EXCLAMATION_BOX, // exclamation_box_geo + MODEL_DIRT_ANIMATION, // dirt_animation_geo + MODEL_CARTOON_STAR, // cartoon_star_geo + MODEL_BLUE_COIN_SWITCH, // blue_coin_switch_geo + // find me + MODEL_MIST, // mist_geo + MODEL_SPARKLES_ANIMATION, // sparkles_animation_geo + MODEL_RED_FLAME, // red_flame_geo + MODEL_BLUE_FLAME, // blue_flame_geo + // find me + // find me + MODEL_BURN_SMOKE, // burn_smoke_geo + MODEL_SPARKLES, // sparkles_geo + MODEL_SMOKE, // smoke_geo + // find me + // find me + // find me + // find me + // find me + MODEL_BURN_SMOKE_UNUSED, // burn_smoke_geo - unused & duplicated + // find me + MODEL_WHITE_PARTICLE_DL, // white_particle_dl + MODEL_SAND_DUST, // sand_seg3_dl_particle + MODEL_WHITE_PARTICLE, // white_particle_dl + MODEL_PEBBLE, // pebble_seg3_dl_0301CB00 + MODEL_LEAVES, // leaves_geo + MODEL_WAVE_TRAIL, // wave_trail_geo + MODEL_WHITE_PARTICLE_SMALL, // white_particle_small_dl + MODEL_SMALL_WATER_SPLASH, // small_water_splash_geo + MODEL_IDLE_WATER_WAVE, // idle_water_wave_geo + MODEL_WATER_SPLASH, // water_splash_geo + MODEL_BUBBLE, // bubble_geo + // find me + MODEL_PURPLE_MARBLE, // purple_marble_geo + // find me + MODEL_UNKNOWN_AC, // according to an special preset, it was the original id of the castle floor trap + MODEL_WF_SLIDING_PLATFORM, // wf_geo_000A98 + MODEL_WF_SMALL_BOMP, // wf_geo_000A00 + MODEL_WF_ROTATING_WOODEN_PLATFORM, // wf_geo_000A58 + MODEL_WF_TUMBLING_BRIDGE_PART, // wf_geo_000AB0 + MODEL_WF_LARGE_BOMP, // wf_geo_000A40 + MODEL_WF_TUMBLING_BRIDGE, // wf_geo_000AC8 + MODEL_BOWSER_BOMB, // bowser_bomb_geo + MODEL_WATER_MINE, // water_mine_geo + MODEL_BOWLING_BALL, // bowling_ball_geo + MODEL_TRAMPOLINE, // springboard_top_geo (unused) + MODEL_TRAMPOLINE_CENTER, // springboard_spring_geo (unused) + MODEL_TRAMPOLINE_BASE, // springboard_bottom_geo (unused) + MODEL_UNKNOWN_B8, // referenced in special presets as a static object. Unknown usage + MODEL_FISH, // fish_geo - fish without shadow, used + MODEL_FISH_SHADOW, // fish_shadow_geo - fish with shadow, unused + MODEL_BUTTERFLY, // butterfly_geo + MODEL_BLACK_BOBOMB, // black_bobomb_geo + // find me + MODEL_KOOPA_SHELL, // koopa_shell_geo + MODEL_KOOPA_WITHOUT_SHELL, // koopa_without_shell_geo + MODEL_GOOMBA, // goomba_geo + MODEL_SEAWEED, // seaweed_geo + MODEL_AMP, // dAmpGeo + MODEL_BOBOMB_BUDDY, // bobomb_buddy_geo + // find me + // find me + // find me + MODEL_SSL_TOX_BOX, // ssl_geo_000630 + MODEL_BOWSER_KEY_CUTSCENE, // bowser_key_cutscene_geo + MODEL_DL_CANNON_LID, // cannon_closed_seg8_dl_080048E0 + MODEL_CHECKERBOARD_PLATFORM, // checkerboard_platform_geo + MODEL_RED_FLAME_SHADOW, // red_flame_shadow_geo + MODEL_BOWSER_KEY, // bowser_key_geo + MODEL_EXPLOSION, // explosion_geo + MODEL_SNUFIT, // snufit_geo + MODEL_PURPLE_SWITCH, // purple_switch_geo + MODEL_CASTLE_STAR_DOOR_30_STARS, // castle_geo_000F00 + MODEL_CASTLE_STAR_DOOR_50_STARS, // castle_geo_000F00 + MODEL_CCM_SNOWMAN_BASE, // ccm_geo_0003F0 + // find me + MODEL_1UP, // mushroom_1up_geo + MODEL_CASTLE_STAR_DOOR_8_STARS, // castle_geo_000F00 + MODEL_CASTLE_STAR_DOOR_70_STARS, // castle_geo_000F00 + MODEL_RED_COIN, // red_coin_geo + MODEL_RED_COIN_NO_SHADOW, // red_coin_no_shadow_geo + MODEL_METAL_BOX, // metal_box_geo + MODEL_METAL_BOX_DL, // metal_box_dl + MODEL_NUMBER, // number_geo + MODEL_FLYGUY, // shyguy_geo + MODEL_TOAD, // toad_geo + MODEL_PEACH, // peach_geo + MODEL_CHUCKYA, // chuckya_geo + MODEL_WHITE_PUFF, // white_puff_geo + MODEL_TRAJECTORY_MARKER_BALL, // bowling_ball_track_geo - duplicate used in SSL Pyramid small sized and as a track ball #ifdef IA8_30FPS_COINS -#define MODEL_SILVER_COIN 0xE2 // silver_coin_geo -#define MODEL_SILVER_COIN_NO_SHADOW 0xE3 // silver_coin_no_shadow_geo + MODEL_SILVER_COIN, // silver_coin_geo + MODEL_SILVER_COIN_NO_SHADOW, // silver_coin_no_shadow_geo #endif + MODEL_ID_COUNT, +}; + // Menu Models (overwrites Level Geometry IDs) #define MODEL_MAIN_MENU_MARIO_SAVE_BUTTON MODEL_LEVEL_GEOMETRY_03 // main_menu_geo_0001D0 #define MODEL_MAIN_MENU_RED_ERASE_BUTTON MODEL_LEVEL_GEOMETRY_04 // main_menu_geo_000290 diff --git a/include/types.h b/include/types.h index c65afd67c4..311e224d14 100644 --- a/include/types.h +++ b/include/types.h @@ -144,9 +144,7 @@ typedef u32 Texture32; typedef s16 TextureCoord; // -- Models -- - -typedef u8 ModelID8; -typedef u16 ModelID16; +typedef u16 ModelID; typedef u32 ModelID32; // -- Animations -- diff --git a/src/engine/level_script.c b/src/engine/level_script.c index 0e84c573ea..bc2aac6c94 100644 --- a/src/engine/level_script.c +++ b/src/engine/level_script.c @@ -426,7 +426,7 @@ static void level_cmd_end_area(void) { } static void level_cmd_load_model_from_dl(void) { - ModelID16 model = CMD_GET(ModelID16, 0xA); + ModelID model = CMD_GET(ModelID, 0xA); s16 layer = CMD_GET(u16, 0x8); void *dl_ptr = CMD_GET(void *, 4); @@ -440,7 +440,7 @@ static void level_cmd_load_model_from_dl(void) { } static void level_cmd_load_model_from_geo(void) { - ModelID16 model = CMD_GET(ModelID16, 2); + ModelID model = CMD_GET(ModelID, 2); void *geo = CMD_GET(void *, 4); assert(model < MODEL_ID_COUNT, "Tried to load an invalid model ID."); @@ -452,7 +452,7 @@ static void level_cmd_load_model_from_geo(void) { } static void level_cmd_23(void) { - ModelID16 model = (CMD_GET(ModelID16, 2) & 0x0FFF); + ModelID model = (CMD_GET(ModelID, 2) & 0x0FFF); s16 layer = (((u16)CMD_GET(s16, 2)) >> 12); void *dl = CMD_GET(void *, 4); s32 scale = CMD_GET(s32, 8); @@ -477,7 +477,7 @@ static void level_cmd_init_mario(void) { gMarioSpawnInfo->respawnInfo = RESPAWN_INFO_NONE; gMarioSpawnInfo->behaviorArg = CMD_GET(u32, 4); gMarioSpawnInfo->behaviorScript = CMD_GET(void *, 8); - gMarioSpawnInfo->model = gLoadedGraphNodes[CMD_GET(ModelID16, 0x2)]; // u8, 3? + gMarioSpawnInfo->model = gLoadedGraphNodes[CMD_GET(ModelID, 0x2)]; // u8, 3? gMarioSpawnInfo->next = NULL; sCurrentCmd = CMD_NEXT; @@ -488,7 +488,7 @@ static void level_cmd_place_object(void) { sCurrAreaIndex != -1 && (CMD_GET(u8, 2) & (1 << (gCurrActNum - 1))) ) { - ModelID16 model = CMD_GET(u32, 0x18); + ModelID model = CMD_GET(u32, 0x18); struct SpawnInfo *spawnInfo = alloc_only_pool_alloc(sLevelPool, sizeof(struct SpawnInfo)); vec3s_set(spawnInfo->startPos, CMD_GET(s16, 4), diff --git a/src/game/behaviors/animated_floor_switch.inc.c b/src/game/behaviors/animated_floor_switch.inc.c index e69907cf2d..05d4841122 100644 --- a/src/game/behaviors/animated_floor_switch.inc.c +++ b/src/game/behaviors/animated_floor_switch.inc.c @@ -2,7 +2,7 @@ struct FloorSwitchTriggeredAnimationFrame { const Collision *collision; - ModelID16 model; + ModelID model; }; struct FloorSwitchTriggeredAnimationFrame sFloorSwitchTriggeredAnimationFrames[][5] = { diff --git a/src/game/behaviors/bowser_puzzle_piece.inc.c b/src/game/behaviors/bowser_puzzle_piece.inc.c index efa6610691..26cebcbce3 100644 --- a/src/game/behaviors/bowser_puzzle_piece.inc.c +++ b/src/game/behaviors/bowser_puzzle_piece.inc.c @@ -43,7 +43,7 @@ static ObjAction8 sPieceActions14[] = { BOWSER_PUZZLE_PIECE_ACT_IDLE, BOWSER_PUZ BOWSER_PUZZLE_PIECE_ACT_IDLE, BOWSER_PUZZLE_PIECE_ACT_IDLE, BOWSER_PUZZLE_PIECE_ACT_IDLE, BOWSER_PUZZLE_PIECE_ACT_IDLE, BOWSER_PUZZLE_PIECE_ACT_IDLE, BOWSER_PUZZLE_PIECE_ACT_IDLE, BOWSER_PUZZLE_PIECE_ACT_IDLE , BOWSER_PUZZLE_PIECE_ACT_IDLE , BOWSER_PUZZLE_PIECE_ACT_IDLE , BOWSER_PUZZLE_PIECE_ACT_IDLE , BOWSER_PUZZLE_PIECE_ACT_IDLE , BOWSER_PUZZLE_PIECE_ACT_IDLE, -1 }; struct BowserPuzzlePiece { - ModelID8 model; + ModelID model; s8 xOffset; s8 zOffset; ObjAction8 initialAction; @@ -85,7 +85,7 @@ static struct BowserPuzzlePiece sBowserPuzzlePieces[] = { /** * Spawn a single puzzle piece. */ -void bhv_lll_bowser_puzzle_spawn_piece(ModelID16 model, const BehaviorScript *behavior, +void bhv_lll_bowser_puzzle_spawn_piece(ModelID model, const BehaviorScript *behavior, f32 xOffset, f32 zOffset, ObjAction8 initialAction, ObjAction8 *actionList) { struct Object *puzzlePiece = spawn_object(o, model, behavior); diff --git a/src/game/behaviors/fish.inc.c b/src/game/behaviors/fish.inc.c index 8d3d0adaa4..ddd2b463fa 100644 --- a/src/game/behaviors/fish.inc.c +++ b/src/game/behaviors/fish.inc.c @@ -11,7 +11,7 @@ static void fish_spawner_act_spawn(void) { s32 i; s32 schoolQuantity; - ModelID16 model; + ModelID model; f32 minDistToMario; const struct Animation *const *fishAnimation; diff --git a/src/game/behaviors/grill_door.inc.c b/src/game/behaviors/grill_door.inc.c index ee5cb18687..d3632c9848 100644 --- a/src/game/behaviors/grill_door.inc.c +++ b/src/game/behaviors/grill_door.inc.c @@ -2,7 +2,7 @@ struct OpenableGrill { s16 halfWidth; - ModelID16 modelID; + ModelID modelID; const Collision *collision; }; diff --git a/src/game/behaviors/pokey.inc.c b/src/game/behaviors/pokey.inc.c index c791056e1e..79e7ebe7ad 100644 --- a/src/game/behaviors/pokey.inc.c +++ b/src/game/behaviors/pokey.inc.c @@ -141,7 +141,7 @@ static void pokey_act_uninitialized(void) { struct Object *bodyPart; if (o->oDistanceToMario < o->oDrawingDistance) { - ModelID16 partModel = MODEL_POKEY_HEAD; + ModelID partModel = MODEL_POKEY_HEAD; s32 i; for (i = 0; i < POKEY_NUM_SEGMENTS; i++) { diff --git a/src/game/behaviors/tumbling_bridge.inc.c b/src/game/behaviors/tumbling_bridge.inc.c index d0a3e5ada6..5d7bb64089 100644 --- a/src/game/behaviors/tumbling_bridge.inc.c +++ b/src/game/behaviors/tumbling_bridge.inc.c @@ -4,7 +4,7 @@ struct TumblingBridgeParams { s16 numBridgeSections; s16 bridgeRelativeStartingXorZ; s16 platformWidth; - ModelID16 model; + ModelID model; const Collision *collision; }; diff --git a/src/game/object_helpers.c b/src/game/object_helpers.c index 82435a4f63..ac5242c62b 100644 --- a/src/game/object_helpers.c +++ b/src/game/object_helpers.c @@ -833,19 +833,19 @@ void cur_obj_get_dropped(void) { cur_obj_move_after_thrown_or_dropped(0.0f, 0.0f); } -void obj_set_model(struct Object *obj, ModelID16 modelID) { +void obj_set_model(struct Object *obj, ModelID modelID) { obj->header.gfx.sharedChild = gLoadedGraphNodes[modelID]; } -void cur_obj_set_model(ModelID16 modelID) { +void cur_obj_set_model(ModelID modelID) { o->header.gfx.sharedChild = gLoadedGraphNodes[modelID]; } -s32 obj_has_model(struct Object *obj, ModelID16 modelID) { +s32 obj_has_model(struct Object *obj, ModelID modelID) { return (obj->header.gfx.sharedChild == gLoadedGraphNodes[modelID]); } -s32 cur_obj_has_model(ModelID16 modelID) { +s32 cur_obj_has_model(ModelID modelID) { return (o->header.gfx.sharedChild == gLoadedGraphNodes[modelID]); } @@ -1258,7 +1258,7 @@ void cur_obj_set_hurtbox_radius_and_height(f32 radius, f32 height) { static void obj_spawn_loot_coins(struct Object *obj, s32 numCoins, f32 baseYVel, const BehaviorScript *coinBehavior, - s16 posJitter, ModelID16 model) { + s16 posJitter, ModelID model) { s32 i; struct Surface *floor; struct Object *coin; diff --git a/src/game/object_helpers.h b/src/game/object_helpers.h index f6858b8ab9..d395379b55 100644 --- a/src/game/object_helpers.h +++ b/src/game/object_helpers.h @@ -25,7 +25,7 @@ enum WaterDropletFlags { // Call spawn_water_droplet with this struct to spawn an object. struct WaterDropletParams { s16 flags; // Droplet spawn flags, see defines above - ModelID16 model; + ModelID model; const BehaviorScript *behavior; s16 moveAngleRange; // Only used for RAND_ANGLE_INCR flags s16 moveRange; // Only used for RAND_OFFSET flags @@ -40,7 +40,7 @@ struct WaterDropletParams { struct SpawnParticlesInfo { /*0x00*/ s8 behParam; /*0x01*/ s8 count; - /*0x02*/ ModelID16 model; + /*0x02*/ ModelID model; /*0x03*/ s8 offsetY; /*0x04*/ s8 forwardVelBase; /*0x05*/ s8 forwardVelRange; @@ -135,10 +135,10 @@ void cur_obj_set_y_vel_and_animation(f32 yVel, s32 animIndex); void cur_obj_unrender_set_action_and_anim(s32 animIndex, s32 action); void cur_obj_get_thrown_or_placed(f32 forwardVel, f32 velY, s32 thrownAction); void cur_obj_get_dropped(void); -void obj_set_model(struct Object *obj, ModelID16 modelID); -void cur_obj_set_model(ModelID16 modelID); -s32 obj_has_model(struct Object *obj, ModelID16 modelID); -s32 cur_obj_has_model(ModelID16 modelID); +void obj_set_model(struct Object *obj, ModelID modelID); +void cur_obj_set_model(ModelID modelID); +s32 obj_has_model(struct Object *obj, ModelID modelID); +s32 cur_obj_has_model(ModelID modelID); ModelID32 obj_get_model_id(struct Object *obj); void mario_set_flag(s32 flag); s32 cur_obj_clear_interact_status_flag(s32 flag); diff --git a/src/game/object_list_processor.c b/src/game/object_list_processor.c index 15a4e0e53d..cff64c6eba 100644 --- a/src/game/object_list_processor.c +++ b/src/game/object_list_processor.c @@ -179,7 +179,7 @@ s8 sObjectListUpdateOrder[] = { OBJ_LIST_SPAWNER, struct ParticleProperties { u32 particleFlag; u32 activeParticleFlag; - ModelID16 model; + ModelID model; const BehaviorScript *behavior; }; @@ -243,7 +243,7 @@ void copy_mario_state_to_object(void) { /** * Spawn a particle at gCurrentObject's location. */ -void spawn_particle(u32 activeParticleFlag, ModelID16 model, const BehaviorScript *behavior) { +void spawn_particle(u32 activeParticleFlag, ModelID model, const BehaviorScript *behavior) { if (!(gCurrentObject->oActiveParticleFlags & activeParticleFlag)) { struct Object *particle; gCurrentObject->oActiveParticleFlags |= activeParticleFlag; diff --git a/tools/migrate_load_models.py b/tools/migrate_load_models.py new file mode 100644 index 0000000000..81d9ce4cbf --- /dev/null +++ b/tools/migrate_load_models.py @@ -0,0 +1,28 @@ +import glob, os + +lfolders = [i for i in glob.glob("levels/*") if os.path.isdir(i)] + +llist = [] + +for f in lfolders: + lname = f.split("/")[-1] + llist.append(lname) + print(f"const LevelScript script_load_{lname}_models[] = {{") + sb = "" + with open(f+"/script.c") as script: + sb = script.read() + + with open(f+"/script.c", "w+") as sf: + for line in sb.split("\n"): + if "LOAD_MODEL_FROM_GEO" in line: + print(f"{line.replace("LEVEL_GEOMETRY", f"{lname}_LEVEL_GEOMETRY")}") + elif "JUMP_LINK" in line and "script_func_global" in line: + pass + else: + sf.write(f"{line}\n") + + + print(" RETURN(),") + print("};") + print() + diff --git a/tools/rename_level_objects.py b/tools/rename_level_objects.py new file mode 100644 index 0000000000..2eeec3c27d --- /dev/null +++ b/tools/rename_level_objects.py @@ -0,0 +1,37 @@ + + +mods = [ +"special_level_geo_03", +"special_level_geo_04", +"special_level_geo_05", +"special_level_geo_06", +"special_level_geo_07", +"special_level_geo_08", +"special_level_geo_09", +"special_level_geo_0A", +"special_level_geo_0B", +"special_level_geo_0C", +"special_level_geo_0D", +"special_level_geo_0E", +"special_level_geo_0F", +"special_level_geo_10", +"special_level_geo_11", +"special_level_geo_12", +"special_level_geo_13", +"special_level_geo_14", +"special_level_geo_15", +"special_level_geo_16", +] + +import glob, os + +level_folders = glob.glob("levels/**"); +lf = [i for i in level_folders if os.path.isdir(i)] + + +for i in lf: + lname = i.split("/")[-1] + for m in mods: + m_old = m + m_new = m.replace("level", f"{lname}_level") + os.system(f"git grep -rl {m_old} {i} | xargs sed -i 's|{m_old}|{m_new}|g'") From 705d5372a43b19f63a46c9d052365fd9416badf6 Mon Sep 17 00:00:00 2001 From: someone2639 Date: Fri, 7 Feb 2025 18:15:29 -0500 Subject: [PATCH 02/15] we dont need this tool --- tools/migrate_load_models.py | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 tools/migrate_load_models.py diff --git a/tools/migrate_load_models.py b/tools/migrate_load_models.py deleted file mode 100644 index 81d9ce4cbf..0000000000 --- a/tools/migrate_load_models.py +++ /dev/null @@ -1,28 +0,0 @@ -import glob, os - -lfolders = [i for i in glob.glob("levels/*") if os.path.isdir(i)] - -llist = [] - -for f in lfolders: - lname = f.split("/")[-1] - llist.append(lname) - print(f"const LevelScript script_load_{lname}_models[] = {{") - sb = "" - with open(f+"/script.c") as script: - sb = script.read() - - with open(f+"/script.c", "w+") as sf: - for line in sb.split("\n"): - if "LOAD_MODEL_FROM_GEO" in line: - print(f"{line.replace("LEVEL_GEOMETRY", f"{lname}_LEVEL_GEOMETRY")}") - elif "JUMP_LINK" in line and "script_func_global" in line: - pass - else: - sf.write(f"{line}\n") - - - print(" RETURN(),") - print("};") - print() - From a1bda08b37ca51e3788bc77ea2ffe9ef6d76d561 Mon Sep 17 00:00:00 2001 From: someone2639 Date: Fri, 7 Feb 2025 19:40:50 -0500 Subject: [PATCH 03/15] rename level specific models --- levels/bbh/script.c | 50 ++++++++--------- levels/bitdw/areas/script_vanilla.inc.c | 32 +++++------ levels/bitdw/script.c | 46 +++++++-------- levels/bitfs/areas/script_vanilla_load.inc.c | 38 ++++++------- levels/bitfs/script.c | 46 +++++++-------- levels/bits/areas/script_vanilla.inc.c | 36 ++++++------ levels/bits/script.c | 42 +++++++------- levels/bob/areas/script_vanilla.inc.c | 2 +- levels/bob/script.c | 34 +++++------ levels/bowser_1/script.c | 34 +++++------ levels/bowser_3/script.c | 12 ++-- .../areas/script_vanilla.inc.c | 4 +- levels/castle_courtyard/script.c | 4 +- .../castle_grounds/areas/script_vanilla.inc.c | 6 +- levels/castle_grounds/script.c | 54 +++++++++--------- .../castle_inside/areas/script_vanilla.inc.c | 4 +- levels/castle_inside/script.c | 14 ++--- levels/ccm/areas/script_vanilla.inc.c | 12 ++-- levels/ccm/script.c | 42 +++++++------- levels/hmc/areas/script_vanilla.inc.c | 2 +- levels/hmc/script.c | 8 +-- levels/lll/areas/script_vanilla.inc.c | 22 ++++---- levels/lll/script.c | 28 +++++----- levels/rr/areas/script_vanilla.inc.c | 40 ++++++------- levels/rr/script.c | 44 +++++++-------- levels/sl/areas/script_vanilla.inc.c | 2 +- levels/sl/script.c | 18 +++--- levels/ssl/areas/script_vanilla.inc.c | 4 +- levels/ssl/script.c | 16 +++--- levels/thi/areas/script_vanilla_load.inc.c | 6 +- levels/thi/script.c | 18 +++--- levels/totwc/areas/script_vanilla.inc.c | 2 +- levels/totwc/script.c | 44 +++++++-------- levels/ttm/areas/script_vanilla.inc.c | 38 ++++++------- levels/ttm/script.c | 56 +++++++++---------- levels/vcutm/areas/script_vanilla.inc.c | 2 +- levels/wdw/areas/script_vanilla.inc.c | 2 +- levels/wdw/script.c | 4 +- levels/wf/areas/script_vanilla_load.inc.c | 24 ++++---- levels/wf/script.c | 30 +++++----- 40 files changed, 461 insertions(+), 461 deletions(-) diff --git a/levels/bbh/script.c b/levels/bbh/script.c index ae9dee769c..bb24739c64 100644 --- a/levels/bbh/script.c +++ b/levels/bbh/script.c @@ -54,31 +54,31 @@ static const LevelScript script_bbh_macro_objects[] = { OBJECT(/*model*/ MODEL_BREAKABLE_BOX, /*pos*/ -220, -220, 6140, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvJumpingBox), OBJECT(/*model*/ MODEL_1UP, /*pos*/ -3040, 1120, 5460, /*angle*/ 0, 0, 0, /*behParam*/ (MUSHROOM_BP_REQUIRES_NONE << 16), /*beh*/ bhv1Up), // Special objects - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 0, -2457, 2099, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -1996, -2457, 205, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 1587, -2457, 205, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -2136, -204, 4527, /*angle*/ 0, 315, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 0, -2457, 4659, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 2099, 1741, 486, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 589, 1922, 1894, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 742, 1922, 1894, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -1970, 1024, 1075, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -2021, 0, 1075, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 2099, 819, 1818, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 3354, 0, 1075, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 742, 0, 2099, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 589, 0, 2099, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 2099, 0, 1459, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 179, 819, -50, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 2099, 819, 486, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 435, 0, -50, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 1613, 0, -50, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 1613, 819, -50, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -1561, 0, -1586, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -767, 819, 1408, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -767, 819, 640, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -50, 0, 640, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -50, 0, 1459, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 0, -2457, 2099, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -1996, -2457, 205, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 1587, -2457, 205, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -2136, -204, 4527, /*angle*/ 0, 315, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 0, -2457, 4659, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 2099, 1741, 486, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 589, 1922, 1894, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 742, 1922, 1894, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -1970, 1024, 1075, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -2021, 0, 1075, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 2099, 819, 1818, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 3354, 0, 1075, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 742, 0, 2099, /*angle*/ 0, 180, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 589, 0, 2099, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 2099, 0, 1459, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 179, 819, -50, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 2099, 819, 486, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 435, 0, -50, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 1613, 0, -50, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 1613, 819, -50, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -1561, 0, -1586, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -767, 819, 1408, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -767, 819, 640, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -50, 0, 640, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -50, 0, 1459, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), RETURN(), }; diff --git a/levels/bitdw/areas/script_vanilla.inc.c b/levels/bitdw/areas/script_vanilla.inc.c index 5186a5635e..bd7bffdc71 100644 --- a/levels/bitdw/areas/script_vanilla.inc.c +++ b/levels/bitdw/areas/script_vanilla.inc.c @@ -2,19 +2,19 @@ JUMP_LINK(script_func_global_12), JUMP_LINK(script_func_global_18), JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_vo_bitdw), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, geo_bitdw_0003C0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, geo_bitdw_0003D8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, geo_bitdw_0003F0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, geo_bitdw_000408), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, geo_bitdw_000420), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, geo_bitdw_000438), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, geo_bitdw_000450), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, geo_bitdw_000468), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, geo_bitdw_000480), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, geo_bitdw_000498), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, geo_bitdw_0004B0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, geo_bitdw_0004C8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, geo_bitdw_0004E0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, geo_bitdw_0004F8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, geo_bitdw_000510), -LOAD_MODEL_FROM_GEO(MODEL_BITDW_WARP_PIPE, warp_pipe_geo), +LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_03, geo_bitdw_0003C0), +LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_04, geo_bitdw_0003D8), +LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_05, geo_bitdw_0003F0), +LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_06, geo_bitdw_000408), +LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_07, geo_bitdw_000420), +LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_08, geo_bitdw_000438), +LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_09, geo_bitdw_000450), +LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_0A, geo_bitdw_000468), +LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_0B, geo_bitdw_000480), +LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_0C, geo_bitdw_000498), +LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_0D, geo_bitdw_0004B0), +LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_0E, geo_bitdw_0004C8), +LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_0F, geo_bitdw_0004E0), +LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_10, geo_bitdw_0004F8), +LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_11, geo_bitdw_000510), +LOAD_MODEL_FROM_GEO(MODEL_WARP_PIPE, warp_pipe_geo), diff --git a/levels/bitdw/script.c b/levels/bitdw/script.c index e075d4e2d6..86476ab3c9 100644 --- a/levels/bitdw/script.c +++ b/levels/bitdw/script.c @@ -79,28 +79,28 @@ static const LevelScript script_bitdw_macro_objects[] = { OBJECT(/*model*/ MODEL_BREAKABLE_BOX, /*pos*/ -3100, -3145, 4518, /*angle*/ 0, 0, 0, /*behParam*/ (BREAKABLE_BOX_BP_NO_COINS << 16), /*beh*/ bhvHiddenObject), OBJECT(/*model*/ MODEL_EXCLAMATION_BOX, /*pos*/ -2420, -1140, 3700, /*angle*/ 0, 0, 0, /*behParam*/ (EXCLAMATION_BOX_BP_1UP_RUNNING_AWAY << 16), /*beh*/ bhvExclamationBox), // Special objects - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -6368, -3972, 3883, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ -3245, -3358, 3893, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ -2405, -1228, 1740, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ -5861, -434, 306, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_07, /*pos*/ -5062, 922, -1895, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_08, /*pos*/ -7116, 717, -819, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_09, /*pos*/ -4601, 0, -312, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0A, /*pos*/ 797, -3282, 3868, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0B, /*pos*/ -2047, -1868, 3685, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ -966, 922, 44, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0D, /*pos*/ 2207, 922, 44, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -7108, 209, 356, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -7103, 844, -2088, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -6466, 9, 986, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -4013, -670, 990, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -5251, -276, 967, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -7665, 502, -251, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0F, /*pos*/ 5382, 1536, -6, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_10, /*pos*/ -1658, -3281, 3893, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_10, /*pos*/ -2656, 889, -2156, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_10, /*pos*/ -2052, 889, -928, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_11, /*pos*/ -3168, 710, 607, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_03, /*pos*/ -6368, -3972, 3883, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_04, /*pos*/ -3245, -3358, 3893, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_05, /*pos*/ -2405, -1228, 1740, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_06, /*pos*/ -5861, -434, 306, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_07, /*pos*/ -5062, 922, -1895, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_08, /*pos*/ -7116, 717, -819, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_09, /*pos*/ -4601, 0, -312, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0A, /*pos*/ 797, -3282, 3868, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0B, /*pos*/ -2047, -1868, 3685, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0C, /*pos*/ -966, 922, 44, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0D, /*pos*/ 2207, 922, 44, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0E, /*pos*/ -7108, 209, 356, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0E, /*pos*/ -7103, 844, -2088, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0E, /*pos*/ -6466, 9, 986, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0E, /*pos*/ -4013, -670, 990, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0E, /*pos*/ -5251, -276, 967, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0E, /*pos*/ -7665, 502, -251, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0F, /*pos*/ 5382, 1536, -6, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_10, /*pos*/ -1658, -3281, 3893, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_10, /*pos*/ -2656, 889, -2156, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_10, /*pos*/ -2052, 889, -928, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_11, /*pos*/ -3168, 710, 607, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; @@ -140,7 +140,7 @@ const LevelScript level_bitdw_entry[] = { AREA(/*index*/ 1, geo_bitdw_000618), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -7443, -2153, 3886, /*angle*/ 0, 90, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvAirborneWarp), - OBJECT(/*model*/ MODEL_BITDW_WARP_PIPE, /*pos*/ 6816, 2860, -7, /*angle*/ 0, 0, 0, /*behParam*/ 0x000B0000, /*beh*/ bhvWarpPipe), + OBJECT(/*model*/ MODEL_WARP_PIPE, /*pos*/ 6816, 2860, -7, /*angle*/ 0, 0, 0, /*behParam*/ 0x000B0000, /*beh*/ bhvWarpPipe), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 5910, 3500, -7, /*angle*/ 0, 90, 0, /*behParam*/ 0x000C0000, /*beh*/ bhvDeathWarp), WARP_NODE(/*id*/ 0x0A, /*destLevel*/ LEVEL_BITDW, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0x0B, /*destLevel*/ LEVEL_BOWSER_1, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), diff --git a/levels/bitfs/areas/script_vanilla_load.inc.c b/levels/bitfs/areas/script_vanilla_load.inc.c index 8abc50dd90..120e2f6c42 100644 --- a/levels/bitfs/areas/script_vanilla_load.inc.c +++ b/levels/bitfs/areas/script_vanilla_load.inc.c @@ -2,22 +2,22 @@ JUMP_LINK(script_func_global_3), JUMP_LINK(script_func_global_18), JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_vo_bitfs), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, bitfs_geo_0004B0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, bitfs_geo_0004C8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, bitfs_geo_0004E0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, bitfs_geo_0004F8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, bitfs_geo_000510), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, bitfs_geo_000528), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, bitfs_geo_000540), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, bitfs_geo_000558), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, bitfs_geo_000570), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, bitfs_geo_000588), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, bitfs_geo_0005A0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, bitfs_geo_0005B8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, bitfs_geo_0005D0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, bitfs_geo_0005E8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, bitfs_geo_000600), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, bitfs_geo_000618), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_13, bitfs_geo_000630), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_14, bitfs_geo_000648), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_15, bitfs_geo_000660), +LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_03, bitfs_geo_0004B0), +LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_04, bitfs_geo_0004C8), +LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_05, bitfs_geo_0004E0), +LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_06, bitfs_geo_0004F8), +LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_07, bitfs_geo_000510), +LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_08, bitfs_geo_000528), +LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_09, bitfs_geo_000540), +LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_0A, bitfs_geo_000558), +LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_0B, bitfs_geo_000570), +LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_0C, bitfs_geo_000588), +LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_0D, bitfs_geo_0005A0), +LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_0E, bitfs_geo_0005B8), +LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_0F, bitfs_geo_0005D0), +LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_10, bitfs_geo_0005E8), +LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_11, bitfs_geo_000600), +LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_12, bitfs_geo_000618), +LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_13, bitfs_geo_000630), +LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_14, bitfs_geo_000648), +LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_15, bitfs_geo_000660), diff --git a/levels/bitfs/script.c b/levels/bitfs/script.c index afceff0378..34a6bb8242 100644 --- a/levels/bitfs/script.c +++ b/levels/bitfs/script.c @@ -59,29 +59,29 @@ static const LevelScript script_bitfs_macro_objects[] = { OBJECT(/*model*/ MODEL_AMP, /*pos*/ -2325, 3625, 0, /*angle*/ 0, 0, 0, /*behParam*/ (2 << 16), /*beh*/ bhvCirclingAmp), OBJECT(/*model*/ MODEL_EXCLAMATION_BOX, /*pos*/ -5340, 4000, 100, /*angle*/ 0, 0, 0, /*behParam*/ (EXCLAMATION_BOX_BP_COINS_10 << 16), /*beh*/ bhvExclamationBox), // Special objects - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -5938, -3071, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ -5488, -1535, 41, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 4342, 1741, 41, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ -1965, -3030, 10, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ -1996, 3277, -19, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ -4914, 0, -19, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_07, /*pos*/ 1843, -3071, -398, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_08, /*pos*/ 4659, -1663, 307, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_09, /*pos*/ 3123, -511, 307, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0A, /*pos*/ 1382, 0, -6, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0B, /*pos*/ 1229, 205, -410, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0B, /*pos*/ -3225, 3482, -825, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0B, /*pos*/ -1381, 3482, -821, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ -1433, 717, -127, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0D, /*pos*/ -741, 589, 307, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -5017, 205, 310, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0F, /*pos*/ -6297, 3251, 1, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_10, /*pos*/ -4556, 3482, 97, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_11, /*pos*/ 1946, 4506, 96, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_12, /*pos*/ 1946, 4352, 96, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_13, /*pos*/ 6540, 3796, 83, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_14, /*pos*/ 6740, 4224, 74, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_15, /*pos*/ 3123, 3277, -19, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_03, /*pos*/ -5938, -3071, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_04, /*pos*/ -5488, -1535, 41, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_04, /*pos*/ 4342, 1741, 41, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_05, /*pos*/ -1965, -3030, 10, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_06, /*pos*/ -1996, 3277, -19, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_06, /*pos*/ -4914, 0, -19, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_07, /*pos*/ 1843, -3071, -398, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_08, /*pos*/ 4659, -1663, 307, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_09, /*pos*/ 3123, -511, 307, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_0A, /*pos*/ 1382, 0, -6, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_0B, /*pos*/ 1229, 205, -410, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_0B, /*pos*/ -3225, 3482, -825, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_0B, /*pos*/ -1381, 3482, -821, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_0C, /*pos*/ -1433, 717, -127, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_0D, /*pos*/ -741, 589, 307, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_0E, /*pos*/ -5017, 205, 310, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_0F, /*pos*/ -6297, 3251, 1, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_10, /*pos*/ -4556, 3482, 97, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_11, /*pos*/ 1946, 4506, 96, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_12, /*pos*/ 1946, 4352, 96, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_13, /*pos*/ 6540, 3796, 83, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_14, /*pos*/ 6740, 4224, 74, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_15, /*pos*/ 3123, 3277, -19, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; diff --git a/levels/bits/areas/script_vanilla.inc.c b/levels/bits/areas/script_vanilla.inc.c index f0b13d2205..1a4a5eb918 100644 --- a/levels/bits/areas/script_vanilla.inc.c +++ b/levels/bits/areas/script_vanilla.inc.c @@ -1,22 +1,22 @@ JUMP_LINK(script_func_global_15), JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_vo_bits), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, bits_geo_000430), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, bits_geo_000448), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, bits_geo_000460), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, bits_geo_000478), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, bits_geo_000490), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, bits_geo_0004A8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, bits_geo_0004C0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, bits_geo_0004D8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, bits_geo_0004F0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, bits_geo_000508), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, bits_geo_000520), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, bits_geo_000538), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, bits_geo_000550), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, bits_geo_000568), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, bits_geo_000580), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, bits_geo_000598), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_13, bits_geo_0005B0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_14, bits_geo_0005C8), +LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_03, bits_geo_000430), +LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_04, bits_geo_000448), +LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_05, bits_geo_000460), +LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_06, bits_geo_000478), +LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_07, bits_geo_000490), +LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_08, bits_geo_0004A8), +LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_09, bits_geo_0004C0), +LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_0A, bits_geo_0004D8), +LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_0B, bits_geo_0004F0), +LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_0C, bits_geo_000508), +LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_0D, bits_geo_000520), +LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_0E, bits_geo_000538), +LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_0F, bits_geo_000550), +LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_10, bits_geo_000568), +LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_11, bits_geo_000580), +LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_12, bits_geo_000598), +LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_13, bits_geo_0005B0), +LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_14, bits_geo_0005C8), LOAD_MODEL_FROM_GEO(MODEL_BITS_WARP_PIPE, warp_pipe_geo), diff --git a/levels/bits/script.c b/levels/bits/script.c index f24503d878..3b547ed212 100644 --- a/levels/bits/script.c +++ b/levels/bits/script.c @@ -75,27 +75,27 @@ static const LevelScript script_bits_macro_objects[] = { OBJECT(/*model*/ MODEL_BOWLING_BALL, /*pos*/ -2656, -2442, -800, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFireSpitter), OBJECT(/*model*/ MODEL_EXCLAMATION_BOX, /*pos*/ 4100, -1050, -1800, /*angle*/ 0, 0, 0, /*behParam*/ (EXCLAMATION_BOX_BP_1UP_RUNNING_AWAY << 16), /*beh*/ bhvExclamationBox), // Special objects - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -4505, -5119, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ -2291, -2073, -762, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ 3891, -3276, -705, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ 1753, -1986, -531, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_07, /*pos*/ -5414, -1330, -787, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_07, /*pos*/ -3182, 2059, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_08, /*pos*/ -3182, 1854, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_08, /*pos*/ 759, 5628, -1008, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_09, /*pos*/ -4902, -895, -1171, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0A, /*pos*/ -3882, -357, -1241, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0B, /*pos*/ -1199, -387, -1308, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ 5584, 2735, -1851, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0D, /*pos*/ -5248, 3800, -895, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0D, /*pos*/ -1356, 3800, -895, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -6459, 3800, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0F, /*pos*/ -930, 2884, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_10, /*pos*/ 2486, -438, -899, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_11, /*pos*/ 563, 2249, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_12, /*pos*/ -6459, 2039, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_13, /*pos*/ 1143, 4670, -494, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_14, /*pos*/ 349, 6268, -4054, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_03, /*pos*/ -4505, -5119, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_04, /*pos*/ -2291, -2073, -762, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_05, /*pos*/ 3891, -3276, -705, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_06, /*pos*/ 1753, -1986, -531, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_07, /*pos*/ -5414, -1330, -787, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_07, /*pos*/ -3182, 2059, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_08, /*pos*/ -3182, 1854, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_08, /*pos*/ 759, 5628, -1008, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_09, /*pos*/ -4902, -895, -1171, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_0A, /*pos*/ -3882, -357, -1241, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_0B, /*pos*/ -1199, -387, -1308, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_0C, /*pos*/ 5584, 2735, -1851, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_0D, /*pos*/ -5248, 3800, -895, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_0D, /*pos*/ -1356, 3800, -895, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_0E, /*pos*/ -6459, 3800, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_0F, /*pos*/ -930, 2884, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_10, /*pos*/ 2486, -438, -899, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_11, /*pos*/ 563, 2249, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_12, /*pos*/ -6459, 2039, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_13, /*pos*/ 1143, 4670, -494, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_14, /*pos*/ 349, 6268, -4054, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; diff --git a/levels/bob/areas/script_vanilla.inc.c b/levels/bob/areas/script_vanilla.inc.c index 5f50c94e1c..60a0d7f805 100644 --- a/levels/bob/areas/script_vanilla.inc.c +++ b/levels/bob/areas/script_vanilla.inc.c @@ -2,4 +2,4 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_4), JUMP_LINK(script_func_global_15), JUMP_LINK(script_func_vo_bob), -LOAD_MODEL_FROM_GEO(MODEL_BOB_BUBBLY_TREE, bubbly_tree_geo), +LOAD_MODEL_FROM_GEO(MODEL_BUBBLY_TREE, bubbly_tree_geo), diff --git a/levels/bob/script.c b/levels/bob/script.c index 1effa77486..30e01ff177 100644 --- a/levels/bob/script.c +++ b/levels/bob/script.c @@ -108,23 +108,23 @@ static const LevelScript script_bob_macro_objects[] = { OBJECT(/*model*/ MODEL_YELLOW_COIN, /*pos*/ -300, 4200, 1250, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvYellowCoin), OBJECT(/*model*/ MODEL_BREAKABLE_BOX, /*pos*/ -6800, 1024, 40, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBreakableBoxSmall), // Special objects - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -5792, 1024, -4654, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -1509, 144, 5094, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -4095, 768, 3072, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -5119, 768, 2048, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 5444, 863, 6016, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -6655, 768, 3584, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -6130, 900, -6507, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -6804, 1024, -4866, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 6033, 2194, -7660, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -4095, 768, 1536, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -4268, 0, 4768, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -3583, 768, 2560, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -6172, 1024, -430, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 4096, 3072, 1638, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 6799, 2008, -5587, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 2911, 768, 5917, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 4208, 927, 3772, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -5792, 1024, -4654, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -1509, 144, 5094, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -4095, 768, 3072, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -5119, 768, 2048, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 5444, 863, 6016, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -6655, 768, 3584, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -6130, 900, -6507, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -6804, 1024, -4866, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 6033, 2194, -7660, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -4095, 768, 1536, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -4268, 0, 4768, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -3583, 768, 2560, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -6172, 1024, -430, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 4096, 3072, 1638, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 6799, 2008, -5587, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 2911, 768, 5917, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 4208, 927, 3772, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), RETURN(), }; diff --git a/levels/bowser_1/script.c b/levels/bowser_1/script.c index 11a4227590..386f11d4dd 100644 --- a/levels/bowser_1/script.c +++ b/levels/bowser_1/script.c @@ -24,22 +24,22 @@ static const LevelScript script_bowser_1_macro_objects[] = { OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ 0, 589, 2949, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBowserBomb), OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ -2949, 589, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBowserBomb), OBJECT(/*model*/ MODEL_BOWSER, /*pos*/ 0, 300, -1000, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBowser), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 0, 384, 3072, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -2171, 384, -2171, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 0, 384, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -3071, 384, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -2171, 384, 2172, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -2621, 384, 1086, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 2172, 384, 2172, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 3072, 384, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 2172, 384, -2171, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -1085, 384, 2622, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 2622, 384, 1086, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -2621, 384, -1085, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -1085, 384, -2621, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 1086, 384, -2621, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 2622, 384, -1085, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 1086, 384, 2622, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ 0, 384, 3072, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ -2171, 384, -2171, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ 0, 384, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ -3071, 384, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ -2171, 384, 2172, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ -2621, 384, 1086, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ 2172, 384, 2172, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ 3072, 384, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ 2172, 384, -2171, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ -1085, 384, 2622, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ 2622, 384, 1086, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ -2621, 384, -1085, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ -1085, 384, -2621, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ 1086, 384, -2621, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ 2622, 384, -1085, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ 1086, 384, 2622, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; @@ -52,7 +52,7 @@ const LevelScript level_bowser_1_entry[] = { ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), JUMP_LINK(script_func_global_13), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, bowser_1_yellow_sphere_geo), + LOAD_MODEL_FROM_GEO(MODEL_bowser_1_LEVEL_GEOMETRY_03, bowser_1_yellow_sphere_geo), AREA(/*index*/ 1, bowser_1_geo_0000D0), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, 1307, 0, /*angle*/ 0, 180, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneCircleWarp), diff --git a/levels/bowser_3/script.c b/levels/bowser_3/script.c index 014de8f946..823ec6a520 100644 --- a/levels/bowser_3/script.c +++ b/levels/bowser_3/script.c @@ -19,11 +19,11 @@ static const LevelScript script_bowser_3_macro_objects[] = { // Special objects OBJECT(/*model*/ MODEL_BOWSER, /*pos*/ 13, 307, -1024, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBowser), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -3362, -204, 1121, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 0, -204, 3584, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 3362, -204, 1126, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 2123, -204, -2912, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -2122, -204, -2912, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_3_LEVEL_GEOMETRY_03, /*pos*/ -3362, -204, 1121, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_3_LEVEL_GEOMETRY_03, /*pos*/ 0, -204, 3584, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_3_LEVEL_GEOMETRY_03, /*pos*/ 3362, -204, 1126, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_3_LEVEL_GEOMETRY_03, /*pos*/ 2123, -204, -2912, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_bowser_3_LEVEL_GEOMETRY_03, /*pos*/ -2122, -204, -2912, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; @@ -65,7 +65,7 @@ const LevelScript level_bowser_3_entry[] = { LOAD_MODEL_FROM_GEO(MODEL_BOWSER_3_FALLING_PLATFORM_8, bowser_3_geo_000338), LOAD_MODEL_FROM_GEO(MODEL_BOWSER_3_FALLING_PLATFORM_9, bowser_3_geo_000350), LOAD_MODEL_FROM_GEO(MODEL_BOWSER_3_FALLING_PLATFORM_10, bowser_3_geo_000368), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, bowser_3_geo_000380), + LOAD_MODEL_FROM_GEO(MODEL_bowser_3_LEVEL_GEOMETRY_03, bowser_3_geo_000380), AREA(/*index*/ 1, bowser_3_geo_000398), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, 1307, 0, /*angle*/ 0, 183, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneCircleWarp), diff --git a/levels/castle_courtyard/areas/script_vanilla.inc.c b/levels/castle_courtyard/areas/script_vanilla.inc.c index c26f8c5713..17956b0ee1 100644 --- a/levels/castle_courtyard/areas/script_vanilla.inc.c +++ b/levels/castle_courtyard/areas/script_vanilla.inc.c @@ -1,5 +1,5 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_10), LOAD_MODEL_FROM_GEO(MODEL_COURTYARD_SPIKY_TREE, spiky_tree_geo), -LOAD_MODEL_FROM_GEO(MODEL_COURTYARD_WOODEN_DOOR, wooden_door_geo), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, castle_courtyard_geo_000200), +LOAD_MODEL_FROM_GEO(MODEL_WOODEN_DOOR, wooden_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_castle_courtyard_LEVEL_GEOMETRY_03, castle_courtyard_geo_000200), diff --git a/levels/castle_courtyard/script.c b/levels/castle_courtyard/script.c index 4a9a560b69..e6469e7030 100644 --- a/levels/castle_courtyard/script.c +++ b/levels/castle_courtyard/script.c @@ -24,7 +24,7 @@ static const LevelScript script_castle_courtyard_macro_objects[] = { OBJECT(/*model*/ MODEL_WOODEN_SIGNPOST, /*pos*/ 300, 0, -3600, /*angle*/ 0, 0, 0, /*behParam*/ (DIALOG_102 << 16), /*beh*/ bhvMessagePanel), OBJECT(/*model*/ MODEL_WOODEN_SIGNPOST, /*pos*/ -300, 0, -3600, /*angle*/ 0, 0, 0, /*behParam*/ (DIALOG_160 << 16), /*beh*/ bhvMessagePanel), // Special objects - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 0, 2048, 2662, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_castle_courtyard_LEVEL_GEOMETRY_03, /*pos*/ 0, 2048, 2662, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), OBJECT(/*model*/ MODEL_COURTYARD_SPIKY_TREE, /*pos*/ 2272, -214, -1432, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), OBJECT(/*model*/ MODEL_COURTYARD_SPIKY_TREE, /*pos*/ 818, 10, 203, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), OBJECT(/*model*/ MODEL_COURTYARD_SPIKY_TREE, /*pos*/ -820, 10, 201, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), @@ -41,7 +41,7 @@ static const LevelScript script_castle_courtyard_macro_objects[] = { OBJECT(/*model*/ MODEL_COURTYARD_SPIKY_TREE, /*pos*/ -2446, -214, -1786, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), OBJECT(/*model*/ MODEL_COURTYARD_SPIKY_TREE, /*pos*/ -2820, -214, -1317, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), OBJECT(/*model*/ MODEL_COURTYARD_SPIKY_TREE, /*pos*/ -1868, -214, -45, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR, /*pos*/ 0, 0, 461, /*angle*/ 0, 0, 0, /*behParam*/ (1 << 16), /*beh*/ bhvDoorWarp), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 0, 0, 461, /*angle*/ 0, 0, 0, /*behParam*/ (1 << 16), /*beh*/ bhvDoorWarp), RETURN(), }; diff --git a/levels/castle_grounds/areas/script_vanilla.inc.c b/levels/castle_grounds/areas/script_vanilla.inc.c index def29732cf..27d664f4e4 100644 --- a/levels/castle_grounds/areas/script_vanilla.inc.c +++ b/levels/castle_grounds/areas/script_vanilla.inc.c @@ -2,8 +2,8 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_11), JUMP_LINK(script_func_global_16), JUMP_LINK(script_func_vo_castle_grounds), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, castle_grounds_geo_0006F4), -LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_BUBBLY_TREE, bubbly_tree_geo), -LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_WARP_PIPE, warp_pipe_geo), +LOAD_MODEL_FROM_GEO(MODEL_castle_grounds_LEVEL_GEOMETRY_03, castle_grounds_geo_0006F4), +LOAD_MODEL_FROM_GEO(MODEL_BUBBLY_TREE, bubbly_tree_geo), +LOAD_MODEL_FROM_GEO(MODEL_WARP_PIPE, warp_pipe_geo), LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_CASTLE_DOOR, castle_door_geo), LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_METAL_DOOR, metal_door_geo), diff --git a/levels/castle_grounds/script.c b/levels/castle_grounds/script.c index c3ccd49eeb..668a284343 100644 --- a/levels/castle_grounds/script.c +++ b/levels/castle_grounds/script.c @@ -37,33 +37,33 @@ static const LevelScript script_castle_grounds_macro_objects[] = { OBJECT(/*model*/ MODEL_BUTTERFLY, /*pos*/ -6240, 295, 320, /*angle*/ 0, 0, 0, /*behParam*/ (TRIPLET_BUTTERFLY_BP_NO_BOMBS << 16), /*beh*/ bhvTripletButterfly), OBJECT(/*model*/ MODEL_BUTTERFLY, /*pos*/ 6330, 710, -3760, /*angle*/ 0, 0, 0, /*behParam*/ (TRIPLET_BUTTERFLY_BP_NO_BOMBS << 16), /*beh*/ bhvTripletButterfly), // Special objects - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 0, 2867, -3924, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -1333, 711, 1881, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -6220, 468, 3458, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -5069, 350, 3221, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -2566, 438, 2626, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -1900, 401, 2868, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 6399, 494, -1680, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 767, 498, 2598, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 1476, 189, 3280, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 3153, 206, 469, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 6178, 219, 167, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -6510, 260, 1411, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 5457, 528, -3259, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 5868, 698, -4453, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 6408, 869, -5314, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -4711, 342, 433, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 1132, 365, 1977, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -5506, 364, -661, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -6269, 402, -2145, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -5600, 440, -2627, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 1919, 268, 1157, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -5957, 517, -3447, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -2021, 633, 1468, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -109, 613, 3008, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 5774, 413, -1114, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 5954, 526, -2846, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ -5204, 296, 811, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_castle_grounds_LEVEL_GEOMETRY_03, /*pos*/ 0, 2867, -3924, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -1333, 711, 1881, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -6220, 468, 3458, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -5069, 350, 3221, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -2566, 438, 2626, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -1900, 401, 2868, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 6399, 494, -1680, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 767, 498, 2598, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 1476, 189, 3280, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 3153, 206, 469, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 6178, 219, 167, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -6510, 260, 1411, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 5457, 528, -3259, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 5868, 698, -4453, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 6408, 869, -5314, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -4711, 342, 433, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 1132, 365, 1977, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -5506, 364, -661, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -6269, 402, -2145, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -5600, 440, -2627, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 1919, 268, 1157, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -5957, 517, -3447, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -2021, 633, 1468, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -109, 613, 3008, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 5774, 413, -1114, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 5954, 526, -2846, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -5204, 296, 811, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), OBJECT(/*model*/ MODEL_CASTLE_METAL_DOOR, /*pos*/ 3292, -511, -2931, /*angle*/ 0, 225, 0, /*behParam*/ (2 << 16), /*beh*/ bhvDoorWarp), OBJECT(/*model*/ MODEL_CASTLE_CASTLE_DOOR, /*pos*/ -76, 803, -3155, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 16), /*beh*/ bhvDoorWarp), OBJECT(/*model*/ MODEL_CASTLE_CASTLE_DOOR, /*pos*/ 77, 803, -3155, /*angle*/ 0, 180, 0, /*behParam*/ (1 << 16), /*beh*/ bhvDoorWarp), diff --git a/levels/castle_inside/areas/script_vanilla.inc.c b/levels/castle_inside/areas/script_vanilla.inc.c index 0312b79549..3321f116e8 100644 --- a/levels/castle_inside/areas/script_vanilla.inc.c +++ b/levels/castle_inside/areas/script_vanilla.inc.c @@ -1,10 +1,10 @@ JUMP_LINK(script_func_global_16), JUMP_LINK(script_func_vo_castle_inside), LOAD_MODEL_FROM_GEO(MODEL_CASTLE_CASTLE_DOOR, castle_door_geo), -LOAD_MODEL_FROM_GEO(MODEL_CASTLE_WOODEN_DOOR, wooden_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_WOODEN_DOOR, wooden_door_geo), LOAD_MODEL_FROM_GEO(MODEL_CASTLE_METAL_DOOR, metal_door_geo), LOAD_MODEL_FROM_GEO(MODEL_CASTLE_CASTLE_DOOR_UNUSED, castle_door_geo), -LOAD_MODEL_FROM_GEO(MODEL_CASTLE_WOODEN_DOOR_UNUSED, wooden_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_WOODEN_DOOR, wooden_door_geo), LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR_0_STARS, castle_door_0_star_geo), LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR_1_STAR, castle_door_1_star_geo), LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR_3_STARS, castle_door_3_stars_geo), diff --git a/levels/castle_inside/script.c b/levels/castle_inside/script.c index d29ceed281..f604d6e170 100644 --- a/levels/castle_inside/script.c +++ b/levels/castle_inside/script.c @@ -32,11 +32,11 @@ static const LevelScript script_inside_castle_area_1_macro_objects[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ 2005, 800, -1694, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvHidden1upTrigger), OBJECT(/*model*/ MODEL_1UP, /*pos*/ 2036, 800, -1673, /*angle*/ 0, 0, 0, /*behParam*/ (1 << 16), /*beh*/ bhvHidden1up), // Special objects - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -271, 0, -824, /*angle*/ 0, 45, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -1775, 0, -824, /*angle*/ 0, 315, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -271, 0, -824, /*angle*/ 0, 45, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -1775, 0, -824, /*angle*/ 0, 315, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), OBJECT(/*model*/ MODEL_CASTLE_CASTLE_DOOR, /*pos*/ -1100, 0, 2202, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 16), /*beh*/ bhvDoorWarp), OBJECT(/*model*/ MODEL_CASTLE_CASTLE_DOOR, /*pos*/ -946, 0, 2202, /*angle*/ 0, 180, 0, /*behParam*/ (1 << 16), /*beh*/ bhvDoorWarp), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR, /*pos*/ -1023, -101, -5170, /*angle*/ 0, 0, 0, /*behParam*/ (2 << 16), /*beh*/ bhvDoorWarp), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -1023, -101, -5170, /*angle*/ 0, 0, 0, /*behParam*/ (2 << 16), /*beh*/ bhvDoorWarp), OBJECT(/*model*/ MODEL_CASTLE_DOOR_0_STARS, /*pos*/ -3122, 205, -793, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), OBJECT(/*model*/ MODEL_CASTLE_DOOR_1_STAR, /*pos*/ 256, 0, -1074, /*angle*/ 0, 0, 0, /*behParam*/ (1 << 24), /*beh*/ bhvDoor), OBJECT(/*model*/ MODEL_CASTLE_DOOR_1_STAR, /*pos*/ 644, 614, -1476, /*angle*/ 0, 315, 0, /*behParam*/ (1 << 24), /*beh*/ bhvDoor), @@ -52,7 +52,7 @@ static const LevelScript script_inside_castle_area_2_macro_objects[] = { OBJECT(/*model*/ MODEL_CASTLE_DOOR_0_STARS, /*pos*/ -2695, 1203, 1828, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), OBJECT(/*model*/ MODEL_CASTLE_DOOR_0_STARS, /*pos*/ 6994, 1203, 1828, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), OBJECT(/*model*/ MODEL_CASTLE_DOOR_0_STARS, /*pos*/ 1670, 1203, 1828, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -997, 1203, 1178, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -997, 1203, 1178, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), RETURN(), }; @@ -65,9 +65,9 @@ static const LevelScript script_inside_castle_area_3_macro_objects[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ 3515, -2508, -92, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvHidden1upTrigger), OBJECT(/*model*/ MODEL_1UP, /*pos*/ 2861, -2508, -515, /*angle*/ 0, 0, 0, /*behParam*/ (4 << 16), /*beh*/ bhvHidden1up), // Special objects - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -3097, -1279, 1434, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -332, -767, 205, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 717, -1177, -869, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -3097, -1279, 1434, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -332, -767, 205, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 717, -1177, -869, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), OBJECT(/*model*/ MODEL_CASTLE_DOOR_0_STARS, /*pos*/ 1126, -1074, -2661, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), OBJECT(/*model*/ MODEL_CASTLE_METAL_DOOR, /*pos*/ 7885, -1586, -511, /*angle*/ 0, 270, 0, /*behParam*/ (2 << 16), /*beh*/ bhvDoorWarp), RETURN(), diff --git a/levels/ccm/areas/script_vanilla.inc.c b/levels/ccm/areas/script_vanilla.inc.c index 5fa055b9be..2ec5282af9 100644 --- a/levels/ccm/areas/script_vanilla.inc.c +++ b/levels/ccm/areas/script_vanilla.inc.c @@ -2,10 +2,10 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_8), JUMP_LINK(script_func_global_17), JUMP_LINK(script_func_vo_ccm), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, ccm_geo_00042C), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, ccm_geo_00045C), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, ccm_geo_000494), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, ccm_geo_0004BC), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, ccm_geo_0004E4), +LOAD_MODEL_FROM_GEO(MODEL_ccm_LEVEL_GEOMETRY_03, ccm_geo_00042C), +LOAD_MODEL_FROM_GEO(MODEL_ccm_LEVEL_GEOMETRY_04, ccm_geo_00045C), +LOAD_MODEL_FROM_GEO(MODEL_ccm_LEVEL_GEOMETRY_05, ccm_geo_000494), +LOAD_MODEL_FROM_GEO(MODEL_ccm_LEVEL_GEOMETRY_06, ccm_geo_0004BC), +LOAD_MODEL_FROM_GEO(MODEL_ccm_LEVEL_GEOMETRY_07, ccm_geo_0004E4), LOAD_MODEL_FROM_GEO(MODEL_CCM_CABIN_DOOR, cabin_door_geo), -LOAD_MODEL_FROM_GEO(MODEL_CCM_SNOW_TREE, snow_tree_geo), +LOAD_MODEL_FROM_GEO(MODEL_SNOW_TREE, snow_tree_geo), diff --git a/levels/ccm/script.c b/levels/ccm/script.c index d29107e88e..fbb0a8afec 100644 --- a/levels/ccm/script.c +++ b/levels/ccm/script.c @@ -57,26 +57,26 @@ static const LevelScript script_ccm_area_1_macro_objects[] = { OBJECT(/*model*/ MODEL_EXCLAMATION_BOX, /*pos*/ -4887, -1300, -4003, /*angle*/ 0, 0, 0, /*behParam*/ (EXCLAMATION_BOX_BP_1UP_RUNNING_AWAY << 16), /*beh*/ bhvExclamationBox), OBJECT(/*model*/ MODEL_EXCLAMATION_BOX, /*pos*/ -1557, -205, 1794, /*angle*/ 0, 0, 0, /*behParam*/ (EXCLAMATION_BOX_BP_1UP_RUNNING_AWAY << 16), /*beh*/ bhvExclamationBox), // Special objects - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -409, 2765, -1637, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 2355, -4095, 4096, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ -4210, -1446, 1874, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ 2560, 2560, -1023, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ -818, 102, 2048, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_07, /*pos*/ -511, -3071, -3583, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ -5201, -1740, 2994, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ 1989, -4607, 4949, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ 1248, -4607, 5474, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ -5508, -1740, 4148, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ -4576, -1740, 4814, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ -488, 2560, -2305, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ -5892, -1740, 811, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ -3748, -4607, 4464, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ 2237, 2560, -1630, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ 2885, 2560, -1638, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ -1146, -3583, 5919, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ -1768, 2560, -1793, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ -3443, 807, -2713, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR, /*pos*/ 2464, -4607, 4302, /*angle*/ 0, 222, 0, /*behParam*/ (20 << 16), /*beh*/ bhvDoorWarp), + OBJECT(/*model*/ MODEL_ccm_LEVEL_GEOMETRY_03, /*pos*/ -409, 2765, -1637, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ccm_LEVEL_GEOMETRY_04, /*pos*/ 2355, -4095, 4096, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ccm_LEVEL_GEOMETRY_05, /*pos*/ -4210, -1446, 1874, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ccm_LEVEL_GEOMETRY_05, /*pos*/ 2560, 2560, -1023, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ccm_LEVEL_GEOMETRY_06, /*pos*/ -818, 102, 2048, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ccm_LEVEL_GEOMETRY_07, /*pos*/ -511, -3071, -3583, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ -5201, -1740, 2994, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ 1989, -4607, 4949, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ 1248, -4607, 5474, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ -5508, -1740, 4148, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ -4576, -1740, 4814, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ -488, 2560, -2305, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ -5892, -1740, 811, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ -3748, -4607, 4464, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ 2237, 2560, -1630, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ 2885, 2560, -1638, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ -1146, -3583, 5919, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ -1768, 2560, -1793, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ -3443, 807, -2713, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + // OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 2464, -4607, 4302, /*angle*/ 0, 222, 0, /*behParam*/ (20 << 16), /*beh*/ bhvDoorWarp), RETURN(), }; @@ -124,7 +124,7 @@ static const LevelScript script_ccm_area_2_macro_objects[] = { OBJECT(/*model*/ MODEL_1UP, /*pos*/ -4890, 1452, 552, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhv1upSliding), OBJECT(/*model*/ MODEL_1UP, /*pos*/ -6369, -1538, 3726, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhv1upSliding), // Special objects - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR, /*pos*/ -7628, -5836, -6988, /*angle*/ 0, 90, 0, /*behParam*/ (20 << 16), /*beh*/ bhvDoorWarp), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -7628, -5836, -6988, /*angle*/ 0, 90, 0, /*behParam*/ (20 << 16), /*beh*/ bhvDoorWarp), RETURN(), }; diff --git a/levels/hmc/areas/script_vanilla.inc.c b/levels/hmc/areas/script_vanilla.inc.c index 8bcfe24f3b..98f14a44ad 100644 --- a/levels/hmc/areas/script_vanilla.inc.c +++ b/levels/hmc/areas/script_vanilla.inc.c @@ -2,6 +2,6 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_7), JUMP_LINK(script_func_global_18), JUMP_LINK(script_func_vo_hmc), -LOAD_MODEL_FROM_GEO(MODEL_HMC_WOODEN_DOOR, wooden_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_WOODEN_DOOR, wooden_door_geo), LOAD_MODEL_FROM_GEO(MODEL_HMC_METAL_DOOR, metal_door_geo), LOAD_MODEL_FROM_GEO(MODEL_HMC_HAZY_MAZE_DOOR, hazy_maze_door_geo), diff --git a/levels/hmc/script.c b/levels/hmc/script.c index 7056af0304..09a49be4e0 100644 --- a/levels/hmc/script.c +++ b/levels/hmc/script.c @@ -104,10 +104,10 @@ static const LevelScript script_hmc_macro_objects[] = { OBJECT(/*model*/ MODEL_BOWLING_BALL, /*pos*/ 2500, -380, -7740, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFireSpitter), OBJECT(/*model*/ MODEL_EXCLAMATION_BOX, /*pos*/ -2700, 2100, -6400, /*angle*/ 0, 0, 0, /*behParam*/ (EXCLAMATION_BOX_BP_1UP_RUNNING_AWAY << 16), /*beh*/ bhvExclamationBox), // Special objects - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 922, -4689, 2330, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ -3586, 1536, 647, /*angle*/ 0, 26, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 5911, -204, 870, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_WOODEN_DOOR_UNUSED, /*pos*/ 3817, 205, 870, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 922, -4689, 2330, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -3586, 1536, 647, /*angle*/ 0, 26, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 5911, -204, 870, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 3817, 205, 870, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), OBJECT(/*model*/ MODEL_HMC_METAL_DOOR, /*pos*/ 1127, -409, -4709, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), OBJECT(/*model*/ MODEL_HMC_METAL_DOOR, /*pos*/ -468, -4279, 6711, /*angle*/ 0, 45, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), OBJECT(/*model*/ MODEL_HMC_METAL_DOOR, /*pos*/ -359, -4279, 6602, /*angle*/ 0, 225, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), diff --git a/levels/lll/areas/script_vanilla.inc.c b/levels/lll/areas/script_vanilla.inc.c index ee587e90ad..b3e1650c07 100644 --- a/levels/lll/areas/script_vanilla.inc.c +++ b/levels/lll/areas/script_vanilla.inc.c @@ -2,14 +2,14 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_3), JUMP_LINK(script_func_global_18), JUMP_LINK(script_func_vo_lll), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, lll_geo_0009E0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, lll_geo_0009F8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, lll_geo_000A10), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, lll_geo_000A28), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, lll_geo_000A40), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, lll_geo_000A60), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, lll_geo_000A90), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, lll_geo_000AA8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, lll_geo_000AC0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, lll_geo_000AD8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, lll_geo_000AF0), +LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_03, lll_geo_0009E0), +LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_04, lll_geo_0009F8), +LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_05, lll_geo_000A10), +LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_06, lll_geo_000A28), +LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_07, lll_geo_000A40), +LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_08, lll_geo_000A60), +LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_0A, lll_geo_000A90), +LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_0B, lll_geo_000AA8), +LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_0C, lll_geo_000AC0), +LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_0D, lll_geo_000AD8), +LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_0E, lll_geo_000AF0), diff --git a/levels/lll/script.c b/levels/lll/script.c index c5d4175590..e9215c9fd8 100644 --- a/levels/lll/script.c +++ b/levels/lll/script.c @@ -105,20 +105,20 @@ static const LevelScript script_lll_area_2_macro_objects[] = { }; static const LevelScript script_lll_area_1_objects_1[] = { - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 3840, 0, -5631, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 4992, 0, -639, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ 7168, 0, 1408, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ 0, 0, 3712, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_07, /*pos*/ -3199, 0, 3456, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_08, /*pos*/ -5119, 0, -2047, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0A, /*pos*/ 0, 0, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0B, /*pos*/ 0, 0, 6272, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ 5632, 0, 1408, /*angle*/ 0, 270, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ 2048, 0, 3456, /*angle*/ 0, 180, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ -4607, 0, 3456, /*angle*/ 0, 270, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ -5119, 0, -511, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0D, /*pos*/ 0, 0, -2047, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -5115, 300, -3200, /*angle*/ 0, 90, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_03, /*pos*/ 3840, 0, -5631, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_04, /*pos*/ 4992, 0, -639, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_05, /*pos*/ 7168, 0, 1408, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_06, /*pos*/ 0, 0, 3712, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_07, /*pos*/ -3199, 0, 3456, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_08, /*pos*/ -5119, 0, -2047, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_0A, /*pos*/ 0, 0, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_0B, /*pos*/ 0, 0, 6272, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_0C, /*pos*/ 5632, 0, 1408, /*angle*/ 0, 270, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_0C, /*pos*/ 2048, 0, 3456, /*angle*/ 0, 180, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_0C, /*pos*/ -4607, 0, 3456, /*angle*/ 0, 270, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_0C, /*pos*/ -5119, 0, -511, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_0D, /*pos*/ 0, 0, -2047, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_0E, /*pos*/ -5115, 300, -3200, /*angle*/ 0, 90, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; diff --git a/levels/rr/areas/script_vanilla.inc.c b/levels/rr/areas/script_vanilla.inc.c index b7eb754e27..24b867e1de 100644 --- a/levels/rr/areas/script_vanilla.inc.c +++ b/levels/rr/areas/script_vanilla.inc.c @@ -1,23 +1,23 @@ JUMP_LINK(script_func_global_12), JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_vo_rr), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, rr_geo_000660), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, rr_geo_000678), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, rr_geo_000690), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, rr_geo_0006A8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, rr_geo_0006C0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, rr_geo_0006D8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, rr_geo_0006F0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, rr_geo_000708), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, rr_geo_000720), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, rr_geo_000738), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, rr_geo_000758), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, rr_geo_000770), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, rr_geo_000788), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, rr_geo_0007A0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, rr_geo_0007B8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, rr_geo_0007D0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_13, rr_geo_0007E8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_14, rr_geo_000800), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_15, rr_geo_000818), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_16, rr_geo_000830), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_03, rr_geo_000660), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_04, rr_geo_000678), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_05, rr_geo_000690), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_06, rr_geo_0006A8), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_07, rr_geo_0006C0), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_08, rr_geo_0006D8), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_09, rr_geo_0006F0), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_0A, rr_geo_000708), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_0B, rr_geo_000720), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_0C, rr_geo_000738), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_0D, rr_geo_000758), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_0E, rr_geo_000770), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_0F, rr_geo_000788), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_10, rr_geo_0007A0), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_11, rr_geo_0007B8), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_12, rr_geo_0007D0), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_13, rr_geo_0007E8), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_14, rr_geo_000800), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_15, rr_geo_000818), +LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_16, rr_geo_000830), diff --git a/levels/rr/script.c b/levels/rr/script.c index 5e05e57379..728163b809 100644 --- a/levels/rr/script.c +++ b/levels/rr/script.c @@ -80,28 +80,28 @@ static const LevelScript script_rr_macro_objects[] = { OBJECT(/*model*/ MODEL_EXCLAMATION_BOX, /*pos*/ 5000, 4100, 4440, /*angle*/ 0, 0, 0, /*behParam*/ (EXCLAMATION_BOX_BP_STAR_6 << 16), /*beh*/ bhvExclamationBox), OBJECT(/*model*/ MODEL_BOWLING_BALL, /*pos*/ -6000, -440, -40, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFireSpitter), // Special objects - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 1902, -1833, 1063, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 3803, -1833, 2036, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ -4888, -2550, 5847, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ 5324, -2038, 6155, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_07, /*pos*/ -409, -3164, 5207, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_08, /*pos*/ -3193, -4726, 6670, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_08, /*pos*/ -4680, -1910, 296, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_09, /*pos*/ 6506, -1295, 762, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0A, /*pos*/ -4629, 137, -113, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0B, /*pos*/ 2639, 2724, -622, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ 3577, 2486, -2346, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0D, /*pos*/ 614, -1116, 3671, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0D, /*pos*/ 3554, 4276, -2346, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ 5280, 4937, 603, /*angle*/ 0, 180, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0F, /*pos*/ -4197, 4608, -5119, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_10, /*pos*/ 2628, -143, -1611, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_11, /*pos*/ 5094, 3440, 4029, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_12, /*pos*/ -3708, 2006, 270, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_13, /*pos*/ 5994, -988, 1341, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_14, /*pos*/ 3917, 624, -1133, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_15, /*pos*/ -3981, 3328, -2736, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_16, /*pos*/ -6053, 4096, -3197, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_03, /*pos*/ 1902, -1833, 1063, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_04, /*pos*/ 3803, -1833, 2036, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_05, /*pos*/ -4888, -2550, 5847, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_06, /*pos*/ 5324, -2038, 6155, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_07, /*pos*/ -409, -3164, 5207, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_08, /*pos*/ -3193, -4726, 6670, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_08, /*pos*/ -4680, -1910, 296, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_09, /*pos*/ 6506, -1295, 762, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_0A, /*pos*/ -4629, 137, -113, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_0B, /*pos*/ 2639, 2724, -622, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_0C, /*pos*/ 3577, 2486, -2346, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_0D, /*pos*/ 614, -1116, 3671, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_0D, /*pos*/ 3554, 4276, -2346, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_0E, /*pos*/ 5280, 4937, 603, /*angle*/ 0, 180, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_0F, /*pos*/ -4197, 4608, -5119, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_10, /*pos*/ 2628, -143, -1611, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_11, /*pos*/ 5094, 3440, 4029, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_12, /*pos*/ -3708, 2006, 270, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_13, /*pos*/ 5994, -988, 1341, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_14, /*pos*/ 3917, 624, -1133, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_15, /*pos*/ -3981, 3328, -2736, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_16, /*pos*/ -6053, 4096, -3197, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; diff --git a/levels/sl/areas/script_vanilla.inc.c b/levels/sl/areas/script_vanilla.inc.c index 485c82f203..18cd42a72e 100644 --- a/levels/sl/areas/script_vanilla.inc.c +++ b/levels/sl/areas/script_vanilla.inc.c @@ -2,4 +2,4 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_8), JUMP_LINK(script_func_global_17), JUMP_LINK(script_func_vo_sl), -LOAD_MODEL_FROM_GEO(MODEL_SL_SNOW_TREE, snow_tree_geo), +LOAD_MODEL_FROM_GEO(MODEL_SNOW_TREE, snow_tree_geo), diff --git a/levels/sl/script.c b/levels/sl/script.c index 1ae3fab21b..e763f44b67 100644 --- a/levels/sl/script.c +++ b/levels/sl/script.c @@ -67,15 +67,15 @@ static const LevelScript script_sl_area_1_macro_objects[] = { OBJECT(/*model*/ MODEL_YELLOW_COIN, /*pos*/ 3418, 1024, 3554, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvOneCoin), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, 5420, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvHidden1upInPoleSpawner), // Special objects - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ 5395, 1054, -5443, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ 0, 4864, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ 5666, 1024, -3341, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ 1919, 1024, -4759, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ 3645, 1024, -5889, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ 1658, 1536, -3605, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ -3769, 1024, -1197, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ -2745, 1024, -582, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CCM_SNOW_TREE, /*pos*/ 1766, 2816, -942, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ 5395, 1054, -5443, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ 0, 4864, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ 5666, 1024, -3341, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ 1919, 1024, -4759, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ 3645, 1024, -5889, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ 1658, 1536, -3605, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ -3769, 1024, -1197, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ -2745, 1024, -582, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ 1766, 2816, -942, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), RETURN(), }; diff --git a/levels/ssl/areas/script_vanilla.inc.c b/levels/ssl/areas/script_vanilla.inc.c index 05e189afd2..e88b4ed2dc 100644 --- a/levels/ssl/areas/script_vanilla.inc.c +++ b/levels/ssl/areas/script_vanilla.inc.c @@ -2,5 +2,5 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_6), JUMP_LINK(script_func_vo_ssl), LOAD_MODEL_FROM_GEO(MODEL_SSL_PALM_TREE, palm_tree_geo), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, ssl_geo_0005C0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, ssl_geo_0005D8), +LOAD_MODEL_FROM_GEO(MODEL_ssl_LEVEL_GEOMETRY_03, ssl_geo_0005C0), +LOAD_MODEL_FROM_GEO(MODEL_ssl_LEVEL_GEOMETRY_04, ssl_geo_0005D8), diff --git a/levels/ssl/script.c b/levels/ssl/script.c index c0ac82738c..93395ade5b 100644 --- a/levels/ssl/script.c +++ b/levels/ssl/script.c @@ -66,11 +66,11 @@ static const LevelScript script_ssl_area_1_macro_objects[] = { OBJECT(/*model*/ MODEL_EXCLAMATION_BOX, /*pos*/ -1200, 500, 800, /*angle*/ 0, 0, 0, /*behParam*/ (EXCLAMATION_BOX_BP_1UP_RUNNING_AWAY << 16), /*beh*/ bhvExclamationBox), OBJECT(/*model*/ MODEL_WOODEN_SIGNPOST, /*pos*/ 5130, 26, -370, /*angle*/ 0, 0, 0, /*behParam*/ (DIALOG_157 << 16), /*beh*/ bhvMessagePanel), // Special objects - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 5760, 0, 5751, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -3583, 0, 2935, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -511, 0, 2935, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 1024, 0, 3822, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 3072, 0, 375, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ssl_LEVEL_GEOMETRY_03, /*pos*/ 5760, 0, 5751, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ssl_LEVEL_GEOMETRY_03, /*pos*/ -3583, 0, 2935, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ssl_LEVEL_GEOMETRY_03, /*pos*/ -511, 0, 2935, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ssl_LEVEL_GEOMETRY_03, /*pos*/ 1024, 0, 3822, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ssl_LEVEL_GEOMETRY_03, /*pos*/ 3072, 0, 375, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), OBJECT(/*model*/ MODEL_SSL_PALM_TREE, /*pos*/ -5989, 0, -4850, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), RETURN(), }; @@ -128,9 +128,9 @@ static const LevelScript script_ssl_area_2_macro_objects[] = { OBJECT(/*model*/ MODEL_YELLOW_COIN, /*pos*/ -1840, 1357, 3076, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvOneCoin), OBJECT(/*model*/ MODEL_YELLOW_COIN, /*pos*/ -1840, 1408, 2870, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvOneCoin), // Special objects - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 1741, -101, 1843, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 0, -101, 528, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ -1740, -101, 1843, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ssl_LEVEL_GEOMETRY_04, /*pos*/ 1741, -101, 1843, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ssl_LEVEL_GEOMETRY_04, /*pos*/ 0, -101, 528, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ssl_LEVEL_GEOMETRY_04, /*pos*/ -1740, -101, 1843, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; diff --git a/levels/thi/areas/script_vanilla_load.inc.c b/levels/thi/areas/script_vanilla_load.inc.c index 5d9279bc22..d4e6e3c9f6 100644 --- a/levels/thi/areas/script_vanilla_load.inc.c +++ b/levels/thi/areas/script_vanilla_load.inc.c @@ -2,6 +2,6 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_12), JUMP_LINK(script_func_global_15), JUMP_LINK(script_func_vo_thi), -LOAD_MODEL_FROM_GEO(MODEL_THI_BUBBLY_TREE, bubbly_tree_geo), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, thi_geo_0005F0), -LOAD_MODEL_FROM_GEO(MODEL_THI_WARP_PIPE, warp_pipe_geo), +LOAD_MODEL_FROM_GEO(MODEL_BUBBLY_TREE, bubbly_tree_geo), +LOAD_MODEL_FROM_GEO(MODEL_thi_LEVEL_GEOMETRY_03, thi_geo_0005F0), +LOAD_MODEL_FROM_GEO(MODEL_WARP_PIPE, warp_pipe_geo), diff --git a/levels/thi/script.c b/levels/thi/script.c index 425a07e28c..12c10f56f2 100644 --- a/levels/thi/script.c +++ b/levels/thi/script.c @@ -60,7 +60,7 @@ static const LevelScript script_thi_area_1_macro_objects[] = { OBJECT(/*model*/ MODEL_BUTTERFLY, /*pos*/ -3111, -511, 2400, /*angle*/ 0, 0, 0, /*behParam*/ (TRIPLET_BUTTERFLY_BP_0 << 16), /*beh*/ bhvTripletButterfly), OBJECT(/*model*/ MODEL_BUTTERFLY, /*pos*/ 4844, -533, 2266, /*angle*/ 0, 0, 0, /*behParam*/ (TRIPLET_BUTTERFLY_BP_0 << 16), /*beh*/ bhvTripletButterfly), // Special objects - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 4813, -511, 2254, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 4813, -511, 2254, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), RETURN(), }; @@ -135,8 +135,8 @@ static const LevelScript script_thi_area_2_macro_objects[] = { OBJECT(/*model*/ MODEL_YELLOW_COIN, /*pos*/ 280, -640, -4140, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvYellowCoin), OBJECT(/*model*/ MODEL_GOOMBA, /*pos*/ -2020, -890, 1720, /*angle*/ 0, 0, 0, /*behParam*/ (GOOMBA_SIZE_TINY << 16), /*beh*/ bhvGoomba), // Special objects - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -40, -767, -4494, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 1444, -153, 676, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_thi_LEVEL_GEOMETRY_03, /*pos*/ -40, -767, -4494, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 1444, -153, 676, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), RETURN(), }; @@ -199,9 +199,9 @@ static const LevelScript script_thi_area_2_objects_2[] = { }; static const LevelScript script_thi_area_1_objects_3[] = { - OBJECT(/*model*/ MODEL_THI_WARP_PIPE, /*pos*/ 6656, -1536, -5632, /*angle*/ 0, 0, 0, /*behParam*/ 0x00320000, /*beh*/ bhvWarpPipe), - OBJECT(/*model*/ MODEL_THI_WARP_PIPE, /*pos*/ -5888, -2048, -5888, /*angle*/ 0, 0, 0, /*behParam*/ 0x00330000, /*beh*/ bhvWarpPipe), - OBJECT(/*model*/ MODEL_THI_WARP_PIPE, /*pos*/ -3072, 512, -3840, /*angle*/ 0, 0, 0, /*behParam*/ 0x00340000, /*beh*/ bhvWarpPipe), + OBJECT(/*model*/ MODEL_WARP_PIPE, /*pos*/ 6656, -1536, -5632, /*angle*/ 0, 0, 0, /*behParam*/ 0x00320000, /*beh*/ bhvWarpPipe), + OBJECT(/*model*/ MODEL_WARP_PIPE, /*pos*/ -5888, -2048, -5888, /*angle*/ 0, 0, 0, /*behParam*/ 0x00330000, /*beh*/ bhvWarpPipe), + OBJECT(/*model*/ MODEL_WARP_PIPE, /*pos*/ -3072, 512, -3840, /*angle*/ 0, 0, 0, /*behParam*/ 0x00340000, /*beh*/ bhvWarpPipe), WARP_NODE(/*id*/ 0x32, /*destLevel*/ LEVEL_THI, /*destArea*/ 0x02, /*destNode*/ 0x32, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0x33, /*destLevel*/ LEVEL_THI, /*destArea*/ 0x02, /*destNode*/ 0x33, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0x34, /*destLevel*/ LEVEL_THI, /*destArea*/ 0x02, /*destNode*/ 0x34, /*flags*/ WARP_NO_CHECKPOINT), @@ -209,9 +209,9 @@ static const LevelScript script_thi_area_1_objects_3[] = { }; static const LevelScript script_thi_area_2_objects_3[] = { - OBJECT(/*model*/ MODEL_THI_WARP_PIPE, /*pos*/ 1997, -461, -1690, /*angle*/ 0, 0, 0, /*behParam*/ 0x00320000, /*beh*/ bhvWarpPipe), - OBJECT(/*model*/ MODEL_THI_WARP_PIPE, /*pos*/ -1766, -614, -1766, /*angle*/ 0, 0, 0, /*behParam*/ 0x00330000, /*beh*/ bhvWarpPipe), - OBJECT(/*model*/ MODEL_THI_WARP_PIPE, /*pos*/ -922, 154, -1152, /*angle*/ 0, 0, 0, /*behParam*/ 0x00340000, /*beh*/ bhvWarpPipe), + OBJECT(/*model*/ MODEL_WARP_PIPE, /*pos*/ 1997, -461, -1690, /*angle*/ 0, 0, 0, /*behParam*/ 0x00320000, /*beh*/ bhvWarpPipe), + OBJECT(/*model*/ MODEL_WARP_PIPE, /*pos*/ -1766, -614, -1766, /*angle*/ 0, 0, 0, /*behParam*/ 0x00330000, /*beh*/ bhvWarpPipe), + OBJECT(/*model*/ MODEL_WARP_PIPE, /*pos*/ -922, 154, -1152, /*angle*/ 0, 0, 0, /*behParam*/ 0x00340000, /*beh*/ bhvWarpPipe), WARP_NODE(/*id*/ 0x32, /*destLevel*/ LEVEL_THI, /*destArea*/ 0x01, /*destNode*/ 0x32, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0x33, /*destLevel*/ LEVEL_THI, /*destArea*/ 0x01, /*destNode*/ 0x33, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0x34, /*destLevel*/ LEVEL_THI, /*destArea*/ 0x01, /*destNode*/ 0x34, /*flags*/ WARP_NO_CHECKPOINT), diff --git a/levels/totwc/areas/script_vanilla.inc.c b/levels/totwc/areas/script_vanilla.inc.c index 39175812c7..6981dd3a4b 100644 --- a/levels/totwc/areas/script_vanilla.inc.c +++ b/levels/totwc/areas/script_vanilla.inc.c @@ -1,3 +1,3 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_9), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, totwc_geo_000160), +LOAD_MODEL_FROM_GEO(MODEL_totwc_LEVEL_GEOMETRY_03, totwc_geo_000160), diff --git a/levels/totwc/script.c b/levels/totwc/script.c index ffefbf4b8a..7425f5e903 100644 --- a/levels/totwc/script.c +++ b/levels/totwc/script.c @@ -48,28 +48,28 @@ static const LevelScript script_totwc_macro_objects[] = { OBJECT(/*model*/ MODEL_YELLOW_COIN, /*pos*/ -960, 2600, 1040, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvYellowCoin), OBJECT(/*model*/ MODEL_YELLOW_COIN, /*pos*/ -1760, 2800, 600, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvYellowCoin), // Special objects - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 4608, -357, -511, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -4095, 666, 512, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -5631, -1893, 6144, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -2047, -869, 2048, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 1024, 1178, 1536, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -2047, -357, -2559, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 2560, -2917, 2560, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 1024, 1178, 4096, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -1023, -869, 5632, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -5119, -2405, 1024, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 512, -2917, 3584, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 1024, -1893, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -511, -869, -4095, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 4608, -3429, 1536, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 6144, -3429, -5119, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -2559, -2405, -6655, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 3072, -869, 5632, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 6144, -1381, -511, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 4096, 666, -1535, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -4607, -1381, -2559, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -1535, -2917, -6143, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 2560, -3429, -3583, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 4608, -357, -511, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -4095, 666, 512, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -5631, -1893, 6144, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -2047, -869, 2048, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 1024, 1178, 1536, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -2047, -357, -2559, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 2560, -2917, 2560, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 1024, 1178, 4096, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -1023, -869, 5632, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -5119, -2405, 1024, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 512, -2917, 3584, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 1024, -1893, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -511, -869, -4095, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 4608, -3429, 1536, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 6144, -3429, -5119, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -2559, -2405, -6655, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 3072, -869, 5632, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 6144, -1381, -511, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 4096, 666, -1535, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -4607, -1381, -2559, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -1535, -2917, -6143, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 2560, -3429, -3583, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; diff --git a/levels/ttm/areas/script_vanilla.inc.c b/levels/ttm/areas/script_vanilla.inc.c index 5e5785d602..1faafd9a3a 100644 --- a/levels/ttm/areas/script_vanilla.inc.c +++ b/levels/ttm/areas/script_vanilla.inc.c @@ -1,22 +1,22 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_7), JUMP_LINK(script_func_vo_ttm), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, ttm_geo_000748), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, ttm_geo_000778), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, ttm_geo_0007A8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, ttm_geo_0007D8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, ttm_geo_000808), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, ttm_geo_000830), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, ttm_geo_000858), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, ttm_geo_000880), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, ttm_geo_0008A8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, ttm_geo_0008D0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, ttm_geo_0008F8), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, ttm_geo_000920), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, ttm_geo_000948), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, ttm_geo_000970), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, ttm_geo_000990), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_13, ttm_geo_0009C0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_14, ttm_geo_0009F0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_15, ttm_geo_000A18), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_16, ttm_geo_000A40), +LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_03, ttm_geo_000748), +LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_04, ttm_geo_000778), +LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_05, ttm_geo_0007A8), +LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_06, ttm_geo_0007D8), +LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_07, ttm_geo_000808), +LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_08, ttm_geo_000830), +LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_09, ttm_geo_000858), +LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_0A, ttm_geo_000880), +LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_0B, ttm_geo_0008A8), +LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_0C, ttm_geo_0008D0), +LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_0D, ttm_geo_0008F8), +LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_0F, ttm_geo_000920), +LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_10, ttm_geo_000948), +LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_11, ttm_geo_000970), +LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_12, ttm_geo_000990), +LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_13, ttm_geo_0009C0), +LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_14, ttm_geo_0009F0), +LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_15, ttm_geo_000A18), +LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_16, ttm_geo_000A40), diff --git a/levels/ttm/script.c b/levels/ttm/script.c index a09680b8f8..9204a2dc53 100644 --- a/levels/ttm/script.c +++ b/levels/ttm/script.c @@ -59,34 +59,34 @@ static const LevelScript script_ttm_area_1_macro_objects[] = { OBJECT(/*model*/ MODEL_BUTTERFLY, /*pos*/ -606, 1186, -1290, /*angle*/ 0, 0, 0, /*behParam*/ (TRIPLET_BUTTERFLY_BP_0 << 16), /*beh*/ bhvTripletButterfly), OBJECT(/*model*/ MODEL_BREAKABLE_BOX, /*pos*/ 4980, -4607, 2680, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvJumpingBox), // Special objects - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -3276, -4423, -3685, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 7293, -5056, 1429, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 4938, -5568, 5115, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 4198, -4508, -2866, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 1470, -4507, -4298, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 3277, -4508, -4095, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ 3891, -4489, -3532, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ 3277, -4489, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ 2509, -4489, -3378, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ 534, -4490, -4176, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ 2358, -4594, -4386, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ 1843, -4515, -3583, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ 2317, -4635, -3838, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_07, /*pos*/ 102, -4363, 5734, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_08, /*pos*/ 4710, -4656, -101, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_09, /*pos*/ 5018, -4249, -3481, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0A, /*pos*/ -306, -3356, 3584, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0B, /*pos*/ 1434, -2279, 3277, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ 2970, -1854, 4301, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0D, /*pos*/ 4608, -1854, 2560, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0F, /*pos*/ 2355, 1309, 1229, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_10, /*pos*/ 1843, 1295, 1024, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_11, /*pos*/ 819, 2349, -101, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_12, /*pos*/ -1945, -918, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_13, /*pos*/ -1842, -1791, -2866, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_14, /*pos*/ -1228, -613, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_15, /*pos*/ -1740, -204, -2354, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_16, /*pos*/ -2764, -2661, 3789, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_03, /*pos*/ -3276, -4423, -3685, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_03, /*pos*/ 7293, -5056, 1429, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_03, /*pos*/ 4938, -5568, 5115, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_04, /*pos*/ 4198, -4508, -2866, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_04, /*pos*/ 1470, -4507, -4298, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_04, /*pos*/ 3277, -4508, -4095, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_05, /*pos*/ 3891, -4489, -3532, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_05, /*pos*/ 3277, -4489, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_05, /*pos*/ 2509, -4489, -3378, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_05, /*pos*/ 534, -4490, -4176, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_06, /*pos*/ 2358, -4594, -4386, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_06, /*pos*/ 1843, -4515, -3583, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_06, /*pos*/ 2317, -4635, -3838, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_07, /*pos*/ 102, -4363, 5734, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_08, /*pos*/ 4710, -4656, -101, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_09, /*pos*/ 5018, -4249, -3481, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_0A, /*pos*/ -306, -3356, 3584, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_0B, /*pos*/ 1434, -2279, 3277, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_0C, /*pos*/ 2970, -1854, 4301, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_0D, /*pos*/ 4608, -1854, 2560, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_0F, /*pos*/ 2355, 1309, 1229, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_10, /*pos*/ 1843, 1295, 1024, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_11, /*pos*/ 819, 2349, -101, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_12, /*pos*/ -1945, -918, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_13, /*pos*/ -1842, -1791, -2866, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_14, /*pos*/ -1228, -613, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_15, /*pos*/ -1740, -204, -2354, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_16, /*pos*/ -2764, -2661, 3789, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; diff --git a/levels/vcutm/areas/script_vanilla.inc.c b/levels/vcutm/areas/script_vanilla.inc.c index 563e9dd551..d4282d985f 100644 --- a/levels/vcutm/areas/script_vanilla.inc.c +++ b/levels/vcutm/areas/script_vanilla.inc.c @@ -1,4 +1,4 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_9), JUMP_LINK(script_func_vo_vcutm), -LOAD_MODEL_FROM_GEO(MODEL_VCUTM_WARP_PIPE, warp_pipe_geo), +LOAD_MODEL_FROM_GEO(MODEL_WARP_PIPE, warp_pipe_geo), diff --git a/levels/wdw/areas/script_vanilla.inc.c b/levels/wdw/areas/script_vanilla.inc.c index d1990a857c..80d1461ddf 100644 --- a/levels/wdw/areas/script_vanilla.inc.c +++ b/levels/wdw/areas/script_vanilla.inc.c @@ -2,4 +2,4 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_2), JUMP_LINK(script_func_global_14), JUMP_LINK(script_func_vo_wdw), -LOAD_MODEL_FROM_GEO(MODEL_WDW_BUBBLY_TREE, bubbly_tree_geo), +LOAD_MODEL_FROM_GEO(MODEL_BUBBLY_TREE, bubbly_tree_geo), diff --git a/levels/wdw/script.c b/levels/wdw/script.c index 7a483bd3ce..533f6aade8 100644 --- a/levels/wdw/script.c +++ b/levels/wdw/script.c @@ -127,8 +127,8 @@ static const LevelScript script_wdw_area_2_macro_objects[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ -770, -320, 2820, /*angle*/ 0, 0, 0, /*behParam*/ ((COIN_FORMATION_FLAG_NONE ) << 16), /*beh*/ bhvCoinFormation), OBJECT(/*model*/ MODEL_EXCLAMATION_BOX, /*pos*/ 1655, -2160, -1293, /*angle*/ 0, 0, 0, /*behParam*/ (EXCLAMATION_BOX_BP_1UP_RUNNING_AWAY << 16), /*beh*/ bhvExclamationBox), // Special objects - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 1664, -2457, -946, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 1664, -2457, -1637, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 1664, -2457, -946, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 1664, -2457, -1637, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), RETURN(), }; diff --git a/levels/wf/areas/script_vanilla_load.inc.c b/levels/wf/areas/script_vanilla_load.inc.c index 1718fddf6d..7a581a8eef 100644 --- a/levels/wf/areas/script_vanilla_load.inc.c +++ b/levels/wf/areas/script_vanilla_load.inc.c @@ -2,15 +2,15 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_2), JUMP_LINK(script_func_global_15), JUMP_LINK(script_func_vo_wf), -LOAD_MODEL_FROM_GEO(MODEL_WF_BUBBLY_TREE, bubbly_tree_geo), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, wf_geo_0007E0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, wf_geo_000820), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, wf_geo_000860), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, wf_geo_000878), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, wf_geo_000890), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, wf_geo_000900), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, wf_geo_000940), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, wf_geo_000958), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, wf_geo_0009A0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, wf_geo_0009D0), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, wf_geo_0009E8), +LOAD_MODEL_FROM_GEO(MODEL_BUBBLY_TREE, bubbly_tree_geo), +LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_03, wf_geo_0007E0), +LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_04, wf_geo_000820), +LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_05, wf_geo_000860), +LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_06, wf_geo_000878), +LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_07, wf_geo_000890), +LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_0A, wf_geo_000900), +LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_0C, wf_geo_000940), +LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_0E, wf_geo_000958), +LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_0F, wf_geo_0009A0), +LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_11, wf_geo_0009D0), +LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_12, wf_geo_0009E8), diff --git a/levels/wf/script.c b/levels/wf/script.c index 39cd829767..85eca425e9 100644 --- a/levels/wf/script.c +++ b/levels/wf/script.c @@ -63,23 +63,23 @@ static const LevelScript script_wf_macro_objects[] = { OBJECT(/*model*/ MODEL_BREAKABLE_BOX, /*pos*/ -2940, 384, -1320, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBreakableBoxSmall), OBJECT(/*model*/ MODEL_BUTTERFLY, /*pos*/ 4574, 300, 1130, /*angle*/ 0, 0, 0, /*behParam*/ (TRIPLET_BUTTERFLY_BP_NO_BOMBS << 16), /*beh*/ bhvTripletButterfly), // Special objects - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ 3584, 154, 4864, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0F, /*pos*/ 4608, 256, 1792, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_11, /*pos*/ -2499, 1792, -261, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_12, /*pos*/ -2661, 384, 640, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_BOB_BUBBLY_TREE, /*pos*/ 2560, 256, 4608, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), + OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_0E, /*pos*/ 3584, 154, 4864, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_0F, /*pos*/ 4608, 256, 1792, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_11, /*pos*/ -2499, 1792, -261, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_12, /*pos*/ -2661, 384, 640, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 2560, 256, 4608, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), RETURN(), }; static const LevelScript script_wf_objects_1[] = { - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 2305, 2432, -255, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 3405, 1664, -1791, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ 3840, 0, -2303, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ 3840, 0, -1279, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ 0, 0, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_07, /*pos*/ 1757, 3519, -3151, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0A, /*pos*/ 3840, 794, 2688, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ 1408, 2522, 2431, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_03, /*pos*/ 2305, 2432, -255, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_04, /*pos*/ 3405, 1664, -1791, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_05, /*pos*/ 3840, 0, -2303, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_05, /*pos*/ 3840, 0, -1279, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_06, /*pos*/ 0, 0, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_07, /*pos*/ 1757, 3519, -3151, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_0A, /*pos*/ 3840, 794, 2688, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_0C, /*pos*/ 1408, 2522, 2431, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), OBJECT(/*model*/ MODEL_WF_GIANT_POLE, /*pos*/ -2560, 2560, -256, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvGiantPole), RETURN(), }; @@ -125,8 +125,8 @@ static const LevelScript script_wf_objects_3[] = { OBJECT(/*model*/ MODEL_BUTTERFLY, /*pos*/ 4608, 256, 128, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvButterfly), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 1035, 2880, -900, /*angle*/ 0, 45, 0, /*behParam*/ 0x00000000, /*beh*/ bhvCheckerboardElevatorGroup), OBJECT_WITH_ACTS(/*model*/ MODEL_BULLET_BILL, /*pos*/ 1280, 3712, 968, /*angle*/ 0, 180, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBulletBill, /*acts*/ ACT_2 | ACT_3 | ACT_4 | ACT_5 | ACT_6), - OBJECT_WITH_ACTS(/*model*/ MODEL_LEVEL_GEOMETRY_08, /*pos*/ 0, 3584, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTower, /*acts*/ ACT_2 | ACT_3 | ACT_4 | ACT_5 | ACT_6), - OBJECT_WITH_ACTS(/*model*/ MODEL_LEVEL_GEOMETRY_09, /*pos*/ 1280, 3584, 896, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBulletBillCannon, /*acts*/ ACT_2 | ACT_3 | ACT_4 | ACT_5 | ACT_6), + OBJECT_WITH_ACTS(/*model*/ MODEL_wf_LEVEL_GEOMETRY_08, /*pos*/ 0, 3584, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTower, /*acts*/ ACT_2 | ACT_3 | ACT_4 | ACT_5 | ACT_6), + OBJECT_WITH_ACTS(/*model*/ MODEL_wf_LEVEL_GEOMETRY_09, /*pos*/ 1280, 3584, 896, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBulletBillCannon, /*acts*/ ACT_2 | ACT_3 | ACT_4 | ACT_5 | ACT_6), OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ 0, 3483, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTowerPlatformGroup, /*acts*/ ACT_2 | ACT_3 | ACT_4 | ACT_5 | ACT_6), OBJECT_WITH_ACTS(/*model*/ MODEL_WF_TOWER_DOOR, /*pos*/ -511, 3584, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTowerDoor, /*acts*/ ACT_2 | ACT_3 | ACT_4 | ACT_5 | ACT_6), OBJECT_WITH_ACTS(/*model*/ MODEL_BOBOMB_BUDDY, /*pos*/ -1700, 1140, 3500, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBobombBuddyOpensCannon, /*acts*/ ACT_3 | ACT_4 | ACT_5 | ACT_6), From 57c07b8777976e458ee60f10bb51cd805fb7c108 Mon Sep 17 00:00:00 2001 From: someone2639 Date: Fri, 7 Feb 2025 20:02:11 -0500 Subject: [PATCH 04/15] move wooden door loading to common1 global --- levels/castle_courtyard/areas/script_vanilla.inc.c | 1 - levels/castle_grounds/areas/script_vanilla.inc.c | 4 ++-- levels/castle_grounds/script.c | 6 +++--- levels/castle_inside/areas/script_vanilla.inc.c | 8 +++----- levels/castle_inside/script.c | 6 +++--- levels/ccm/script.c | 2 +- levels/hmc/areas/script_vanilla.inc.c | 3 +-- levels/hmc/script.c | 12 ++++++------ levels/scripts.c | 1 + 9 files changed, 20 insertions(+), 23 deletions(-) diff --git a/levels/castle_courtyard/areas/script_vanilla.inc.c b/levels/castle_courtyard/areas/script_vanilla.inc.c index 17956b0ee1..b38b132aeb 100644 --- a/levels/castle_courtyard/areas/script_vanilla.inc.c +++ b/levels/castle_courtyard/areas/script_vanilla.inc.c @@ -1,5 +1,4 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_10), LOAD_MODEL_FROM_GEO(MODEL_COURTYARD_SPIKY_TREE, spiky_tree_geo), -LOAD_MODEL_FROM_GEO(MODEL_WOODEN_DOOR, wooden_door_geo), LOAD_MODEL_FROM_GEO(MODEL_castle_courtyard_LEVEL_GEOMETRY_03, castle_courtyard_geo_000200), diff --git a/levels/castle_grounds/areas/script_vanilla.inc.c b/levels/castle_grounds/areas/script_vanilla.inc.c index 27d664f4e4..a15b60c877 100644 --- a/levels/castle_grounds/areas/script_vanilla.inc.c +++ b/levels/castle_grounds/areas/script_vanilla.inc.c @@ -5,5 +5,5 @@ JUMP_LINK(script_func_vo_castle_grounds), LOAD_MODEL_FROM_GEO(MODEL_castle_grounds_LEVEL_GEOMETRY_03, castle_grounds_geo_0006F4), LOAD_MODEL_FROM_GEO(MODEL_BUBBLY_TREE, bubbly_tree_geo), LOAD_MODEL_FROM_GEO(MODEL_WARP_PIPE, warp_pipe_geo), -LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_CASTLE_DOOR, castle_door_geo), -LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_METAL_DOOR, metal_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR, castle_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_METAL_DOOR, metal_door_geo), diff --git a/levels/castle_grounds/script.c b/levels/castle_grounds/script.c index 668a284343..886fbff37f 100644 --- a/levels/castle_grounds/script.c +++ b/levels/castle_grounds/script.c @@ -64,9 +64,9 @@ static const LevelScript script_castle_grounds_macro_objects[] = { OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 5774, 413, -1114, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 5954, 526, -2846, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -5204, 296, 811, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - OBJECT(/*model*/ MODEL_CASTLE_METAL_DOOR, /*pos*/ 3292, -511, -2931, /*angle*/ 0, 225, 0, /*behParam*/ (2 << 16), /*beh*/ bhvDoorWarp), - OBJECT(/*model*/ MODEL_CASTLE_CASTLE_DOOR, /*pos*/ -76, 803, -3155, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 16), /*beh*/ bhvDoorWarp), - OBJECT(/*model*/ MODEL_CASTLE_CASTLE_DOOR, /*pos*/ 77, 803, -3155, /*angle*/ 0, 180, 0, /*behParam*/ (1 << 16), /*beh*/ bhvDoorWarp), + OBJECT(/*model*/ MODEL_METAL_DOOR, /*pos*/ 3292, -511, -2931, /*angle*/ 0, 225, 0, /*behParam*/ (2 << 16), /*beh*/ bhvDoorWarp), + OBJECT(/*model*/ MODEL_CASTLE_DOOR, /*pos*/ -76, 803, -3155, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 16), /*beh*/ bhvDoorWarp), + OBJECT(/*model*/ MODEL_CASTLE_DOOR, /*pos*/ 77, 803, -3155, /*angle*/ 0, 180, 0, /*behParam*/ (1 << 16), /*beh*/ bhvDoorWarp), RETURN(), }; diff --git a/levels/castle_inside/areas/script_vanilla.inc.c b/levels/castle_inside/areas/script_vanilla.inc.c index 3321f116e8..59a7a379cc 100644 --- a/levels/castle_inside/areas/script_vanilla.inc.c +++ b/levels/castle_inside/areas/script_vanilla.inc.c @@ -1,10 +1,8 @@ JUMP_LINK(script_func_global_16), JUMP_LINK(script_func_vo_castle_inside), -LOAD_MODEL_FROM_GEO(MODEL_CASTLE_CASTLE_DOOR, castle_door_geo), -LOAD_MODEL_FROM_GEO(MODEL_WOODEN_DOOR, wooden_door_geo), -LOAD_MODEL_FROM_GEO(MODEL_CASTLE_METAL_DOOR, metal_door_geo), -LOAD_MODEL_FROM_GEO(MODEL_CASTLE_CASTLE_DOOR_UNUSED, castle_door_geo), -LOAD_MODEL_FROM_GEO(MODEL_WOODEN_DOOR, wooden_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR, castle_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_METAL_DOOR, metal_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR, castle_door_geo), LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR_0_STARS, castle_door_0_star_geo), LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR_1_STAR, castle_door_1_star_geo), LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR_3_STARS, castle_door_3_stars_geo), diff --git a/levels/castle_inside/script.c b/levels/castle_inside/script.c index f604d6e170..c9fdb53b30 100644 --- a/levels/castle_inside/script.c +++ b/levels/castle_inside/script.c @@ -34,8 +34,8 @@ static const LevelScript script_inside_castle_area_1_macro_objects[] = { // Special objects OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -271, 0, -824, /*angle*/ 0, 45, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -1775, 0, -824, /*angle*/ 0, 315, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_CASTLE_DOOR, /*pos*/ -1100, 0, 2202, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 16), /*beh*/ bhvDoorWarp), - OBJECT(/*model*/ MODEL_CASTLE_CASTLE_DOOR, /*pos*/ -946, 0, 2202, /*angle*/ 0, 180, 0, /*behParam*/ (1 << 16), /*beh*/ bhvDoorWarp), + OBJECT(/*model*/ MODEL_CASTLE_DOOR, /*pos*/ -1100, 0, 2202, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 16), /*beh*/ bhvDoorWarp), + OBJECT(/*model*/ MODEL_CASTLE_DOOR, /*pos*/ -946, 0, 2202, /*angle*/ 0, 180, 0, /*behParam*/ (1 << 16), /*beh*/ bhvDoorWarp), OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -1023, -101, -5170, /*angle*/ 0, 0, 0, /*behParam*/ (2 << 16), /*beh*/ bhvDoorWarp), OBJECT(/*model*/ MODEL_CASTLE_DOOR_0_STARS, /*pos*/ -3122, 205, -793, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), OBJECT(/*model*/ MODEL_CASTLE_DOOR_1_STAR, /*pos*/ 256, 0, -1074, /*angle*/ 0, 0, 0, /*behParam*/ (1 << 24), /*beh*/ bhvDoor), @@ -69,7 +69,7 @@ static const LevelScript script_inside_castle_area_3_macro_objects[] = { OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -332, -767, 205, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 717, -1177, -869, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), OBJECT(/*model*/ MODEL_CASTLE_DOOR_0_STARS, /*pos*/ 1126, -1074, -2661, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_CASTLE_METAL_DOOR, /*pos*/ 7885, -1586, -511, /*angle*/ 0, 270, 0, /*behParam*/ (2 << 16), /*beh*/ bhvDoorWarp), + OBJECT(/*model*/ MODEL_METAL_DOOR, /*pos*/ 7885, -1586, -511, /*angle*/ 0, 270, 0, /*behParam*/ (2 << 16), /*beh*/ bhvDoorWarp), RETURN(), }; diff --git a/levels/ccm/script.c b/levels/ccm/script.c index fbb0a8afec..780bbc55d4 100644 --- a/levels/ccm/script.c +++ b/levels/ccm/script.c @@ -76,7 +76,7 @@ static const LevelScript script_ccm_area_1_macro_objects[] = { OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ -1146, -3583, 5919, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ -1768, 2560, -1793, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ -3443, 807, -2713, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), - // OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 2464, -4607, 4302, /*angle*/ 0, 222, 0, /*behParam*/ (20 << 16), /*beh*/ bhvDoorWarp), + OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 2464, -4607, 4302, /*angle*/ 0, 222, 0, /*behParam*/ (20 << 16), /*beh*/ bhvDoorWarp), RETURN(), }; diff --git a/levels/hmc/areas/script_vanilla.inc.c b/levels/hmc/areas/script_vanilla.inc.c index 98f14a44ad..5c6c34a121 100644 --- a/levels/hmc/areas/script_vanilla.inc.c +++ b/levels/hmc/areas/script_vanilla.inc.c @@ -2,6 +2,5 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_7), JUMP_LINK(script_func_global_18), JUMP_LINK(script_func_vo_hmc), -LOAD_MODEL_FROM_GEO(MODEL_WOODEN_DOOR, wooden_door_geo), -LOAD_MODEL_FROM_GEO(MODEL_HMC_METAL_DOOR, metal_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_METAL_DOOR, metal_door_geo), LOAD_MODEL_FROM_GEO(MODEL_HMC_HAZY_MAZE_DOOR, hazy_maze_door_geo), diff --git a/levels/hmc/script.c b/levels/hmc/script.c index 09a49be4e0..705fc552f6 100644 --- a/levels/hmc/script.c +++ b/levels/hmc/script.c @@ -108,12 +108,12 @@ static const LevelScript script_hmc_macro_objects[] = { OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ -3586, 1536, 647, /*angle*/ 0, 26, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 5911, -204, 870, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), OBJECT(/*model*/ MODEL_WOODEN_DOOR, /*pos*/ 3817, 205, 870, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_HMC_METAL_DOOR, /*pos*/ 1127, -409, -4709, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_HMC_METAL_DOOR, /*pos*/ -468, -4279, 6711, /*angle*/ 0, 45, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_HMC_METAL_DOOR, /*pos*/ -359, -4279, 6602, /*angle*/ 0, 225, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_HMC_METAL_DOOR, /*pos*/ -3634, 2355, -2764, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_HMC_METAL_DOOR, /*pos*/ -4863, 1843, -7551, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), - OBJECT(/*model*/ MODEL_HMC_METAL_DOOR, /*pos*/ 3328, -409, -6911, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_METAL_DOOR, /*pos*/ 1127, -409, -4709, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_METAL_DOOR, /*pos*/ -468, -4279, 6711, /*angle*/ 0, 45, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_METAL_DOOR, /*pos*/ -359, -4279, 6602, /*angle*/ 0, 225, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_METAL_DOOR, /*pos*/ -3634, 2355, -2764, /*angle*/ 0, 90, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_METAL_DOOR, /*pos*/ -4863, 1843, -7551, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), + OBJECT(/*model*/ MODEL_METAL_DOOR, /*pos*/ 3328, -409, -6911, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), OBJECT(/*model*/ MODEL_HMC_HAZY_MAZE_DOOR, /*pos*/ 358, 2048, 3661, /*angle*/ 0, 270, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), OBJECT(/*model*/ MODEL_HMC_HAZY_MAZE_DOOR, /*pos*/ -6553, 1536, 1459, /*angle*/ 0, 0, 0, /*behParam*/ (0 << 24), /*beh*/ bhvDoor), RETURN(), diff --git a/levels/scripts.c b/levels/scripts.c index c2cf6d8a4f..96ee037f3e 100644 --- a/levels/scripts.c +++ b/levels/scripts.c @@ -111,6 +111,7 @@ const LevelScript level_main_scripts_entry[] = { LOAD_MODEL_FROM_GEO(MODEL_EXPLOSION, explosion_geo), LOAD_MODEL_FROM_GEO(MODEL_DIRT_ANIMATION, dirt_animation_geo), LOAD_MODEL_FROM_GEO(MODEL_CARTOON_STAR, cartoon_star_geo), + LOAD_MODEL_FROM_GEO(MODEL_WOODEN_DOOR, wooden_door_geo), #ifdef IA8_30FPS_COINS LOAD_MODEL_FROM_GEO(MODEL_SILVER_COIN, silver_coin_geo), LOAD_MODEL_FROM_GEO(MODEL_SILVER_COIN_NO_SHADOW, silver_coin_no_shadow_geo), From 039c7538a3bc01072e84d4a2c2279dde6ef09c10 Mon Sep 17 00:00:00 2001 From: someone2639 Date: Fri, 7 Feb 2025 20:08:21 -0500 Subject: [PATCH 05/15] remove some more common1 things --- levels/castle_inside/areas/script_vanilla.inc.c | 3 --- levels/hmc/areas/script_vanilla.inc.c | 1 - levels/scripts.c | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/levels/castle_inside/areas/script_vanilla.inc.c b/levels/castle_inside/areas/script_vanilla.inc.c index 59a7a379cc..6753a7433c 100644 --- a/levels/castle_inside/areas/script_vanilla.inc.c +++ b/levels/castle_inside/areas/script_vanilla.inc.c @@ -1,8 +1,5 @@ JUMP_LINK(script_func_global_16), JUMP_LINK(script_func_vo_castle_inside), -LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR, castle_door_geo), -LOAD_MODEL_FROM_GEO(MODEL_METAL_DOOR, metal_door_geo), -LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR, castle_door_geo), LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR_0_STARS, castle_door_0_star_geo), LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR_1_STAR, castle_door_1_star_geo), LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR_3_STARS, castle_door_3_stars_geo), diff --git a/levels/hmc/areas/script_vanilla.inc.c b/levels/hmc/areas/script_vanilla.inc.c index 5c6c34a121..f0645c165f 100644 --- a/levels/hmc/areas/script_vanilla.inc.c +++ b/levels/hmc/areas/script_vanilla.inc.c @@ -2,5 +2,4 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_7), JUMP_LINK(script_func_global_18), JUMP_LINK(script_func_vo_hmc), -LOAD_MODEL_FROM_GEO(MODEL_METAL_DOOR, metal_door_geo), LOAD_MODEL_FROM_GEO(MODEL_HMC_HAZY_MAZE_DOOR, hazy_maze_door_geo), diff --git a/levels/scripts.c b/levels/scripts.c index 96ee037f3e..15bcda2eb1 100644 --- a/levels/scripts.c +++ b/levels/scripts.c @@ -112,6 +112,8 @@ const LevelScript level_main_scripts_entry[] = { LOAD_MODEL_FROM_GEO(MODEL_DIRT_ANIMATION, dirt_animation_geo), LOAD_MODEL_FROM_GEO(MODEL_CARTOON_STAR, cartoon_star_geo), LOAD_MODEL_FROM_GEO(MODEL_WOODEN_DOOR, wooden_door_geo), + LOAD_MODEL_FROM_GEO(MODEL_METAL_DOOR, metal_door_geo), + LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR, castle_door_geo), #ifdef IA8_30FPS_COINS LOAD_MODEL_FROM_GEO(MODEL_SILVER_COIN, silver_coin_geo), LOAD_MODEL_FROM_GEO(MODEL_SILVER_COIN_NO_SHADOW, silver_coin_no_shadow_geo), From 2c8ad6b3c2839aa4dcdc1e3f2735fe8a1052bda4 Mon Sep 17 00:00:00 2001 From: someone2639 Date: Fri, 7 Feb 2025 20:08:48 -0500 Subject: [PATCH 06/15] fully enum-ify, hardcode the level geos to halve model count --- include/model_ids.h | 222 ++++++++++++++++++++++++++++++-------------- 1 file changed, 154 insertions(+), 68 deletions(-) diff --git a/include/model_ids.h b/include/model_ids.h index 6e2e2eef87..577e319db7 100644 --- a/include/model_ids.h +++ b/include/model_ids.h @@ -9,61 +9,20 @@ enum ModelIDs { MODEL_MARIO, // mario_geo MODEL_LUIGI, // unused - /* Various static level geometry, the geo layout differs but terrain object presets treat them the same.*/ - - MODEL_LEVEL_GEOMETRY_03, - MODEL_LEVEL_GEOMETRY_04, - MODEL_LEVEL_GEOMETRY_05, - MODEL_LEVEL_GEOMETRY_06, - MODEL_LEVEL_GEOMETRY_07, - MODEL_LEVEL_GEOMETRY_08, - MODEL_LEVEL_GEOMETRY_09, - MODEL_LEVEL_GEOMETRY_0A, - MODEL_LEVEL_GEOMETRY_0B, - MODEL_LEVEL_GEOMETRY_0C, - MODEL_LEVEL_GEOMETRY_0D, - MODEL_LEVEL_GEOMETRY_0E, - MODEL_LEVEL_GEOMETRY_0F, - MODEL_LEVEL_GEOMETRY_10, - MODEL_LEVEL_GEOMETRY_11, - MODEL_LEVEL_GEOMETRY_12, - MODEL_LEVEL_GEOMETRY_13, - MODEL_LEVEL_GEOMETRY_14, - MODEL_LEVEL_GEOMETRY_15, - MODEL_LEVEL_GEOMETRY_16, - - MODEL_BOB_BUBBLY_TREE, // bubbly_tree_geo - MODEL_WDW_BUBBLY_TREE, // bubbly_tree_geo - MODEL_CASTLE_GROUNDS_BUBBLY_TREE, // bubbly_tree_geo - MODEL_WF_BUBBLY_TREE, // bubbly_tree_geo - MODEL_THI_BUBBLY_TREE, // bubbly_tree_geo + MODEL_BUBBLY_TREE, // bubbly_tree_geo MODEL_COURTYARD_SPIKY_TREE, // spiky_tree_geo - MODEL_CCM_SNOW_TREE, // snow_tree_geo - MODEL_SL_SNOW_TREE, // snow_tree_geo - MODEL_UNKNOWN_TREE_1A, // referenced in special presets, undefined + MODEL_SNOW_TREE, // snow_tree_geo MODEL_SSL_PALM_TREE, // palm_tree_geo - MODEL_CASTLE_CASTLE_DOOR_UNUSED, // castle_door_geo - unused, original id - MODEL_CASTLE_WOODEN_DOOR_UNUSED, // wooden_door_geo - unused, original id + MODEL_CASTLE_DOOR, // castle_door_geo + MODEL_WOODEN_DOOR, // wooden_door_geo MODEL_BBH_HAUNTED_DOOR, // haunted_door_geo - MODEL_HMC_WOODEN_DOOR, // wooden_door_geo - MODEL_UNKNOWN_DOOR_1E, // referenced in special presets, undefined - MODEL_HMC_METAL_DOOR, // metal_door_geo + MODEL_METAL_DOOR, // metal_door_geo MODEL_HMC_HAZY_MAZE_DOOR, // hazy_maze_door_geo - MODEL_UNKNOWN_DOOR_21, // referenced in special presets, undefined MODEL_CASTLE_DOOR_0_STARS, // castle_door_0_star_geo MODEL_CASTLE_DOOR_1_STAR, // castle_door_1_star_geo MODEL_CASTLE_DOOR_3_STARS, // castle_door_3_stars_geo MODEL_CASTLE_KEY_DOOR, // key_door_geo - MODEL_CASTLE_CASTLE_DOOR, // castle_door_geo - used duplicate - MODEL_CASTLE_GROUNDS_CASTLE_DOOR, // castle_door_geo - used duplicate - MODEL_CASTLE_WOODEN_DOOR, // wooden_door_geo - MODEL_COURTYARD_WOODEN_DOOR, // wooden_door_geo MODEL_CCM_CABIN_DOOR, // cabin_door_geo - MODEL_UNKNOWN_DOOR_28, // referenced in special presets, undefined - MODEL_CASTLE_METAL_DOOR, // metal_door_geo - MODEL_CASTLE_GROUNDS_METAL_DOOR, // metal_door_geo - MODEL_UNKNOWN_DOOR_2A, // referenced in special presets, undefined - MODEL_UNKNOWN_DOOR_2B, // referenced in special presets, undefined MODEL_WF_TOWER_TRAPEZOID_PLATORM, // wf_geo_000AF8 - unused MODEL_WF_TOWER_SQUARE_PLATORM, // wf_geo_000B10 MODEL_WF_TOWER_SQUARE_PLATORM_UNUSED, // wf_geo_000B38 - unused & duplicated @@ -551,29 +510,156 @@ enum ModelIDs { MODEL_SILVER_COIN_NO_SHADOW, // silver_coin_no_shadow_geo #endif + /* Various static level geometry */ + MODEL_bitdw_LEVEL_GEOMETRY_03, + MODEL_bitdw_LEVEL_GEOMETRY_04, + MODEL_bitdw_LEVEL_GEOMETRY_05, + MODEL_bitdw_LEVEL_GEOMETRY_06, + MODEL_bitdw_LEVEL_GEOMETRY_07, + MODEL_bitdw_LEVEL_GEOMETRY_08, + MODEL_bitdw_LEVEL_GEOMETRY_09, + MODEL_bitdw_LEVEL_GEOMETRY_0A, + MODEL_bitdw_LEVEL_GEOMETRY_0B, + MODEL_bitdw_LEVEL_GEOMETRY_0C, + MODEL_bitdw_LEVEL_GEOMETRY_0D, + MODEL_bitdw_LEVEL_GEOMETRY_0E, + MODEL_bitdw_LEVEL_GEOMETRY_0F, + MODEL_bitdw_LEVEL_GEOMETRY_10, + MODEL_bitdw_LEVEL_GEOMETRY_11, + MODEL_bitfs_LEVEL_GEOMETRY_03, + MODEL_bitfs_LEVEL_GEOMETRY_04, + MODEL_bitfs_LEVEL_GEOMETRY_05, + MODEL_bitfs_LEVEL_GEOMETRY_06, + MODEL_bitfs_LEVEL_GEOMETRY_07, + MODEL_bitfs_LEVEL_GEOMETRY_08, + MODEL_bitfs_LEVEL_GEOMETRY_09, + MODEL_bitfs_LEVEL_GEOMETRY_0A, + MODEL_bitfs_LEVEL_GEOMETRY_0B, + MODEL_bitfs_LEVEL_GEOMETRY_0C, + MODEL_bitfs_LEVEL_GEOMETRY_0D, + MODEL_bitfs_LEVEL_GEOMETRY_0E, + MODEL_bitfs_LEVEL_GEOMETRY_0F, + MODEL_bitfs_LEVEL_GEOMETRY_10, + MODEL_bitfs_LEVEL_GEOMETRY_11, + MODEL_bitfs_LEVEL_GEOMETRY_12, + MODEL_bitfs_LEVEL_GEOMETRY_13, + MODEL_bitfs_LEVEL_GEOMETRY_14, + MODEL_bitfs_LEVEL_GEOMETRY_15, + MODEL_bits_LEVEL_GEOMETRY_03, + MODEL_bits_LEVEL_GEOMETRY_04, + MODEL_bits_LEVEL_GEOMETRY_05, + MODEL_bits_LEVEL_GEOMETRY_06, + MODEL_bits_LEVEL_GEOMETRY_07, + MODEL_bits_LEVEL_GEOMETRY_08, + MODEL_bits_LEVEL_GEOMETRY_09, + MODEL_bits_LEVEL_GEOMETRY_0A, + MODEL_bits_LEVEL_GEOMETRY_0B, + MODEL_bits_LEVEL_GEOMETRY_0C, + MODEL_bits_LEVEL_GEOMETRY_0D, + MODEL_bits_LEVEL_GEOMETRY_0E, + MODEL_bits_LEVEL_GEOMETRY_0F, + MODEL_bits_LEVEL_GEOMETRY_10, + MODEL_bits_LEVEL_GEOMETRY_11, + MODEL_bits_LEVEL_GEOMETRY_12, + MODEL_bits_LEVEL_GEOMETRY_13, + MODEL_bits_LEVEL_GEOMETRY_14, + MODEL_bowser_1_LEVEL_GEOMETRY_03, + MODEL_bowser_3_LEVEL_GEOMETRY_03, + MODEL_castle_courtyard_LEVEL_GEOMETRY_03, + MODEL_castle_grounds_LEVEL_GEOMETRY_03, + MODEL_ccm_LEVEL_GEOMETRY_03, + MODEL_ccm_LEVEL_GEOMETRY_04, + MODEL_ccm_LEVEL_GEOMETRY_05, + MODEL_ccm_LEVEL_GEOMETRY_06, + MODEL_ccm_LEVEL_GEOMETRY_07, + MODEL_lll_LEVEL_GEOMETRY_03, + MODEL_lll_LEVEL_GEOMETRY_04, + MODEL_lll_LEVEL_GEOMETRY_05, + MODEL_lll_LEVEL_GEOMETRY_06, + MODEL_lll_LEVEL_GEOMETRY_07, + MODEL_lll_LEVEL_GEOMETRY_08, + MODEL_lll_LEVEL_GEOMETRY_0A, + MODEL_lll_LEVEL_GEOMETRY_0B, + MODEL_lll_LEVEL_GEOMETRY_0C, + MODEL_lll_LEVEL_GEOMETRY_0D, + MODEL_lll_LEVEL_GEOMETRY_0E, + MODEL_rr_LEVEL_GEOMETRY_03, + MODEL_rr_LEVEL_GEOMETRY_04, + MODEL_rr_LEVEL_GEOMETRY_05, + MODEL_rr_LEVEL_GEOMETRY_06, + MODEL_rr_LEVEL_GEOMETRY_07, + MODEL_rr_LEVEL_GEOMETRY_08, + MODEL_rr_LEVEL_GEOMETRY_09, + MODEL_rr_LEVEL_GEOMETRY_0A, + MODEL_rr_LEVEL_GEOMETRY_0B, + MODEL_rr_LEVEL_GEOMETRY_0C, + MODEL_rr_LEVEL_GEOMETRY_0D, + MODEL_rr_LEVEL_GEOMETRY_0E, + MODEL_rr_LEVEL_GEOMETRY_0F, + MODEL_rr_LEVEL_GEOMETRY_10, + MODEL_rr_LEVEL_GEOMETRY_11, + MODEL_rr_LEVEL_GEOMETRY_12, + MODEL_rr_LEVEL_GEOMETRY_13, + MODEL_rr_LEVEL_GEOMETRY_14, + MODEL_rr_LEVEL_GEOMETRY_15, + MODEL_rr_LEVEL_GEOMETRY_16, + MODEL_ssl_LEVEL_GEOMETRY_03, + MODEL_ssl_LEVEL_GEOMETRY_04, + MODEL_thi_LEVEL_GEOMETRY_03, + MODEL_totwc_LEVEL_GEOMETRY_03, + MODEL_ttm_LEVEL_GEOMETRY_03, + MODEL_ttm_LEVEL_GEOMETRY_04, + MODEL_ttm_LEVEL_GEOMETRY_05, + MODEL_ttm_LEVEL_GEOMETRY_06, + MODEL_ttm_LEVEL_GEOMETRY_07, + MODEL_ttm_LEVEL_GEOMETRY_08, + MODEL_ttm_LEVEL_GEOMETRY_09, + MODEL_ttm_LEVEL_GEOMETRY_0A, + MODEL_ttm_LEVEL_GEOMETRY_0B, + MODEL_ttm_LEVEL_GEOMETRY_0C, + MODEL_ttm_LEVEL_GEOMETRY_0D, + MODEL_ttm_LEVEL_GEOMETRY_0F, + MODEL_ttm_LEVEL_GEOMETRY_10, + MODEL_ttm_LEVEL_GEOMETRY_11, + MODEL_ttm_LEVEL_GEOMETRY_12, + MODEL_ttm_LEVEL_GEOMETRY_13, + MODEL_ttm_LEVEL_GEOMETRY_14, + MODEL_ttm_LEVEL_GEOMETRY_15, + MODEL_ttm_LEVEL_GEOMETRY_16, + MODEL_wf_LEVEL_GEOMETRY_03, + MODEL_wf_LEVEL_GEOMETRY_04, + MODEL_wf_LEVEL_GEOMETRY_05, + MODEL_wf_LEVEL_GEOMETRY_06, + MODEL_wf_LEVEL_GEOMETRY_07, + MODEL_wf_LEVEL_GEOMETRY_08, + MODEL_wf_LEVEL_GEOMETRY_09, + MODEL_wf_LEVEL_GEOMETRY_0A, + MODEL_wf_LEVEL_GEOMETRY_0C, + MODEL_wf_LEVEL_GEOMETRY_0E, + MODEL_wf_LEVEL_GEOMETRY_0F, + MODEL_wf_LEVEL_GEOMETRY_11, + MODEL_wf_LEVEL_GEOMETRY_12, + + // Menu Models + MODEL_MAIN_MENU_MARIO_SAVE_BUTTON, // main_menu_geo_0001D0 + MODEL_MAIN_MENU_RED_ERASE_BUTTON, // main_menu_geo_000290 + MODEL_MAIN_MENU_BLUE_COPY_BUTTON, // main_menu_geo_0002B8 + MODEL_MAIN_MENU_YELLOW_FILE_BUTTON, // main_menu_geo_0002E0 + MODEL_MAIN_MENU_GREEN_SCORE_BUTTON, // main_menu_geo_000308 + MODEL_MAIN_MENU_MARIO_SAVE_BUTTON_FADE, // main_menu_geo_000200 + MODEL_MAIN_MENU_MARIO_NEW_BUTTON, // main_menu_geo_000230 + MODEL_MAIN_MENU_MARIO_NEW_BUTTON_FADE, // main_menu_geo_000260 + MODEL_MAIN_MENU_PURPLE_SOUND_BUTTON, // main_menu_geo_000330 + MODEL_MAIN_MENU_GENERIC_BUTTON, // main_menu_geo_000358 + + // level model aliases to level geometry IDs. Possibly a relic from an older level + // format that used to rely on level geometry objects. (seen in WF, LLL, etc) + MODEL_LLL_ROTATING_HEXAGONAL_PLATFORM, // lll_geo_000A78 + MODEL_WF_GIANT_POLE, // wf_geo_000AE0 + MODEL_WF_ROTATING_PLATFORM, // wf_geo_0009B8 + MODEL_WARP_PIPE, // warp_pipe_geo + MODEL_ID_COUNT, }; -// Menu Models (overwrites Level Geometry IDs) -#define MODEL_MAIN_MENU_MARIO_SAVE_BUTTON MODEL_LEVEL_GEOMETRY_03 // main_menu_geo_0001D0 -#define MODEL_MAIN_MENU_RED_ERASE_BUTTON MODEL_LEVEL_GEOMETRY_04 // main_menu_geo_000290 -#define MODEL_MAIN_MENU_BLUE_COPY_BUTTON MODEL_LEVEL_GEOMETRY_05 // main_menu_geo_0002B8 -#define MODEL_MAIN_MENU_YELLOW_FILE_BUTTON MODEL_LEVEL_GEOMETRY_06 // main_menu_geo_0002E0 -#define MODEL_MAIN_MENU_GREEN_SCORE_BUTTON MODEL_LEVEL_GEOMETRY_07 // main_menu_geo_000308 -#define MODEL_MAIN_MENU_MARIO_SAVE_BUTTON_FADE MODEL_LEVEL_GEOMETRY_08 // main_menu_geo_000200 -#define MODEL_MAIN_MENU_MARIO_NEW_BUTTON MODEL_LEVEL_GEOMETRY_09 // main_menu_geo_000230 -#define MODEL_MAIN_MENU_MARIO_NEW_BUTTON_FADE MODEL_LEVEL_GEOMETRY_0A // main_menu_geo_000260 -#define MODEL_MAIN_MENU_PURPLE_SOUND_BUTTON MODEL_LEVEL_GEOMETRY_0B // main_menu_geo_000330 -#define MODEL_MAIN_MENU_GENERIC_BUTTON MODEL_LEVEL_GEOMETRY_0C // main_menu_geo_000358 - -// level model aliases to level geometry IDs. Possibly a relic from an older level -// format that used to rely on level geometry objects. (seen in WF, LLL, etc) -#define MODEL_LLL_ROTATING_HEXAGONAL_PLATFORM MODEL_LEVEL_GEOMETRY_09 // lll_geo_000A78 -#define MODEL_WF_GIANT_POLE MODEL_LEVEL_GEOMETRY_0D // wf_geo_000AE0 -#define MODEL_WF_ROTATING_PLATFORM MODEL_LEVEL_GEOMETRY_10 // wf_geo_0009B8 -#define MODEL_BITDW_WARP_PIPE MODEL_LEVEL_GEOMETRY_12 // warp_pipe_geo -#define MODEL_THI_WARP_PIPE MODEL_LEVEL_GEOMETRY_16 // warp_pipe_geo -#define MODEL_VCUTM_WARP_PIPE MODEL_LEVEL_GEOMETRY_16 // warp_pipe_geo -#define MODEL_CASTLE_GROUNDS_WARP_PIPE MODEL_LEVEL_GEOMETRY_16 // warp_pipe_geo - #endif // MODEL_IDS_H From 0e7e9193e4c104ebe144b92522a98a9a2f3edafb Mon Sep 17 00:00:00 2001 From: someone2639 Date: Fri, 7 Feb 2025 20:09:06 -0500 Subject: [PATCH 07/15] wf level geo renames --- actors/vanilla_actors/wf/geo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actors/vanilla_actors/wf/geo.c b/actors/vanilla_actors/wf/geo.c index 87085bdbf8..0ada940f85 100644 --- a/actors/vanilla_actors/wf/geo.c +++ b/actors/vanilla_actors/wf/geo.c @@ -50,7 +50,7 @@ const LevelScript script_func_vo_wf[] = { LOAD_MODEL_FROM_GEO(MODEL_WF_KICKABLE_BOARD_FELLED, wf_geo_000BC8), LOAD_MODEL_FROM_GEO(MODEL_WF_GIANT_POLE, wf_geo_000AE0), LOAD_MODEL_FROM_GEO(MODEL_WF_ROTATING_PLATFORM, wf_geo_0009B8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, wf_geo_0008A8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, wf_geo_0008E8), + LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_08, wf_geo_0008A8), + LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_09, wf_geo_0008E8), RETURN(), }; From a5a6e83d01a79424cebea8f02c24e9a282269ff1 Mon Sep 17 00:00:00 2001 From: someone2639 Date: Fri, 7 Feb 2025 20:09:34 -0500 Subject: [PATCH 08/15] rename models in behavior code --- src/game/behaviors/door.inc.c | 4 ++-- src/game/behaviors/tree_particles.inc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game/behaviors/door.inc.c b/src/game/behaviors/door.inc.c index 17c84832b2..93f90d1e5e 100644 --- a/src/game/behaviors/door.inc.c +++ b/src/game/behaviors/door.inc.c @@ -34,7 +34,7 @@ void set_door_camera_event(void) { } void play_door_open_noise(void) { - s32 isMetalDoor = cur_obj_has_model(MODEL_HMC_METAL_DOOR); + s32 isMetalDoor = cur_obj_has_model(MODEL_METAL_DOOR); if (o->oTimer == 0) { cur_obj_play_sound_2(sDoorOpenSounds[isMetalDoor]); gTimeStopState |= TIME_STOP_MARIO_OPENED_DOOR; @@ -45,7 +45,7 @@ void play_door_open_noise(void) { } void play_warp_door_open_noise(void) { - s32 isMetalDoor = cur_obj_has_model(MODEL_HMC_METAL_DOOR); + s32 isMetalDoor = cur_obj_has_model(MODEL_METAL_DOOR); if (o->oTimer == 30) { cur_obj_play_sound_2(sDoorCloseSounds[isMetalDoor]); } diff --git a/src/game/behaviors/tree_particles.inc.c b/src/game/behaviors/tree_particles.inc.c index 3f60b7d3b8..bfff1a176e 100644 --- a/src/game/behaviors/tree_particles.inc.c +++ b/src/game/behaviors/tree_particles.inc.c @@ -49,8 +49,8 @@ void bhv_snow_leaf_particle_spawn_init(void) { struct Object *nearestTree = cur_obj_nearest_object_with_behavior(bhvTree); if (nearestTree == NULL) return; isSnow = - nearestTree->header.gfx.sharedChild == gLoadedGraphNodes[MODEL_CCM_SNOW_TREE] - || nearestTree->header.gfx.sharedChild == gLoadedGraphNodes[MODEL_SL_SNOW_TREE]; + nearestTree->header.gfx.sharedChild == gLoadedGraphNodes[MODEL_SNOW_TREE] + || nearestTree->header.gfx.sharedChild == gLoadedGraphNodes[MODEL_SNOW_TREE]; if (isSnow) { if (random_float() < 0.5f) { From 0cdc7f42ec5e4d25e279d3cd676b824e08523468 Mon Sep 17 00:00:00 2001 From: someone2639 Date: Fri, 7 Feb 2025 20:10:12 -0500 Subject: [PATCH 09/15] mario_actions_cutscene single renaming --- src/game/mario_actions_cutscene.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/mario_actions_cutscene.c b/src/game/mario_actions_cutscene.c index e09a64b4ac..04819dc584 100644 --- a/src/game/mario_actions_cutscene.c +++ b/src/game/mario_actions_cutscene.c @@ -1679,7 +1679,7 @@ static void intro_cutscene_peach_lakitu_scene(struct MarioState *m) { if ((s16) m->statusForCamera->cameraEvent != CAM_EVENT_START_INTRO) { if (m->actionTimer++ == TIMER_SPAWN_PIPE) { sIntroWarpPipeObj = - spawn_object_abs_with_rot(gCurrentObject, 0, MODEL_CASTLE_GROUNDS_WARP_PIPE, + spawn_object_abs_with_rot(gCurrentObject, 0, MODEL_WARP_PIPE, bhvStaticObject, -1328, 60, 4664, 0, 180, 0); advance_cutscene_step(m); } From 0bdbd6b8f2cfefe360b843799d503b4164d6ee0b Mon Sep 17 00:00:00 2001 From: someone2639 Date: Fri, 7 Feb 2025 20:54:49 -0500 Subject: [PATCH 10/15] migrate warp pipe and bubbly tree to one global load --- levels/bitdw/areas/script_vanilla.inc.c | 1 - levels/bits/areas/script_vanilla.inc.c | 1 - levels/bob/areas/script_vanilla.inc.c | 1 - levels/castle_grounds/areas/script_vanilla.inc.c | 4 ---- levels/scripts.c | 4 +++- levels/thi/areas/script_vanilla_load.inc.c | 2 -- levels/vcutm/areas/script_vanilla.inc.c | 1 - levels/wdw/areas/script_vanilla.inc.c | 1 - levels/wf/areas/script_vanilla_load.inc.c | 1 - 9 files changed, 3 insertions(+), 13 deletions(-) diff --git a/levels/bitdw/areas/script_vanilla.inc.c b/levels/bitdw/areas/script_vanilla.inc.c index bd7bffdc71..b98ca0eb70 100644 --- a/levels/bitdw/areas/script_vanilla.inc.c +++ b/levels/bitdw/areas/script_vanilla.inc.c @@ -17,4 +17,3 @@ LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_0E, geo_bitdw_0004C8), LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_0F, geo_bitdw_0004E0), LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_10, geo_bitdw_0004F8), LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_11, geo_bitdw_000510), -LOAD_MODEL_FROM_GEO(MODEL_WARP_PIPE, warp_pipe_geo), diff --git a/levels/bits/areas/script_vanilla.inc.c b/levels/bits/areas/script_vanilla.inc.c index 1a4a5eb918..9bf30ce085 100644 --- a/levels/bits/areas/script_vanilla.inc.c +++ b/levels/bits/areas/script_vanilla.inc.c @@ -19,4 +19,3 @@ LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_11, bits_geo_000580), LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_12, bits_geo_000598), LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_13, bits_geo_0005B0), LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_14, bits_geo_0005C8), -LOAD_MODEL_FROM_GEO(MODEL_BITS_WARP_PIPE, warp_pipe_geo), diff --git a/levels/bob/areas/script_vanilla.inc.c b/levels/bob/areas/script_vanilla.inc.c index 60a0d7f805..23d977d4bd 100644 --- a/levels/bob/areas/script_vanilla.inc.c +++ b/levels/bob/areas/script_vanilla.inc.c @@ -2,4 +2,3 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_4), JUMP_LINK(script_func_global_15), JUMP_LINK(script_func_vo_bob), -LOAD_MODEL_FROM_GEO(MODEL_BUBBLY_TREE, bubbly_tree_geo), diff --git a/levels/castle_grounds/areas/script_vanilla.inc.c b/levels/castle_grounds/areas/script_vanilla.inc.c index a15b60c877..84a0cb7ede 100644 --- a/levels/castle_grounds/areas/script_vanilla.inc.c +++ b/levels/castle_grounds/areas/script_vanilla.inc.c @@ -3,7 +3,3 @@ JUMP_LINK(script_func_global_11), JUMP_LINK(script_func_global_16), JUMP_LINK(script_func_vo_castle_grounds), LOAD_MODEL_FROM_GEO(MODEL_castle_grounds_LEVEL_GEOMETRY_03, castle_grounds_geo_0006F4), -LOAD_MODEL_FROM_GEO(MODEL_BUBBLY_TREE, bubbly_tree_geo), -LOAD_MODEL_FROM_GEO(MODEL_WARP_PIPE, warp_pipe_geo), -LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR, castle_door_geo), -LOAD_MODEL_FROM_GEO(MODEL_METAL_DOOR, metal_door_geo), diff --git a/levels/scripts.c b/levels/scripts.c index 15bcda2eb1..ee779e09f1 100644 --- a/levels/scripts.c +++ b/levels/scripts.c @@ -88,12 +88,12 @@ const LevelScript level_main_scripts_entry[] = { LOAD_MODEL_FROM_GEO(MODEL_SPARKLES_ANIMATION, sparkles_animation_geo), LOAD_MODEL_FROM_DL( MODEL_SAND_DUST, sand_seg3_dl_particle, LAYER_OCCLUDE_SILHOUETTE_ALPHA), LOAD_MODEL_FROM_GEO(MODEL_BUTTERFLY, butterfly_geo), - // LOAD_MODEL_FROM_GEO(MODEL_BURN_SMOKE_UNUSED, burn_smoke_geo), LOAD_MODEL_FROM_DL( MODEL_PEBBLE, pebble_seg3_dl_0301CB00, LAYER_OCCLUDE_SILHOUETTE_ALPHA), LOAD_MODEL_FROM_GEO(MODEL_MIST, mist_geo), LOAD_MODEL_FROM_GEO(MODEL_WHITE_PUFF, white_puff_geo), LOAD_MODEL_FROM_DL( MODEL_WHITE_PARTICLE_DL, white_particle_dl, LAYER_OCCLUDE_SILHOUETTE_ALPHA), LOAD_MODEL_FROM_GEO(MODEL_WHITE_PARTICLE, white_particle_geo), + // common1 LOAD_MODEL_FROM_GEO(MODEL_YELLOW_COIN_NO_SHADOW, yellow_coin_no_shadow_geo), LOAD_MODEL_FROM_GEO(MODEL_BLUE_COIN, blue_coin_geo), LOAD_MODEL_FROM_GEO(MODEL_BLUE_COIN_NO_SHADOW, blue_coin_no_shadow_geo), @@ -114,6 +114,8 @@ const LevelScript level_main_scripts_entry[] = { LOAD_MODEL_FROM_GEO(MODEL_WOODEN_DOOR, wooden_door_geo), LOAD_MODEL_FROM_GEO(MODEL_METAL_DOOR, metal_door_geo), LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR, castle_door_geo), + LOAD_MODEL_FROM_GEO(MODEL_WARP_PIPE, warp_pipe_geo), + LOAD_MODEL_FROM_GEO(MODEL_BUBBLY_TREE, bubbly_tree_geo), #ifdef IA8_30FPS_COINS LOAD_MODEL_FROM_GEO(MODEL_SILVER_COIN, silver_coin_geo), LOAD_MODEL_FROM_GEO(MODEL_SILVER_COIN_NO_SHADOW, silver_coin_no_shadow_geo), diff --git a/levels/thi/areas/script_vanilla_load.inc.c b/levels/thi/areas/script_vanilla_load.inc.c index d4e6e3c9f6..8e54429fd6 100644 --- a/levels/thi/areas/script_vanilla_load.inc.c +++ b/levels/thi/areas/script_vanilla_load.inc.c @@ -2,6 +2,4 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_12), JUMP_LINK(script_func_global_15), JUMP_LINK(script_func_vo_thi), -LOAD_MODEL_FROM_GEO(MODEL_BUBBLY_TREE, bubbly_tree_geo), LOAD_MODEL_FROM_GEO(MODEL_thi_LEVEL_GEOMETRY_03, thi_geo_0005F0), -LOAD_MODEL_FROM_GEO(MODEL_WARP_PIPE, warp_pipe_geo), diff --git a/levels/vcutm/areas/script_vanilla.inc.c b/levels/vcutm/areas/script_vanilla.inc.c index d4282d985f..b3d110f8c1 100644 --- a/levels/vcutm/areas/script_vanilla.inc.c +++ b/levels/vcutm/areas/script_vanilla.inc.c @@ -1,4 +1,3 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_9), JUMP_LINK(script_func_vo_vcutm), -LOAD_MODEL_FROM_GEO(MODEL_WARP_PIPE, warp_pipe_geo), diff --git a/levels/wdw/areas/script_vanilla.inc.c b/levels/wdw/areas/script_vanilla.inc.c index 80d1461ddf..2f87b3bf5d 100644 --- a/levels/wdw/areas/script_vanilla.inc.c +++ b/levels/wdw/areas/script_vanilla.inc.c @@ -2,4 +2,3 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_2), JUMP_LINK(script_func_global_14), JUMP_LINK(script_func_vo_wdw), -LOAD_MODEL_FROM_GEO(MODEL_BUBBLY_TREE, bubbly_tree_geo), diff --git a/levels/wf/areas/script_vanilla_load.inc.c b/levels/wf/areas/script_vanilla_load.inc.c index 7a581a8eef..f0de738886 100644 --- a/levels/wf/areas/script_vanilla_load.inc.c +++ b/levels/wf/areas/script_vanilla_load.inc.c @@ -2,7 +2,6 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_2), JUMP_LINK(script_func_global_15), JUMP_LINK(script_func_vo_wf), -LOAD_MODEL_FROM_GEO(MODEL_BUBBLY_TREE, bubbly_tree_geo), LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_03, wf_geo_0007E0), LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_04, wf_geo_000820), LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_05, wf_geo_000860), From 4060e2527405fbca12d55b9eedf802b98e33e7c9 Mon Sep 17 00:00:00 2001 From: someone2639 Date: Fri, 7 Feb 2025 21:10:28 -0500 Subject: [PATCH 11/15] shorten ID impact to 511 --- include/model_ids.h | 43 +------------------------------------------ 1 file changed, 1 insertion(+), 42 deletions(-) diff --git a/include/model_ids.h b/include/model_ids.h index 577e319db7..89b64b9ab0 100644 --- a/include/model_ids.h +++ b/include/model_ids.h @@ -138,8 +138,6 @@ enum ModelIDs { MODEL_RR_TRICKY_TRIANGLES_FRAME3, // rr_geo_0009A0 MODEL_RR_TRICKY_TRIANGLES_FRAME4, // rr_geo_0009B8 - // castle grounds - // bitdw MODEL_BITDW_SQUARE_PLATFORM, // geo_bitdw_000558 MODEL_BITDW_SEESAW_PLATFORM, // geo_bitdw_000540 @@ -169,8 +167,6 @@ enum ModelIDs { MODEL_BITFS_TUMBLING_PLATFORM_PART, // bitfs_geo_0006D8 MODEL_BITFS_TUMBLING_PLATFORM, // bitfs_geo_0006F0 - // sa - // bits MODEL_BITS_SLIDING_PLATFORM, // bits_geo_0005E0 MODEL_BITS_TWIN_SLIDING_PLATFORMS, // bits_geo_0005F8 @@ -229,23 +225,11 @@ enum ModelIDs { MODEL_WF_TOWER_DOOR, // wf_geo_000BE0 MODEL_WF_KICKABLE_BOARD_FELLED, // wf_geo_000BC8 - // ending - // castle grounds MODEL_CASTLE_GROUNDS_VCUTM_GRILL, // castle_grounds_geo_00070C MODEL_CASTLE_GROUNDS_FLAG, // castle_grounds_geo_000660 MODEL_CASTLE_GROUNDS_CANNON_GRILL, // castle_grounds_geo_000724 - // pss - - // cotmc - - // totwc - - // bowser 1 - - // wmotr - // bowser 2 MODEL_BOWSER_2_TILTING_ARENA, // bowser_2_geo_000170 @@ -343,10 +327,6 @@ enum ModelIDs { MODEL_WIGGLER_BODY, // wiggler_body_geo MODEL_BUBBA, // bubba_geo - // referenced in macro presets. Unknown usage. - MODEL_UNKNOWN_54, - MODEL_UNKNOWN_58, - // second set of actor bins, (0x64-0x73) // group 12 MODEL_BOWSER, // bowser_geo @@ -401,8 +381,6 @@ enum ModelIDs { MODEL_STAR, // star_geo MODEL_TTM_SLIDE_EXIT_PODIUM, // ttm_geo_000DF4 MODEL_WOODEN_SIGNPOST, // wooden_signpost_geo - MODEL_UNKNOWN_7D, // referenced in macro presets. Unknown usage - // find me MODEL_CANNON_BARREL, // cannon_barrel_geo MODEL_CANNON_BASE, // cannon_base_geo MODEL_BREAKABLE_BOX, // breakable_box_geo @@ -418,23 +396,13 @@ enum ModelIDs { MODEL_DIRT_ANIMATION, // dirt_animation_geo MODEL_CARTOON_STAR, // cartoon_star_geo MODEL_BLUE_COIN_SWITCH, // blue_coin_switch_geo - // find me MODEL_MIST, // mist_geo MODEL_SPARKLES_ANIMATION, // sparkles_animation_geo MODEL_RED_FLAME, // red_flame_geo MODEL_BLUE_FLAME, // blue_flame_geo - // find me - // find me MODEL_BURN_SMOKE, // burn_smoke_geo MODEL_SPARKLES, // sparkles_geo MODEL_SMOKE, // smoke_geo - // find me - // find me - // find me - // find me - // find me - MODEL_BURN_SMOKE_UNUSED, // burn_smoke_geo - unused & duplicated - // find me MODEL_WHITE_PARTICLE_DL, // white_particle_dl MODEL_SAND_DUST, // sand_seg3_dl_particle MODEL_WHITE_PARTICLE, // white_particle_dl @@ -446,10 +414,7 @@ enum ModelIDs { MODEL_IDLE_WATER_WAVE, // idle_water_wave_geo MODEL_WATER_SPLASH, // water_splash_geo MODEL_BUBBLE, // bubble_geo - // find me MODEL_PURPLE_MARBLE, // purple_marble_geo - // find me - MODEL_UNKNOWN_AC, // according to an special preset, it was the original id of the castle floor trap MODEL_WF_SLIDING_PLATFORM, // wf_geo_000A98 MODEL_WF_SMALL_BOMP, // wf_geo_000A00 MODEL_WF_ROTATING_WOODEN_PLATFORM, // wf_geo_000A58 @@ -462,21 +427,16 @@ enum ModelIDs { MODEL_TRAMPOLINE, // springboard_top_geo (unused) MODEL_TRAMPOLINE_CENTER, // springboard_spring_geo (unused) MODEL_TRAMPOLINE_BASE, // springboard_bottom_geo (unused) - MODEL_UNKNOWN_B8, // referenced in special presets as a static object. Unknown usage MODEL_FISH, // fish_geo - fish without shadow, used MODEL_FISH_SHADOW, // fish_shadow_geo - fish with shadow, unused MODEL_BUTTERFLY, // butterfly_geo MODEL_BLACK_BOBOMB, // black_bobomb_geo - // find me MODEL_KOOPA_SHELL, // koopa_shell_geo MODEL_KOOPA_WITHOUT_SHELL, // koopa_without_shell_geo MODEL_GOOMBA, // goomba_geo MODEL_SEAWEED, // seaweed_geo MODEL_AMP, // dAmpGeo MODEL_BOBOMB_BUDDY, // bobomb_buddy_geo - // find me - // find me - // find me MODEL_SSL_TOX_BOX, // ssl_geo_000630 MODEL_BOWSER_KEY_CUTSCENE, // bowser_key_cutscene_geo MODEL_DL_CANNON_LID, // cannon_closed_seg8_dl_080048E0 @@ -489,7 +449,6 @@ enum ModelIDs { MODEL_CASTLE_STAR_DOOR_30_STARS, // castle_geo_000F00 MODEL_CASTLE_STAR_DOOR_50_STARS, // castle_geo_000F00 MODEL_CCM_SNOWMAN_BASE, // ccm_geo_0003F0 - // find me MODEL_1UP, // mushroom_1up_geo MODEL_CASTLE_STAR_DOOR_8_STARS, // castle_geo_000F00 MODEL_CASTLE_STAR_DOOR_70_STARS, // castle_geo_000F00 @@ -510,7 +469,7 @@ enum ModelIDs { MODEL_SILVER_COIN_NO_SHADOW, // silver_coin_no_shadow_geo #endif - /* Various static level geometry */ + /* Various unnamed vanilla static level models */ MODEL_bitdw_LEVEL_GEOMETRY_03, MODEL_bitdw_LEVEL_GEOMETRY_04, MODEL_bitdw_LEVEL_GEOMETRY_05, From 8d235cbc287a8e6a816243e02ecfabcab30305a3 Mon Sep 17 00:00:00 2001 From: someone2639 Date: Fri, 7 Feb 2025 21:22:52 -0500 Subject: [PATCH 12/15] oops debug tool --- tools/rename_level_objects.py | 37 ----------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 tools/rename_level_objects.py diff --git a/tools/rename_level_objects.py b/tools/rename_level_objects.py deleted file mode 100644 index 2eeec3c27d..0000000000 --- a/tools/rename_level_objects.py +++ /dev/null @@ -1,37 +0,0 @@ - - -mods = [ -"special_level_geo_03", -"special_level_geo_04", -"special_level_geo_05", -"special_level_geo_06", -"special_level_geo_07", -"special_level_geo_08", -"special_level_geo_09", -"special_level_geo_0A", -"special_level_geo_0B", -"special_level_geo_0C", -"special_level_geo_0D", -"special_level_geo_0E", -"special_level_geo_0F", -"special_level_geo_10", -"special_level_geo_11", -"special_level_geo_12", -"special_level_geo_13", -"special_level_geo_14", -"special_level_geo_15", -"special_level_geo_16", -] - -import glob, os - -level_folders = glob.glob("levels/**"); -lf = [i for i in level_folders if os.path.isdir(i)] - - -for i in lf: - lname = i.split("/")[-1] - for m in mods: - m_old = m - m_new = m.replace("level", f"{lname}_level") - os.system(f"git grep -rl {m_old} {i} | xargs sed -i 's|{m_old}|{m_new}|g'") From bc71028a6631b7160e12bf186a2a0013d93ab500 Mon Sep 17 00:00:00 2001 From: someone2639 Date: Sat, 8 Feb 2025 00:53:35 -0500 Subject: [PATCH 13/15] revert level specific geometry models --- actors/vanilla_actors/wf/geo.c | 4 +- include/model_ids.h | 150 +++--------------- levels/bitdw/areas/script_vanilla.inc.c | 30 ++-- levels/bitdw/script.c | 44 ++--- levels/bitfs/areas/script_vanilla_load.inc.c | 38 ++--- levels/bitfs/script.c | 46 +++--- levels/bits/areas/script_vanilla.inc.c | 36 ++--- levels/bits/script.c | 42 ++--- levels/bowser_1/script.c | 34 ++-- levels/bowser_3/script.c | 12 +- .../areas/script_vanilla.inc.c | 2 +- levels/castle_courtyard/script.c | 2 +- .../castle_grounds/areas/script_vanilla.inc.c | 2 +- levels/castle_grounds/script.c | 2 +- levels/ccm/areas/script_vanilla.inc.c | 10 +- levels/ccm/script.c | 12 +- levels/lll/areas/script_vanilla.inc.c | 22 +-- levels/lll/script.c | 28 ++-- levels/rr/areas/script_vanilla.inc.c | 40 ++--- levels/rr/script.c | 44 ++--- levels/ssl/areas/script_vanilla.inc.c | 4 +- levels/ssl/script.c | 16 +- levels/thi/areas/script_vanilla_load.inc.c | 2 +- levels/thi/script.c | 2 +- levels/totwc/areas/script_vanilla.inc.c | 2 +- levels/totwc/script.c | 44 ++--- levels/ttm/areas/script_vanilla.inc.c | 38 ++--- levels/ttm/script.c | 56 +++---- levels/wf/areas/script_vanilla_load.inc.c | 22 +-- levels/wf/script.c | 28 ++-- 30 files changed, 353 insertions(+), 461 deletions(-) diff --git a/actors/vanilla_actors/wf/geo.c b/actors/vanilla_actors/wf/geo.c index 0ada940f85..87085bdbf8 100644 --- a/actors/vanilla_actors/wf/geo.c +++ b/actors/vanilla_actors/wf/geo.c @@ -50,7 +50,7 @@ const LevelScript script_func_vo_wf[] = { LOAD_MODEL_FROM_GEO(MODEL_WF_KICKABLE_BOARD_FELLED, wf_geo_000BC8), LOAD_MODEL_FROM_GEO(MODEL_WF_GIANT_POLE, wf_geo_000AE0), LOAD_MODEL_FROM_GEO(MODEL_WF_ROTATING_PLATFORM, wf_geo_0009B8), - LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_08, wf_geo_0008A8), - LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_09, wf_geo_0008E8), + LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, wf_geo_0008A8), + LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, wf_geo_0008E8), RETURN(), }; diff --git a/include/model_ids.h b/include/model_ids.h index 89b64b9ab0..677716c762 100644 --- a/include/model_ids.h +++ b/include/model_ids.h @@ -470,135 +470,27 @@ enum ModelIDs { #endif /* Various unnamed vanilla static level models */ - MODEL_bitdw_LEVEL_GEOMETRY_03, - MODEL_bitdw_LEVEL_GEOMETRY_04, - MODEL_bitdw_LEVEL_GEOMETRY_05, - MODEL_bitdw_LEVEL_GEOMETRY_06, - MODEL_bitdw_LEVEL_GEOMETRY_07, - MODEL_bitdw_LEVEL_GEOMETRY_08, - MODEL_bitdw_LEVEL_GEOMETRY_09, - MODEL_bitdw_LEVEL_GEOMETRY_0A, - MODEL_bitdw_LEVEL_GEOMETRY_0B, - MODEL_bitdw_LEVEL_GEOMETRY_0C, - MODEL_bitdw_LEVEL_GEOMETRY_0D, - MODEL_bitdw_LEVEL_GEOMETRY_0E, - MODEL_bitdw_LEVEL_GEOMETRY_0F, - MODEL_bitdw_LEVEL_GEOMETRY_10, - MODEL_bitdw_LEVEL_GEOMETRY_11, - MODEL_bitfs_LEVEL_GEOMETRY_03, - MODEL_bitfs_LEVEL_GEOMETRY_04, - MODEL_bitfs_LEVEL_GEOMETRY_05, - MODEL_bitfs_LEVEL_GEOMETRY_06, - MODEL_bitfs_LEVEL_GEOMETRY_07, - MODEL_bitfs_LEVEL_GEOMETRY_08, - MODEL_bitfs_LEVEL_GEOMETRY_09, - MODEL_bitfs_LEVEL_GEOMETRY_0A, - MODEL_bitfs_LEVEL_GEOMETRY_0B, - MODEL_bitfs_LEVEL_GEOMETRY_0C, - MODEL_bitfs_LEVEL_GEOMETRY_0D, - MODEL_bitfs_LEVEL_GEOMETRY_0E, - MODEL_bitfs_LEVEL_GEOMETRY_0F, - MODEL_bitfs_LEVEL_GEOMETRY_10, - MODEL_bitfs_LEVEL_GEOMETRY_11, - MODEL_bitfs_LEVEL_GEOMETRY_12, - MODEL_bitfs_LEVEL_GEOMETRY_13, - MODEL_bitfs_LEVEL_GEOMETRY_14, - MODEL_bitfs_LEVEL_GEOMETRY_15, - MODEL_bits_LEVEL_GEOMETRY_03, - MODEL_bits_LEVEL_GEOMETRY_04, - MODEL_bits_LEVEL_GEOMETRY_05, - MODEL_bits_LEVEL_GEOMETRY_06, - MODEL_bits_LEVEL_GEOMETRY_07, - MODEL_bits_LEVEL_GEOMETRY_08, - MODEL_bits_LEVEL_GEOMETRY_09, - MODEL_bits_LEVEL_GEOMETRY_0A, - MODEL_bits_LEVEL_GEOMETRY_0B, - MODEL_bits_LEVEL_GEOMETRY_0C, - MODEL_bits_LEVEL_GEOMETRY_0D, - MODEL_bits_LEVEL_GEOMETRY_0E, - MODEL_bits_LEVEL_GEOMETRY_0F, - MODEL_bits_LEVEL_GEOMETRY_10, - MODEL_bits_LEVEL_GEOMETRY_11, - MODEL_bits_LEVEL_GEOMETRY_12, - MODEL_bits_LEVEL_GEOMETRY_13, - MODEL_bits_LEVEL_GEOMETRY_14, - MODEL_bowser_1_LEVEL_GEOMETRY_03, - MODEL_bowser_3_LEVEL_GEOMETRY_03, - MODEL_castle_courtyard_LEVEL_GEOMETRY_03, - MODEL_castle_grounds_LEVEL_GEOMETRY_03, - MODEL_ccm_LEVEL_GEOMETRY_03, - MODEL_ccm_LEVEL_GEOMETRY_04, - MODEL_ccm_LEVEL_GEOMETRY_05, - MODEL_ccm_LEVEL_GEOMETRY_06, - MODEL_ccm_LEVEL_GEOMETRY_07, - MODEL_lll_LEVEL_GEOMETRY_03, - MODEL_lll_LEVEL_GEOMETRY_04, - MODEL_lll_LEVEL_GEOMETRY_05, - MODEL_lll_LEVEL_GEOMETRY_06, - MODEL_lll_LEVEL_GEOMETRY_07, - MODEL_lll_LEVEL_GEOMETRY_08, - MODEL_lll_LEVEL_GEOMETRY_0A, - MODEL_lll_LEVEL_GEOMETRY_0B, - MODEL_lll_LEVEL_GEOMETRY_0C, - MODEL_lll_LEVEL_GEOMETRY_0D, - MODEL_lll_LEVEL_GEOMETRY_0E, - MODEL_rr_LEVEL_GEOMETRY_03, - MODEL_rr_LEVEL_GEOMETRY_04, - MODEL_rr_LEVEL_GEOMETRY_05, - MODEL_rr_LEVEL_GEOMETRY_06, - MODEL_rr_LEVEL_GEOMETRY_07, - MODEL_rr_LEVEL_GEOMETRY_08, - MODEL_rr_LEVEL_GEOMETRY_09, - MODEL_rr_LEVEL_GEOMETRY_0A, - MODEL_rr_LEVEL_GEOMETRY_0B, - MODEL_rr_LEVEL_GEOMETRY_0C, - MODEL_rr_LEVEL_GEOMETRY_0D, - MODEL_rr_LEVEL_GEOMETRY_0E, - MODEL_rr_LEVEL_GEOMETRY_0F, - MODEL_rr_LEVEL_GEOMETRY_10, - MODEL_rr_LEVEL_GEOMETRY_11, - MODEL_rr_LEVEL_GEOMETRY_12, - MODEL_rr_LEVEL_GEOMETRY_13, - MODEL_rr_LEVEL_GEOMETRY_14, - MODEL_rr_LEVEL_GEOMETRY_15, - MODEL_rr_LEVEL_GEOMETRY_16, - MODEL_ssl_LEVEL_GEOMETRY_03, - MODEL_ssl_LEVEL_GEOMETRY_04, - MODEL_thi_LEVEL_GEOMETRY_03, - MODEL_totwc_LEVEL_GEOMETRY_03, - MODEL_ttm_LEVEL_GEOMETRY_03, - MODEL_ttm_LEVEL_GEOMETRY_04, - MODEL_ttm_LEVEL_GEOMETRY_05, - MODEL_ttm_LEVEL_GEOMETRY_06, - MODEL_ttm_LEVEL_GEOMETRY_07, - MODEL_ttm_LEVEL_GEOMETRY_08, - MODEL_ttm_LEVEL_GEOMETRY_09, - MODEL_ttm_LEVEL_GEOMETRY_0A, - MODEL_ttm_LEVEL_GEOMETRY_0B, - MODEL_ttm_LEVEL_GEOMETRY_0C, - MODEL_ttm_LEVEL_GEOMETRY_0D, - MODEL_ttm_LEVEL_GEOMETRY_0F, - MODEL_ttm_LEVEL_GEOMETRY_10, - MODEL_ttm_LEVEL_GEOMETRY_11, - MODEL_ttm_LEVEL_GEOMETRY_12, - MODEL_ttm_LEVEL_GEOMETRY_13, - MODEL_ttm_LEVEL_GEOMETRY_14, - MODEL_ttm_LEVEL_GEOMETRY_15, - MODEL_ttm_LEVEL_GEOMETRY_16, - MODEL_wf_LEVEL_GEOMETRY_03, - MODEL_wf_LEVEL_GEOMETRY_04, - MODEL_wf_LEVEL_GEOMETRY_05, - MODEL_wf_LEVEL_GEOMETRY_06, - MODEL_wf_LEVEL_GEOMETRY_07, - MODEL_wf_LEVEL_GEOMETRY_08, - MODEL_wf_LEVEL_GEOMETRY_09, - MODEL_wf_LEVEL_GEOMETRY_0A, - MODEL_wf_LEVEL_GEOMETRY_0C, - MODEL_wf_LEVEL_GEOMETRY_0E, - MODEL_wf_LEVEL_GEOMETRY_0F, - MODEL_wf_LEVEL_GEOMETRY_11, - MODEL_wf_LEVEL_GEOMETRY_12, - + MODEL_LEVEL_GEOMETRY_03, + MODEL_LEVEL_GEOMETRY_04, + MODEL_LEVEL_GEOMETRY_05, + MODEL_LEVEL_GEOMETRY_06, + MODEL_LEVEL_GEOMETRY_07, + MODEL_LEVEL_GEOMETRY_08, + MODEL_LEVEL_GEOMETRY_09, + MODEL_LEVEL_GEOMETRY_0A, + MODEL_LEVEL_GEOMETRY_0B, + MODEL_LEVEL_GEOMETRY_0C, + MODEL_LEVEL_GEOMETRY_0D, + MODEL_LEVEL_GEOMETRY_0E, + MODEL_LEVEL_GEOMETRY_0F, + MODEL_LEVEL_GEOMETRY_10, + MODEL_LEVEL_GEOMETRY_11, + MODEL_LEVEL_GEOMETRY_12, + MODEL_LEVEL_GEOMETRY_13, + MODEL_LEVEL_GEOMETRY_14, + MODEL_LEVEL_GEOMETRY_15, + MODEL_LEVEL_GEOMETRY_16, + // Menu Models MODEL_MAIN_MENU_MARIO_SAVE_BUTTON, // main_menu_geo_0001D0 MODEL_MAIN_MENU_RED_ERASE_BUTTON, // main_menu_geo_000290 diff --git a/levels/bitdw/areas/script_vanilla.inc.c b/levels/bitdw/areas/script_vanilla.inc.c index b98ca0eb70..3738cc5afb 100644 --- a/levels/bitdw/areas/script_vanilla.inc.c +++ b/levels/bitdw/areas/script_vanilla.inc.c @@ -2,18 +2,18 @@ JUMP_LINK(script_func_global_12), JUMP_LINK(script_func_global_18), JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_vo_bitdw), -LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_03, geo_bitdw_0003C0), -LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_04, geo_bitdw_0003D8), -LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_05, geo_bitdw_0003F0), -LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_06, geo_bitdw_000408), -LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_07, geo_bitdw_000420), -LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_08, geo_bitdw_000438), -LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_09, geo_bitdw_000450), -LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_0A, geo_bitdw_000468), -LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_0B, geo_bitdw_000480), -LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_0C, geo_bitdw_000498), -LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_0D, geo_bitdw_0004B0), -LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_0E, geo_bitdw_0004C8), -LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_0F, geo_bitdw_0004E0), -LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_10, geo_bitdw_0004F8), -LOAD_MODEL_FROM_GEO(MODEL_bitdw_LEVEL_GEOMETRY_11, geo_bitdw_000510), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, geo_bitdw_0003C0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, geo_bitdw_0003D8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, geo_bitdw_0003F0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, geo_bitdw_000408), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, geo_bitdw_000420), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, geo_bitdw_000438), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, geo_bitdw_000450), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, geo_bitdw_000468), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, geo_bitdw_000480), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, geo_bitdw_000498), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, geo_bitdw_0004B0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, geo_bitdw_0004C8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, geo_bitdw_0004E0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, geo_bitdw_0004F8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, geo_bitdw_000510), diff --git a/levels/bitdw/script.c b/levels/bitdw/script.c index 86476ab3c9..7c180d26e4 100644 --- a/levels/bitdw/script.c +++ b/levels/bitdw/script.c @@ -79,28 +79,28 @@ static const LevelScript script_bitdw_macro_objects[] = { OBJECT(/*model*/ MODEL_BREAKABLE_BOX, /*pos*/ -3100, -3145, 4518, /*angle*/ 0, 0, 0, /*behParam*/ (BREAKABLE_BOX_BP_NO_COINS << 16), /*beh*/ bhvHiddenObject), OBJECT(/*model*/ MODEL_EXCLAMATION_BOX, /*pos*/ -2420, -1140, 3700, /*angle*/ 0, 0, 0, /*behParam*/ (EXCLAMATION_BOX_BP_1UP_RUNNING_AWAY << 16), /*beh*/ bhvExclamationBox), // Special objects - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_03, /*pos*/ -6368, -3972, 3883, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_04, /*pos*/ -3245, -3358, 3893, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_05, /*pos*/ -2405, -1228, 1740, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_06, /*pos*/ -5861, -434, 306, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_07, /*pos*/ -5062, 922, -1895, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_08, /*pos*/ -7116, 717, -819, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_09, /*pos*/ -4601, 0, -312, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0A, /*pos*/ 797, -3282, 3868, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0B, /*pos*/ -2047, -1868, 3685, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0C, /*pos*/ -966, 922, 44, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0D, /*pos*/ 2207, 922, 44, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0E, /*pos*/ -7108, 209, 356, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0E, /*pos*/ -7103, 844, -2088, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0E, /*pos*/ -6466, 9, 986, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0E, /*pos*/ -4013, -670, 990, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0E, /*pos*/ -5251, -276, 967, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0E, /*pos*/ -7665, 502, -251, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_0F, /*pos*/ 5382, 1536, -6, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_10, /*pos*/ -1658, -3281, 3893, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_10, /*pos*/ -2656, 889, -2156, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_10, /*pos*/ -2052, 889, -928, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitdw_LEVEL_GEOMETRY_11, /*pos*/ -3168, 710, 607, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -6368, -3972, 3883, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ -3245, -3358, 3893, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ -2405, -1228, 1740, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ -5861, -434, 306, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_07, /*pos*/ -5062, 922, -1895, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_08, /*pos*/ -7116, 717, -819, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_09, /*pos*/ -4601, 0, -312, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0A, /*pos*/ 797, -3282, 3868, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0B, /*pos*/ -2047, -1868, 3685, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ -966, 922, 44, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0D, /*pos*/ 2207, 922, 44, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -7108, 209, 356, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -7103, 844, -2088, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -6466, 9, 986, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -4013, -670, 990, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -5251, -276, 967, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -7665, 502, -251, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0F, /*pos*/ 5382, 1536, -6, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_10, /*pos*/ -1658, -3281, 3893, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_10, /*pos*/ -2656, 889, -2156, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_10, /*pos*/ -2052, 889, -928, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_11, /*pos*/ -3168, 710, 607, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; diff --git a/levels/bitfs/areas/script_vanilla_load.inc.c b/levels/bitfs/areas/script_vanilla_load.inc.c index 120e2f6c42..8abc50dd90 100644 --- a/levels/bitfs/areas/script_vanilla_load.inc.c +++ b/levels/bitfs/areas/script_vanilla_load.inc.c @@ -2,22 +2,22 @@ JUMP_LINK(script_func_global_3), JUMP_LINK(script_func_global_18), JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_vo_bitfs), -LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_03, bitfs_geo_0004B0), -LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_04, bitfs_geo_0004C8), -LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_05, bitfs_geo_0004E0), -LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_06, bitfs_geo_0004F8), -LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_07, bitfs_geo_000510), -LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_08, bitfs_geo_000528), -LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_09, bitfs_geo_000540), -LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_0A, bitfs_geo_000558), -LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_0B, bitfs_geo_000570), -LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_0C, bitfs_geo_000588), -LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_0D, bitfs_geo_0005A0), -LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_0E, bitfs_geo_0005B8), -LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_0F, bitfs_geo_0005D0), -LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_10, bitfs_geo_0005E8), -LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_11, bitfs_geo_000600), -LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_12, bitfs_geo_000618), -LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_13, bitfs_geo_000630), -LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_14, bitfs_geo_000648), -LOAD_MODEL_FROM_GEO(MODEL_bitfs_LEVEL_GEOMETRY_15, bitfs_geo_000660), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, bitfs_geo_0004B0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, bitfs_geo_0004C8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, bitfs_geo_0004E0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, bitfs_geo_0004F8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, bitfs_geo_000510), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, bitfs_geo_000528), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, bitfs_geo_000540), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, bitfs_geo_000558), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, bitfs_geo_000570), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, bitfs_geo_000588), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, bitfs_geo_0005A0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, bitfs_geo_0005B8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, bitfs_geo_0005D0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, bitfs_geo_0005E8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, bitfs_geo_000600), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, bitfs_geo_000618), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_13, bitfs_geo_000630), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_14, bitfs_geo_000648), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_15, bitfs_geo_000660), diff --git a/levels/bitfs/script.c b/levels/bitfs/script.c index 34a6bb8242..afceff0378 100644 --- a/levels/bitfs/script.c +++ b/levels/bitfs/script.c @@ -59,29 +59,29 @@ static const LevelScript script_bitfs_macro_objects[] = { OBJECT(/*model*/ MODEL_AMP, /*pos*/ -2325, 3625, 0, /*angle*/ 0, 0, 0, /*behParam*/ (2 << 16), /*beh*/ bhvCirclingAmp), OBJECT(/*model*/ MODEL_EXCLAMATION_BOX, /*pos*/ -5340, 4000, 100, /*angle*/ 0, 0, 0, /*behParam*/ (EXCLAMATION_BOX_BP_COINS_10 << 16), /*beh*/ bhvExclamationBox), // Special objects - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_03, /*pos*/ -5938, -3071, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_04, /*pos*/ -5488, -1535, 41, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_04, /*pos*/ 4342, 1741, 41, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_05, /*pos*/ -1965, -3030, 10, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_06, /*pos*/ -1996, 3277, -19, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_06, /*pos*/ -4914, 0, -19, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_07, /*pos*/ 1843, -3071, -398, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_08, /*pos*/ 4659, -1663, 307, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_09, /*pos*/ 3123, -511, 307, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_0A, /*pos*/ 1382, 0, -6, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_0B, /*pos*/ 1229, 205, -410, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_0B, /*pos*/ -3225, 3482, -825, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_0B, /*pos*/ -1381, 3482, -821, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_0C, /*pos*/ -1433, 717, -127, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_0D, /*pos*/ -741, 589, 307, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_0E, /*pos*/ -5017, 205, 310, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_0F, /*pos*/ -6297, 3251, 1, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_10, /*pos*/ -4556, 3482, 97, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_11, /*pos*/ 1946, 4506, 96, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_12, /*pos*/ 1946, 4352, 96, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_13, /*pos*/ 6540, 3796, 83, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_14, /*pos*/ 6740, 4224, 74, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bitfs_LEVEL_GEOMETRY_15, /*pos*/ 3123, 3277, -19, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -5938, -3071, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ -5488, -1535, 41, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 4342, 1741, 41, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ -1965, -3030, 10, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ -1996, 3277, -19, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ -4914, 0, -19, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_07, /*pos*/ 1843, -3071, -398, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_08, /*pos*/ 4659, -1663, 307, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_09, /*pos*/ 3123, -511, 307, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0A, /*pos*/ 1382, 0, -6, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0B, /*pos*/ 1229, 205, -410, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0B, /*pos*/ -3225, 3482, -825, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0B, /*pos*/ -1381, 3482, -821, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ -1433, 717, -127, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0D, /*pos*/ -741, 589, 307, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -5017, 205, 310, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0F, /*pos*/ -6297, 3251, 1, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_10, /*pos*/ -4556, 3482, 97, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_11, /*pos*/ 1946, 4506, 96, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_12, /*pos*/ 1946, 4352, 96, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_13, /*pos*/ 6540, 3796, 83, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_14, /*pos*/ 6740, 4224, 74, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_15, /*pos*/ 3123, 3277, -19, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; diff --git a/levels/bits/areas/script_vanilla.inc.c b/levels/bits/areas/script_vanilla.inc.c index 9bf30ce085..768efe9dac 100644 --- a/levels/bits/areas/script_vanilla.inc.c +++ b/levels/bits/areas/script_vanilla.inc.c @@ -1,21 +1,21 @@ JUMP_LINK(script_func_global_15), JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_vo_bits), -LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_03, bits_geo_000430), -LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_04, bits_geo_000448), -LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_05, bits_geo_000460), -LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_06, bits_geo_000478), -LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_07, bits_geo_000490), -LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_08, bits_geo_0004A8), -LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_09, bits_geo_0004C0), -LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_0A, bits_geo_0004D8), -LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_0B, bits_geo_0004F0), -LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_0C, bits_geo_000508), -LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_0D, bits_geo_000520), -LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_0E, bits_geo_000538), -LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_0F, bits_geo_000550), -LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_10, bits_geo_000568), -LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_11, bits_geo_000580), -LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_12, bits_geo_000598), -LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_13, bits_geo_0005B0), -LOAD_MODEL_FROM_GEO(MODEL_bits_LEVEL_GEOMETRY_14, bits_geo_0005C8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, bits_geo_000430), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, bits_geo_000448), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, bits_geo_000460), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, bits_geo_000478), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, bits_geo_000490), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, bits_geo_0004A8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, bits_geo_0004C0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, bits_geo_0004D8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, bits_geo_0004F0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, bits_geo_000508), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, bits_geo_000520), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, bits_geo_000538), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, bits_geo_000550), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, bits_geo_000568), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, bits_geo_000580), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, bits_geo_000598), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_13, bits_geo_0005B0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_14, bits_geo_0005C8), diff --git a/levels/bits/script.c b/levels/bits/script.c index 3b547ed212..f24503d878 100644 --- a/levels/bits/script.c +++ b/levels/bits/script.c @@ -75,27 +75,27 @@ static const LevelScript script_bits_macro_objects[] = { OBJECT(/*model*/ MODEL_BOWLING_BALL, /*pos*/ -2656, -2442, -800, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFireSpitter), OBJECT(/*model*/ MODEL_EXCLAMATION_BOX, /*pos*/ 4100, -1050, -1800, /*angle*/ 0, 0, 0, /*behParam*/ (EXCLAMATION_BOX_BP_1UP_RUNNING_AWAY << 16), /*beh*/ bhvExclamationBox), // Special objects - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_03, /*pos*/ -4505, -5119, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_04, /*pos*/ -2291, -2073, -762, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_05, /*pos*/ 3891, -3276, -705, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_06, /*pos*/ 1753, -1986, -531, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_07, /*pos*/ -5414, -1330, -787, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_07, /*pos*/ -3182, 2059, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_08, /*pos*/ -3182, 1854, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_08, /*pos*/ 759, 5628, -1008, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_09, /*pos*/ -4902, -895, -1171, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_0A, /*pos*/ -3882, -357, -1241, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_0B, /*pos*/ -1199, -387, -1308, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_0C, /*pos*/ 5584, 2735, -1851, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_0D, /*pos*/ -5248, 3800, -895, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_0D, /*pos*/ -1356, 3800, -895, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_0E, /*pos*/ -6459, 3800, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_0F, /*pos*/ -930, 2884, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_10, /*pos*/ 2486, -438, -899, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_11, /*pos*/ 563, 2249, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_12, /*pos*/ -6459, 2039, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_13, /*pos*/ 1143, 4670, -494, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bits_LEVEL_GEOMETRY_14, /*pos*/ 349, 6268, -4054, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -4505, -5119, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ -2291, -2073, -762, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ 3891, -3276, -705, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ 1753, -1986, -531, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_07, /*pos*/ -5414, -1330, -787, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_07, /*pos*/ -3182, 2059, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_08, /*pos*/ -3182, 1854, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_08, /*pos*/ 759, 5628, -1008, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_09, /*pos*/ -4902, -895, -1171, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0A, /*pos*/ -3882, -357, -1241, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0B, /*pos*/ -1199, -387, -1308, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ 5584, 2735, -1851, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0D, /*pos*/ -5248, 3800, -895, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0D, /*pos*/ -1356, 3800, -895, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -6459, 3800, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0F, /*pos*/ -930, 2884, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_10, /*pos*/ 2486, -438, -899, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_11, /*pos*/ 563, 2249, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_12, /*pos*/ -6459, 2039, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_13, /*pos*/ 1143, 4670, -494, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_14, /*pos*/ 349, 6268, -4054, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; diff --git a/levels/bowser_1/script.c b/levels/bowser_1/script.c index 386f11d4dd..11a4227590 100644 --- a/levels/bowser_1/script.c +++ b/levels/bowser_1/script.c @@ -24,22 +24,22 @@ static const LevelScript script_bowser_1_macro_objects[] = { OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ 0, 589, 2949, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBowserBomb), OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ -2949, 589, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBowserBomb), OBJECT(/*model*/ MODEL_BOWSER, /*pos*/ 0, 300, -1000, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBowser), - OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ 0, 384, 3072, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ -2171, 384, -2171, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ 0, 384, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ -3071, 384, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ -2171, 384, 2172, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ -2621, 384, 1086, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ 2172, 384, 2172, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ 3072, 384, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ 2172, 384, -2171, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ -1085, 384, 2622, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ 2622, 384, 1086, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ -2621, 384, -1085, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ -1085, 384, -2621, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ 1086, 384, -2621, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ 2622, 384, -1085, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bowser_1_LEVEL_GEOMETRY_03, /*pos*/ 1086, 384, 2622, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 0, 384, 3072, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -2171, 384, -2171, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 0, 384, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -3071, 384, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -2171, 384, 2172, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -2621, 384, 1086, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 2172, 384, 2172, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 3072, 384, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 2172, 384, -2171, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -1085, 384, 2622, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 2622, 384, 1086, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -2621, 384, -1085, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -1085, 384, -2621, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 1086, 384, -2621, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 2622, 384, -1085, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 1086, 384, 2622, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; @@ -52,7 +52,7 @@ const LevelScript level_bowser_1_entry[] = { ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), JUMP_LINK(script_func_global_13), - LOAD_MODEL_FROM_GEO(MODEL_bowser_1_LEVEL_GEOMETRY_03, bowser_1_yellow_sphere_geo), + LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, bowser_1_yellow_sphere_geo), AREA(/*index*/ 1, bowser_1_geo_0000D0), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, 1307, 0, /*angle*/ 0, 180, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneCircleWarp), diff --git a/levels/bowser_3/script.c b/levels/bowser_3/script.c index 823ec6a520..014de8f946 100644 --- a/levels/bowser_3/script.c +++ b/levels/bowser_3/script.c @@ -19,11 +19,11 @@ static const LevelScript script_bowser_3_macro_objects[] = { // Special objects OBJECT(/*model*/ MODEL_BOWSER, /*pos*/ 13, 307, -1024, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBowser), - OBJECT(/*model*/ MODEL_bowser_3_LEVEL_GEOMETRY_03, /*pos*/ -3362, -204, 1121, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bowser_3_LEVEL_GEOMETRY_03, /*pos*/ 0, -204, 3584, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bowser_3_LEVEL_GEOMETRY_03, /*pos*/ 3362, -204, 1126, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bowser_3_LEVEL_GEOMETRY_03, /*pos*/ 2123, -204, -2912, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_bowser_3_LEVEL_GEOMETRY_03, /*pos*/ -2122, -204, -2912, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -3362, -204, 1121, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 0, -204, 3584, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 3362, -204, 1126, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 2123, -204, -2912, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -2122, -204, -2912, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; @@ -65,7 +65,7 @@ const LevelScript level_bowser_3_entry[] = { LOAD_MODEL_FROM_GEO(MODEL_BOWSER_3_FALLING_PLATFORM_8, bowser_3_geo_000338), LOAD_MODEL_FROM_GEO(MODEL_BOWSER_3_FALLING_PLATFORM_9, bowser_3_geo_000350), LOAD_MODEL_FROM_GEO(MODEL_BOWSER_3_FALLING_PLATFORM_10, bowser_3_geo_000368), - LOAD_MODEL_FROM_GEO(MODEL_bowser_3_LEVEL_GEOMETRY_03, bowser_3_geo_000380), + LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, bowser_3_geo_000380), AREA(/*index*/ 1, bowser_3_geo_000398), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, 1307, 0, /*angle*/ 0, 183, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneCircleWarp), diff --git a/levels/castle_courtyard/areas/script_vanilla.inc.c b/levels/castle_courtyard/areas/script_vanilla.inc.c index b38b132aeb..25a0bf5bd6 100644 --- a/levels/castle_courtyard/areas/script_vanilla.inc.c +++ b/levels/castle_courtyard/areas/script_vanilla.inc.c @@ -1,4 +1,4 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_10), LOAD_MODEL_FROM_GEO(MODEL_COURTYARD_SPIKY_TREE, spiky_tree_geo), -LOAD_MODEL_FROM_GEO(MODEL_castle_courtyard_LEVEL_GEOMETRY_03, castle_courtyard_geo_000200), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, castle_courtyard_geo_000200), diff --git a/levels/castle_courtyard/script.c b/levels/castle_courtyard/script.c index e6469e7030..3c3d7a377d 100644 --- a/levels/castle_courtyard/script.c +++ b/levels/castle_courtyard/script.c @@ -24,7 +24,7 @@ static const LevelScript script_castle_courtyard_macro_objects[] = { OBJECT(/*model*/ MODEL_WOODEN_SIGNPOST, /*pos*/ 300, 0, -3600, /*angle*/ 0, 0, 0, /*behParam*/ (DIALOG_102 << 16), /*beh*/ bhvMessagePanel), OBJECT(/*model*/ MODEL_WOODEN_SIGNPOST, /*pos*/ -300, 0, -3600, /*angle*/ 0, 0, 0, /*behParam*/ (DIALOG_160 << 16), /*beh*/ bhvMessagePanel), // Special objects - OBJECT(/*model*/ MODEL_castle_courtyard_LEVEL_GEOMETRY_03, /*pos*/ 0, 2048, 2662, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 0, 2048, 2662, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), OBJECT(/*model*/ MODEL_COURTYARD_SPIKY_TREE, /*pos*/ 2272, -214, -1432, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), OBJECT(/*model*/ MODEL_COURTYARD_SPIKY_TREE, /*pos*/ 818, 10, 203, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), OBJECT(/*model*/ MODEL_COURTYARD_SPIKY_TREE, /*pos*/ -820, 10, 201, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), diff --git a/levels/castle_grounds/areas/script_vanilla.inc.c b/levels/castle_grounds/areas/script_vanilla.inc.c index 84a0cb7ede..342744e057 100644 --- a/levels/castle_grounds/areas/script_vanilla.inc.c +++ b/levels/castle_grounds/areas/script_vanilla.inc.c @@ -2,4 +2,4 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_11), JUMP_LINK(script_func_global_16), JUMP_LINK(script_func_vo_castle_grounds), -LOAD_MODEL_FROM_GEO(MODEL_castle_grounds_LEVEL_GEOMETRY_03, castle_grounds_geo_0006F4), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, castle_grounds_geo_0006F4), diff --git a/levels/castle_grounds/script.c b/levels/castle_grounds/script.c index 886fbff37f..10b289e6c2 100644 --- a/levels/castle_grounds/script.c +++ b/levels/castle_grounds/script.c @@ -37,7 +37,7 @@ static const LevelScript script_castle_grounds_macro_objects[] = { OBJECT(/*model*/ MODEL_BUTTERFLY, /*pos*/ -6240, 295, 320, /*angle*/ 0, 0, 0, /*behParam*/ (TRIPLET_BUTTERFLY_BP_NO_BOMBS << 16), /*beh*/ bhvTripletButterfly), OBJECT(/*model*/ MODEL_BUTTERFLY, /*pos*/ 6330, 710, -3760, /*angle*/ 0, 0, 0, /*behParam*/ (TRIPLET_BUTTERFLY_BP_NO_BOMBS << 16), /*beh*/ bhvTripletButterfly), // Special objects - OBJECT(/*model*/ MODEL_castle_grounds_LEVEL_GEOMETRY_03, /*pos*/ 0, 2867, -3924, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 0, 2867, -3924, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -1333, 711, 1881, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -6220, 468, 3458, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ -5069, 350, 3221, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), diff --git a/levels/ccm/areas/script_vanilla.inc.c b/levels/ccm/areas/script_vanilla.inc.c index 2ec5282af9..1f5ff49042 100644 --- a/levels/ccm/areas/script_vanilla.inc.c +++ b/levels/ccm/areas/script_vanilla.inc.c @@ -2,10 +2,10 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_8), JUMP_LINK(script_func_global_17), JUMP_LINK(script_func_vo_ccm), -LOAD_MODEL_FROM_GEO(MODEL_ccm_LEVEL_GEOMETRY_03, ccm_geo_00042C), -LOAD_MODEL_FROM_GEO(MODEL_ccm_LEVEL_GEOMETRY_04, ccm_geo_00045C), -LOAD_MODEL_FROM_GEO(MODEL_ccm_LEVEL_GEOMETRY_05, ccm_geo_000494), -LOAD_MODEL_FROM_GEO(MODEL_ccm_LEVEL_GEOMETRY_06, ccm_geo_0004BC), -LOAD_MODEL_FROM_GEO(MODEL_ccm_LEVEL_GEOMETRY_07, ccm_geo_0004E4), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, ccm_geo_00042C), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, ccm_geo_00045C), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, ccm_geo_000494), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, ccm_geo_0004BC), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, ccm_geo_0004E4), LOAD_MODEL_FROM_GEO(MODEL_CCM_CABIN_DOOR, cabin_door_geo), LOAD_MODEL_FROM_GEO(MODEL_SNOW_TREE, snow_tree_geo), diff --git a/levels/ccm/script.c b/levels/ccm/script.c index 780bbc55d4..30726e91df 100644 --- a/levels/ccm/script.c +++ b/levels/ccm/script.c @@ -57,12 +57,12 @@ static const LevelScript script_ccm_area_1_macro_objects[] = { OBJECT(/*model*/ MODEL_EXCLAMATION_BOX, /*pos*/ -4887, -1300, -4003, /*angle*/ 0, 0, 0, /*behParam*/ (EXCLAMATION_BOX_BP_1UP_RUNNING_AWAY << 16), /*beh*/ bhvExclamationBox), OBJECT(/*model*/ MODEL_EXCLAMATION_BOX, /*pos*/ -1557, -205, 1794, /*angle*/ 0, 0, 0, /*behParam*/ (EXCLAMATION_BOX_BP_1UP_RUNNING_AWAY << 16), /*beh*/ bhvExclamationBox), // Special objects - OBJECT(/*model*/ MODEL_ccm_LEVEL_GEOMETRY_03, /*pos*/ -409, 2765, -1637, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ccm_LEVEL_GEOMETRY_04, /*pos*/ 2355, -4095, 4096, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ccm_LEVEL_GEOMETRY_05, /*pos*/ -4210, -1446, 1874, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ccm_LEVEL_GEOMETRY_05, /*pos*/ 2560, 2560, -1023, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ccm_LEVEL_GEOMETRY_06, /*pos*/ -818, 102, 2048, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ccm_LEVEL_GEOMETRY_07, /*pos*/ -511, -3071, -3583, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -409, 2765, -1637, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 2355, -4095, 4096, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ -4210, -1446, 1874, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ 2560, 2560, -1023, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ -818, 102, 2048, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_07, /*pos*/ -511, -3071, -3583, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ -5201, -1740, 2994, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ 1989, -4607, 4949, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), OBJECT(/*model*/ MODEL_SNOW_TREE, /*pos*/ 1248, -4607, 5474, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), diff --git a/levels/lll/areas/script_vanilla.inc.c b/levels/lll/areas/script_vanilla.inc.c index b3e1650c07..ee587e90ad 100644 --- a/levels/lll/areas/script_vanilla.inc.c +++ b/levels/lll/areas/script_vanilla.inc.c @@ -2,14 +2,14 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_3), JUMP_LINK(script_func_global_18), JUMP_LINK(script_func_vo_lll), -LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_03, lll_geo_0009E0), -LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_04, lll_geo_0009F8), -LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_05, lll_geo_000A10), -LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_06, lll_geo_000A28), -LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_07, lll_geo_000A40), -LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_08, lll_geo_000A60), -LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_0A, lll_geo_000A90), -LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_0B, lll_geo_000AA8), -LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_0C, lll_geo_000AC0), -LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_0D, lll_geo_000AD8), -LOAD_MODEL_FROM_GEO(MODEL_lll_LEVEL_GEOMETRY_0E, lll_geo_000AF0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, lll_geo_0009E0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, lll_geo_0009F8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, lll_geo_000A10), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, lll_geo_000A28), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, lll_geo_000A40), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, lll_geo_000A60), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, lll_geo_000A90), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, lll_geo_000AA8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, lll_geo_000AC0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, lll_geo_000AD8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, lll_geo_000AF0), diff --git a/levels/lll/script.c b/levels/lll/script.c index e9215c9fd8..c5d4175590 100644 --- a/levels/lll/script.c +++ b/levels/lll/script.c @@ -105,20 +105,20 @@ static const LevelScript script_lll_area_2_macro_objects[] = { }; static const LevelScript script_lll_area_1_objects_1[] = { - OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_03, /*pos*/ 3840, 0, -5631, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_04, /*pos*/ 4992, 0, -639, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_05, /*pos*/ 7168, 0, 1408, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_06, /*pos*/ 0, 0, 3712, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_07, /*pos*/ -3199, 0, 3456, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_08, /*pos*/ -5119, 0, -2047, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_0A, /*pos*/ 0, 0, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_0B, /*pos*/ 0, 0, 6272, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_0C, /*pos*/ 5632, 0, 1408, /*angle*/ 0, 270, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_0C, /*pos*/ 2048, 0, 3456, /*angle*/ 0, 180, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_0C, /*pos*/ -4607, 0, 3456, /*angle*/ 0, 270, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_0C, /*pos*/ -5119, 0, -511, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_0D, /*pos*/ 0, 0, -2047, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_lll_LEVEL_GEOMETRY_0E, /*pos*/ -5115, 300, -3200, /*angle*/ 0, 90, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 3840, 0, -5631, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 4992, 0, -639, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ 7168, 0, 1408, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ 0, 0, 3712, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_07, /*pos*/ -3199, 0, 3456, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_08, /*pos*/ -5119, 0, -2047, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0A, /*pos*/ 0, 0, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0B, /*pos*/ 0, 0, 6272, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ 5632, 0, 1408, /*angle*/ 0, 270, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ 2048, 0, 3456, /*angle*/ 0, 180, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ -4607, 0, 3456, /*angle*/ 0, 270, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ -5119, 0, -511, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0D, /*pos*/ 0, 0, -2047, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -5115, 300, -3200, /*angle*/ 0, 90, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; diff --git a/levels/rr/areas/script_vanilla.inc.c b/levels/rr/areas/script_vanilla.inc.c index 24b867e1de..b7eb754e27 100644 --- a/levels/rr/areas/script_vanilla.inc.c +++ b/levels/rr/areas/script_vanilla.inc.c @@ -1,23 +1,23 @@ JUMP_LINK(script_func_global_12), JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_vo_rr), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_03, rr_geo_000660), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_04, rr_geo_000678), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_05, rr_geo_000690), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_06, rr_geo_0006A8), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_07, rr_geo_0006C0), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_08, rr_geo_0006D8), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_09, rr_geo_0006F0), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_0A, rr_geo_000708), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_0B, rr_geo_000720), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_0C, rr_geo_000738), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_0D, rr_geo_000758), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_0E, rr_geo_000770), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_0F, rr_geo_000788), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_10, rr_geo_0007A0), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_11, rr_geo_0007B8), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_12, rr_geo_0007D0), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_13, rr_geo_0007E8), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_14, rr_geo_000800), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_15, rr_geo_000818), -LOAD_MODEL_FROM_GEO(MODEL_rr_LEVEL_GEOMETRY_16, rr_geo_000830), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, rr_geo_000660), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, rr_geo_000678), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, rr_geo_000690), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, rr_geo_0006A8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, rr_geo_0006C0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, rr_geo_0006D8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, rr_geo_0006F0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, rr_geo_000708), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, rr_geo_000720), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, rr_geo_000738), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, rr_geo_000758), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, rr_geo_000770), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, rr_geo_000788), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, rr_geo_0007A0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, rr_geo_0007B8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, rr_geo_0007D0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_13, rr_geo_0007E8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_14, rr_geo_000800), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_15, rr_geo_000818), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_16, rr_geo_000830), diff --git a/levels/rr/script.c b/levels/rr/script.c index 728163b809..5e05e57379 100644 --- a/levels/rr/script.c +++ b/levels/rr/script.c @@ -80,28 +80,28 @@ static const LevelScript script_rr_macro_objects[] = { OBJECT(/*model*/ MODEL_EXCLAMATION_BOX, /*pos*/ 5000, 4100, 4440, /*angle*/ 0, 0, 0, /*behParam*/ (EXCLAMATION_BOX_BP_STAR_6 << 16), /*beh*/ bhvExclamationBox), OBJECT(/*model*/ MODEL_BOWLING_BALL, /*pos*/ -6000, -440, -40, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFireSpitter), // Special objects - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_03, /*pos*/ 1902, -1833, 1063, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_04, /*pos*/ 3803, -1833, 2036, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_05, /*pos*/ -4888, -2550, 5847, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_06, /*pos*/ 5324, -2038, 6155, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_07, /*pos*/ -409, -3164, 5207, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_08, /*pos*/ -3193, -4726, 6670, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_08, /*pos*/ -4680, -1910, 296, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_09, /*pos*/ 6506, -1295, 762, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_0A, /*pos*/ -4629, 137, -113, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_0B, /*pos*/ 2639, 2724, -622, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_0C, /*pos*/ 3577, 2486, -2346, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_0D, /*pos*/ 614, -1116, 3671, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_0D, /*pos*/ 3554, 4276, -2346, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_0E, /*pos*/ 5280, 4937, 603, /*angle*/ 0, 180, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_0F, /*pos*/ -4197, 4608, -5119, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_10, /*pos*/ 2628, -143, -1611, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_11, /*pos*/ 5094, 3440, 4029, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_12, /*pos*/ -3708, 2006, 270, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_13, /*pos*/ 5994, -988, 1341, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_14, /*pos*/ 3917, 624, -1133, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_15, /*pos*/ -3981, 3328, -2736, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_rr_LEVEL_GEOMETRY_16, /*pos*/ -6053, 4096, -3197, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 1902, -1833, 1063, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 3803, -1833, 2036, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ -4888, -2550, 5847, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ 5324, -2038, 6155, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_07, /*pos*/ -409, -3164, 5207, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_08, /*pos*/ -3193, -4726, 6670, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_08, /*pos*/ -4680, -1910, 296, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_09, /*pos*/ 6506, -1295, 762, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0A, /*pos*/ -4629, 137, -113, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0B, /*pos*/ 2639, 2724, -622, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ 3577, 2486, -2346, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0D, /*pos*/ 614, -1116, 3671, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0D, /*pos*/ 3554, 4276, -2346, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ 5280, 4937, 603, /*angle*/ 0, 180, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0F, /*pos*/ -4197, 4608, -5119, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_10, /*pos*/ 2628, -143, -1611, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_11, /*pos*/ 5094, 3440, 4029, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_12, /*pos*/ -3708, 2006, 270, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_13, /*pos*/ 5994, -988, 1341, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_14, /*pos*/ 3917, 624, -1133, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_15, /*pos*/ -3981, 3328, -2736, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_16, /*pos*/ -6053, 4096, -3197, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; diff --git a/levels/ssl/areas/script_vanilla.inc.c b/levels/ssl/areas/script_vanilla.inc.c index e88b4ed2dc..05e189afd2 100644 --- a/levels/ssl/areas/script_vanilla.inc.c +++ b/levels/ssl/areas/script_vanilla.inc.c @@ -2,5 +2,5 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_6), JUMP_LINK(script_func_vo_ssl), LOAD_MODEL_FROM_GEO(MODEL_SSL_PALM_TREE, palm_tree_geo), -LOAD_MODEL_FROM_GEO(MODEL_ssl_LEVEL_GEOMETRY_03, ssl_geo_0005C0), -LOAD_MODEL_FROM_GEO(MODEL_ssl_LEVEL_GEOMETRY_04, ssl_geo_0005D8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, ssl_geo_0005C0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, ssl_geo_0005D8), diff --git a/levels/ssl/script.c b/levels/ssl/script.c index 93395ade5b..c0ac82738c 100644 --- a/levels/ssl/script.c +++ b/levels/ssl/script.c @@ -66,11 +66,11 @@ static const LevelScript script_ssl_area_1_macro_objects[] = { OBJECT(/*model*/ MODEL_EXCLAMATION_BOX, /*pos*/ -1200, 500, 800, /*angle*/ 0, 0, 0, /*behParam*/ (EXCLAMATION_BOX_BP_1UP_RUNNING_AWAY << 16), /*beh*/ bhvExclamationBox), OBJECT(/*model*/ MODEL_WOODEN_SIGNPOST, /*pos*/ 5130, 26, -370, /*angle*/ 0, 0, 0, /*behParam*/ (DIALOG_157 << 16), /*beh*/ bhvMessagePanel), // Special objects - OBJECT(/*model*/ MODEL_ssl_LEVEL_GEOMETRY_03, /*pos*/ 5760, 0, 5751, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ssl_LEVEL_GEOMETRY_03, /*pos*/ -3583, 0, 2935, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ssl_LEVEL_GEOMETRY_03, /*pos*/ -511, 0, 2935, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ssl_LEVEL_GEOMETRY_03, /*pos*/ 1024, 0, 3822, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ssl_LEVEL_GEOMETRY_03, /*pos*/ 3072, 0, 375, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 5760, 0, 5751, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -3583, 0, 2935, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -511, 0, 2935, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 1024, 0, 3822, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 3072, 0, 375, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), OBJECT(/*model*/ MODEL_SSL_PALM_TREE, /*pos*/ -5989, 0, -4850, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), RETURN(), }; @@ -128,9 +128,9 @@ static const LevelScript script_ssl_area_2_macro_objects[] = { OBJECT(/*model*/ MODEL_YELLOW_COIN, /*pos*/ -1840, 1357, 3076, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvOneCoin), OBJECT(/*model*/ MODEL_YELLOW_COIN, /*pos*/ -1840, 1408, 2870, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvOneCoin), // Special objects - OBJECT(/*model*/ MODEL_ssl_LEVEL_GEOMETRY_04, /*pos*/ 1741, -101, 1843, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ssl_LEVEL_GEOMETRY_04, /*pos*/ 0, -101, 528, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ssl_LEVEL_GEOMETRY_04, /*pos*/ -1740, -101, 1843, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 1741, -101, 1843, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 0, -101, 528, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ -1740, -101, 1843, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; diff --git a/levels/thi/areas/script_vanilla_load.inc.c b/levels/thi/areas/script_vanilla_load.inc.c index 8e54429fd6..07dc85434b 100644 --- a/levels/thi/areas/script_vanilla_load.inc.c +++ b/levels/thi/areas/script_vanilla_load.inc.c @@ -2,4 +2,4 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_12), JUMP_LINK(script_func_global_15), JUMP_LINK(script_func_vo_thi), -LOAD_MODEL_FROM_GEO(MODEL_thi_LEVEL_GEOMETRY_03, thi_geo_0005F0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, thi_geo_0005F0), diff --git a/levels/thi/script.c b/levels/thi/script.c index 12c10f56f2..bbd31755a1 100644 --- a/levels/thi/script.c +++ b/levels/thi/script.c @@ -135,7 +135,7 @@ static const LevelScript script_thi_area_2_macro_objects[] = { OBJECT(/*model*/ MODEL_YELLOW_COIN, /*pos*/ 280, -640, -4140, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvYellowCoin), OBJECT(/*model*/ MODEL_GOOMBA, /*pos*/ -2020, -890, 1720, /*angle*/ 0, 0, 0, /*behParam*/ (GOOMBA_SIZE_TINY << 16), /*beh*/ bhvGoomba), // Special objects - OBJECT(/*model*/ MODEL_thi_LEVEL_GEOMETRY_03, /*pos*/ -40, -767, -4494, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -40, -767, -4494, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 1444, -153, 676, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), RETURN(), }; diff --git a/levels/totwc/areas/script_vanilla.inc.c b/levels/totwc/areas/script_vanilla.inc.c index 6981dd3a4b..39175812c7 100644 --- a/levels/totwc/areas/script_vanilla.inc.c +++ b/levels/totwc/areas/script_vanilla.inc.c @@ -1,3 +1,3 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_9), -LOAD_MODEL_FROM_GEO(MODEL_totwc_LEVEL_GEOMETRY_03, totwc_geo_000160), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, totwc_geo_000160), diff --git a/levels/totwc/script.c b/levels/totwc/script.c index 7425f5e903..ffefbf4b8a 100644 --- a/levels/totwc/script.c +++ b/levels/totwc/script.c @@ -48,28 +48,28 @@ static const LevelScript script_totwc_macro_objects[] = { OBJECT(/*model*/ MODEL_YELLOW_COIN, /*pos*/ -960, 2600, 1040, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvYellowCoin), OBJECT(/*model*/ MODEL_YELLOW_COIN, /*pos*/ -1760, 2800, 600, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvYellowCoin), // Special objects - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 4608, -357, -511, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -4095, 666, 512, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -5631, -1893, 6144, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -2047, -869, 2048, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 1024, 1178, 1536, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -2047, -357, -2559, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 2560, -2917, 2560, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 1024, 1178, 4096, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -1023, -869, 5632, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -5119, -2405, 1024, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 512, -2917, 3584, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 1024, -1893, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -511, -869, -4095, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 4608, -3429, 1536, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 6144, -3429, -5119, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -2559, -2405, -6655, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 3072, -869, 5632, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 6144, -1381, -511, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 4096, 666, -1535, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -4607, -1381, -2559, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ -1535, -2917, -6143, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_totwc_LEVEL_GEOMETRY_03, /*pos*/ 2560, -3429, -3583, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 4608, -357, -511, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -4095, 666, 512, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -5631, -1893, 6144, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -2047, -869, 2048, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 1024, 1178, 1536, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -2047, -357, -2559, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 2560, -2917, 2560, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 1024, 1178, 4096, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -1023, -869, 5632, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -5119, -2405, 1024, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 512, -2917, 3584, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 1024, -1893, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -511, -869, -4095, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 4608, -3429, 1536, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 6144, -3429, -5119, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -2559, -2405, -6655, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 3072, -869, 5632, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 6144, -1381, -511, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 4096, 666, -1535, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -4607, -1381, -2559, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -1535, -2917, -6143, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 2560, -3429, -3583, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; diff --git a/levels/ttm/areas/script_vanilla.inc.c b/levels/ttm/areas/script_vanilla.inc.c index 1faafd9a3a..5e5785d602 100644 --- a/levels/ttm/areas/script_vanilla.inc.c +++ b/levels/ttm/areas/script_vanilla.inc.c @@ -1,22 +1,22 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_7), JUMP_LINK(script_func_vo_ttm), -LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_03, ttm_geo_000748), -LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_04, ttm_geo_000778), -LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_05, ttm_geo_0007A8), -LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_06, ttm_geo_0007D8), -LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_07, ttm_geo_000808), -LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_08, ttm_geo_000830), -LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_09, ttm_geo_000858), -LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_0A, ttm_geo_000880), -LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_0B, ttm_geo_0008A8), -LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_0C, ttm_geo_0008D0), -LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_0D, ttm_geo_0008F8), -LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_0F, ttm_geo_000920), -LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_10, ttm_geo_000948), -LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_11, ttm_geo_000970), -LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_12, ttm_geo_000990), -LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_13, ttm_geo_0009C0), -LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_14, ttm_geo_0009F0), -LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_15, ttm_geo_000A18), -LOAD_MODEL_FROM_GEO(MODEL_ttm_LEVEL_GEOMETRY_16, ttm_geo_000A40), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, ttm_geo_000748), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, ttm_geo_000778), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, ttm_geo_0007A8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, ttm_geo_0007D8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, ttm_geo_000808), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, ttm_geo_000830), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, ttm_geo_000858), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, ttm_geo_000880), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, ttm_geo_0008A8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, ttm_geo_0008D0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, ttm_geo_0008F8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, ttm_geo_000920), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, ttm_geo_000948), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, ttm_geo_000970), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, ttm_geo_000990), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_13, ttm_geo_0009C0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_14, ttm_geo_0009F0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_15, ttm_geo_000A18), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_16, ttm_geo_000A40), diff --git a/levels/ttm/script.c b/levels/ttm/script.c index 9204a2dc53..a09680b8f8 100644 --- a/levels/ttm/script.c +++ b/levels/ttm/script.c @@ -59,34 +59,34 @@ static const LevelScript script_ttm_area_1_macro_objects[] = { OBJECT(/*model*/ MODEL_BUTTERFLY, /*pos*/ -606, 1186, -1290, /*angle*/ 0, 0, 0, /*behParam*/ (TRIPLET_BUTTERFLY_BP_0 << 16), /*beh*/ bhvTripletButterfly), OBJECT(/*model*/ MODEL_BREAKABLE_BOX, /*pos*/ 4980, -4607, 2680, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvJumpingBox), // Special objects - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_03, /*pos*/ -3276, -4423, -3685, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_03, /*pos*/ 7293, -5056, 1429, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_03, /*pos*/ 4938, -5568, 5115, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_04, /*pos*/ 4198, -4508, -2866, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_04, /*pos*/ 1470, -4507, -4298, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_04, /*pos*/ 3277, -4508, -4095, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_05, /*pos*/ 3891, -4489, -3532, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_05, /*pos*/ 3277, -4489, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_05, /*pos*/ 2509, -4489, -3378, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_05, /*pos*/ 534, -4490, -4176, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_06, /*pos*/ 2358, -4594, -4386, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_06, /*pos*/ 1843, -4515, -3583, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_06, /*pos*/ 2317, -4635, -3838, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_07, /*pos*/ 102, -4363, 5734, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_08, /*pos*/ 4710, -4656, -101, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_09, /*pos*/ 5018, -4249, -3481, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_0A, /*pos*/ -306, -3356, 3584, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_0B, /*pos*/ 1434, -2279, 3277, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_0C, /*pos*/ 2970, -1854, 4301, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_0D, /*pos*/ 4608, -1854, 2560, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_0F, /*pos*/ 2355, 1309, 1229, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_10, /*pos*/ 1843, 1295, 1024, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_11, /*pos*/ 819, 2349, -101, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_12, /*pos*/ -1945, -918, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_13, /*pos*/ -1842, -1791, -2866, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_14, /*pos*/ -1228, -613, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_15, /*pos*/ -1740, -204, -2354, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_ttm_LEVEL_GEOMETRY_16, /*pos*/ -2764, -2661, 3789, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ -3276, -4423, -3685, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 7293, -5056, 1429, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 4938, -5568, 5115, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 4198, -4508, -2866, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 1470, -4507, -4298, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 3277, -4508, -4095, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ 3891, -4489, -3532, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ 3277, -4489, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ 2509, -4489, -3378, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ 534, -4490, -4176, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ 2358, -4594, -4386, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ 1843, -4515, -3583, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ 2317, -4635, -3838, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_07, /*pos*/ 102, -4363, 5734, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_08, /*pos*/ 4710, -4656, -101, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_09, /*pos*/ 5018, -4249, -3481, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0A, /*pos*/ -306, -3356, 3584, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0B, /*pos*/ 1434, -2279, 3277, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ 2970, -1854, 4301, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0D, /*pos*/ 4608, -1854, 2560, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0F, /*pos*/ 2355, 1309, 1229, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_10, /*pos*/ 1843, 1295, 1024, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_11, /*pos*/ 819, 2349, -101, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_12, /*pos*/ -1945, -918, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_13, /*pos*/ -1842, -1791, -2866, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_14, /*pos*/ -1228, -613, -3071, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_15, /*pos*/ -1740, -204, -2354, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_16, /*pos*/ -2764, -2661, 3789, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), RETURN(), }; diff --git a/levels/wf/areas/script_vanilla_load.inc.c b/levels/wf/areas/script_vanilla_load.inc.c index f0de738886..f5345f0090 100644 --- a/levels/wf/areas/script_vanilla_load.inc.c +++ b/levels/wf/areas/script_vanilla_load.inc.c @@ -2,14 +2,14 @@ JUMP_LINK(script_func_global_1), JUMP_LINK(script_func_global_2), JUMP_LINK(script_func_global_15), JUMP_LINK(script_func_vo_wf), -LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_03, wf_geo_0007E0), -LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_04, wf_geo_000820), -LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_05, wf_geo_000860), -LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_06, wf_geo_000878), -LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_07, wf_geo_000890), -LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_0A, wf_geo_000900), -LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_0C, wf_geo_000940), -LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_0E, wf_geo_000958), -LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_0F, wf_geo_0009A0), -LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_11, wf_geo_0009D0), -LOAD_MODEL_FROM_GEO(MODEL_wf_LEVEL_GEOMETRY_12, wf_geo_0009E8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, wf_geo_0007E0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, wf_geo_000820), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, wf_geo_000860), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, wf_geo_000878), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, wf_geo_000890), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, wf_geo_000900), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, wf_geo_000940), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, wf_geo_000958), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, wf_geo_0009A0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, wf_geo_0009D0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, wf_geo_0009E8), diff --git a/levels/wf/script.c b/levels/wf/script.c index 85eca425e9..f571ce2f8d 100644 --- a/levels/wf/script.c +++ b/levels/wf/script.c @@ -63,23 +63,23 @@ static const LevelScript script_wf_macro_objects[] = { OBJECT(/*model*/ MODEL_BREAKABLE_BOX, /*pos*/ -2940, 384, -1320, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBreakableBoxSmall), OBJECT(/*model*/ MODEL_BUTTERFLY, /*pos*/ 4574, 300, 1130, /*angle*/ 0, 0, 0, /*behParam*/ (TRIPLET_BUTTERFLY_BP_NO_BOMBS << 16), /*beh*/ bhvTripletButterfly), // Special objects - OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_0E, /*pos*/ 3584, 154, 4864, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_0F, /*pos*/ 4608, 256, 1792, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_11, /*pos*/ -2499, 1792, -261, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_12, /*pos*/ -2661, 384, 640, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ 3584, 154, 4864, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0F, /*pos*/ 4608, 256, 1792, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_11, /*pos*/ -2499, 1792, -261, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_12, /*pos*/ -2661, 384, 640, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), OBJECT(/*model*/ MODEL_BUBBLY_TREE, /*pos*/ 2560, 256, 4608, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTree), RETURN(), }; static const LevelScript script_wf_objects_1[] = { - OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_03, /*pos*/ 2305, 2432, -255, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_04, /*pos*/ 3405, 1664, -1791, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_05, /*pos*/ 3840, 0, -2303, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_05, /*pos*/ 3840, 0, -1279, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_06, /*pos*/ 0, 0, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_07, /*pos*/ 1757, 3519, -3151, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_0A, /*pos*/ 3840, 794, 2688, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_wf_LEVEL_GEOMETRY_0C, /*pos*/ 1408, 2522, 2431, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_03, /*pos*/ 2305, 2432, -255, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_04, /*pos*/ 3405, 1664, -1791, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ 3840, 0, -2303, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_05, /*pos*/ 3840, 0, -1279, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_06, /*pos*/ 0, 0, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_07, /*pos*/ 1757, 3519, -3151, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0A, /*pos*/ 3840, 794, 2688, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), + OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ 1408, 2522, 2431, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), OBJECT(/*model*/ MODEL_WF_GIANT_POLE, /*pos*/ -2560, 2560, -256, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvGiantPole), RETURN(), }; @@ -125,8 +125,8 @@ static const LevelScript script_wf_objects_3[] = { OBJECT(/*model*/ MODEL_BUTTERFLY, /*pos*/ 4608, 256, 128, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvButterfly), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 1035, 2880, -900, /*angle*/ 0, 45, 0, /*behParam*/ 0x00000000, /*beh*/ bhvCheckerboardElevatorGroup), OBJECT_WITH_ACTS(/*model*/ MODEL_BULLET_BILL, /*pos*/ 1280, 3712, 968, /*angle*/ 0, 180, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBulletBill, /*acts*/ ACT_2 | ACT_3 | ACT_4 | ACT_5 | ACT_6), - OBJECT_WITH_ACTS(/*model*/ MODEL_wf_LEVEL_GEOMETRY_08, /*pos*/ 0, 3584, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTower, /*acts*/ ACT_2 | ACT_3 | ACT_4 | ACT_5 | ACT_6), - OBJECT_WITH_ACTS(/*model*/ MODEL_wf_LEVEL_GEOMETRY_09, /*pos*/ 1280, 3584, 896, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBulletBillCannon, /*acts*/ ACT_2 | ACT_3 | ACT_4 | ACT_5 | ACT_6), + OBJECT_WITH_ACTS(/*model*/ MODEL_LEVEL_GEOMETRY_08, /*pos*/ 0, 3584, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTower, /*acts*/ ACT_2 | ACT_3 | ACT_4 | ACT_5 | ACT_6), + OBJECT_WITH_ACTS(/*model*/ MODEL_LEVEL_GEOMETRY_09, /*pos*/ 1280, 3584, 896, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBulletBillCannon, /*acts*/ ACT_2 | ACT_3 | ACT_4 | ACT_5 | ACT_6), OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ 0, 3483, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTowerPlatformGroup, /*acts*/ ACT_2 | ACT_3 | ACT_4 | ACT_5 | ACT_6), OBJECT_WITH_ACTS(/*model*/ MODEL_WF_TOWER_DOOR, /*pos*/ -511, 3584, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTowerDoor, /*acts*/ ACT_2 | ACT_3 | ACT_4 | ACT_5 | ACT_6), OBJECT_WITH_ACTS(/*model*/ MODEL_BOBOMB_BUDDY, /*pos*/ -1700, 1140, 3500, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBobombBuddyOpensCannon, /*acts*/ ACT_3 | ACT_4 | ACT_5 | ACT_6), From 8878960b762f2ae9d4b220796d0c1eef06f4f5d5 Mon Sep 17 00:00:00 2001 From: someone2639 Date: Sat, 8 Feb 2025 08:39:19 -0500 Subject: [PATCH 14/15] deduplicate bowser bomb --- include/model_ids.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/model_ids.h b/include/model_ids.h index 677716c762..fc3c0f8d62 100644 --- a/include/model_ids.h +++ b/include/model_ids.h @@ -330,7 +330,7 @@ enum ModelIDs { // second set of actor bins, (0x64-0x73) // group 12 MODEL_BOWSER, // bowser_geo - MODEL_BOWSER_BOMB_CHILD_OBJ, // bowser_bomb_geo - Spawns as a chill object in bowser's behavior command, causing an explosion if it touches a bomb + MODEL_BOWSER_BOMB, // bowser_bomb_geo - Spawns as a chill object in bowser's behavior command, causing an explosion if it touches a bomb MODEL_BOWSER_SMOKE, // bowser_impact_smoke_geo MODEL_BOWSER_FLAMES, // bowser_flames_geo MODEL_BOWSER_WAVE, // invisible_bowser_accessory_geo @@ -421,7 +421,6 @@ enum ModelIDs { MODEL_WF_TUMBLING_BRIDGE_PART, // wf_geo_000AB0 MODEL_WF_LARGE_BOMP, // wf_geo_000A40 MODEL_WF_TUMBLING_BRIDGE, // wf_geo_000AC8 - MODEL_BOWSER_BOMB, // bowser_bomb_geo MODEL_WATER_MINE, // water_mine_geo MODEL_BOWLING_BALL, // bowling_ball_geo MODEL_TRAMPOLINE, // springboard_top_geo (unused) From 37fff58407fc9f3470ef4465c563a1f3b30ba555 Mon Sep 17 00:00:00 2001 From: someone2639 Date: Sat, 8 Feb 2025 08:40:40 -0500 Subject: [PATCH 15/15] and the other files --- data/behavior_data.c | 2 +- levels/scripts.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/behavior_data.c b/data/behavior_data.c index bec8edb3b2..00689f07aa 100644 --- a/data/behavior_data.c +++ b/data/behavior_data.c @@ -2005,7 +2005,7 @@ const BehaviorScript bhvBowser[] = { SET_HOME(), LOAD_ANIMATIONS(oAnimations, bowser_seg6_anims_06057690), SPAWN_CHILD(/*Model*/ MODEL_NONE, /*Behavior*/ bhvBowserBodyAnchor), - SPAWN_CHILD(/*Model*/ MODEL_BOWSER_BOMB_CHILD_OBJ, /*Behavior*/ bhvBowserFlameSpawn), + SPAWN_CHILD(/*Model*/ MODEL_BOWSER_BOMB, /*Behavior*/ bhvBowserFlameSpawn), SPAWN_OBJ(/*Model*/ MODEL_NONE, /*Behavior*/ bhvBowserTailAnchor), // Beta leftover that spawn 50 coins when Bowser is defeated SET_INT(oNumLootCoins, 50), diff --git a/levels/scripts.c b/levels/scripts.c index ee779e09f1..98f8ad9cfc 100644 --- a/levels/scripts.c +++ b/levels/scripts.c @@ -301,7 +301,7 @@ const LevelScript script_func_global_12[] = { const LevelScript script_func_global_13[] = { LOAD_MODEL_FROM_GEO(MODEL_BOWSER, bowser_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOWSER_BOMB_CHILD_OBJ, bowser_bomb_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOWSER_BOMB, bowser_bomb_geo), LOAD_MODEL_FROM_GEO(MODEL_BOWSER_BOMB, bowser_bomb_geo), LOAD_MODEL_FROM_GEO(MODEL_BOWSER_SMOKE, bowser_impact_smoke_geo), LOAD_MODEL_FROM_GEO(MODEL_BOWSER_FLAMES, bowser_flames_geo),