Name some HMC geolayouts + some demo fixes

This commit is contained in:
Arceveti
2021-09-26 17:10:10 -07:00
parent be8a27f79f
commit 72be706ec7
44 changed files with 229 additions and 227 deletions

View File

@@ -15,7 +15,7 @@
#include "make_const_nonconst.h"
#include "levels/bits/header.h"
static const LevelScript script_func_local_1[] = {
static const LevelScript script_func_local_hmc_flames_and_poles[] = {
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_1[] = {
RETURN(),
};
static const LevelScript script_func_local_2[] = {
static const LevelScript script_func_local_hmc_platforms[] = {
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_1),
JUMP_LINK(script_func_local_2),
JUMP_LINK(script_func_local_hmc_flames_and_poles),
JUMP_LINK(script_func_local_hmc_platforms),
TERRAIN(/*terrainData*/ bits_seg7_collision_level),
MACRO_OBJECTS(/*objList*/ bits_seg7_macro_objs),
SET_BACKGROUND_MUSIC(/*settingsPreset*/ 0x0000, /*seq*/ SEQ_LEVEL_KOOPA_ROAD),