Fix fire speed for ice palace rooms

2020-04-08 17:04:33 -06:00
parent 4fe97f9b7f
commit 7f935d6ff9
4 changed files with 14 additions and 3 deletions
--- a/Rom.py
+++ b/Rom.py
@@ -22,7 +22,7 @@ from EntranceShuffle import door_addresses, exit_ids


 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = 'da4e48a9692a3f7c488dfb3dcaa58f42'
+RANDOMIZERBASEHASH = '5af37026eb2c5a5d21a2d16724be805c'


 class JsonRom(object):
--- a/asm/drhooks.asm
+++ b/asm/drhooks.asm
@@ -89,6 +89,11 @@ jsl FixShopCode
 org $1ddeea ; <- Bank1D.asm : 286 (JSL Sprite_LoadProperties)
 jsl VitreousKeyReset

+org $1ed024 ;  f5024 sprite_guruguru_bar.asm : 27 (LDA $040C : CMP.b #$12 : INY #2
+jsl GuruguruFix : bra .next
+nop #3
+.next
+
 ; also rando's hooks.asm line 1360
 org $a0ee11 ; <- 6FC4C - headsup_display.asm : 836 (LDA $7EF36E : AND.w #$00FF : ADD.w #$0007 : AND.w #$FFF8 : TAX)
 jsl DrHudOverride
--- a/asm/overrides.asm
+++ b/asm/overrides.asm
@@ -68,3 +68,9 @@ VitreousKeyReset:
        stz $0cba, x
    + jsl $0db818 ;restore old code
    rtl
+
+GuruguruFix:
+    lda $a0 : cmp #$df : !bge +
+        and #$0f : cmp #$0e : !blt +
+            iny #2
+    + rtl
--- a/data/base2current.json
+++ b/data/base2current.json