Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions 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
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
depixel 0, 10, 7, 0
ld a, SPRITE_ANIM_INDEX_CELEBI
call _InitSpriteAnimStruct
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc
ld [hl], SPECIALCELEBIEVENT_CELEBI
@@ -107,7 +107,7 @@ CelebiEvent_SpawnLeaf:
ld d, a
ld e, $0
ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land
call _InitSpriteAnimStruct
call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc
ld [hl], $80

12
engine/events/field_moves.asm
View File

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

2
engine/events/magnet_train.asm
View File

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

2
engine/games/dummy_game.asm
View File

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

6
engine/games/slot_machine.asm
View File

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

6
engine/gfx/mon_icons.asm
View File

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

2
engine/gfx/sprites.asm
View File

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

2
engine/menus/intro_menu.asm
View File

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

10
engine/menus/naming_screen.asm
View File

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

24
engine/movie/crystal_intro.asm
View File

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

2
engine/movie/evolution_animation.asm
View File

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

12
engine/movie/trade_animation.asm
View File

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

12
engine/pokegear/pokegear.asm
View File

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

4
engine/pokemon/breeding.asm
View File

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