diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-09 15:47:59 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-09 15:47:59 +0100 |
| commit | ee39862392cc263c3f3073c125cffcb449131643 (patch) | |
| tree | 7687814cc368ea6a832eea9398307084bc94ceae /src/battle/battle_anim.c | |
| parent | dcecc8aebfd2480d6e79f3c1f54b737ecbb319f8 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
Merge branch 'master' into battle_anim
Diffstat (limited to 'src/battle/battle_anim.c')
| -rw-r--r-- | src/battle/battle_anim.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c index 8242a1ddd..a0c74be1d 100644 --- a/src/battle/battle_anim.c +++ b/src/battle/battle_anim.c @@ -43,7 +43,7 @@ EWRAM_DATA u16 sAnimMoveIndex = 0; // set but unused. EWRAM_DATA u8 gAnimBankAttacker = 0; EWRAM_DATA u8 gAnimBankTarget = 0; EWRAM_DATA u16 gAnimSpeciesByBanks[4] = {0}; -EWRAM_DATA u8 gUnknown_0202F7D2 = 0; +EWRAM_DATA u8 gUnknown_0202F7D2 = 0; // some global pan variable extern u16 gBattle_BG1_Y; extern u16 gBattle_WIN1H; extern u16 gBattle_WIN0V; @@ -1489,9 +1489,9 @@ s8 BattleAnimAdjustPanning2(s8 pan) return pan; } -s16 sub_8077104(s16 a) +s16 sub_8077104(s16 newPan, int oldPan) { - s16 var = a; + s16 var = newPan; if (var > 63) var = 63; |