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 a1f5d4a..0000000 Binary files a/expected_objs/nullsub_18.o and /dev/null differ 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) +{ +}