diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | data/text/battle.asm (renamed from data/text/battle_text.asm) | 0 | ||||
| -rw-r--r-- | data/text/common.asm | 16 | ||||
| -rw-r--r-- | data/text/common_1.asm (renamed from data/text/common_text_1.asm) | 0 | ||||
| -rw-r--r-- | data/text/common_2.asm (renamed from data/text/common_text_2.asm) | 0 | ||||
| -rw-r--r-- | data/text/common_3.asm (renamed from data/text/common_text_3.asm) | 0 | ||||
| -rw-r--r-- | data/text/common_text.asm | 16 | ||||
| -rw-r--r-- | data/text/unused_sweet_honey.asm (renamed from data/text/unused_sweet_honey_text.asm) | 0 | ||||
| -rw-r--r-- | main.asm | 4 | ||||
| -rw-r--r-- | maps/GoldenrodNameRater.asm | 2 | ||||
| -rw-r--r-- | pokecrystal.link | 2 |
11 files changed, 21 insertions, 21 deletions
@@ -16,7 +16,7 @@ audio.o \ home.o \ main.o \ wram.o \ -data/text/common_text.o \ +data/text/common.o \ data/maps/maps.o \ data/pokemon/dex_entries.o \ data/pokemon/egg_moves.o \ diff --git a/data/text/battle_text.asm b/data/text/battle.asm index eaff02017..eaff02017 100644 --- a/data/text/battle_text.asm +++ b/data/text/battle.asm diff --git a/data/text/common.asm b/data/text/common.asm new file mode 100644 index 000000000..d1fbb8b1a --- /dev/null +++ b/data/text/common.asm @@ -0,0 +1,16 @@ +INCLUDE "constants.asm" + + +SECTION "Text 1", ROMX + +INCLUDE "data/text/common_1.asm" + + +SECTION "Text 2", ROMX + +INCLUDE "data/text/common_2.asm" + + +SECTION "Text 3", ROMX + +INCLUDE "data/text/common_3.asm" diff --git a/data/text/common_text_1.asm b/data/text/common_1.asm index 38007bc43..38007bc43 100644 --- a/data/text/common_text_1.asm +++ b/data/text/common_1.asm diff --git a/data/text/common_text_2.asm b/data/text/common_2.asm index aaf14cc48..aaf14cc48 100644 --- a/data/text/common_text_2.asm +++ b/data/text/common_2.asm diff --git a/data/text/common_text_3.asm b/data/text/common_3.asm index a04432637..a04432637 100644 --- a/data/text/common_text_3.asm +++ b/data/text/common_3.asm diff --git a/data/text/common_text.asm b/data/text/common_text.asm deleted file mode 100644 index 72ef91fea..000000000 --- a/data/text/common_text.asm +++ /dev/null @@ -1,16 +0,0 @@ -INCLUDE "constants.asm" - - -SECTION "Text 1", ROMX - -INCLUDE "data/text/common_text_1.asm" - - -SECTION "Text 2", ROMX - -INCLUDE "data/text/common_text_2.asm" - - -SECTION "Text 3", ROMX - -INCLUDE "data/text/common_text_3.asm" diff --git a/data/text/unused_sweet_honey_text.asm b/data/text/unused_sweet_honey.asm index 9bfa4f6b1..9bfa4f6b1 100644 --- a/data/text/unused_sweet_honey_text.asm +++ b/data/text/unused_sweet_honey.asm @@ -279,7 +279,7 @@ SECTION "bank20", ROMX INCLUDE "engine/player_movement.asm" INCLUDE "engine/engine_flags.asm" INCLUDE "engine/variables.asm" -INCLUDE "data/text/battle_text.asm" +INCLUDE "data/text/battle.asm" INCLUDE "engine/debug.asm" @@ -539,7 +539,7 @@ SECTION "Mobile 5F", ROMX INCLUDE "mobile/mobile_5f.asm" -SECTION "Common Text 1", ROMX +SECTION "Phone Text 2", ROMX INCLUDE "data/text/std_text.asm" INCLUDE "data/phone/text/jack_overworld.asm" diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index ebee5d6a5..8e9f0612d 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -22,7 +22,7 @@ GoldenrodNameRaterBookshelf: GoldenrodNameRaterRadio: jumpstd radio2 -INCLUDE "data/text/unused_sweet_honey_text.asm" +INCLUDE "data/text/unused_sweet_honey.asm" GoldenrodNameRater_MapEvents: ; filler diff --git a/pokecrystal.link b/pokecrystal.link index 0cfb54a8b..fc8fbb38a 100644 --- a/pokecrystal.link +++ b/pokecrystal.link @@ -271,7 +271,7 @@ ROMX $6a ROMX $6b "Map Scripts 24" ROMX $6c - "Common Text 1" + "Phone Text 2" "Map Scripts 25" ROMX $6d "Special Phone Text" |