summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2020-01-14 20:57:31 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2020-01-14 20:57:31 -0500
commit69994e89ca0baf69cd43d5df10560300150654f7 (patch)
treef4c186a5349e3264a5d6f981b92d97ed919d7a33
parent87302a21033e6f41d0007d962b37fb16cca995df (diff)
Rename files: link_rfu_3 --> union_room, link_rfu_4 --> link_rfu_3
-rw-r--r--asm/union_room.s (renamed from asm/link_rfu_3.s)0
-rw-r--r--data/union_room.s (renamed from data/link_rfu_3.s)0
-rw-r--r--ld_script.txt8
-rw-r--r--src/link_rfu_3.c (renamed from src/link_rfu_4.c)0
-rw-r--r--sym_bss.txt2
-rw-r--r--sym_ewram.txt2
6 files changed, 6 insertions, 6 deletions
diff --git a/asm/link_rfu_3.s b/asm/union_room.s
index e054a98ad..e054a98ad 100644
--- a/asm/link_rfu_3.s
+++ b/asm/union_room.s
diff --git a/data/link_rfu_3.s b/data/union_room.s
index 6cd65b04d..6cd65b04d 100644
--- a/data/link_rfu_3.s
+++ b/data/union_room.s
diff --git a/ld_script.txt b/ld_script.txt
index 1a4749d0f..25f4608ea 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -226,7 +226,7 @@ SECTIONS {
src/save_menu_util.o(.text);
src/map_preview_screen.o(.text);
src/link_rfu_2.o(.text);
- src/link_rfu_4.o(.text);
+ src/link_rfu_3.o(.text);
src/link_rfu.o(.text);
asm/easy_chat_2.o(.text);
src/pokedex_screen.o(.text);
@@ -241,7 +241,7 @@ SECTIONS {
src/mailbox_pc.o(.text);
src/menu.o(.text);
src/quest_log.o(.text);
- asm/link_rfu_3.o(.text);
+ asm/union_room.o(.text);
asm/pokemon_special_anim.o(.text);
src/party_menu.o(.text);
asm/union_room_chat.o(.text);
@@ -511,7 +511,7 @@ SECTIONS {
data/box_party_pokemon_dropdown.o(.rodata);
src/map_preview_screen.o(.rodata);
src/link_rfu_2.o(.rodata);
- src/link_rfu_4.o(.rodata);
+ src/link_rfu_3.o(.rodata);
data/easy_chat_2.o(.rodata);
src/pokedex_screen.o(.rodata);
data/pokedex_screen.o(.rodata);
@@ -526,7 +526,7 @@ SECTIONS {
data/decorations.o(.rodata);
src/menu.o(.rodata);
src/quest_log.o(.rodata);
- data/link_rfu_3.o(.rodata);
+ data/union_room.o(.rodata);
data/pokemon_special_anim.o(.rodata);
src/party_menu.o(.rodata);
data/union_room_chat.o(.rodata);
diff --git a/src/link_rfu_4.c b/src/link_rfu_3.c
index 01f19d817..01f19d817 100644
--- a/src/link_rfu_4.c
+++ b/src/link_rfu_3.c
diff --git a/sym_bss.txt b/sym_bss.txt
index 059233848..16c5758fc 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -73,7 +73,7 @@ gUnknown_3000FE8: @ 3000FE8
.align 2
.include "src/link_rfu_2.o"
.align 2
- .include "src/link_rfu_4.o"
+ .include "src/link_rfu_3.o"
.align 2
.include "src/quest_log.o"
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 1171ba918..140915655 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -332,7 +332,7 @@ gUnknown_203ABE8: @ 203ABE8
.align 2
.include "src/link_rfu_2.o"
.align 2
- .include "src/link_rfu_4.o"
+ .include "src/link_rfu_3.o"
.align 2
gUnknown_203ACE8: @ 203ACE8