From 84cd45b8fc265ccb338592f0b99847ee80598df7 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 2 Nov 2019 22:08:08 +1000 Subject: [PATCH] Decompile func0f19ab40 --- src/game/game_0601b0.c | 24 ++++++++---------------- src/gvars/gvars.c | 2 +- src/include/gvars/gvars.h | 4 ++++ 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index 5d72e35f4..0f6cb7544 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -355972,22 +355972,14 @@ glabel ai0176 /* f19ab3c: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f19ab40 -/* f19ab40: 3c0e8009 */ lui $t6,0x8009 -/* f19ab44: 91ce0af0 */ lbu $t6,0xaf0($t6) -/* f19ab48: 3c018009 */ lui $at,0x8009 -/* f19ab4c: 11c00006 */ beqz $t6,.L0f19ab68 -/* f19ab50: 00000000 */ sll $zero,$zero,0x0 -/* f19ab54: ac200af4 */ sw $zero,0xaf4($at) -/* f19ab58: 3c018009 */ lui $at,0x8009 -/* f19ab5c: ac200af8 */ sw $zero,0xaf8($at) -/* f19ab60: 3c018009 */ lui $at,0x8009 -/* f19ab64: ac200afc */ sw $zero,0xafc($at) -.L0f19ab68: -/* f19ab68: 03e00008 */ jr $ra -/* f19ab6c: 00000000 */ sll $zero,$zero,0x0 -); +void func0f19ab40(void) +{ + if (var80090af0) { + var80090af4 = 0; + var80090af8 = 0; + var80090afc = 0; + } +} GLOBAL_ASM( glabel func0f19ab70 diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index d8bba327b..606590856 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -4143,7 +4143,7 @@ u32 var80090ae0 = 0; u32 var80090ae4 = 0; u32 var80090ae8 = 0; u32 var80090aec = 0; -u32 var80090af0 = 0; +u8 var80090af0 = 0; u32 var80090af4 = 0; u32 var80090af8 = 0; u32 var80090afc = 0; diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 0c7993b24..903c66f34 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -465,6 +465,10 @@ extern struct bootbufferthing var8008de48[3]; extern s32 var8008fa6c; extern s32 var8008fa70; extern s32 var8008fa74; +extern u8 var80090af0; +extern u32 var80090af4; +extern u32 var80090af8; +extern u32 var80090afc; extern u32 var8009cac0; extern u32 var8009cac4; extern u32 var8009de24;