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

Clean up some ifdefs and config.h

Browse Source
This commit is contained in:
Arceveti
2021-09-24 12:17:18 -07:00
parent 923db21615
commit 12c362ac86
57 changed files with 207 additions and 5568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
actors/bowser/geo.inc.c
View File

@@ -110,11 +110,7 @@ const GeoLayout bowser_geo_0000D8[] = {
const GeoLayout bowser_geo_000424[] = {
GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0x9B, 400),
GEO_OPEN_NODE(),
#if BUGFIX_BOWSER_FADING_OUT
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_06040358),
#else
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_06040210),
#endif
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_TRANSPARENT, -89, -2, -18, NULL),
GEO_OPEN_NODE(),
@@ -200,11 +196,7 @@ const GeoLayout bowser_geo_000424[] = {
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_0603A4E8),
GEO_CLOSE_NODE(),
#if BUGFIX_BOWSER_FADING_OUT
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_0603B948),
#else
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_0603B8D0),
#endif
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
@@ -226,11 +218,7 @@ const GeoLayout bowser_geo_000424[] = {
const GeoLayout bowser_geo_000770[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
#if BUGFIX_BOWSER_FADING_OUT
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_06040358),
#else
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_06040210),
#endif
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_TRANSPARENT, -89, -2, -18, NULL),
GEO_OPEN_NODE(),
@@ -316,11 +304,7 @@ const GeoLayout bowser_geo_000770[] = {
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_0603A4E8),
GEO_CLOSE_NODE(),
#if BUGFIX_BOWSER_FADING_OUT
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_0603B948),
#else
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_0603B8D0),
#endif
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
@@ -338,24 +322,18 @@ const GeoLayout bowser_geo_000770[] = {
GEO_RETURN(),
};
#ifndef VERSION_JP
// 0x0D000AB8
const GeoLayout bowser_shadow_geo[] = {
GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0x9B, 400),
GEO_RETURN(),
};
#endif
// 0x0D000AB8 / 0AC4
const GeoLayout bowser_geo[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_ASM(0, geo_update_layer_transparency),
#ifndef VERSION_JP
GEO_SWITCH_CASE(3, geo_switch_anim_state),
#else
GEO_SWITCH_CASE(2, geo_switch_anim_state),
#endif
GEO_OPEN_NODE(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
@@ -369,13 +347,11 @@ const GeoLayout bowser_geo[] = {
GEO_BRANCH(1, bowser_geo_000424),
GEO_CLOSE_NODE(),
#ifndef VERSION_JP
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_ASM(0, geo_bits_bowser_coloring),
GEO_BRANCH(1, bowser_shadow_geo),
GEO_CLOSE_NODE(),
#endif
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
@@ -387,11 +363,7 @@ const GeoLayout bowser_geo_no_shadow[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_ASM(0, geo_update_layer_transparency),
#ifndef VERSION_JP
GEO_SWITCH_CASE(3, geo_switch_anim_state),
#else
GEO_SWITCH_CASE(2, geo_switch_anim_state),
#endif
GEO_OPEN_NODE(),
GEO_NODE_START(),
GEO_OPEN_NODE(),
@@ -405,13 +377,11 @@ const GeoLayout bowser_geo_no_shadow[] = {
GEO_BRANCH(1, bowser_geo_000770),
GEO_CLOSE_NODE(),
#ifndef VERSION_JP
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_ASM(0, geo_bits_bowser_coloring),
GEO_BRANCH(1, bowser_shadow_geo),
GEO_CLOSE_NODE(),
#endif
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),

4
actors/bowser/model.inc.c
View File

@@ -1184,7 +1184,6 @@ const Gfx bowser_seg6_dl_0603B8D0[] = {
gsSPEndDisplayList(),
};
#if BUGFIX_BOWSER_FADING_OUT
// 0x0603B948 - 0x0603B9C8
const Gfx bowser_seg6_dl_0603B948[] = {
gsDPPipeSync(),
@@ -1204,7 +1203,6 @@ const Gfx bowser_seg6_dl_0603B948[] = {
gsSPSetGeometryMode(G_LIGHTING),
gsSPEndDisplayList(),
};
#endif
// 0x0603B948
static const Vtx bowser_seg6_vertex_0603B948[] = {
@@ -2870,7 +2868,6 @@ const Gfx bowser_seg6_dl_06040210[] = {
gsSPEndDisplayList(),
};
#if BUGFIX_BOWSER_FADING_OUT
// 0x06040358 - 0x06040428
const Gfx bowser_seg6_dl_06040358[] = {
gsDPPipeSync(),
@@ -2900,7 +2897,6 @@ const Gfx bowser_seg6_dl_06040358[] = {
gsSPDisplayList(bowser_seg6_dl_060401F0),
gsSPEndDisplayList(),
};
#endif
// 0x060402D8
static const Vtx bowser_seg6_vertex_060402D8[] = {

8
actors/peach/geo.inc.c
View File

@@ -68,11 +68,7 @@ const GeoLayout peach_geo_000254[] = {
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, NULL),
GEO_OPEN_NODE(),
#ifdef VERSION_JP
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, peach_seg5_dl_05007230),
#else
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, peach_seg5_us_dl_05007288),
#endif
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 78, 0, 0, peach_seg5_dl_05006A18),
GEO_OPEN_NODE(),
@@ -122,11 +118,7 @@ const GeoLayout peach_geo_000254[] = {
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 78, 0, 0, peach_seg5_dl_050060E0),
GEO_ANIMATED_PART(LAYER_TRANSPARENT, -23, -1, 0, NULL),
GEO_OPEN_NODE(),
#ifdef VERSION_JP
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, peach_seg5_dl_0500A0A8),
#else
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, peach_seg5_us_dl_0500A188),
#endif
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),

4
actors/peach/model.inc.c
View File

@@ -1087,7 +1087,6 @@ const Gfx peach_seg5_dl_05007230[] = {
gsSPEndDisplayList(),
};
#ifndef VERSION_JP
// 0x05007288 - 0x050072E8
const Gfx peach_seg5_us_dl_05007288[] = {
gsDPPipeSync(),
@@ -1103,7 +1102,6 @@ const Gfx peach_seg5_us_dl_05007288[] = {
gsDPPipeSync(),
gsSPEndDisplayList(),
};
#endif
// 0x05007288
static const Lights1 peach_seg5_lights_05007288 = gdSPDefLights1(
@@ -2219,7 +2217,6 @@ const Gfx peach_seg5_dl_0500A0A8[] = {
gsSPEndDisplayList(),
};
#ifndef VERSION_JP
// 0x0500A188 - 0x0500A210
const Gfx peach_seg5_us_dl_0500A188[] = {
gsDPPipeSync(),
@@ -2240,4 +2237,3 @@ const Gfx peach_seg5_us_dl_0500A188[] = {
gsDPSetAlphaCompare(G_AC_NONE),
gsSPEndDisplayList(),
};
#endif

12
actors/toad/geo.inc.c
View File

@@ -62,17 +62,9 @@ const GeoLayout toad_geo_00027C[] = {
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 83, 0, 0, NULL),
GEO_OPEN_NODE(),
#ifdef VERSION_JP
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 126, -37, 0, toad_seg6_dl_06007710),
#else
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 126, -37, 0, toad_seg6_us_dl_06007788),
#endif
GEO_CLOSE_NODE(),
#ifdef VERSION_JP
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 25, 8, 0, toad_seg6_dl_06007A48),
#else
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 25, 8, 0, toad_seg6_us_dl_06007B00),
#endif
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 34, 8, 0, toad_seg6_dl_06007EB0),
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 4, 7, 38, NULL),
GEO_OPEN_NODE(),
@@ -105,11 +97,7 @@ const GeoLayout toad_geo_00027C[] = {
GEO_OPEN_NODE(),
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, NULL),
GEO_OPEN_NODE(),
#ifdef VERSION_JP
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 17, 0, -4, toad_seg6_dl_06008520),
#else
GEO_ANIMATED_PART(LAYER_TRANSPARENT, 17, 0, -4, toad_seg6_us_dl_06008608),
#endif
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),

6
actors/toad/model.inc.c
View File

@@ -327,7 +327,6 @@ const Gfx toad_seg6_dl_06007710[] = {
gsSPEndDisplayList(),
};
#ifndef VERSION_JP
// 0x06007788 - 0x06007808
const Gfx toad_seg6_us_dl_06007788[] = {
gsDPPipeSync(),
@@ -347,7 +346,6 @@ const Gfx toad_seg6_us_dl_06007788[] = {
gsDPPipeSync(),
gsSPEndDisplayList(),
};
#endif
// 0x06007788
static const Lights1 toad_seg6_lights_06007788 = gdSPDefLights1(
@@ -423,7 +421,6 @@ const Gfx toad_seg6_dl_06007A48[] = {
gsSPEndDisplayList(),
};
#ifndef VERSION_JP
// 0x06007B00 - 0x06007B28
const Gfx toad_seg6_us_dl_06007B00[] = {
gsDPPipeSync(),
@@ -432,7 +429,6 @@ const Gfx toad_seg6_us_dl_06007B00[] = {
gsDPPipeSync(),
gsSPEndDisplayList(),
};
#endif
// 0x06007A80
static const Lights1 toad_seg6_lights_06007A80 = gdSPDefLights1(
@@ -698,7 +694,6 @@ const Gfx toad_seg6_dl_06008520[] = {
};
// US: 8608
#ifndef VERSION_JP
// 0x06008608 - 0x06008650
const Gfx toad_seg6_us_dl_06008608[] = {
gsDPPipeSync(),
@@ -711,7 +706,6 @@ const Gfx toad_seg6_us_dl_06008608[] = {
gsDPSetRenderMode(G_RM_AA_ZB_XLU_SURF, G_RM_NOOP2),
gsSPEndDisplayList(),
};
#endif
// 0x06008560
static const Lights1 toad_seg6_lights_06008560 = gdSPDefLights1(

13
actors/whomp/collision.inc.c
View File

@@ -2,18 +2,6 @@
// 0x06020A0C - 0x06020A90
const Collision whomp_seg6_collision_06020A0C[] = {
#ifdef VERSION_JP
COL_INIT(),
COL_VERTEX_INIT(0x8),
COL_VERTEX(-200, 50, -100),
COL_VERTEX(150, 50, -100),
COL_VERTEX(150, 430, -100),
COL_VERTEX(-200, 430, -100),
COL_VERTEX(-200, 50, -3),
COL_VERTEX(150, 430, -3),
COL_VERTEX(150, 50, -3),
COL_VERTEX(-200, 430, -3),
#else
COL_INIT(),
COL_VERTEX_INIT(0x8),
COL_VERTEX(-150, 50, -100),
@@ -24,7 +12,6 @@ const Collision whomp_seg6_collision_06020A0C[] = {
COL_VERTEX(150, 430, -3),
COL_VERTEX(150, 50, -3),
COL_VERTEX(-150, 430, -3),
#endif
COL_TRI_INIT(SURFACE_NO_CAM_COLLISION, 12),
COL_TRI(2, 1, 0),