From faadd1d7f1ce119125384ae72bd31a1ffb21a189 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Thu, 5 Jun 2025 19:50:49 -0500
Subject: [PATCH] Fixing boss behavior in Swamp Palace Arrghus' room

---
 enemizer/bosses_moved.asm       | 13 +++++++++++++
 enemizer/hooks/bosses_hooks.asm |  7 +++++++
 vanillalabels.asm               |  1 +
 3 files changed, 21 insertions(+)

diff --git a/enemizer/bosses_moved.asm b/enemizer/bosses_moved.asm
index c5f518c..c11674d 100644
--- a/enemizer/bosses_moved.asm
+++ b/enemizer/bosses_moved.asm
@@ -288,3 +288,16 @@ new_trinexx_code:
 
     RTL
 ;--------------------------------------------------------------------------------
+
+;================================================================================
+; Check if water tile in Swamp boss room, skip interaction
+;--------------------------------------------------------------------------------
+swamp_boss_tile_interaction:
+    LDA.l Sprite_ReducedTileInteractionTable, X : BEQ .return
+    CPX.b #$09 : BNE .return ; return if non-water tile
+    LDX.b IndoorsFlag : BEQ .return ; return if overworld
+    LDX.b RoomIndex : CPX.b #$06 : BNE .return ; return if not swamp boss room
+        LDA.b #$00
+.return
+    RTL
+;--------------------------------------------------------------------------------
diff --git a/enemizer/hooks/bosses_hooks.asm b/enemizer/hooks/bosses_hooks.asm
index f64c68f..5ae4f0b 100644
--- a/enemizer/hooks/bosses_hooks.asm
+++ b/enemizer/hooks/bosses_hooks.asm
@@ -39,3 +39,10 @@ JSL new_kholdstare_code ; Write new gfx in the vram
 org $1DAD67 ; sprite_trinexx.asm (62) : LDA.b #$03 : STA $0DC0, X
 JSL new_trinexx_code : NOP
 ;--------------------------------------------------------------------------------
+
+;================================================================================
+; Swamp Boss Room Water Fix
+;--------------------------------------------------------------------------------
+org $06E81A
+JSL swamp_boss_tile_interaction
+;--------------------------------------------------------------------------------
diff --git a/vanillalabels.asm b/vanillalabels.asm
index 4a5d7eb..fb40811 100644
--- a/vanillalabels.asm
+++ b/vanillalabels.asm
@@ -286,4 +286,5 @@ Overworld_Entrance_ID                                      = $9BBB73
 SwordPaletteOffsets                                        = $9BEBB4
 ShieldPaletteOffsets                                       = $9BEBC1
 LinkMailPalettesOffsets                                    = $9BEC06
+Sprite_ReducedTileInteractionTable                         = $9DF6CF
 RoomData_ObjectDataPointers                                = $9F8000