diff options
author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-19 00:16:08 -0500 |
---|---|---|
committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-19 00:16:08 -0500 |
commit | 25048bd12dfb1f7182be32f1dba24616c6175377 (patch) | |
tree | 55fff09e327aa3434033d7ffecc79065cc69775e | |
parent | 55d8de6c24b0a05d9b76f32ce64074cb22589164 (diff) |
wiggle → wobble
-rw-r--r-- | audio/sfx.asm | 6 | ||||
-rw-r--r-- | audio/sfx_pointers.asm | 2 | ||||
-rw-r--r-- | constants/sfx_constants.asm | 2 | ||||
-rw-r--r-- | constants/sprite_anim_constants.asm | 2 | ||||
-rw-r--r-- | data/moves/animations.asm | 2 | ||||
-rwxr-xr-x | data/sprite_anims/framesets.asm | 4 | ||||
-rwxr-xr-x | engine/sprite_anims.asm | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/audio/sfx.asm b/audio/sfx.asm index a47f521e0..864e56558 100644 --- a/audio/sfx.asm +++ b/audio/sfx.asm @@ -2,8 +2,8 @@ Sfx_PokeballsPlacedOnTable: ; f0941 musicheader 1, 5, Sfx_PokeballsPlacedOnTable_Ch5 ; f0944 -Sfx_BallWiggle: ; f0944 - musicheader 1, 5, Sfx_BallWiggle_Ch5 +Sfx_BallWobble: ; f0944 + musicheader 1, 5, Sfx_BallWobble_Ch5 ; f0947 Sfx_Potion: ; f0947 @@ -4075,7 +4075,7 @@ Sfx_PokeballsPlacedOnTable_Ch5: ; f1d21 endchannel ; f1d32 -Sfx_BallWiggle_Ch5: ; f1d32 +Sfx_BallWobble_Ch5: ; f1d32 dutycycle $2 soundinput $3a sound __, 5, $f2, $0400 diff --git a/audio/sfx_pointers.asm b/audio/sfx_pointers.asm index 64c4108c8..9cbe1d0eb 100644 --- a/audio/sfx_pointers.asm +++ b/audio/sfx_pointers.asm @@ -180,7 +180,7 @@ SFX: ; e927c dba Sfx_Encore dba Sfx_BeatUp dba Sfx_BatonPass - dba Sfx_BallWiggle + dba Sfx_BallWobble dba Sfx_SweetScent dba Sfx_SweetScent2 dba Sfx_HitEndOfExpBar diff --git a/constants/sfx_constants.asm b/constants/sfx_constants.asm index 0dee70793..9d98e147d 100644 --- a/constants/sfx_constants.asm +++ b/constants/sfx_constants.asm @@ -180,7 +180,7 @@ const SFX_ENCORE ; b0 const SFX_BEAT_UP ; b1 const SFX_BATON_PASS ; b2 - const SFX_BALL_WIGGLE ; b3 + const SFX_BALL_WOBBLE ; b3 const SFX_SWEET_SCENT ; b4 const SFX_SWEET_SCENT_2 ; b5 const SFX_HIT_END_OF_EXP_BAR ; b6 diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index 2aeb5027a..8be0f312a 100644 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -127,7 +127,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs const SPRITE_ANIM_FRAMESET_RED_WALK ; 11 const SPRITE_ANIM_FRAMESET_STILL_CURSOR ; 12 const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL ; 13 - const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_WIGGLE ; 14 + const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_WOBBLE ; 14 const SPRITE_ANIM_FRAMESET_TRADE_POOF ; 15 const SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE ; 16 const SPRITE_ANIM_FRAMESET_TRADEMON_ICON ; 17 diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 7f097c3f6..030aa2fa3 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -401,7 +401,7 @@ BattleAnim_ThrowPokeBall anim_if_var_equal $1, .Click anim_if_var_equal $2, .BreakFree anim_incobj 1 - anim_sound 0, 1, SFX_BALL_WIGGLE + anim_sound 0, 1, SFX_BALL_WOBBLE anim_jump .Loop ; c93bc diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm index a4e126cef..d768ec21a 100755 --- a/data/sprite_anims/framesets.asm +++ b/data/sprite_anims/framesets.asm @@ -20,7 +20,7 @@ SpriteAnimFrameData: ; 8d6e6 dw .Frameset_RedWalk dw .Frameset_StillCursor dw .Frameset_TradePokeBall - dw .Frameset_TradePokeBallWiggle + dw .Frameset_TradePokeBallWobble dw .Frameset_TradePoof dw .Frameset_TradeTubeBulge dw .Frameset_TrademonIcon @@ -202,7 +202,7 @@ SpriteAnimFrameData: ; 8d6e6 frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 32 endanim -.Frameset_TradePokeBallWiggle: +.Frameset_TradePokeBallWobble: frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3 frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3 frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3 diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm index 29af03d89..9353b71c9 100755 --- a/engine/sprite_anims.asm +++ b/engine/sprite_anims.asm @@ -430,7 +430,7 @@ DoAnimFrame: ; 8d24b ; 8d493 .TradePokeBall_zero ; 8d493 - ld a, SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_WIGGLE + ld a, SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_WOBBLE call _ReinitSpriteAnimFrame ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX |