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

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

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