From 0d81f1c470339efeb1f136aa5caab56c389be30a Mon Sep 17 00:00:00 2001 From: mid-kid Date: Tue, 11 Feb 2020 13:42:36 +0100 Subject: [PATCH] InitSpriteAnimStruct <-> _InitSpriteAnimStruct These were the wrong way around, as the function in home should not be prefixed --- engine/events/celebi.asm | 4 ++-- engine/events/field_moves.asm | 12 ++++++------ engine/events/magnet_train.asm | 2 +- engine/games/dummy_game.asm | 2 +- engine/games/slot_machine.asm | 6 +++--- engine/gfx/mon_icons.asm | 6 +++--- engine/gfx/sprites.asm | 2 +- engine/menus/intro_menu.asm | 2 +- engine/menus/naming_screen.asm | 10 +++++----- engine/movie/crystal_intro.asm | 24 ++++++++++++------------ engine/movie/evolution_animation.asm | 2 +- engine/movie/trade_animation.asm | 12 ++++++------ engine/pokegear/pokegear.asm | 12 ++++++------ engine/pokemon/breeding.asm | 4 ++-- home/sprite_anims.asm | 6 +++--- mobile/fixed_words.asm | 12 ++++++------ mobile/mobile_42.asm | 28 ++++++++++++++-------------- mobile/mobile_45_stadium.asm | 4 ++-- mobile/mobile_5c.asm | 6 +++--- 19 files changed, 78 insertions(+), 78 deletions(-) diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm index cf37eec49..21070cc56 100644 --- a/engine/events/celebi.asm +++ b/engine/events/celebi.asm @@ -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 diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index baba3c7a1..1fd4f4fe0 100644 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm @@ -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 diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm index 0c6110b7a..5ad968a17 100644 --- a/engine/events/magnet_train.asm +++ b/engine/events/magnet_train.asm @@ -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 diff --git a/engine/games/dummy_game.asm b/engine/games/dummy_game.asm index 6e435191b..d3360ff3f 100644 --- a/engine/games/dummy_game.asm +++ b/engine/games/dummy_game.asm @@ -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 diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index 25f9166ee..291f0151d 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -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 diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm index ec8899a8a..ac25712d1 100644 --- a/engine/gfx/mon_icons.asm +++ b/engine/gfx/mon_icons.asm @@ -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 diff --git a/engine/gfx/sprites.asm b/engine/gfx/sprites.asm index 395ff1830..20613cc60 100644 --- a/engine/gfx/sprites.asm +++ b/engine/gfx/sprites.asm @@ -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 diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 33c6ce759..d34b342f0 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -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: diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index 05c702cd0..5d4b98c22 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -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 diff --git a/engine/movie/crystal_intro.asm b/engine/movie/crystal_intro.asm index 29808c86b..1be7b55f4 100644 --- a/engine/movie/crystal_intro.asm +++ b/engine/movie/crystal_intro.asm @@ -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 diff --git a/engine/movie/evolution_animation.asm b/engine/movie/evolution_animation.asm index 1c41935c7..ed500d1f8 100644 --- a/engine/movie/evolution_animation.asm +++ b/engine/movie/evolution_animation.asm @@ -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] diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm index 7868fe33e..a57e30cb1 100644 --- a/engine/movie/trade_animation.asm +++ b/engine/movie/trade_animation.asm @@ -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 diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index b4228f68a..896685395 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -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 diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index 9751a90cf..a545d9ab9 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -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 diff --git a/home/sprite_anims.asm b/home/sprite_anims.asm index 7f271575e..816849981 100644 --- a/home/sprite_anims.asm +++ b/home/sprite_anims.asm @@ -17,16 +17,16 @@ PushLYOverrides:: ld [wRequested2bpp], a ret -_InitSpriteAnimStruct:: +InitSpriteAnimStruct:: ld [wSpriteAnimIDBuffer], a ldh a, [hROMBank] push af - ld a, BANK(InitSpriteAnimStruct) + ld a, BANK(_InitSpriteAnimStruct) rst Bankswitch ld a, [wSpriteAnimIDBuffer] - call InitSpriteAnimStruct + call _InitSpriteAnimStruct pop af rst Bankswitch diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index 2bca1cbd8..5456a08a7 100644 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -413,11 +413,11 @@ EZChat_MasterLoop: .SpawnObjects: depixel 3, 1, 2, 5 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct depixel 8, 1, 2, 5 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, $1 @@ -425,7 +425,7 @@ EZChat_MasterLoop: depixel 9, 2, 2, 0 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, $3 @@ -433,7 +433,7 @@ EZChat_MasterLoop: depixel 10, 16 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, $4 @@ -441,7 +441,7 @@ EZChat_MasterLoop: depixel 10, 4 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, $5 @@ -449,7 +449,7 @@ EZChat_MasterLoop: depixel 10, 2 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, $2 diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index 6a796f198..ab00ef67d 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -500,7 +500,7 @@ MobileTradeAnim_ShowPlayerMonToBeSent: call Function108bec depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld de, SFX_BALL_POOF call PlaySFX hlcoord 0, 0 @@ -534,7 +534,7 @@ MobileTradeAnim_ShowOTMonFromTrade: ldh [hWY], a depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL - call _InitSpriteAnimStruct + call InitSpriteAnimStruct call Function108b45 ld a, $1 call Function108b98 @@ -633,7 +633,7 @@ MobileTradeAnim_ShowPlayerMonForGTS: call Function108c2b depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld de, SFX_BALL_POOF call PlaySFX hlcoord 0, 0 @@ -676,7 +676,7 @@ MobileTradeAnim_ShowOTMonFromGTS: ldh [hWY], a depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL - call _InitSpriteAnimStruct + call InitSpriteAnimStruct call Function108b45 ld a, $1 call Function108b98 @@ -744,7 +744,7 @@ MobileTradeAnim_GetOddEgg: ldh [hWY], a depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL - call _InitSpriteAnimStruct + call InitSpriteAnimStruct call Function108b45 ld a, $1 call Function108b98 @@ -926,7 +926,7 @@ MobileTradeAnim_GiveTrademon1: jr nz, .next depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE - call _InitSpriteAnimStruct + call InitSpriteAnimStruct .next ld c, 1 @@ -951,7 +951,7 @@ MobileTradeAnim_GiveTrademon1: .init depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE - call _InitSpriteAnimStruct + call InitSpriteAnimStruct xor a call Function108ad4 jr .next2 @@ -981,7 +981,7 @@ MobileTradeAnim_GiveTrademon2: call Function108b5a depixel 9, 10, 2, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_PING - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld de, SFX_FORESIGHT call PlaySFX ld c, 10 @@ -990,7 +990,7 @@ MobileTradeAnim_GiveTrademon2: ld [wcf64], a depixel 9, 10, 2, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_PULSE - call _InitSpriteAnimStruct + call InitSpriteAnimStruct .loop ldh a, [hSCY] cp $90 @@ -1016,7 +1016,7 @@ MobileTradeAnim_05: call WaitMobileTradeSpriteAnims depixel 30, 10, 2, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE - call _InitSpriteAnimStruct + call InitSpriteAnimStruct call GetMobileTradeAnimByte ld de, SFX_THROW_BALL call PlaySFX @@ -1037,7 +1037,7 @@ MobileTradeAnim_07: call DelayFrames depixel 30, 10, 2, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE - call _InitSpriteAnimStruct + call InitSpriteAnimStruct call GetMobileTradeAnimByte ld de, SFX_THROW_BALL call PlaySFX @@ -1060,7 +1060,7 @@ MobileTradeAnim_GetTrademon1: farcall DeinitializeAllSprites depixel 9, 10, 2, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_PING - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld de, SFX_GLASS_TING_2 call PlaySFX call Function108af4 @@ -1095,13 +1095,13 @@ MobileTradeAnim_GetTrademon2: .asm_1088c5 depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE - call _InitSpriteAnimStruct + call InitSpriteAnimStruct jr .asm_1088e7 .asm_1088cf depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE - call _InitSpriteAnimStruct + call InitSpriteAnimStruct xor a call Function108ad4 jr .asm_1088e7 diff --git a/mobile/mobile_45_stadium.asm b/mobile/mobile_45_stadium.asm index bf194905d..16ddd6a8a 100644 --- a/mobile/mobile_45_stadium.asm +++ b/mobile/mobile_45_stadium.asm @@ -106,14 +106,14 @@ Function117738: farcall Function171ccd depixel 6, 3 ld a, $1d - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, $c add hl, bc ld a, $6 ld [hl], a depixel 9, 4 ld a, $1d - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, $c add hl, bc ld a, $7 diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index dce1ab702..b5a92532e 100644 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -493,7 +493,7 @@ Function171b42: Function171b4b: depixel 8, 2 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, $8 @@ -501,7 +501,7 @@ Function171b4b: depixel 8, 19 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, $9 @@ -509,7 +509,7 @@ Function171b4b: depixel 17, 14, 2, 0 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, $a