mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-06-21 08:41:58 -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
src/actors.c
+77 -72
View File
@@ -433,19 +433,19 @@ void func_80297A50(Camera *camera, Mat4 arg1, struct Actor *arg2) {
if (func_802B4FF8(arg1, 0) != 0) {
switch (arg2->state) {
case 0:
gSPDisplayList(gDisplayListHead++, D_06013C00);
gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow1);
break;
case 1:
gSPDisplayList(gDisplayListHead++, D_06013CA0);
gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow2);
break;
case 2:
gSPDisplayList(gDisplayListHead++, D_06013D20);
gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow3);
break;
case 3:
gSPDisplayList(gDisplayListHead++, D_06013DA0);
gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow4);
break;
case 4:
gSPDisplayList(gDisplayListHead++, D_06013E20);
gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow5);
break;
}
}
@@ -725,9 +725,9 @@ void func_80298328(Camera *arg0, Mat4 arg1, struct PiranhaPlant *arg2) {
if (gCurrentCourseId == COURSE_MARIO_RACEWAY) {
gSPDisplayList(gDisplayListHead++, &D_06006990);
gSPDisplayList(gDisplayListHead++, &d_course_mario_raceway_dl_piranha_plant);
} else {
gSPDisplayList(gDisplayListHead++, &D_0600D850);
gSPDisplayList(gDisplayListHead++, &d_course_royal_raceway_dl_piranha_plant);
}
}
@@ -765,19 +765,19 @@ void func_802986B4(Camera *camera, Mat4 arg1, UNUSED struct Actor *actor) {
if ((D_80150112 < 0x80) && (func_802B4FF8(arg1, 0) != 0)) {
switch (var_s1->someId) {
case 0:
gSPDisplayList(gDisplayListHead++, D_06013C00);
gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow1);
break;
case 1:
gSPDisplayList(gDisplayListHead++, D_06013CA0);
gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow2);
break;
case 2:
gSPDisplayList(gDisplayListHead++, D_06013D20);
gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow3);
break;
case 3:
gSPDisplayList(gDisplayListHead++, D_06013DA0);
gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow4);
break;
case 4:
gSPDisplayList(gDisplayListHead++, D_06013E20);
gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow5);
break;
}
} else {
@@ -913,16 +913,16 @@ dummylabel:
gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
switch (test) {
case 0:
gSPDisplayList(gDisplayListHead++, D_06010CC0);
gSPDisplayList(gDisplayListHead++, d_course_dks_jungle_parkway_dl_tree1);
break;
case 4:
gSPDisplayList(gDisplayListHead++, D_06011DC8);
gSPDisplayList(gDisplayListHead++, d_course_dks_jungle_parkway_dl_tree2);
break;
case 5:
gSPDisplayList(gDisplayListHead++, D_06012EF0);
gSPDisplayList(gDisplayListHead++, d_course_dks_jungle_parkway_dl_tree3);
break;
case 6:
gSPDisplayList(gDisplayListHead++, D_060138D0);
gSPDisplayList(gDisplayListHead++, d_course_dks_jungle_parkway_dl_palm_tree);
break;
}
} else { break; }
@@ -950,7 +950,7 @@ void func_80299144(Camera *camera, Mat4 arg1, struct Actor *arg2) {
if (func_802B4FF8(arg1, 0) != 0) {
gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68);
gSPDisplayList(gDisplayListHead++, D_06006A68);
gSPDisplayList(gDisplayListHead++, d_course_mario_raceway_dl_tree);
}
}
@@ -973,7 +973,7 @@ void func_8029930C(Camera *camera, Mat4 arg1, struct Actor *arg2) {
if (func_802B4FF8(arg1, 0) != 0) {
gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68);
gSPDisplayList(gDisplayListHead++, D_06015B48);
gSPDisplayList(gDisplayListHead++, d_course_yoshi_valley_dl_tree);
}
}
@@ -996,7 +996,7 @@ void func_802994D4(Camera *camera, Mat4 arg1, struct Actor *arg2) {
if (func_802B4FF8(arg1, 0) != 0) {
gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68);
gSPDisplayList(gDisplayListHead++, D_0600D4A0);
gSPDisplayList(gDisplayListHead++, d_course_royal_raceway_dl_tree);
}
}
@@ -1019,7 +1019,7 @@ void func_8029969C(Camera *camera, Mat4 arg1, struct Actor *arg2) {
if (func_802B4FF8(arg1, 0) != 0) {
gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68);
gSPDisplayList(gDisplayListHead++, D_06013F20);
gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_tree);
}
}
@@ -1042,7 +1042,11 @@ void func_80299864(Camera *camera, Mat4 arg1, struct Actor *arg2) {
if (func_802B4FF8(arg1, 0) != 0) {
gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68);
gSPDisplayList(gDisplayListHead++, D_0600FC70);
// Why is a TLUT being used a DL here? That makes no sense
// Based on the TLUT being loaded above, this ought to be be another
// tree related DL, presumably one found in a course other than Moo Moo farm
// 0x0600FC70
gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_mole_tlut);
}
}
@@ -1065,7 +1069,7 @@ void func_80299A2C(Camera *camera, Mat4 arg1, struct Actor *arg2) {
if (func_802B4FF8(arg1, 0) != 0) {
gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68);
gSPDisplayList(gDisplayListHead++, D_0600D578);
gSPDisplayList(gDisplayListHead++, d_course_royal_raceway_dl_castle_tree);
}
}
@@ -1088,7 +1092,7 @@ void func_80299BF4(Camera *camera, Mat4 arg1, struct Actor *arg2) {
if (func_802B4FF8(arg1, 0) != 0) {
gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68);
gSPDisplayList(gDisplayListHead++, D_060090C8);
gSPDisplayList(gDisplayListHead++, d_course_bowsers_castle_dl_bush);
}
}
@@ -1110,7 +1114,7 @@ void func_80299DBC(Camera *camera, Mat4 arg1, struct Actor *arg2) {
arg1[3][2] = arg2->pos[2];
if (func_802B4FF8(arg1, 0) != 0) {
gSPDisplayList(gDisplayListHead++, D_060075A0);
gSPDisplayList(gDisplayListHead++, d_course_frappe_snowland_dl_tree);
}
}
@@ -1132,7 +1136,7 @@ void func_80299EDC(Camera *camera, Mat4 arg1, struct Actor *arg2) {
arg1[3][2] = arg2->pos[2];
if (func_802B4FF8(arg1, 0) != 0) {
gSPDisplayList(gDisplayListHead++, D_06008528);
gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus1);
}
}
@@ -1154,7 +1158,7 @@ void func_80299FFC(Camera *camera, Mat4 arg1, struct Actor *arg2) {
arg1[3][2] = arg2->pos[2];
if (func_802B4FF8(arg1, 0) != 0) {
gSPDisplayList(gDisplayListHead++, D_06008628);
gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus2);
}
}
@@ -1176,7 +1180,7 @@ void func_8029A11C(Camera *camera, Mat4 arg1, struct Actor *arg2) {
arg1[3][2] = arg2->pos[2];
if (func_802B4FF8(arg1, 0) != 0) {
gSPDisplayList(gDisplayListHead++, D_06008728);
gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus3);
}
}
@@ -1195,7 +1199,7 @@ void func_8029A23C(UNUSED Camera *camera, Mat4 arg1, struct Actor *actor) {
gDPLoadTextureBlock(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(addr),
G_IM_FMT_CI, G_IM_SIZ_8b, 32, 32, 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);
gSPDisplayList(gDisplayListHead++, D_06013BB8);
gSPDisplayList(gDisplayListHead++, d_course_dks_jungle_parkway_dl_kiwano_fruit);
}
void func_8029A3AC(Camera *camera, Mat4 matrix, struct ShellActor *shell) {
@@ -1908,7 +1912,7 @@ void func_8029CA90(Camera *camera, struct FallingRock *rock) {
if (func_802B4FF8(sp4C, 0) == 0) {
return;
}
gSPDisplayList(gDisplayListHead++, D_06006FE0);
gSPDisplayList(gDisplayListHead++, d_course_choco_mountain_dl_falling_rock);
}
void place_piranha_plants(struct ActorSpawnData *spawnData) {
@@ -2020,7 +2024,7 @@ void update_obj_falling_rocks(struct FallingRock *rock) {
return;
}
if (rock->pos[1] < D_8015F8E4) {
func_8029CF0C(D_06007230, rock);
func_8029CF0C(d_course_choco_mountain_falling_rock_spawns, rock);
}
rock->rot[0] += (s16) ((rock->velocity[2] * 5461.0f) / 20.0f);
rock->rot[2] += (s16) ((rock->velocity[0] * 5461.0f) / 20.0f);
@@ -2260,7 +2264,7 @@ void place_course_actors(void) {
case COURSE_MARIO_RACEWAY:
place_segment_06(D_06009570);
place_piranha_plants(D_06009518);
place_all_item_boxes(D_06009498);
place_all_item_boxes(d_course_mario_raceway_item_box_spawns);
vec3f_set(position, 150.0f, 40.0f, -1300.0f);
position[0] *= gCourseDirection;
addActorToEmptySlot(position, rotation, velocity, ACTOR_MARIO_RACEWAY_SIGN);
@@ -2270,53 +2274,53 @@ void place_course_actors(void) {
actor->flags |= 0x4000;
break;
case COURSE_CHOCO_MOUNTAIN:
place_all_item_boxes(D_06007250);
place_falling_rocks(D_06007230);
place_all_item_boxes(d_course_choco_mountain_item_box_spawns);
place_falling_rocks(d_course_choco_mountain_falling_rock_spawns);
break;
case COURSE_BOWSER_CASTLE:
place_segment_06(D_06009290);
place_all_item_boxes(D_06009370);
place_all_item_boxes(d_course_bowsers_castle_item_box_spawns);
break;
case COURSE_BANSHEE_BOARDWALK:
place_all_item_boxes(D_0600B3D0);
place_all_item_boxes(d_course_banshee_boardwalk_item_box_spawns);
break;
case COURSE_YOSHI_VALLEY:
place_segment_06(D_060180A0);
place_all_item_boxes(D_06018110);
place_all_item_boxes(d_course_yoshi_valley_item_box_spawns);
vec3f_set(position, -2300.0f, 0.0f, 634.0f);
position[0] *= gCourseDirection;
addActorToEmptySlot(position, rotation, velocity, ACTOR_YOSHI_VALLEY_EGG);
break;
case COURSE_FRAPPE_SNOWLAND:
place_segment_06(D_06007718);
place_all_item_boxes(D_06007810);
place_all_item_boxes(d_course_frappe_snowland_item_box_spawns);
break;
case COURSE_KOOPA_BEACH:
func_802A14BC(328.0f * gCourseDirection, 70.0f, 2541.0f);
place_all_item_boxes(D_06018E78);
place_all_item_boxes(d_course_koopa_troopa_beach_item_box_spawns);
place_palm_trees(D_06018F70);
break;
case COURSE_ROYAL_RACEWAY:
place_segment_06(D_0600DA78);
place_all_item_boxes(D_0600DB80);
place_all_item_boxes(d_course_royal_raceway_item_box_spawns);
place_piranha_plants(D_0600D9F0);
break;
case COURSE_LUIGI_RACEWAY:
place_segment_06(D_0600FE80);
place_all_item_boxes(D_0600FDE8);
place_all_item_boxes(d_course_luigi_raceway_item_box_spawns);
break;
case COURSE_MOO_MOO_FARM:
if (gPlayerCountSelection1 != 4) {
place_segment_06(D_06014330);
}
place_all_item_boxes(D_060143E0);
place_all_item_boxes(d_course_moo_moo_farm_item_box_spawns);
break;
case COURSE_TOADS_TURNPIKE:
place_all_item_boxes(D_06023AE0);
place_all_item_boxes(d_course_toads_turnpike_item_box_spawns);
break;
case COURSE_KALAMARI_DESERT:
place_segment_06(D_06022F08);
place_all_item_boxes(D_06022E88);
place_all_item_boxes(d_course_kalimari_desert_item_box_spawns);
vec3f_set(position, -1680.0f, 2.0f, 35.0f);
position[0] *= gCourseDirection;
rrxing = (struct RailroadCrossing *)&gActorList[addActorToEmptySlot(position, rotation, velocity, ACTOR_RAILROAD_CROSSING)];
@@ -2336,13 +2340,13 @@ void place_course_actors(void) {
rrxing->crossingId = 0;
break;
case COURSE_SHERBET_LAND:
place_all_item_boxes(D_06009B80);
place_all_item_boxes(d_course_sherbet_land_item_box_spawns);
break;
case COURSE_RAINBOW_ROAD:
place_all_item_boxes(D_06016338);
place_all_item_boxes(d_course_rainbow_road_item_box_spawns);
break;
case COURSE_WARIO_STADIUM:
place_all_item_boxes(D_0600CB40);
place_all_item_boxes(d_course_wario_stadium_item_box_spawns);
vec3f_set(position, -131.0f, 83.0f, 286.0f);
position[0] *= gCourseDirection;
addActorToEmptySlot(position, rotation, velocity, ACTOR_WARIO_STADIUM_SIGN);
@@ -2354,21 +2358,21 @@ void place_course_actors(void) {
addActorToEmptySlot(position, rotation, velocity, ACTOR_WARIO_STADIUM_SIGN);
break;
case COURSE_BLOCK_FORT:
place_all_item_boxes(D_06000038);
place_all_item_boxes(d_course_block_fort_item_box_spawns);
break;
case COURSE_SKYSCRAPER:
place_all_item_boxes(D_06000080);
place_all_item_boxes(d_course_skyscraper_item_box_spawns);
break;
case COURSE_DOUBLE_DECK:
place_all_item_boxes(D_06000028);
place_all_item_boxes(d_course_double_deck_item_box_spawns);
break;
case COURSE_DK_JUNGLE:
place_all_item_boxes(D_06013EC0);
place_all_item_boxes(d_course_dks_jungle_parkway_item_box_spawns);
init_kiwano_fruit();
func_80298D10();
break;
case COURSE_BIG_DONUT:
place_all_item_boxes(D_06000058);
place_all_item_boxes(d_course_big_donut_item_box_spawns);
break;
}
gNumPermanentActors = gNumActors;
@@ -3958,7 +3962,7 @@ void func_802A269C(Camera *arg0, struct Actor *arg1) {
func_802B5F74(sp38, arg1->pos, arg1->rot);
if (func_802B4FF8(sp38, 0) != 0) {
gSPDisplayList(gDisplayListHead++, D_0600CA60);
gSPDisplayList(gDisplayListHead++, d_course_wario_stadium_dl_sign);
}
}
}
@@ -3994,8 +3998,8 @@ void func_802A27A0(Camera *arg0, Mat4 arg1, struct YoshiValleyEgg *egg, u16 arg3
func_802B5F74(sp60, egg->pos, sp5C);
if (func_802B4FF8(sp60, 0) == 0) { return; }
gSPSetGeometryMode(gDisplayListHead++, G_LIGHTING);
gSPDisplayList(gDisplayListHead++, D_06016D70);
gSPSetGeometryMode(gDisplayListHead++, G_LIGHTING);
gSPDisplayList(gDisplayListHead++, D_06016D70);
} else {
arg1[3][0] = egg->pos[0];
arg1[3][1] = egg->pos[1];
@@ -4003,7 +4007,7 @@ void func_802A27A0(Camera *arg0, Mat4 arg1, struct YoshiValleyEgg *egg, u16 arg3
if (func_802B4FF8(arg1, 0) != 0) {
gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
gSPDisplayList(gDisplayListHead++, D_06017FA8);
gSPDisplayList(gDisplayListHead++, d_course_yoshi_valley_dl_egg_lod0);
}
}
}
@@ -4014,15 +4018,16 @@ void func_802A29BC(Camera *arg0, UNUSED Mat4 arg1, struct Actor *arg2) {
s16 temp = arg2->flags;
if (temp & 0x800) { return; }
unk = func_802B80D0(arg0->pos, arg2->pos, arg0->rot[1], 0, D_80150130[arg0 - camera1], 16000000.0f);
if (!(unk < 0.0f)) {
gSPSetGeometryMode(gDisplayListHead++, G_SHADING_SMOOTH);
gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
func_802B5F74(sp40, arg2->pos, arg2->rot);
if (func_802B4FF8(sp40, 0) != 0) {
gSPDisplayList(gDisplayListHead++, D_06009330);
}
unk = func_802B80D0(arg0->pos, arg2->pos, arg0->rot[1], 0, D_80150130[arg0 - camera1], 16000000.0f);
if (!(unk < 0.0f)) {
gSPSetGeometryMode(gDisplayListHead++, G_SHADING_SMOOTH);
gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
func_802B5F74(sp40, arg2->pos, arg2->rot);
if (func_802B4FF8(sp40, 0) != 0) {
gSPDisplayList(gDisplayListHead++, d_course_mario_raceway_dl_sign);
}
}
}
void func_802A2AD0(Camera *arg0, struct RailroadCrossing *rr_crossing) {
@@ -4040,12 +4045,12 @@ void func_802A2AD0(Camera *arg0, struct RailroadCrossing *rr_crossing) {
if (D_801637B8[rr_crossing->crossingId]) {
if (rr_crossing->someTimer < 20) {
gSPDisplayList(gDisplayListHead++, D_06010AE8);
gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_crossing_right_active);
} else {
gSPDisplayList(gDisplayListHead++, D_06010C10);
gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_crossing_left_active);
}
} else {
gSPDisplayList(gDisplayListHead++, D_06010D38);
gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_crossing_both_inactive);
}
gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
}
@@ -4076,23 +4081,23 @@ void func_802A2C78(Camera *arg0, UNUSED Mat4 arg1, struct Actor *arg2) {
switch(arg2->unk_04) {
case 0:
gSPDisplayList(gDisplayListHead++, &D_060186B8);
gSPDisplayList(gDisplayListHead++, &d_course_koopa_troopa_beach_dl_tree_trunk1);
gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
gSPDisplayList(gDisplayListHead++, &D_060185F8);
gSPDisplayList(gDisplayListHead++, &d_course_koopa_troopa_beach_dl_tree_top1);
gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
break;
case 1:
gSPDisplayList(gDisplayListHead++, &D_06018A08);
gSPDisplayList(gDisplayListHead++, &d_course_koopa_troopa_beach_dl_tree_trunk2);
gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
gSPDisplayList(gDisplayListHead++, &D_06018948);
gSPDisplayList(gDisplayListHead++, &d_course_koopa_troopa_beach_dl_tree_top2);
gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
break;
case 2:
gSPDisplayList(gDisplayListHead++, &D_06018D58);
gSPDisplayList(gDisplayListHead++, &d_course_koopa_troopa_beach_dl_tree_trunk3);
gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
gSPDisplayList(gDisplayListHead++, &D_06018C98);
gSPDisplayList(gDisplayListHead++, &d_course_koopa_troopa_beach_dl_tree_top3);
gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
break;
src/actors.h
+57 -57
View File
@@ -160,56 +160,55 @@ extern f32 gCourseDirection;
extern uintptr_t gSegmentTable[];
extern s16 gPlaceItemBoxes;
extern struct ActorSpawnData D_06000028[];
extern struct ActorSpawnData D_06000038[];
extern struct ActorSpawnData D_06000058[];
extern struct ActorSpawnData D_06000080[];
extern struct ActorSpawnData D_06007230[];
extern struct ActorSpawnData D_06007250[];
extern struct ActorSpawnData d_course_double_deck_item_box_spawns[];
extern struct ActorSpawnData d_course_block_fort_item_box_spawns[];
extern struct ActorSpawnData d_course_big_donut_item_box_spawns[];
extern struct ActorSpawnData d_course_skyscraper_item_box_spawns[];
extern struct ActorSpawnData d_course_choco_mountain_falling_rock_spawns[];
extern struct ActorSpawnData d_course_choco_mountain_item_box_spawns[];
extern struct ActorSpawnData D_06007718[];
extern struct ActorSpawnData D_06007810[];
extern struct ActorSpawnData d_course_frappe_snowland_item_box_spawns[];
extern struct ActorSpawnData D_06009290[];
extern struct ActorSpawnData D_06009370[];
extern struct ActorSpawnData D_06009498[];
extern struct ActorSpawnData d_course_bowsers_castle_item_box_spawns[];
extern struct ActorSpawnData d_course_mario_raceway_item_box_spawns[];
extern struct ActorSpawnData D_06009518[];
extern struct ActorSpawnData D_06009570[];
extern struct ActorSpawnData D_06009B80[];
extern struct ActorSpawnData D_0600B3D0[];
extern struct ActorSpawnData D_0600CB40[];
extern struct ActorSpawnData d_course_sherbet_land_item_box_spawns[];
extern struct ActorSpawnData d_course_banshee_boardwalk_item_box_spawns[];
extern struct ActorSpawnData d_course_wario_stadium_item_box_spawns[];
extern struct ActorSpawnData D_0600D9F0[];
extern struct ActorSpawnData D_0600DA78[];
extern struct ActorSpawnData D_0600DB80[];
extern struct ActorSpawnData D_0600FDE8[];
extern struct ActorSpawnData d_course_royal_raceway_item_box_spawns[];
extern struct ActorSpawnData d_course_luigi_raceway_item_box_spawns[];
extern struct ActorSpawnData D_0600FE80[];
extern struct ActorSpawnData D_06013EC0[];
extern struct ActorSpawnData d_course_dks_jungle_parkway_item_box_spawns[];
extern struct ActorSpawnData D_06014200[];
extern struct ActorSpawnData D_06014330[];
extern struct ActorSpawnData D_060143E0[];
extern struct ActorSpawnData D_06016338[];
extern struct ActorSpawnData d_course_moo_moo_farm_item_box_spawns[];
extern struct ActorSpawnData d_course_rainbow_road_item_box_spawns[];
extern struct ActorSpawnData D_060180A0[];
extern struct ActorSpawnData D_06018110[];
extern struct ActorSpawnData D_06018E78[];
extern struct ActorSpawnData d_course_yoshi_valley_item_box_spawns[];
extern struct ActorSpawnData d_course_koopa_troopa_beach_item_box_spawns[];
extern struct ActorSpawnData D_06018F70[];
extern struct ActorSpawnData D_06022E88[];
extern struct ActorSpawnData d_course_kalimari_desert_item_box_spawns[];
extern struct ActorSpawnData D_06022F08[];
extern struct ActorSpawnData D_06023AE0[];
extern struct ActorSpawnData d_course_toads_turnpike_item_box_spawns[];
extern struct UnkActorSpawnData D_06013F78[];
extern Gfx D_06006A68[];
extern Gfx d_course_mario_raceway_dl_tree[];
extern Gfx D_06006F88[];
extern Gfx D_06006FE0[];
extern Gfx D_060075A0[];
extern Gfx D_06008528[];
extern Gfx D_06008628[];
extern Gfx D_06008728[];
extern Gfx D_060090C8[];
extern Gfx D_0600D4A0[];
extern Gfx D_0600D578[];
extern Gfx D_0600FC70[];
extern Gfx D_06013BB8[];
extern Gfx D_06013F20[];
extern Gfx D_06015B48[];
extern Gfx d_course_choco_mountain_dl_falling_rock[];
extern Gfx d_course_frappe_snowland_dl_tree[];
extern Gfx d_course_kalimari_desert_dl_cactus1[];
extern Gfx d_course_kalimari_desert_dl_cactus2[];
extern Gfx d_course_kalimari_desert_dl_cactus3[];
extern Gfx d_course_bowsers_castle_dl_bush[];
extern Gfx d_course_royal_raceway_dl_tree[];
extern Gfx d_course_royal_raceway_dl_castle_tree[];
extern Gfx d_course_dks_jungle_parkway_dl_kiwano_fruit[];
extern Gfx d_course_moo_moo_farm_dl_tree[];
extern Gfx d_course_yoshi_valley_dl_tree[];
extern Gfx D_0601B978[];
extern Gfx D_0601C0F0[];
extern Gfx D_0601D160[];
@@ -264,33 +263,34 @@ extern s32 D_801625F0;
extern s32 D_801625F4;
extern s32 D_80162DF8;
extern Gfx D_06006990[];
extern Gfx D_06009330[];
extern Gfx D_0600CA60[];
extern Gfx D_0600D850[];
extern Gfx d_course_mario_raceway_dl_piranha_plant[];
extern Gfx d_course_mario_raceway_dl_sign[];
extern Gfx d_course_wario_stadium_dl_sign[];
extern Gfx d_course_royal_raceway_dl_piranha_plant[];
extern Gfx D_0600E058[];
extern Gfx D_0600E730[];
extern Gfx D_0600FC28[];
extern Gfx D_06010AE8[];
extern Gfx D_06010C10[];
extern Gfx D_06010CC0[];
extern Gfx D_06010D38[];
extern Gfx D_06011DC8[];
extern Gfx D_06012EF0[];
extern Gfx D_060138D0[];
extern Gfx D_06013C00[];
extern Gfx D_06013CA0[];
extern Gfx D_06013D20[];
extern Gfx D_06013DA0[];
extern Gfx D_06013E20[];
extern Gfx d_course_kalimari_desert_dl_crossing_right_active[];
extern Gfx d_course_kalimari_desert_dl_crossing_left_active[];
extern Gfx d_course_dks_jungle_parkway_dl_tree1[];
extern Gfx d_course_kalimari_desert_dl_crossing_both_inactive[];
extern Gfx d_course_dks_jungle_parkway_dl_tree2[];
extern Gfx d_course_dks_jungle_parkway_dl_tree3[];
extern Gfx d_course_dks_jungle_parkway_dl_palm_tree[];
extern u8 d_course_moo_moo_farm_mole_tlut[];
extern Gfx d_course_moo_moo_farm_dl_cow1[];
extern Gfx d_course_moo_moo_farm_dl_cow2[];
extern Gfx d_course_moo_moo_farm_dl_cow3[];
extern Gfx d_course_moo_moo_farm_dl_cow4[];
extern Gfx d_course_moo_moo_farm_dl_cow5[];
extern Gfx D_06016D70[];
extern Gfx D_06017FA8[];
extern Gfx D_060185F8[];
extern Gfx D_060186B8[];
extern Gfx D_06018948[];
extern Gfx D_06018A08[];
extern Gfx D_06018C98[];
extern Gfx D_06018D58[];
extern Gfx d_course_yoshi_valley_dl_egg_lod0[];
extern Gfx d_course_koopa_troopa_beach_dl_tree_top1[];
extern Gfx d_course_koopa_troopa_beach_dl_tree_trunk1[];
extern Gfx d_course_koopa_troopa_beach_dl_tree_top2[];
extern Gfx d_course_koopa_troopa_beach_dl_tree_trunk2[];
extern Gfx d_course_koopa_troopa_beach_dl_tree_top3[];
extern Gfx d_course_koopa_troopa_beach_dl_tree_trunk3[];
extern Gfx D_06023858[];
extern Gfx D_060238A0[];
extern Gfx D_060238E8[];
src/code_80057C60.c
+1 -1
View File
@@ -745,7 +745,7 @@ void func_80059560(s32 playerId) {
if (D_801657E4 == 2) {
temp_v0_2 = &D_8018CA70[playerId];
if ((temp_v0_2->unk_74 != 0) && (D_80165608 != 0)) {
func_80047910((s32) temp_v0_2->unk_6C, (s32) temp_v0_2->unk_6E, 0U, 1.0f, (s32) gTLUTPortraitBombKartAndQuestionMark, (s32) gTexturePortraitBombKartAndQuestionMark, D_0D005AE0, 0x00000020, 0x00000020, 0x00000020, 0x00000020);
func_80047910((s32) temp_v0_2->unk_6C, (s32) temp_v0_2->unk_6E, 0U, 1.0f, (s32) gTLUTPortraitBombKartAndQuestionMark, (s32) gTexturePortraitBombKart, D_0D005AE0, 0x00000020, 0x00000020, 0x00000020, 0x00000020);
}
}
}
src/code_80071F00.c
+56 -56
View File
@@ -4283,7 +4283,7 @@ void func_8007BB9C(s32 arg0) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern ? D_06007BA8;
extern ? d_course_banshee_boardwalk_dl_cheep_cheep;
void func_8007BBBC(s32 objectIndex) {
f32 temp_f0;
@@ -4295,7 +4295,7 @@ void func_8007BBBC(s32 objectIndex) {
temp_v0 = temp_s1->unk_0A6;
switch (temp_v0) { /* irregular */
case 1:
func_800735BC(objectIndex, (s32) &D_06007BA8, 2.0f);
func_800735BC(objectIndex, (s32) &d_course_banshee_boardwalk_dl_cheep_cheep, 2.0f);
func_800721C0(objectIndex, 0x00000010);
temp_s1->unk_0D5 = 0;
return;
@@ -4347,7 +4347,7 @@ void func_8007BDA8(void) {
func_8008BF18(temp_a0);
}
extern Gfx D_06007BA8[];
extern Gfx d_course_banshee_boardwalk_dl_cheep_cheep[];
// This is either 3 Vec3s as separate variables or an array of s16's or an array of vec3s.
// The other entries appear to be unused.
extern Vec3s D_800E634C[3]; // static?
@@ -4366,7 +4366,7 @@ void func_8007BDE0(s32 objectIndex) {
temp_v0 = &D_80165C18[objectIndex];
temp_v0->unk_0D5 = 1;
temp_v0->unk_054 = 0;
temp_v0->unk_070 = D_06007BA8;
temp_v0->unk_070 = d_course_banshee_boardwalk_dl_cheep_cheep;
temp_v0->unk_000 = 0.2f;
func_80072488(objectIndex);
func_8008B7D4(objectIndex, (f32) D_800E634C[0][0], (f32) ((f64) D_800E634C[0][1] + 55.0), (f32) D_800E634C[0][2]);
@@ -5401,14 +5401,14 @@ void func_8007DDC0(s32 objectIndex) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern ? D_0600A9D8;
extern ? d_course_banshee_boardwalk_dl_trash_bin;
void func_8007DF20(s32 objectIndex) {
struct_80165C18_entry *sp1C;
struct_80165C18_entry *temp_v0;
temp_v0 = &D_80165C18[objectIndex];
temp_v0->unk_070 = (s32) &D_0600A9D8;
temp_v0->unk_070 = (s32) &d_course_banshee_boardwalk_dl_trash_bin;
temp_v0->unk_04C = 0;
temp_v0->unk_084[7] = 0;
sp1C = temp_v0;
@@ -5814,8 +5814,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E63C.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 gTLUTWhomp;
extern s32 D_06007138;
extern ? D_06009088;
extern s32 d_course_bowsers_castle_thwomp_faces;
extern ? d_course_bowsers_castle_dl_thwomp;
void func_8007EC30(s32 objectIndex) {
struct_80165C18_entry *temp_s1;
@@ -5831,8 +5831,8 @@ void func_8007EC30(s32 objectIndex) {
func_8008B888(objectIndex, 0U, 0xC000U, 0U);
func_8008B8BC(objectIndex, 0U, 0xC000U, 0U);
}
func_80073444(objectIndex, &gTLUTWhomp, &D_06007138, 0x10U, (u16) 0x00000040);
temp_s1->unk_070 = (s32) &D_06009088;
func_80073444(objectIndex, &gTLUTWhomp, &d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040);
temp_s1->unk_070 = (s32) &d_course_bowsers_castle_dl_thwomp;
temp_s1->unkC8 = 0x000C;
temp_s1->unk_000 = 1.0f;
temp_s1->unk20 = 30.0f;
@@ -5893,15 +5893,15 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007ED6C.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 gTLUTWhomp;
extern s32 D_06007138;
extern ? D_06009088;
extern s32 d_course_bowsers_castle_thwomp_faces;
extern ? d_course_bowsers_castle_dl_thwomp;
void func_8007EE5C(s32 objectIndex) {
struct_80165C18_entry *temp_s0;
func_80073444(objectIndex, &gTLUTWhomp, &D_06007138, 0x10U, (u16) 0x00000040);
func_80073444(objectIndex, &gTLUTWhomp, &d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040);
temp_s0 = &D_80165C18[objectIndex];
temp_s0->unk_070 = (s32) &D_06009088;
temp_s0->unk_070 = (s32) &d_course_bowsers_castle_dl_thwomp;
temp_s0->unkC8 = 0x000C;
temp_s0->unk_000 = 1.0f;
func_800721C0(objectIndex, 0x04000220);
@@ -6213,15 +6213,15 @@ void func_8007F8D8(void) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 gTLUTWhomp;
extern s32 D_06007138;
extern ? D_06009088;
extern s32 d_course_bowsers_castle_thwomp_faces;
extern ? d_course_bowsers_castle_dl_thwomp;
void func_8007FA08(s32 objectIndex) {
struct_80165C18_entry *temp_s0;
func_80073444(objectIndex, &gTLUTWhomp, &D_06007138, 0x10U, (u16) 0x00000040);
func_80073444(objectIndex, &gTLUTWhomp, &d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040);
temp_s0 = &D_80165C18[objectIndex];
temp_s0->unk_070 = (s32) &D_06009088;
temp_s0->unk_070 = (s32) &d_course_bowsers_castle_dl_thwomp;
temp_s0->unkC8 = 0x000C;
temp_s0->unk_000 = 1.0f;
func_800721C0(objectIndex, 0x04000220);
@@ -6407,16 +6407,16 @@ void func_8007FFC0(s32 objectIndex) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 gTLUTWhomp;
extern s32 D_06007138;
extern ? D_06009088;
extern s32 d_course_bowsers_castle_thwomp_faces;
extern ? d_course_bowsers_castle_dl_thwomp;
void func_80080078(s32 objectIndex) {
s16 temp_v0;
struct_80165C18_entry *temp_s0;
func_80073444(objectIndex, &gTLUTWhomp, &D_06007138, 0x10U, (u16) 0x00000040);
func_80073444(objectIndex, &gTLUTWhomp, &d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040);
temp_s0 = &D_80165C18[objectIndex];
temp_s0->unk_070 = (s32) &D_06009088;
temp_s0->unk_070 = (s32) &d_course_bowsers_castle_dl_thwomp;
temp_s0->unkC8 = 0x000C;
temp_s0->unk_000 = 1.0f;
func_800721C0(objectIndex, 0x04000220);
@@ -6494,16 +6494,16 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800801FC.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 gTLUTWhomp;
extern s32 D_06007138;
extern ? D_06009088;
extern s32 d_course_bowsers_castle_thwomp_faces;
extern ? d_course_bowsers_castle_dl_thwomp;
void func_800802C0(s32 objectIndex) {
struct_80165C18_entry *temp_s0;
temp_s0 = &D_80165C18[objectIndex];
temp_s0->unk_0D8 = 0;
func_80073444(objectIndex, &gTLUTWhomp, &D_06007138, 0x10U, (u16) 0x00000040);
temp_s0->unk_070 = (s32) &D_06009088;
func_80073444(objectIndex, &gTLUTWhomp, &d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040);
temp_s0->unk_070 = (s32) &d_course_bowsers_castle_dl_thwomp;
temp_s0->unk_0D2 = 0;
temp_s0->unkC8 = 0x000C;
temp_s0->unk_000 = 1.5f;
@@ -6578,17 +6578,17 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80080408.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 gTLUTWhomp;
extern s32 D_06007138;
extern ? D_06009088;
extern s32 d_course_bowsers_castle_thwomp_faces;
extern ? d_course_bowsers_castle_dl_thwomp;
extern s32 gGamestate;
void func_80080524(s32 objectIndex) {
s16 temp_v0;
struct_80165C18_entry *temp_s0;
func_80073444(objectIndex, &gTLUTWhomp, &D_06007138, 0x10U, (u16) 0x00000040);
func_80073444(objectIndex, &gTLUTWhomp, &d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040);
temp_s0 = &D_80165C18[objectIndex];
temp_s0->unk_070 = (s32) &D_06009088;
temp_s0->unk_070 = (s32) &d_course_bowsers_castle_dl_thwomp;
temp_s0->unkC8 = 0x000C;
temp_s0->unk_0D2 = 0;
temp_s0->unk_000 = 1.0f;
@@ -7194,13 +7194,13 @@ void func_80081790(s32 objectIndex) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 D_0600FE70;
extern s32 d_course_moo_moo_farm_mole_frames;
void func_80081848(s32 objectIndex) {
struct_80165C18_entry *sp2C;
struct_80165C18_entry *temp_v0;
func_80073444(objectIndex, (s32 *) D_0600FC70, &D_0600FE70, 0x20U, (u16) 0x00000040);
func_80073444(objectIndex, d_course_moo_moo_farm_mole_tlut, d_course_moo_moo_farm_mole_frames, 0x20U, (u16) 0x00000040);
temp_v0 = &D_80165C18[objectIndex];
temp_v0->unk_0D2 = 0;
sp2C = temp_v0;
@@ -7773,13 +7773,13 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80082870.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 gTLUTCrab;
extern s32 D_0600D828;
extern s32 d_course_koopa_troopa_beach_crab_tlut;
extern s32 d_course_koopa_troopa_beach_crab_frames;
void func_80082A4C(s32 objectIndex) {
struct_80165C18_entry *temp_s1;
func_80073444(objectIndex, &gTLUTCrab, &D_0600D828, 0x40U, (u16) 0x00000040);
func_80073444(objectIndex, &d_course_koopa_troopa_beach_crab_tlut, &d_course_koopa_troopa_beach_crab_frames, 0x40U, (u16) 0x00000040);
temp_s1 = &D_80165C18[objectIndex];
temp_s1->unk_0D2 = 0;
temp_s1->unk_000 = 0.15f;
@@ -8130,8 +8130,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800834B8.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 D_06006D20;
extern s32 D_06006F20;
extern s32 d_course_frappe_snowland_snow_tlut;
extern s32 d_course_frappe_snowland_snow;
void func_80083538(s32 objectIndex, f32 *arg1, s32 arg2, s32 arg3) {
f32 var_f6;
@@ -8141,10 +8141,10 @@ void func_80083538(s32 objectIndex, f32 *arg1, s32 arg2, s32 arg3) {
func_800723A4(objectIndex, 0);
temp_s0 = &D_80165C18[objectIndex];
temp_s0->unk_064 = &D_06006F20;
temp_s0->unk_06C = (s32) &D_06006F20;
temp_s0->unk_060 = &D_06006D20;
temp_s0->unk_068 = &D_06006D20;
temp_s0->unk_064 = &d_course_frappe_snowland_snow;
temp_s0->unk_06C = (s32) &d_course_frappe_snowland_snow;
temp_s0->unk_060 = &d_course_frappe_snowland_snow_tlut;
temp_s0->unk_068 = &d_course_frappe_snowland_snow_tlut;
temp_v0 = random_int(0x0064U);
var_f6 = (f32) temp_v0;
if (temp_v0 < 0) {
@@ -8463,7 +8463,7 @@ void func_80083F18(s32 objectIndex) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 D_060068E8;
extern s32 d_course_sherbet_land_ice;
extern u16 D_801657A2;
void func_80083FD0(s32 objectIndex, s32 arg1, s16 playerId) {
@@ -8480,8 +8480,8 @@ void func_80083FD0(s32 objectIndex, s32 arg1, s16 playerId) {
sp20 = &gPlayerOne[playerId];
temp_s0->unk_084[7] = playerId;
func_800723A4(objectIndex, 0);
temp_s0->unk_060 = &D_060068E8;
temp_s0->unk_068 = &D_060068E8;
temp_s0->unk_060 = &d_course_sherbet_land_ice;
temp_s0->unk_068 = &d_course_sherbet_land_ice;
temp_s0->unk_000 = (f32) (((f64) (f32) random_int(0x01F4U) * 0.0002) + 0.04);
temp_v0 = random_int(0x0032U);
var_f16 = (f32) temp_v0;
@@ -9300,13 +9300,13 @@ void func_80085BB4(s32 objectIndex) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 D_06005400;
extern s32 D_06008000;
extern s32 d_course_rainbow_road_neon_mushroom_tlut_list;
extern s32 d_course_rainbow_road_neon_mushroom;
extern f32 D_8018D01C;
void func_80085C20(s32 objectIndex) {
func_8008B7D4(objectIndex, (f32) ((f64) D_8018D01C * -1431.0), 827.0f, -2957.0f);
func_80073444(objectIndex, &D_06005400, &D_06008000, 0x40U, (u16) 0x00000040);
func_80073444(objectIndex, &d_course_rainbow_road_neon_mushroom_tlut_list, &d_course_rainbow_road_neon_mushroom, 0x40U, (u16) 0x00000040);
func_80085BB4(objectIndex);
}
#else
@@ -9357,13 +9357,13 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085CA0.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 D_06005E00;
extern s32 D_06009000;
extern s32 d_course_rainbow_road_neon_mario_tlut_list;
extern s32 d_course_rainbow_road_neon_mario;
extern f32 D_8018D01C;
void func_80085DB8(s32 objectIndex) {
func_8008B7D4(objectIndex, (f32) ((f64) D_8018D01C * 799.0), 1193.0f, -5891.0f);
func_80073444(objectIndex, &D_06005E00, &D_06009000, 0x40U, (u16) 0x00000040);
func_80073444(objectIndex, &d_course_rainbow_road_neon_mario_tlut_list, &d_course_rainbow_road_neon_mario, 0x40U, (u16) 0x00000040);
func_80085BB4(objectIndex);
}
#else
@@ -9405,13 +9405,13 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085E38.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s32 D_06006800;
extern s32 D_0600A000;
extern s32 d_course_rainbow_road_neon_boo_tlut_list;
extern s32 d_course_rainbow_road_neon_boo;
extern f32 D_8018D01C;
void func_80085EF8(s32 objectIndex) {
func_8008B7D4(objectIndex, (f32) ((f64) D_8018D01C * -2013.0), 555.0f, 0.0f);
func_80073444(objectIndex, &D_06006800, &D_0600A000, 0x40U, (u16) 0x00000040);
func_80073444(objectIndex, &d_course_rainbow_road_neon_boo_tlut_list, &d_course_rainbow_road_neon_boo, 0x40U, (u16) 0x00000040);
func_80085BB4(objectIndex);
}
#else
@@ -9462,8 +9462,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085F74.s")
#ifdef MIPS_TO_C
//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c
extern ? D_06007200;
extern ? D_0600B000;
extern ? d_course_rainbow_road_static_tluts;
extern ? d_course_rainbow_road_static_textures;
extern f32 D_8018D01C;
f32 D_800E6734[0][3]; /* unable to generate initializer */
@@ -9472,7 +9472,7 @@ void func_80086074(s32 arg0, s32 arg1) {
temp_v0 = D_800E6734[arg1];
func_8008B7D4(arg0, temp_v0->unk0 * D_8018D01C, temp_v0->unk4, temp_v0->unk8);
func_80073444(arg0, (arg1 << 9) + &D_06007200, (arg1 << 0xC) + &D_0600B000, 0x40U, (u16) 0x00000040);
func_80073444(arg0, (arg1 << 9) + &d_course_rainbow_road_static_tluts, (arg1 << 0xC) + &d_course_rainbow_road_static_textures, 0x40U, (u16) 0x00000040);
func_80085BB4(arg0);
}
#else
src/hud_renderer.c
+12 -12
View File
@@ -3444,7 +3444,7 @@ void func_80050C68(void) {
gDisplayListHead = temp_v0_8 + 8;
temp_v0_8->words.w1 = 0;
temp_v0_8->words.w0 = 0xE7000000;
func_800452A4(gTexturePortraitBombKartAndQuestionMark, 0x00000020, 0x00000020);
func_800452A4(gTexturePortraitBombKart, 0x00000020, 0x00000020);
func_80042330(sp88 + 0x20, sp84 + 0x12, 0U, 0.6f);
temp_v0_9 = gDisplayListHead;
gDisplayListHead = temp_v0_9 + 8;
@@ -4167,12 +4167,12 @@ void func_8005285C(s32 arg0) {
D_80183E80[0] = 0;
D_80183E80[1] = 0;
D_80183E80[2] = 0;
func_80043500(D_80183E40, D_80183E80, 0.02f, D_06007218);
func_80043500(D_80183E40, D_80183E80, 0.02f, d_course_sherbet_land_dl_ice_block);
}
#ifdef MIPS_TO_C
//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b
extern s8 D_060068E8;
extern s8 d_course_sherbet_land_ice;
extern ? D_8016582C;
extern s16 D_80183E80;
extern s32 D_8018C3F0;
@@ -4233,7 +4233,7 @@ void func_800528EC(s32 arg0) {
gDisplayListHead = temp_v0_7 + 8;
temp_v0_7->words.w0 = 0xB7000000;
temp_v0_7->words.w1 = 0x00020204;
func_800441E0(&D_060068E8, 0x00000020, 0x00000020);
func_800441E0(&d_course_sherbet_land_ice, 0x00000020, 0x00000020);
var_s3 = &D_8018C3F0;
if (gPlayerCountSelection1 < 3) {
var_s3_2 = &D_8018C3F0;
@@ -4348,7 +4348,7 @@ void func_80052D70(s32 playerId) {
D_80183E40[0] = temp_v1->pos[0];
D_80183E40[1] = temp_v1->unk_074 - 6.5;
D_80183E40[2] = temp_v1->pos[2];
func_800435A0(D_80183E40, (u16 *) D_80183E80, 0.02f, D_06007218, 0x000000FF);
func_800435A0(D_80183E40, (u16 *) D_80183E80, 0.02f, d_course_sherbet_land_dl_ice_block, 0x000000FF);
}
}
@@ -4392,8 +4392,8 @@ GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80052E30.s")
#ifdef MIPS_TO_C
//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022
extern ? D_06006D20;
extern ? D_06006F20;
extern ? d_course_frappe_snowland_snow_tlut;
extern ? d_course_frappe_snowland_snow;
extern ? D_8018C5F0;
void func_80052F20(s32 arg0) {
@@ -4405,7 +4405,7 @@ void func_80052F20(s32 arg0) {
struct_80165C18_entry *temp_s1;
sp44 = &camera1[arg0];
func_80046E60((s32) &D_06006D20, (s32) &D_06006F20, 0x00000020, 0x00000020);
func_80046E60((s32) &d_course_frappe_snowland_snow_tlut, (s32) &d_course_frappe_snowland_snow, 0x00000020, 0x00000020);
var_s2 = D_8018C3F0;
do {
temp_s0 = *var_s2;
@@ -4588,7 +4588,7 @@ void func_800536C8(s32 objectIndex) {
//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b
? func_800534A4(s32); /* extern */
? func_800536C8(s32); /* extern */
extern s8 D_06006738;
extern s8 d_course_bowsers_castle_thwomp_side;
extern s16 D_80165750;
extern s16 D_80183E80;
extern s32 D_8018C3F0;
@@ -4693,7 +4693,7 @@ void func_80053870(s32 cameraId) {
gDisplayListHead = temp_v0_9 + 8;
temp_v0_9->words.w0 = 0xB7000000;
temp_v0_9->words.w1 = 0x00020204;
func_80043D50(&D_06006738, 0x00000020, 0x00000020);
func_80043D50(&d_course_bowsers_castle_thwomp_side, 0x00000020, 0x00000020);
var_a3 = &D_8018C630;
do {
temp_s1_3 = *var_a3;
@@ -5452,7 +5452,7 @@ GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8005592C.s")
#ifdef MIPS_TO_C
//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b
? func_80004DFC(s32, s32, ?, s8); /* extern */
extern ? D_06012028;
extern ? d_course_rainbow_road_sphere;
extern ? D_0D0062B0;
extern ? D_0D0077D0;
extern f32 D_80183E40;
@@ -5481,7 +5481,7 @@ void func_80055AB8(s32 objectIndex, s32 cameraId) {
D_80183E40.unk8 = temp_f14;
D_80183E80.unk2 = func_800418AC(temp_f12, temp_f14, temp_a2->pos);
D_80183E80.unk4 = 0x8000;
func_800468E0(&D_80183E40, &D_80183E80, 0.54f, (s32) &D_06012028, (s32) &D_0D0062B0, 0x00000020, 0x00000040, 0x00000020, 0x00000040, 5);
func_800468E0(&D_80183E40, &D_80183E80, 0.54f, (s32) &d_course_rainbow_road_sphere, (s32) &D_0D0062B0, 0x00000020, 0x00000040, 0x00000020, 0x00000040, 5);
return;
}
sp34 = temp_v1;
src/hud_renderer.h
+1 -1
View File
@@ -446,7 +446,7 @@ extern Gfx *gDisplayListHead;
// Stuff from undefined_syms.txt, don't know where else to put them
extern u8 D_06013670[];
extern Gfx D_06007218[];
extern Gfx d_course_sherbet_land_dl_ice_block[];
extern Gfx D_0600F650[];
extern Gfx D_0600F960[];
extern Gfx D_0600FA20[];
src/render_courses.c
+2 -2
View File
@@ -279,7 +279,7 @@ void func_8029122C(struct UnkStruct_800DC5EC *arg0, s32 arg1) {
gDPNoOp(gDisplayListHead++);
gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA, G_CC_MODULATEIA);
gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
load_surface_map((uintptr_t) D_06019578, arg0);
load_surface_map(d_course_koopa_troopa_beach_dl_list2, arg0);
gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 1, 1, G_OFF);
gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
gDPSetAlphaCompare(gDisplayListHead++, G_AC_NONE);
@@ -732,7 +732,7 @@ void render_koopa_troopa_beach(struct UnkStruct_800DC5EC *arg0) {
gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA, G_CC_MODULATEIA);
gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2);
gSPDisplayList(gDisplayListHead++, d_course_koopa_troopa_beach_packed_dl_9688);
load_surface_map((uintptr_t) koopa_troopa_beach_dls, arg0);
load_surface_map((uintptr_t) d_course_koopa_troopa_beach_dl_list1, arg0);
gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA);
gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2);
src/render_courses.h
+2 -2
View File
@@ -74,7 +74,7 @@ extern Gfx banshee_boardwalk_dls[];
extern Gfx D_0600B278[];
extern Gfx yoshi_valley_dls[];
extern u8 frappe_snowland_dls[];
extern Gfx koopa_troopa_beach_dls[];
extern Gfx d_course_koopa_troopa_beach_dl_list1[];
extern Gfx royal_raceway_dls[];
extern Gfx luigi_raceway_dls[];
extern s32 D_801625EC;
@@ -95,7 +95,7 @@ extern Gfx wario_stadium_dls[];
extern Gfx D_06009228[];
extern Gfx D_060164B8[];
extern Gfx D_06019578[];
extern Gfx d_course_koopa_troopa_beach_dl_list2[];
extern Gfx D_090001D0[];
extern Gfx dks_jungle_parkway_dls[];