Cleanup dungeon tags, prepare for CustomTag system

Dungeons/dungeons.asm

@@ -14,19 +14,17 @@ org $028BE7
 ; Module06_UnderworldLoad
 org $028364
 {
-  #_028364: LDA.b #$00 ; Fixed color RGB: #808000
-  #_028366: STA.b $9C
+  LDA.b #$00 ; Fixed color RGB: #808000
+  STA.b $9C
 
-  #_028368: LDA.b #$00
-  #_02836A: STA.b $9D
+  LDA.b #$00 : STA.b $9D
 
-  #_02836C: LDA.b #$00
-  #_02836E: STA.b $9E
-  #_028370: LDA.b #$00
-  #_028372: STA.l $7EC005
-  #_028376: STA.l $7EC006
+  LDA.b #$00 : STA.b $9E
+  LDA.b #$00
+  STA.l $7EC005
+  STA.l $7EC006
 
-  #_02837A: JSL $079A2C ; Link_TuckIntoBed
+  JSL $079A2C ; Link_TuckIntoBed
 }
 
 incsrc "Dungeons/enemy_damage.asm"
@@ -40,7 +38,6 @@ print  "End of object_handler.asm         ", pc
 
 ; Tag: Holes8
 incsrc "Dungeons/together_warp_tag.asm"
-incsrc "Dungeons/spike_subtype.asm"
 
 ; Tag: Holes7
 incsrc "Dungeons/house_tag.asm"
@@ -49,6 +46,8 @@ incsrc "Dungeons/house_tag.asm"
 incsrc "Dungeons/floor_puzzle.asm"
 print "End of floor_puzzle.asm           ", pc
 
+incsrc "Dungeons/spike_subtype.asm"
+
 incsrc "Dungeons/attract_scenes.asm"
 print  "End of attract_scenes.asm         ", pc
 

Dungeons/keyblock.asm

@@ -1,4 +1,4 @@
-; =============================================================================
+; ==========================================================
 ; Key Block Object like Link's Awakening
 ; Overwrites the Prison Door
 ;
@@ -12,7 +12,7 @@
 ;
 ; The key block must always be placed on EVEN x and y.
 ; 00, 02, 04, 06, 08, 0A, 0C, 0E
-; =============================================================================
+; ==========================================================
 
 ; Big chest key for compass
 org $01EC1A
@@ -32,16 +32,17 @@ Object_KeyBlock:
   DEC A				    ; remove one key
   STA $7EF36F			; save the new value at small key counter position
   BRA $05				  ; branch to the code that opens the prison door
+}
 
 ; Fix draw bug from floor tile left by block after unlock.
 org $01EBC8
-  LDA.w $9B5A,y
+  LDA.w $9B5A, Y
 
 org $01EBD1
-  LDA.w $9B54,y
+  LDA.w $9B54, Y
 
 org $01EBDA
-  LDA.w $9B5C,y
+  LDA.w $9B5C, Y
 
 ; Draw Values
 ; 50 - /
@@ -52,9 +53,6 @@ Object_KeyBlock:
 ; 5A - y mirror
 ; 5C - xy mirror
 ; 5E - y mirror
-}
-
-; =============================================================================
 
 
 org $00AFE6

Dungeons/spike_subtype.asm

@@ -28,23 +28,25 @@ db $00, $00, $00, $00, $00, $00, $00, $FF
 db $20, $18, $20, $28, $30, $38, $40, $FF
 
 NewSpikePrep:
+{
   PHB : PHK : PLB
   LDA $0E30, X : TAY
   LDA.w speedValuesH, Y : STA $0D50, X
   LDA.w speedValuesV, Y : STA $0D40, X
   PLB
   RTL
-
+}
 
 NewSpikeCollision:
+{
   LDA.b #$04 : STA $0DF0, X
 
   LDA $0D50, X : EOR.b #$FF : INC A : STA $0D50, X
   LDA $0D40, X : EOR.b #$FF : INC A : STA $0D40, X
 
   LDA.b #$05 : JSL $0DBB7C ; Sound_SetSfx2PanLong
-
   RTL
+}
 
 print  "End of spike_subtype.asm          ", pc
 pushpc

Dungeons/together_warp_tag.asm

@@ -1,20 +1,12 @@
-; ==============================================================================
+; ==========================================================
 ; Special Warp room tag
 ; Written by Jared_Brian_
 ; 11-19-2022
 ;
-; Edit by scawful since I'm already using Holes(7) 
-; ==============================================================================
-; Replaces the "Holes(8)" tag in HM or ZS. Makes it so that what room the player
-; will warp to when falling in a hole or using a warp pad will change depending
-; on the player's position in the room. This uses the 4 "stairs" properties in 
-; the room header.
-
-; ==============================================================================
-
-;relpaces the original tag.
-
-; dw $CC1C ; = $CC1C* ; routine 0x3A "Holes(8)"
+; Makes it so that what room the player will warp to when
+; falling in a hole or using a warp pad will change
+; depending on the player's position in the room. This uses
+; the 4 "stairs" properties in the room header.
 
 org $01CC1C
   JML WarpTag
@@ -22,8 +14,6 @@ org $01CC1C
 org $01CC5A
   WarpTag_Return:
 
-; ==============================================================================
-
 pullpc ; Bank 0x2C
 WarpTag:
 {
@@ -46,4 +36,3 @@ WarpTag:
 print  "End of together_warp_tag.asm      ", pc
 pushpc
 
-; ==============================================================================