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

Identify active screen mode, relabel accordingly (#141)

Browse Source
This commit is contained in:
Maciek Baron
2022-01-17 13:44:14 +00:00
committed by GitHub
parent b56b43e721
commit 1bbc7674ff
62 changed files with 425 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_800029B0.c
+1 -1
View File
@@ -143,7 +143,7 @@ void func_80002A18(void) {
if (gModeSelection == GRAND_PRIX) {
gCurrentCourseId = gCupCourseOrder[gCupSelection][gCupCourseSelection];
}
D_800DC52C = gScreenModeSelection;
gActiveScreenMode = gScreenModeSelection;
if (gCurrentCourseId != gCurrentlyLoadedCourseId) {
D_80150120 = 0;
gCurrentlyLoadedCourseId = gCurrentCourseId;
src/code_80005FD0.c
+1 -1
View File
@@ -137,7 +137,7 @@ s32 func_800061DC(void *arg0, f32 arg1, s32 arg2) {
s32 phi_v1_9;
s32 phi_v1_10;
temp_v0 = D_800DC52C;
temp_v0 = gActiveScreenMode;
temp_f0 = arg0->unk0;
temp_f2 = arg0->unk8;
if (temp_v0 != 0) {
src/code_8001C4D0.c
+7 -7
View File
@@ -107,7 +107,7 @@ void func_8001C4D0(f32 x, f32 y, f32 z, s16 rot, u32 arg4, s32 cameraId) {
*(&D_80164A90 + temp_t6_2) = 0.0f;
*(&D_80164AA0 + temp_t6_2) = 0.0f;
temp_t3 = temp_t6_2 + &D_80164A78;
*temp_t3 = *(&D_800DDB30 + (D_800DC52C * 4));
*temp_t3 = *(&D_800DDB30 + (gActiveScreenMode * 4));
*(&D_80164A18 + temp_t6_2) = 0;
*(&D_80164A08 + temp_t6_2) = 0;
*(&D_80164498 + temp_t6_2) = 0.0f;
@@ -116,7 +116,7 @@ void func_8001C4D0(f32 x, f32 y, f32 z, s16 rot, u32 arg4, s32 cameraId) {
temp_v1 = gPlayerOne + (cameraId * 0xDD8);
cameras[cameraId].unk2C = temp_v1->unk2E;
cameras[cameraId].unk28 = temp_v1->unk2E;
temp_v0 = D_800DC52C;
temp_v0 = gActiveScreenMode;
if (temp_v0 != 0) {
if (temp_v0 != 1) {
if (temp_v0 != 2) {
@@ -464,7 +464,7 @@ void func_8001CCEC(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32
move_f32_towards((bitwise f32) temp_a0_4, 0.0f, 0x3DCCCCCD);
temp_v1_3 = temp_s2_2 + &D_80164A78;
*temp_v1_3 = *temp_v1_3 - D_800ED558;
temp_f0_4 = *(&D_800DDB30 + (D_800DC52C * 4));
temp_f0_4 = *(&D_800DDB30 + (gActiveScreenMode * 4));
phi_s2 = temp_s2_2;
phi_v1_2 = temp_v1_3;
if (*temp_v1_3 <= temp_f0_4) {
@@ -472,7 +472,7 @@ void func_8001CCEC(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32
}
}
if ((arg0->unkCA & 0x100) == 0x100) {
temp_v0_2 = D_800DC52C;
temp_v0_2 = gActiveScreenMode;
if ((temp_v0_2 == 1) || (temp_v0_2 == 2) || (temp_v0_2 == 3)) {
temp_a0_9 = phi_s2 + &D_80164A90;
sp38 = temp_a0_9;
@@ -811,7 +811,7 @@ void func_8001D944(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32
move_f32_towards((bitwise f32) temp_a0_4, 0.0f, 0x3DCCCCCD);
temp_v0_3 = temp_s2_2 + &D_80164A78;
*temp_v0_3 = *temp_v0_3 - D_800ED5B0;
temp_f0_4 = *(&D_800DDB30 + (D_800DC52C * 4));
temp_f0_4 = *(&D_800DDB30 + (gActiveScreenMode * 4));
phi_s2 = temp_s2_2;
phi_v0_2 = temp_v0_3;
if (*temp_v0_3 <= temp_f0_4) {
@@ -1532,7 +1532,7 @@ block_51:
}
break;
}
temp_v0_4 = D_800DC52C;
temp_v0_4 = gActiveScreenMode;
if (temp_v0_4 != 0) {
if ((temp_v0_4 != 1) && (temp_v0_4 != 2) && (temp_v0_4 != 3)) {
phi_f2 = sp34;
@@ -1580,7 +1580,7 @@ void func_8001F87C(s32 arg0) {
Player *phi_a2;
s32 phi_a1;
if (D_800DC52C == 0) {
if (gActiveScreenMode == 0) {
phi_a2 = gPlayerOne;
phi_a1 = 0;
if (gModeSelection == GRAND_PRIX) {
src/code_8001F980.c
+13 -13
View File
@@ -5,7 +5,7 @@
#include "framebuffers.h"
extern s32 D_800ED600, D_800ED608, D_800ED610, D_800ED618, D_800ED620, D_800ED628, D_800ED630;
extern s32 D_800DC52C;
extern s32 gActiveScreenMode;
extern s32 D_800DDB58[];
extern s32 D_800ED638;
extern s32 D_80164A28;
@@ -136,7 +136,7 @@ u16 func_8001FB0C(void *arg0, void *arg1, f32 arg2, f32 arg3) {
s32 temp_v0;
s16 phi_v0;
temp_v0 = D_800DC52C;
temp_v0 = gActiveScreenMode;
sp40 = 0;
if (temp_v0 != 0) {
if ((temp_v0 != 1) && (temp_v0 != 2)) {
@@ -416,7 +416,7 @@ void func_80020524(void) {
func_8006E5AC(gPlayerTwo, 1, 0);
func_8006E5AC(gPlayerThree, 2, 0);
func_8006E5AC(gPlayerFour, 3, 0);
if (D_800DC52C != 3) {
if (gActiveScreenMode != 3) {
func_8006E5AC(gPlayerFive, 4, 0);
func_8006E5AC(gPlayerSix, 5, 0);
func_8006E5AC(gPlayerSeven, 6, 0);
@@ -489,7 +489,7 @@ void func_8002088C(void) {
func_8006E634(gPlayerTwo, 1, 1);
func_8006E634(gPlayerThree, 2, 1);
func_8006E634(gPlayerFour, 3, 1);
if (D_800DC52C != 3) {
if (gActiveScreenMode != 3) {
func_8006E634(gPlayerFive, 4, 1);
func_8006E634(gPlayerSix, 5, 1);
func_8006E634(gPlayerSeven, 6, 1);
@@ -711,7 +711,7 @@ void func_800212B4(void) {
func_80020000(gPlayerTwo, camera1, 1, 0);
func_80020000(gPlayerThree, camera1, 2, 0);
func_80020000(gPlayerFour, camera1, 3, 0);
if (D_800DC52C != 3) {
if (gActiveScreenMode != 3) {
func_80020000(gPlayerFive, camera1, 4, 0);
func_80020000(gPlayerSix, camera1, 5, 0);
func_80020000(gPlayerSeven, camera1, 6, 0);
@@ -721,7 +721,7 @@ void func_800212B4(void) {
func_80021244(gPlayerTwo, 1, 0);
func_80021244(gPlayerThree, 2, 0);
func_80021244(gPlayerFour, 3, 0);
if (D_800DC52C != 3) {
if (gActiveScreenMode != 3) {
func_80021244(gPlayerFive, 4, 0);
func_80021244(gPlayerSix, 5, 0);
func_80021244(gPlayerSeven, 6, 0);
@@ -734,7 +734,7 @@ void func_800212B4(void) {
func_8006E5AC(gPlayerTwo, 1, 0);
func_8006E5AC(gPlayerThree, 2, 0);
func_8006E5AC(gPlayerFour, 3, 0);
if (D_800DC52C != 3) {
if (gActiveScreenMode != 3) {
func_8006E5AC(gPlayerFive, 4, 0);
func_8006E5AC(gPlayerSix, 5, 0);
func_8006E5AC(gPlayerSeven, 6, 0);
@@ -753,7 +753,7 @@ void func_800215DC(void) {
func_80020000(gPlayerTwo, camera2, 1, 1);
func_80020000(gPlayerThree, camera2, 2, 1);
func_80020000(gPlayerFour, camera2, 3, 1);
if (D_800DC52C != 3) {
if (gActiveScreenMode != SCREEN_MODE_3P_4P_SPLITSCREEN) {
func_80020000(gPlayerFive, camera2, 4, 1);
func_80020000(gPlayerSix, camera2, 5, 1);
func_80020000(gPlayerSeven, camera2, 6, 1);
@@ -763,7 +763,7 @@ void func_800215DC(void) {
func_80021244(gPlayerTwo, 1, 1);
func_80021244(gPlayerThree, 2, 1);
func_80021244(gPlayerFour, 3, 1);
if (D_800DC52C != 3) {
if (gActiveScreenMode != SCREEN_MODE_3P_4P_SPLITSCREEN) {
func_80021244(gPlayerFive, 4, 1);
func_80021244(gPlayerSix, 5, 1);
func_80021244(gPlayerSeven, 6, 1);
@@ -776,7 +776,7 @@ void func_800215DC(void) {
func_8006E634(gPlayerTwo, 1, 1);
func_8006E634(gPlayerThree, 2, 1);
func_8006E634(gPlayerFour, 3, 1);
if (D_800DC52C != 3) {
if (gActiveScreenMode != SCREEN_MODE_3P_4P_SPLITSCREEN) {
func_8006E634(gPlayerFive, 4, 1);
func_8006E634(gPlayerSix, 5, 1);
func_8006E634(gPlayerSeven, 6, 1);
@@ -854,7 +854,7 @@ void func_80021B0C(void) {
func_8006E7CC(gPlayerTwo, 1, 0);
func_8006E7CC(gPlayerThree, 2, 0);
func_8006E7CC(gPlayerFour, 3, 0);
if (D_800DC52C != 3) {
if (gActiveScreenMode != 3) {
func_8006E7CC(gPlayerFive, 4, 0);
func_8006E7CC(gPlayerSix, 5, 0);
func_8006E7CC(gPlayerSeven, 6, 0);
@@ -888,7 +888,7 @@ void func_80021C78(void) {
func_8006E848(gPlayerTwo, 1, 1);
func_8006E848(gPlayerThree, 2, 1);
func_8006E848(gPlayerFour, 3, 1);
if (D_800DC52C != 3) {
if (gActiveScreenMode != SCREEN_MODE_3P_4P_SPLITSCREEN) {
func_8006E848(gPlayerFive, 4, 1);
func_8006E848(gPlayerSix, 5, 1);
func_8006E848(gPlayerSeven, 6, 1);
@@ -1107,7 +1107,7 @@ void func_8002276C(void) {
s32 temp_v0_5;
s32 phi_v0;
temp_v0 = D_800DC52C;
temp_v0 = gActiveScreenMode;
if (temp_v0 != 0) {
if ((temp_v0 != 1) && (temp_v0 != 2)) {
if (temp_v0 != 3) {
src/code_80027040.c
+2 -2
View File
@@ -14,7 +14,7 @@ extern u32 *D_802F1F80;
extern u32 *D_802DFB80;
extern s16 D_800DDEB0[];
extern s32 D_800DC52C;
extern s32 gActiveScreenMode;
// Structured like a 3D pointer array
extern u32 ***gKartTextureTable0, ***gKartTextureTable1, **gKartTextureGroup18s;
@@ -148,7 +148,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027040/func_80027560.s")
void func_80027A20(Player *player, s8 arg1, s8 arg2, s8 arg3) {
void *temp_s0 = (arg3 << 0xE) + (arg2 << 0xC) + (arg1 << 9) + (s32)&D_802F1F80;
switch(D_800DC52C) {
switch(gActiveScreenMode) {
case 0: case 1: case 2:
osInvalDCache(temp_s0, 0x200);
osPiStartDma(&gDmaIoMesg, 0, 0, &_kart_texturesSegmentRomStart[gKartPalettes[player->characterId] & 0x00FFFFFF], temp_s0, 0x200, &gDmaMesgQueue);
src/code_80027D00.c
+5 -5
View File
@@ -577,7 +577,7 @@ void func_80028864(Player *arg0, s32 arg1, s8 arg2, s8 arg3) {
temp_v0 = arg0->unk_000;
phi_a0 = arg0;
if ((temp_v0 & PLAYER_START_SEQUENCE) == 0) {
temp_v0_2 = D_800DC52C;
temp_v0_2 = gActiveScreenMode;
if (temp_v0_2 != 0) {
if ((temp_v0_2 != 1) && (temp_v0_2 != 2)) {
if (temp_v0_2 != 3) {
@@ -3336,7 +3336,7 @@ void func_8002D268(Player *player, s32 arg1, s8 arg2, s8 arg3) {
func_8008F5A4(player, arg3);
}
player->unk_074 = func_802ABE30(spFC, spF8, spF4, player->unk_11A);
if (((player->unk_000 & 0x4000) == 0x4000) && ((temp_v0_16 = D_800DC52C, (temp_v0_16 == 0)) || (temp_v0_16 == 2) || (temp_v0_16 == 1))) {
if (((player->unk_000 & 0x4000) == 0x4000) && ((temp_v0_16 = gActiveScreenMode, (temp_v0_16 == 0)) || (temp_v0_16 == 2) || (temp_v0_16 == 1))) {
func_80029B4C(player, spFC, spF8, spF4);
} else {
func_8002A194(player, spFC, spF8, spF4);
@@ -3772,7 +3772,7 @@ block_63:
func_8008F5A4(arg0, arg3);
}
arg0->unk74 = func_802ABE30(spD0, spCC, spC8, arg0->unk11A);
if (((arg0->unk0 & 0x4000) == 0x4000) && ((temp_v0_13 = D_800DC52C, (temp_v0_13 == 0)) || (temp_v0_13 == 2) || (temp_v0_13 == 1))) {
if (((arg0->unk0 & 0x4000) == 0x4000) && ((temp_v0_13 = gActiveScreenMode, (temp_v0_13 == 0)) || (temp_v0_13 == 2) || (temp_v0_13 == 1))) {
func_80029B4C(arg0, spD0, spCC, spC8);
} else {
func_8002A194(arg0, spD0, spCC, spC8);
@@ -4072,7 +4072,7 @@ void func_8002F730(void *arg0, ? arg1, ? arg2, s8 arg3) {
func_8003F46C(arg0, &sp5C, &sp68, &spE8, &sp78, &spCC, &spC8, &spC4);
}
arg0->unk74 = func_802ABE30(spCC, spC8, spC4, arg0->unk11A);
if (((arg0->unk0 & 0x4000) == 0x4000) && ((temp_v0 = D_800DC52C, (temp_v0 == 0)) || (temp_v0 == 2) || (temp_v0 == 1))) {
if (((arg0->unk0 & 0x4000) == 0x4000) && ((temp_v0 = gActiveScreenMode, (temp_v0 == 0)) || (temp_v0 == 2) || (temp_v0 == 1))) {
func_80029B4C(arg0, spCC, spC8, spC4);
} else {
func_8002A194(arg0, spCC, spC8, spC4);
@@ -7468,7 +7468,7 @@ void func_800382DC(void) {
u16 temp_v0_5;
u16 temp_v0_6;
temp_v0 = D_800DC52C;
temp_v0 = gActiveScreenMode;
if (temp_v0 != 0) {
if ((temp_v0 != 1) && (temp_v0 != 2)) {
if (temp_v0 != 3) {
src/code_800393C0.c
+12 -12
View File
@@ -301,8 +301,8 @@ void spawn_player(Player *player, s8 playerIndex, f32 arg2, f32 arg3, f32 arg4,
}
void func_80039AE4(void) {
switch (D_800DC52C) {
case 0:
switch (gActiveScreenMode) {
case SCREEN_MODE_1P:
if (D_800DC50C == ENDING_SEQUENCE) {
D_80165578 = 0x898;
D_8016557A = 0;
@@ -328,8 +328,8 @@ void func_80039AE4(void) {
}
break;
case 1:
case 2:
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
if (gModeSelection == BATTLE) {
D_80165578 = 0x898;
D_8016557A = 0;
@@ -763,7 +763,7 @@ void func_8003C0F0(void) {
case COURSE_RAINBOW_ROAD:
case COURSE_WARIO_STADIUM:
case COURSE_DK_JUNGLE:
switch (D_800DC52C) {
switch (gActiveScreenMode) {
case 0:
switch (gModeSelection) {
case GRAND_PRIX:
@@ -857,7 +857,7 @@ void func_8003C0F0(void) {
break;
case COURSE_BLOCK_FORT:
switch (D_800DC52C) {
switch (gActiveScreenMode) {
case 1:
case 2:
temp = 5;
@@ -896,7 +896,7 @@ void func_8003C0F0(void) {
break;
case COURSE_SKYSCRAPER:
switch (D_800DC52C) {
switch (gActiveScreenMode) {
case 1:
case 2:
temp = 0x1E0;
@@ -933,7 +933,7 @@ void func_8003C0F0(void) {
break;
case COURSE_DOUBLE_DECK:
switch (D_800DC52C) {
switch (gActiveScreenMode) {
case 1:
case 2:
temp = 0x37;
@@ -970,7 +970,7 @@ void func_8003C0F0(void) {
break;
case COURSE_BIG_DONUT:
switch (D_800DC52C) {
switch (gActiveScreenMode) {
case 1:
case 2:
temp = 0xC8;
@@ -1084,7 +1084,7 @@ void func_8003D080(void) {
func_8003C0F0();
}
if (D_800DC51C == 0) {
switch (D_800DC52C) {
switch (gActiveScreenMode) {
case 0:
switch (gModeSelection) {
case GRAND_PRIX:
@@ -1150,7 +1150,7 @@ void func_8003D080(void) {
break;
}
} else {
switch (D_800DC52C) {
switch (gActiveScreenMode) {
case 0:
func_8001C4D0(gPlayerOne->unk_0A4, gPlayerOne->unk_0A8, gPlayerOne->unk_0AC, gPlayerOne->unk_0BC, 3, 0);
break;
@@ -1173,7 +1173,7 @@ void func_8003D080(void) {
}
}
switch (D_800DC52C) {
switch (gActiveScreenMode) {
case 0:
func_8003CD98(gPlayerTwo, camera1, 0, 0); // sic
func_8003CD98(gPlayerTwo, camera1, 1, 0);
src/code_80040E50.c
+6 -6
View File
@@ -117,7 +117,7 @@ s32 func_80041028(u16 *arg0, u16 arg1, u16 arg2) {
s32 phi_v1 = 0;
u16 temp_t6 = arg1;
u16 temp_t8 = arg2;
if (*arg0 < temp_t6) {
*arg0 += temp_t8;
if (*arg0 >= temp_t6) {
@@ -281,7 +281,7 @@ UNUSED s32 func_8004132C(s32 *arg0, s32 arg1, s32 arg2) {
*arg0 = arg1;
phi_v1 = 1;
}
} else if (arg1 < temp_v0) {
if (arg2 >= 0) {
*arg0 = (s32) (temp_v0 - arg2);
@@ -358,11 +358,11 @@ GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80041530.s")
#endif
Vec3f *func_80041594(Vec3f arg0, Vec3f arg1, Vec3f arg2) {
arg0[0] = (arg1[1] * arg2[2]) - (arg2[1] * arg1[2]);
arg0[1] = (arg1[2] * arg2[0]) - (arg2[2] * arg1[0]);
arg0[2] = (arg1[0] * arg2[1]) - (arg2[0] * arg1[1]);
return &arg0;
}
@@ -701,13 +701,13 @@ GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80041D24.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 5bd751fca3befef73d6a2e20d84a88cc918a77fe
void guOrtho(Mtx *, f32, f32, f32, f32, f32, f32, f32); /* extern */
extern s32 D_800DC52C;
extern s32 gActiveScreenMode;
extern s8 D_801658FE;
extern Mtx D_80183D60;
void func_80041D34(void) {
guOrtho(&D_80183D60, 0.0f, 320.0f, 240.0f, 0.0f, -1.0f, 1.0f, 1.0f);
switch (D_800DC52C) { /* irregular */
switch (gActiveScreenMode) { /* irregular */
case 0:
guOrtho(&gGfxPool->mtxPool[5], 0.0f, 320.0f, 240.0f, 0.0f, -1.0f, 1.0f, 1.0f);
break;
src/code_800431B0.c
+1 -1
View File
@@ -6454,7 +6454,7 @@ void func_800514BC(void) {
}
phi_s3 = 8;
phi_s1 = 0;
if ((gPlayerCountSelection1 == 2) && (D_800DC52C == 2)) {
if ((gPlayerCountSelection1 == 2) && (gActiveScreenMode == SCREEN_MODE_2P_SPLITSCREEN_VERTICAL)) {
phi_s3 = 0;
}
temp_s0 = phi_s3 - 1;
src/code_80057C60.c
+18 -18
View File
@@ -10685,7 +10685,7 @@ void func_8006AFD0(void *arg0, s8 arg1, s16 arg2, s8 arg3) {
temp_v0_2 = (arg3 * 0xB8) + &cameras;
temp_f20 = arg0->unk14 - temp_v0_2->unk0;
temp_f0 = arg0->unk1C - temp_v0_2->unk8;
if (D_800DC52C != 3) {
if (gActiveScreenMode != 3) {
sp11C = temp_t1;
phi_f20 = sqrtf((temp_f20 * temp_f20) + (temp_f0 * temp_f0)) / 300.0f;
} else {
@@ -11477,7 +11477,7 @@ void func_8006CEC0(void *arg0, s16 arg1, s8 arg2, s8 arg3) {
goto block_22;
}
block_22:
temp_v0_4 = D_800DC52C;
temp_v0_4 = gActiveScreenMode;
if (temp_v0_4 != 0) {
if ((temp_v0_4 != 1) && (temp_v0_4 != 2) && (temp_v0_4 != 3)) {
return;
@@ -11621,14 +11621,14 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) {
if (temp_v0_2 != 1) {
if (temp_v0_2 != 6) {
} else if (D_800DC52C == 3) {
} else if (gActiveScreenMode == 3) {
if (arg2 == arg1) {
func_80066BAC(arg0, arg1, phi_s2, arg2);
}
} else if (arg2 == arg1) {
func_80066BAC(arg0, arg1, phi_s2, arg2);
}
} else if (D_800DC52C == 3) {
} else if (gActiveScreenMode == 3) {
if (arg2 == arg1) {
func_8006538C(arg0, arg1, phi_s2, arg2);
}
@@ -11639,56 +11639,56 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) {
switch (temp_t8_2) { /* switch 1 */
case 1: /* switch 1 */
case 9: /* switch 1 */
if (D_800DC52C == 0) {
if (gActiveScreenMode == 0) {
func_800691B8(arg0, arg1, phi_s2, arg2);
} else if (arg2 == arg1) {
func_800691B8(arg0, arg1, phi_s2, arg2);
}
break;
case 2: /* switch 1 */
if (D_800DC52C == 0) {
if (gActiveScreenMode == 0) {
func_800696CC(arg0, arg1, phi_s2, arg2, temp_s5->unkAD4);
} else if (arg2 == arg1) {
func_800696CC(arg0, arg1, phi_s2, arg2, temp_s5->unkAD4);
}
break;
case 3: /* switch 1 */
if (D_800DC52C == 0) {
if (gActiveScreenMode == 0) {
func_80067280(arg0, arg1, phi_s2, arg2);
} else if (arg2 == arg1) {
func_80067280(arg0, arg1, phi_s2, arg2);
}
break;
case 4: /* switch 1 */
if (D_800DC52C == 0) {
if (gActiveScreenMode == 0) {
func_80069444(arg0, arg1, phi_s2, arg2);
} else if (arg2 == arg1) {
func_80069444(arg0, arg1, phi_s2, arg2);
}
break;
case 5: /* switch 1 */
if (D_800DC52C == 0) {
if (gActiveScreenMode == 0) {
func_80069938(arg0, arg1, phi_s2, arg2);
} else if (arg2 == arg1) {
func_80069938(arg0, arg1, phi_s2, arg2);
}
break;
case 6: /* switch 1 */
if (D_800DC52C == 0) {
if (gActiveScreenMode == 0) {
func_80069BA8(arg0, arg1, phi_s2, arg2);
} else if (arg2 == arg1) {
func_80069BA8(arg0, arg1, phi_s2, arg2);
}
break;
case 7: /* switch 1 */
if (D_800DC52C == 0) {
if (gActiveScreenMode == 0) {
func_80069DB8(arg0, arg1, phi_s2, arg2);
} else if (arg2 == arg1) {
func_80069DB8(arg0, arg1, phi_s2, arg2);
}
break;
case 8: /* switch 1 */
if (D_800DC52C == 0) {
if (gActiveScreenMode == 0) {
func_80067604(arg0, arg1, phi_s2, arg2);
} else if (arg2 == arg1) {
func_80067604(arg0, arg1, phi_s2, arg2);
@@ -11698,7 +11698,7 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) {
temp_t6 = temp_s5->unk53A;
switch (temp_t6) { /* switch 2 */
case 1: /* switch 2 */
if (D_800DC52C == 3) {
if (gActiveScreenMode == 3) {
if (arg2 == arg1) {
func_80065AB0(arg0, arg1, phi_s2, arg2);
}
@@ -11710,7 +11710,7 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) {
case 3: /* switch 2 */
case 4: /* switch 2 */
case 5: /* switch 2 */
if (D_800DC52C == 3) {
if (gActiveScreenMode == 3) {
if (arg2 == arg1) {
func_80065F0C(arg0, arg1, phi_s2, arg2);
}
@@ -11719,7 +11719,7 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) {
}
break;
case 9: /* switch 2 */
if (D_800DC52C == 3) {
if (gActiveScreenMode == 3) {
if (arg2 == arg1) {
func_800664E0(arg0, arg1, phi_s2, arg2);
}
@@ -11728,7 +11728,7 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) {
}
break;
case 11: /* switch 2 */
if (D_800DC52C == 3) {
if (gActiveScreenMode == 3) {
if (arg2 == arg1) {
func_8006A01C(arg0, arg1, phi_s2, arg2);
}
@@ -11802,7 +11802,7 @@ void func_8006DD3C(void *arg0, s8 arg1, s8 arg2) {
if (temp_v0_2 == 5) {
func_8006A280(arg0, arg1, phi_s0, arg2);
}
} else if (D_800DC52C == 3) {
} else if (gActiveScreenMode == 3) {
if (arg2 == arg1) {
func_80066998(arg0, arg1, phi_s0, arg2);
}
@@ -11857,7 +11857,7 @@ void func_8006E058(void) {
s32 temp_v0_5;
s32 phi_v0;
temp_v0 = D_800DC52C;
temp_v0 = gActiveScreenMode;
if (temp_v0 != 0) {
if ((temp_v0 != 1) && (temp_v0 != 2)) {
if (temp_v0 != 3) {
src/code_80071F00.c
+2 -2
View File
@@ -6576,7 +6576,7 @@ void func_8007B34C(s32 playerId) {
func_8007B254(temp_s0, playerId);
break;
case 0x2:
temp_v0 = D_800DC52C;
temp_v0 = gActiveScreenMode;
if (temp_v0 == 0) {
temp_v1 = (playerId * 0x84) + &D_8018CA70;
sp28 = temp_v1;
@@ -6640,7 +6640,7 @@ void func_8007B34C(s32 playerId) {
func_8007278C(temp_s0, 0x14);
break;
case 0xB:
temp_v0_2 = D_800DC52C;
temp_v0_2 = gActiveScreenMode;
if (temp_v0_2 == 0) {
if (func_8004106C((playerId * 0x84) + 0x48 + &D_8018CA70, 0, 4) != 0) {
func_80072488(temp_s0);
src/code_80280000.c
+1 -1
View File
@@ -130,7 +130,7 @@ void func_80280420(void) {
D_800DC5EC->screenStartX = 160;
D_800DC5EC->screenStartY = 120;
gScreenModeSelection = SCREEN_MODE_1P;
D_800DC52C = 0;
gActiveScreenMode = SCREEN_MODE_1P;
gPrevLoadedAddress = D_8015F734;
load_course(gCurrentCourseId);
D_8015F730 = gPrevLoadedAddress;
src/code_80281780.c
+1 -1
View File
@@ -92,7 +92,7 @@ void load_ending_sequence_royalraceway(void) {
D_800DC5EC->screenStartY = 120;
gScreenModeSelection = SCREEN_MODE_1P;
gPrevLoadedAddress = (s32) D_8015F734;
D_800DC52C = 0;
gActiveScreenMode = SCREEN_MODE_1P;
gModeSelection = GRAND_PRIX;
load_course(gCurrentCourseId);
D_8015F730 = (s32) gPrevLoadedAddress;
src/code_80281780.h
+1 -1
View File
@@ -24,7 +24,7 @@ extern u16 D_800DC5B4;
extern s32 gIsMirrorMode;
extern s32 gScreenModeSelection;
extern s32 D_800DC52C;
extern s32 gActiveScreenMode;
extern s32 gModeSelection;
extern u16 D_800DC5BC;
extern u16 D_800DC5C8;
src/code_8028DF00.c
+7 -7
View File
@@ -67,7 +67,7 @@ extern float gCourseTimer;
extern float D_800DC594;
extern s32 gScreenModeSelection;
extern s32 D_8018D2AC;
extern s32 D_800DC52C;
extern s32 gActiveScreenMode;
extern s16 gCurrentCourseId;
extern u16 D_80162DD4[];
extern u16 D_8015F890;
@@ -300,7 +300,7 @@ void func_8028E438(void) {
D_80150148 = (f32) ((f32) temp_v0->screenWidth / (f32) temp_v0->screenHeight);
if (phi_v1_4 == 4) {
D_8015F894 = 2;
D_800DC52C = 0;
gActiveScreenMode = 0;
D_800DC5EC->screenWidth = temp_v0->screenWidth;
D_800DC5EC->screenHeight = temp_v0->screenHeight;
D_800DC5EC->screenStartX = temp_v0->screenStartX;
@@ -435,7 +435,7 @@ void func_8028E678(void) {
D_800DC5F0->screenStartX = D_800DC5EC->screenStartX;
D_800DC5F0->screenStartY = D_800DC5EC->screenStartY;
D_800DC52C = 2;
gActiveScreenMode = 2;
D_80150148 = 1.33333337;
gPlayerCountSelection1 = 2;
func_8003DB5C();
@@ -804,7 +804,7 @@ void func_8028F588(void) {
s16 phi_v0_7;
s16 phi_v0_8;
temp_v0 = D_800DC52C;
temp_v0 = gActiveScreenMode;
if (temp_v0 != 0) {
if (temp_v0 != 1) {
if (temp_v0 != 2) {
@@ -943,7 +943,7 @@ loop_2:
temp_v0 = phi_s3->unk_000;
if (((temp_v0 & PLAYER_HUMAN) != 0) && ((temp_v0 & PLAYER_CPU) == 0)) {
temp_s0 = &gControllers[phi_s2];
if (D_800DC52C != 3) {
if (gActiveScreenMode != 3) {
temp_v0_2 = temp_s0->buttonPressed;
if (((temp_v0_2 & 0x20) != 0) && ((temp_s0->button & 0x10) == 0)) {
temp_s0->buttonPressed = temp_v0_2 & 0xFFDF;
@@ -1096,7 +1096,7 @@ void func_8028FCBC(void) {
case 1:
func_8028F914();
if (D_802BA034 == 1.0f) {
if (D_800DC52C != 0) {
if (gActiveScreenMode != 0) {
if (gCurrentCourseId == COURSE_LUIGI_RACEWAY) {
func_802A7940();
} else if (gCurrentCourseId == COURSE_WARIO_STADIUM) {
@@ -1437,7 +1437,7 @@ void func_80290B14(void) {
func_80059C50();
switch(D_800DC52C) {
switch(gActiveScreenMode) {
case 0:
func_8001EE98(gPlayerOneCopy, camera1, 0);
break;
src/code_80290C20.c
+4 -4
View File
@@ -449,7 +449,7 @@ block_9:
temp_t7 = gCurrentCourseId;
switch (temp_t7) { /* switch 1 */
case 2: /* switch 1 */
if ((D_800DC52C == 0) && (sp21A >= 6) && (sp21A < 0xA) && ((sp21A != 9) || ((sp218 >= 0xA000) && (sp218 < 0xE001)))) {
if ((gActiveScreenMode == 0) && (sp21A >= 6) && (sp21A < 0xA) && ((sp21A != 9) || ((sp218 >= 0xA000) && (sp218 < 0xE001)))) {
temp_v1_9 = gDisplayListHead;
gDisplayListHead = temp_v1_9 + 8;
temp_v1_9->words.w1 = &D_06009228;
@@ -1566,7 +1566,7 @@ extern Gfx luigi_raceway_dls[];
extern s32 D_800DC5DC;
extern s32 D_800DC5E0;
extern s32 D_800DC52C;
extern s32 gActiveScreenMode;
extern s16 D_802B87D8;
void render_luigi_raceway(struct UnkStruct_800DC5EC *arg0) {
@@ -1595,7 +1595,7 @@ void render_luigi_raceway(struct UnkStruct_800DC5EC *arg0) {
D_800DC5DC = 88;
D_800DC5E0 = 72;
if ((D_800DC52C == 0) && (sp22 >= 10) && (sp22 < 17)) {
if ((gActiveScreenMode == 0) && (sp22 >= 10) && (sp22 < 17)) {
phi_v0 = sRenderedFramebuffer - 1;
@@ -1884,7 +1884,7 @@ void render_wario_stadium(void *arg0) {
temp_v0_14->words.w0 = 0xB7000000;
D_800DC5DC = 0x58;
D_800DC5E0 = 0x48;
if (D_800DC52C == 0) {
if (gActiveScreenMode == 0) {
temp_v0_15 = sRenderedFramebuffer - 1;
phi_v0 = temp_v0_15;
if (temp_v0_15 < 0) {
src/code_80296A50.c
+4 -4
View File
@@ -2956,7 +2956,7 @@ block_9:
*phi_v0 = 0x6000000;
phi_a1 = 0x6000000;
}
if (D_800DC52C == 0) {
if (gActiveScreenMode == 0) {
if (temp_f2 < D_802B96E4) {
temp_v0_7 = gDisplayListHead;
gDisplayListHead = temp_v0_7 + 8;
@@ -3027,7 +3027,7 @@ void func_8029B2E4(void *arg0, s32 arg1) {
temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x451C4000, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B96F0);
temp_f2 = temp_f0;
if (!(temp_f0 < 0.0f) && (temp_v0 = gDisplayListHead, gDisplayListHead = temp_v0 + 8, temp_v0->unk4 = -1, temp_v0->unk0 = 0xBB000001, temp_v0_2 = gDisplayListHead, gDisplayListHead = temp_v0_2 + 8, temp_v0_2->unk4 = 0x20000, temp_v0_2->unk0 = 0xB6000000, sp44 = temp_f2, func_802B5F74(&spC8, temp_a1, arg1 + 0x10), (func_802B4FF8(&spC8, 0) != 0))) {
if (D_800DC52C == 0) {
if (gActiveScreenMode == 0) {
if (temp_f2 < D_802B96F4) {
temp_v0_3 = gDisplayListHead;
gDisplayListHead = temp_v0_3 + 8;
@@ -3104,7 +3104,7 @@ void func_8029B4E0(void *arg0, s32 arg1) {
temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x451C4000, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9700);
temp_f2 = temp_f0;
if (!(temp_f0 < 0.0f) && (temp_v0 = gDisplayListHead, gDisplayListHead = temp_v0 + 8, temp_v0->unk4 = -1, temp_v0->unk0 = 0xBB000001, temp_v0_2 = gDisplayListHead, gDisplayListHead = temp_v0_2 + 8, temp_v0_2->unk4 = 0x20000, temp_v0_2->unk0 = 0xB6000000, sp44 = temp_f2, func_802B5F74(&spC8, temp_a1, arg1 + 0x10), func_802B5F00(&spC8, 0x3DCCCCCD), (func_802B4FF8(&spC8, 0) != 0))) {
if (D_800DC52C == 0) {
if (gActiveScreenMode == 0) {
if (temp_f2 < D_802B9704) {
temp_v0_3 = gDisplayListHead;
gDisplayListHead = temp_v0_3 + 8;
@@ -3180,7 +3180,7 @@ void func_8029B6EC(void *arg0, s32 arg1) {
temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x451C4000, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9710);
temp_f2 = temp_f0;
if (!(temp_f0 < 0.0f) && (temp_v0 = gDisplayListHead, gDisplayListHead = temp_v0 + 8, temp_v0->unk4 = -1, temp_v0->unk0 = 0xBB000001, temp_v0_2 = gDisplayListHead, gDisplayListHead = temp_v0_2 + 8, temp_v0_2->unk4 = 0x20000, temp_v0_2->unk0 = 0xB6000000, sp44 = temp_f2, func_802B5F74(&spC8, temp_a1, arg1 + 0x10), (func_802B4FF8(&spC8, 0) != 0))) {
if (D_800DC52C == 0) {
if (gActiveScreenMode == 0) {
if (temp_f2 < D_802B9714) {
temp_v0_3 = gDisplayListHead;
gDisplayListHead = temp_v0_3 + 8;
src/code_802A3730.c
+9 -9
View File
@@ -285,7 +285,7 @@ void func_802A41D4(void) {
void func_802A4300(void) {
if ( D_800DC52C == 0) {
if (gActiveScreenMode == SCREEN_MODE_1P) {
return;
}
if (D_800DC5B0 != 0) {
@@ -300,14 +300,14 @@ void func_802A4300(void) {
gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
gDPPipeSync(gDisplayListHead++);
switch(D_800DC52C) {
case 2:
switch(gActiveScreenMode) {
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
gDPFillRectangle(gDisplayListHead++, 157, 0, 159, 239);
break;
case 1:
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
gDPFillRectangle(gDisplayListHead++, 0, 119, 319, 121);
break;
case 3:
case SCREEN_MODE_3P_4P_SPLITSCREEN:
gDPFillRectangle(gDisplayListHead++, 157, 0, 159, 239);
gDPFillRectangle(gDisplayListHead++, 0, 119, 319, 121);
break;
@@ -761,7 +761,7 @@ extern f32 D_8015013C;
extern f32 D_80150130;
void func_802A4EF4(void) {
switch(D_800DC52C) {
switch(gActiveScreenMode) {
case 0:
func_8001F394(gPlayerOne, &D_80150130);
break;
@@ -1431,7 +1431,7 @@ void func_802A74BC(void) {
wrapper->pathCounter = 1;
switch(D_800DC52C) {
switch(gActiveScreenMode) {
case 0:
if (i == 0) {
wrapper->screenStartX = 160;
@@ -1583,7 +1583,7 @@ extern u16 sRenderedFramebuffer;
void func_802A7728(void) {
s16 temp_v0;
if (D_800DC52C == 3) {
if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) {
D_800DC5DC = 0;
} else {
D_800DC5DC = 128;
@@ -1606,7 +1606,7 @@ void func_802A7728(void) {
void func_802A7940(void) {
s16 temp_v0;
if (D_800DC52C == 3) {
if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) {
D_800DC5DC = 0;
} else {
D_800DC5DC = 128;
src/main.c
+7 -7
View File
@@ -39,7 +39,7 @@ extern s32 func_802A7D70(u8 *arg0, u8 *arg1);
extern void func_802A7CF0(u32 arg0, u32 arg1);
extern s32 D_800DC524;
extern s32 D_800DC52C;
extern s32 gActiveScreenMode;
extern f32 D_800DC594;
@@ -170,7 +170,7 @@ u16 D_800DC51C = 0;
u16 gEnableDebugMode = 0;
s32 D_800DC524 = 7; // = COURSE_DATA_MENU?;
UNUSED s32 D_800DC528 = 1;
s32 D_800DC52C = 0;
s32 gActiveScreenMode = SCREEN_MODE_1P;
s32 gScreenModeSelection[2] = {0};
s32 gPlayerCountSelection1 = 2;
@@ -597,7 +597,7 @@ void func_8000142C(void) {
}
func_802A4EF4();
switch(D_800DC52C) {
switch(gActiveScreenMode) {
case 0:
D_80150114 = 2;
func_80005F44();
@@ -1063,25 +1063,25 @@ void thread3_video(UNUSED void *arg0) {
void func_800025D4(void) {
func_80091B78();
D_800DC52C = 0;
gActiveScreenMode = SCREEN_MODE_1P;
func_802A4D18();
}
void func_80002600(void) {
func_80091B78();
D_800DC52C = 0;
gActiveScreenMode = SCREEN_MODE_1P;
func_802A4D18();
}
void func_8000262C(void) {
func_80091B78();
D_800DC52C = 0;
gActiveScreenMode = SCREEN_MODE_1P;
func_802A4D18();
}
void func_80002658(void) {
func_80091B78();
D_800DC52C = 0;
gActiveScreenMode = SCREEN_MODE_1P;
func_802A4D18();
}
src/staff_ghosts.c
+4 -4
View File
@@ -65,7 +65,7 @@ extern OSMesg gMainReceivedMesg;
extern s16 gCurrentCourseId;
extern s32 gModeSelection;
extern s32 D_800DC52C;
extern s32 gActiveScreenMode;
extern u16 D_8015F890;
extern s32 lapCount[];
extern s32 D_8018CA78;
@@ -208,7 +208,7 @@ void func_80005310(void) {
D_80162DEC = 0;
D_80162DF8 = 0;
if (gModeSelection == TIME_TRIALS && D_800DC52C == 0) {
if (gModeSelection == TIME_TRIALS && gActiveScreenMode == SCREEN_MODE_1P) {
if (D_8015F890 == 1) {
func_80004FB0();
@@ -548,7 +548,7 @@ void func_80005B18(void) {
if (D_80162DEC > 100) {
D_80162DEC = 100;
}
if ((gModeSelection == TIME_TRIALS) && (D_800DC52C == 0)) {
if ((gModeSelection == TIME_TRIALS) && (gActiveScreenMode == 0)) {
if ((D_80162DD4 == 0) && (lapCount[4] != 3)) {
func_800057DC(); //gModeSelection, &D_80162DDC, 3, &D_80162DD4);
}
@@ -567,7 +567,7 @@ GLOBAL_ASM("asm/non_matchings/staff_ghosts/func_80005B18.s")
#endif
void func_80005E6C(void) {
if ((gModeSelection == TIME_TRIALS) && (gModeSelection == TIME_TRIALS) && (D_800DC52C == 0)) {
if ((gModeSelection == TIME_TRIALS) && (gModeSelection == TIME_TRIALS) && (gActiveScreenMode == SCREEN_MODE_1P)) {
if ((D_80162DD8 == 0) && (D_80164394 != 3)) {
func_800057DC(); //3
}