Revert "Name some HMC geolayouts + some demo fixes"

This reverts commit 72be706ec7.
This commit is contained in:
thecozies
2021-10-05 08:29:12 -05:00
parent febc16cacb
commit fec149b238
38 changed files with 213 additions and 213 deletions

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