mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-09-12 03:59:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename a bunch of D_06XXXXXX variables (#330)

Browse Source 
* Rename a bunch of D_06XXXXXX variables

Signed-off-by: Taggerung <tyler.taggerung@email.com>
This commit is contained in:
Tyler McGavran
2023-07-08 19:54:58 -04:00
committed by GitHub
parent ed404043f2
commit 2f7719086a
54 changed files with 566 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files
courses/battle/big_donut/course_data.inc.c
+1 -1
View File
@@ -21,7 +21,7 @@ Gfx d_course_big_donut_dl[] = {
};
// Item box spawn locations
struct ActorSpawnData d_course_big_donut_spawn_item_box[] = {
struct ActorSpawnData d_course_big_donut_item_box_spawns[] = {
{{ -40, 222, 824 }, {0} },
{{ 125, 200, 573 }, {0} },
{{ -302, 251, 889 }, {0} },
courses/battle/block_fort/course_data.inc.c
+1 -1
View File
@@ -16,7 +16,7 @@ Gfx d_course_block_fort_dl[] = {
};
// Item box spawn locations
struct ActorSpawnData d_course_block_fort_spawn_item_box[] = {
struct ActorSpawnData d_course_block_fort_item_box_spawns[] = {
{{ -38, 0, 744 }, {0} },
{{ 29, 0, 710 }, {0} },
{{ -13, 0, 685 }, {0} },
courses/battle/double_deck/course_data.inc.c
+1 -1
View File
@@ -14,7 +14,7 @@ Gfx d_course_double_deck_dl[] = {
};
// Item box spawn locations.
struct ActorSpawnData d_course_double_deck_spawn_item_box[] = {
struct ActorSpawnData d_course_double_deck_item_box_spawns[] = {
{{ -331, 0, 675 }, { 0 }},
{{ 18, 30, 295 }, { 0 }},
{{ -685, 0, -279 }, { 0 }},
courses/battle/skyscraper/course_data.inc.c
+1 -1
View File
@@ -25,7 +25,7 @@ Gfx d_course_skyscraper_dl[] = {
};
// Item box spawn locations
struct ActorSpawnData d_course_skyscraper_spawn_item_box[] = {
struct ActorSpawnData d_course_skyscraper_item_box_spawns[] = {
{{ -18, 480, 365 }, { 0 }},
{{ -272, 480, 312 }, { 0 }},
{{ -312, 480, 359 }, { 0 }},
courses/flower_cup/choco_mountain/course_data.inc.c
+1 -1
View File
@@ -3452,7 +3452,7 @@ Gfx d_course_choco_mountain_dl_6F88[] =
gsSPEndDisplayList(),
};
Gfx d_course_choco_mountain_dl_6FE0[] =
Gfx d_course_choco_mountain_dl_falling_rock[] =
{
gsSPSetGeometryMode(G_LIGHTING),
gsDPSetCycleType(G_CYC_2CYCLE),
courses/flower_cup/frappe_snowland/course_data.inc.c
+1 -1
View File
@@ -2731,7 +2731,7 @@ Vtx d_frappe_snowland_tree[] = {
{{{ 25, -2, 0 }, 0, { 1023, 1945 }, {0xFF, 0xFE, 0xFE, 0xFF }}},
};
Gfx d_course_frappe_snowland_dl_75A0[] =
Gfx d_course_frappe_snowland_dl_tree[] =
{
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2),
courses/flower_cup/mario_raceway/course_data.inc.c
+5 -5
View File
@@ -3609,7 +3609,7 @@ Vtx d_course_mario_raceway_piranha_plant_model[] = {
{{{ 15, 30, 0 }, 0, { 2048, 0 }, {0xFF, 0xFF, 0xFE, 0xFF }}},
};
Gfx d_course_mario_raceway_dl_6990[] =
Gfx d_course_mario_raceway_dl_piranha_plant[] =
{
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPPipeSync(),
@@ -3628,14 +3628,14 @@ Gfx d_course_mario_raceway_dl_6990[] =
};
// 0x6A28
Vtx d_course_mario_raceway_sdfuih[4] = {
Vtx d_course_mario_raceway_tree_model[4] = {
{{{ 40, 10, 0 }, 0, { 1536, 1706 }, { 0xFF, 0xFE, 0xFE, 0xFF }}},
{{{ 0, 100, 0 }, 0, { 512, -341 }, { 0xFF, 0xFE, 0xFE, 0xFF }}},
{{{ -40, 10, 0 }, 0, { -512, 1706 }, { 0xFF, 0xFE, 0xFE, 0xFF }}},
{{{ 0, -10, 0 }, 0, { 512, 2161 }, { 0xFF, 0xFE, 0xFE, 0xFF }}},
};
Gfx d_course_mario_raceway_dl_6A68[] =
Gfx d_course_mario_raceway_dl_tree[] =
{
gsSPClearGeometryMode(G_LIGHTING),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
@@ -3646,7 +3646,7 @@ Gfx d_course_mario_raceway_dl_6A68[] =
gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_8b, 4, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
gsDPLoadTextureBlock(0x03009000, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(d_course_mario_raceway_sdfuih, 4, 0),
gsSPVertex(d_course_mario_raceway_tree_model, 4, 0),
gsSP1Triangle(0, 1, 2, 0),
gsSP1Triangle(0, 2, 3, 0),
gsDPSetTextureLUT(G_TT_NONE),
@@ -3884,7 +3884,7 @@ Gfx d_course_mario_raceway_dl_9310[] =
gsSPEndDisplayList(),
};
Gfx d_course_mario_raceway_dl_9330[] =
Gfx d_course_mario_raceway_dl_sign[] =
{
gsSPDisplayList(d_course_mario_raceway_dl_9310),
gsSPDisplayList(d_course_mario_raceway_dl_90B0),
courses/flower_cup/toads_turnpike/course_data.inc.c
+1 -1
View File
@@ -8386,7 +8386,7 @@ Gfx *d_course_toads_turnpike_dl_list[] = {
};
// 0x23AE0
struct ActorSpawnData d_course_toads_turnpike_itembox_spawn[] = {
struct ActorSpawnData d_course_toads_turnpike_item_box_spawns[] = {
{{ -18, 0, -1666 }, { 0 }},
{{ -18, 0, -1748 }, { 0 }},
{{ -22, 0, -1851 }, { 0 }},
courses/mushroom_cup/kalimari_desert/course_data.inc.c
+7 -7
View File
@@ -4578,7 +4578,7 @@ Vtx d_course_kalimari_desert_cactus_model2[] = {
{{{ 6, 0, 0 }, 0, { 1024, 1638 }, {0xFF, 0xFE, 0xFE, 0xFF }}},
};
Gfx d_course_kalimari_desert_dl_8528[] =
Gfx d_course_kalimari_desert_dl_cactus1[] =
{
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2),
@@ -4597,7 +4597,7 @@ Gfx d_course_kalimari_desert_dl_8528[] =
gsSPEndDisplayList(),
};
Gfx d_course_kalimari_desert_dl_8628[] =
Gfx d_course_kalimari_desert_dl_cactus2[] =
{
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2),
@@ -4616,7 +4616,7 @@ Gfx d_course_kalimari_desert_dl_8628[] =
gsSPEndDisplayList(),
};
Gfx d_course_kalimari_desert_dl_8728[] =
Gfx d_course_kalimari_desert_dl_cactus3[] =
{
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2),
@@ -4759,7 +4759,7 @@ Vtx d_course_kalimari_desert_crossing_signal_unknown_model11[] = {
};
// 0x10AE8
Gfx d_course_kalimari_desert_dl_10AE8[] =
Gfx d_course_kalimari_desert_dl_crossing_right_active[] =
{
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPPipeSync(),
@@ -4800,7 +4800,7 @@ Gfx d_course_kalimari_desert_dl_10AE8[] =
gsSPEndDisplayList(),
};
Gfx d_course_kalimari_desert_dl_10C10[] =
Gfx d_course_kalimari_desert_dl_crossing_left_active[] =
{
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPPipeSync(),
@@ -4841,7 +4841,7 @@ Gfx d_course_kalimari_desert_dl_10C10[] =
gsSPEndDisplayList(),
};
Gfx d_course_kalimari_desert_dl_10D38[] =
Gfx d_course_kalimari_desert_dl_crossing_both_inactive[] =
{
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPPipeSync(),
@@ -8327,7 +8327,7 @@ Gfx d_course_kalimari_desert_dl_22E00[] =
};
// 0x22E88
struct ActorSpawnData d_course_kalimari_desert_item_box_spawn[] = {
struct ActorSpawnData d_course_kalimari_desert_item_box_spawns[] = {
{{ -856, 26, -1141 }, { 0 }},
{{ -846, 26, -1074 }, { 0 }},
{{ -844, 26, -1098 }, { 0 }},
courses/mushroom_cup/koopa_troopa_beach/course_data.inc.c
+12 -9
View File
@@ -8072,7 +8072,7 @@ u8 d_course_koopa_troopa_beach_crab_tlut[] = {
};
// 0xD828
u8 d_course_koopa_troopa_beach_crab[][4096] = {
u8 d_course_koopa_troopa_beach_crab_frames[][4096] = {
{
#include "assets/courses/koopa_troopa_beach/gTextureCrab1.inc.c"
},
@@ -8462,7 +8462,7 @@ Gfx d_course_koopa_troopa_beach_dl_185E8[] =
gsSPEndDisplayList(),
};
Gfx d_course_koopa_troopa_beach_dl_185F8[] =
Gfx d_course_koopa_troopa_beach_dl_tree_top1[] =
{
gsSPDisplayList(d_course_koopa_troopa_beach_dl_185E8),
gsSPEndDisplayList(),
@@ -8496,7 +8496,7 @@ Gfx d_course_koopa_troopa_beach_dl_186A8[] =
gsSPEndDisplayList(),
};
Gfx d_course_koopa_troopa_beach_dl_186B8[] =
Gfx d_course_koopa_troopa_beach_dl_tree_trunk1[] =
{
gsSPDisplayList(d_course_koopa_troopa_beach_dl_186A8),
gsSPEndDisplayList(),
@@ -8571,7 +8571,7 @@ Gfx d_course_koopa_troopa_beach_dl_18938[] =
gsSPEndDisplayList(),
};
Gfx d_course_koopa_troopa_beach_dl_18948[] =
Gfx d_course_koopa_troopa_beach_dl_tree_top2[] =
{
gsSPDisplayList(d_course_koopa_troopa_beach_dl_18938),
gsSPEndDisplayList(),
@@ -8605,7 +8605,7 @@ Gfx d_course_koopa_troopa_beach_dl_189F8[] =
gsSPEndDisplayList(),
};
Gfx d_course_koopa_troopa_beach_dl_18A08[] =
Gfx d_course_koopa_troopa_beach_dl_tree_trunk2[] =
{
gsSPDisplayList(d_course_koopa_troopa_beach_dl_189F8),
gsSPEndDisplayList(),
@@ -8680,7 +8680,7 @@ Gfx d_course_koopa_troopa_beach_dl_18C88[] =
gsSPEndDisplayList(),
};
Gfx d_course_koopa_troopa_beach_dl_18C98[] =
Gfx d_course_koopa_troopa_beach_dl_tree_top3[] =
{
gsSPDisplayList(d_course_koopa_troopa_beach_dl_18C88),
gsSPEndDisplayList(),
@@ -8714,7 +8714,7 @@ Gfx d_course_koopa_troopa_beach_dl_18D48[] =
gsSPEndDisplayList(),
};
Gfx d_course_koopa_troopa_beach_dl_18D58[] =
Gfx d_course_koopa_troopa_beach_dl_tree_trunk3[] =
{
gsSPDisplayList(d_course_koopa_troopa_beach_dl_18D48),
gsSPEndDisplayList(),
@@ -8759,7 +8759,7 @@ Gfx d_course_koopa_troopa_beach_dl_18D68[] =
};
// 0x18E78
struct ActorSpawnData d_course_koopa_troopa_beach_item_box_spawn[] = {
struct ActorSpawnData d_course_koopa_troopa_beach_item_box_spawns[] = {
{{ -118, 1, -977 }, { 0 }},
{{ -116, 1, -1009 }, { 0 }},
{{ -91, 1, -1021 }, { 0 }},
@@ -8920,7 +8920,7 @@ struct CourseAddrUnkStruct d_course_koopa_troopa_beach_addr[] = {
{ 0x00000000, 0x00000000 },
};
Gfx *d_course_koopa_troopa_beach_dl_list[] = {
Gfx *d_course_koopa_troopa_beach_dl_list1[] = {
d_course_koopa_troopa_beach_dl_90, d_course_koopa_troopa_beach_dl_278,
d_course_koopa_troopa_beach_dl_188, d_course_koopa_troopa_beach_dl_3C0,
d_course_koopa_troopa_beach_dl_4B0, d_course_koopa_troopa_beach_dl_6E0,
@@ -8995,6 +8995,9 @@ Gfx *d_course_koopa_troopa_beach_dl_list[] = {
d_course_koopa_troopa_beach_dl_A4D8, d_course_koopa_troopa_beach_dl_A780,
d_course_koopa_troopa_beach_dl_A8D0, d_course_koopa_troopa_beach_dl_AB88,
d_course_koopa_troopa_beach_dl_AA38, d_course_koopa_troopa_beach_dl_AC68,
};
Gfx *d_course_koopa_troopa_beach_dl_list2[] = {
d_course_koopa_troopa_beach_dl_118, d_course_koopa_troopa_beach_dl_328,
d_course_koopa_troopa_beach_dl_218, d_course_koopa_troopa_beach_dl_458,
d_course_koopa_troopa_beach_dl_530, d_course_koopa_troopa_beach_dl_790,
courses/mushroom_cup/luigi_raceway/course_data.inc.c
+1 -1
View File
@@ -7027,7 +7027,7 @@ Gfx d_course_luigi_raceway_dl_FD40[] =
};
// 0xFDE8
struct ActorSpawnData d_course_luigi_raceway_item_box_spawn[] = {
struct ActorSpawnData d_course_luigi_raceway_item_box_spawns[] = {
{{ -183, -50, -2076 }, { 0 }},
{{ -169, -50, -2078 }, { 0 }},
{{ -151, -50, -2079 }, { 0 }},
courses/mushroom_cup/moo_moo_farm/course_data.inc.c
+10 -10
View File
@@ -8487,7 +8487,7 @@ u8 d_course_moo_moo_farm_mole_tlut[] = {
};
// 0xFE70
u8 d_course_moo_moo_farm_mole[][2048] = {
u8 d_course_moo_moo_farm_mole_frames[][2048] = {
{
#include "assets/courses/moo_moo_farm/gTextureMole1.inc.c"
},
@@ -8576,7 +8576,7 @@ Gfx d_course_moo_moo_farm_dl_13B88[] =
gsSPEndDisplayList(),
};
Gfx d_course_moo_moo_farm_dl_13C00[] =
Gfx d_course_moo_moo_farm_dl_cow1[] =
{
gsSPDisplayList(d_course_moo_moo_farm_dl_13B88),
gsDPLoadTextureBlock(0x0300A000, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
@@ -8588,7 +8588,7 @@ Gfx d_course_moo_moo_farm_dl_13C00[] =
gsSPEndDisplayList(),
};
Gfx d_course_moo_moo_farm_dl_13CA0[] =
Gfx d_course_moo_moo_farm_dl_cow2[] =
{
gsSPDisplayList(d_course_moo_moo_farm_dl_13B88),
gsDPSetTextureImage(G_IM_FMT_CI, G_IM_SIZ_8b, 1, 0x0300B000),
@@ -8608,7 +8608,7 @@ Gfx d_course_moo_moo_farm_dl_13CA0[] =
gsSPEndDisplayList(),
};
Gfx d_course_moo_moo_farm_dl_13D20[] =
Gfx d_course_moo_moo_farm_dl_cow3[] =
{
gsSPDisplayList(d_course_moo_moo_farm_dl_13B88),
gsDPSetTextureImage(G_IM_FMT_CI, G_IM_SIZ_8b, 1, 0x0300C000),
@@ -8628,7 +8628,7 @@ Gfx d_course_moo_moo_farm_dl_13D20[] =
gsSPEndDisplayList(),
};
Gfx d_course_moo_moo_farm_dl_13DA0[] =
Gfx d_course_moo_moo_farm_dl_cow4[] =
{
gsSPDisplayList(d_course_moo_moo_farm_dl_13B88),
gsDPSetTextureImage(G_IM_FMT_CI, G_IM_SIZ_8b, 1, 0x0300D000),
@@ -8648,7 +8648,7 @@ Gfx d_course_moo_moo_farm_dl_13DA0[] =
gsSPEndDisplayList(),
};
Gfx d_course_moo_moo_farm_dl_13E20[] =
Gfx d_course_moo_moo_farm_dl_cow5[] =
{
gsSPDisplayList(d_course_moo_moo_farm_dl_13B88),
gsDPSetTextureImage(G_IM_FMT_CI, G_IM_SIZ_8b, 1, 0x0300E000),
@@ -8669,7 +8669,7 @@ Gfx d_course_moo_moo_farm_dl_13E20[] =
};
// 0x13EA0
Vtx d_course_moo_moo_farm_mole_model[] = {
Vtx d_course_moo_moo_farm_tree_model[] = {
{{{ 0, 95, 0 }, 0, { 1024, 0 }, {0xFF, 0xFF, 0xFF, 0xFF }}},
{{{ -50, 95, 0 }, 0, { 0, 0 }, {0xFF, 0xFF, 0xFF, 0xFF }}},
{{{ -50, -5, 0 }, 0, { 0, 2048 }, {0xFF, 0xFF, 0xFF, 0xFF }}},
@@ -8680,7 +8680,7 @@ Vtx d_course_moo_moo_farm_mole_model[] = {
{{{ 50, -5, 0 }, 0, { 1023, 2048 }, {0xFF, 0xFF, 0xFF, 0xFF }}},
};
Gfx d_course_moo_moo_farm_dl_13F20[] =
Gfx d_course_moo_moo_farm_dl_tree[] =
{
gsSPClearGeometryMode(G_LIGHTING),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
@@ -8691,7 +8691,7 @@ Gfx d_course_moo_moo_farm_dl_13F20[] =
gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_8b, 4, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC),
gsDPLoadTextureBlock(0x03009000, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
gsSPVertex(d_course_moo_moo_farm_mole_model, 8, 0),
gsSPVertex(d_course_moo_moo_farm_tree_model, 8, 0),
gsSP1Quadrangle(0, 1, 2, 3, 0),
gsDPLoadTextureBlock(0x03009800, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
gsSP1Quadrangle(4, 5, 6, 7, 0),
@@ -8842,7 +8842,7 @@ struct ActorSpawnData d_course_moo_moo_farm_tree_spawn[] = {
{{ -32768, 0, 0 }, { 0 }},
};
struct ActorSpawnData d_course_moo_moo_farm_item_box_spawn[] = {
struct ActorSpawnData d_course_moo_moo_farm_item_box_spawns[] = {
{{ -78, 13, -1056 }, { 0 }},
{{ -42, 13, -1051 }, { 0 }},
{{ -20, 13, -1053 }, { 0 }},
courses/special_cup/banshee_boardwalk/course_data.inc.c
+3 -3
View File
@@ -3880,7 +3880,7 @@ Gfx d_course_banshee_boardwalk_dl_7B78[] =
gsSPEndDisplayList(),
};
Gfx d_course_banshee_boardwalk_dl_7BA8[] =
Gfx d_course_banshee_boardwalk_dl_cheep_cheep[] =
{
gsSPDisplayList(d_course_banshee_boardwalk_dl_7B78),
gsSPEndDisplayList(),
@@ -4023,7 +4023,7 @@ Gfx d_course_banshee_boardwalk_dl_A9C8[] =
gsSPEndDisplayList(),
};
Gfx d_course_banshee_boardwalk_dl_A9D8[] =
Gfx d_course_banshee_boardwalk_dl_trash_bin[] =
{
gsSPDisplayList(d_course_banshee_boardwalk_dl_A9C8),
gsSPEndDisplayList(),
@@ -4100,7 +4100,7 @@ Gfx d_course_banshee_boardwalk_dl_B308[] =
};
// 0xB3D0
struct ActorSpawnData d_course_banshee_boardwalk_item_box_spawn[] = {
struct ActorSpawnData d_course_banshee_boardwalk_item_box_spawns[] = {
{{ -271, 12, -1629 }, { 0 }},
{{ -241, 12, -1614 }, { 0 }},
{{ -196, 12, -1585 }, { 0 }},
courses/special_cup/dks_jungle_parkway/course_data.inc.c
+6 -6
View File
@@ -5831,7 +5831,7 @@ u8 d_course_dks_jungle_parkway_tree2_trunk[] = {
#include "assets/courses/dks_jungle_parkway/gTextureDksJungleParkwayTree2Trunk.inc.c"
};
Gfx d_course_dks_jungle_parkway_dl_10CC0[] =
Gfx d_course_dks_jungle_parkway_dl_tree1[] =
{
gsSPVertex(d_course_dks_jungle_parkway_tree_model, 8, 0),
gsDPTileSync(),
@@ -5873,7 +5873,7 @@ u8 d_course_dks_jungle_parkway_tree4[] = {
#include "assets/courses/dks_jungle_parkway/gTextureDksJungleParkwayTree3TopLeft.inc.c"
};
Gfx d_course_dks_jungle_parkway_dl_11DC8[] =
Gfx d_course_dks_jungle_parkway_dl_tree2[] =
{
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPPipeSync(),
@@ -5921,7 +5921,7 @@ u8 d_course_dks_jungle_parkway_tree5[] = {
};
// 0x12EF0
Gfx d_course_dks_jungle_parkway_dl_12EF0[] =
Gfx d_course_dks_jungle_parkway_dl_tree3[] =
{
gsSPVertex(d_course_dks_jungle_parkway_model4, 8, 0),
gsDPTileSync(),
@@ -5983,7 +5983,7 @@ Gfx d_course_dks_jungle_parkway_dl_13878[] =
gsSPEndDisplayList(),
};
Gfx d_course_dks_jungle_parkway_dl_138D0[] =
Gfx d_course_dks_jungle_parkway_dl_palm_tree[] =
{
gsSPVertex(d_course_dks_jungle_parkway_palm_tree_model, 16, 0),
gsSPClearGeometryMode(G_CULL_BACK),
@@ -6022,7 +6022,7 @@ Vtx d_course_dks_jungle_parkway_kiwano_model[] = {
};
// 0x13BB8
Gfx d_course_dks_jungle_parkway_dl_13BB8[] =
Gfx d_course_dks_jungle_parkway_dl_kiwano_fruit[] =
{
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPPipeSync(),
@@ -6100,7 +6100,7 @@ Gfx *d_course_dks_jungle_parkway_unknown_dl_list[] = {
d_course_dks_jungle_parkway_dl_6F10, d_course_dks_jungle_parkway_dl_7080, d_course_dks_jungle_parkway_dl_7008, d_course_dks_jungle_parkway_dl_7108,
};
struct ActorSpawnData d_course_dks_jungle_parkway_item_box_spawn[] = {
struct ActorSpawnData d_course_dks_jungle_parkway_item_box_spawns[] = {
{{ 561, 0, -953 }, { 0 }},
{{ 599, 0, -954 }, { 0 }},
{{ 597, 0, -917 }, { 0 }},
courses/special_cup/rainbow_road/course_data.inc.c
+74 -88
View File
@@ -2903,92 +2903,82 @@ struct TrackWayPoint d_course_rainbow_road_track_waypoints[] = {
};
// some textures 0x5400
u8 d_course_rainbow_road_mushroom_tlut1[] = {
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom1.inc.c"
u8 d_course_rainbow_road_neon_mushroom_tlut_list[][512] = {
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom1.inc.c"
},
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom2.inc.c"
},
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom3.inc.c"
},
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom4.inc.c"
},
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom5.inc.c"
},
};
u8 d_course_rainbow_road_mushroom_tlut2[] = {
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom2.inc.c"
u8 d_course_rainbow_road_neon_mario_tlut_list[][512] = {
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario1.inc.c"
},
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario2.inc.c"
},
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario3.inc.c"
},
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario4.inc.c"
},
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario5.inc.c"
},
};
u8 d_course_rainbow_road_mushroom_tlut3[] = {
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom3.inc.c"
};
u8 d_course_rainbow_road_mushroom_tlut4[] = {
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom4.inc.c"
};
u8 d_course_rainbow_road_mushroom_tlut5[] = {
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom5.inc.c"
};
u8 d_course_rainbow_road_mario_tlut1[] = {
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario1.inc.c"
};
u8 d_course_rainbow_road_mario_tlut2[] = {
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario2.inc.c"
};
u8 d_course_rainbow_road_mario_tlut3[] = {
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario3.inc.c"
};
u8 d_course_rainbow_road_mario_tlut4[] = {
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario4.inc.c"
};
u8 d_course_rainbow_road_mario_tlut5[] = {
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario5.inc.c"
};
u8 d_course_rainbow_road_boo_tlut1[] = {
u8 d_course_rainbow_road_neon_boo_tlut_list[][512] = {
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonBoo1.inc.c"
};
u8 d_course_rainbow_road_boo_tlut2[] = {
},
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonBoo2.inc.c"
};
u8 d_course_rainbow_road_boo_tlut3[] = {
},
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonBoo3.inc.c"
};
u8 d_course_rainbow_road_boo_tlut4[] = {
},
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonBoo4.inc.c"
};
u8 d_course_rainbow_road_boo_tlut5[] = {
},
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonBoo5.inc.c"
},
};
u8 d_course_rainbow_road_peach_tlut[] = {
u8 d_course_rainbow_road_static_tluts[][512] = {
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonPeach.inc.c"
};
u8 d_course_rainbow_road_luigi_tlut[] = {
},
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonLuigi.inc.c"
};
u8 d_course_rainbow_road_donkey_kong_tlut[] = {
},
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonDonkeyKong.inc.c"
};
u8 d_course_rainbow_road_yoshi_tlut[] = {
},
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonYoshi.inc.c"
};
u8 d_course_rainbow_road_bowser_tlut[] = {
},
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonBowser.inc.c"
};
u8 d_course_rainbow_road_wario_tlut[] = {
},
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonWario.inc.c"
};
u8 d_course_rainbow_road_toad_tlut[] = {
},
{
#include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonToad.inc.c"
},
};
u8 d_course_rainbow_road_neon_mushroom[] = {
@@ -3003,32 +2993,28 @@ u8 d_course_rainbow_road_neon_boo[] = {
#include "assets/courses/rainbow_road/gTextureRainbowRoadNeonBoo.inc.c"
};
u8 d_course_rainbow_road_neon_peach[] = {
u8 d_course_rainbow_road_static_textures[][4096] = {
{
#include "assets/courses/rainbow_road/gTextureRainbowRoadNeonPeach.inc.c"
};
u8 d_course_rainbow_road_neon_luigi[] = {
},
{
#include "assets/courses/rainbow_road/gTextureRainbowRoadNeonLuigi.inc.c"
};
u8 d_course_rainbow_road_neon_donkey_kong[] = {
},
{
#include "assets/courses/rainbow_road/gTextureRainbowRoadNeonDonkeyKong.inc.c"
};
u8 d_course_rainbow_road_neon_yoshi[] = {
},
{
#include "assets/courses/rainbow_road/gTextureRainbowRoadNeonYoshi.inc.c"
};
u8 d_course_rainbow_road_neon_bowser[] = {
},
{
#include "assets/courses/rainbow_road/gTextureRainbowRoadNeonBowser.inc.c"
};
u8 d_course_rainbow_road_neon_wario[] = {
},
{
#include "assets/courses/rainbow_road/gTextureRainbowRoadNeonWario.inc.c"
};
u8 d_course_rainbow_road_neon_toad[] = {
},
{
#include "assets/courses/rainbow_road/gTextureRainbowRoadNeonToad.inc.c"
},
};
// unk data
@@ -3639,7 +3625,7 @@ Gfx d_course_rainbow_road_dl_16220[] =
gsSPEndDisplayList(),
};
struct ActorSpawnData d_course_rainbow_road_item_box_spawn[] = {
struct ActorSpawnData d_course_rainbow_road_item_box_spawns[] = {
{{ 250, 999, -5279 }, { 0 }},
{{ 256, 999, -5248 }, { 0 }},
{{ 279, 999, -5241 }, { 0 }},
courses/special_cup/yoshi_valley/course_data.inc.c
+3 -3
View File
@@ -10944,7 +10944,7 @@ Vtx d_course_yoshi_valley_tree_model[] = {
{{{ 0, -10, 0 }, 0, { 511, 2137 }, {0xFF, 0xFE, 0xFE, 0xFF }}},
};
Gfx d_course_yoshi_valley_dl_15B48[] =
Gfx d_course_yoshi_valley_dl_tree[] =
{
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2),
@@ -11214,7 +11214,7 @@ u8 d_course_yoshi_valley_egg[] = {
#include "assets/courses/yoshi_valley/gTextureYoshiValleyEgg.inc.c"
};
Gfx d_course_yoshi_valley_dl_17FA8[] =
Gfx d_course_yoshi_valley_dl_egg_lod0[] =
{
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPPipeSync(),
@@ -11271,7 +11271,7 @@ struct ActorSpawnData d_course_yoshi_valley_tree_spawn[] = {
{{ -32768, 0, 0 }, { 0 }},
};
struct ActorSpawnData d_course_yoshi_valley_item_box_spawn[] = {
struct ActorSpawnData d_course_yoshi_valley_item_box_spawns[] = {
{{ -157, 183, -1413 }, { 0 }},
{{ -180, 183, -1400 }, { 0 }},
{{ -206, 183, -1392 }, { 0 }},
courses/star_cup/bowsers_castle/course_data.inc.c
+6 -6
View File
@@ -3751,7 +3751,7 @@ struct TrackWayPoint d_course_bowsers_castle_track_waypoints[] = {
};
// 82DF40_06738
u8 d_course_bowsers_castle_thwomp[] = {
u8 d_course_bowsers_castle_thwomp_side[] = {
#include "assets/courses/bowsers_castle/gTextureThwompSide.inc.c"
};
@@ -3761,7 +3761,7 @@ u8 d_course_bowsers_castle_thwomp_tlut[] = {
};
// 0x7138
u8 d_course_bowsers_castle_thwomp_face[][1024] = {
u8 d_course_bowsers_castle_thwomp_faces[][1024] = {
{
#include "assets/courses/bowsers_castle/gTextureThwompFace1.inc.c"
},
@@ -3903,7 +3903,7 @@ Gfx d_course_bowsers_castle_dl_8F38[] =
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_bowsers_castle_thwomp),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_bowsers_castle_thwomp_side),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
@@ -3941,7 +3941,7 @@ Gfx d_course_bowsers_castle_dl_9078[] =
gsSPEndDisplayList(),
};
Gfx d_course_bowsers_castle_dl_9088[] =
Gfx d_course_bowsers_castle_dl_thwomp[] =
{
gsSPDisplayList(d_course_bowsers_castle_dl_9078),
gsSPEndDisplayList(),
@@ -3954,7 +3954,7 @@ Vtx d_course_bowsers_castle_unknown_model[] = {
};
Gfx d_course_bowsers_castle_dl_90B8[] =
Gfx d_course_bowsers_castle_dl_bush[] =
{
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPPipeSync(),
@@ -4055,7 +4055,7 @@ struct ActorSpawnData d_course_bowsers_castle_tree_spawn[] = {
{{ -32768, 0, 0 }, {0}},
};
struct ActorSpawnData d_course_bowsers_castle_item_box_spawn[] = {
struct ActorSpawnData d_course_bowsers_castle_item_box_spawns[] = {
{{ 64, 0, -1592 }, {0}},
{{ 78, 0, -1649 }, {0}},
{{ 132, 0, -1669 }, {0}},
courses/star_cup/royal_raceway/course_data.inc.c
+4 -4
View File
@@ -7347,7 +7347,7 @@ Vtx d_course_royal_raceway_tree_model[] = {
{{{ 0, -10, 0 }, 0, { 512, 2076 }, {0xFF, 0xFE, 0xFE, 0xFF }}},
};
Gfx d_course_royal_raceway_dl_D4A0[] =
Gfx d_course_royal_raceway_dl_tree[] =
{
gsSPClearGeometryMode(G_LIGHTING),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
@@ -7372,7 +7372,7 @@ Vtx d_royal_raceway_peaches_castle_tree_model[] = {
{{{ 0, -10, 0 }, 0, { 512, 2085 }, {0xFF, 0xFE, 0xFE, 0xFF }}},
};
Gfx d_course_royal_raceway_dl_D578[] =
Gfx d_course_royal_raceway_dl_castle_tree[] =
{
gsSPClearGeometryMode(G_LIGHTING),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
@@ -7402,7 +7402,7 @@ Vtx d_course_royal_raceway_piranha_plant_model[] = {
{{{ 15, 30, 0 }, 0, { 2048, 0 }, {0xFF, 0xFF, 0xFE, 0xFF }}},
};
Gfx d_course_royal_raceway_dl_D858[] =
Gfx d_course_royal_raceway_dl_piranha_plant[] =
{
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPPipeSync(),
@@ -7514,7 +7514,7 @@ struct ActorSpawnData d_course_royal_raceway_tree_spawn[] = {
{{ -32768, 0, 0 }, { 0 }},
};
struct ActorSpawnData d_course_royal_raceway_item_box_spawn[] = {
struct ActorSpawnData d_course_royal_raceway_item_box_spawns[] = {
{{ -314, 2, -2006 }, { 0 }},
{{ -290, 3, -2016 }, { 0 }},
{{ -241, 5, -2057 }, { 0 }},
courses/star_cup/sherbet_land/course_data.inc.c
+2 -2
View File
@@ -3912,7 +3912,7 @@ Gfx d_course_sherbet_land_dl_7208[] =
gsSPEndDisplayList(),
};
Gfx d_course_sherbet_land_dl_7218[] =
Gfx d_course_sherbet_land_dl_ice_block[] =
{
gsSPDisplayList(d_course_sherbet_land_dl_7208),
gsSPEndDisplayList(),
@@ -4510,7 +4510,7 @@ Gfx d_course_sherbet_land_dl_9AE8[] =
};
// 0x9B80 Spawn locations
struct ActorSpawnData d_course_sherbet_land_spawn_item_box[] = {
struct ActorSpawnData d_course_sherbet_land_item_box_spawns[] = {
{{ 168, 0, -1131 }, { 0 }},
{{ 152, 0, -1111 }, { 0 }},
{{ 108, 0, -1080 }, { 0 }},
courses/star_cup/wario_stadium/course_data.inc.c
+2 -2
View File
@@ -4856,7 +4856,7 @@ Gfx d_course_wario_stadium_dl_CA50[] =
gsSPEndDisplayList(),
};
Gfx d_course_wario_stadium_dl_CA60[] =
Gfx d_course_wario_stadium_dl_sign[] =
{
gsSPDisplayList(d_course_wario_stadium_dl_CA50),
gsSPEndDisplayList(),
@@ -4897,7 +4897,7 @@ Gfx d_course_wario_stadium_dl_CA78[] =
};
// 0xCB40 Spawn locations
struct ActorSpawnData d_course_wario_stadium_spawn_item_box[] = {
struct ActorSpawnData d_course_wario_stadium_item_box_spawns[] = {
{{ -1652, 0, -2095 }, { -1 }},
{{ -1653, 0, -2199 }, { -1 }},
{{ -1667, 0, -2173 }, { -1 }},