Merge Unstable into EdgeWork

asm/drhooks.asm

@@ -38,7 +38,7 @@ org $029396 ; <- 11384 - Bank02.asm : 3641 (LDA $01C322, X)
 jsl StraightStairLayerFix
 
 ; Graphics fix
-org $02895d
+org $02895d ; Bank 02 line 1812 (JSL Dungeon_LoadRoom : JSL Dungeon_InitStarTileChr : JSL $00D6F9 : INC $B0)
 Splicer:
 jsl GfxFixer
 lda $b1 : beq .done
@@ -46,10 +46,14 @@ rts
 nop #5
 .done
 
-org $00fda4
+org $00d377 ;Bank 00 line 3185
+DecompDungAnimatedTiles:
+org $00fda4 ;Bank 00 line 8882
 Dungeon_InitStarTileCh:
 org $00d6ae ;(PC: 56ae)
 LoadTransAuxGfx:
+org $00d739 ;
+LoadTransAuxGfx_Alt:
 org $00df5a ;(PC: 5f5a)
 PrepTransAuxGfx:
 org $0ffd65 ;(PC: 07fd65)
@@ -86,7 +90,31 @@ org $2081f2
 jsl MirrorCheckOverride2
 org $20825c
 jsl MirrorCheckOverride2
+org $07a955 ; <- Bank07.asm : around 6564 (JP is a bit different) (STZ $05FC : STZ $05FD)
+jsl BlockEraseFix
+nop #2
 
+org $02b82a
+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
+org $098638 ; rando's hooks.asm line 2192
+jsl CountChestKeys
+org $06D192 ; rando's hooks.asm line 457
+jsl CountAbsorbedKeys
+; rando's hooks.asm line 1020
+org $05FC7E ; <- 2FC7E - sprite_dash_item.asm : 118 (LDA $7EF36F : INC A : STA $7EF36F)
+jsl CountBonkItem
 
 ; These two, if enabled together, have implications for vanilla BK doors in IP/Hera/Mire
 ; IPBJ is common enough to consider not doing this. Mire is not a concern for vanilla - maybe glitched modes