summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-10-17 18:51:59 -0700
committerYamaArashi <shadow962@live.com>2016-10-17 18:51:59 -0700
commit3d23a0c3cc6a08228a477786f5d28f484e62c403 (patch)
tree6bec4b63c29ab57d2f8073022d01feb126b156e8
parent1842cb4c1919378907cdefbeb0053a098354aa05 (diff)
rename rom_8072DF8.s to tileset.s
-rw-r--r--Makefile2
-rw-r--r--asm/tileset.s (renamed from asm/rom_8072DF8.s)0
-rw-r--r--ld_script.txt2
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 08d283a99..c38f0b0f6 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ 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/libgcnmultiboot.o asm/m4a_1.o asm/m4a_3.o asm/libagbsyscall.o \
-asm/rom_8072DF8.o asm/rom_8065394.o asm/rom_803D1FC.o asm/rom_803BA2C.o \
+asm/tileset.o asm/rom_8065394.o asm/rom_803D1FC.o asm/rom_803BA2C.o \
asm/rom_813BA94.o asm/rom_81258BC.o asm/mystery_event_script.o \
asm/field_effect_helpers.o asm/contest_ai.o asm/berry.o asm/rom_80B5054.o \
asm/party_menu.o asm/rom_806D7F8.o
diff --git a/asm/rom_8072DF8.s b/asm/tileset.s
index fe3a73559..fe3a73559 100644
--- a/asm/rom_8072DF8.s
+++ b/asm/tileset.s
diff --git a/ld_script.txt b/ld_script.txt
index 0caccfded..9cbed71a7 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -69,7 +69,7 @@ SECTIONS {
asm/rom_806D7F8.o(.text);
src/start_menu.o(.text);
src/menu.o(.text);
- asm/rom_8072DF8.o(.text);
+ asm/tileset.o(.text);
src/palette.o(.text);
src/sound.o(.text);
asm/rom_8074BAC.o(.text);