From fec149b2380ffd8e25e533345db294d01a5e98c7 Mon Sep 17 00:00:00 2001 From: thecozies Date: Tue, 5 Oct 2021 08:29:12 -0500 Subject: [PATCH] Revert "Name some HMC geolayouts + some demo fixes" This reverts commit 72be706ec7796870438953b9e8c1927c66248a86. --- include/model_ids.h | 14 +++--- levels/bbh/script.c | 16 +++---- levels/bitdw/script.c | 12 ++--- levels/bitfs/script.c | 12 ++--- levels/bits/script.c | 8 ++-- levels/bob/script.c | 12 ++--- levels/bowser_2/script.c | 4 +- levels/bowser_3/script.c | 4 +- levels/castle_courtyard/script.c | 8 ++-- levels/castle_grounds/script.c | 16 +++---- levels/castle_inside/script.c | 16 +++---- levels/ccm/script.c | 16 +++---- levels/cotmc/script.c | 8 ++-- levels/ddd/script.c | 16 +++---- levels/hmc/areas/1/geo.inc.c | 2 +- levels/hmc/arrow_platform/geo.inc.c | 2 +- levels/hmc/arrow_platform_button/geo.inc.c | 2 +- levels/hmc/elevator_platform/geo.inc.c | 2 +- levels/hmc/grill_door/geo.inc.c | 2 +- levels/hmc/header.h | 16 +++---- levels/hmc/rolling_rock/geo.inc.c | 2 +- levels/hmc/rolling_rock_fragment_1/geo.inc.c | 2 +- levels/hmc/rolling_rock_fragment_2/geo.inc.c | 2 +- levels/hmc/script.c | 48 ++++++++++---------- levels/jrb/script.c | 16 +++---- levels/lll/script.c | 16 +++---- levels/rr/script.c | 12 ++--- levels/sa/script.c | 8 ++-- levels/sl/script.c | 16 +++---- levels/ssl/script.c | 16 +++---- levels/thi/script.c | 16 +++---- levels/totwc/script.c | 8 ++-- levels/ttc/script.c | 8 ++-- levels/ttm/script.c | 16 +++---- levels/vcutm/script.c | 12 ++--- levels/wdw/script.c | 16 +++---- levels/wf/script.c | 16 +++---- levels/wmotr/script.c | 8 ++-- 38 files changed, 213 insertions(+), 213 deletions(-) diff --git a/include/model_ids.h b/include/model_ids.h index dbc83f247a..a8434c1786 100644 --- a/include/model_ids.h +++ b/include/model_ids.h @@ -110,13 +110,13 @@ #define MODEL_CASTLE_CLOCK_PENDULUM 0x39 // castle_geo_001518 // hmc -#define MODEL_HMC_METAL_PLATFORM 0x36 // hmc_geo_controllable_arrow_platform -#define MODEL_HMC_METAL_ARROW_PLATFORM 0x37 // hmc_geo_controllable_arrow_platform_button -#define MODEL_HMC_ELEVATOR_PLATFORM 0x38 // hmc_geo_elevator_platform -#define MODEL_HMC_ROLLING_ROCK 0x39 // hmc_geo_rolling_rock -#define MODEL_HMC_ROCK_PIECE 0x3A // hmc_geo_rolling_rock_fragment_large - unused -#define MODEL_HMC_ROCK_SMALL_PIECE 0x3B // hmc_geo_rolling_rock_fragment_small - unused -#define MODEL_HMC_RED_GRILLS 0x3C // hmc_geo_grill_door +#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 diff --git a/levels/bbh/script.c b/levels/bbh/script.c index fb1408f1b1..8c13b2eaf2 100644 --- a/levels/bbh/script.c +++ b/levels/bbh/script.c @@ -17,7 +17,7 @@ #include "levels/bbh/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_RED_FLAME, /*pos*/ 2089, 1331, -1125, /*angle*/ 0, 270, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFlame), OBJECT(/*model*/ MODEL_RED_FLAME, /*pos*/ 1331, 1075, -1330, /*angle*/ 0, 90, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFlame), OBJECT(/*model*/ MODEL_RED_FLAME, /*pos*/ 2089, 1331, -511, /*angle*/ 0, 270, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFlame), @@ -27,7 +27,7 @@ static const LevelScript script_func_local_hmc_flames_and_poles[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_BBH_TILTING_FLOOR_PLATFORM, /*pos*/ 2866, 820, 1897, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBbhTiltingTrapPlatform), OBJECT(/*model*/ MODEL_BBH_TUMBLING_PLATFORM, /*pos*/ 2961, 0, -768, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBbhTumblingBridge), OBJECT(/*model*/ MODEL_BBH_MOVING_BOOKSHELF, /*pos*/ -1994, 819, 213, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvHauntedBookshelf), @@ -37,7 +37,7 @@ static const LevelScript script_func_local_hmc_platforms[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { +static const LevelScript script_func_local_3[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_BOO, /*pos*/ 1000, 50, 1000, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvGhostHuntBigBoo, /*acts*/ ACT_1), OBJECT_WITH_ACTS(/*model*/ MODEL_BOO, /*pos*/ 20, 100, -908, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvGhostHuntBoo, /*acts*/ ACT_1), OBJECT_WITH_ACTS(/*model*/ MODEL_BOO, /*pos*/ 3150, 100, 398, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvGhostHuntBoo, /*acts*/ ACT_1), @@ -69,7 +69,7 @@ static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_stars[] = { +static const LevelScript script_func_local_4[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ -2030, 1350, 1940, /*angle*/ 0, 0, 0, /*behParam*/ 0x02000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ -204, 1100, 1576, /*angle*/ 0, 0, 0, /*behParam*/ 0x03000000, /*beh*/ bhvHiddenRedCoinStar, /*acts*/ ALL_ACTS), OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ 923, 1741, -332, /*angle*/ 0, 18, 0, /*behParam*/ 0x05010000, /*beh*/ bhvMrI, /*acts*/ ALL_ACTS), @@ -103,10 +103,10 @@ const LevelScript level_bbh_entry[] = { LOAD_MODEL_FROM_GEO(MODEL_BBH_WOODEN_TOMB, geo_bbh_000658), AREA(/*index*/ 1, geo_bbh_000F00), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), - JUMP_LINK(script_func_local_hmc_dorrie_and_spawners), - JUMP_LINK(script_func_local_hmc_stars), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), + JUMP_LINK(script_func_local_3), + JUMP_LINK(script_func_local_4), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 666, 796, 5350, /*angle*/ 0, 180, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneWarp), WARP_NODE(/*id*/ 0x0A, /*destLevel*/ LEVEL_BBH, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE_COURTYARD, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), diff --git a/levels/bitdw/script.c b/levels/bitdw/script.c index 7278514fa4..60bfc624f5 100644 --- a/levels/bitdw/script.c +++ b/levels/bitdw/script.c @@ -16,7 +16,7 @@ #include "make_const_nonconst.h" #include "levels/bitdw/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_BITDW_SQUARE_PLATFORM, /*pos*/ -1966, -3154, 3586, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvSquarishPathMoving), OBJECT(/*model*/ MODEL_BITDW_SQUARE_PLATFORM, /*pos*/ -1352, -3154, 4200, /*angle*/ 0, 0, 0, /*behParam*/ 0x00020000, /*beh*/ bhvSquarishPathMoving), OBJECT(/*model*/ MODEL_BITDW_SQUARE_PLATFORM, /*pos*/ -2963, 1017, -2464, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvSquarishPathMoving), @@ -32,13 +32,13 @@ static const LevelScript script_func_local_hmc_flames_and_poles[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ -3092, -2795, 2842, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFlamethrower), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 2463, -2386, 2844, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFlamethrower), RETURN(), }; -static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { +static const LevelScript script_func_local_3[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ 7180, 3000, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBowserCourseRedCoinStar), RETURN(), }; @@ -94,9 +94,9 @@ const LevelScript level_bitdw_entry[] = { WARP_NODE(/*id*/ 0x0B, /*destLevel*/ LEVEL_BOWSER_1, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0x0C, /*destLevel*/ LEVEL_BITDW, /*destArea*/ 0x01, /*destNode*/ 0x0C, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x25, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), - JUMP_LINK(script_func_local_hmc_dorrie_and_spawners), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), + JUMP_LINK(script_func_local_3), TERRAIN(/*terrainData*/ bitdw_seg7_collision_level), MACRO_OBJECTS(/*objList*/ bitdw_seg7_macro_objs), SHOW_DIALOG(/*index*/ 0x00, DIALOG_090), diff --git a/levels/bitfs/script.c b/levels/bitfs/script.c index a7c6333333..008d75479f 100644 --- a/levels/bitfs/script.c +++ b/levels/bitfs/script.c @@ -15,7 +15,7 @@ #include "make_const_nonconst.h" #include "levels/bitfs/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_BITFS_PLATFORM_ON_TRACK, /*pos*/ -5733, -3071, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x07330000, /*beh*/ bhvPlatformOnTrack), OBJECT(/*model*/ MODEL_BITFS_TILTING_SQUARE_PLATFORM, /*pos*/ -1945, -3225, -715, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBitfsTiltingInvertedPyramid), OBJECT(/*model*/ MODEL_BITFS_TILTING_SQUARE_PLATFORM, /*pos*/ -2866, -3225, -715, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBitfsTiltingInvertedPyramid), @@ -38,14 +38,14 @@ static const LevelScript script_func_local_hmc_flames_and_poles[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ -3226, 3584, -822, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFlamethrower), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -1382, 3584, -822, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFlamethrower), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 1229, 307, -412, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFlamethrower), RETURN(), }; -static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { +static const LevelScript script_func_local_3[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ 1200, 5700, 160, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBowserCourseRedCoinStar), RETURN(), }; @@ -107,9 +107,9 @@ const LevelScript level_bitfs_entry[] = { WARP_NODE(/*id*/ 0x0B, /*destLevel*/ LEVEL_BOWSER_2, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0x0C, /*destLevel*/ LEVEL_BITFS, /*destArea*/ 0x01, /*destNode*/ 0x0C, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x68, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), - JUMP_LINK(script_func_local_hmc_dorrie_and_spawners), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), + JUMP_LINK(script_func_local_3), TERRAIN(/*terrainData*/ bitfs_seg7_collision_level), MACRO_OBJECTS(/*objList*/ bitfs_seg7_macro_objs), SET_BACKGROUND_MUSIC(/*settingsPreset*/ 0x0000, /*seq*/ SEQ_LEVEL_KOOPA_ROAD), diff --git a/levels/bits/script.c b/levels/bits/script.c index 0b0036068e..3232dbc6f4 100644 --- a/levels/bits/script.c +++ b/levels/bits/script.c @@ -15,7 +15,7 @@ #include "make_const_nonconst.h" #include "levels/bits/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_BITS_SLIDING_PLATFORM, /*pos*/ -2370, -4525, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00100000, /*beh*/ bhvSlidingPlatform2), OBJECT(/*model*/ MODEL_BITS_TWIN_SLIDING_PLATFORMS, /*pos*/ -2611, 3544, -904, /*angle*/ 0, 0, 0, /*behParam*/ 0x00CF0000, /*beh*/ bhvSlidingPlatform2), OBJECT(/*model*/ MODEL_BITS_TWIN_SLIDING_PLATFORMS, /*pos*/ -4700, 3544, -904, /*angle*/ 0, 180, 0, /*behParam*/ 0x008F0000, /*beh*/ bhvSlidingPlatform2), @@ -38,7 +38,7 @@ static const LevelScript script_func_local_hmc_flames_and_poles[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ 350, 6800, -6800, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBowserCourseRedCoinStar), RETURN(), }; @@ -97,8 +97,8 @@ const LevelScript level_bits_entry[] = { WARP_NODE(/*id*/ 0x0B, /*destLevel*/ LEVEL_BOWSER_3, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0x0C, /*destLevel*/ LEVEL_BITS, /*destArea*/ 0x01, /*destNode*/ 0x0C, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x6B, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), TERRAIN(/*terrainData*/ bits_seg7_collision_level), MACRO_OBJECTS(/*objList*/ bits_seg7_macro_objs), SET_BACKGROUND_MUSIC(/*settingsPreset*/ 0x0000, /*seq*/ SEQ_LEVEL_KOOPA_ROAD), diff --git a/levels/bob/script.c b/levels/bob/script.c index 3aa6499100..cdf8e14cc8 100644 --- a/levels/bob/script.c +++ b/levels/bob/script.c @@ -16,7 +16,7 @@ #include "make_const_nonconst.h" #include "levels/bob/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_BOB_CHAIN_CHOMP_GATE, /*pos*/ 1456, 768, 446, /*angle*/ 0, 326, 0, /*behParam*/ 0x00000000, /*beh*/ bhvChainChompGate), OBJECT(/*model*/ MODEL_BOB_SEESAW_PLATFORM, /*pos*/ -2303, 717, 1024, /*angle*/ 0, 45, 0, /*behParam*/ 0x00030000, /*beh*/ bhvSeesawPlatform), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -2050, 0, -3069, /*angle*/ 0, 25, 0, /*behParam*/ 0x00000000, /*beh*/ bhvOpenableGrill), @@ -25,7 +25,7 @@ static const LevelScript script_func_local_hmc_flames_and_poles[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ 1535, 3840, -5561, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBobBowlingBallSpawner, /*acts*/ ACT_1 | ACT_2), OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ 1535, 3840, -5561, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTtmBowlingBallSpawner, /*acts*/ ACT_3 | ACT_4 | ACT_5 | ACT_6), OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ 524, 2825, -5400, /*angle*/ 0, 0, 0, /*behParam*/ 0x00020000, /*beh*/ bhvBobBowlingBallSpawner, /*acts*/ ACT_1 | ACT_2), @@ -44,7 +44,7 @@ static const LevelScript script_func_local_hmc_platforms[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { +static const LevelScript script_func_local_3[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_KING_BOBOMB, /*pos*/ 1636, 4242, -5567, /*angle*/ 0, -147, 0, /*behParam*/ 0x00000000, /*beh*/ bhvKingBobomb, /*acts*/ ACT_1), OBJECT_WITH_ACTS(/*model*/ MODEL_KOOPA_WITH_SHELL, /*pos*/ -4004, 0, 5221, /*angle*/ 0, 0, 0, /*behParam*/ 0x01020000, /*beh*/ bhvKoopa, /*acts*/ ACT_2), OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ -6000, 1000, 2400, /*angle*/ 0, 0, 0, /*behParam*/ 0x03000000, /*beh*/ bhvHiddenRedCoinStar, /*acts*/ ALL_ACTS), @@ -75,9 +75,9 @@ const LevelScript level_bob_entry[] = { LOAD_MODEL_FROM_GEO(MODEL_BOB_BARS_GRILLS, bob_geo_000470), AREA(/*index*/ 1, bob_geo_000488), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), - JUMP_LINK(script_func_local_hmc_dorrie_and_spawners), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), + JUMP_LINK(script_func_local_3), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -6558, 1000, 6464, /*angle*/ 0, 135, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneWarp), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 583, 2683, -5387, /*angle*/ 0, -154, 0, /*behParam*/ 0x000B0000, /*beh*/ bhvFadingWarp), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 1680, 3835, -5523, /*angle*/ 0, -153, 0, /*behParam*/ 0x000C0000, /*beh*/ bhvFadingWarp), diff --git a/levels/bowser_2/script.c b/levels/bowser_2/script.c index 2d1ef805ca..0511bf1c54 100644 --- a/levels/bowser_2/script.c +++ b/levels/bowser_2/script.c @@ -15,7 +15,7 @@ #include "make_const_nonconst.h" #include "levels/bowser_2/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_BOWSER_2_TILTING_ARENA, /*pos*/ 0, 0, 0, /*angle*/ 0, 90, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTiltingBowserLavaPlatform), OBJECT(/*model*/ MODEL_BOWSER_BOMB, /*pos*/ 4, 1329, 3598, /*angle*/ 0, 90, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBowserBomb), OBJECT(/*model*/ MODEL_BOWSER_BOMB, /*pos*/ 3584, 1329, 0, /*angle*/ 0, 90, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBowserBomb), @@ -42,7 +42,7 @@ const LevelScript level_bowser_2_entry[] = { WARP_NODE(/*id*/ 0x0A, /*destLevel*/ LEVEL_BOWSER_2, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x36, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_BITFS, /*destArea*/ 0x01, /*destNode*/ 0x0C, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_flames_and_poles), + JUMP_LINK(script_func_local_1), TERRAIN(/*terrainData*/ bowser_2_seg7_collision_lava), SET_BACKGROUND_MUSIC(/*settingsPreset*/ 0x0002, /*seq*/ SEQ_LEVEL_BOSS_KOOPA), TERRAIN_TYPE(/*terrainType*/ TERRAIN_STONE), diff --git a/levels/bowser_3/script.c b/levels/bowser_3/script.c index 25a9af1b27..3d6df9bf7d 100644 --- a/levels/bowser_3/script.c +++ b/levels/bowser_3/script.c @@ -15,7 +15,7 @@ #include "make_const_nonconst.h" #include "levels/bowser_3/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_BOWSER_3_FALLING_PLATFORM_1, /*pos*/ 0, 0, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00010000, /*beh*/ bhvFallingBowserPlatform), OBJECT(/*model*/ MODEL_BOWSER_3_FALLING_PLATFORM_2, /*pos*/ 0, 0, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00020000, /*beh*/ bhvFallingBowserPlatform), OBJECT(/*model*/ MODEL_BOWSER_3_FALLING_PLATFORM_3, /*pos*/ 0, 0, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00030000, /*beh*/ bhvFallingBowserPlatform), @@ -58,7 +58,7 @@ const LevelScript level_bowser_3_entry[] = { AREA(/*index*/ 1, bowser_3_geo_000398), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, 1307, 0, /*angle*/ 0, 183, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneCircleWarp), WARP_NODE(/*id*/ 0x0A, /*destLevel*/ LEVEL_BOWSER_3, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_flames_and_poles), + JUMP_LINK(script_func_local_1), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_BITS, /*destArea*/ 0x01, /*destNode*/ 0x0C, /*flags*/ WARP_NO_CHECKPOINT), TERRAIN(/*terrainData*/ bowser_3_seg7_collision_level), SET_BACKGROUND_MUSIC(/*settingsPreset*/ 0x0002, /*seq*/ SEQ_LEVEL_BOSS_KOOPA_FINAL), diff --git a/levels/castle_courtyard/script.c b/levels/castle_courtyard/script.c index 8701355f8e..a532c56a42 100644 --- a/levels/castle_courtyard/script.c +++ b/levels/castle_courtyard/script.c @@ -15,14 +15,14 @@ #include "make_const_nonconst.h" #include "levels/castle_courtyard/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, 200, -1652, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvAmbientSounds), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -2700, 0, -1652, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBirdsSoundLoop), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 2700, 0, -1652, /*angle*/ 0, 0, 0, /*behParam*/ 0x00010000, /*beh*/ bhvBirdsSoundLoop), RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_BOO, /*pos*/ -3217, 100, -101, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvCourtyardBooTriplet), OBJECT(/*model*/ MODEL_BOO, /*pos*/ 3317, 100, -1701, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvCourtyardBooTriplet), OBJECT(/*model*/ MODEL_BOO, /*pos*/ -71, 1, -1387, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvCourtyardBooTriplet), @@ -55,8 +55,8 @@ const LevelScript level_castle_courtyard_entry[] = { WARP_NODE(/*id*/ 0x0B, /*destLevel*/ LEVEL_CASTLE_COURTYARD, /*destArea*/ 0x01, /*destNode*/ 0x0B, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0x01, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x02, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE_GROUNDS, /*destArea*/ 0x01, /*destNode*/ 0x03, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), TERRAIN(/*terrainData*/ castle_courtyard_seg7_collision), MACRO_OBJECTS(/*objList*/ castle_courtyard_seg7_macro_objs), SET_BACKGROUND_MUSIC(/*settingsPreset*/ 0x0000, /*seq*/ SEQ_SOUND_PLAYER), diff --git a/levels/castle_grounds/script.c b/levels/castle_grounds/script.c index ccfb7fa68e..6e44620b4a 100644 --- a/levels/castle_grounds/script.c +++ b/levels/castle_grounds/script.c @@ -15,7 +15,7 @@ #include "make_const_nonconst.h" #include "levels/castle_grounds/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { WARP_NODE(/*id*/ 0x00, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x00, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0x01, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x01, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0x02, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x02, /*flags*/ WARP_NO_CHECKPOINT), @@ -40,7 +40,7 @@ static const LevelScript script_func_local_hmc_flames_and_poles[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ -5812, 100, -5937, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvWaterfallSoundLoop), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -7430, 1500, 873, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBirdsSoundLoop), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -80, 1500, 5004, /*angle*/ 0, 0, 0, /*behParam*/ 0x00010000, /*beh*/ bhvBirdsSoundLoop), @@ -67,7 +67,7 @@ static const LevelScript script_func_local_hmc_platforms[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { +static const LevelScript script_func_local_3[] = { OBJECT(/*model*/ MODEL_CASTLE_GROUNDS_FLAG, /*pos*/ -3213, 3348, -3011, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvCastleFlagWaving), OBJECT(/*model*/ MODEL_CASTLE_GROUNDS_FLAG, /*pos*/ 3213, 3348, -3011, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvCastleFlagWaving), OBJECT(/*model*/ MODEL_CASTLE_GROUNDS_FLAG, /*pos*/ -3835, 3348, -6647, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvCastleFlagWaving), @@ -75,7 +75,7 @@ static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_stars[] = { +static const LevelScript script_func_local_4[] = { OBJECT(/*model*/ MODEL_BUTTERFLY, /*pos*/ -4508, 406, 4400, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvButterfly), OBJECT(/*model*/ MODEL_BUTTERFLY, /*pos*/ -4408, 406, 4500, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvButterfly), OBJECT(/*model*/ MODEL_BUTTERFLY, /*pos*/ -4708, 406, 4100, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvButterfly), @@ -119,10 +119,10 @@ const LevelScript level_castle_grounds_entry[] = { AREA(/*index*/ 1, castle_grounds_geo_00073C), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE_GROUNDS, /*destArea*/ 0x01, /*destNode*/ 0x03, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), - JUMP_LINK(script_func_local_hmc_dorrie_and_spawners), - JUMP_LINK(script_func_local_hmc_stars), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), + JUMP_LINK(script_func_local_3), + JUMP_LINK(script_func_local_4), TERRAIN(/*terrainData*/ castle_grounds_seg7_collision_level), MACRO_OBJECTS(/*objList*/ castle_grounds_seg7_macro_objs), SET_BACKGROUND_MUSIC(/*settingsPreset*/ 0x0000, /*seq*/ SEQ_SOUND_PLAYER), diff --git a/levels/castle_inside/script.c b/levels/castle_inside/script.c index aed935b889..0011560302 100644 --- a/levels/castle_inside/script.c +++ b/levels/castle_inside/script.c @@ -16,7 +16,7 @@ #include "make_const_nonconst.h" #include "levels/castle_inside/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { WARP_NODE(/*id*/ 0x00, /*destLevel*/ LEVEL_CASTLE_GROUNDS, /*destArea*/ 0x01, /*destNode*/ 0x00, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0x01, /*destLevel*/ LEVEL_CASTLE_GROUNDS, /*destArea*/ 0x01, /*destNode*/ 0x01, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0x02, /*destLevel*/ LEVEL_CASTLE_COURTYARD, /*destArea*/ 0x01, /*destNode*/ 0x01, /*flags*/ WARP_NO_CHECKPOINT), @@ -90,7 +90,7 @@ static const LevelScript script_func_local_hmc_flames_and_poles[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_CASTLE_KEY_DOOR, /*pos*/ -1100, 512, 3021, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvDoorWarp), OBJECT(/*model*/ MODEL_CASTLE_KEY_DOOR, /*pos*/ -946, 512, 3021, /*angle*/ 0, 180, 0, /*behParam*/ 0x00010000, /*beh*/ bhvDoorWarp), WARP_NODE(/*id*/ 0x00, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x03, /*flags*/ WARP_NO_CHECKPOINT), @@ -159,7 +159,7 @@ static const LevelScript script_func_local_hmc_platforms[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { +static const LevelScript script_func_local_3[] = { OBJECT(/*model*/ MODEL_CASTLE_KEY_DOOR, /*pos*/ -1100, -1074, 922, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvDoorWarp), OBJECT(/*model*/ MODEL_CASTLE_KEY_DOOR, /*pos*/ -946, -1074, 922, /*angle*/ 0, 180, 0, /*behParam*/ 0x00010000, /*beh*/ bhvDoorWarp), WARP_NODE(/*id*/ 0x00, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x05, /*flags*/ WARP_NO_CHECKPOINT), @@ -202,7 +202,7 @@ static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_stars[] = { +static const LevelScript script_func_local_4[] = { OBJECT(/*model*/ MODEL_RED_FLAME, /*pos*/ -2037, -818, -716, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFlame), OBJECT(/*model*/ MODEL_RED_FLAME, /*pos*/ -1648, -818, -716, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFlame), OBJECT(/*model*/ MODEL_RED_FLAME, /*pos*/ -1648, -818, -101, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFlame), @@ -260,7 +260,7 @@ const LevelScript level_castle_inside_entry[] = { OBJECT(/*model*/ MODEL_TOAD, /*pos*/ -1671, 0, 1313, /*angle*/ 0, 83, 0, /*behParam*/ DIALOG_133 << 24, /*beh*/ bhvToadMessage), OBJECT(/*model*/ MODEL_TOAD, /*pos*/ 1524, 307, 458, /*angle*/ 0, 110, 0, /*behParam*/ DIALOG_134 << 24, /*beh*/ bhvToadMessage), OBJECT(/*model*/ MODEL_TOAD, /*pos*/ 596, -306, -2637, /*angle*/ 0, 152, 0, /*behParam*/ DIALOG_135 << 24, /*beh*/ bhvToadMessage), - JUMP_LINK(script_func_local_hmc_flames_and_poles), + JUMP_LINK(script_func_local_1), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE_GROUNDS, /*destArea*/ 0x01, /*destNode*/ 0x03, /*flags*/ WARP_NO_CHECKPOINT), TERRAIN(/*terrainData*/ inside_castle_seg7_area_1_collision), ROOMS(/*surfaceRooms*/ inside_castle_seg7_area_1_rooms), @@ -277,7 +277,7 @@ const LevelScript level_castle_inside_entry[] = { OBJECT(/*model*/ MODEL_TOAD, /*pos*/ -977, 1203, 2569, /*angle*/ 0, 0, 0, /*behParam*/ DIALOG_076 << 24, /*beh*/ bhvToadMessage), OBJECT(/*model*/ MODEL_TOAD, /*pos*/ -1584, 2253, 7157, /*angle*/ 0, 136, 0, /*behParam*/ DIALOG_083 << 24, /*beh*/ bhvToadMessage), OBJECT(/*model*/ MODEL_TOAD, /*pos*/ 837, 1203, 3020, /*angle*/ 0, 180, 0, /*behParam*/ DIALOG_137 << 24, /*beh*/ bhvToadMessage), - JUMP_LINK(script_func_local_hmc_platforms), + JUMP_LINK(script_func_local_2), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE_GROUNDS, /*destArea*/ 0x01, /*destNode*/ 0x03, /*flags*/ WARP_NO_CHECKPOINT), TERRAIN(/*terrainData*/ inside_castle_seg7_area_2_collision), ROOMS(/*surfaceRooms*/ inside_castle_seg7_area_2_rooms), @@ -294,8 +294,8 @@ const LevelScript level_castle_inside_entry[] = { OBJECT(/*model*/ MODEL_MIPS, /*pos*/ -1509, -1177, -1564, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvMips), OBJECT(/*model*/ MODEL_TOAD, /*pos*/ 1787, -1381, -1957, /*angle*/ 0, 126, 0, /*behParam*/ DIALOG_082 << 24, /*beh*/ bhvToadMessage), OBJECT(/*model*/ MODEL_TOAD, /*pos*/ -4048, -1381, -1334, /*angle*/ 0, 30, 0, /*behParam*/ DIALOG_136 << 24, /*beh*/ bhvToadMessage), - JUMP_LINK(script_func_local_hmc_dorrie_and_spawners), - JUMP_LINK(script_func_local_hmc_stars), + JUMP_LINK(script_func_local_3), + JUMP_LINK(script_func_local_4), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE_GROUNDS, /*destArea*/ 0x01, /*destNode*/ 0x03, /*flags*/ WARP_NO_CHECKPOINT), TERRAIN(/*terrainData*/ inside_castle_seg7_area_3_collision), ROOMS(/*surfaceRooms*/ inside_castle_seg7_area_3_rooms), diff --git a/levels/ccm/script.c b/levels/ccm/script.c index 3259d6c347..f98b318646 100644 --- a/levels/ccm/script.c +++ b/levels/ccm/script.c @@ -16,12 +16,12 @@ #include "make_const_nonconst.h" #include "levels/ccm/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_CCM_ROPEWAY_LIFT, /*pos*/ 531, -4430, 6426, /*angle*/ 0, 0, 0, /*behParam*/ 0x07120000, /*beh*/ bhvPlatformOnTrack), RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_PENGUIN, /*pos*/ 2650, -3735, 3970, /*angle*/ 0, 0, 0, /*behParam*/ 0x00010000, /*beh*/ bhvSmallPenguin), OBJECT(/*model*/ MODEL_PENGUIN, /*pos*/ -555, 3470, -1000, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvSmallPenguin), OBJECT(/*model*/ MODEL_MR_BLIZZARD, /*pos*/ -2376, -1589, 4256, /*angle*/ 0, 252, 0, /*behParam*/ 0x00010000, /*beh*/ bhvMrBlizzard), @@ -30,7 +30,7 @@ static const LevelScript script_func_local_hmc_platforms[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { +static const LevelScript script_func_local_3[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ 2665, -4607, 4525, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvCcmTouchedStarSpawn, /*acts*/ ALL_ACTS), OBJECT_WITH_ACTS(/*model*/ MODEL_PENGUIN, /*pos*/ 3450, -4700, 4550, /*angle*/ 0, 0, 0, /*behParam*/ 0x01000000, /*beh*/ bhvTuxiesMother, /*acts*/ ALL_ACTS), OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ 4200, -927, 400, /*angle*/ 0, 0, 0, /*behParam*/ 0x03000000, /*beh*/ bhvHiddenRedCoinStar, /*acts*/ ALL_ACTS), @@ -39,7 +39,7 @@ static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_stars[] = { +static const LevelScript script_func_local_4[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_PENGUIN, /*pos*/ -4952, 6656, -6075, /*angle*/ 0, 270, 0, /*behParam*/ 0x02000000, /*beh*/ bhvRacingPenguin, /*acts*/ ACT_2 | ACT_3 | ACT_4 | ACT_5 | ACT_6), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -6500, -5836, -6400, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvPenguinRaceFinishLine), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -6393, -716, 7503, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvPenguinRaceShortcutCheck), @@ -87,9 +87,9 @@ const LevelScript level_ccm_entry[] = { WARP_NODE(/*id*/ 0x20, /*destLevel*/ LEVEL_CCM, /*destArea*/ 0x01, /*destNode*/ 0x1F, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x33, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x65, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), - JUMP_LINK(script_func_local_hmc_dorrie_and_spawners), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), + JUMP_LINK(script_func_local_3), TERRAIN(/*terrainData*/ ccm_seg7_area_1_collision), MACRO_OBJECTS(/*objList*/ ccm_seg7_area_1_macro_objs), SHOW_DIALOG(/*index*/ 0x00, DIALOG_048), @@ -103,7 +103,7 @@ const LevelScript level_ccm_entry[] = { WARP_NODE(/*id*/ 0x0A, /*destLevel*/ LEVEL_CCM, /*destArea*/ 0x02, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x33, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x65, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_stars), + JUMP_LINK(script_func_local_4), TERRAIN(/*terrainData*/ ccm_seg7_area_2_collision), MACRO_OBJECTS(/*objList*/ ccm_seg7_area_2_macro_objs), SET_BACKGROUND_MUSIC(/*settingsPreset*/ 0x0001, /*seq*/ SEQ_LEVEL_SLIDE), diff --git a/levels/cotmc/script.c b/levels/cotmc/script.c index d8efdcf841..149a11b2ed 100644 --- a/levels/cotmc/script.c +++ b/levels/cotmc/script.c @@ -16,14 +16,14 @@ #include "make_const_nonconst.h" #include "levels/cotmc/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_CAP_SWITCH, /*pos*/ 0, 363, -6144, /*angle*/ 0, 0, 0, /*behParam*/ 0x00010000, /*beh*/ bhvCapSwitch), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, 500, -7373, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvWaterfallSoundLoop), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, 500, 3584, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvWaterfallSoundLoop), RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, -200, -7000, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvHiddenRedCoinStar), RETURN(), }; @@ -50,8 +50,8 @@ const LevelScript level_cotmc_entry[] = { WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x34, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x66, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF3, /*destLevel*/ LEVEL_CASTLE_GROUNDS, /*destArea*/ 0x01, /*destNode*/ 0x14, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_platforms), - JUMP_LINK(script_func_local_hmc_flames_and_poles), + JUMP_LINK(script_func_local_2), + JUMP_LINK(script_func_local_1), TERRAIN(/*terrainData*/ cotmc_seg7_collision_level), MACRO_OBJECTS(/*objList*/ cotmc_seg7_macro_objs), SHOW_DIALOG(/*index*/ 0x00, DIALOG_130), diff --git a/levels/ddd/script.c b/levels/ddd/script.c index fc5c8cd3b9..12d839d2b4 100644 --- a/levels/ddd/script.c +++ b/levels/ddd/script.c @@ -15,7 +15,7 @@ #include "make_const_nonconst.h" #include "levels/ddd/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_SUSHI, /*pos*/ -3071, -270, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvSushiShark), OBJECT(/*model*/ MODEL_SUSHI, /*pos*/ -3071, -4270, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvSushiShark), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -3071, -130, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFewBlueFishSpawner), @@ -26,13 +26,13 @@ static const LevelScript script_func_local_hmc_flames_and_poles[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ -2400, -4607, 125, /*angle*/ 0, 0, 0, /*behParam*/ 0x01000000, /*beh*/ bhvTreasureChests, /*acts*/ ALL_ACTS), OBJECT_WITH_ACTS(/*model*/ MODEL_MANTA_RAY, /*pos*/ -4640, -1380, 40, /*angle*/ 0, 0, 0, /*behParam*/ 0x04000000, /*beh*/ bhvMantaRay, /*acts*/ ACT_2 | ACT_3 | ACT_4 | ACT_5 | ACT_6), RETURN(), }; -static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { +static const LevelScript script_func_local_3[] = { OBJECT(/*model*/ MODEL_DDD_BOWSER_SUB_DOOR, /*pos*/ 0, 0, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBowserSubDoor), OBJECT(/*model*/ MODEL_DDD_BOWSER_SUB, /*pos*/ 0, 0, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBowsersSub), OBJECT(/*model*/ MODEL_DDD_POLE, /*pos*/ 5120, 1005, 3584, /*angle*/ 0, 180, 0, /*behParam*/ 0x001E0000, /*beh*/ bhvDDDPole), @@ -47,7 +47,7 @@ static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_stars[] = { +static const LevelScript script_func_local_4[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ 3404, -3319, -489, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvJetStream), RETURN(), }; @@ -87,8 +87,8 @@ const LevelScript level_ddd_entry[] = { WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x35, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x67, /*flags*/ WARP_NO_CHECKPOINT), WHIRLPOOL(/*unk2*/ 0, /*unk3*/ 0, /*pos*/ -3174, -4915, 102, /*strength*/ 20), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), INSTANT_WARP(/*index*/ 3, /*destArea*/ 2, /*displace*/ -8192, 0, 0), TERRAIN(/*terrainData*/ ddd_seg7_area_1_collision), MACRO_OBJECTS(/*objList*/ ddd_seg7_area_1_macro_objs), @@ -102,8 +102,8 @@ const LevelScript level_ddd_entry[] = { WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x35, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x67, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF3, /*destLevel*/ LEVEL_CASTLE_GROUNDS, /*destArea*/ 0x01, /*destNode*/ 0x1E, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_dorrie_and_spawners), - JUMP_LINK(script_func_local_hmc_stars), + JUMP_LINK(script_func_local_3), + JUMP_LINK(script_func_local_4), JUMP_LINK(script_func_local_5), INSTANT_WARP(/*index*/ 2, /*destArea*/ 1, /*displace*/ 8192, 0, 0), TERRAIN(/*terrainData*/ ddd_seg7_area_2_collision), diff --git a/levels/hmc/areas/1/geo.inc.c b/levels/hmc/areas/1/geo.inc.c index b62a69d33d..5a2baac0d1 100644 --- a/levels/hmc/areas/1/geo.inc.c +++ b/levels/hmc/areas/1/geo.inc.c @@ -288,7 +288,7 @@ const GeoLayout hmc_geo_000B48[] = { }; // 0x0E000B90 -const GeoLayout hmc_geo_area_1[] = { +const GeoLayout hmc_geo_000B90[] = { GEO_NODE_SCREEN_AREA(10, SCREEN_WIDTH/2, SCREEN_HEIGHT/2, SCREEN_WIDTH/2, SCREEN_HEIGHT/2), GEO_OPEN_NODE(), GEO_ZBUFFER(0), diff --git a/levels/hmc/arrow_platform/geo.inc.c b/levels/hmc/arrow_platform/geo.inc.c index 3ed48ceeed..71f0be7554 100644 --- a/levels/hmc/arrow_platform/geo.inc.c +++ b/levels/hmc/arrow_platform/geo.inc.c @@ -1,5 +1,5 @@ // 0x0E0005A0 -const GeoLayout hmc_geo_controllable_arrow_platform[] = { +const GeoLayout hmc_geo_0005A0[] = { GEO_CULLING_RADIUS(550), GEO_OPEN_NODE(), GEO_DISPLAY_LIST(LAYER_OPAQUE, hmc_seg7_dl_07022DA0), diff --git a/levels/hmc/arrow_platform_button/geo.inc.c b/levels/hmc/arrow_platform_button/geo.inc.c index 080f01b202..09af5b26d0 100644 --- a/levels/hmc/arrow_platform_button/geo.inc.c +++ b/levels/hmc/arrow_platform_button/geo.inc.c @@ -1,5 +1,5 @@ // 0x0E0005B8 -const GeoLayout hmc_geo_controllable_arrow_platform_button[] = { +const GeoLayout hmc_geo_0005B8[] = { GEO_CULLING_RADIUS(200), GEO_OPEN_NODE(), GEO_DISPLAY_LIST(LAYER_OPAQUE, hmc_seg7_dl_07023090), diff --git a/levels/hmc/elevator_platform/geo.inc.c b/levels/hmc/elevator_platform/geo.inc.c index 1a82900141..2265af03ba 100644 --- a/levels/hmc/elevator_platform/geo.inc.c +++ b/levels/hmc/elevator_platform/geo.inc.c @@ -1,5 +1,5 @@ // 0x0E0005D0 -const GeoLayout hmc_geo_elevator_platform[] = { +const GeoLayout hmc_geo_0005D0[] = { GEO_CULLING_RADIUS(500), GEO_OPEN_NODE(), GEO_DISPLAY_LIST(LAYER_OPAQUE, hmc_seg7_dl_07022AA0), diff --git a/levels/hmc/grill_door/geo.inc.c b/levels/hmc/grill_door/geo.inc.c index bc27441e1e..e4e123f296 100644 --- a/levels/hmc/grill_door/geo.inc.c +++ b/levels/hmc/grill_door/geo.inc.c @@ -1,5 +1,5 @@ // 0x0E000530 -const GeoLayout hmc_geo_grill_door[] = { +const GeoLayout hmc_geo_000530[] = { GEO_CULLING_RADIUS(1000), GEO_OPEN_NODE(), GEO_DISPLAY_LIST(LAYER_ALPHA, hmc_seg7_dl_0701FFF8), diff --git a/levels/hmc/header.h b/levels/hmc/header.h index fa913c11f8..68ed2f64ca 100644 --- a/levels/hmc/header.h +++ b/levels/hmc/header.h @@ -5,13 +5,13 @@ #include "game/moving_texture.h" // geo -extern const GeoLayout hmc_geo_grill_door[]; -extern const GeoLayout hmc_geo_rolling_rock[]; -extern const GeoLayout hmc_geo_rolling_rock_fragment_large[]; -extern const GeoLayout hmc_geo_rolling_rock_fragment_small[]; -extern const GeoLayout hmc_geo_controllable_arrow_platform[]; -extern const GeoLayout hmc_geo_controllable_arrow_platform_button[]; -extern const GeoLayout hmc_geo_elevator_platform[]; +extern const GeoLayout hmc_geo_000530[]; +extern const GeoLayout hmc_geo_000548[]; +extern const GeoLayout hmc_geo_000570[]; +extern const GeoLayout hmc_geo_000588[]; +extern const GeoLayout hmc_geo_0005A0[]; +extern const GeoLayout hmc_geo_0005B8[]; +extern const GeoLayout hmc_geo_0005D0[]; extern const GeoLayout hmc_geo_0005E8[]; extern const GeoLayout hmc_geo_000618[]; extern const GeoLayout hmc_geo_000658[]; @@ -30,7 +30,7 @@ extern const GeoLayout hmc_geo_000A18[]; extern const GeoLayout hmc_geo_000A88[]; extern const GeoLayout hmc_geo_000AE8[]; extern const GeoLayout hmc_geo_000B48[]; -extern const GeoLayout hmc_geo_area_1[]; +extern const GeoLayout hmc_geo_000B90[]; // leveldata extern const Gfx hmc_seg7_dl_070078B0[]; diff --git a/levels/hmc/rolling_rock/geo.inc.c b/levels/hmc/rolling_rock/geo.inc.c index 2a70526bff..3822ed9b7e 100644 --- a/levels/hmc/rolling_rock/geo.inc.c +++ b/levels/hmc/rolling_rock/geo.inc.c @@ -1,5 +1,5 @@ // 0x0E000548 -const GeoLayout hmc_geo_rolling_rock[] = { +const GeoLayout hmc_geo_000548[] = { GEO_CULLING_RADIUS(300), GEO_OPEN_NODE(), GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0xB4, 400), diff --git a/levels/hmc/rolling_rock_fragment_1/geo.inc.c b/levels/hmc/rolling_rock_fragment_1/geo.inc.c index 88d94c137f..a40bae6250 100644 --- a/levels/hmc/rolling_rock_fragment_1/geo.inc.c +++ b/levels/hmc/rolling_rock_fragment_1/geo.inc.c @@ -1,5 +1,5 @@ // 0x0E000570 -const GeoLayout hmc_geo_rolling_rock_fragment_large[] = { +const GeoLayout hmc_geo_000570[] = { GEO_CULLING_RADIUS(150), GEO_OPEN_NODE(), GEO_DISPLAY_LIST(LAYER_OPAQUE, hmc_seg7_dl_07023E10), diff --git a/levels/hmc/rolling_rock_fragment_2/geo.inc.c b/levels/hmc/rolling_rock_fragment_2/geo.inc.c index 826f6bdc05..fe5072cedb 100644 --- a/levels/hmc/rolling_rock_fragment_2/geo.inc.c +++ b/levels/hmc/rolling_rock_fragment_2/geo.inc.c @@ -1,5 +1,5 @@ // 0x0E000588 -const GeoLayout hmc_geo_rolling_rock_fragment_small[] = { +const GeoLayout hmc_geo_000588[] = { GEO_CULLING_RADIUS(100), GEO_OPEN_NODE(), GEO_DISPLAY_LIST(LAYER_OPAQUE, hmc_seg7_dl_07024110), diff --git a/levels/hmc/script.c b/levels/hmc/script.c index a32459cf67..a38c1fb173 100644 --- a/levels/hmc/script.c +++ b/levels/hmc/script.c @@ -15,7 +15,7 @@ #include "make_const_nonconst.h" #include "levels/hmc/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_RED_FLAME, /*pos*/ 4936, -357, -4146, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFlame), OBJECT(/*model*/ MODEL_RED_FLAME, /*pos*/ 5018, -460, -5559, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFlame), OBJECT(/*model*/ MODEL_RED_FLAME, /*pos*/ 1997, 666, -235, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFlame), @@ -38,7 +38,7 @@ static const LevelScript script_func_local_hmc_flames_and_poles[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_HMC_METAL_PLATFORM, /*pos*/ 1100, 950, 6350, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvControllablePlatform), OBJECT(/*model*/ MODEL_HMC_ELEVATOR_PLATFORM, /*pos*/ -3243, 1434, 1392, /*angle*/ 0, 27, 0, /*behParam*/ 0x00000000, /*beh*/ bhvHmcElevatorPlatform), OBJECT(/*model*/ MODEL_HMC_ELEVATOR_PLATFORM, /*pos*/ -2816, 2253, -2509, /*angle*/ 0, 0, 0, /*behParam*/ 0x00010000, /*beh*/ bhvHmcElevatorPlatform), @@ -50,7 +50,7 @@ static const LevelScript script_func_local_hmc_platforms[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { +static const LevelScript script_func_local_3[] = { OBJECT(/*model*/ MODEL_DORRIE, /*pos*/ -3533, -4969, 3558, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvDorrie), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -6093, 3075, -7807, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBigBoulderGenerator), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -500, 1600, 3500, /*angle*/ 0, 0, 0, /*behParam*/ 0x00040000, /*beh*/ bhvFlamethrower), @@ -58,13 +58,13 @@ static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_stars[] = { - OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ -3600, -4000, 3600, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), +static const LevelScript script_func_local_4[] = { + OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ -3600, -4000, 3600, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ 4000, 300, 5000, /*angle*/ 0, 0, 0, /*behParam*/ 0x01000000, /*beh*/ bhvHiddenRedCoinStar, /*acts*/ ALL_ACTS), - OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ 6200, -4400, 2300, /*angle*/ 0, 0, 0, /*behParam*/ 0x02000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), - OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ -2100, 2100, -7550, /*angle*/ 0, 0, 0, /*behParam*/ 0x03000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), - OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ -6500, 2700, -1600, /*angle*/ 0, 0, 0, /*behParam*/ 0x04000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), - OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ -5000, 3050, -6700, /*angle*/ 0, 0, 0, /*behParam*/ 0x05000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), + OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ 6200, -4400, 2300, /*angle*/ 0, 0, 0, /*behParam*/ 0x02000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), + OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ -2100, 2100, -7550, /*angle*/ 0, 0, 0, /*behParam*/ 0x03000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), + OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ -6500, 2700, -1600, /*angle*/ 0, 0, 0, /*behParam*/ 0x04000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), + OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ -5000, 3050, -6700, /*angle*/ 0, 0, 0, /*behParam*/ 0x05000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), RETURN(), }; @@ -86,25 +86,25 @@ const LevelScript level_hmc_entry[] = { LOAD_MODEL_FROM_GEO(MODEL_HMC_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), - LOAD_MODEL_FROM_GEO(MODEL_HMC_METAL_PLATFORM, hmc_geo_controllable_arrow_platform), - LOAD_MODEL_FROM_GEO(MODEL_HMC_METAL_ARROW_PLATFORM, hmc_geo_controllable_arrow_platform_button), - LOAD_MODEL_FROM_GEO(MODEL_HMC_ELEVATOR_PLATFORM, hmc_geo_elevator_platform), - LOAD_MODEL_FROM_GEO(MODEL_HMC_ROLLING_ROCK, hmc_geo_rolling_rock), - LOAD_MODEL_FROM_GEO(MODEL_HMC_ROCK_PIECE, hmc_geo_rolling_rock_fragment_large), - LOAD_MODEL_FROM_GEO(MODEL_HMC_ROCK_SMALL_PIECE, hmc_geo_rolling_rock_fragment_small), - LOAD_MODEL_FROM_GEO(MODEL_HMC_RED_GRILLS, hmc_geo_grill_door), + LOAD_MODEL_FROM_GEO(MODEL_HMC_METAL_PLATFORM, hmc_geo_0005A0), + LOAD_MODEL_FROM_GEO(MODEL_HMC_METAL_ARROW_PLATFORM, hmc_geo_0005B8), + LOAD_MODEL_FROM_GEO(MODEL_HMC_ELEVATOR_PLATFORM, hmc_geo_0005D0), + LOAD_MODEL_FROM_GEO(MODEL_HMC_ROLLING_ROCK, hmc_geo_000548), + LOAD_MODEL_FROM_GEO(MODEL_HMC_ROCK_PIECE, hmc_geo_000570), + LOAD_MODEL_FROM_GEO(MODEL_HMC_ROCK_SMALL_PIECE, hmc_geo_000588), + LOAD_MODEL_FROM_GEO(MODEL_HMC_RED_GRILLS, hmc_geo_000530), - AREA(/*index*/ 1, hmc_geo_area_1), + AREA(/*index*/ 1, hmc_geo_000B90), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -7152, 3161, 7181, /*angle*/ 0, 135, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneWarp), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 3351, -4690, 4773, /*angle*/ 0, 0, 0, /*behParam*/ 0x340B0000, /*beh*/ bhvWarp), - WARP_NODE(/*id*/ 0x0A, /*destLevel*/ LEVEL_HMC, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), - WARP_NODE(/*id*/ 0x0B, /*destLevel*/ LEVEL_COTMC, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), + WARP_NODE(/*id*/ 0x0A, /*destLevel*/ LEVEL_HMC, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), + WARP_NODE(/*id*/ 0x0B, /*destLevel*/ LEVEL_COTMC, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x34, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x66, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), - JUMP_LINK(script_func_local_hmc_dorrie_and_spawners), - JUMP_LINK(script_func_local_hmc_stars), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), + JUMP_LINK(script_func_local_3), + JUMP_LINK(script_func_local_4), TERRAIN(/*terrainData*/ hmc_seg7_collision_level), MACRO_OBJECTS(/*objList*/ hmc_seg7_macro_objs), ROOMS(/*surfaceRooms*/ hmc_seg7_rooms), @@ -114,7 +114,7 @@ const LevelScript level_hmc_entry[] = { FREE_LEVEL_POOL(), MARIO_POS(/*area*/ 1, /*yaw*/ 135, /*pos*/ -7152, 2161, 7181), - CALL( /*arg*/ 0, /*func*/ lvl_init_or_update), + CALL(/*arg*/ 0, /*func*/ lvl_init_or_update), CALL_LOOP(/*arg*/ 1, /*func*/ lvl_init_or_update), CLEAR_LEVEL(), SLEEP_BEFORE_EXIT(/*frames*/ 1), diff --git a/levels/jrb/script.c b/levels/jrb/script.c index 39d2fc7b55..57c9d548d5 100644 --- a/levels/jrb/script.c +++ b/levels/jrb/script.c @@ -15,7 +15,7 @@ #include "make_const_nonconst.h" #include "levels/jrb/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_JRB_SUNKEN_SHIP, /*pos*/ 2385, 3589, 3727, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvSunkenShipPart, /*acts*/ ACT_1), OBJECT_WITH_ACTS(/*model*/ MODEL_JRB_SUNKEN_SHIP_BACK, /*pos*/ 2385, 3589, 3727, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvSunkenShipPart, /*acts*/ ACT_1), OBJECT_WITH_ACTS(/*model*/ MODEL_JRB_SHIP_LEFT_HALF_PART, /*pos*/ 5385, -5520, 2428, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvSunkenShipPart2, /*acts*/ ACT_1), @@ -37,7 +37,7 @@ static const LevelScript script_func_local_hmc_flames_and_poles[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_JRB_ROCK, /*pos*/ 1834, -2556, -7090, /*angle*/ 0, 194, 0, /*behParam*/ 0x00000000, /*beh*/ bhvRockSolid), OBJECT(/*model*/ MODEL_JRB_ROCK, /*pos*/ -2005, -2556, -3506, /*angle*/ 0, 135, 0, /*behParam*/ 0x00000000, /*beh*/ bhvRockSolid), OBJECT(/*model*/ MODEL_JRB_ROCK, /*pos*/ 1578, -2556, -5554, /*angle*/ 0, 90, 0, /*behParam*/ 0x00000000, /*beh*/ bhvRockSolid), @@ -91,7 +91,7 @@ static const LevelScript script_func_local_hmc_platforms[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { +static const LevelScript script_func_local_3[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ 4900, 2400, 800, /*angle*/ 0, 0, 0, /*behParam*/ 0x03000000, /*beh*/ bhvHiddenRedCoinStar, /*acts*/ ALL_ACTS), #if defined(VERSION_JP) || defined(VERSION_SH) OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ 1540, 2160, 2130, /*angle*/ 0, 0, 0, /*behParam*/ 0x04000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), @@ -102,7 +102,7 @@ static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_stars[] = { +static const LevelScript script_func_local_4[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ 400, -350, -2700, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTreasureChestsShip), RETURN(), }; @@ -147,9 +147,9 @@ const LevelScript level_jrb_entry[] = { WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x35, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x67, /*flags*/ WARP_NO_CHECKPOINT), WHIRLPOOL(/*unk2*/ 0, /*unk3*/ 3, /*pos*/ 4979, -5222, 2482, /*strength*/ -30), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), - JUMP_LINK(script_func_local_hmc_dorrie_and_spawners), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), + JUMP_LINK(script_func_local_3), TERRAIN(/*terrainData*/ jrb_seg7_area_1_collision), MACRO_OBJECTS(/*objList*/ jrb_seg7_area_1_macro_objs), SET_BACKGROUND_MUSIC(/*settingsPreset*/ 0x0003, /*seq*/ SEQ_LEVEL_WATER), @@ -161,7 +161,7 @@ const LevelScript level_jrb_entry[] = { WARP_NODE(/*id*/ 0x0A, /*destLevel*/ LEVEL_JRB, /*destArea*/ 0x02, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x35, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x67, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_stars), + JUMP_LINK(script_func_local_4), JUMP_LINK(script_func_local_5), TERRAIN(/*terrainData*/ jrb_seg7_area_2_collision), MACRO_OBJECTS(/*objList*/ jrb_seg7_area_2_macro_objs), diff --git a/levels/lll/script.c b/levels/lll/script.c index 94446abc99..99c903d546 100644 --- a/levels/lll/script.c +++ b/levels/lll/script.c @@ -17,7 +17,7 @@ #include "levels/lll/header.h" // Unlike most levels, level geometry objects in LLL are defined as regular objects instead of terrain objects. -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_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), @@ -35,7 +35,7 @@ static const LevelScript script_func_local_hmc_flames_and_poles[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_LLL_DRAWBRIDGE_PART, /*pos*/ -1919, 307, 3648, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvLllDrawbridgeSpawner), OBJECT(/*model*/ MODEL_LLL_ROTATING_BLOCK_FIRE_BARS, /*pos*/ -5119, 307, -4095, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvLllRotatingBlockWithFireBars), OBJECT(/*model*/ MODEL_LLL_ROTATING_HEXAGONAL_RING, /*pos*/ 0, 0, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvLllRotatingHexagonalRing), @@ -52,7 +52,7 @@ static const LevelScript script_func_local_hmc_platforms[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { +static const LevelScript script_func_local_3[] = { OBJECT(/*model*/ MODEL_LLL_MOVING_OCTAGONAL_MESH_PLATFORM, /*pos*/ 1124, 0, -4607, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvLllMovingOctagonalMeshPlatform), OBJECT(/*model*/ MODEL_LLL_MOVING_OCTAGONAL_MESH_PLATFORM, /*pos*/ 7168, 0, 2432, /*angle*/ 0, 0, 0, /*behParam*/ 0x00010000, /*beh*/ bhvLllMovingOctagonalMeshPlatform), OBJECT(/*model*/ MODEL_LLL_SINKING_ROCK_BLOCK, /*pos*/ 7168, 0, 7296, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvLllSinkingRockBlock), @@ -62,7 +62,7 @@ static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_stars[] = { +static const LevelScript script_func_local_4[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ -3199, 307, 3456, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvMrI), OBJECT(/*model*/ MODEL_BULLY_BOSS, /*pos*/ 0, 307, -4385, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBigBully), OBJECT(/*model*/ MODEL_BULLY_BOSS, /*pos*/ 4046, 2234, -5521, /*angle*/ 0, 0, 0, /*behParam*/ 0x01000000, /*beh*/ bhvBigBullyWithMinions), @@ -182,10 +182,10 @@ const LevelScript level_lll_entry[] = { WARP_NODE(/*id*/ 0x0D, /*destLevel*/ LEVEL_LLL, /*destArea*/ 0x01, /*destNode*/ 0x0C, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x32, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x64, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), - JUMP_LINK(script_func_local_hmc_dorrie_and_spawners), - JUMP_LINK(script_func_local_hmc_stars), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), + JUMP_LINK(script_func_local_3), + JUMP_LINK(script_func_local_4), JUMP_LINK(script_func_local_5), TERRAIN(/*terrainData*/ lll_seg7_area_1_collision), MACRO_OBJECTS(/*objList*/ lll_seg7_area_1_macro_objs), diff --git a/levels/rr/script.c b/levels/rr/script.c index af3d45162a..c4dc6d7021 100644 --- a/levels/rr/script.c +++ b/levels/rr/script.c @@ -15,7 +15,7 @@ #include "make_const_nonconst.h" #include "levels/rr/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_RR_SLIDING_PLATFORM, /*pos*/ -3400, -2038, 6564, /*angle*/ 0, 0, 0, /*behParam*/ 0x02560000, /*beh*/ bhvSlidingPlatform2), OBJECT(/*model*/ MODEL_RR_SLIDING_PLATFORM, /*pos*/ -2684, -1423, -36, /*angle*/ 0, 0, 0, /*behParam*/ 0x02590000, /*beh*/ bhvSlidingPlatform2), OBJECT(/*model*/ MODEL_RR_FLYING_CARPET, /*pos*/ 4571, -1782, 2036, /*angle*/ 0, 180, 0, /*behParam*/ 0x00000000, /*beh*/ bhvPlatformOnTrack), @@ -50,7 +50,7 @@ static const LevelScript script_func_local_hmc_flames_and_poles[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ -5809, -1834, 5719, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFlamethrower), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -4838, -1015, 4081, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFlamethrower), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 3301, -1834, 5617, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFlamethrower), @@ -59,7 +59,7 @@ static const LevelScript script_func_local_hmc_platforms[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { +static const LevelScript script_func_local_3[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ 1450, 3400, -2352, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ -4200, 6700, -4450, /*angle*/ 0, 0, 0, /*behParam*/ 0x01000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ -5150, -1400, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x02000000, /*beh*/ bhvHiddenRedCoinStar, /*acts*/ ALL_ACTS), @@ -127,9 +127,9 @@ const LevelScript level_rr_entry[] = { WARP_NODE(/*id*/ 0x0C, /*destLevel*/ LEVEL_RR, /*destArea*/ 0x01, /*destNode*/ 0x0B, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x3A, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x6C, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), - JUMP_LINK(script_func_local_hmc_dorrie_and_spawners), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), + JUMP_LINK(script_func_local_3), TERRAIN(/*terrainData*/ rr_seg7_collision_level), MACRO_OBJECTS(/*objList*/ rr_seg7_macro_objs), SET_BACKGROUND_MUSIC(/*settingsPreset*/ 0x0000, /*seq*/ SEQ_LEVEL_SLIDE), diff --git a/levels/sa/script.c b/levels/sa/script.c index c1b2796a12..575edac56f 100644 --- a/levels/sa/script.c +++ b/levels/sa/script.c @@ -15,13 +15,13 @@ #include "make_const_nonconst.h" #include "levels/sa/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, -1000, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvFishSpawner), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, -1000, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00020000, /*beh*/ bhvFishSpawner), RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, -4250, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvHiddenRedCoinStar), RETURN(), }; @@ -46,8 +46,8 @@ const LevelScript level_sa_entry[] = { WARP_NODE(/*id*/ 0x0A, /*destLevel*/ LEVEL_SA, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x27, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x28, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), TERRAIN(/*terrainData*/ sa_seg7_collision), MACRO_OBJECTS(/*objList*/ sa_seg7_macro_objs), SET_BACKGROUND_MUSIC(/*settingsPreset*/ 0x0003, /*seq*/ (SEQ_LEVEL_WATER | SEQ_VARIATION)), diff --git a/levels/sl/script.c b/levels/sl/script.c index cfd9627fe2..f937ddd186 100644 --- a/levels/sl/script.c +++ b/levels/sl/script.c @@ -16,19 +16,19 @@ #include "levels/sl/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ 700, 4500, 690, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ 4350, 1350, 4350, /*angle*/ 0, 0, 0, /*behParam*/ 0x02000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ 5000, 1200, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x04000000, /*beh*/ bhvHiddenRedCoinStar, /*acts*/ ALL_ACTS), RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ 977, 1024, 2075, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvSnowMoundSpawn), RETURN(), }; -static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { +static const LevelScript script_func_local_3[] = { OBJECT(/*model*/ MODEL_PENGUIN, /*pos*/ 1715, 3328, 518, /*angle*/ 0, -51, 0, /*behParam*/ 0x00000000, /*beh*/ bhvSLWalkingPenguin), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 700, 3428, 700, /*angle*/ 0, 30, 0, /*behParam*/ 0x00000000, /*beh*/ bhvSLSnowmanWind), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 480, 2300, 1370, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvIgloo), @@ -37,7 +37,7 @@ static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_stars[] = { +static const LevelScript script_func_local_4[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ 0, 500, 1000, /*angle*/ 0, 0, 0, /*behParam*/ 0x05000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), RETURN(), }; @@ -75,9 +75,9 @@ const LevelScript level_sl_entry[] = { WARP_NODE(/*id*/ 0x0C, /*destLevel*/ LEVEL_SL, /*destArea*/ 0x02, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0x0D, /*destLevel*/ LEVEL_SL, /*destArea*/ 0x01, /*destNode*/ 0x0E, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0x0E, /*destLevel*/ LEVEL_SL, /*destArea*/ 0x01, /*destNode*/ 0x0D, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), - JUMP_LINK(script_func_local_hmc_dorrie_and_spawners), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), + JUMP_LINK(script_func_local_3), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x36, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x68, /*flags*/ WARP_NO_CHECKPOINT), TERRAIN(/*terrainData*/ sl_seg7_area_1_collision), @@ -91,7 +91,7 @@ const LevelScript level_sl_entry[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, 0, 3277, /*angle*/ 0, 0, 0, /*behParam*/ 0x140B0000, /*beh*/ bhvWarp), WARP_NODE(/*id*/ 0x0A, /*destLevel*/ LEVEL_SL, /*destArea*/ 0x02, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0x0B, /*destLevel*/ LEVEL_SL, /*destArea*/ 0x01, /*destNode*/ 0x0B, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_stars), + JUMP_LINK(script_func_local_4), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x36, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x68, /*flags*/ WARP_NO_CHECKPOINT), TERRAIN(/*terrainData*/ sl_seg7_area_2_collision), diff --git a/levels/ssl/script.c b/levels/ssl/script.c index 714ee43dee..05725d14f0 100644 --- a/levels/ssl/script.c +++ b/levels/ssl/script.c @@ -15,12 +15,12 @@ #include "make_const_nonconst.h" #include "levels/ssl/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_SSL_PYRAMID_TOP, /*pos*/ -2047, 1536, -1023, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvPyramidTop), RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_SSL_TOX_BOX, /*pos*/ -1284, 0, -5895, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvToxBox), OBJECT(/*model*/ MODEL_SSL_TOX_BOX, /*pos*/ 1283, 0, -4865, /*angle*/ 0, 0, 0, /*behParam*/ 0x00010000, /*beh*/ bhvToxBox), OBJECT(/*model*/ MODEL_SSL_TOX_BOX, /*pos*/ 4873, 0, -3335, /*angle*/ 0, 0, 0, /*behParam*/ 0x00020000, /*beh*/ bhvToxBox), @@ -32,13 +32,13 @@ static const LevelScript script_func_local_hmc_platforms[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { +static const LevelScript script_func_local_3[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ -2050, 1200, -580, /*angle*/ 0, 0, 0, /*behParam*/ 0x01000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ 6000, 800, 3500, /*angle*/ 0, 0, 0, /*behParam*/ 0x04000000, /*beh*/ bhvHiddenRedCoinStar, /*acts*/ ALL_ACTS), RETURN(), }; -static const LevelScript script_func_local_hmc_stars[] = { +static const LevelScript script_func_local_4[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ 2867, 640, 2867, /*angle*/ 0, 0, 0, /*behParam*/ 0x004D0000, /*beh*/ bhvPoleGrabbing), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, 3200, 1331, /*angle*/ 0, 0, 0, /*behParam*/ 0x005C0000, /*beh*/ bhvPoleGrabbing), OBJECT(/*model*/ MODEL_SSL_GRINDEL, /*pos*/ 3297, 0, 95, /*angle*/ 0, 0, 0, /*behParam*/ 0x001C0000, /*beh*/ bhvGrindel), @@ -103,9 +103,9 @@ const LevelScript level_ssl_entry[] = { WARP_NODE(/*id*/ 0x20, /*destLevel*/ LEVEL_SSL, /*destArea*/ 0x01, /*destNode*/ 0x1F, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x33, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x65, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), - JUMP_LINK(script_func_local_hmc_dorrie_and_spawners), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), + JUMP_LINK(script_func_local_3), TERRAIN(/*terrainData*/ ssl_seg7_area_1_collision), MACRO_OBJECTS(/*objList*/ ssl_seg7_area_1_macro_objs), SET_BACKGROUND_MUSIC(/*settingsPreset*/ 0x0000, /*seq*/ SEQ_LEVEL_HOT), @@ -123,7 +123,7 @@ const LevelScript level_ssl_entry[] = { WARP_NODE(/*id*/ 0x16, /*destLevel*/ LEVEL_SSL, /*destArea*/ 0x02, /*destNode*/ 0x15, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x33, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x03, /*destNode*/ 0x65, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_stars), + JUMP_LINK(script_func_local_4), JUMP_LINK(script_func_local_5), INSTANT_WARP(/*index*/ 3, /*destArea*/ 3, /*displace*/ 0, 0, 0), TERRAIN(/*terrainData*/ ssl_seg7_area_2_collision), diff --git a/levels/thi/script.c b/levels/thi/script.c index 6eaa4c13e3..82d371c2dc 100644 --- a/levels/thi/script.c +++ b/levels/thi/script.c @@ -15,22 +15,22 @@ #include "make_const_nonconst.h" #include "levels/thi/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ 0, -700, -4500, /*angle*/ 0, 0, 0, /*behParam*/ 0x03000000, /*beh*/ bhvHiddenStar, /*acts*/ ALL_ACTS), RETURN(), }; -static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { +static const LevelScript script_func_local_3[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ -1800, 800, -1500, /*angle*/ 0, 0, 0, /*behParam*/ 0x04000000, /*beh*/ bhvHiddenRedCoinStar, /*acts*/ ALL_ACTS), OBJECT(/*model*/ MODEL_WIGGLER_HEAD, /*pos*/ 17, 1843, -62, /*angle*/ 0, 0, 0, /*behParam*/ 0x05000000, /*beh*/ bhvWigglerHead), RETURN(), }; -static const LevelScript script_func_local_hmc_stars[] = { +static const LevelScript script_func_local_4[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_KOOPA_WITH_SHELL, /*pos*/ -1900, -511, 2400, /*angle*/ 0, -30, 0, /*behParam*/ 0x02030000, /*beh*/ bhvKoopa, /*acts*/ ACT_3), OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ 7400, -1537, -6300, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvKoopaRaceEndpoint, /*acts*/ ACT_3), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -6556, -2969, 6565, /*angle*/ 0, 0, 0, /*behParam*/ 0x00010000, /*beh*/ bhvGoombaTripletSpawner), @@ -111,9 +111,9 @@ const LevelScript level_thi_entry[] = { WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x37, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x69, /*flags*/ WARP_NO_CHECKPOINT), JUMP_LINK(script_func_local_7), - JUMP_LINK(script_func_local_hmc_flames_and_poles), + JUMP_LINK(script_func_local_1), JUMP_LINK(script_func_local_5), - JUMP_LINK(script_func_local_hmc_stars), + JUMP_LINK(script_func_local_4), TERRAIN(/*terrainData*/ thi_seg7_area_1_collision), MACRO_OBJECTS(/*objList*/ thi_seg7_area_1_macro_objs), SET_BACKGROUND_MUSIC(/*settingsPreset*/ 0x0000, /*seq*/ SEQ_LEVEL_GRASS), @@ -130,7 +130,7 @@ const LevelScript level_thi_entry[] = { WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x33, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x65, /*flags*/ WARP_NO_CHECKPOINT), JUMP_LINK(script_func_local_8), - JUMP_LINK(script_func_local_hmc_platforms), + JUMP_LINK(script_func_local_2), JUMP_LINK(script_func_local_6), TERRAIN(/*terrainData*/ thi_seg7_area_2_collision), MACRO_OBJECTS(/*objList*/ thi_seg7_area_2_macro_objs), @@ -147,7 +147,7 @@ const LevelScript level_thi_entry[] = { WARP_NODE(/*id*/ 0x0C, /*destLevel*/ LEVEL_THI, /*destArea*/ 0x01, /*destNode*/ 0x0B, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x37, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x69, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_dorrie_and_spawners), + JUMP_LINK(script_func_local_3), TERRAIN(/*terrainData*/ thi_seg7_area_3_collision), MACRO_OBJECTS(/*objList*/ thi_seg7_area_3_macro_objs), SET_BACKGROUND_MUSIC(/*settingsPreset*/ 0x0004, /*seq*/ SEQ_LEVEL_UNDERGROUND), diff --git a/levels/totwc/script.c b/levels/totwc/script.c index ea35d7aec7..ea322edeed 100644 --- a/levels/totwc/script.c +++ b/levels/totwc/script.c @@ -16,12 +16,12 @@ #include "make_const_nonconst.h" #include "levels/totwc/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_CAP_SWITCH, /*pos*/ 0, -2047, 10, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvCapSwitch), RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ 800, -1700, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvHiddenRedCoinStar), RETURN(), }; @@ -47,8 +47,8 @@ const LevelScript level_totwc_entry[] = { WARP_NODE(/*id*/ 0xF3, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x20, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x26, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x23, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_platforms), - JUMP_LINK(script_func_local_hmc_flames_and_poles), + JUMP_LINK(script_func_local_2), + JUMP_LINK(script_func_local_1), TERRAIN(/*terrainData*/ totwc_seg7_collision), MACRO_OBJECTS(/*objList*/ totwc_seg7_macro_objs), SHOW_DIALOG(/*index*/ 0x00, DIALOG_131), diff --git a/levels/ttc/script.c b/levels/ttc/script.c index ca663f638e..70c9f781cb 100644 --- a/levels/ttc/script.c +++ b/levels/ttc/script.c @@ -15,13 +15,13 @@ #include "make_const_nonconst.h" #include "levels/ttc/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ -1080, -840, 1573, /*angle*/ 0, 0, 0, /*behParam*/ 0x00560000, /*beh*/ bhvPoleGrabbing), OBJECT(/*model*/ MODEL_THWOMP, /*pos*/ 1919, 6191, 1919, /*angle*/ 0, 225, 0, /*behParam*/ 0x00000000, /*beh*/ bhvThwomp2), RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ -1450, -1130, -1050, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ -1850, 300, -950, /*angle*/ 0, 0, 0, /*behParam*/ 0x01000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ -1300, -2250, -1300, /*angle*/ 0, 0, 0, /*behParam*/ 0x02000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), @@ -64,8 +64,8 @@ const LevelScript level_ttc_entry[] = { WARP_NODE(/*id*/ 0x0A, /*destLevel*/ LEVEL_TTC, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x35, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x67, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), TERRAIN(/*terrainData*/ ttc_seg7_collision_level), MACRO_OBJECTS(/*objList*/ ttc_seg7_macro_objs), SET_BACKGROUND_MUSIC(/*settingsPreset*/ 0x0001, /*seq*/ SEQ_LEVEL_SLIDE), diff --git a/levels/ttm/script.c b/levels/ttm/script.c index a9b88f497c..899aef6196 100644 --- a/levels/ttm/script.c +++ b/levels/ttm/script.c @@ -15,12 +15,12 @@ #include "make_const_nonconst.h" #include "levels/ttm/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_TTM_ROLLING_LOG, /*pos*/ 4360, -1722, 4001, /*angle*/ 0, 48, 0, /*behParam*/ 0x00000000, /*beh*/ bhvTtmRollingLog), RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ -1639, 1146, -1742, /*angle*/ 0, 0, 0, /*behParam*/ 0x00010000, /*beh*/ bhvTtmBowlingBallSpawner), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 3295, -3692, 2928, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvWaterfallSoundLoop), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 2004, -1580, 1283, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvWaterfallSoundLoop), @@ -41,7 +41,7 @@ static const LevelScript script_func_local_hmc_platforms[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { +static const LevelScript script_func_local_3[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ 1200, 2600, 150, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStar, /*acts*/ ACT_1), OBJECT_WITH_ACTS(/*model*/ MODEL_TTM_STAR_CAGE, /*pos*/ 2496, 1670, 1492, /*angle*/ 0, 0, 0, /*behParam*/ 0x01000000, /*beh*/ bhvUkikiCage, /*acts*/ ACT_2), OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ -3250, -2500, -3700, /*angle*/ 0, 0, 0, /*behParam*/ 0x02000000, /*beh*/ bhvHiddenRedCoinStar, /*acts*/ ALL_ACTS), @@ -51,7 +51,7 @@ static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_stars[] = { +static const LevelScript script_func_local_4[] = { OBJECT(/*model*/ MODEL_TTM_BLUE_SMILEY, /*pos*/ 4389, 3620, 624, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), OBJECT(/*model*/ MODEL_TTM_YELLOW_SMILEY, /*pos*/ -1251, 2493, 2224, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), OBJECT(/*model*/ MODEL_TTM_STAR_SMILEY, /*pos*/ -2547, 1365, -520, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject), @@ -134,9 +134,9 @@ const LevelScript level_ttm_entry[] = { PAINTING_WARP_NODE(/*id*/ 0x02, /*destLevel*/ LEVEL_TTM, /*destArea*/ 0x02, /*destNode*/ 0x0A, /*flags*/ WARP_CHECKPOINT), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x34, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x66, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), - JUMP_LINK(script_func_local_hmc_dorrie_and_spawners), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), + JUMP_LINK(script_func_local_3), TERRAIN(/*terrainData*/ ttm_seg7_area_1_collision), MACRO_OBJECTS(/*objList*/ ttm_seg7_area_1_macro_objs), SET_BACKGROUND_MUSIC(/*settingsPreset*/ 0x0000, /*seq*/ SEQ_LEVEL_GRASS), @@ -148,7 +148,7 @@ const LevelScript level_ttm_entry[] = { WARP_NODE(/*id*/ 0x0A, /*destLevel*/ LEVEL_TTM, /*destArea*/ 0x02, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x34, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x66, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_stars), + JUMP_LINK(script_func_local_4), TERRAIN(/*terrainData*/ ttm_seg7_area_2_collision), MACRO_OBJECTS(/*objList*/ ttm_seg7_area_2_macro_objs), INSTANT_WARP(/*index*/ 2, /*destArea*/ 3, /*displace*/ 10240, 7168, 10240), diff --git a/levels/vcutm/script.c b/levels/vcutm/script.c index b76229db00..9f9cdc37bb 100644 --- a/levels/vcutm/script.c +++ b/levels/vcutm/script.c @@ -16,7 +16,7 @@ #include "make_const_nonconst.h" #include "levels/vcutm/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_VCUTM_SEESAW_PLATFORM, /*pos*/ 154, -1919, -6256, /*angle*/ 0, 270, 0, /*behParam*/ 0x00070000, /*beh*/ bhvSeesawPlatform), OBJECT(/*model*/ MODEL_VCUTM_SEESAW_PLATFORM, /*pos*/ -2047, -3378, -2047, /*angle*/ 0, 0, 0, /*behParam*/ 0x00070000, /*beh*/ bhvSeesawPlatform), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 3251, -1082, -6256, /*angle*/ 0, 270, 0, /*behParam*/ 0x014B0000, /*beh*/ bhvCheckerboardElevatorGroup), @@ -26,12 +26,12 @@ static const LevelScript script_func_local_hmc_flames_and_poles[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_CAP_SWITCH, /*pos*/ 4506, 26, -6246, /*angle*/ 0, 0, 0, /*behParam*/ 0x00020000, /*beh*/ bhvCapSwitch), RETURN(), }; -static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { +static const LevelScript script_func_local_3[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ 4600, 250, -4500, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvHiddenRedCoinStar), RETURN(), }; @@ -57,9 +57,9 @@ const LevelScript level_vcutm_entry[] = { WARP_NODE(/*id*/ 0xF3, /*destLevel*/ LEVEL_CASTLE_GROUNDS, /*destArea*/ 0x01, /*destNode*/ 0x07, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE_GROUNDS, /*destArea*/ 0x01, /*destNode*/ 0x08, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE_GROUNDS, /*destArea*/ 0x01, /*destNode*/ 0x06, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_dorrie_and_spawners), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), + JUMP_LINK(script_func_local_3), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), TERRAIN(/*terrainData*/ vcutm_seg7_collision), MACRO_OBJECTS(/*objList*/ vcutm_seg7_macro_objs), SHOW_DIALOG(/*index*/ 0x00, DIALOG_129), diff --git a/levels/wdw/script.c b/levels/wdw/script.c index 22c4524afa..e647ec1401 100644 --- a/levels/wdw/script.c +++ b/levels/wdw/script.c @@ -15,7 +15,7 @@ #include "make_const_nonconst.h" #include "levels/wdw/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_WDW_SQUARE_FLOATING_PLATFORM, /*pos*/ 3390, 0, 384, /*angle*/ 0, 180, 0, /*behParam*/ 0x00000000, /*beh*/ bhvWdwSquareFloatingPlatform), OBJECT(/*model*/ MODEL_WDW_SQUARE_FLOATING_PLATFORM, /*pos*/ -767, 384, 3584, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvWdwSquareFloatingPlatform), OBJECT(/*model*/ MODEL_WDW_SQUARE_FLOATING_PLATFORM, /*pos*/ -767, 384, 1536, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvWdwSquareFloatingPlatform), @@ -47,7 +47,7 @@ static const LevelScript script_func_local_hmc_flames_and_poles[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, 0, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvInitializeChangingWaterLevel), OBJECT(/*model*/ MODEL_WDW_WATER_LEVEL_DIAMOND, /*pos*/ -3583, -2508, -2047, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvWaterLevelDiamond), OBJECT(/*model*/ MODEL_WDW_WATER_LEVEL_DIAMOND, /*pos*/ -767, -127, 1792, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvWaterLevelDiamond), @@ -55,13 +55,13 @@ static const LevelScript script_func_local_hmc_platforms[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { +static const LevelScript script_func_local_3[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ 3360, 1580, 2660, /*angle*/ 0, 0, 0, /*behParam*/ 0x02000000, /*beh*/ bhvHiddenStar, /*acts*/ ALL_ACTS), OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ 890, 3400, -2040, /*angle*/ 0, 0, 0, /*behParam*/ 0x03000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), RETURN(), }; -static const LevelScript script_func_local_hmc_stars[] = { +static const LevelScript script_func_local_4[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_NONE, /*pos*/ -770, -1600, 3600, /*angle*/ 0, 0, 0, /*behParam*/ 0x04000000, /*beh*/ bhvHiddenRedCoinStar, /*acts*/ ALL_ACTS), OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ 2180, -840, 3720, /*angle*/ 0, 0, 0, /*behParam*/ 0x05000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), RETURN(), @@ -99,8 +99,8 @@ const LevelScript level_wdw_entry[] = { WARP_NODE(/*id*/ 0x0A, /*destLevel*/ LEVEL_WDW, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0x0B, /*destLevel*/ LEVEL_WDW, /*destArea*/ 0x01, /*destNode*/ 0x0C, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0x0C, /*destLevel*/ LEVEL_WDW, /*destArea*/ 0x01, /*destNode*/ 0x0B, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_dorrie_and_spawners), - JUMP_LINK(script_func_local_hmc_flames_and_poles), + JUMP_LINK(script_func_local_3), + JUMP_LINK(script_func_local_1), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x32, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x64, /*flags*/ WARP_NO_CHECKPOINT), INSTANT_WARP(/*index*/ 1, /*destArea*/ 2, /*displace*/ 0, 0, 0), @@ -111,8 +111,8 @@ const LevelScript level_wdw_entry[] = { END_AREA(), AREA(/*index*/ 2, wdw_geo_000724), - JUMP_LINK(script_func_local_hmc_stars), - JUMP_LINK(script_func_local_hmc_platforms), + JUMP_LINK(script_func_local_4), + JUMP_LINK(script_func_local_2), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x32, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x64, /*flags*/ WARP_NO_CHECKPOINT), INSTANT_WARP(/*index*/ 0, /*destArea*/ 1, /*displace*/ 0, 0, 0), diff --git a/levels/wf/script.c b/levels/wf/script.c index b2473ede6b..57105e5d96 100644 --- a/levels/wf/script.c +++ b/levels/wf/script.c @@ -18,7 +18,7 @@ // Unlike most levels, some of the level geometry objects in WF are defined as regular objects instead of terrain objects. // Some of them are still terrain objects, however. -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_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), @@ -31,7 +31,7 @@ static const LevelScript script_func_local_hmc_flames_and_poles[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_WF_SMALL_BOMP, /*pos*/ 3300, 1070, 1, /*angle*/ 0, 90, 0, /*behParam*/ 0x00000000, /*beh*/ bhvSmallBomp), OBJECT(/*model*/ MODEL_WF_SMALL_BOMP, /*pos*/ 3300, 1070, 1281, /*angle*/ 0, 90, 0, /*behParam*/ 0x00000000, /*beh*/ bhvSmallBomp), OBJECT(/*model*/ MODEL_WF_LARGE_BOMP, /*pos*/ 3300, 1070, 641, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvLargeBomp), @@ -51,7 +51,7 @@ static const LevelScript script_func_local_hmc_platforms[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { +static const LevelScript script_func_local_3[] = { OBJECT(/*model*/ MODEL_THWOMP, /*pos*/ 3462, 1939, -1545, /*angle*/ 0, 180, 0, /*behParam*/ 0x00000000, /*beh*/ bhvThwomp), OBJECT(/*model*/ MODEL_THWOMP, /*pos*/ 3462, 1075, -3314, /*angle*/ 0, 90, 0, /*behParam*/ 0x00000000, /*beh*/ bhvThwomp2), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -856, 922, 3819, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvBetaFishSplashSpawner), @@ -81,7 +81,7 @@ static const LevelScript script_func_local_hmc_dorrie_and_spawners[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_stars[] = { +static const LevelScript script_func_local_4[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_WHOMP, /*pos*/ 0, 3584, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvWhompKingBoss, /*acts*/ ACT_1), OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ 300, 5550, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x01000000, /*beh*/ bhvStar, /*acts*/ ACT_2 | ACT_3 | ACT_4 | ACT_5 | ACT_6), OBJECT_WITH_ACTS(/*model*/ MODEL_STAR, /*pos*/ -2500, 1500, -750, /*angle*/ 0, 0, 0, /*behParam*/ 0x02000000, /*beh*/ bhvStar, /*acts*/ ALL_ACTS), @@ -148,10 +148,10 @@ const LevelScript level_wf_entry[] = { WARP_NODE(/*id*/ 0x0C, /*destLevel*/ LEVEL_WF, /*destArea*/ 0x01, /*destNode*/ 0x0B, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x34, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x01, /*destNode*/ 0x66, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), - JUMP_LINK(script_func_local_hmc_dorrie_and_spawners), - JUMP_LINK(script_func_local_hmc_stars), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), + JUMP_LINK(script_func_local_3), + JUMP_LINK(script_func_local_4), TERRAIN(/*terrainData*/ wf_seg7_collision_070102D8), MACRO_OBJECTS(/*objList*/ wf_seg7_macro_objs), SHOW_DIALOG(/*index*/ 0x00, DIALOG_030), diff --git a/levels/wmotr/script.c b/levels/wmotr/script.c index 3877c2c8e6..dcd8363c13 100644 --- a/levels/wmotr/script.c +++ b/levels/wmotr/script.c @@ -15,7 +15,7 @@ #include "make_const_nonconst.h" #include "levels/wmotr/header.h" -static const LevelScript script_func_local_hmc_flames_and_poles[] = { +static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ 3996, -2739, 5477, /*angle*/ 0, 0, 0, /*behParam*/ 0x00520000, /*beh*/ bhvPoleGrabbing), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -2911, 3564, -3967, /*angle*/ 0, 0, 0, /*behParam*/ 0x00540000, /*beh*/ bhvPoleGrabbing), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -3258, 3359, -3946, /*angle*/ 0, 0, 0, /*behParam*/ 0x00690000, /*beh*/ bhvPoleGrabbing), @@ -25,7 +25,7 @@ static const LevelScript script_func_local_hmc_flames_and_poles[] = { RETURN(), }; -static const LevelScript script_func_local_hmc_platforms[] = { +static const LevelScript script_func_local_2[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ -160, 1950, -470, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvHiddenRedCoinStar), RETURN(), }; @@ -53,8 +53,8 @@ const LevelScript level_wmotr_entry[] = { WARP_NODE(/*id*/ 0xF0, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x38, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 0x02, /*destNode*/ 0x6D, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ 0xF3, /*destLevel*/ LEVEL_CASTLE_GROUNDS, /*destArea*/ 0x01, /*destNode*/ 0x0A, /*flags*/ WARP_NO_CHECKPOINT), - JUMP_LINK(script_func_local_hmc_flames_and_poles), - JUMP_LINK(script_func_local_hmc_platforms), + JUMP_LINK(script_func_local_1), + JUMP_LINK(script_func_local_2), TERRAIN(/*terrainData*/ wmotr_seg7_collision), MACRO_OBJECTS(/*objList*/ wmotr_seg7_macro_objs), SET_BACKGROUND_MUSIC(/*settingsPreset*/ 0x0000, /*seq*/ SEQ_LEVEL_SLIDE),