diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
| commit | 803c6081d7b458f1965c4b9e62be2714b73fcdf4 (patch) | |
| tree | 94632a90406f3b185d82cabee2beb834bd711215 /battle/anim_commands.asm | |
| parent | c33ba049a5a993fc678fd1698645039ce4974022 (diff) | |
| parent | a32b6ccbb5b9ad15befa3b9893659f2ceabd1ba0 (diff) | |
Merge github.com:pikalaxalt/pokecrystal
Diffstat (limited to 'battle/anim_commands.asm')
| -rw-r--r-- | battle/anim_commands.asm | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index 48dc9c433..957b2a066 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -108,7 +108,7 @@ RunBattleAnimScript: ; cc163 call RunBattleAnimCommand call _ExecuteBGEffects call BattleAnim_UpdateOAM_All - call Function3b0c + call PushLYOverrides call BattleAnimRequestPals ; Speed up Rollout's animation. @@ -265,9 +265,9 @@ BattleAnim_ClearCGB_OAMFlags: ; cc23d ld a, [hl] and $f0 ld [hli], a -rept 3 inc hl -endr + inc hl + inc hl dec c jr nz, .loop ret @@ -382,7 +382,7 @@ BattleAnimCommands:: ; cc2a4 (33:42a4) dw BattleAnimCmd_EB ; dummy dw BattleAnimCmd_EC ; dummy dw BattleAnimCmd_ED ; dummy - dw BattleAnimCmd_JumpAnd + dw BattleAnimCmd_IfParamAnd dw BattleAnimCmd_JumpUntil dw BattleAnimCmd_BGEffect dw BattleAnimCmd_BGP @@ -392,10 +392,10 @@ BattleAnimCommands:: ; cc2a4 (33:42a4) dw BattleAnimCmd_F5 dw BattleAnimCmd_F6 dw BattleAnimCmd_F7 - dw BattleAnimCmd_JumpIf + dw BattleAnimCmd_IfParamEqual dw BattleAnimCmd_SetVar dw BattleAnimCmd_IncVar - dw BattleAnimCmd_JumpVar + dw BattleAnimCmd_IfVarEqual dw BattleAnimCmd_Jump dw BattleAnimCmd_Loop dw BattleAnimCmd_Call @@ -535,7 +535,7 @@ BattleAnimCmd_IncVar: ; cc3ad (33:43ad) inc [hl] ret -BattleAnimCmd_JumpVar: ; cc3b2 (33:43b2) +BattleAnimCmd_IfVarEqual: ; cc3b2 (33:43b2) call GetBattleAnimByte ld hl, BattleAnimVar cp [hl] @@ -563,7 +563,7 @@ BattleAnimCmd_JumpVar: ; cc3b2 (33:43b2) ld [hl], d ret -BattleAnimCmd_JumpIf: ; cc3d6 (33:43d6) +BattleAnimCmd_IfParamEqual: ; cc3d6 (33:43d6) call GetBattleAnimByte ld hl, wBattleAnimParam cp [hl] @@ -591,7 +591,7 @@ BattleAnimCmd_JumpIf: ; cc3d6 (33:43d6) ld [hl], d ret -BattleAnimCmd_JumpAnd: ; cc3fa (33:43fa) +BattleAnimCmd_IfParamAnd: ; cc3fa (33:43fa) call GetBattleAnimByte ld e, a ld a, [wBattleAnimParam] @@ -608,6 +608,7 @@ BattleAnimCmd_JumpAnd: ; cc3fa (33:43fa) dec hl ld [hl], e ret + .jump call GetBattleAnimByte ld e, a |