diff options
| author | yenatch <yenatch@gmail.com> | 2013-09-08 22:30:10 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-09-08 22:30:10 -0400 |
| commit | b4d37c675fea5ed3b156e1701b6b89154f974de8 (patch) | |
| tree | 4a0d87d46eadccf365c3bef270585d95c1ebed7f | |
| parent | 7a1951528d7232ce3958e1eed600c141b8a988ce (diff) | |
comment defrost move effect asm
| -rw-r--r-- | battle/effect_commands.asm | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index ec1d26f21..27e3c9363 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -9457,22 +9457,30 @@ BattleCommand52: ; 37536 BattleCommand53: ; 37563 ; defrost +; Thaw the user. + ld a, BATTLE_VARS_STATUS call GetBattleVarPair - bit 5, [hl] + bit FRZ, [hl] ret z - res 5, [hl] + res FRZ, [hl] + +; Don't update the enemy's party struct in a wild battle. + ld a, [hBattleTurn] and a - jr z, .asm_37578 ; 37570 $6 + jr z, .party + ld a, [IsInBattle] dec a - jr z, .asm_3757f ; 37576 $7 -.asm_37578 - ld a, $20 + jr z, .done + +.party + ld a, PartyMon1Status - PartyMon1 call UserPartyAttr - res 5, [hl] -.asm_3757f + res FRZ, [hl] + +.done call RefreshBattleHuds ld hl, WasDefrostedText jp StdBattleTextBox |