From 79e71b0a934893bd9509f00704805100f43a5374 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sun, 6 Oct 2024 08:22:39 -0400
Subject: [PATCH] Housekeeping

---
 Menu/menu_draw.asm           | 26 ++++++++------------------
 Sprites/NPCs/bean_vendor.asm | 12 ++++--------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/Menu/menu_draw.asm b/Menu/menu_draw.asm
index a6677e6..48c299c 100644
--- a/Menu/menu_draw.asm
+++ b/Menu/menu_draw.asm
@@ -340,7 +340,7 @@ DrawYItems:
   LDA.l $7EF34C : AND.w #$00FF : CMP.w #$0000 : BEQ .no_ocarina
     LDA.w $030F : BNE .spoof_ocarina
       LDA #$0001 ; Multi-songs not unlocked yet
-    .spoof_ocarina 
+    .spoof_ocarina
 
     STA.w ShortSpoof : LDA.w #ShortSpoof
     LDX.w #menu_offset(13,3)
@@ -362,8 +362,8 @@ DrawYItems:
 
   ; LDA.w #$7EF351
   LDA.l $7EF351 : AND.w #$00FF : CMP.w #$00 : BEQ .no_rods
-    LDA.w FishingOrPortalRod 
-    INC A 
+    LDA.w FishingOrPortalRod
+    INC A
     STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof
     LDX.w #menu_offset(13,13)
     LDY.w #FishingRodGFX
@@ -426,7 +426,7 @@ Menu_DrawQuestItems:
   LDA.w #$7EF359
   LDX.w #menu_offset(14,2)
   LDY.w #SwordGFX
-  JSR DrawMenuItem 
+  JSR DrawMenuItem
 
   LDA.w #$7EF35A
   LDX.w #menu_offset(14,5)
@@ -611,30 +611,24 @@ CheckPalaceItemPossession:
   .mirror_shield
 
   LDA $7EF35A : CMP.b #$03 : BEQ .success
-  
   STZ $02
   STZ $03
-  
   RTS
 
   .red_mail
 
   LDA $7EF35B : CMP.b #$02 : BEQ .success
-  
   STZ $02
   STZ $03
-  
   RTS
 }
 
 ; *$6EF39-$6EF66 LOCAL
 Menu_DrawBigChestKey:
-{  
+{
   LDA $040C : AND.w #$00FF : CMP.w #$00FF : BEQ .notInPalace
     LSR A : TAX
-    
     LDA $7EF364
-    
     .locateCompassFlag
 
     ASL A : DEX : BPL .locateCompassFlag
@@ -649,10 +643,8 @@ Menu_DrawBigChestKey:
       LDX.w #menu_offset(11, 5)
       LDY.w #BigChestKeyGFX
       JSR DrawMenuItem
-    
     .dontHaveCompass
   .notInPalace
-  
   RTS
 }
 
@@ -660,7 +652,7 @@ Menu_DrawBigChestKey:
 Menu_DrawSongMenu:
 {
   REP #$30
-  LDX.w #$FE ; $1700-17FF 
+  LDX.w #$FE ; $1700-17FF
 
   .loop
     LDA.w .magic_bag_tilemap, X
@@ -682,7 +674,6 @@ Menu_DrawSongMenu:
 
     DEX : DEX
   BPL .loop
-  
   RTS
 
   .magic_bag_tilemap
@@ -692,7 +683,7 @@ Menu_DrawSongMenu:
 Menu_DrawMagicBag:
 {
   REP #$30
-  LDX.w #$FE ; $1700-17FF 
+  LDX.w #$FE ; $1700-17FF
 
   .loop
     LDA.w .magic_bag_tilemap, X
@@ -714,7 +705,6 @@ Menu_DrawMagicBag:
 
     DEX : DEX
   BPL .loop
-  
   RTS
 
   .magic_bag_tilemap
@@ -724,7 +714,7 @@ Menu_DrawMagicBag:
 Menu_DrawRingBox:
 {
   REP #$30
-  LDX.w #$FE ; $1700-17FF 
+  LDX.w #$FE ; $1700-17FF
 
   .loop
     LDA.w .ring_box_tilemap, X
diff --git a/Sprites/NPCs/bean_vendor.asm b/Sprites/NPCs/bean_vendor.asm
index d907d7a..38691a9 100644
--- a/Sprites/NPCs/bean_vendor.asm
+++ b/Sprites/NPCs/bean_vendor.asm
@@ -37,16 +37,12 @@
 Sprite_BeanVendor_Long:
 {
   PHB : PHK : PLB
-
   JSR Sprite_BeanVendor_Draw
-  JSL Sprite_CheckActive   ; Check if game is not paused
-  BCC .SpriteIsNotActive   ; Skip Main code is sprite is innactive
-
-  JSR Sprite_BeanVendor_Main ; Call the main sprite code
-
+  JSL Sprite_CheckActive : BCC .SpriteIsNotActive
+    JSR Sprite_BeanVendor_Main
   .SpriteIsNotActive
-  PLB ; Get back the databank we stored previously
-  RTL ; Go back to original code
+  PLB
+  RTL
 }
 
 ; =========================================================