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

2
engine/movie/evolution_animation.asm
View File

@@ -311,7 +311,7 @@ EvolutionAnimation:
.GenerateBallOfLight:
push de
depixel 9, 11
ld a, SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT
ld a, SPRITE_ANIM_OBJ_EVOLUTION_BALL_OF_LIGHT
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc

22
engine/movie/intro.asm
View File

@@ -388,7 +388,7 @@ IntroScene7:
call Intro_ResetLYOverrides
farcall ClearSpriteAnims
depixel 13, 27, 4, 0
ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE
ld a, SPRITE_ANIM_OBJ_INTRO_SUICUNE
call InitSpriteAnimStruct
ld a, $f0
ld [wGlobalAnimXOffset], a
@@ -481,7 +481,7 @@ IntroScene10:
.pichu
depixel 21, 16, 1, 0
ld a, SPRITE_ANIM_INDEX_INTRO_PICHU
ld a, SPRITE_ANIM_OBJ_INTRO_PICHU
call InitSpriteAnimStruct
ld de, SFX_INTRO_PICHU
call PlaySFX
@@ -489,7 +489,7 @@ IntroScene10:
.wooper
depixel 22, 6
ld a, SPRITE_ANIM_INDEX_INTRO_WOOPER
ld a, SPRITE_ANIM_OBJ_INTRO_WOOPER
call InitSpriteAnimStruct
ld de, SFX_INTRO_PICHU
call PlaySFX
@@ -668,7 +668,7 @@ IntroScene13:
ldh [hWY], a
farcall ClearSpriteAnims
depixel 13, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE
ld a, SPRITE_ANIM_OBJ_INTRO_SUICUNE
call InitSpriteAnimStruct
ld de, MUSIC_CRYSTAL_OPENING
call PlayMusic
@@ -779,10 +779,10 @@ IntroScene15:
farcall ClearSpriteAnims
call Intro_SetCGBPalUpdate
depixel 8, 5
ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN_F
ld a, SPRITE_ANIM_OBJ_INTRO_UNOWN_F
call InitSpriteAnimStruct
depixel 12, 0
ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY
ld a, SPRITE_ANIM_OBJ_INTRO_SUICUNE_AWAY
call InitSpriteAnimStruct
xor a
ld [wIntroSceneFrameCounter], a
@@ -931,7 +931,7 @@ IntroScene19:
ld [hl], $7f
call Intro_SetCGBPalUpdate
depixel 12, 0
ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY
ld a, SPRITE_ANIM_OBJ_INTRO_SUICUNE_AWAY
call InitSpriteAnimStruct
xor a
ld [wIntroSceneFrameCounter], a
@@ -1189,7 +1189,7 @@ INCLUDE "gfx/intro/fade.pal"
CrystalIntro_InitUnownAnim:
push de
ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
ld a, SPRITE_ANIM_OBJ_INTRO_UNOWN
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
@@ -1199,7 +1199,7 @@ CrystalIntro_InitUnownAnim:
pop de
push de
ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
ld a, SPRITE_ANIM_OBJ_INTRO_UNOWN
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
@@ -1209,7 +1209,7 @@ CrystalIntro_InitUnownAnim:
pop de
push de
ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
ld a, SPRITE_ANIM_OBJ_INTRO_UNOWN
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
@@ -1218,7 +1218,7 @@ CrystalIntro_InitUnownAnim:
call ReinitSpriteAnimFrame
pop de
ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
ld a, SPRITE_ANIM_OBJ_INTRO_UNOWN
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc

2
engine/movie/splash.asm
View File

@@ -89,7 +89,7 @@ GameFreakPresentsInit:
farcall ClearSpriteAnims
depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
ld a, SPRITE_ANIM_OBJ_GAMEFREAK_LOGO
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc

12
engine/movie/trade_animation.asm
View File

@@ -357,7 +357,7 @@ TradeAnim_InitTubeAnim:
call LoadTradeBubbleGFX
pop de
ld a, SPRITE_ANIM_INDEX_TRADEMON_ICON
ld a, SPRITE_ANIM_OBJ_TRADEMON_ICON
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
@@ -366,7 +366,7 @@ TradeAnim_InitTubeAnim:
ld [hl], b
pop de
ld a, SPRITE_ANIM_INDEX_TRADEMON_BUBBLE
ld a, SPRITE_ANIM_OBJ_TRADEMON_BUBBLE
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
@@ -1010,7 +1010,7 @@ TrademonStats_PrintTrademonID:
TradeAnim_RockingBall:
depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_TRADE_POKE_BALL
ld a, SPRITE_ANIM_OBJ_TRADE_POKE_BALL
call InitSpriteAnimStruct
call TradeAnim_AdvanceScriptPointer
ld a, 32
@@ -1019,7 +1019,7 @@ TradeAnim_RockingBall:
TradeAnim_DropBall:
depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_TRADE_POKE_BALL
ld a, SPRITE_ANIM_OBJ_TRADE_POKE_BALL
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc
@@ -1034,7 +1034,7 @@ TradeAnim_DropBall:
TradeAnim_Poof:
depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_TRADE_POOF
ld a, SPRITE_ANIM_OBJ_TRADE_POOF
call InitSpriteAnimStruct
call TradeAnim_AdvanceScriptPointer
ld a, 16
@@ -1047,7 +1047,7 @@ TradeAnim_BulgeThroughTube:
ld a, %11100100 ; 3,2,1,0
call DmgToCgbObjPal0
depixel 5, 11
ld a, SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE
ld a, SPRITE_ANIM_OBJ_TRADE_TUBE_BULGE
call InitSpriteAnimStruct
call TradeAnim_AdvanceScriptPointer
ld a, 64