From f4018f9d2a26c4bc12671fa05c48def62e17f2f1 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sat, 15 Jul 2023 20:47:28 -0400 Subject: [PATCH] Matched overlay 34 --- asm/include/overlay_34.inc | 2 +- asm/overlay_34.s | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/asm/include/overlay_34.inc b/asm/include/overlay_34.inc index 7fe1083d..30161016 100644 --- a/asm/include/overlay_34.inc +++ b/asm/include/overlay_34.inc @@ -55,7 +55,7 @@ .public sub_02034710 .public sub_0202AABC .public sub_02003990 -.public sub_0200BA08 +.public sub_0200BC54 .public sub_02017B70 .public IsDBoxActive .public sub_020039E4 diff --git a/asm/overlay_34.s b/asm/overlay_34.s index 4c302656..8fdecefe 100644 --- a/asm/overlay_34.s +++ b/asm/overlay_34.s @@ -664,7 +664,7 @@ ov34_022DCA70: ; 0x022DCA70 b _022DCAC4 _022DCAB4: ldr r0, _022DCB5C ; =0x022DD104 - bl sub_0200BA08 + bl sub_0200BC54 cmp r0, #0 movne r4, #0 _022DCAC4: @@ -684,7 +684,7 @@ _022DCAC4: b _022DCB0C _022DCAFC: ldr r0, _022DCB60 ; =0x022DD0C0 - bl sub_0200BA08 + bl sub_0200BC54 cmp r0, #0 movne r4, #0 _022DCB0C: @@ -698,12 +698,12 @@ _022DCB0C: ldmia sp!, {r4, pc} _022DCB2C: ldr r0, _022DCB5C ; =0x022DD104 - bl sub_0200BA08 + bl sub_0200BC54 ldr r0, _022DCB5C ; =0x022DD104 ldrsh r0, [r0, #0x14] bl ov34_022DCB64 ldr r0, _022DCB60 ; =0x022DD0C0 - bl sub_0200BA08 + bl sub_0200BC54 ldr r0, _022DCB60 ; =0x022DD0C0 ldrsh r0, [r0, #0x14] bl ov34_022DCB98