diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-12 00:54:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-12 00:54:14 -0700 |
| commit | 2b2c6fefd311101c87845c8c498746dc74bd725f (patch) | |
| tree | 3f917e1bf896e380cfea6d2d876ff68a4db87a57 /engine/oak_speech.asm | |
| parent | a51037eeeedb03e29d8675626018cf02750882fa (diff) | |
| parent | 61ee39678695479816feff4b58baaa6953ff219f (diff) | |
Merge pull request #134 from YamaArashi/master
sync engine code with pokeyellow
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 31c00fd0..f786e3c1 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -6,7 +6,7 @@ SetDefaultNames: ld a, [wd732] push af ld hl, wPlayerName - ld bc, $d8a + ld bc, wBoxDataEnd - wPlayerName xor a call FillMemory ld hl, wSpriteStateData1 @@ -195,7 +195,7 @@ MovePicLeft: ld [rWX],a call DelayFrame - ld a,$E4 + ld a,%11100100 ld [rBGP],a .next call DelayFrame |