diff --git a/Dungeons/dungeons.asm b/Dungeons/dungeons.asm index 7f2b375..a2f44b9 100644 --- a/Dungeons/dungeons.asm +++ b/Dungeons/dungeons.asm @@ -6,9 +6,6 @@ incsrc "Dungeons/sanctuary_transition.asm" incsrc "Dungeons/entrances.asm" print "End of entrances.asm ", pc -incsrc "Dungeons/mothula.asm" -print "End of mothula.asm ", pc - incsrc "Dungeons/enemy_damage.asm" print "End of enemy_damage.asm ", pc diff --git a/Masks/mask_routines.asm b/Masks/mask_routines.asm index ac43ac6..4b583ae 100644 --- a/Masks/mask_routines.asm +++ b/Masks/mask_routines.asm @@ -378,7 +378,8 @@ DekuLink_HoverBasedOnInput: .auto_cancel - STZ $5D + ; Reset LinkState to Default + STZ $5D #_08B6A5: LDA.b #$01 #_08B6A7: STA.w $0AAA @@ -412,6 +413,10 @@ DekuLink_HoverBasedOnInput: #_08B6F1: STZ.b $5E #_08B6F3: STZ.w $0325 + ; Set height at end of hover + ; This makes it so the landing animation timer looks correct + ; Floating for a bit, then slowly landing on the ground + LDA.b #$12 : STA $24 .no_cancel RTL diff --git a/Sprites/Enemies/poltergeist.asm b/Sprites/Enemies/poltergeist.asm index 696e078..23c6f11 100644 --- a/Sprites/Enemies/poltergeist.asm +++ b/Sprites/Enemies/poltergeist.asm @@ -1,5 +1,5 @@ -!SPRID = $A4; The sprite ID you are overwriting (HEX) +!SPRID = $AF; The sprite ID you are overwriting (HEX) !NbrTiles = 4 ; Number of tiles used in a frame !Harmless = 00 ; 00 = Sprite is Harmful, 01 = Sprite is Harmless !HVelocity = 00 ; Is your sprite going super fast? put 01 if it is