From 73e87c628bbe5bb085cb5c9b0915ecb6a95b4f9b Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Mon, 19 Dec 2022 19:14:28 -0500
Subject: [PATCH] housekeeping

---
 Menu/menu.asm             |  2 ++
 Menu/menu_hud.asm         | 32 ++------------------------------
 Menu/menu_select_item.asm | 36 ++++++++++++++++++------------------
 Util/ram.asm              |  2 --
 4 files changed, 22 insertions(+), 50 deletions(-)

diff --git a/Menu/menu.asm b/Menu/menu.asm
index b3b4b7d..81d93c5 100644
--- a/Menu/menu.asm
+++ b/Menu/menu.asm
@@ -11,6 +11,7 @@
 ;            Significant thanks to Kan for helping me craft this menu!
 ;   
 ; =============================================================================
+incsrc "Util/ram.asm"
 
 pushpc
 ; update in game hud colors 
@@ -263,6 +264,7 @@ Menu_ScrollTo:
 
 ; =============================================================================
 ; 06 MENU STATS SCREEN 
+
 incsrc "menu_scroll.asm"
 
 Menu_StatsScreen:
diff --git a/Menu/menu_hud.asm b/Menu/menu_hud.asm
index cb29473..e805600 100644
--- a/Menu/menu_hud.asm
+++ b/Menu/menu_hud.asm
@@ -766,73 +766,45 @@ FloorIndicatorNumberLow:
 ; *$57D0C-$57DA7 JUMP LOCATION (LONG)
 org $0AFD0C
 FloorIndicator:
-{
-  ; Handles display of the Floor indicator on BG3 (1F, B1, etc)
-  
-  REP #$30
-  
+{  
+  REP #$30 
   LDA $04A0 : AND.w #$00FF : BEQ .hideIndicator
-  
   INC A : CMP.w #$00C0 : BNE .dontDisable
-  
   ; if the count up timer reaches 0x00BF frames, disable the floor indicator during the next frame.
   LDA.w #$0000
-
 .dontDisable
-
   STA $04A0
-  
   PHB : PHK : PLB
-  
   LDA.w #$251E : STA $7EC7F0
   INC A        : STA $7EC832
   INC A        : STA $7EC830
-  
   LDA.w #$250F : STA $7EC7F2
-  
   LDX.w #$0000
   
   ; this confused me at first, but it's actually looking at whether $A4[1]
   ; has a negative value $A3 has nothing to do with $A4
   LDA $A3 : BMI .basementFloor
-  
   ; check which floor Link is on.
   LDA $A4 : BNE .notFloor1F
-  
   LDA $A0 : CMP.w #$0002 : BEQ .sanctuaryRatRoom
-  
   SEP #$20
-  
   ; Check the world state
   LDA $7EF3C5 : CMP.b #$02 : BCS .noRainSound
-  
   ; cause the ambient rain sound to occur (indoor version)
   LDA.b #$03 : STA $012D
-
 .noRainSound
-
   REP #$20
-
 .notFloor1F
 .sanctuaryRatRoom
-
   LDA $A4 : AND.w #$00FF
-  
   BRA .setFloorIndicatorNumber
-
 .basementFloor
-
   SEP #$20
-  
   ; turn off any ambient sound effects
   LDA.b #$05 : STA $012D
-  
   REP #$20
-  
   INX #2
-  
   LDA $A4 : ORA.w #$FF00 : EOR.w #$FFFF
-
 .setFloorIndicatorNumber
 
   ASL A : TAY
diff --git a/Menu/menu_select_item.asm b/Menu/menu_select_item.asm
index 38a9fd6..d42b8e7 100644
--- a/Menu/menu_select_item.asm
+++ b/Menu/menu_select_item.asm
@@ -46,30 +46,30 @@ Menu_AddressIndex:
 ; -----------------------------------------------------------------------------
 
 Menu_ItemCursorPositions:
-  dw menu_offset(6,2) ; bow
-  dw menu_offset(6,5) ; boom
-  dw menu_offset(6,8) ; hookshot
-  dw menu_offset(6,12) ; bombs
-  dw menu_offset(6,15) ; deku mask
-  dw menu_offset(6,18) ; bottle1
+  dw menu_offset(6,2)   ; bow
+  dw menu_offset(6,5)   ; boom
+  dw menu_offset(6,8)   ; hookshot
+  dw menu_offset(6,12)  ; bombs
+  dw menu_offset(6,15)  ; deku mask
+  dw menu_offset(6,18)  ; bottle1
 
-  dw menu_offset(9,2) ; hammer 
-  dw menu_offset(9,5) ; lamp
-  dw menu_offset(9,8) ; firerod
-  dw menu_offset(9,12) ; icerod
-  dw menu_offset(9,15) ; goron
-  dw menu_offset(9,18) ; bottle2
+  dw menu_offset(9,2)   ; hammer 
+  dw menu_offset(9,5)   ; lamp
+  dw menu_offset(9,8)   ; firerod
+  dw menu_offset(9,12)  ; icerod
+  dw menu_offset(9,15)  ; goron
+  dw menu_offset(9,18)  ; bottle2
 
-  dw menu_offset(12,2) ; shovel 
-  dw menu_offset(12,5) ; feather 
-  dw menu_offset(12,8) ; somaria
+  dw menu_offset(12,2)  ; shovel 
+  dw menu_offset(12,5)  ; feather 
+  dw menu_offset(12,8)  ; somaria
   dw menu_offset(12,12) ; byrna
   dw menu_offset(12,15) ; bunny hood
   dw menu_offset(12,18) ; bottle3
 
-  dw menu_offset(15,2) ; powder 
-  dw menu_offset(15,5) ; book 
-  dw menu_offset(15,8) ; flute
+  dw menu_offset(15,2)  ; powder 
+  dw menu_offset(15,5)  ; book 
+  dw menu_offset(15,8)  ; flute
   dw menu_offset(15,12) ; mirror
   dw menu_offset(15,15) ; stone mask 
   dw menu_offset(15,18) ; bottle4
diff --git a/Util/ram.asm b/Util/ram.asm
index 6d40d26..6a9c289 100644
--- a/Util/ram.asm
+++ b/Util/ram.asm
@@ -1,7 +1,5 @@
 ; ==============================
 ; RAM in Use
-StoryState = $7C
-
 org $008000
 base $7E0730