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 ddaa852..0000000 Binary files a/expected_objs/sub_4D648.o and /dev/null differ 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;