diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-24 17:39:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 17:39:50 -0500 |
| commit | e400fe5142731422b0f542749d913d569997159e (patch) | |
| tree | 004b17f7b444c4bbc8bbb80e3b189a48287ed4b7 /engine/sprite_anims.asm | |
| parent | 70e6b5947b5cc9ca9fd93c720c7f97d9e018da2d (diff) | |
| parent | 3e7f3bbeb6dd2d3cff6343dea2298502faa14185 (diff) | |
Merge pull request #423 from roukaour/master
Fix issues #262, #345, #347, #396, #408, and #412
Diffstat (limited to 'engine/sprite_anims.asm')
| -rwxr-xr-x | engine/sprite_anims.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm index 32c91b07f..1b3fb9a0d 100755 --- a/engine/sprite_anims.asm +++ b/engine/sprite_anims.asm @@ -218,15 +218,15 @@ DoAnimFrame: ; 8d24b ret .NamingScreenCursor ; 8d36c (23:536c) - callab NamingScreen_AnimateCursor + callfar NamingScreen_AnimateCursor ret .MailCursor ; 8d373 (23:5373) - callab ComposeMail_AnimateCursor + callfar ComposeMail_AnimateCursor ret .GameFreakLogo: ; 8d37a (23:537a) - callab GameFreakLogoJumper + callfar GameFreakLogoJumper ret .GSIntroStar ; 8d381 (23:5381) @@ -357,11 +357,11 @@ DoAnimFrame: ; 8d24b ret .SlotsGolem: ; 8d422 (23:5422) - callab SlotMachine_AnimateGolem + callfar SlotMachine_AnimateGolem ret .SlotsChansey: ; 8d429 (23:5429) - callab Slots_AnimateChansey + callfar Slots_AnimateChansey ld hl, wcf64 ld a, [hl] cp $2 @@ -405,15 +405,15 @@ DoAnimFrame: ; 8d24b ret .ForUnusedCursor ; 8d46e (23:546e) - callab ret_e00ed + callfar ret_e00ed ret .PokegearArrow ; 8d475 (23:5475) - callab AnimatePokegearModeIndicatorArrow + callfar AnimatePokegearModeIndicatorArrow ret .DummyGameCursor ; 8d47c (23:547c) - callab DummyGame_InterpretJoypad_AnimateCursor + callfar DummyGame_InterpretJoypad_AnimateCursor ret .TradePokeBall ; 8d483 (23:5483) @@ -566,7 +566,7 @@ DoAnimFrame: ; 8d24b ret .TrademonInTube ; 8d543 (23:5543) - callab TradeAnim_AnimateTrademonInTube + callfar TradeAnim_AnimateTrademonInTube ret .RevealNewMon: ; 8d54a (23:554a) @@ -607,7 +607,7 @@ DoAnimFrame: ; 8d24b ret .RadioTuningKnob: ; 8d578 (23:5578) - callab AnimateTuningKnob + callfar AnimateTuningKnob ret .CutLeaves ; 8d57f (23:557f) @@ -750,11 +750,11 @@ DoAnimFrame: ; 8d24b ret .sprite_anim_seq_1B ; 8d630 (23:5630) - callba Function108bc7 + farcall Function108bc7 ret .sprite_anim_seq_1C ; 8d637 (23:5637) - callba Function108be0 + farcall Function108be0 ret .IntroSuicune ; 8d63e (23:563e) @@ -847,11 +847,11 @@ DoAnimFrame: ; 8d24b ret .sprite_anim_seq_1A ; 8d6b7 (23:56b7) - callba AnimateEZChatCursor + farcall AnimateEZChatCursor ret .Celebi ; 8d6be (23:56be) - callba UpdateCelebiPosition + farcall UpdateCelebiPosition ret .AnonymousJumptable: ; 8d6c5 (23:56c5) |