diff options
| author | yenatch <yenatch@gmail.com> | 2014-06-17 11:58:11 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-06-17 11:58:11 -0700 |
| commit | c2dba431884fdd9d61a90f6c3efd1876aa1cfa14 (patch) | |
| tree | bc2d055295c0c63722c41f3eeed1f38e009d68c2 /battle/effects | |
| parent | 541a9c73472db20472db5531cba196a0dcd148ea (diff) | |
Contest battle type and comment the battle menu.
Diffstat (limited to 'battle/effects')
| -rw-r--r-- | battle/effects/curse.asm | 4 | ||||
| -rw-r--r-- | battle/effects/rollout.asm | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/battle/effects/curse.asm b/battle/effects/curse.asm index f82ed97c5..27f821ffc 100644 --- a/battle/effects/curse.asm +++ b/battle/effects/curse.asm @@ -67,10 +67,10 @@ BattleCommand54: ; 37588 ld a, BATTLE_VARS_SUBSTATUS1_OPP call GetBattleVarAddr - bit 1, [hl] + bit SUBSTATUS_CURSE, [hl] jr nz, .failed - set 1, [hl] + set SUBSTATUS_CURSE, [hl] call AnimateCurrentMove ld hl, GetHalfMaxHP call CallBattleCore diff --git a/battle/effects/rollout.asm b/battle/effects/rollout.asm index 748736fef..f108a9062 100644 --- a/battle/effects/rollout.asm +++ b/battle/effects/rollout.asm @@ -1,3 +1,6 @@ +MAX_ROLLOUT_COUNT EQU 5 + + BattleCommand5b: ; 37718 ; checkcurl @@ -28,7 +31,7 @@ BattleCommand5c: ; 37734 ld a, BATTLE_VARS_STATUS call GetBattleVar - and 7 + and SLP ret nz ld hl, PlayerRolloutCount @@ -58,23 +61,23 @@ BattleCommand5c: ; 37734 inc [hl] ld a, [hl] ld b, a - cp $5 + cp MAX_ROLLOUT_COUNT jr c, .asm_3776e ld a, BATTLE_VARS_SUBSTATUS1 call GetBattleVarAddr - res 6, [hl] + res SUBSTATUS_ENCORED, [hl] jr .asm_37775 .asm_3776e ld a, BATTLE_VARS_SUBSTATUS1 call GetBattleVarAddr - set 6, [hl] + set SUBSTATUS_ENCORED, [hl] .asm_37775 ld a, BATTLE_VARS_SUBSTATUS2 call GetBattleVar - bit 0, a + bit SUBSTATUS_CURLED, a jr z, .asm_3777f inc b .asm_3777f |