From 0722de77ae57ed6832b9a725ddc14511668f79c5 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 1 Jan 2018 18:32:01 -0500 Subject: Remove trailing whitespace find . -name '*.asm' -exec sed -i 's/[ \t]\+$//' {} \; --- engine/sprite_anims.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/sprite_anims.asm') diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm index 9fb78a5d7..965f6bc0b 100755 --- a/engine/sprite_anims.asm +++ b/engine/sprite_anims.asm @@ -43,7 +43,7 @@ DoAnimFrame: ; 8d24b dw .sprite_anim_seq_1A dw .sprite_anim_seq_1B dw .sprite_anim_seq_1C - dw .IntroSuicune + dw .IntroSuicune dw .IntroPichuWooper dw .Celebi dw .IntroUnown -- cgit v1.2.3 From 7ad8ea13c95a6ddbde90de56e7d58bf0eb161dfc Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 2 Jan 2018 12:25:13 -0500 Subject: Document more sprite anim data --- engine/sprite_anims.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'engine/sprite_anims.asm') diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm index 965f6bc0b..55777f45a 100755 --- a/engine/sprite_anims.asm +++ b/engine/sprite_anims.asm @@ -27,7 +27,7 @@ DoAnimFrame: ; 8d24b dw .SlotsChansey dw .SlotsChanseyEgg dw .MailCursor - dw .ForUnusedCursor + dw .UnusedCursor dw .DummyGameCursor dw .PokegearArrow dw .TradePokeBall @@ -39,10 +39,10 @@ DoAnimFrame: ; 8d24b dw .FlyFrom dw .FlyLeaf dw .FlyTo - dw .sprite_anim_seq_19 - dw .sprite_anim_seq_1A - dw .sprite_anim_seq_1B - dw .sprite_anim_seq_1C + dw .ForUnused1A + dw .EZChatCursor + dw .MobileTradeSentPulse + dw .MobileTradeOTPulse dw .IntroSuicune dw .IntroPichuWooper dw .Celebi @@ -202,7 +202,7 @@ DoAnimFrame: ; 8d24b ret ; 8d35a -.sprite_anim_seq_19 ; 8d35a (23:535a) +.ForUnused1A ; 8d35a (23:535a) ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] @@ -403,7 +403,7 @@ DoAnimFrame: ; 8d24b ld [hl], a ret -.ForUnusedCursor ; 8d46e (23:546e) +.UnusedCursor ; 8d46e (23:546e) callfar ret_e00ed ret @@ -748,11 +748,11 @@ DoAnimFrame: ; 8d24b ld [hl], a ret -.sprite_anim_seq_1B ; 8d630 (23:5630) +.MobileTradeSentPulse ; 8d630 (23:5630) farcall Function108bc7 ret -.sprite_anim_seq_1C ; 8d637 (23:5637) +.MobileTradeOTPulse ; 8d637 (23:5637) farcall Function108be0 ret @@ -845,7 +845,7 @@ DoAnimFrame: ; 8d24b ld [hl], a ret -.sprite_anim_seq_1A ; 8d6b7 (23:56b7) +.EZChatCursor ; 8d6b7 (23:56b7) farcall AnimateEZChatCursor ret -- cgit v1.2.3 From 2dd9ac08a4d6ae7f26515dd99cd579b00a7d2b14 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 2 Jan 2018 14:39:24 -0500 Subject: More sprite anim documentation --- engine/sprite_anims.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/sprite_anims.asm') diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm index 55777f45a..f51b26e61 100755 --- a/engine/sprite_anims.asm +++ b/engine/sprite_anims.asm @@ -39,7 +39,7 @@ DoAnimFrame: ; 8d24b dw .FlyFrom dw .FlyLeaf dw .FlyTo - dw .ForUnused1A + dw .GSIntroHoOh dw .EZChatCursor dw .MobileTradeSentPulse dw .MobileTradeOTPulse @@ -202,7 +202,7 @@ DoAnimFrame: ; 8d24b ret ; 8d35a -.ForUnused1A ; 8d35a (23:535a) +.GSIntroHoOh ; 8d35a (23:535a) ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] -- cgit v1.2.3 From 8d095cd5b8c8aa120ec4ccb215cd0ee6345a197b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 3 Jan 2018 01:27:12 -0500 Subject: Better names --- engine/sprite_anims.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/sprite_anims.asm') diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm index f51b26e61..29af03d89 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_0 + ld a, SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_WIGGLE call _ReinitSpriteAnimFrame ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX -- cgit v1.2.3 From 25048bd12dfb1f7182be32f1dba24616c6175377 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 19 Jan 2018 00:16:08 -0500 Subject: =?UTF-8?q?wiggle=20=E2=86=92=20wobble?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/sprite_anims.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/sprite_anims.asm') 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 -- cgit v1.2.3