diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
| commit | f5983c0f813d3d908b6016db3ed866e4ca9437dc (patch) | |
| tree | d6888723f443557ce45c9a00d873caa5e7a8930e /engine/oak_speech2.asm | |
| parent | Character dict; surfing minigame; printer debug (diff) | |
| parent | More syncing with pokered (diff) | |
| download | pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.tar.gz pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.tar.xz pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.zip | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'engine/oak_speech2.asm')
| -rwxr-xr-x | engine/oak_speech2.asm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 37c998a9..5eeb5ea9 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -226,9 +226,16 @@ GetDefaultName: ; 6858 (1:6858) jp CopyData DefaultNamesPlayerList: ; 687d (1:687d) - db "NEW NAME@YELLOW@ASH@JACK@" + db "NEW NAME@" + db "YELLOW@" + db "ASH@" + db "JACK@" + DefaultNamesRivalList: ; 688d (1:688d) - db "NEW NAME@BLUE@GARY@JOHN@" + db "NEW NAME@" + db "BLUE@" + db "GARY@" + db "JOHN@" TextTerminator_6b20: ; 68a5 (1:68a5) db "@" |