hackern64/HackerSM64
0
0
Fork 0
mirror of https://github.com/HackerN64/HackerSM64.git synced 2026-01-21 10:35:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Name some HMC geolayouts + some demo fixes"

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
levels/sa/script.c
View File

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