diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c index c0060629f..6dda5a9bb 100644 --- a/src/game/game_1999b0.c +++ b/src/game/game_1999b0.c @@ -2991,25 +2991,15 @@ glabel func0f19bfa0 /* f19c18c: 27bd0040 */ addiu $sp,$sp,0x40 ); -GLOBAL_ASM( -glabel func0f19c190 -/* f19c190: 27bdffe8 */ addiu $sp,$sp,-24 -/* f19c194: 3c02800b */ lui $v0,%hi(var800acca0) -/* f19c198: 3c03800b */ lui $v1,%hi(g_MpChallengesCompleted) -/* f19c19c: afbf0014 */ sw $ra,0x14($sp) -/* f19c1a0: 2463ccc8 */ addiu $v1,$v1,%lo(g_MpChallengesCompleted) -/* f19c1a4: 2442cca0 */ addiu $v0,$v0,%lo(var800acca0) -.L0f19c1a8: -/* f19c1a8: 24420001 */ addiu $v0,$v0,0x1 -/* f19c1ac: 1443fffe */ bne $v0,$v1,.L0f19c1a8 -/* f19c1b0: a040ffff */ sb $zero,-0x1($v0) -/* f19c1b4: 0fc66bf7 */ jal func0f19afdc -/* f19c1b8: 00000000 */ sll $zero,$zero,0x0 -/* f19c1bc: 8fbf0014 */ lw $ra,0x14($sp) -/* f19c1c0: 27bd0018 */ addiu $sp,$sp,0x18 -/* f19c1c4: 03e00008 */ jr $ra -/* f19c1c8: 00000000 */ sll $zero,$zero,0x0 -); +void func0f19c190(void) +{ + s32 i; + for (i = 0; i < 40; i++) { + var800acca0[i] = 0; + } + + func0f19afdc(); +} GLOBAL_ASM( glabel func0f19c1cc diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index f998a21a4..68a1e1a32 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -30791,16 +30791,7 @@ u32 var800acc90 = 0; u32 var800acc94 = 0; u32 var800acc98 = 0; u32 var800acc9c = 0; -u32 var800acca0 = 0; -u32 var800acca4 = 0; -u32 var800acca8 = 0; -u32 var800accac = 0; -u32 var800accb0 = 0; -u32 var800accb4 = 0; -u32 var800accb8 = 0; -u32 var800accbc = 0; -u32 var800accc0 = 0; -u32 var800accc4 = 0; +u8 var800acca0[40] = {0}; u8 g_MpChallengesCompleted[4] = {0}; // This is one *byte* per option, and length is unknown u32 var800acccc = 0; u32 var800accd0 = 0; diff --git a/src/include/game/game_1999b0.h b/src/include/game/game_1999b0.h index 0b3735bde..138f7172f 100644 --- a/src/include/game/game_1999b0.h +++ b/src/include/game/game_1999b0.h @@ -42,7 +42,7 @@ u32 func0f19bb50(void); u32 func0f19bb98(void); u32 func0f19bd4c(void); u32 func0f19bfa0(void); -u32 func0f19c190(void); +void func0f19c190(void); u32 func0f19c1cc(void); s32 func0f19c220(void); void mpCalculateVar800884b4(void); diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 54750b722..0aa3520e1 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -857,7 +857,7 @@ extern u32 var800acc28; extern u32 var800acc70; extern u32 var800acc74; extern u32 var800acc80; -extern u32 var800acca0; +extern u8 var800acca0[40]; extern u8 g_MpChallengesCompleted[]; extern u32 var800acd20; extern u32 var800ad158;