pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

data/text/X_text.asm is redundant

Browse Source
This commit is contained in:
Rangi 2018-01-24 21:27:23 -05:00
parent 8e83eb1b32
commit 518dd46ca1
11 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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 \

0
data/text/battle_text.asm → data/text/battle.asm
View File

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

@ -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"

0
data/text/common_text_1.asm → data/text/common_1.asm
View File

0
data/text/common_text_2.asm → data/text/common_2.asm
View File

0
data/text/common_text_3.asm → data/text/common_3.asm
View File

16
data/text/common_text.asm
View File

@ -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"

0
data/text/unused_sweet_honey_text.asm → data/text/unused_sweet_honey.asm
View File

4
main.asm
View File

@ -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"

2
maps/GoldenrodNameRater.asm
View File

@ -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

2
pokecrystal.link
View File

@ -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"