mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-09-04 02:49:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename a couple variables (#93)

Browse Source 
* Rename a couple variables

Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
This commit is contained in:
Tyler McGavran
2021-12-14 22:40:38 -05:00
committed by GitHub
parent 66d9a4fe88
commit d587580bd5
52 changed files with 362 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_800AF9B0.c
+23 -23
View File
@@ -2358,7 +2358,7 @@ extern s8 D_8018EDEC;
extern s32 D_8018EE00;
extern s8 D_8018EE0A;
extern s8 gCupSelection;
extern ? gCupTrackOrder;
extern ? gCupCourseOrder;
void func_800B3B58(void *arg0, u16 arg1) {
u16 sp26;
@@ -2425,27 +2425,27 @@ void func_800B3B58(void *arg0, u16 arg1) {
block_22:
phi_v1 = phi_a2;
if ((phi_a2 & 0x400) != 0) {
temp_v0_3 = gCourseSelection;
temp_v0_3 = gCupCourseSelection;
if (temp_v0_3 < 3) {
gCourseSelection = temp_v0_3 + 1;
gCupCourseSelection = temp_v0_3 + 1;
sp1C = phi_a2;
func_800B44AC(&gCourseSelection, &D_8018EDEC, phi_a2);
func_800B44AC(&gCupCourseSelection, &D_8018EDEC, phi_a2);
play_sound2(0x49008000);
phi_v1 = sp1C;
}
}
temp_v0_4 = gCourseSelection;
temp_v0_4 = gCupCourseSelection;
phi_v0 = temp_v0_4;
phi_a1 = &D_8018EDEC;
if (((phi_v1 & 0x800) != 0) && (temp_v0_4 > 0)) {
gCourseSelection = temp_v0_4 - 1;
gCupCourseSelection = temp_v0_4 - 1;
sp1C = phi_v1;
func_800B44AC(&gCourseSelection, &D_8018EDEC);
func_800B44AC(&gCupCourseSelection, &D_8018EDEC);
play_sound2(0x49008000);
phi_v0 = gCourseSelection;
phi_v0 = gCupCourseSelection;
phi_a1 = &D_8018EDEC;
}
gCurrentCourseId = *(&gCupTrackOrder + ((gCupSelection * 8) + (phi_v0 * 2)));
gCurrentCourseId = *(&gCupCourseOrder + ((gCupSelection * 8) + (phi_v0 * 2)));
if ((phi_v1 & 0x4000) != 0) {
if (*phi_a1 == 2) {
*phi_a1 = 1;
@@ -2491,7 +2491,7 @@ block_22:
phi_a1_2 = &D_8018EDEC;
}
D_800DC540 = phi_v0_2;
gCurrentCourseId = *(&gCupTrackOrder + ((phi_v0_2 * 8) + (gCourseSelection * 2)));
gCurrentCourseId = *(&gCupCourseOrder + ((phi_v0_2 * 8) + (gCupCourseSelection * 2)));
if ((phi_v1_2 & 0x4000) != 0) {
func_8009E208();
play_sound2(0x49008002);
@@ -2504,7 +2504,7 @@ block_22:
} else {
*phi_a1_2 = 3;
play_sound2(0x49008001, phi_a1_2);
gCurrentCourseId = *(&gCupTrackOrder + (gCupSelection * 8));
gCurrentCourseId = *(&gCupCourseOrder + (gCupSelection * 8));
D_8018EE00 = 0;
}
func_800B44AC();
@@ -2617,7 +2617,7 @@ void func_800B3F74(u32 arg0) {
gIsMirrorMode = 0;
gEnableDebugMode = 0;
gCupSelection = MUSHROOM_CUP;
gCourseSelection = COURSE_MARIO_RACEWAY;
gCupCourseSelection = CUP_COURSE_ONE;
D_8018EDF7 = 0;
if (D_8018EDF3 <= 0) {
D_8018EDF3 = 1;
@@ -2768,9 +2768,9 @@ void func_800B3F74(u32 arg0) {
play_sound2(0x49009013);
D_8018EE0A = 0;
if (gModeSelection == GRAND_PRIX) {
gCourseSelection = COURSE_MARIO_RACEWAY;
gCupCourseSelection = CUP_COURSE_ONE;
}
phi_v0_2 = gGPCharacterPoints;
phi_v0_2 = gGPPointsByCharacterId;
do {
temp_v0_5 = phi_v0_2 + 4;
temp_v0_5->unk-3 = 0;
@@ -2778,7 +2778,7 @@ void func_800B3F74(u32 arg0) {
temp_v0_5->unk-1 = 0;
temp_v0_5->unk-4 = 0;
phi_v0_2 = temp_v0_5;
} while (temp_v0_5 != gGPOverallRanks);
} while (temp_v0_5 != gCharacterIdByGPOverallRank);
break;
}
func_800B44AC();
@@ -3217,8 +3217,8 @@ GLOBAL_ASM("asm/non_matchings/code_800AF9B0/func_800B4DF4.s")
s32 func_800B4E24(s32 recordIndex) {
return func_800B4DF4(
D_8018EB90.allCourseTimeTrialRecords \
.cupRecords[(((gCupSelection * 4) + gCourseSelection) / 4)] \
.courseRecords[(((gCupSelection * 4) + gCourseSelection) % 4)] \
.cupRecords[(((gCupSelection * 4) + gCupCourseSelection) / 4)] \
.courseRecords[(((gCupSelection * 4) + gCupCourseSelection) % 4)] \
.records[recordIndex]
);
}
@@ -3237,8 +3237,8 @@ s32 func_800B4EB4(s32 recordIndex, s32 courseIndex) {
s32 func_800B4F2C(void) {
return func_800B4DF4(
D_8018EB90.allCourseTimeTrialRecords \
.cupRecords[(((gCupSelection * 4) + gCourseSelection) / 4)] \
.courseRecords[(((gCupSelection * 4) + gCourseSelection) % 4)] \
.cupRecords[(((gCupSelection * 4) + gCupCourseSelection) / 4)] \
.courseRecords[(((gCupSelection * 4) + gCupCourseSelection) % 4)] \
.records[TIME_TRIAL_1LAP_RECORD]
);
}
@@ -3285,7 +3285,7 @@ s32 func_800B5020(u32 arg0, s32 arg1) {
s32 phi_s0_2;
s32 phi_a0_2;
temp_v0 = (gCupSelection * 4) + gCourseSelection;
temp_v0 = (gCupSelection * 4) + gCupCourseSelection;
temp_s2 = ((temp_v0 / 4) * 0x60) + ((temp_v0 % 4) * 0x18) + &D_8018EB90;
sp30 = temp_v0;
phi_s0 = 0;
@@ -3391,7 +3391,7 @@ s32 func_800B5218(void) {
s32 phi_v0_2;
s32 phi_a3_2;
sp38 = (gCupSelection * 4) + gCourseSelection;
sp38 = (gCupSelection * 4) + gCupCourseSelection;
sp28 = *D_800E86A8;
phi_a1 = &D_8018CA74;
phi_a2 = &D_8018CA70;
@@ -4184,7 +4184,7 @@ s32 func_800B6178(s32 arg0) {
if (temp_v0_2 == 0) {
temp_s3->unk4 = 1;
if (D_800DC50C == 4) {
temp_s3->unk5 = (gCupSelection * 4) + gCourseSelection;
temp_s3->unk5 = (gCupSelection * 4) + gCupCourseSelection;
}
temp_s3->unk0 = D_80162DFC;
temp_s3->unk6 = D_80162DE0;
@@ -4278,7 +4278,7 @@ extern s8 gCupSelection;
func_80005AE8(D_800DC4E4);
temp_v0 = (arg0 << 7) + &D_8018EE10;
phi_s3 = 0;
if (((gCupSelection * 4) + gCourseSelection) != temp_v0->unk5) {
if (((gCupSelection * 4) + gCupCourseSelection) != temp_v0->unk5) {
phi_s3 = 2;
} else if (D_80162DFC != temp_v0->unk0) {
phi_s3 = 3;