diff options
| author | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
| commit | fb11ff7e55be56cef9234c8443614f04f2157a1e (patch) | |
| tree | a6aa8d0745bd07d0b80090491b5e4b6652de4420 /engine/battle/14.asm | |
| parent | 15427f532085846ab6b51719be687951a094cb6c (diff) | |
| parent | 9f29f21d9d43baa7124991dcf3b093fc6c615706 (diff) | |
Merge pull request #48 from yenatch/master
Clean up post-split main.asm. Get rid of static wram addresses. Lay out a foundation for Yellow.
Diffstat (limited to 'engine/battle/14.asm')
| -rwxr-xr-x | engine/battle/14.asm | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/engine/battle/14.asm b/engine/battle/14.asm index 209135af..01d115a6 100755 --- a/engine/battle/14.asm +++ b/engine/battle/14.asm @@ -1,52 +1,52 @@ Func_525af: ; 525af (14:65af) ld a, [$ffd7] - ld [$d0d4], a + ld [wd0d4], a xor a - ld [$cd6a], a - ld [$cf0b], a - ld hl, $cc2b + ld [wcd6a], a + ld [wcf0b], a + ld hl, wcc2b ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld [wListScrollOffset], a ; $cc36 - ld [$d05e], a - ld [W_PLAYERMONID], a - ld [W_PLAYERMONSALIVEFLAGS], a - ld [wPlayerMonNumber], a ; $cc2f - ld [$d078], a - ld [$d35d], a - ld hl, $cf1d + ld [wListScrollOffset], a ; wcc36 + ld [wd05e], a + ld [wBattleMonSpecies], a + ld [wPartyAliveFlags], a + ld [wPlayerMonNumber], a ; wPlayerMonNumber + ld [wd078], a + ld [wd35d], a + ld hl, wcf1d ld [hli], a ld [hl], a - ld hl, $ccd3 + ld hl, wccd3 ld b, $3c .asm_525e1 ld [hli], a dec b jr nz, .asm_525e1 inc a - ld [$ccd9], a - ld a, [W_CURMAP] ; $d35e + ld [wccd9], a + ld a, [W_CURMAP] ; W_CURMAP cp SAFARI_ZONE_EAST jr c, .asm_525f9 cp SAFARI_ZONE_REST_HOUSE_1 jr nc, .asm_525f9 ld a, $2 - ld [W_BATTLETYPE], a ; $d05a + ld [W_BATTLETYPE], a ; wd05a .asm_525f9 ld hl, PlayBattleMusic ld b, BANK(PlayBattleMusic) jp Bankswitch ParalyzeEffect_: ; 52601 (14:6601) - ld hl, W_ENEMYMONSTATUS ; $cfe9 - ld de, W_PLAYERMOVETYPE ; $cfd5 + ld hl, wEnemyMonStatus ; wcfe9 + ld de, W_PLAYERMOVETYPE ; wcfd5 ld a, [H_WHOSETURN] ; $fff3 and a jp z, .asm_52613 - ld hl, W_PLAYERMONSTATUS ; $d018 - ld de, W_ENEMYMOVETYPE ; $cfcf + ld hl, wBattleMonStatus ; wBattleMonStatus + ld de, W_ENEMYMOVETYPE ; wcfcf .asm_52613 ld a, [hl] @@ -69,7 +69,7 @@ ParalyzeEffect_: ; 52601 (14:6601) push hl callab MoveHitTest pop hl - ld a, [W_MOVEMISSED] ; $d05f + ld a, [W_MOVEMISSED] ; W_MOVEMISSED and a jr nz, .asm_52659 set 6, [hl] |