diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-12 19:13:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 19:13:53 -0500 |
| commit | 6cf7c0790f3424a4cb472b274a88d04d449d5231 (patch) | |
| tree | 7d3c49aaaa6d50f6ea698e95e7204e6d0b76bcca /misc | |
| parent | f6942b9a136b2ee3b25159ebc4d54509a42c5266 (diff) | |
| parent | f0ab09125493f91d66af836e0abb977459a0d801 (diff) | |
Merge pull request #414 from roukaour/master
Improve sprite constants and documentation
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/mobile_42.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm index 77cf9ac54..b625d6bcf 100644 --- a/misc/mobile_42.asm +++ b/misc/mobile_42.asm @@ -526,7 +526,7 @@ MobileTradeAnim_ShowPlayerMonToBeSent: ; 10830e call DelayFrames call Function108bec depixel 10, 11, 4, 0 - ld a, SPRITE_ANIM_INDEX_20 + ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL call _InitSpriteAnimStruct ld de, SFX_BALL_POOF call PlaySFX @@ -561,7 +561,7 @@ MobileTradeAnim_ShowOTMonFromTrade: ; 10839b ld a, $90 ld [hWY], a depixel 10, 11, 4, 0 - ld a, SPRITE_ANIM_INDEX_21 + ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL call _InitSpriteAnimStruct call Function108b45 ld a, $1 @@ -661,7 +661,7 @@ MobileTradeAnim_ShowPlayerMonForGTS: ; 10842c call DelayFrames call Function108c2b depixel 10, 11, 4, 0 - ld a, SPRITE_ANIM_INDEX_20 + ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL call _InitSpriteAnimStruct ld de, SFX_BALL_POOF call PlaySFX @@ -705,7 +705,7 @@ MobileTradeAnim_ShowOTMonFromGTS: ; 1084d7 ld a, $90 ld [hWY], a depixel 10, 11, 4, 0 - ld a, SPRITE_ANIM_INDEX_21 + ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL call _InitSpriteAnimStruct call Function108b45 ld a, $1 @@ -774,7 +774,7 @@ MobileTradeAnim_GetOddEgg: ; 108589 ld a, $90 ld [hWY], a depixel 10, 11, 4, 0 - ld a, SPRITE_ANIM_INDEX_21 + ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL call _InitSpriteAnimStruct call Function108b45 ld a, $1 @@ -960,7 +960,7 @@ MobileTradeAnim_GiveTrademon1: ; 108763 cp $f8 jr nz, .next depixel 10, 11, 4, 0 - ld a, SPRITE_ANIM_INDEX_22 + ld a, SPRITE_ANIM_INDEX_MOBILE_22 call _InitSpriteAnimStruct .next @@ -985,7 +985,7 @@ MobileTradeAnim_GiveTrademon1: ; 108763 .init depixel 10, 11, 4, 0 - ld a, SPRITE_ANIM_INDEX_22 + ld a, SPRITE_ANIM_INDEX_MOBILE_22 call _InitSpriteAnimStruct xor a call Function108ad4 @@ -1016,7 +1016,7 @@ MobileTradeAnim_GiveTrademon2: ; 1087cf call Function108af4 call Function108b5a depixel 9, 10, 2, 0 - ld a, SPRITE_ANIM_INDEX_25 + ld a, SPRITE_ANIM_INDEX_MOBILE_25 call _InitSpriteAnimStruct ld de, SFX_FORESIGHT call PlaySFX @@ -1025,7 +1025,7 @@ MobileTradeAnim_GiveTrademon2: ; 1087cf xor a ld [wcf64], a depixel 9, 10, 2, 0 - ld a, SPRITE_ANIM_INDEX_23 + ld a, SPRITE_ANIM_INDEX_MOBILE_23 call _InitSpriteAnimStruct .loop ld a, [hSCY] @@ -1052,7 +1052,7 @@ MobileTradeAnim_05: ; 108811 ld c, 60 call WaitMobileTradeSpriteAnims depixel 30, 10, 2, 0 - ld a, SPRITE_ANIM_INDEX_24 + ld a, SPRITE_ANIM_INDEX_MOBILE_24 call _InitSpriteAnimStruct call GetMobileTradeAnimByte ld de, SFX_THROW_BALL @@ -1075,7 +1075,7 @@ MobileTradeAnim_07: ; 10884c ld c, 80 call DelayFrames depixel 30, 10, 2, 0 - ld a, SPRITE_ANIM_INDEX_24 + ld a, SPRITE_ANIM_INDEX_MOBILE_24 call _InitSpriteAnimStruct call GetMobileTradeAnimByte ld de, SFX_THROW_BALL @@ -1099,7 +1099,7 @@ MobileTradeAnim_GetTrademon1: ; 108863 .done callba DeinitializeAllSprites depixel 9, 10, 2, 0 - ld a, SPRITE_ANIM_INDEX_25 + ld a, SPRITE_ANIM_INDEX_MOBILE_25 call _InitSpriteAnimStruct ld de, SFX_GLASS_TING_2 call PlaySFX @@ -1135,13 +1135,13 @@ MobileTradeAnim_GetTrademon2: ; 108894 .asm_1088c5 depixel 10, 11, 4, 0 - ld a, SPRITE_ANIM_INDEX_22 + ld a, SPRITE_ANIM_INDEX_MOBILE_22 call _InitSpriteAnimStruct jr .asm_1088e7 .asm_1088cf depixel 10, 11, 4, 0 - ld a, SPRITE_ANIM_INDEX_22 + ld a, SPRITE_ANIM_INDEX_MOBILE_22 call _InitSpriteAnimStruct xor a call Function108ad4 |