From 10052a8ad980bcc8ce41f2ef8d01881a6679fece Mon Sep 17 00:00:00 2001 From: Alejandro Javier Asenjo Nitti Date: Tue, 17 Oct 2023 08:25:31 -0300 Subject: [PATCH] decompile func_801924A8_DFF1E8 --- src/overlays/segment_DF4260/DF4260.h | 3 --- src/overlays/segment_DF4260/DFEE30.c | 17 +++++++++++++++-- src/overlays/segment_DF4260/DFEE30.h | 22 ++++++++++++++++++++++ 3 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 src/overlays/segment_DF4260/DFEE30.h diff --git a/src/overlays/segment_DF4260/DF4260.h b/src/overlays/segment_DF4260/DF4260.h index fd6d6e2a..52193157 100644 --- a/src/overlays/segment_DF4260/DF4260.h +++ b/src/overlays/segment_DF4260/DF4260.h @@ -17,7 +17,4 @@ typedef struct { void func_8007C120(s32, s32, s32, f32, f32, f32, f32, s32); -extern s8 D_80177A98; -extern s8 D_80177AB0; - #endif \ No newline at end of file diff --git a/src/overlays/segment_DF4260/DFEE30.c b/src/overlays/segment_DF4260/DFEE30.c index e37357e2..7cb927b4 100644 --- a/src/overlays/segment_DF4260/DFEE30.c +++ b/src/overlays/segment_DF4260/DFEE30.c @@ -1,4 +1,5 @@ -#include "common.h" +#include "global.h" +#include "DFEE30.h" #pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/segment_DF4260/DFEE30/func_801920F0_DFEE30.s") @@ -10,7 +11,19 @@ #pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/segment_DF4260/DFEE30/func_8019243C_DFF17C.s") -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/segment_DF4260/DFEE30/func_801924A8_DFF1E8.s") +void func_801924A8_DFF1E8(UnkStruct_func_801924A8_DFF1E8* arg0) { + switch (arg0->unk48) { + case 0: + if (D_80178280->unk7C < arg0->unkC) { + D_80177AB0 = 0; + D_80177A98 = 0; + arg0->unk48++; + } + + case 1: + return; + } +} #pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/segment_DF4260/DFEE30/func_8019250C_DFF24C.s") diff --git a/src/overlays/segment_DF4260/DFEE30.h b/src/overlays/segment_DF4260/DFEE30.h new file mode 100644 index 00000000..7607ac14 --- /dev/null +++ b/src/overlays/segment_DF4260/DFEE30.h @@ -0,0 +1,22 @@ +#ifndef OVL_DFEE30_H +#define OVL_DFEE30_H + +#include "global.h" + +typedef struct { + /* 0x00 */ char pad_0[0xC]; + /* 0x0C */ f32 unkC; + /* 0x10 */ char pad_10[0x38]; + /* 0x48 */ s32 unk48; +} UnkStruct_func_801924A8_DFF1E8; + +typedef struct { + /* 0x00 */ char pad_0[0x7C]; + /* 0x7C */ f32 unk7C; +} UnkStruct_D_80178280; + +extern s8 D_80177A98; +extern s8 D_80177AB0; +extern UnkStruct_D_80178280* D_80178280; + +#endif \ No newline at end of file