diff --git a/src/game/pad.c b/src/game/pad.c index 427d445c7..eb9074ce6 100644 --- a/src/game/pad.c +++ b/src/game/pad.c @@ -764,11 +764,13 @@ glabel coverLoad // return true; //} +u16 getVar800a236c(void) +{ + return var800a236c; +} + GLOBAL_ASM( -glabel func0f116394 -/* f116394: 3c02800a */ lui $v0,0x800a -/* f116398: 03e00008 */ jr $ra -/* f11639c: 9442236c */ lhu $v0,0x236c($v0) +glabel func0f1163a0 /* f1163a0: 3c02800a */ lui $v0,0x800a /* f1163a4: 8c422370 */ lw $v0,0x2370($v0) /* f1163a8: 27bdffe8 */ addiu $sp,$sp,-24 diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index 3b7a822b7..686eb431e 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -20295,7 +20295,7 @@ u32 var800a235c = 0; u16 *g_CoverFlags = NULL; s32 *g_CoverRooms = NULL; u32 var800a2368 = 0; -u32 var800a236c = 0; +u16 var800a236c = 0; u32 var800a2370 = 0; u32 var800a2374 = 0; u32 var800a2378 = 0; diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index f59086480..5d714a1c5 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -705,7 +705,7 @@ extern u16 *g_PadOffsets; extern u16 *g_CoverFlags; extern s32 *g_CoverRooms; extern u32 var800a2368; -extern u32 var800a236c; +extern u16 var800a236c; extern u32 var800a2370; extern struct var800a2380 var800a2380[4]; extern u32 var800a2eb0;