pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

InitSpriteAnimStruct <-> _InitSpriteAnimStruct

Browse Source 
These were the wrong way around, as the function in home should not be
prefixed
This commit is contained in:
mid-kid 2020-02-11 13:42:36 +01:00
parent 53cf08b6b3
commit 0d81f1c470
19 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/events/celebi.asm
View File

@ -9,7 +9,7 @@ CelebiShrineEvent:
call LoadCelebiGFX call LoadCelebiGFX
depixel 0, 10, 7, 0 depixel 0, 10, 7, 0
ld a, SPRITE_ANIM_INDEX_CELEBI ld a, SPRITE_ANIM_INDEX_CELEBI
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], SPECIALCELEBIEVENT_CELEBI ld [hl], SPECIALCELEBIEVENT_CELEBI
@ -107,7 +107,7 @@ CelebiEvent_SpawnLeaf:
ld d, a ld d, a
ld e, $0 ld e, $0
ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], $80 ld [hl], $80

12
engine/events/field_moves.asm
View File

@ -33,7 +33,7 @@ ShakeHeadbuttTree:
call Request2bpp call Request2bpp
call Cut_Headbutt_GetPixelFacing call Cut_Headbutt_GetPixelFacing
ld a, SPRITE_ANIM_INDEX_HEADBUTT ld a, SPRITE_ANIM_INDEX_HEADBUTT
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_TREE ld [hl], FIELDMOVE_TREE
@ -174,7 +174,7 @@ OWCutJumptable:
Cut_SpawnAnimateTree: Cut_SpawnAnimateTree:
call Cut_Headbutt_GetPixelFacing call Cut_Headbutt_GetPixelFacing
ld a, SPRITE_ANIM_INDEX_CUT_TREE ; cut tree ld a, SPRITE_ANIM_INDEX_CUT_TREE ; cut tree
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_TREE ld [hl], FIELDMOVE_TREE
@ -227,7 +227,7 @@ Cut_SpawnLeaf:
push de push de
push af push af
ld a, SPRITE_ANIM_INDEX_LEAF ; leaf ld a, SPRITE_ANIM_INDEX_LEAF ; leaf
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_GRASS ld [hl], FIELDMOVE_GRASS
@ -314,7 +314,7 @@ FlyFromAnim:
call FlyFunction_InitGFX call FlyFunction_InitGFX
depixel 10, 10, 4, 0 depixel 10, 10, 4, 0
ld a, SPRITE_ANIM_INDEX_RED_WALK ld a, SPRITE_ANIM_INDEX_RED_WALK
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_FLY ld [hl], FIELDMOVE_FLY
@ -348,7 +348,7 @@ FlyToAnim:
call FlyFunction_InitGFX call FlyFunction_InitGFX
depixel 31, 10, 4, 0 depixel 31, 10, 4, 0
ld a, SPRITE_ANIM_INDEX_RED_WALK ld a, SPRITE_ANIM_INDEX_RED_WALK
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_FLY ld [hl], FIELDMOVE_FLY
@ -447,7 +447,7 @@ FlyFunction_FrameTimer:
ld d, a ld d, a
ld e, $0 ld e, $0
ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_GRASS ld [hl], FIELDMOVE_GRASS

2
engine/events/magnet_train.asm
View File

@ -313,7 +313,7 @@ MagnetTrain_Jumptable:
pop af pop af
ldh [rSVBK], a ldh [rSVBK], a
ld a, b ld a, b
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], 0 ld [hl], 0

2
engine/games/dummy_game.asm
View File

@ -110,7 +110,7 @@ endr
.spawn_object .spawn_object
depixel 6, 3, 4, 4 depixel 6, 3, 4, 4
ld a, SPRITE_ANIM_INDEX_DUMMY_GAME ld a, SPRITE_ANIM_INDEX_DUMMY_GAME
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld a, 5 ld a, 5
ld [wDummyGameNumberTriesRemaining], a ld [wDummyGameNumberTriesRemaining], a
ld hl, wJumptableIndex ld hl, wJumptableIndex

6
engine/games/slot_machine.asm
View File

@ -1139,7 +1139,7 @@ ReelAction_InitGolem:
push af push af
depixel 12, 13 depixel 12, 13
ld a, SPRITE_ANIM_INDEX_SLOTS_GOLEM ld a, SPRITE_ANIM_INDEX_SLOTS_GOLEM
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0E ld hl, SPRITEANIMSTRUCT_0E
add hl, bc add hl, bc
pop af pop af
@ -1200,7 +1200,7 @@ ReelAction_InitChansey:
push bc push bc
depixel 12, 0 depixel 12, 0
ld a, SPRITE_ANIM_INDEX_SLOTS_CHANSEY ld a, SPRITE_ANIM_INDEX_SLOTS_CHANSEY
call _InitSpriteAnimStruct call InitSpriteAnimStruct
pop bc pop bc
xor a xor a
ld [wSlotsDelay], a ld [wSlotsDelay], a
@ -2120,7 +2120,7 @@ Slots_AnimateChansey:
push bc push bc
depixel 12, 13, 0, 4 depixel 12, 13, 0, 4
ld a, SPRITE_ANIM_INDEX_SLOTS_EGG ld a, SPRITE_ANIM_INDEX_SLOTS_EGG
call _InitSpriteAnimStruct call InitSpriteAnimStruct
pop bc pop bc
ret ret

6
engine/gfx/mon_icons.asm
View File

@ -175,7 +175,7 @@ InitPartyMenuIcon:
ld e, $10 ld e, $10
; type is partymon icon ; type is partymon icon
ld a, SPRITE_ANIM_INDEX_PARTY_MON ld a, SPRITE_ANIM_INDEX_PARTY_MON
call InitSpriteAnimStruct call _InitSpriteAnimStruct
pop af pop af
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
@ -222,7 +222,7 @@ NamingScreen_InitAnimatedMonIcon:
call GetIconGFX call GetIconGFX
depixel 4, 4, 4, 0 depixel 4, 4, 4, 0
ld a, SPRITE_ANIM_INDEX_PARTY_MON ld a, SPRITE_ANIM_INDEX_PARTY_MON
call InitSpriteAnimStruct call _InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc add hl, bc
ld [hl], SPRITE_ANIM_SEQ_NULL ld [hl], SPRITE_ANIM_SEQ_NULL
@ -237,7 +237,7 @@ MoveList_InitAnimatedMonIcon:
ld d, 3 * 8 + 2 ; depixel 3, 4, 2, 4 ld d, 3 * 8 + 2 ; depixel 3, 4, 2, 4
ld e, 4 * 8 + 4 ld e, 4 * 8 + 4
ld a, SPRITE_ANIM_INDEX_PARTY_MON ld a, SPRITE_ANIM_INDEX_PARTY_MON
call InitSpriteAnimStruct call _InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc add hl, bc
ld [hl], SPRITE_ANIM_SEQ_NULL ld [hl], SPRITE_ANIM_SEQ_NULL

2
engine/gfx/sprites.asm
View File

@ -109,7 +109,7 @@ DoNextFrameForFirst16Sprites:
.done .done
ret ret
InitSpriteAnimStruct:: _InitSpriteAnimStruct::
; Initialize animation a at pixel x=e, y=d ; Initialize animation a at pixel x=e, y=d
; Find if there's any room in the wSpriteAnimationStructs array, which is 10x16 ; Find if there's any room in the wSpriteAnimationStructs array, which is 10x16
push de push de

2
engine/menus/intro_menu.asm
View File

@ -1280,7 +1280,7 @@ Unreferenced_Function639b:
ld e, a ld e, a
ld d, [hl] ld d, [hl]
ld a, SPRITE_ANIM_INDEX_GS_TITLE_TRAIL ld a, SPRITE_ANIM_INDEX_GS_TITLE_TRAIL
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ret ret
.Data63ca: .Data63ca:

10
engine/menus/naming_screen.asm
View File

@ -167,7 +167,7 @@ NamingScreen:
ld [hl], a ld [hl], a
depixel 4, 4, 4, 0 depixel 4, 4, 4, 0
ld a, SPRITE_ANIM_INDEX_RED_WALK ld a, SPRITE_ANIM_INDEX_RED_WALK
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_FRAMESET_ID ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
add hl, bc add hl, bc
ld [hl], $0 ld [hl], $0
@ -219,7 +219,7 @@ NamingScreen:
.not_kris .not_kris
ld a, b ld a, b
depixel 4, 4, 4, 0 depixel 4, 4, 4, 0
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ret ret
.StoreMonIconParams: .StoreMonIconParams:
@ -385,7 +385,7 @@ NamingScreenJoypadLoop:
ld d, 8 * 8 ld d, 8 * 8
.got_cursor_position .got_cursor_position
ld a, SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR ld a, SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld a, c ld a, c
ld [wNamingScreenCursorObjectPointer], a ld [wNamingScreenCursorObjectPointer], a
ld a, b ld a, b
@ -940,7 +940,7 @@ _ComposeMailMessage:
; init mail icon ; init mail icon
depixel 3, 2 depixel 3, 2
ld a, SPRITE_ANIM_INDEX_PARTY_MON ld a, SPRITE_ANIM_INDEX_PARTY_MON
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc add hl, bc
@ -1068,7 +1068,7 @@ INCBIN "gfx/icons/mail_big.2bpp"
.init_blinking_cursor .init_blinking_cursor
depixel 9, 2 depixel 9, 2
ld a, SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR ld a, SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld a, c ld a, c
ld [wNamingScreenCursorObjectPointer], a ld [wNamingScreenCursorObjectPointer], a
ld a, b ld a, b

24
engine/movie/crystal_intro.asm
View File

@ -80,7 +80,7 @@ Copyright_GFPresents:
farcall ClearSpriteAnims farcall ClearSpriteAnims
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_GAMEFREAK_LOGO ld a, SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_YOFFSET ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc add hl, bc
ld [hl], $a0 ld [hl], $a0
@ -733,7 +733,7 @@ IntroScene7:
farcall ClearSpriteAnims farcall ClearSpriteAnims
depixel 13, 27, 4, 0 depixel 13, 27, 4, 0
ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld a, $f0 ld a, $f0
ld [wGlobalAnimXOffset], a ld [wGlobalAnimXOffset], a
call Intro_SetCGBPalUpdate call Intro_SetCGBPalUpdate
@ -826,7 +826,7 @@ IntroScene10:
.pichu .pichu
depixel 21, 16, 1, 0 depixel 21, 16, 1, 0
ld a, SPRITE_ANIM_INDEX_INTRO_PICHU ld a, SPRITE_ANIM_INDEX_INTRO_PICHU
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld de, SFX_INTRO_PICHU ld de, SFX_INTRO_PICHU
call PlaySFX call PlaySFX
ret ret
@ -834,7 +834,7 @@ IntroScene10:
.wooper .wooper
depixel 22, 6 depixel 22, 6
ld a, SPRITE_ANIM_INDEX_INTRO_WOOPER ld a, SPRITE_ANIM_INDEX_INTRO_WOOPER
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld de, SFX_INTRO_PICHU ld de, SFX_INTRO_PICHU
call PlaySFX call PlaySFX
ret ret
@ -1013,7 +1013,7 @@ IntroScene13:
farcall ClearSpriteAnims farcall ClearSpriteAnims
depixel 13, 11, 4, 0 depixel 13, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld de, MUSIC_CRYSTAL_OPENING ld de, MUSIC_CRYSTAL_OPENING
call PlayMusic call PlayMusic
xor a xor a
@ -1124,10 +1124,10 @@ IntroScene15:
call Intro_SetCGBPalUpdate call Intro_SetCGBPalUpdate
depixel 8, 5 depixel 8, 5
ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN_F ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN_F
call _InitSpriteAnimStruct call InitSpriteAnimStruct
depixel 12, 0 depixel 12, 0
ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY
call _InitSpriteAnimStruct call InitSpriteAnimStruct
xor a xor a
ld [wIntroSceneFrameCounter], a ld [wIntroSceneFrameCounter], a
ld [wIntroSceneTimer], a ld [wIntroSceneTimer], a
@ -1276,7 +1276,7 @@ IntroScene19:
call Intro_SetCGBPalUpdate call Intro_SetCGBPalUpdate
depixel 12, 0 depixel 12, 0
ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY
call _InitSpriteAnimStruct call InitSpriteAnimStruct
xor a xor a
ld [wIntroSceneFrameCounter], a ld [wIntroSceneFrameCounter], a
ld [wIntroSceneTimer], a ld [wIntroSceneTimer], a
@ -1533,7 +1533,7 @@ INCLUDE "gfx/intro/fade.pal"
CrystalIntro_InitUnownAnim: CrystalIntro_InitUnownAnim:
push de push de
ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld [hl], $8 ld [hl], $8
@ -1543,7 +1543,7 @@ CrystalIntro_InitUnownAnim:
push de push de
ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld [hl], $18 ld [hl], $18
@ -1553,7 +1553,7 @@ CrystalIntro_InitUnownAnim:
push de push de
ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld [hl], $28 ld [hl], $28
@ -1562,7 +1562,7 @@ CrystalIntro_InitUnownAnim:
pop de pop de
ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld [hl], $38 ld [hl], $38

2
engine/movie/evolution_animation.asm
View File

@ -305,7 +305,7 @@ EvolutionAnimation:
push de push de
depixel 9, 11 depixel 9, 11
ld a, SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT ld a, SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc add hl, bc
ld a, [wJumptableIndex] ld a, [wJumptableIndex]

12
engine/movie/trade_animation.asm
View File

@ -359,7 +359,7 @@ TradeAnim_InitTubeAnim:
pop de pop de
ld a, SPRITE_ANIM_INDEX_TRADEMON_ICON ld a, SPRITE_ANIM_INDEX_TRADEMON_ICON
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc add hl, bc
@ -368,7 +368,7 @@ TradeAnim_InitTubeAnim:
pop de pop de
ld a, SPRITE_ANIM_INDEX_TRADEMON_BUBBLE ld a, SPRITE_ANIM_INDEX_TRADEMON_BUBBLE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc add hl, bc
@ -1012,7 +1012,7 @@ TrademonStats_PrintTrademonID:
TradeAnim_RockingBall: TradeAnim_RockingBall:
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_TRADE_POKE_BALL ld a, SPRITE_ANIM_INDEX_TRADE_POKE_BALL
call _InitSpriteAnimStruct call InitSpriteAnimStruct
call TradeAnim_AdvanceScriptPointer call TradeAnim_AdvanceScriptPointer
ld a, 32 ld a, 32
ld [wFrameCounter], a ld [wFrameCounter], a
@ -1021,7 +1021,7 @@ TradeAnim_RockingBall:
TradeAnim_DropBall: TradeAnim_DropBall:
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_TRADE_POKE_BALL ld a, SPRITE_ANIM_INDEX_TRADE_POKE_BALL
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc add hl, bc
ld [hl], $1 ld [hl], $1
@ -1036,7 +1036,7 @@ TradeAnim_DropBall:
TradeAnim_Poof: TradeAnim_Poof:
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_TRADE_POOF ld a, SPRITE_ANIM_INDEX_TRADE_POOF
call _InitSpriteAnimStruct call InitSpriteAnimStruct
call TradeAnim_AdvanceScriptPointer call TradeAnim_AdvanceScriptPointer
ld a, 16 ld a, 16
ld [wFrameCounter], a ld [wFrameCounter], a
@ -1049,7 +1049,7 @@ TradeAnim_BulgeThroughTube:
call DmgToCgbObjPal0 call DmgToCgbObjPal0
depixel 5, 11 depixel 5, 11
ld a, SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE ld a, SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
call TradeAnim_AdvanceScriptPointer call TradeAnim_AdvanceScriptPointer
ld a, 64 ld a, 64
ld [wFrameCounter], a ld [wFrameCounter], a

12
engine/pokegear/pokegear.asm
View File

@ -165,7 +165,7 @@ INCBIN "gfx/pokegear/fast_ship.2bpp"
InitPokegearModeIndicatorArrow: InitPokegearModeIndicatorArrow:
depixel 4, 2, 4, 0 depixel 4, 2, 4, 0
ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], $0 ld [hl], $0
@ -671,7 +671,7 @@ PokegearMap_InitPlayerIcon:
ld b, SPRITE_ANIM_INDEX_BLUE_WALK ld b, SPRITE_ANIM_INDEX_BLUE_WALK
.got_gender .got_gender
ld a, b ld a, b
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], $10 ld [hl], $10
@ -692,7 +692,7 @@ PokegearMap_InitCursor:
push af push af
depixel 0, 0 depixel 0, 0
ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], $04 ld [hl], $04
@ -750,7 +750,7 @@ PokegearRadio_Init:
call InitPokegearTilemap call InitPokegearTilemap
depixel 4, 10, 4, 4 depixel 4, 10, 4, 4
ld a, SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB ld a, SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], $08 ld [hl], $08
@ -2743,7 +2743,7 @@ TownMapMon:
; Animation/palette ; Animation/palette
depixel 0, 0 depixel 0, 0
ld a, SPRITE_ANIM_INDEX_PARTY_MON ld a, SPRITE_ANIM_INDEX_PARTY_MON
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], $08 ld [hl], $08
@ -2778,7 +2778,7 @@ TownMapPlayerIcon:
ld b, SPRITE_ANIM_INDEX_BLUE_WALK ; Female ld b, SPRITE_ANIM_INDEX_BLUE_WALK ; Female
.got_gender .got_gender
ld a, b ld a, b
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], $10 ld [hl], $10

4
engine/pokemon/breeding.asm
View File

@ -782,7 +782,7 @@ EggHatch_CrackShell:
ld d, a ld d, a
ld e, 11 * 8 ld e, 11 * 8
ld a, SPRITE_ANIM_INDEX_EGG_CRACK ld a, SPRITE_ANIM_INDEX_EGG_CRACK
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], $0 ld [hl], $0
@ -810,7 +810,7 @@ Hatch_InitShellFragments:
push bc push bc
ld a, SPRITE_ANIM_INDEX_EGG_HATCH ld a, SPRITE_ANIM_INDEX_EGG_HATCH
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc

6
home/sprite_anims.asm
View File

@ -17,16 +17,16 @@ PushLYOverrides::
ld [wRequested2bpp], a ld [wRequested2bpp], a
ret ret
_InitSpriteAnimStruct:: InitSpriteAnimStruct::
ld [wSpriteAnimIDBuffer], a ld [wSpriteAnimIDBuffer], a
ldh a, [hROMBank] ldh a, [hROMBank]
push af push af
ld a, BANK(InitSpriteAnimStruct) ld a, BANK(_InitSpriteAnimStruct)
rst Bankswitch rst Bankswitch
ld a, [wSpriteAnimIDBuffer] ld a, [wSpriteAnimIDBuffer]
call InitSpriteAnimStruct call _InitSpriteAnimStruct
pop af pop af
rst Bankswitch rst Bankswitch

12
mobile/fixed_words.asm
View File

@ -413,11 +413,11 @@ EZChat_MasterLoop:
.SpawnObjects: .SpawnObjects:
depixel 3, 1, 2, 5 depixel 3, 1, 2, 5
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
call _InitSpriteAnimStruct call InitSpriteAnimStruct
depixel 8, 1, 2, 5 depixel 8, 1, 2, 5
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, $1 ld a, $1
@ -425,7 +425,7 @@ EZChat_MasterLoop:
depixel 9, 2, 2, 0 depixel 9, 2, 2, 0
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, $3 ld a, $3
@ -433,7 +433,7 @@ EZChat_MasterLoop:
depixel 10, 16 depixel 10, 16
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, $4 ld a, $4
@ -441,7 +441,7 @@ EZChat_MasterLoop:
depixel 10, 4 depixel 10, 4
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, $5 ld a, $5
@ -449,7 +449,7 @@ EZChat_MasterLoop:
depixel 10, 2 depixel 10, 2
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, $2 ld a, $2

28
mobile/mobile_42.asm
View File

@ -500,7 +500,7 @@ MobileTradeAnim_ShowPlayerMonToBeSent:
call Function108bec call Function108bec
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld de, SFX_BALL_POOF ld de, SFX_BALL_POOF
call PlaySFX call PlaySFX
hlcoord 0, 0 hlcoord 0, 0
@ -534,7 +534,7 @@ MobileTradeAnim_ShowOTMonFromTrade:
ldh [hWY], a ldh [hWY], a
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL
call _InitSpriteAnimStruct call InitSpriteAnimStruct
call Function108b45 call Function108b45
ld a, $1 ld a, $1
call Function108b98 call Function108b98
@ -633,7 +633,7 @@ MobileTradeAnim_ShowPlayerMonForGTS:
call Function108c2b call Function108c2b
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld de, SFX_BALL_POOF ld de, SFX_BALL_POOF
call PlaySFX call PlaySFX
hlcoord 0, 0 hlcoord 0, 0
@ -676,7 +676,7 @@ MobileTradeAnim_ShowOTMonFromGTS:
ldh [hWY], a ldh [hWY], a
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL
call _InitSpriteAnimStruct call InitSpriteAnimStruct
call Function108b45 call Function108b45
ld a, $1 ld a, $1
call Function108b98 call Function108b98
@ -744,7 +744,7 @@ MobileTradeAnim_GetOddEgg:
ldh [hWY], a ldh [hWY], a
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL
call _InitSpriteAnimStruct call InitSpriteAnimStruct
call Function108b45 call Function108b45
ld a, $1 ld a, $1
call Function108b98 call Function108b98
@ -926,7 +926,7 @@ MobileTradeAnim_GiveTrademon1:
jr nz, .next jr nz, .next
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
.next .next
ld c, 1 ld c, 1
@ -951,7 +951,7 @@ MobileTradeAnim_GiveTrademon1:
.init .init
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
xor a xor a
call Function108ad4 call Function108ad4
jr .next2 jr .next2
@ -981,7 +981,7 @@ MobileTradeAnim_GiveTrademon2:
call Function108b5a call Function108b5a
depixel 9, 10, 2, 0 depixel 9, 10, 2, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_PING ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_PING
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld de, SFX_FORESIGHT ld de, SFX_FORESIGHT
call PlaySFX call PlaySFX
ld c, 10 ld c, 10
@ -990,7 +990,7 @@ MobileTradeAnim_GiveTrademon2:
ld [wcf64], a ld [wcf64], a
depixel 9, 10, 2, 0 depixel 9, 10, 2, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_PULSE ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_PULSE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
.loop .loop
ldh a, [hSCY] ldh a, [hSCY]
cp $90 cp $90
@ -1016,7 +1016,7 @@ MobileTradeAnim_05:
call WaitMobileTradeSpriteAnims call WaitMobileTradeSpriteAnims
depixel 30, 10, 2, 0 depixel 30, 10, 2, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
call GetMobileTradeAnimByte call GetMobileTradeAnimByte
ld de, SFX_THROW_BALL ld de, SFX_THROW_BALL
call PlaySFX call PlaySFX
@ -1037,7 +1037,7 @@ MobileTradeAnim_07:
call DelayFrames call DelayFrames
depixel 30, 10, 2, 0 depixel 30, 10, 2, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
call GetMobileTradeAnimByte call GetMobileTradeAnimByte
ld de, SFX_THROW_BALL ld de, SFX_THROW_BALL
call PlaySFX call PlaySFX
@ -1060,7 +1060,7 @@ MobileTradeAnim_GetTrademon1:
farcall DeinitializeAllSprites farcall DeinitializeAllSprites
depixel 9, 10, 2, 0 depixel 9, 10, 2, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_PING ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_PING
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld de, SFX_GLASS_TING_2 ld de, SFX_GLASS_TING_2
call PlaySFX call PlaySFX
call Function108af4 call Function108af4
@ -1095,13 +1095,13 @@ MobileTradeAnim_GetTrademon2:
.asm_1088c5 .asm_1088c5
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
jr .asm_1088e7 jr .asm_1088e7
.asm_1088cf .asm_1088cf
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
xor a xor a
call Function108ad4 call Function108ad4
jr .asm_1088e7 jr .asm_1088e7

4
mobile/mobile_45_stadium.asm
View File

@ -106,14 +106,14 @@ Function117738:
farcall Function171ccd farcall Function171ccd
depixel 6, 3 depixel 6, 3
ld a, $1d ld a, $1d
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, $c ld hl, $c
add hl, bc add hl, bc
ld a, $6 ld a, $6
ld [hl], a ld [hl], a
depixel 9, 4 depixel 9, 4
ld a, $1d ld a, $1d
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, $c ld hl, $c
add hl, bc add hl, bc
ld a, $7 ld a, $7

6
mobile/mobile_5c.asm
View File

@ -493,7 +493,7 @@ Function171b42:
Function171b4b: Function171b4b:
depixel 8, 2 depixel 8, 2
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, $8 ld a, $8
@ -501,7 +501,7 @@ Function171b4b:
depixel 8, 19 depixel 8, 19
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, $9 ld a, $9
@ -509,7 +509,7 @@ Function171b4b:
depixel 17, 14, 2, 0 depixel 17, 14, 2, 0
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, $a ld a, $a