From 9686ef500b1d542f4276bf49fee728d7d5ceae85 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Wed, 19 Feb 2025 20:41:32 -0600
Subject: [PATCH] nullsub_18, and remove pinball_game_main.s

---
 asm/pinball_game_main.s    |  13 -------------
 expected_objs/nullsub_18.o | Bin 596 -> 0 bytes
 ld_script.txt              |   1 -
 src/pinball_game_main.c    |   4 ++++
 4 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100644 asm/pinball_game_main.s
 delete mode 100644 expected_objs/nullsub_18.o

diff --git a/asm/pinball_game_main.s b/asm/pinball_game_main.s
deleted file mode 100644
index 0a7ceaf..0000000
--- a/asm/pinball_game_main.s
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "constants/global.h"
-#include "constants/bg_music.h"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start nullsub_18
-nullsub_18: @ 0x0804CEA4
-	bx lr
-
-    .align 2, 0
diff --git a/expected_objs/nullsub_18.o b/expected_objs/nullsub_18.o
deleted file mode 100644
index a1f5d4a542e2101db2e36736aa2ba448f8044b35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 596
zcmah_Jxc^J6r5bVbFcCPtt?a!yg~wkpoPtWo(Nte7Iu>0f(NG@mn>-IU$gWd_;;M=
z?prsFzVLW6$?RmZ@0T|dV+^zmM)+mGR!#aRKY|eotYUHXF&Xc2!<RnHV73YS<J;-!
z-Np18gI-~VT?@5tr_F8vEPCyk0Lzsd<ji7)3$12T&_TjWHJ`^SJRF|^F1|e{A2`#p
zo==KW`I_J!ee!T2MmR=yKBeU>RH=+vlt0N%lVQ-P<R3{cEyerXkQdnIfbp`@*Bx@V
zVE?B(sx=EW5x+epoa!gD`)BXT<s-=}E&0~jL$=;Yh)?#KfTq-MgS@NzB0pCVr|P}|
DqLL;D

diff --git a/ld_script.txt b/ld_script.txt
index 460a679..3cf31ff 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -56,7 +56,6 @@ SECTIONS
         src/rom_31F6C.o(.text);
         asm/rom_3219C.o(.text);
         src/pinball_game_main.o(.text);
-        asm/pinball_game_main.o(.text);
         asm/rom_4CEA8.o(.text);
         src/options.o(.text);
         src/rom_528AC.o(.text);
diff --git a/src/pinball_game_main.c b/src/pinball_game_main.c
index 6855739..a85654a 100644
--- a/src/pinball_game_main.c
+++ b/src/pinball_game_main.c
@@ -2169,3 +2169,7 @@ void sub_4CD60(void)
 
     DmaCopy16(3, gUnknown_084B77EC, (void *)0x6015800, 0x800);
 }
+
+void nullsub_18(void)
+{
+}