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/16.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/16.asm')
| -rwxr-xr-x | engine/battle/16.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/engine/battle/16.asm b/engine/battle/16.asm index f2f4ada9..1500d003 100755 --- a/engine/battle/16.asm +++ b/engine/battle/16.asm @@ -1,17 +1,17 @@ PrintBeginningBattleText: ; 58d99 (16:4d99) - ld a, [W_ISINBATTLE] ; $d057 + ld a, [W_ISINBATTLE] ; W_ISINBATTLE dec a jr nz, .trainerBattle - ld a, [W_CURMAP] ; $d35e + ld a, [W_CURMAP] ; W_CURMAP cp POKEMONTOWER_3 jr c, .notPokemonTower cp LAVENDER_HOUSE_1 jr c, .pokemonTower .notPokemonTower - ld a, [W_ENEMYMONID] + ld a, [wEnemyMonSpecies2] call PlayCry ld hl, WildMonAppearedText - ld a, [W_MOVEMISSED] ; $d05f + ld a, [W_MOVEMISSED] ; W_MOVEMISSED and a jr z, .notFishing ld hl, HookedMonAttackedText @@ -31,8 +31,8 @@ PrintBeginningBattleText: ; 58d99 (16:4d99) .pokemonTower ld b, SILPH_SCOPE call IsItemInBag - ld a, [W_ENEMYMONID] - ld [$cf91], a + ld a, [wEnemyMonSpecies2] + ld [wcf91], a cp MAROWAK jr z, .isMarowak ld a, b @@ -61,9 +61,9 @@ PrintBeginningBattleText: ; 58d99 (16:4d99) .playSFX xor a - ld [$c0f1], a + ld [wc0f1], a ld a, $80 - ld [$c0f2], a + ld [wc0f2], a ld a, (SFX_08_77 - SFX_Headers_08) / 3 call PlaySound jp WaitForSoundToFinish @@ -95,24 +95,24 @@ GhostCantBeIDdText: ; 58e54 (16:4e54) db "@" SendOutMon: ; 58e59 (16:4e59) - ld hl, W_ENEMYMONCURHP ; $cfe6 + ld hl, wEnemyMonHP ; wEnemyMonHP ld a, [hli] or [hl] ld hl, GoText jr z, .printText xor a ld [H_NUMTOPRINT], a ; $ff96 (aliases: H_MULTIPLICAND) - ld hl, W_ENEMYMONCURHP ; $cfe6 + ld hl, wEnemyMonHP ; wEnemyMonHP ld a, [hli] - ld [$cce3], a + ld [wcce3], a ld [$ff97], a ld a, [hl] - ld [$cce4], a + ld [wcce4], a ld [$ff98], a ld a, $19 ld [H_REMAINDER], a ; $ff99 (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) call Multiply - ld hl, W_ENEMYMONMAXHP ; $cff4 + ld hl, wEnemyMonMaxHP ; wEnemyMonMaxHP ld a, [hli] ld b, [hl] srl a @@ -173,8 +173,8 @@ PlayerMon2Text: ; 58ed7 (16:4ed7) db $08 ; asm push de push bc - ld hl, $cfe7 - ld de, $cce4 + ld hl, wEnemyMonHP + 1 + ld de, wcce4 ld b, [hl] dec hl ld a, [de] @@ -188,7 +188,7 @@ PlayerMon2Text: ; 58ed7 (16:4ed7) ld a, $19 ld [H_POWEROFTEN], a call Multiply - ld hl, W_ENEMYMONMAXHP + ld hl, wEnemyMonMaxHP ld a, [hli] ld b, [hl] srl a |