Start of lift processing #36

picosonic · Mar 13, 2023 · 39ea04d · 39ea04d
1 parent 0aac01f
commit 39ea04d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/beeb/objects.asm b/beeb/objects.asm
@@ -742,11 +742,6 @@ noofmoving = (endofmovingdata-movingdata)/movingsize
   EQUW switchrou1
   EQUW daisyrou1
 
-;; TEMPORARY - Placeholder empty routines
-.resetlift
-  JMP printmoving ; At least draw it for now
-
-.liftrou
 .trollrou
 .daggerrou
 .rethere
@@ -1858,7 +1853,7 @@ resetportswitch = resetmachines
 
   LDA breathingfire
   CLC:ADC #&01
-  CMP #48:BCS juststoreit
+  CMP #48:BCC juststoreit
 
   LDA #&00
 .juststoreit
@@ -1962,6 +1957,31 @@ turnonfullbucket = movingsize+room
   LDA #STR_plantbeanmess:JSR findroomstr
   JMP windowrou
 }
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;LIFT
+.resetlift
+{
+  LDY #movey:LDA (zptr4), Y
+  LDY #oldmovex:CMP (zptr4), Y
+  BCS notfirstlift
+
+  LDA (zptr4), Y
+  LDY #movey:STA (zptr4), Y
+
+.notfirstlift
+  ; TODO - add code
+
+.drawdownlp
+  ; TODO - add code
+  JSR printmoving
+  ; TODO - add code
+
+  RTS ; TODO should be plotattris
+}
+
+.liftrou
+{
+  RTS
+}
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;DOZY FLOATING
 .resetdozyfloat
 {

diff --git a/beeb/progress.odt b/beeb/progress.odt