From fa72adb53d0ba076936d011cce5281c1eda36d41 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Sun, 13 Jul 2025 00:27:22 -0500
Subject: [PATCH] Restore Kodongo AI when in vanilla rooms

---
 enemizer/kodongo_fixes.asm | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/enemizer/kodongo_fixes.asm b/enemizer/kodongo_fixes.asm
index b803f94..14041ed 100644
--- a/enemizer/kodongo_fixes.asm
+++ b/enemizer/kodongo_fixes.asm
@@ -2,8 +2,7 @@ pushpc
 
 org $9EC147
 JSL NewKodongoCollision
-JMP .continue : NOP #2
-.continue
+BRA + : NOP #3 : +
 
 org $9EC152
 Kodongo_SetDirection:
@@ -12,8 +11,18 @@ pullpc
 
 NewKodongoCollision:
     LDA.w SpriteMoveDirection, X : INC A : AND.b #$03 : STA.w SpriteMoveDirection, X
+    JSL Kodongo_InVanillaRoom : BEQ .continue
     ;If they collide more than 4 times just set direction
     LDA.w SpriteAuxTable, X : INC A : STA.w SpriteAuxTable, X : CMP.b #$04 : BCC .continue
     PLA : PLA : PEA.w Kodongo_SetDirection-1
 .continue
-RTL
\ No newline at end of file
+RTL
+
+Kodongo_InVanillaRoom:
+    LDA.b RoomIndex+1 : BNE .return
+    LDA.b RoomIndex : CMP.b #$19 : BEQ .return
+    CMP.b #$27 : BEQ .return
+    CMP.b #$77 : BEQ .return
+.return
+RTL
+nop #10
\ No newline at end of file