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

22
engine/pokegear/pokegear.asm
View File

@@ -164,7 +164,7 @@ INCBIN "gfx/pokegear/fast_ship.2bpp"
InitPokegearModeIndicatorArrow:
depixel 4, 2, 4, 0
ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW
ld a, SPRITE_ANIM_OBJ_POKEGEAR_ARROW
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc
@@ -655,11 +655,11 @@ PokegearMap_ContinueMap:
PokegearMap_InitPlayerIcon:
push af
depixel 0, 0
ld b, SPRITE_ANIM_INDEX_RED_WALK
ld b, SPRITE_ANIM_OBJ_RED_WALK
ld a, [wPlayerGender]
bit PLAYERGENDER_FEMALE_F, a
jr z, .got_gender
ld b, SPRITE_ANIM_INDEX_BLUE_WALK
ld b, SPRITE_ANIM_OBJ_BLUE_WALK
.got_gender
ld a, b
call InitSpriteAnimStruct
@@ -682,14 +682,14 @@ PokegearMap_InitPlayerIcon:
PokegearMap_InitCursor:
push af
depixel 0, 0
ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW
ld a, SPRITE_ANIM_OBJ_POKEGEAR_ARROW
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc
ld [hl], $04
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc
ld [hl], SPRITE_ANIM_SEQ_NULL
ld [hl], SPRITE_ANIM_FUNC_NULL
pop af
push bc
call PokegearMap_UpdateCursorPosition
@@ -740,7 +740,7 @@ TownMap_GetKantoLandmarkLimits:
PokegearRadio_Init:
call InitPokegearTilemap
depixel 4, 10, 4, 4
ld a, SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB
ld a, SPRITE_ANIM_OBJ_RADIO_TUNING_KNOB
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc
@@ -1363,7 +1363,7 @@ INCBIN "gfx/pokegear/clock.tilemap.rle"
_UpdateRadioStation:
jr UpdateRadioStation
; called from engine/gfx/sprite_anims.asm
; called from engine/sprite_anims/functions.asm
AnimateTuningKnob:
push bc
@@ -2719,14 +2719,14 @@ TownMapMon:
farcall GetSpeciesIcon
; Animation/palette
depixel 0, 0
ld a, SPRITE_ANIM_INDEX_PARTY_MON
ld a, SPRITE_ANIM_OBJ_PARTY_MON
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc
ld [hl], $08
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc
ld [hl], SPRITE_ANIM_SEQ_NULL
ld [hl], SPRITE_ANIM_FUNC_NULL
ret
TownMapPlayerIcon:
@@ -2748,11 +2748,11 @@ TownMapPlayerIcon:
call Request2bpp
; Animation/palette
depixel 0, 0
ld b, SPRITE_ANIM_INDEX_RED_WALK ; Male
ld b, SPRITE_ANIM_OBJ_RED_WALK ; Male
ld a, [wPlayerGender]
bit PLAYERGENDER_FEMALE_F, a
jr z, .got_gender
ld b, SPRITE_ANIM_INDEX_BLUE_WALK ; Female
ld b, SPRITE_ANIM_OBJ_BLUE_WALK ; Female
.got_gender
ld a, b
call InitSpriteAnimStruct