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

Some refactoring

Browse Source
This commit is contained in:
Arceveti
2021-09-26 20:47:23 -07:00
parent 7da55b1456
commit c3a68d48a7
37 changed files with 581 additions and 746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
levels/hmc/geo.c
View File

@@ -13,7 +13,7 @@
#include "levels/hmc/header.h"
#include "levels/hmc/areas/1/grill_door/geo.inc.c"
#include "levels/hmc/grill_door/geo.inc.c"
#include "levels/hmc/rolling_rock/geo.inc.c"
#include "levels/hmc/rolling_rock_fragment_1/geo.inc.c"
#include "levels/hmc/rolling_rock_fragment_2/geo.inc.c"

0
levels/hmc/areas/1/grill_door/collision.inc.c → levels/hmc/grill_door/collision.inc.c
View File

0
levels/hmc/areas/1/grill_door/geo.inc.c → levels/hmc/grill_door/geo.inc.c
View File

0
levels/hmc/areas/1/grill_door/model.inc.c → levels/hmc/grill_door/model.inc.c
View File

4
levels/hmc/leveldata.c
View File

@@ -38,7 +38,6 @@
#include "levels/hmc/areas/1/26/model.inc.c"
#include "levels/hmc/areas/1/27/model.inc.c"
#include "levels/hmc/areas/1/28/model.inc.c"
#include "levels/hmc/areas/1/grill_door/model.inc.c"
#include "levels/hmc/areas/1/29/model.inc.c"
#include "levels/hmc/areas/1/30/model.inc.c"
#include "levels/hmc/areas/1/31/model.inc.c"
@@ -54,7 +53,8 @@
#include "levels/hmc/areas/1/macro.inc.c"
#include "levels/hmc/areas/1/room.inc.c"
#include "levels/hmc/elevator_platform/collision.inc.c"
#include "levels/hmc/areas/1/grill_door/collision.inc.c" // This is odd, but the model data for this is in the middle of area 1. I have to conclude it is an area local object, despite the fact it has collision. Let's hope this is the only oddity...
#include "levels/hmc/grill_door/model.inc.c"
#include "levels/hmc/grill_door/collision.inc.c" // This is odd, but the model data for this is in the middle of area 1. I have to conclude it is an area local object, despite the fact it has collision. Let's hope this is the only oddity...
#include "levels/hmc/arrow_platform/collision.inc.c"
#include "levels/hmc/arrow_platform_button/collision.inc.c"
#include "levels/hmc/areas/1/trajectory.inc.c"

10
levels/lll/areas/1/collision.inc.c
View File

@@ -1,7 +1,7 @@
// 0x0701ADE8 - 0x0701CE18
const Collision lll_seg7_area_1_collision[] = {
COL_INIT(),
COL_VERTEX_INIT(0x20F),
COL_VERTEX_INIT(0x213),
COL_VERTEX(2775, 1280, 4567),
COL_VERTEX(2816, 1280, 4608),
COL_VERTEX(5888, 1280, 4608),
@@ -529,7 +529,11 @@ const Collision lll_seg7_area_1_collision[] = {
COL_VERTEX(6724, 554, -6532),
COL_VERTEX(6863, 376, -6392),
COL_VERTEX(6934, 166, -6321),
COL_TRI_INIT(SURFACE_DEFAULT, 622),
COL_VERTEX(-5315, 300, -3400),
COL_VERTEX(-4915, 300, -3400),
COL_VERTEX(-4915, 300, -3000),
COL_VERTEX(-5315, 300, -3000),
COL_TRI_INIT(SURFACE_DEFAULT, 624),
COL_TRI(142, 143, 144),
COL_TRI(48, 49, 50),
COL_TRI(48, 50, 51),
@@ -1152,6 +1156,8 @@ const Collision lll_seg7_area_1_collision[] = {
COL_TRI(97, 521, 522),
COL_TRI(97, 92, 521),
COL_TRI(376, 524, 525),
COL_TRI(529, 528, 527),
COL_TRI(530, 529, 527),
COL_TRI_INIT(SURFACE_BURNING, 82),
COL_TRI(77, 73, 41),
COL_TRI(41, 39, 72),

5
levels/lll/script.c
View File

@@ -31,10 +31,7 @@ static const LevelScript script_func_local_hmc_flames_and_poles[] = {
OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ -4607, 0, 3456, /*angle*/ 0, 270, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject),
OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ -5119, 0, -511, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject),
OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0D, /*pos*/ 0, 0, -2047, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject),
// This behavior differs from the rest in that it actually has collision rather than being purely visual.
// A likely explanation is that this object was added in after the collision model was made, and they didn't want
// to redo the collision so they just added a new behavior for it.
OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -5115, 300, -3200, /*angle*/ 0, 90, 0, /*behParam*/ 0x00000000, /*beh*/ bhvLllHexagonalMesh),
OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0E, /*pos*/ -5115, 300, -3200, /*angle*/ 0, 90, 0, /*behParam*/ 0x00000000, /*beh*/ bhvStaticObject),
RETURN(),
};