From b79c4c713de47e33038e1fad9db533229cbbd3bc Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Tue, 21 Feb 2023 11:44:34 -0800 Subject: [PATCH] Move start-map in collision event --- src/oquonie.tal | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/src/oquonie.tal b/src/oquonie.tal index 8103103..b29a15d 100644 --- a/src/oquonie.tal +++ b/src/oquonie.tal @@ -611,7 +611,13 @@ JMP2r JMP2r @e/map =e/blank/draw =&collide =e/blank/load -&collide ( e* -- ) !start-map +&collide ( e* -- ) + ( lock timed redraw ) + ;on-frame-lock .Screen/vector DEO2 + ;on-map .Controller/vector DEO2 + ( fill screen ) + ;patt-icns/2 #05 draw-fill + #0003 ADD2 LDA !draw-map @e/owl =&draw =&collide =&load &draw ( e* -- ) @@ -936,7 +942,7 @@ JMP2r @get-spell ( e* -- spell ) - INC2k LDA2 ;e/ramen-lobby EQU2 ?&ramen + INC2k LDA2 ;e/ramen-lobby EQU2 ?&ramen #0003 ADD2 LDA JMP2r @@ -957,20 +963,6 @@ JMP2r JMP2r -( -@|map ) - -@start-map ( e* -- ) - - ( lock timed redraw ) - ;on-frame-lock .Screen/vector DEO2 - ;on-map .Controller/vector DEO2 - ( fill screen ) - ;patt-icns/2 #05 draw-fill - #0003 ADD2 LDA - -!draw-map - ( @|dialog ) @@ -1351,23 +1343,19 @@ JMP2r ( dl ) #20 STH2kr #01 draw-frame/single ( bb ) ,&w LDR #20 STH2kr #0010 ADD2 #01 draw-frame/repeat ( dr ) #30 STH2r #00 - -( >> ) - &single ( color addr* auto -- ) .Screen/auto DEO .Screen/addr DEO2 &paint ( mask -- ) #85 SWP ORA .Screen/sprite DEO -JMP2r - + JMP2r &repeat ( times color addr* auto -- ) .Screen/auto DEO .Screen/addr DEO2 STH #00 &l STHkr draw-frame/paint INC GTHk ?&l POP2 POPr -JMP2r + JMP2r ( @|animations )