From bb79af6c9f8470b6ee9490299064adc8e46a7ce1 Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 6 Jul 2024 16:34:02 -0400 Subject: [PATCH] update long function references --- Dungeons/attract_scenes.asm | 1 - Masks/deku_mask.asm | 3 --- Sprites/ZSpriteLib/sprites.asm | 9 ++++++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Dungeons/attract_scenes.asm b/Dungeons/attract_scenes.asm index ad9d741..685f7dd 100644 --- a/Dungeons/attract_scenes.asm +++ b/Dungeons/attract_scenes.asm @@ -19,7 +19,6 @@ AttractScene_AdvanceFromDungeon = $0CEFC0 Underworld_LoadAllPalettes = $02C55E PuppetSoldier = $1DEB84 Attract_DrawPreloadedSprite = $0CF9B5 -SpritePrep_ResetProperties = $0DB871 Attract_SetUpConclusionHDMA = $0ABC33 Attract_DoTextInDungeonScene = $0CF766 Attract_FadeInStep = $0CEEA6 diff --git a/Masks/deku_mask.asm b/Masks/deku_mask.asm index 3a7f87b..38b8761 100644 --- a/Masks/deku_mask.asm +++ b/Masks/deku_mask.asm @@ -75,9 +75,6 @@ print "End of Masks/deku_mask.asm ", pc pushpc -org $07E370 - LinkHop_FindArbitraryLandingSpot: - org $078926 Link_HandleChangeInZVelocity: diff --git a/Sprites/ZSpriteLib/sprites.asm b/Sprites/ZSpriteLib/sprites.asm index dbee124..e7f5695 100644 --- a/Sprites/ZSpriteLib/sprites.asm +++ b/Sprites/ZSpriteLib/sprites.asm @@ -232,6 +232,9 @@ SprDrop = $0CBA ;X W 00: Drop nothing, 01: drop normal key, 03: Drop green SpriteData_OAMProp = $0DB359 +; Clear all properties for sprites +SpritePrep_ResetProperties = $0DB871 + ; ========================================================= ; set the oam coordinate for the sprite draw Sprite_PrepOamCoord = $06E416 @@ -569,6 +572,8 @@ Link_HandleMovingAnimation_FullLongEntry = $07E6A6 Link_HandleMovingAnimation_General = $07E765 Link_HandleMovingAnimationSwimming = $07E7FA +LinkHop_FindArbitraryLandingSpot = $07E370 + HandleFollowersAfterMirroring = $07AAA2 TileDetect_BigArea_long = $07CF0A @@ -704,4 +709,6 @@ AncillaAdd_WallTapSpark = $099395 AncillaAdd_SwordSwingSparkle = $0993C2 AncillaAdd_QuakeSpell = $099589 AncillaAdd_IceRodShot = $099863 -AncillaAdd_Splash = $0998FC \ No newline at end of file +AncillaAdd_Splash = $0998FC + +DeleteBoomAndByrnaSparks = $0FFD86 \ No newline at end of file