From 0b6de8edc44e32ad7b4fc5191e7c0402d4051945 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Fri, 20 Dec 2024 11:01:11 -0500
Subject: [PATCH] Cleanup dungeon code

---
 Dungeons/crumblefloor_tag.asm  | 60 +++++++++-------------------------
 Dungeons/custom_tag.asm        | 25 ++++----------
 Dungeons/keyblock.asm          | 10 ++----
 Dungeons/spike_subtype.asm     |  3 --
 Dungeons/together_warp_tag.asm |  6 ++--
 Oracle_main.asm                |  1 -
 6 files changed, 28 insertions(+), 77 deletions(-)

diff --git a/Dungeons/crumblefloor_tag.asm b/Dungeons/crumblefloor_tag.asm
index 985ace6..a3e4492 100644
--- a/Dungeons/crumblefloor_tag.asm
+++ b/Dungeons/crumblefloor_tag.asm
@@ -58,28 +58,15 @@ SpawnFallingTile:
 
   .next
   LDA.l $7FF800, X : BNE .skip
-
-    LDA.b #$03 ; GARNISH 03
-    STA.l $7FF800, X
-
+    ; GARNISH 03
+    LDA.b #$03 : STA.l $7FF800, X
     LDA.w $022A : STA.l $7FF83C, X
     LDA.w $022B : STA.l $7FF878, X
-
-    LDA.w $0228
-    CLC
-    ADC.b #$10
-    STA.l $7FF81E, X
-
-    LDA.w $0229
-    ADC.b #$00
-    STA.l $7FF85A, X
-
+    LDA.w $0228 : CLC : ADC.b #$10 : STA.l $7FF81E, X
+    LDA.w $0229 : ADC.b #$00 : STA.l $7FF85A, X
     LDA.b #$1F : STA.l $7FF90E, X
-
     STA.w $0FB4
-
     BRA .exit
-
   .skip
   DEX
   BPL .next
@@ -113,28 +100,20 @@ update_pit_tile:
 replace_crack_pit:
 {
   LDX.w $1000
-
-  LDA.w #$0CCC : STA.w $1006,X
-
-  LDA.w #$0CDC : STA.w $100C,X
-
-  LDA.w #$0CCD : STA.w $1012,X
-
-  LDA.w #$0CDD : STA.w $1018,X
+  LDA.w #$0CCC : STA.w $1006, X
+  LDA.w #$0CDC : STA.w $100C, X
+  LDA.w #$0CCD : STA.w $1012, X
+  LDA.w #$0CDD : STA.w $1018, X
 
   LDX.b $06
-
   LDA.w #$0CCC : STA.l $7E2000, X
   LDA.w #$0CDC : STA.l $7E2080, X
   LDA.w #$0CCD : STA.l $7E2002, X
   LDA.w #$0CDD : STA.l $7E2082, X
 
   LDA.w #$01E9 : AND.w #$03FF : TAX
-
-  LDA.l $7EFE00,X
-  AND.w #$00FF
-  STA.b $08
-  STA.b $09
+  LDA.l $7EFE00, X : AND.w #$00FF
+  STA.b $08 : STA.b $09
 
   JMP replace_tile_continue
 }
@@ -144,10 +123,10 @@ replace_tile_pit:
   LDX.w $1000
 
   LDA.w #$01E9
-  STA.w $1006,X
-  STA.w $100C,X
-  STA.w $1012,X
-  STA.w $1018,X
+  STA.w $1006, X
+  STA.w $100C, X
+  STA.w $1012, X
+  STA.w $1018, X
 
   LDX.b $06
 
@@ -164,15 +143,8 @@ replace_tile_pit:
   STA.l $7F2000, X
   STA.l $7F2040, X
 
-
-  LDA.w #$01E9
-  AND.w #$03FF
-  TAX
-
-  LDA.l $7EFE00,X
-  AND.w #$00FF
-  STA.b $08
-  STA.b $09
+  LDA.w #$01E9 : AND.w #$03FF : TAX
+  LDA.l $7EFE00, X : AND.w #$00FF : STA.b $08 : STA.b $09
 
   JMP replace_tile_continue
 }
diff --git a/Dungeons/custom_tag.asm b/Dungeons/custom_tag.asm
index d5eb163f..b1972a0 100644
--- a/Dungeons/custom_tag.asm
+++ b/Dungeons/custom_tag.asm
@@ -5,18 +5,16 @@
 StoryState = $7C
 RoomTag_Return = $01CC5A
 
-org $01CC18 ; override routine 0x39 "Holes(7)"
-  JML CustomTag
+; override routine 0x39 "Holes(7)"
+org $01CC18 : JML CustomTag
 
-org $01CC10
-  RoomTag_Holes5:
-  JML RoomTag_MinishShutterDoor
+; RoomTag_Holes5
+org $01CC10 : JML RoomTag_MinishShutterDoor
 
 pullpc
 CustomTag:
 {
   PHX
-
   LDA $7EF3C6 : BNE .game_has_begun
     JSR HouseTag_Main
   .game_has_begun
@@ -30,7 +28,6 @@ CustomTag:
 HouseTag_Main:
 {
   LDA.w StoryState
-
   JSL $008781
 
   dw HouseTag_TelepathicPlea
@@ -39,7 +36,7 @@ HouseTag_Main:
 
   HouseTag_TelepathicPlea:
   {
-    LDA #$08 : STA $7EE000 ; Set the time to 8:00am
+    LDA.b #$08 : STA $7EE000 ; Set the time to 8:00am
     LDA.b #$03 : STA.w $012C ; Play the deku tree music
 
     ; -------------------------------
@@ -64,12 +61,9 @@ HouseTag_Main:
     ; Lighten the screen gradually and then wake Link up partially
     LDA $1A : AND.b #$03 : BNE .delay
       LDA $9C : CMP.b #$00 : BEQ .colorTargetReached
-
         DEC $9C : DEC $9D
-
-    .delay
-    RTS
-
+      .delay
+      RTS
     .colorTargetReached
 
     INC $0D80, X
@@ -92,12 +86,10 @@ HouseTag_Main:
     RTS
   }
 
-
   HouseTag_End:
   {
     LDA $B6 : BNE .hasMetFarore
       LDA #$00 : STA.w StoryState
-
     .hasMetFarore
     RTS
   }
@@ -115,12 +107,9 @@ RoomTag_MinishShutterDoor:
     LDX.w #$0000 : CPX.w $0468 : BEQ .exit
       STZ.w $0468
       STZ.w $068E : STZ.w $0690
-
       SEP #$30
-
       LDA.b #$1B : STA.w $012F
       LDA.b #$05 : STA.b $11
-
     .exit
     SEP #$30
   .no_minish
diff --git a/Dungeons/keyblock.asm b/Dungeons/keyblock.asm
index e49a3b3..dd9e0e4 100644
--- a/Dungeons/keyblock.asm
+++ b/Dungeons/keyblock.asm
@@ -35,14 +35,11 @@ Object_KeyBlock:
 }
 
 ; Fix draw bug from floor tile left by block after unlock.
-org $01EBC8
-  LDA.w $9B5A, Y
+org $01EBC8 : LDA.w $9B5A, Y
 
-org $01EBD1
-  LDA.w $9B54, Y
+org $01EBD1 : LDA.w $9B54, Y
 
-org $01EBDA
-  LDA.w $9B5C, Y
+org $01EBDA : LDA.w $9B5C, Y
 
 ; Draw Values
 ; 50 - /
@@ -54,7 +51,6 @@ org $01EBDA
 ; 5C - xy mirror
 ; 5E - y mirror
 
-
 org $00AFE6
   dw $4936
   ; 0100 1001 0011 0110
diff --git a/Dungeons/spike_subtype.asm b/Dungeons/spike_subtype.asm
index f872e03..f2fe965 100644
--- a/Dungeons/spike_subtype.asm
+++ b/Dungeons/spike_subtype.asm
@@ -17,7 +17,6 @@ org $1EBD0E
 JSL NewSpikeCollision
 RTS
 
-
 pullpc
 speedValuesH:
 db $20, $10, $18, $28, $30, $38, $40, $FF
@@ -40,10 +39,8 @@ NewSpikePrep:
 NewSpikeCollision:
 {
   LDA.b #$04 : STA.w SprTimerA, X
-
   LDA.w SprXSpeed, X : EOR.b #$FF : INC A : STA.w SprXSpeed, X
   LDA.w SprYSpeed, X : EOR.b #$FF : INC A : STA.w SprYSpeed, X
-
   LDA.b #$05 : JSL $0DBB7C ; Sound_SetSfx2PanLong
   RTL
 }
diff --git a/Dungeons/together_warp_tag.asm b/Dungeons/together_warp_tag.asm
index bae37e7..2ff44cd 100644
--- a/Dungeons/together_warp_tag.asm
+++ b/Dungeons/together_warp_tag.asm
@@ -8,11 +8,9 @@
 ; depending on the player's position in the room. This uses
 ; the 4 "stairs" properties in the room header.
 
-org $01CC1C
-  JML WarpTag
+org $01CC1C : JML WarpTag
 
-org $01CC5A
-  WarpTag_Return:
+WarpTag_Return = $01CC5A
 
 pullpc ; Bank 0x2C
 WarpTag:
diff --git a/Oracle_main.asm b/Oracle_main.asm
index 5934bb4..9249706 100644
--- a/Oracle_main.asm
+++ b/Oracle_main.asm
@@ -44,7 +44,6 @@ namespace Oracle
 
   incsrc "Core/music_macros.asm"
   incsrc "Core/symbols.asm"
-
   incsrc "Core/message.asm"
 
   print "  -- Music --  "