diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | asm/pokedex.s (renamed from asm/rom5_part2.s) | 0 | ||||
| -rw-r--r-- | ld_script.txt | 2 |
3 files changed, 2 insertions, 2 deletions
@@ -46,7 +46,7 @@ compare_sapphire compare_sapphire_rev1 compare_sapphire_rev2 C_SRCS := $(wildcard src/*.c) C_OBJS := $(C_SRCS:%.c=%.o) -ASM_OBJS := asm/crt0.o asm/rom3.o asm/rom_8040EB4.o asm/rom4.o asm/rom_8074BAC.o asm/rom5.o asm/rom5_part2.o asm/rom6.o\ +ASM_OBJS := asm/crt0.o asm/rom3.o asm/rom_8040EB4.o asm/rom4.o asm/rom_8074BAC.o asm/rom5.o asm/pokedex.o asm/rom6.o\ asm/libgcnmultiboot.o asm/m4a_1.o asm/m4a_3.o asm/libagbsyscall.o \ asm/tileset.o asm/rom_8065394.o asm/rom_803D1FC.o asm/calculate_base_damage.o \ asm/rom_813BA94.o asm/rom_81258BC.o asm/mystery_event_script.o \ diff --git a/asm/rom5_part2.s b/asm/pokedex.s index acc4a5309..acc4a5309 100644 --- a/asm/rom5_part2.s +++ b/asm/pokedex.s diff --git a/ld_script.txt b/ld_script.txt index 35295ee59..d3509a3af 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -85,7 +85,7 @@ SECTIONS { asm/rom_80859BC.o(.text); src/option_menu.o(.text); src/pokedex.o(.text); - asm/rom5_part2.o(.text); + asm/pokedex.o(.text); asm/trainer_card.o(.text); asm/save_menu_util.o(.text); asm/rom_8094928.o(.text); |