Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync sprite and battle anim consts/labels (#1055)

Browse Source 
* Sync sprite and battle anim consts/labels

* Add `; 00` comments

* Renamed to `SpriteAnimFunc_` and `BattleAnimFunc_`
This commit is contained in:
vulcandth
2023-09-17 13:09:28 -05:00
committed by GitHub
parent b0ddb0758d
commit aba1f14044
37 changed files with 4148 additions and 4148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mobile/fixed_words.asm
View File

@@ -412,11 +412,11 @@ EZChat_MasterLoop:
.SpawnObjects:
depixel 3, 1, 2, 5
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
ld a, SPRITE_ANIM_OBJ_EZCHAT_CURSOR
call InitSpriteAnimStruct
depixel 8, 1, 2, 5
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
ld a, SPRITE_ANIM_OBJ_EZCHAT_CURSOR
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
@@ -424,7 +424,7 @@ EZChat_MasterLoop:
ld [hl], a
depixel 9, 2, 2, 0
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
ld a, SPRITE_ANIM_OBJ_EZCHAT_CURSOR
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
@@ -432,7 +432,7 @@ EZChat_MasterLoop:
ld [hl], a
depixel 10, 16
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
ld a, SPRITE_ANIM_OBJ_EZCHAT_CURSOR
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
@@ -440,7 +440,7 @@ EZChat_MasterLoop:
ld [hl], a
depixel 10, 4
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
ld a, SPRITE_ANIM_OBJ_EZCHAT_CURSOR
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
@@ -448,7 +448,7 @@ EZChat_MasterLoop:
ld [hl], a
depixel 10, 2
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
ld a, SPRITE_ANIM_OBJ_EZCHAT_CURSOR
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc

28
mobile/mobile_42.asm
View File

@@ -499,7 +499,7 @@ MobileTradeAnim_ShowPlayerMonToBeSent:
call DelayFrames
call Function108bec
depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL
ld a, SPRITE_ANIM_OBJ_MOBILE_TRADE_SENT_BALL
call InitSpriteAnimStruct
ld de, SFX_BALL_POOF
call PlaySFX
@@ -533,7 +533,7 @@ MobileTradeAnim_ShowOTMonFromTrade:
ld a, $90
ldh [hWY], a
depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL
ld a, SPRITE_ANIM_OBJ_MOBILE_TRADE_OT_BALL
call InitSpriteAnimStruct
call Function108b45
ld a, $1
@@ -632,7 +632,7 @@ MobileTradeAnim_ShowPlayerMonForGTS:
call DelayFrames
call Function108c2b
depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL
ld a, SPRITE_ANIM_OBJ_MOBILE_TRADE_SENT_BALL
call InitSpriteAnimStruct
ld de, SFX_BALL_POOF
call PlaySFX
@@ -675,7 +675,7 @@ MobileTradeAnim_ShowOTMonFromGTS:
ld a, $90
ldh [hWY], a
depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL
ld a, SPRITE_ANIM_OBJ_MOBILE_TRADE_OT_BALL
call InitSpriteAnimStruct
call Function108b45
ld a, $1
@@ -743,7 +743,7 @@ MobileTradeAnim_GetOddEgg:
ld a, $90
ldh [hWY], a
depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL
ld a, SPRITE_ANIM_OBJ_MOBILE_TRADE_OT_BALL
call InitSpriteAnimStruct
call Function108b45
ld a, $1
@@ -925,7 +925,7 @@ MobileTradeAnim_GiveTrademon1:
cp $f8
jr nz, .next
depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE
ld a, SPRITE_ANIM_OBJ_MOBILE_TRADE_CABLE_BULGE
call InitSpriteAnimStruct
.next
@@ -950,7 +950,7 @@ MobileTradeAnim_GiveTrademon1:
.init
depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE
ld a, SPRITE_ANIM_OBJ_MOBILE_TRADE_CABLE_BULGE
call InitSpriteAnimStruct
xor a
call Function108ad4
@@ -980,7 +980,7 @@ MobileTradeAnim_GiveTrademon2:
call Function108af4
call Function108b5a
depixel 9, 10, 2, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_PING
ld a, SPRITE_ANIM_OBJ_MOBILE_TRADE_PING
call InitSpriteAnimStruct
ld de, SFX_FORESIGHT
call PlaySFX
@@ -989,7 +989,7 @@ MobileTradeAnim_GiveTrademon2:
xor a
ld [wcf64], a
depixel 9, 10, 2, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_PULSE
ld a, SPRITE_ANIM_OBJ_MOBILE_TRADE_SENT_PULSE
call InitSpriteAnimStruct
.loop
ldh a, [hSCY]
@@ -1015,7 +1015,7 @@ MobileTradeAnim_05:
ld c, 60
call WaitMobileTradeSpriteAnims
depixel 30, 10, 2, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE
ld a, SPRITE_ANIM_OBJ_MOBILE_TRADE_OT_PULSE
call InitSpriteAnimStruct
call GetMobileTradeAnimByte
ld de, SFX_THROW_BALL
@@ -1036,7 +1036,7 @@ MobileTradeAnim_07:
ld c, 80
call DelayFrames
depixel 30, 10, 2, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE
ld a, SPRITE_ANIM_OBJ_MOBILE_TRADE_OT_PULSE
call InitSpriteAnimStruct
call GetMobileTradeAnimByte
ld de, SFX_THROW_BALL
@@ -1059,7 +1059,7 @@ MobileTradeAnim_GetTrademon1:
.done
farcall DeinitializeAllSprites
depixel 9, 10, 2, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_PING
ld a, SPRITE_ANIM_OBJ_MOBILE_TRADE_PING
call InitSpriteAnimStruct
ld de, SFX_GLASS_TING_2
call PlaySFX
@@ -1094,13 +1094,13 @@ MobileTradeAnim_GetTrademon2:
.asm_1088c5
depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE
ld a, SPRITE_ANIM_OBJ_MOBILE_TRADE_CABLE_BULGE
call InitSpriteAnimStruct
jr .asm_1088e7
.asm_1088cf
depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE
ld a, SPRITE_ANIM_OBJ_MOBILE_TRADE_CABLE_BULGE
call InitSpriteAnimStruct
xor a
call Function108ad4

6
mobile/mobile_5c.asm
View File

@@ -483,7 +483,7 @@ Function171b42:
Function171b4b:
depixel 8, 2
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
ld a, SPRITE_ANIM_OBJ_EZCHAT_CURSOR
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
@@ -491,7 +491,7 @@ Function171b4b:
ld [hl], a
depixel 8, 19
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
ld a, SPRITE_ANIM_OBJ_EZCHAT_CURSOR
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
@@ -499,7 +499,7 @@ Function171b4b:
ld [hl], a
depixel 17, 14, 2, 0
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
ld a, SPRITE_ANIM_OBJ_EZCHAT_CURSOR
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc