From 9d2ffe9e0000005d056286f21aecb7283fb71410 Mon Sep 17 00:00:00 2001 From: scawful Date: Tue, 16 Jul 2024 20:23:18 -0400 Subject: [PATCH] misc label housekeeping --- Core/symbols.asm | 2 +- Oracle_main.asm | 4 ---- Sprites/NPCs/deku_scrub.asm | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Core/symbols.asm b/Core/symbols.asm index bc3f30c..a709152 100644 --- a/Core/symbols.asm +++ b/Core/symbols.asm @@ -285,7 +285,7 @@ CheckIfHitBoxesOverlap = $0683E6 ; ========================================================= ; $0FD8 = sprite's X coordinate ; $0FDA = sprite's Y coordinate -Sprite_Get16BitCoords = $0684BD +Sprite_Get16BitCoords_Local = $0684C1 Sprite_Get_16_bit_Coords = $0684BD ; ========================================================= diff --git a/Oracle_main.asm b/Oracle_main.asm index c2a122f..9b45abf 100644 --- a/Oracle_main.asm +++ b/Oracle_main.asm @@ -162,10 +162,6 @@ namespace Oracle ; ------------------------------------------------------- ; Misc - - ; LinkState_Bunny.not_moving - org $078427 - JSR $9BAA ; Link_HandleAPress incsrc "Util/item_cheat.asm" diff --git a/Sprites/NPCs/deku_scrub.asm b/Sprites/NPCs/deku_scrub.asm index fc62101..60ae9b5 100644 --- a/Sprites/NPCs/deku_scrub.asm +++ b/Sprites/NPCs/deku_scrub.asm @@ -54,7 +54,7 @@ Sprite_DekuScrub_Prep: { PHB : PHK : PLB - LDA.b #$80 : STA.w $0CAA, X + LDA.b #$80 : STA.w SprDefl, X LDA.w SprSubtype, X : CMP.b #$01 : BEQ .DekuButler CMP.b #$02 : BEQ .DekuPrincess