mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-06-27 10:53:17 -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/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