diff options
Diffstat (limited to 'engine/battle_anims/functions.asm')
| -rw-r--r-- | engine/battle_anims/functions.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm index ec1967e18..271c39252 100644 --- a/engine/battle_anims/functions.asm +++ b/engine/battle_anims/functions.asm @@ -864,7 +864,7 @@ BattleAnimFunction_RazorLeaf: ld hl, BATTLEANIMSTRUCT_YOFFSET add hl, bc ld [hl], a - call Functioncd557 + call BattleAnim_ScatterHorizontal ld hl, BATTLEANIMSTRUCT_VAR2 add hl, bc ld a, [hl] @@ -957,8 +957,8 @@ BattleAnimFunction_RazorLeaf: call BattleAnim_StepToTarget ret -Functioncd557: -; Affects sine movement based on bit 7 of Obj Param +BattleAnim_ScatterHorizontal: +; Affects horizontal sine movement based on bit 7 of Obj Param ld hl, BATTLEANIMSTRUCT_PARAM add hl, bc ld a, [hl] @@ -1043,7 +1043,7 @@ BattleAnimFunction_RockSmash: ld hl, BATTLEANIMSTRUCT_YOFFSET add hl, bc ld [hl], a - call Functioncd557 + call BattleAnim_ScatterHorizontal ld hl, BATTLEANIMSTRUCT_VAR2 add hl, bc ld a, [hl] @@ -1686,7 +1686,7 @@ BattleAnimFunction_Gust: call BattleAnim_IncAnonJumptableIndex ld hl, BATTLEANIMSTRUCT_PARAM add hl, bc - ld [hl], $0 + ld [hl], 0 .one .three call .GustWobble @@ -1759,10 +1759,10 @@ BattleAnimFunction_Gust: add hl, bc ld a, [hl] and a - jr z, .asm_cd9d7 + jr z, .start_wobble cp $c2 - jr c, .asm_cd9e2 -.asm_cd9d7 + jr c, .finish_wobble +.start_wobble dec a ld [hl], a and $7 @@ -1772,7 +1772,7 @@ BattleAnimFunction_Gust: inc [hl] ret -.asm_cd9e2 +.finish_wobble xor a ld hl, BATTLEANIMSTRUCT_VAR2 add hl, bc |