From 0a62d48df2d73c11ca13e4c3015d3d3abfa20292 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jun 2020 17:50:50 -0400 Subject: Move more tables from engine/ to data/ This also splits the end of engine/battle/core.asm into engine/battle/effects.asm. --- engine/oak_speech2.asm | 57 ++------------------------------------------------ 1 file changed, 2 insertions(+), 55 deletions(-) (limited to 'engine/oak_speech2.asm') diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 1258c59b..fdc9ffa3 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -187,37 +187,7 @@ DisplayIntroNameTextBox: .namestring db "NAME@" -IF DEF(_RED) -DefaultNamesPlayer: - db "NEW NAME" - next "RED" - next "ASH" - next "JACK" - db "@" - -DefaultNamesRival: - db "NEW NAME" - next "BLUE" - next "GARY" - next "JOHN" - db "@" -ENDC - -IF DEF(_BLUE) -DefaultNamesPlayer: - db "NEW NAME" - next "BLUE" - next "GARY" - next "JOHN" - db "@" - -DefaultNamesRival: - db "NEW NAME" - next "RED" - next "ASH" - next "JACK" - db "@" -ENDC +INCLUDE "text/player_names.asm" GetDefaultName: ; a = name index @@ -243,30 +213,7 @@ GetDefaultName: ld bc, $14 jp CopyData -IF DEF(_RED) -DefaultNamesPlayerList: - db "NEW NAME@" - db "RED@" - db "ASH@" - db "JACK@" -DefaultNamesRivalList: - db "NEW NAME@" - db "BLUE@" - db "GARY@" - db "JOHN@" -ENDC -IF DEF(_BLUE) -DefaultNamesPlayerList: - db "NEW NAME@" - db "BLUE@" - db "GARY@" - db "JOHN@" -DefaultNamesRivalList: - db "NEW NAME@" - db "RED@" - db "ASH@" - db "JACK@" -ENDC +INCLUDE "text/player_names_list.asm" TextTerminator_6b20: db "@" -- cgit v1.3.1-sl0p