diff --git a/asm/include/overlay_34.inc b/asm/include/overlay_34.inc index 618ff4c2..0368f420 100644 --- a/asm/include/overlay_34.inc +++ b/asm/include/overlay_34.inc @@ -1,9 +1,9 @@ #pragma once -.public Debug_GetDebugFlag .public G3X_Reset .public GetFadeStatus .public HandleMenus .public OVERLAY34_UNKNOWN_POINTER__NA_22DD080 +.public ov34_022DCB64 .public ov34_022DCB98 .public ov34_022DCBCC .public ov34_022DCDCC diff --git a/asm/overlay_34.s b/asm/overlay_34.s index 683fef60..13cfa891 100644 --- a/asm/overlay_34.s +++ b/asm/overlay_34.s @@ -758,21 +758,3 @@ _022DCB58: .word ov34_022DD0B0 _022DCB5C: .word ov34_022DD104 _022DCB60: .word ov34_022DD0C0 arm_func_end ov34_022DCA70 - - arm_func_start ov34_022DCB64 -ov34_022DCB64: ; 0x022DCB64 - stmdb sp!, {r4, lr} - mov r4, r0 - mov r0, #1 - bl Debug_GetDebugFlag - cmp r0, #0 - mov r0, #0 - beq _022DCB8C - mov r1, r0 - bl sub_02008F3C - ldmia sp!, {r4, pc} -_022DCB8C: - mov r1, r4 - bl sub_02008F3C - ldmia sp!, {r4, pc} - arm_func_end ov34_022DCB64 diff --git a/include/overlay_34_022DCB98.h b/include/overlay_34_022DCB98.h index 1edaa63f..66a78870 100644 --- a/include/overlay_34_022DCB98.h +++ b/include/overlay_34_022DCB98.h @@ -1,6 +1,7 @@ #ifndef PMDSKY_OVERLAY_34_022DCB98_H #define PMDSKY_OVERLAY_34_022DCB98_H +void ov34_022DCB64(s32 arg0); void ov34_022DCB98(s32 arg0); #endif //PMDSKY_OVERLAY_34_022DCB98_H diff --git a/src/overlay_34_022DCB98.c b/src/overlay_34_022DCB98.c index 6501f5cc..f536d403 100644 --- a/src/overlay_34_022DCB98.c +++ b/src/overlay_34_022DCB98.c @@ -3,6 +3,15 @@ extern void sub_02008F3C(s32, s32); +void ov34_022DCB64(s32 arg0) +{ + if (Debug_GetDebugFlag(DEBUG_FLAG_NO_SCREEN_FADE) != 0) { + sub_02008F3C(0, 0); + return; + } + sub_02008F3C(0, arg0); +} + void ov34_022DCB98(s32 arg0) { if (Debug_GetDebugFlag(DEBUG_FLAG_NO_SCREEN_FADE) != 0) {