fix: swamola issue with cached sprites

refactor: move some hooks

enemizer/blindboss.asm

@@ -2,7 +2,17 @@
 ; Blind Boss fight
 ;--------------------------------------------------------------------------------
 
-print "Blind Spawn Code Check: ", pc
+pushpc
+
+org $9DA081					; Original Code
+	JML check_blind_boss_room
+Check_for_Blind_Fight:
+
+org $9DA090
+Initialize_Blind_Fight:
+
+pullpc
+
 check_blind_boss_room:
 	LDA $A0                             ; load room index (low byte)
 	CMP #172 : BNE +                    ; Is is Thieves Town Boss Room

enemizer/enemizerflags.asm

@@ -6,7 +6,7 @@ db #$00 ;368100 ; Enable random enemy under bushes
 db #$00 ;408101 : 200101 ; Enable blind's door closing for other bosses
 .moldorm_eye_count
 db #$01 ;408102 : 200102 ; Moldorm eye count, default to 2 eyes (1)
-.randomize_sprites
+EnemizerFlag_Randomize_Sprites:
 db #$00 ;408103 : 200103 ; Randomize Sprites.
 .agahnim_fun_balls
 db #$00 ;408104 : 200104 ; make Agahnim balls deflect back

enemizer/hooks.asm

@@ -14,6 +14,4 @@ incsrc hooks/damage_hooks.asm
 
 incsrc hooks/overworld_sprite_hooks.asm
 
-incsrc hooks/underworld_sprite_hooks.asm
-
-incsrc hooks/blindboss_hooks.asm
+incsrc hooks/underworld_sprite_hooks.asm

enemizer/hooks/blindboss_hooks.asm

@@ -1,11 +0,0 @@
-
-;================================================================================
-; Blind Boss fight
-;--------------------------------------------------------------------------------
-
-org $9DA081					; Original Code
-	JML check_blind_boss_room
-Check_for_Blind_Fight:
-
-org $9DA090
-Initialize_Blind_Fight:

enemizer/main.asm

@@ -47,6 +47,7 @@ incsrc bossdrop.asm
 incsrc moldorm.asm
 incsrc kodongo_fixes.asm
 incsrc mimic_fixes.asm
+incsrc swamola_fix.asm
 ; vitreous key fix for boss shuffle - uses FixPrizeOnTheEyes flag
 
 incsrc overworld_sprites.asm

enemizer/swamola_fix.asm

@@ -0,0 +1,18 @@
+pushpc
+
+org $8683B5
+JSL MaybeDoCachedSprites  ; JSL ExecuteCachedSprites
+
+org $9DE9DA
+ExecuteCachedSprites:
+
+pullpc
+
+MaybeDoCachedSprites:
+  LDA.l EnemizerFlag_Randomize_Sprites
+  BNE .enemizer
+
+  JML ExecuteCachedSprites ; what we copied over
+
+.enemizer
+  RTL