Remove quick death

TheJoeSmo · Nov 4, 2023 · e102b2a · e102b2a
1 parent 5a71ad7
commit e102b2a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/PRG/prg000.asm b/PRG/prg000.asm
@@ -5857,7 +5857,7 @@ Player_Die:
     LDA #-64
     STA Player_YVel ; Player_YVel = -64
 
-    LDA #$10
+    LDA #$30
     STA Event_Countdown ; Event_Countdown = $30 (ticks until dropped back to map)
 
     LDA #$01

diff --git a/PRG/prg029.asm b/PRG/prg029.asm
@@ -2114,14 +2114,10 @@ Player_Die_Dying:
     LDA Player_AboveTop
     BNE PRG029_D6DA  ; If Player is above top of screen, jump to PRG029_D6DA
 
-    NOP
-    NOP
-    NOP
-    NOP
-    NOP
-    NOP
-    NOP
-    JMP PRG029_D6E5
+    LDA Player_SpriteY
+    AND #$f0
+    CMP #$b0
+    BEQ PRG029_D6E5  ; If Player_SpriteY >= $B0 && Player_SpriteY <= $BF (Player is halfway below status bar), jump to PRG029_D6E5
 
 PRG029_D6DA:
     LDA Event_Countdown