diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index 6aafe1894..09b00429e 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -466,7 +466,7 @@ void func0f167e7c(s32 stagenum) buffer[2] = 0x020f0100; buffer[3] = 0xcd31100b; osEepromLongWrite(&var80099e78, address, (u8 *)&buffer, 0x10); - var800a316c[2] = 0; + var800a2380[4].unk2be = 0; } } #endif diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index 5cbfe7c2c..573553b48 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -9466,8 +9466,8 @@ glabel func0f11deb8 GLOBAL_ASM( glabel func0f11df38 /* f11df38: 3c03800a */ lui $v1,%hi(var800a2380) -/* f11df3c: 3c06800a */ lui $a2,%hi(var800a2eb0) -/* f11df40: 24c62eb0 */ addiu $a2,$a2,%lo(var800a2eb0) +/* f11df3c: 3c06800a */ lui $a2,%hi(var800a2380+0xb30) +/* f11df40: 24c62eb0 */ addiu $a2,$a2,%lo(var800a2380+0xb30) /* f11df44: 24632380 */ addiu $v1,$v1,%lo(var800a2380) /* f11df48: 24050008 */ addiu $a1,$zero,0x8 /* f11df4c: 24040007 */ addiu $a0,$zero,0x7 @@ -10016,8 +10016,8 @@ glabel var7f1b4fd8 /* f11de64: 010b6024 */ and $t4,$t0,$t3 /* f11de68: 1180000a */ beqz $t4,.L0f11de94 /* f11de6c: 24180007 */ addiu $t8,$zero,0x7 -/* f11de70: 3c0d800a */ lui $t5,%hi(var800a2eb0) -/* f11de74: 25ad2eb0 */ addiu $t5,$t5,%lo(var800a2eb0) +/* f11de70: 3c0d800a */ lui $t5,%hi(var800a2380+0xb30) +/* f11de74: 25ad2eb0 */ addiu $t5,$t5,%lo(var800a2380+0xb30) /* f11de78: 146d0004 */ bne $v1,$t5,.L0f11de8c /* f11de7c: 240f0004 */ addiu $t7,$zero,0x4 /* f11de80: 240e0005 */ addiu $t6,$zero,0x5 @@ -10227,25 +10227,10 @@ glabel var7f1b4fd8 ); #endif -GLOBAL_ASM( -glabel func0f11e3bc -/* f11e3bc: 00047600 */ sll $t6,$a0,0x18 -/* f11e3c0: 000e7e03 */ sra $t7,$t6,0x18 -/* f11e3c4: 000fc080 */ sll $t8,$t7,0x2 -/* f11e3c8: 030fc023 */ subu $t8,$t8,$t7 -/* f11e3cc: 0018c080 */ sll $t8,$t8,0x2 -/* f11e3d0: 030fc023 */ subu $t8,$t8,$t7 -/* f11e3d4: 0018c080 */ sll $t8,$t8,0x2 -/* f11e3d8: 030fc021 */ addu $t8,$t8,$t7 -/* f11e3dc: 0018c080 */ sll $t8,$t8,0x2 -/* f11e3e0: 030fc023 */ subu $t8,$t8,$t7 -/* f11e3e4: 0018c080 */ sll $t8,$t8,0x2 -/* f11e3e8: 3c01800a */ lui $at,%hi(var800a2380+0x8) -/* f11e3ec: 00380821 */ addu $at,$at,$t8 -/* f11e3f0: afa40000 */ sw $a0,0x0($sp) -/* f11e3f4: 03e00008 */ jr $ra -/* f11e3f8: ac202388 */ sw $zero,%lo(var800a2380+0x8)($at) -); +void func0f11e3bc(s8 device) +{ + var800a2380[device].unk008 = 0; +} GLOBAL_ASM( glabel func0f11e3fc diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index b73fece06..df6919464 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -14951,186 +14951,7 @@ u16 *g_CoverNums = NULL; u32 var800a2374 = 0; u32 var800a2378 = 0; u32 var800a237c = 0; -struct var800a2380 var800a2380[4] = {0}; -u32 var800a2eb0 = 0; -u32 var800a2eb4 = 0; -u32 var800a2eb8 = 0; -u32 var800a2ebc = 0; -u32 var800a2ec0 = 0; -u32 var800a2ec4 = 0; -u32 var800a2ec8 = 0; -u32 var800a2ecc = 0; -u32 var800a2ed0 = 0; -u32 var800a2ed4 = 0; -u32 var800a2ed8 = 0; -u32 var800a2edc = 0; -u32 var800a2ee0 = 0; -u32 var800a2ee4 = 0; -u32 var800a2ee8 = 0; -u32 var800a2eec = 0; -u32 var800a2ef0 = 0; -u32 var800a2ef4 = 0; -u32 var800a2ef8 = 0; -u32 var800a2efc = 0; -u32 var800a2f00 = 0; -u32 var800a2f04 = 0; -u32 var800a2f08 = 0; -u32 var800a2f0c = 0; -u32 var800a2f10 = 0; -u32 var800a2f14 = 0; -u32 var800a2f18 = 0; -u32 var800a2f1c = 0; -u32 var800a2f20 = 0; -u32 var800a2f24 = 0; -u32 var800a2f28 = 0; -u32 var800a2f2c = 0; -u32 var800a2f30 = 0; -u32 var800a2f34 = 0; -u32 var800a2f38 = 0; -u32 var800a2f3c = 0; -u32 var800a2f40 = 0; -u32 var800a2f44 = 0; -u32 var800a2f48 = 0; -u32 var800a2f4c = 0; -u32 var800a2f50 = 0; -u32 var800a2f54 = 0; -u32 var800a2f58 = 0; -u32 var800a2f5c = 0; -u32 var800a2f60 = 0; -u32 var800a2f64 = 0; -u32 var800a2f68 = 0; -u32 var800a2f6c = 0; -u32 var800a2f70 = 0; -u32 var800a2f74 = 0; -u32 var800a2f78 = 0; -u32 var800a2f7c = 0; -u32 var800a2f80 = 0; -u32 var800a2f84 = 0; -u32 var800a2f88 = 0; -u32 var800a2f8c = 0; -u32 var800a2f90 = 0; -u32 var800a2f94 = 0; -u32 var800a2f98 = 0; -u32 var800a2f9c = 0; -u32 var800a2fa0 = 0; -u32 var800a2fa4 = 0; -u32 var800a2fa8 = 0; -u32 var800a2fac = 0; -u32 var800a2fb0 = 0; -u32 var800a2fb4 = 0; -u32 var800a2fb8 = 0; -u32 var800a2fbc = 0; -u32 var800a2fc0 = 0; -u32 var800a2fc4 = 0; -u32 var800a2fc8 = 0; -u32 var800a2fcc = 0; -u32 var800a2fd0 = 0; -u32 var800a2fd4 = 0; -u32 var800a2fd8 = 0; -u32 var800a2fdc = 0; -u32 var800a2fe0 = 0; -u32 var800a2fe4 = 0; -u32 var800a2fe8 = 0; -u32 var800a2fec = 0; -u32 var800a2ff0 = 0; -u32 var800a2ff4 = 0; -u32 var800a2ff8 = 0; -u32 var800a2ffc = 0; -u32 var800a3000 = 0; -u32 var800a3004 = 0; -u32 var800a3008 = 0; -u32 var800a300c = 0; -u32 var800a3010 = 0; -u32 var800a3014 = 0; -u32 var800a3018 = 0; -u32 var800a301c = 0; -u32 var800a3020 = 0; -u32 var800a3024 = 0; -u32 var800a3028 = 0; -u32 var800a302c = 0; -u32 var800a3030 = 0; -u32 var800a3034 = 0; -u32 var800a3038 = 0; -u32 var800a303c = 0; -u32 var800a3040 = 0; -u32 var800a3044 = 0; -u32 var800a3048 = 0; -u32 var800a304c = 0; -u32 var800a3050 = 0; -u32 var800a3054 = 0; -u32 var800a3058 = 0; -u32 var800a305c = 0; -u32 var800a3060 = 0; -u32 var800a3064 = 0; -u32 var800a3068 = 0; -u32 var800a306c = 0; -u32 var800a3070 = 0; -u32 var800a3074 = 0; -u32 var800a3078 = 0; -u32 var800a307c = 0; -u32 var800a3080 = 0; -u32 var800a3084 = 0; -u32 var800a3088 = 0; -u32 var800a308c = 0; -u32 var800a3090 = 0; -u32 var800a3094 = 0; -u32 var800a3098 = 0; -u32 var800a309c = 0; -u32 var800a30a0 = 0; -u32 var800a30a4 = 0; -u32 var800a30a8 = 0; -u32 var800a30ac = 0; -u32 var800a30b0 = 0; -u32 var800a30b4 = 0; -u32 var800a30b8 = 0; -u32 var800a30bc = 0; -u32 var800a30c0 = 0; -u32 var800a30c4 = 0; -u32 var800a30c8 = 0; -u32 var800a30cc = 0; -u32 var800a30d0 = 0; -u32 var800a30d4 = 0; -u32 var800a30d8 = 0; -u32 var800a30dc = 0; -u32 var800a30e0 = 0; -u32 var800a30e4 = 0; -u32 var800a30e8 = 0; -u32 var800a30ec = 0; -u32 var800a30f0 = 0; -u32 var800a30f4 = 0; -u32 var800a30f8 = 0; -u32 var800a30fc = 0; -u32 var800a3100 = 0; -u32 var800a3104 = 0; -u32 var800a3108 = 0; -u32 var800a310c = 0; -u32 var800a3110 = 0; -u32 var800a3114 = 0; -u32 var800a3118 = 0; -u32 var800a311c = 0; -u32 var800a3120 = 0; -u32 var800a3124 = 0; -u32 var800a3128 = 0; -u32 var800a312c = 0; -u32 var800a3130 = 0; -u32 var800a3134 = 0; -u32 var800a3138 = 0; -u32 var800a313c = 0; -u32 var800a3140 = 0; -u32 var800a3144 = 0; -u32 var800a3148 = 0; -u32 var800a314c = 0; -u32 var800a3150 = 0; -u32 var800a3154 = 0; -u32 var800a3158 = 0; -u32 var800a315c = 0; -u32 var800a3160 = 0; -u32 var800a3164 = 0; -u32 var800a3168 = 0; -u8 var800a316c[4] = {0, 0, 0, 0}; -u32 var800a3170 = 0; -u32 var800a3174 = 0; -u32 var800a3178 = 0; +struct var800a2380 var800a2380[5] = {0}; u32 var800a317c = 0; struct var800a3180 var800a3180[4] = {0}; u32 var800a3320 = 0; diff --git a/src/include/game/pak/pak.h b/src/include/game/pak/pak.h index e92f42e69..34a811b75 100644 --- a/src/include/game/pak/pak.h +++ b/src/include/game/pak/pak.h @@ -121,7 +121,7 @@ void func0f11deb8(void); void func0f11df38(void); void pakDumpPak(void); void func0f11df94(s8 device); -u32 func0f11e3bc(void); +void func0f11e3bc(s8 device); u32 func0f11e3fc(void); u32 func0f11e478(void); u32 func0f11e4d4(void); diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index dcc99a071..2efd40c37 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -677,9 +677,7 @@ extern s32 *g_CoverRooms; extern u32 var800a2368; extern u16 var800a236c; extern u16 *g_CoverNums; -extern struct var800a2380 var800a2380[4]; -extern u32 var800a2eb0; -extern u8 var800a316c[4]; +extern struct var800a2380 var800a2380[5]; extern struct var800a3180 var800a3180[4]; extern u32 var800a33a0; extern u32 var800a33a4; diff --git a/src/include/types.h b/src/include/types.h index b3b6464da..ee17df65f 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -5149,6 +5149,7 @@ struct var800a2380 { /*0x2bb*/ u8 unk2bb; /*0x2bc*/ u8 unk2bc; /*0x2bd*/ u8 unk2bd; + /*0x2be*/ u8 unk2be; /*0x2c0*/ u32 unk2c0; /*0x2c4*/ u8 *unk2c4; // len 4096 /*0x2c8*/ u32 unk2c8;