print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #70 from Reonu/revert_levelscript_changes

Browse Source 
Revert "Name some HMC geolayouts + some demo fixes"
This commit is contained in:
Arceveti
2021-10-05 10:12:52 -07:00
committed by GitHub
parent febc16cacb fec149b238
commit 24bbeaabf1
38 changed files with 213 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/model_ids.h
View File

@@ -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

16
levels/bbh/script.c
View File

@@ -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),

12
levels/bitdw/script.c
View File

@@ -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),

12
levels/bitfs/script.c
View File

@@ -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),

8
levels/bits/script.c
View File

@@ -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),

12
levels/bob/script.c
View File

@@ -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),

4
levels/bowser_2/script.c
View File

@@ -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),

4
levels/bowser_3/script.c
View File

@@ -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),

8
levels/castle_courtyard/script.c
View File

@@ -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),

16
levels/castle_grounds/script.c
View File

@@ -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),

16
levels/castle_inside/script.c
View File

@@ -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),

16
levels/ccm/script.c
View File

@@ -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),

8
levels/cotmc/script.c
View File

@@ -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),

16
levels/ddd/script.c
View File

@@ -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),

2
levels/hmc/areas/1/geo.inc.c
View File

@@ -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),

2
levels/hmc/arrow_platform/geo.inc.c
View File

@@ -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),

2
levels/hmc/arrow_platform_button/geo.inc.c
View File

@@ -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),

2
levels/hmc/elevator_platform/geo.inc.c
View File

@@ -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),

2
levels/hmc/grill_door/geo.inc.c
View File

@@ -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),

16
levels/hmc/header.h
View File

@@ -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[];

Some files were not shown because too many files have changed in this diff Show More