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

6
engine/events/celebi.asm
View File

@@ -14,14 +14,14 @@ CelebiShrineEvent:
ld [wVramState], a
call LoadCelebiGFX
depixel 0, 10, 7, 0
ld a, SPRITE_ANIM_INDEX_CELEBI
ld a, SPRITE_ANIM_OBJ_CELEBI
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc
ld [hl], SPECIALCELEBIEVENT_CELEBI
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc
ld [hl], SPRITE_ANIM_SEQ_CELEBI
ld [hl], SPRITE_ANIM_FUNC_CELEBI
ld hl, SPRITEANIMSTRUCT_VAR4
add hl, bc
ld a, $80
@@ -111,7 +111,7 @@ CelebiEvent_SpawnLeaf: ; unreferenced
add $40
ld d, a
ld e, $0
ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land
ld a, SPRITE_ANIM_OBJ_FLY_LEAF ; fly land
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc

16
engine/events/field_moves.asm
View File

@@ -32,7 +32,7 @@ ShakeHeadbuttTree:
lb bc, BANK(HeadbuttTreeGFX), 8
call Request2bpp
call Cut_Headbutt_GetPixelFacing
ld a, SPRITE_ANIM_INDEX_HEADBUTT
ld a, SPRITE_ANIM_OBJ_HEADBUTT
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc
@@ -164,7 +164,7 @@ OWCutJumptable:
Cut_SpawnAnimateTree:
call Cut_Headbutt_GetPixelFacing
ld a, SPRITE_ANIM_INDEX_CUT_TREE ; cut tree
ld a, SPRITE_ANIM_OBJ_CUT_TREE ; cut tree
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc
@@ -217,7 +217,7 @@ Cut_WaitAnimSFX:
Cut_SpawnLeaf:
push de
push af
ld a, SPRITE_ANIM_INDEX_LEAF ; leaf
ld a, SPRITE_ANIM_OBJ_LEAF ; leaf
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc
@@ -304,14 +304,14 @@ FlyFromAnim:
ld [wVramState], a
call FlyFunction_InitGFX
depixel 10, 10, 4, 0
ld a, SPRITE_ANIM_INDEX_RED_WALK
ld a, SPRITE_ANIM_OBJ_RED_WALK
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc
ld [hl], FIELDMOVE_FLY
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc
ld [hl], SPRITE_ANIM_SEQ_FLY_FROM
ld [hl], SPRITE_ANIM_FUNC_FLY_FROM
ld a, 128
ld [wFrameCounter], a
.loop
@@ -338,14 +338,14 @@ FlyToAnim:
ld [wVramState], a
call FlyFunction_InitGFX
depixel 31, 10, 4, 0
ld a, SPRITE_ANIM_INDEX_RED_WALK
ld a, SPRITE_ANIM_OBJ_RED_WALK
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc
ld [hl], FIELDMOVE_FLY
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc
ld [hl], SPRITE_ANIM_SEQ_FLY_TO
ld [hl], SPRITE_ANIM_FUNC_FLY_TO
ld hl, SPRITEANIMSTRUCT_VAR4
add hl, bc
ld [hl], 11 * TILE_WIDTH
@@ -437,7 +437,7 @@ FlyFunction_FrameTimer:
add 8 * 8 ; gives a number in [$40, $50, $60, $70]
ld d, a
ld e, 0
ld a, SPRITE_ANIM_INDEX_FLY_LEAF
ld a, SPRITE_ANIM_OBJ_FLY_LEAF
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc

4
engine/events/magnet_train.asm
View File

@@ -292,7 +292,7 @@ MagnetTrain_Jumptable:
ld d, (8 + 2) * TILE_WIDTH + 5
ld a, [wMagnetTrainPlayerSpriteInitX]
ld e, a
ld b, SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED
ld b, SPRITE_ANIM_OBJ_MAGNET_TRAIN_RED
ldh a, [rSVBK]
push af
ld a, BANK(wPlayerGender)
@@ -300,7 +300,7 @@ MagnetTrain_Jumptable:
ld a, [wPlayerGender]
bit PLAYERGENDER_FEMALE_F, a
jr z, .got_gender
ld b, SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE
ld b, SPRITE_ANIM_OBJ_MAGNET_TRAIN_BLUE
.got_gender
pop af
ldh [rSVBK], a