Merge branch 'DRUnstable' into OWMain

enemizer/hooks.asm

@@ -14,4 +14,13 @@ incsrc hooks/damage_hooks.asm
 
 incsrc hooks/overworld_sprite_hooks.asm
 
-incsrc hooks/underworld_sprite_hooks.asm
+incsrc hooks/underworld_sprite_hooks.asm
+
+org $85B8BA
+JSL GeldmanDrawOverride
+
+org $9EAAAC
+JSL StalfosKnightDrawOverride
+
+org $9EB209
+JSL BlobDrawOverride

enemizer/underworld_sprites.asm

@@ -8,4 +8,40 @@ GetSpriteSlot16Bit:
 	LDA.b Scrap03 : AND.w #$00FF
 	ASL A
 	TAY
-RTL
+RTL
+
+GeldmanDrawOverride:
+    PLA : PLA : PLA ; fix the call stack
+    LDA.l DRFlags+1 : AND.b #$08 : BEQ .vanilla
+
+    LDA.b #$01
+    STA.w $0DC0,X
+    JML Sprite_4C_Geldman_do_indeed_draw
+
+.vanilla
+    JSL Sprite_PrepOAMCoordLong
+    JML Sprite_4C_Geldman_continue
+
+StalfosKnightDrawOverride:
+		LDA.l DRFlags+1 : AND.b #$08 : BEQ .vanilla
+
+    JSL Sprite_PrepOAMCoordLong
+    LDA.b #$12
+		JML Sprite_DrawShadowLong
+
+.vanilla
+    JSL Sprite_PrepOAMCoordLong
+    RTL
+
+BlobDrawOverride:
+    PLA : PLA : PLA ; fix the call stack
+    LDA.l DRFlags+1 : AND.b #$08 : BEQ .vanilla
+
+    LDA.b #$05
+    STA.w $0DC0,X
+
+    JML SpriteDraw_Blob_head_popping_out
+
+.vanilla
+    JSL Sprite_PrepOAMCoordLong
+    JML SpriteDraw_Blob_bad_gfx