diff options
| -rwxr-xr-x | engine/oak_speech2.asm | 9 | ||||
| -rw-r--r-- | macros.asm | 5 |
2 files changed, 9 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@" @@ -349,6 +349,11 @@ tx_pre_jump: MACRO jp PrintPredefTextID ENDM +sound0x0A: macro + db $11 +endm + + WALK EQU $FE STAY EQU $FF |