diff options
| author | YamaArashi <shadow962@live.com> | 2015-07-14 14:32:49 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-07-14 14:32:49 -0700 |
| commit | 01631a2e5910b5334ba0f7cc534bc5d7e5b60ccc (patch) | |
| tree | 845122ead069a7f4de89062434501727767d2ef2 /engine/battle/battle_transitions.asm | |
| parent | b1cb3788938fa981e65619f022a41f1c1d91ae3b (diff) | |
player animations, emotion bubbles, etc.
Diffstat (limited to 'engine/battle/battle_transitions.asm')
| -rw-r--r-- | engine/battle/battle_transitions.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 8613560a..997f23ef 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -104,12 +104,12 @@ GetBattleTransitionID_CompareLevels: ; 709ef (1c:49ef) jr nc, .highLevelEnemy res 1, c ld a, $1 - ld [wcd47], a + ld [wBattleTransitionSpiralDirection], a ret .highLevelEnemy set 1, c xor a - ld [wcd47], a + ld [wBattleTransitionSpiralDirection], a ret ; fails to recognize VICTORY_ROAD_2, VICTORY_ROAD_3, all ROCKET_HIDEOUT maps, @@ -196,7 +196,7 @@ BattleTransition_BlackScreen: ; 70a69 (1c:4a69) ; outward spiral if enemy is at least 3 levels ; higher than player and does an inward spiral otherwise BattleTransition_Spiral: ; 70a72 (1c:4a72) - ld a, [wcd47] + ld a, [wBattleTransitionSpiralDirection] and a jr z, .outwardSpiral call BattleTransition_InwardSpiral |