From 5947bd9c8575d726c2de770c844e51ee7a6a7426 Mon Sep 17 00:00:00 2001 From: Alejandro Javier Asenjo Nitti Date: Fri, 13 Oct 2023 10:08:45 -0300 Subject: [PATCH] func_80085740 --- include/hud.h | 2 ++ src/main/hud.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/hud.h b/include/hud.h index 351c7e52..0b319278 100644 --- a/include/hud.h +++ b/include/hud.h @@ -43,6 +43,7 @@ void func_8009D994(s32*, s32*, s32, s32, f32, f32, f32, f32); void func_8009E1E8(s32*, s32*, s32, s32, f32, f32, f32, f32); // Weird addresses, assets maybe? +extern s32 D_1000E80; extern s32 D_1002280; extern s32 D_10030D0; extern s32 D_1011280; @@ -61,6 +62,7 @@ extern s32 D_1013170; extern s32 D_1013570; extern s32 D_1013580; extern s32 D_1013700; +extern s32 D_3000B20; extern s32 D_30013E0; extern s32 D_80137E64; diff --git a/src/main/hud.c b/src/main/hud.c index 2573c06f..74e17897 100644 --- a/src/main/hud.c +++ b/src/main/hud.c @@ -46,7 +46,13 @@ void func_800856C0(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { func_80084E78(&D_80137E64, &D_1013580, &D_1013700, 0x30, 0xC, arg0, arg1, arg2, arg3, 48.0f * arg4, 8.0f); } -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80085740.s") +void func_80085740(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { + if (D_801778E8 != 0) { + func_8009D994(&D_80137E64, &D_3000B20, 0x20, 5, arg0, arg1, arg2, arg3); + } else { + func_8009D994(&D_80137E64, &D_1000E80, 0x30, 9, arg0, arg1, arg2, arg3); + } +} #pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_800857DC.s")