Transition Fix

Remove offscreen Monsters during transitions.
DevEd2 · Sep 29, 2021 · ba6e6aa · ba6e6aa
1 parent 2c53751
commit ba6e6aa
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/Engine/GameModes/Level.asm b/Engine/GameModes/Level.asm
@@ -514,6 +514,7 @@ Level_TransitionUp:
     ld      a,[Engine_CameraY]
     sub     SCRN_Y/16
     ld      [Engine_CameraY],a
+    call    TransitionUpdateMonsters
     call    BeginSprites
     call    DrawPlayer
     call    RenderMonsters
@@ -570,6 +571,7 @@ Level_TransitionDown:
     ld      a,[Engine_CameraY]
     add     SCRN_Y/16
     ld      [Engine_CameraY],a
+    call    TransitionUpdateMonsters
     call    BeginSprites
     call    DrawPlayer
     call    RenderMonsters

diff --git a/Engine/Object.asm b/Engine/Object.asm
@@ -2,9 +2,6 @@
 ; Object System
 ; ==============
 
-; TODO
-; - Object Behaviors
-
 section "Object Memory",wram0
 
 MONSTER_COUNT               equ 16  ; maximum number of monster slots
@@ -1508,6 +1505,33 @@ UpdateMonsters:
   ld  [Engine_CurrentScreen],a
   ret
   
+TransitionUpdateMonsters:
+  ld  b,0
+  ld  c,MONSTER_COUNT-1
+  ld  a,[Engine_CameraY]
+  ld  d,a
+.updateLoop:
+  ld  hl,Monster_ID
+  add hl,bc
+  ld  a,[hl]
+  or  a
+  jr  z,.nextMonster
+  ld  hl,Monster_YPosition
+  add hl,bc
+  ld  a,[hl]
+  cp  d
+  jr  c,.removeMonster
+  sub SCRN_Y
+  cp  d
+  jr  c,.nextMonster
+.removeMonster:
+  call  DeleteMonster
+.nextMonster:
+  dec c
+  bit 7,c
+  jr  nz,.updateLoop
+  ret
+  
 ; Update Monster animations
 AnimateMonsters:
   ld  b,0