diff options
| author | YamaArashi <shadow962@live.com> | 2015-07-14 19:46:52 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-07-14 19:46:52 -0700 |
| commit | 07dd7056372288de7bb5b64f9416d741adb3b499 (patch) | |
| tree | cc71b691c53fcbbc915b20cd1baf6a4960fded64 /engine/battle | |
| parent | a0ed5bd4aa28745d4d3a47471636d2b9f4235b67 (diff) | |
hall of fame / credits
Diffstat (limited to 'engine/battle')
| -rwxr-xr-x | engine/battle/animations.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 32f98f19..9f725cc9 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -1973,7 +1973,7 @@ AnimationWavyScreen: ; 79666 (1e:5666) push hl .asm_79680 call Func_796ae - ld a, [$ff44] + ld a, [rLY] cp e jr nz, .asm_79680 pop hl diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 5ef94998..9535a8c5 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6856,7 +6856,7 @@ DetermineWildOpponent: ; 3ef23 (f:6f23) InitBattleCommon: ; 3ef3d (f:6f3d) ld a, [wMapPalOffset] push af - ld hl, wd358 + ld hl, wLetterPrintingDelayFlags ld a, [hl] push af res 1, [hl] @@ -6963,7 +6963,7 @@ InitBattle_Common: ; 3efeb (f:6feb) call StartBattle callab EndOfBattle pop af - ld [wd358], a + ld [wLetterPrintingDelayFlags], a pop af ld [wMapPalOffset], a ld a, [wd0d4] |