Sync with pokecrystal up to aba1f14

This commit is contained in:
xCrystal
2023-09-24 15:06:19 +02:00
parent 5e78fd1ecc
commit 2cbe0e1764
34 changed files with 4172 additions and 4172 deletions

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

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

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

View File

@@ -354,7 +354,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
@@ -363,7 +363,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
@@ -1007,7 +1007,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
@@ -1016,7 +1016,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
@@ -1031,7 +1031,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
@@ -1044,7 +1044,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