diff options
| author | yenatch <yenatch@gmail.com> | 2014-06-16 11:20:01 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-06-16 11:20:01 -0700 |
| commit | 8639fcd29b0e929ec6cc236a209d0e07a495db14 (patch) | |
| tree | c5021a1842b931ff41b63a884739342fa31f0a9e /battle/effect_commands.asm | |
| parent | 0b7dfeb9b208a16682e92de9cf15e19fb8cf8a94 (diff) | |
Use a predef macro that takes labels instead of juggling constants.
Besides making predefs convenient, naming a predef no longer requires
adding or renaming a predef constant. This also lets predefs be rearranged at will.
Diffstat (limited to 'battle/effect_commands.asm')
| -rw-r--r-- | battle/effect_commands.asm | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 4bbd0ba6b..d9cbc1fb5 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -3227,8 +3227,7 @@ BattleCommand11: ; 351c0 ld [$d1ef], a ld h, b ld l, c - ld a, $b - call Predef + predef Functionc6e0 call RefreshBattleHuds call SwitchTurn @@ -4607,8 +4606,7 @@ BattleCommand42: ; 35926 ld a, $1 ld [$d10a], a hlcoord 10, 9 - ld a, $b - call Predef + predef Functionc6e0 ld hl, EnemyMonHP ld a, [hli] ld [$d1ed], a @@ -4623,8 +4621,7 @@ BattleCommand42: ; 35926 ld [$d10a], a call ResetDamage hlcoord 2, 2 - ld a, $b - call Predef + predef Functionc6e0 callba Function178000 ld hl, SharedPainText @@ -4767,8 +4764,7 @@ BattleCommand44: ; 359e6 ld a, [hl] ld [$d265], a - ld a, $29 - call Predef + predef GetTypeName ld hl, TransformedTypeText jp StdBattleTextBox @@ -5341,8 +5337,7 @@ Function35d1c: ; 35d1c hlcoord 2, 2 xor a ld [$d10a], a - ld a, $b - call Predef + predef Functionc6e0 .asm_35d7b jp RefreshBattleHuds ; 35d7e @@ -5401,8 +5396,7 @@ Function35d7e: ; 35d7e hlcoord 10, 9 ld a, $1 ld [$d10a], a - ld a, $b - call Predef + predef Functionc6e0 .asm_35ddd jp RefreshBattleHuds ; 35de0 @@ -5850,8 +5844,7 @@ Function36011: ; 36011 xor a .asm_3607e ld [$d10a], a - ld a, $b - call Predef + predef Functionc6e0 call RefreshBattleHuds jp UpdateBattleMonInParty ; 3608c @@ -8001,8 +7994,7 @@ BattleCommand27: ; 36cb2 xor a .asm_36d0c ld [$d10a], a - ld a, $b - call Predef + predef Functionc6e0 call RefreshBattleHuds ld hl, RecoilText jp StdBattleTextBox |