Add data/text/

This commit is contained in:
Rangi 2018-01-22 17:33:52 -05:00
parent cb5e3378de
commit f44b7ad5c3
23 changed files with 28 additions and 28 deletions

View File

@ -16,7 +16,7 @@ audio.o \
home.o \
main.o \
wram.o \
data/common_text/common_text.o \
data/text/common_text.o \
data/maps/maps.o \
data/pokemon/dex_entries.o \
data/pokemon/egg_moves.o \

View File

@ -12,7 +12,7 @@
; - AlphabeticalPokedexOrder (see data/pokemon/dex_order_alpha.asm)
; - EZChat_SortedPokemon (see data/pokemon/ezchat_order.asm)
; - NewPokedexOrder (see data/pokemon/dex_order_new.asm)
; - Pokered_MonIndices (see data/pokemon/rby_order.asm)
; - Pokered_MonIndices (see data/pokemon/gen1_order.asm)
; - AnimationPointers (see gfx/pokemon/anim_pointers.asm)
; - AnimationIdlePointers (see gfx/pokemon/idle_pointers.asm)
; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm)

View File

@ -1,16 +0,0 @@
INCLUDE "constants.asm"
SECTION "Text 1", ROMX
INCLUDE "data/common_text/common_text_1.asm"
SECTION "Text 2", ROMX
INCLUDE "data/common_text/common_text_2.asm"
SECTION "Text 3", ROMX
INCLUDE "data/common_text/common_text_3.asm"

16
data/text/common_text.asm Normal file
View File

@ -0,0 +1,16 @@
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"

View File

@ -771,7 +771,7 @@ NamingScreen_AdvanceCursor_CheckEndOfString: ; 11b27
; 11b56
INCLUDE "data/unused/dakutens.asm"
INCLUDE "data/text/unused_dakutens.asm"
; 11bbc
@ -945,7 +945,7 @@ NamingScreenGFX_Cursor: ; 11cc7
INCBIN "gfx/naming_screen/cursor.2bpp"
; 11ce7
INCLUDE "data/name_input_chars.asm"
INCLUDE "data/text/name_input_chars.asm"
; 11e5d
NamingScreenGFX_End: ; unused
@ -1462,6 +1462,6 @@ MailComposition_TryAddLastCharacter: ; 121ac (4:61ac)
; 121dd
INCLUDE "data/mail_input_chars.asm"
INCLUDE "data/text/mail_input_chars.asm"
; 122c1

View File

@ -18,4 +18,4 @@ Unreferenced_GetGen1TrainerClassName: ; 50a28
jr nz, .copy
ret
INCLUDE "data/unused/gen_1_trainer_names.asm"
INCLUDE "data/text/unused_gen1_trainer_names.asm"

View File

@ -144,4 +144,4 @@ PlaceTradePartnerNamesAndParty: ; fb60d
jr .loop
; fb656
INCLUDE "data/pokemon/rby_base_special.asm"
INCLUDE "data/pokemon/gen1_base_special.asm"

Some files were not shown because too many files have changed in this diff Show More