From 2dd434f0b1b3f60bb983929c621f585f3554c7a7 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 3 Jan 2021 19:34:57 +1000 Subject: [PATCH] Attempt to decompile func0f010b20 --- src/game/game_010b20.c | 27 +++++++++++++++++++++++++++ src/gvars/gvars.c | 8 ++------ src/include/gvars/gvars.h | 4 ++-- 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/game/game_010b20.c b/src/game/game_010b20.c index f295af042..2be7f055c 100644 --- a/src/game/game_010b20.c +++ b/src/game/game_010b20.c @@ -554,6 +554,33 @@ glabel func0f010b20 /* f010bac: ac4002b4 */ sw $zero,0x2b4($v0) ); +// Mismatch: Two instructions are swapped +//void func0f010b20(void) +//{ +// s32 i; +// +// var8009d0d0[0] = 0; +// var8009d0d0[1] = 0; +// var8009d0d8 = 0; +// +// for (i = 0; i != ARRAYCOUNT(var8009d0e0); i++) { +// var8009d0e0[i] = 0; +// } +// +// for (i = 0; i < ARRAYCOUNT(var8009d510); i++) { +// var8009d510[i].unk40 = 0; +// } +// +// var80070524 = 0; +// +// for (i = 0; i < ARRAYCOUNT(g_Fireslots); i++) { +// g_Fireslots[i].unk00 = -1; +// } +// +// g_Vars.killcount = 0; +// g_Vars.knockoutcount = 0; +//} + GLOBAL_ASM( glabel func0f010bb0 /* f010bb0: 27bdf820 */ addiu $sp,$sp,-2016 diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index 0e5c2b74f..5c2bd510f 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -14701,14 +14701,10 @@ s32 g_NumTags = 0; struct tag **g_TagPtrs = 0; u32 var8009d0cc = 0; -u32 var8009d0d0 = 0; -u32 var8009d0d4 = 0; +u32 var8009d0d0[2] = {0}; u32 var8009d0d8 = 0; u32 var8009d0dc = 0; -u32 var8009d0e0 = 0; -u32 var8009d0e4 = 0; -u32 var8009d0e8 = 0; -u32 var8009d0ec = 0; +u32 var8009d0e0[4] = {0}; u32 var8009d0f0 = 0; u32 var8009d0f4 = 0; u32 var8009d0f8 = 0; diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 705da0418..3f0c22537 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -593,9 +593,9 @@ extern struct briefingobj *g_BriefingObjs; extern struct criteria_roomentered *g_RoomEnteredCriterias; extern struct criteria_multiroomentered *g_MultiroomEnteredCriterias; extern struct criteria_holograph *g_HolographCriterias; -extern u32 var8009d0d0; +extern u32 var8009d0d0[2]; extern u32 var8009d0d8; -extern u32 var8009d0e0; +extern u32 var8009d0e0[4]; extern u32 var8009d0f0; extern u32 var8009d144; extern struct fireslot g_Fireslots[NUM_FIRESLOTS];