From cbcad3b5032b48feffbb16468df5d993ddb61c17 Mon Sep 17 00:00:00 2001 From: Alejandro Javier Asenjo Nitti Date: Wed, 18 Oct 2023 09:35:05 -0300 Subject: [PATCH] func_800863C8 --- .vscode/settings.json | 1 + include/hud.h | 9 ++++--- src/main/hud.c | 60 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 65 insertions(+), 5 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 7d4875a4..a555a30f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -17,5 +17,6 @@ "_LANGUAGE_C" // For gbi.h ], "files.associations": { + "hud.h": "c" }, } \ No newline at end of file diff --git a/include/hud.h b/include/hud.h index 57f64b16..3f122e4f 100644 --- a/include/hud.h +++ b/include/hud.h @@ -37,10 +37,10 @@ void func_8008E5E8(void); void func_8008E620(void); void func_80090E8C(void); void func_800910C0(void); -void func_8009C320(s32*, s32*, s32*, s32, s32, f32, f32, f32, f32); -void func_8009D0BC(s32*, void*, void*, u32, u32, f32, f32, f32, f32); -void func_8009D994(s32*, s32*, s32, s32, f32, f32, f32, f32); -void func_8009E1E8(s32*, s32*, s32, s32, f32, f32, f32, f32); +void func_8009C320(Gfx*, s32*, s32*, s32, s32, f32, f32, f32, f32); +void func_8009D0BC(Gfx*, void*, void*, u32, u32, f32, f32, f32, f32); +void func_8009D994(Gfx*, s32*, s32, s32, f32, f32, f32, f32); +void func_8009E1E8(Gfx*, s32*, s32, s32, f32, f32, f32, f32); // Weird addresses, assets maybe? extern s32 D_1000E80; @@ -79,6 +79,7 @@ extern s32 D_80177B48; extern s32 D_80177B50[]; extern s32 D_80177B70[]; extern s32 D_80177E7C; +extern s32 D_80178234; extern s32 D_80178750; #endif diff --git a/src/main/hud.c b/src/main/hud.c index 2dda830a..c0cd7fca 100644 --- a/src/main/hud.c +++ b/src/main/hud.c @@ -65,7 +65,65 @@ void func_80085740(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { #pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80086110.s") -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_800863C8.s") +s32 func_800863C8(void) { + s32 var_v1 = 0; + + switch (D_80178234) { + case 10: + var_v1++; + + case 9: + var_v1++; + + case 19: + var_v1++; + + case 6: + var_v1++; + + case 3: + var_v1++; + + case 17: + var_v1++; + + case 18: + var_v1++; + + case 11: + var_v1++; + + case 12: + var_v1++; + + case 8: + var_v1++; + + case 7: + var_v1++; + + case 2: + var_v1++; + + case 13: + var_v1++; + + case 16: + var_v1++; + + case 14: + var_v1++; + + case 5: + var_v1++; + + case 1: + var_v1++; + case 0: + break; + } + return var_v1; +} #pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80086444.s")