diff options
| author | Logan <log.butt@gmail.com> | 2016-05-30 00:54:10 +1200 |
|---|---|---|
| committer | einstein95 <einstein95@users.noreply.github.com> | 2016-07-19 05:17:48 +1200 |
| commit | cef6459db617ad0863c856831ebcb9d745c43ddf (patch) | |
| tree | 41e4e1907916a5b2cb886f31cad87a6cfe02b9fb /engine | |
| parent | a27aad0f2c98e3e1d5faf7468f9d3858c16c2d3a (diff) | |
Merge branch 'master' of https://github.com/einstein95/pokered
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/oak_speech2.asm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 962c2a30..2e54fcb6 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -244,26 +244,25 @@ GetDefaultName: jp CopyData IF DEF(_RED) -<<<<<<< 25c27785aa83a12330ea58e1e35b2fec90dd84f4 DefaultNamesPlayerList: - db "NEW NAME@" + db "NOM:@" db "RED@" db "SACHA@" db "PAUL@" DefaultNamesRivalList: - db "NEW NAME@" + db "NOM:@" db "BLUE@" db "REGIS@" db "JEAN@" ENDC IF DEF(_BLUE) DefaultNamesPlayerList: - db "NEW NAME@" + db "NOM:@" db "BLUE@" db "REGIS@" db "JEAN@" DefaultNamesRivalList: - db "NEW NAME@" + db "NOM:@" db "RED@" db "SACHA@" db "PAUL@" |