From 9e42e6d0b9ed491e35a8ffba51a9a9f9ba5f3564 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Wed, 16 Jul 2025 20:39:23 -0400 Subject: [PATCH] Decomped ov31_023833B4 Decomped by anonymous user: https://decomp.me/scratch/tILlP --- ..._31_023833B4.inc => overlay_31_023833D8.inc} | 1 + ...rlay_31_023833B4.s => overlay_31_023833D8.s} | 17 +---------------- include/overlay_31_02383328.h | 1 + main.lsf | 2 +- src/overlay_31_02383328.c | 8 ++++++++ 5 files changed, 12 insertions(+), 17 deletions(-) rename asm/include/{overlay_31_023833B4.inc => overlay_31_023833D8.inc} (99%) rename asm/{overlay_31_023833B4.s => overlay_31_023833D8.s} (99%) diff --git a/asm/include/overlay_31_023833B4.inc b/asm/include/overlay_31_023833D8.inc similarity index 99% rename from asm/include/overlay_31_023833B4.inc rename to asm/include/overlay_31_023833D8.inc index d1439e5c..ff7bf4a2 100644 --- a/asm/include/overlay_31_023833B4.inc +++ b/asm/include/overlay_31_023833D8.inc @@ -217,6 +217,7 @@ .public ov31_023832F0 .public ov31_02383328 .public ov31_0238335C +.public ov31_023833B4 .public ov31_02389F5C .public ov31_0238A044 .public ov31_0238A04C diff --git a/asm/overlay_31_023833B4.s b/asm/overlay_31_023833D8.s similarity index 99% rename from asm/overlay_31_023833B4.s rename to asm/overlay_31_023833D8.s index b186cb50..eb82109f 100644 --- a/asm/overlay_31_023833B4.s +++ b/asm/overlay_31_023833D8.s @@ -1,23 +1,8 @@ .include "asm/macros.inc" - .include "overlay_31_023833B4.inc" + .include "overlay_31_023833D8.inc" .text - arm_func_start ov31_023833B4 -ov31_023833B4: ; 0x023833B4 - stmdb sp!, {r3, lr} - cmp r0, #0 - beq _023833C4 - blx r0 -_023833C4: - ldr r0, _023833D4 ; =OVERLAY31_UNKNOWN_POINTER__NA_238A268 - mov r1, #0 - strb r1, [r0, #1] - ldmia sp!, {r3, pc} - .align 2, 0 -_023833D4: .word OVERLAY31_UNKNOWN_POINTER__NA_238A268 - arm_func_end ov31_023833B4 - ; https://decomp.me/scratch/Q183B arm_func_start ov31_023833D8 ov31_023833D8: ; 0x023833D8 diff --git a/include/overlay_31_02383328.h b/include/overlay_31_02383328.h index c9db3e78..34072203 100644 --- a/include/overlay_31_02383328.h +++ b/include/overlay_31_02383328.h @@ -3,5 +3,6 @@ void ov31_02383328(void (*f)(void)); u32 ov31_0238335C(void (*f)(void)); +void ov31_023833B4(void(*f)(void)); #endif //PMDSKY_OVERLAY_31_02383328_H diff --git a/main.lsf b/main.lsf index 173d6093..2e1b6731 100644 --- a/main.lsf +++ b/main.lsf @@ -573,7 +573,7 @@ Overlay OVY_31 Object src/overlay_31_02382820.o Object asm/overlay_31_02382FBC.o Object src/overlay_31_02383328.o - Object asm/overlay_31_023833B4.o + Object asm/overlay_31_023833D8.o } Overlay OVY_32 { diff --git a/src/overlay_31_02383328.c b/src/overlay_31_02383328.c index b78f241a..6ab34b73 100644 --- a/src/overlay_31_02383328.c +++ b/src/overlay_31_02383328.c @@ -29,3 +29,11 @@ u32 ov31_0238335C(void (*f)(void)) OVERLAY31_UNKNOWN_POINTER__NA_238A268[1] = 0; return 1; } + +void ov31_023833B4(void(*f)(void)) +{ + if (f != NULL) { + f(); + } + OVERLAY31_UNKNOWN_POINTER__NA_238A268[1] = 0; +}