diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-19 03:52:20 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-19 03:52:20 -0500 |
| commit | 64b4cf624fe2175e2c7539b91bc41b6dae28a00e (patch) | |
| tree | 971ea955f5d40af7612f7b69029b49db98064690 /engine/oak_speech.asm | |
| parent | ea9cc86949cecc3508aeac06b807372b6b0134d8 (diff) | |
| parent | d0526c036210d2ee186a2a45feac91747ef6fb85 (diff) | |
Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts:
engine/evos_moves.asm
engine/overworld/healing_machine.asm
Diffstat (limited to 'engine/oak_speech.asm')
| -rwxr-xr-x | engine/oak_speech.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index 62b054df..be84b99d 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -19,9 +19,9 @@ SetDefaultNames: ; 60ca (1:60ca) ld [W_OPTIONS], a pop af ld [wLetterPrintingDelayFlags], a - ld a, [wd08a] + ld a, [wOptionsInitialized] and a - call z, Func_5bff + call z, InitOptions ld hl, NintenText ld de, wPlayerName ld bc, $b |