diff options
| author | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
| commit | dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad (patch) | |
| tree | 3618582f76f4183b6bc22c5d4743b6d171d11128 /engine/battle/14.asm | |
| parent | Merge remote-tracking branch 'origin/master' into tentative (diff) | |
| parent | Commented/labelled misc functions (diff) | |
| download | pokeyellow-dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad.tar.gz pokeyellow-dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad.tar.xz pokeyellow-dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad.zip | |
Merge remote-tracking branch 'YamaArashi/master'
Conflicts:
constants/misc_constants.asm
engine/battle/core.asm
engine/menu/pokedex.asm
engine/town_map.asm
home.asm
hram.asm
Diffstat (limited to 'engine/battle/14.asm')
| -rwxr-xr-x | engine/battle/14.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/battle/14.asm b/engine/battle/14.asm index 01d115a6..18aaa5e1 100755 --- a/engine/battle/14.asm +++ b/engine/battle/14.asm @@ -1,21 +1,21 @@ Func_525af: ; 525af (14:65af) - ld a, [$ffd7] + ld a, [hTilesetType] ld [wd0d4], a xor a ld [wcd6a], a - ld [wcf0b], a + ld [wBattleResult], a ld hl, wcc2b ld [hli], a ld [hli], a ld [hli], a ld [hl], a ld [wListScrollOffset], a ; wcc36 - ld [wd05e], a + ld [wCriticalHitOrOHKO], a ld [wBattleMonSpecies], a - ld [wPartyAliveFlags], a + ld [wPartyGainExpFlags], a ld [wPlayerMonNumber], a ; wPlayerMonNumber - ld [wd078], a - ld [wd35d], a + ld [wEscapedFromBattle], a + ld [wMapPalOffset], a ld hl, wcf1d ld [hli], a ld [hl], a @@ -73,7 +73,7 @@ ParalyzeEffect_: ; 52601 (14:6601) and a jr nz, .asm_52659 set 6, [hl] - callab Func_3ed27 + callab QuarterSpeedDueToParalysis ld c, $1e call DelayFrames callab Func_3fba8 |