From 9ad2f7f0e158eefebec6681453d3670cf5a3bd72 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Fri, 15 Aug 2025 08:56:27 -0500
Subject: [PATCH] sub_4D648

---
 asm/rom_4CEA8.s           |  58 --------------------------------------
 expected_objs/sub_4D648.o | Bin 1124 -> 0 bytes
 src/rom_4E598.c           |  15 ++++++++++
 3 files changed, 15 insertions(+), 58 deletions(-)
 delete mode 100644 expected_objs/sub_4D648.o

diff --git a/asm/rom_4CEA8.s b/asm/rom_4CEA8.s
index 650fc4c..6a114ed 100644
--- a/asm/rom_4CEA8.s
+++ b/asm/rom_4CEA8.s
@@ -914,61 +914,3 @@ _0804D638: .4byte 0x040000D4
 _0804D63C: .4byte gUnknown_081C0064
 _0804D640: .4byte 0x05000180
 _0804D644: .4byte 0x80000010
-
-	thumb_func_start sub_4D648
-sub_4D648: @ 0x0804D648
-	push {r4, r5, r6, lr}
-	ldr r2, _0804D6A0 @ =gCurrentPinballGame
-	ldr r0, [r2]
-	movs r1, #0xa5
-	lsls r1, r1, #2
-	adds r0, r0, r1
-	movs r1, #0
-	strb r1, [r0]
-	ldr r0, [r2]
-	ldr r2, _0804D6A4 @ =0x00000296
-	adds r0, r0, r2
-	strh r1, [r0]
-	ldr r6, _0804D6A8 @ =gUnknown_03005EC0
-	ldr r0, _0804D6AC @ =0xFFFFFD40
-	adds r3, r6, r0
-	ldr r5, _0804D6B0 @ =0x00000179
-	subs r2, #0x97
-	ldr r4, _0804D6B4 @ =0x00000199
-_0804D66C:
-	lsls r0, r1, #0x10
-	asrs r0, r0, #0x10
-	adds r1, r0, r5
-	lsls r1, r1, #1
-	adds r1, r1, r3
-	strh r2, [r1]
-	adds r1, r0, r4
-	lsls r1, r1, #1
-	adds r1, r1, r3
-	strh r2, [r1]
-	adds r0, #1
-	lsls r0, r0, #0x10
-	lsrs r1, r0, #0x10
-	asrs r0, r0, #0x10
-	cmp r0, #3
-	ble _0804D66C
-	ldr r1, _0804D6B8 @ =0x040000D4
-	str r6, [r1]
-	ldr r0, _0804D6BC @ =0x060022C0
-	str r0, [r1, #4]
-	ldr r0, _0804D6C0 @ =0x80000040
-	str r0, [r1, #8]
-	ldr r0, [r1, #8]
-	pop {r4, r5, r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804D6A0: .4byte gCurrentPinballGame
-_0804D6A4: .4byte 0x00000296
-_0804D6A8: .4byte gUnknown_03005EC0
-_0804D6AC: .4byte 0xFFFFFD40
-_0804D6B0: .4byte 0x00000179
-_0804D6B4: .4byte 0x00000199
-_0804D6B8: .4byte 0x040000D4
-_0804D6BC: .4byte 0x060022C0
-_0804D6C0: .4byte 0x80000040
diff --git a/expected_objs/sub_4D648.o b/expected_objs/sub_4D648.o
deleted file mode 100644
index ddaa852b68ca847686ebed75262e0b7261d27116..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1124
zcmaizO=}ZT6o${umr0P4jx9u7XiJ2EG7L1P!PO*bZ4w$0so+9PX2{S9O=Fn3p)Ckz
z+5Q1VT)T7O#$6U}-MMh<Z}1N&^*u@M^tKB<;p9B;z3=_Z&71ArM?wfvA*e_fis*N2
z){`vFN|7>@rqP$xR?h#pc1Cud*2F018?8xROqL%Tjg7p~e)rJWO($rjdb3I2^4W<{
z)uM#BPAl=^ub<iGQa9UZAWyre{%9(uw8Klhov%mspY!t*Y~(%i2T|hdI;Cu)N%b~N
zj_0_2605*u^=W%^Z>!y;R4gqr`qt5VIpUX2Mij?Kk2oc+I0RaVo<}A@OW+rp&V##}
zUI+IyeIM*=x(ps@+6EUi-2#s^y$6<>ehEI-G|#Q?FX{rsDM<&Y>QW5QSTp3nXIC^8
zBz3HcRoW_7t%ynyRU)b@sztt9<SSqFMk8ubTiv2UkHWFr!7`-^?bpXa;0@)I{?K&>
zgB|D4qy1;YgW;>AVaM9AtOwf|GCOC?nBRBo1~zVnCx_B;QDrc%zM{Yzn9@6zWcD2C
zkm-gYnRqLvBW2Kc$I=V6lm8p}$?+Yg7B>Dbyk0ODej^;WkQt<n<oJZQ%y-P=cs%>k
z$h!-zUf*YEJ=E`Y4~^{qpAT2Vo{^e^=ewf>s+y1M;_o%<{f=)Njn`0@k-WbglFy*l
Y1X2!zJ}@jo&BtSO-xNMunNXGQFA33b)&Kwi

diff --git a/src/rom_4E598.c b/src/rom_4E598.c
index df6d6fe..795d6d6 100644
--- a/src/rom_4E598.c
+++ b/src/rom_4E598.c
@@ -4,6 +4,21 @@
 #include "constants/bg_music.h"
 
 
+void sub_4D648(void)
+{
+    s16 i;
+
+    gCurrentPinballGame->unk294 = 0;
+    gCurrentPinballGame->eventTimer = 0;
+    for (i = 0; i < 4; i++)
+    {
+        gUnknown_03005C00[0x179 + i] = 0x1FF;
+        gUnknown_03005C00[0x199 + i] = 0x1FF;
+    }
+
+    DmaCopy16(3, &gUnknown_03005C00[0x160], (void *)0x060022C0, 0x80);
+}
+
 void AllBoardProcess_2A_4D6C4(void)
 {
     s16 var0;