summaryrefslogtreecommitdiff
path: root/engine/oak_speech2.asm
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2016-03-22 00:10:23 -0600
committerIIMarckus <iimarckus@gmail.com>2016-03-22 00:10:23 -0600
commit3fd678769231b76c17e4aab2f306892bd6988dc8 (patch)
tree362b426beaceb3747906caf25d1413cf44e9071a /engine/oak_speech2.asm
parent6057f285ad1a930315d1a45fa3d1aa08efe6801d (diff)
Clean up more Yellow ifdefs.
Diffstat (limited to 'engine/oak_speech2.asm')
-rwxr-xr-xengine/oak_speech2.asm22
1 files changed, 0 insertions, 22 deletions
diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm
index 9b5622b8..61775531 100755
--- a/engine/oak_speech2.asm
+++ b/engine/oak_speech2.asm
@@ -219,22 +219,6 @@ DefaultNamesRival: ; 6abe (1:6abe)
db "@"
ENDC
-IF DEF(_YELLOW)
-DefaultNamesPlayer:
- db "NEW NAME"
- next "YELLOW"
- next "ASH"
- next "JACK"
- db "@"
-
-DefaultNamesRival:
- db "NEW NAME"
- next "BLUE"
- next "GARY"
- next "JOHN"
- db "@"
-ENDC
-
GetDefaultName: ; 6ad6 (1:6ad6)
; a = name index
; hl = name list
@@ -271,12 +255,6 @@ DefaultNamesPlayerList: ; 6af2 (1:6af2)
DefaultNamesRivalList: ; 6b08 (1:6b08)
db "NEW NAME@RED@ASH@JACK@"
ENDC
-IF DEF(_YELLOW)
-DefaultNamesPlayerList:
- db "NEW NAME@YELLOW@ASH@JACK@"
-DefaultNamesRivalList:
- db "NEW NAME@BLUE@GARY@JOHN@"
-ENDC
TextTerminator_6b20: ; 6b20 (1:6b20)
db "@"