diff options
Diffstat (limited to 'engine/oak_speech2.asm')
| -rwxr-xr-x | engine/oak_speech2.asm | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 9d994047..34d98fd7 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -181,7 +181,7 @@ DisplayIntroNameTextBox: ; 6a6c (1:6a6c) .namestring ; 6aa3 (1:6aa3) db "NAME@" -IF _RED +IF DEF(_RED) DefaultNamesPlayer: ; 6aa8 (1:6aa8) db "NEW NAME" next "RED" @@ -197,7 +197,7 @@ DefaultNamesRival: ; 6abe (1:6abe) db "@" ENDC -IF _BLUE +IF DEF(_BLUE) DefaultNamesPlayer: ; 6aa8 (1:6aa8) db "NEW NAME" next "BLUE" @@ -213,6 +213,22 @@ 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 + Func_6ad6: ; 6ad6 (1:6ad6) ld b, a ld c, $0 @@ -234,18 +250,24 @@ Func_6ad6: ; 6ad6 (1:6ad6) ld de, wcd6d ld bc, $14 jp CopyData -IF _RED +IF DEF(_RED) DefaultNamesPlayerList: ; 6af2 (1:6af2) db "NEW NAME@RED@ASH@JACK@" DefaultNamesRivalList: ; 6b08 (1:6b08) db "NEW NAME@BLUE@GARY@JOHN@" ENDC -IF _BLUE +IF DEF(_BLUE) DefaultNamesPlayerList: ; 6af2 (1:6af2) db "NEW NAME@BLUE@GARY@JOHN@" 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 "@" |