diff --git a/enemizer/blindboss.asm b/enemizer/blindboss.asm index 4e495dc..1702295 100644 --- a/enemizer/blindboss.asm +++ b/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 diff --git a/enemizer/enemizerflags.asm b/enemizer/enemizerflags.asm index e406db7..5e3808c 100644 --- a/enemizer/enemizerflags.asm +++ b/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 diff --git a/enemizer/hooks.asm b/enemizer/hooks.asm index 31ec286..189b01e 100644 --- a/enemizer/hooks.asm +++ b/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 \ No newline at end of file +incsrc hooks/underworld_sprite_hooks.asm \ No newline at end of file diff --git a/enemizer/hooks/blindboss_hooks.asm b/enemizer/hooks/blindboss_hooks.asm deleted file mode 100644 index 2d67736..0000000 --- a/enemizer/hooks/blindboss_hooks.asm +++ /dev/null @@ -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: \ No newline at end of file diff --git a/enemizer/main.asm b/enemizer/main.asm index b6a2cc5..4f19a03 100644 --- a/enemizer/main.asm +++ b/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 diff --git a/enemizer/swamola_fix.asm b/enemizer/swamola_fix.asm new file mode 100644 index 0000000..4b4a3ff --- /dev/null +++ b/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 \ No newline at end of file