alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

fix: swamola issue with cached sprites

Browse Source 
refactor: move some hooks
This commit is contained in:
aerinon
2024-01-26 11:33:32 -07:00
parent 50dec603e2
commit 23f839cced
6 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
enemizer/blindboss.asm
View File

@@ -2,7 +2,17 @@
; Blind Boss fight ; 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: check_blind_boss_room:
LDA $A0 ; load room index (low byte) LDA $A0 ; load room index (low byte)
CMP #172 : BNE + ; Is is Thieves Town Boss Room CMP #172 : BNE + ; Is is Thieves Town Boss Room

2
enemizer/enemizerflags.asm
View File

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

2
enemizer/hooks.asm
View File

@@ -15,5 +15,3 @@ incsrc hooks/damage_hooks.asm
incsrc hooks/overworld_sprite_hooks.asm incsrc hooks/overworld_sprite_hooks.asm
incsrc hooks/underworld_sprite_hooks.asm incsrc hooks/underworld_sprite_hooks.asm
incsrc hooks/blindboss_hooks.asm

11
enemizer/hooks/blindboss_hooks.asm
View File

@@ -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:

1
enemizer/main.asm
View File

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

18
enemizer/swamola_fix.asm Normal file
View File

@@ -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