Dariaceli's Git
Browse code

Replace now-invalid macros in projects.

Andrew Alderwick authored on 10/11/2022 21:54:32
Showing 3 changed files
projects/examples/demos/snake.tal
History View file @ fc3232a
... ... 
@@ -1,9 +1,9 @@
1 1 
 ( uxnasm projects/examples/demos/snake.tal bin/snake.rom && uxnemu bin/snake.rom )
2 2
3 
-%+  { ADD } %-   { SUB }              %/   { DIV }
4 
-%<  { LTH } %>   { GTH }  %=  { EQU } %!   { NEQ }
5 
-%++ { ADD2 } %-- { SUB2 }              %// { DIV2 }
6 
-%<< { LTH2 } %>> { GTH2 } %== { EQU2 } %!! { NEQ2 }
3 
+%+  { ADD }               %/  { DIV }
4 
+%<  { LTH }  %>  { GTH }  %!  { NEQ }
5 
+%++ { ADD2 }              %// { DIV2 }
6 
+%<< { LTH2 } %>> { GTH2 } %!! { NEQ2 }
7 7 
 %2/  { #01 SFT } %2* { #10 SFT }
8 8 
 %8//  { #03 SFT2 } %8**  { #30 SFT2 }
9 9 
 %MOD { DIVk MUL SUB }
... ... 
@@ -65,7 +65,7 @@ BRK
65 65 
 @on-frame ( -> )
66 66
67 67 
 	.arena/timer LDZ INC DUP .arena/timer STZ
68 
-		DIFFICULTY = BRK?
68 
+		DIFFICULTY EQU BRK?
69 69
70 70 
 	( clear ) #00 ;draw-snake JSR2
71 71 
 	( update ) ;move JSR2
... ... 
@@ -82,7 +82,7 @@ BRK
82 82 
 	DUP #08 ! ,&no-escape JCN
83 83 
 		;reset JSR2
84 84 
 		&no-escape
85 
-	#04 SFT DUP #00 = ,&skip JCN
85 
+	#04 SFT DUP #00 EQU ,&skip JCN
86 86 
 		DUP .snake/direction STZ
87 87 
 		&skip
88 88 
 	POP
... ... 
@@ -94,8 +94,8 @@ BRK
94 94 
 	#00 ;draw-snake JSR2
95 95 
 	#00 ;draw-apple JSR2
96 96
97 
-	.arena/w LDZ 2/ #01 - .snake/x STZ
98 
-	.arena/h LDZ 2/ #01 - .snake/y STZ
97 
+	.arena/w LDZ 2/ #01 SUB .snake/x STZ
98 
+	.arena/h LDZ 2/ #01 SUB .snake/y STZ
99 99 
 	#00 .snake/dead STZ
100 100 
 	#00 .snake/length STZ
101 101 
 	#00 .snake/direction STZ
... ... 
@@ -117,11 +117,11 @@ RTN
117 117 
 	POP2
118 118 
 	POP2r
119 119
120 
-	.snake/dead LDZ #00 = JMP RTN
120 
+	.snake/dead LDZ #00 EQU JMP RTN
121 121
122 122 
 	.snake/direction LDZ
123 123 
 	DUP #01 ! ,&no-up JCN
124 
-		.snake/y LDZ #01 -
124 
+		.snake/y LDZ #01 SUB
125 125 
 			.arena/h LDZ MAX
126 126 
 			.snake/y STZ
127 127 
 		&no-up
... ... 
@@ -131,7 +131,7 @@ RTN
131 131 
 			.snake/y STZ
132 132 
 		&no-down
133 133 
 	DUP #04 ! ,&no-left JCN
134 
-		.snake/x LDZ #01 -
134 
+		.snake/x LDZ #01 SUB
135 135 
 			.arena/w LDZ MAX
136 136 
 			.snake/x STZ
137 137 
 		&no-left
projects/examples/old/dungeon.tal
History View file @ fc3232a
... ... 
@@ -1,9 +1,9 @@
1 1 
 ( art by @ritualdust )
2 2
3 
-%+  { ADD } %-   { SUB }              %/   { DIV }
4 
-%<  { LTH } %>   { GTH }  %=  { EQU } %!   { NEQ }
5 
-%++ { ADD2 } %-- { SUB2 }              %// { DIV2 }
6 
-%<< { LTH2 } %>> { GTH2 } %== { EQU2 } %!! { NEQ2 }
3 
+%+  { ADD }               %/  { DIV }
4 
+%<  { LTH }  %>  { GTH }  %!  { NEQ }
5 
+%++ { ADD2 } %-- { SUB2 } %// { DIV2 }
6 
+%<< { LTH2 } %>> { GTH2 } %!! { NEQ2 }
7 7
8 8 
 %8** { #30 SFT2 }
9 9 
 %10** { #40 SFT2 }
... ... 
@@ -13,7 +13,7 @@
13 13
14 14 
 %RTN { JMP2r }
15 15 
 %TOS { #00 SWP }
16 
-%DEC { #01 - }
16 
+%DEC { #01 SUB }
17 17
18 18 
 %MOUSE { #82 }
19 19
... ... 
@@ -45,8 +45,8 @@
45 45 
 	#036f .System/g DEO2
46 46 
 	#003f .System/b DEO2
47 47
48 
-	.Screen/width DEI2 #01 SFT2 #0040 -- .room/x STZ2
49 
-	.Screen/height DEI2 #01 SFT2 #0040 -- .room/y STZ2
48 
+	.Screen/width DEI2 #01 SFT2 #0040 SUB2 .room/x STZ2
49 
+	.Screen/height DEI2 #01 SFT2 #0040 SUB2 .room/y STZ2
50 50
51 51 
 	( vectors )
52 52 
 	;on-frame .Screen/vector DEO2
projects/examples/old/rule110.tal
History View file @ fc3232a
... ... 
@@ -2,10 +2,10 @@
2 2
3 3 
 ( uxnasm rule110.tal rule110.rom && uxnemu rule110.rom )
4 4
5 
-%+  { ADD }  %-  { SUB }  %*  { MUL }  %/  { DIV }
6 
-%<  { LTH }  %>  { GTH }  %=  { EQU }  %!  { NEQ }
7 
-%++ { ADD2 } %-- { SUB2 } %** { MUL2 } %// { DIV2 }
8 
-%<< { LTH2 } %>> { GTH2 } %== { EQU2 } %!! { NEQ2 }
5 
+%+  { ADD }               %*  { MUL }  %/  { DIV }
6 
+%<  { LTH }  %>  { GTH }               %!  { NEQ }
7 
+%++ { ADD2 }              %** { MUL2 } %// { DIV2 }
8 
+%<< { LTH2 } %>> { GTH2 }              %!! { NEQ2 }
9 9
10 10 
 %2*  { #10 SFT } %2/  { #01 SFT } %2**  { #10 SFT2 } %2//  { #01 SFT2 }
11 11 
 %4*  { #20 SFT } %4/  { #02 SFT } %4**  { #20 SFT2 } %4//  { #02 SFT2 }
... ... 
@@ -76,11 +76,11 @@ RTN
76 76 
 	#1000
77 77 
 	&loop
78 78 
 		DUP #00 SWP 8** .Screen/x DEO2
79 
-		( shift ) INCk #10 SWP -
79 
+		( shift ) INCk #10 SWP SUB
80 80 
 		( get address ) STHkr 2* LDZ2
81 81 
 		( bit ) ROT SFT2 #0001 AND2
82 82 
 		( get sprite ) 8** ;cell-icns ++ .Screen/addr DEO2
83 
-		#01 STHkr #00 = + .Screen/sprite DEO
83 
+		#01 STHkr #00 EQU + .Screen/sprite DEO
84 84 
 		INC GTHk ,&loop JCN
85 85 
 	POP2
86 86 
 	POPr
... ... 
@@ -123,14 +123,14 @@ RTN
123 123 
 	.Mouse/y DEI2 DUP2 ,&y STR2 .Screen/y DEO2
124 124
125 125 
 	( colorize on state )
126 
-	#43 [ .Mouse/state DEI #00 ! ] - .Screen/sprite DEO
126 
+	#43 [ .Mouse/state DEI #00 ! ] SUB .Screen/sprite DEO
127 127
128 128 
 	( on click )
129 129 
 	.Mouse/state DEI #00 ! JMP BRK
130 130
131 131 
 	( toggle bit )
132 132 
 	.input LDZ2k
133 
-		#0001 .Mouse/x DEI2 8// #000f SWP2 -- NIP #40 SFT SFT2 EOR2
133 
+		#0001 .Mouse/x DEI2 8// #000f SWP2 SUB2 NIP #40 SFT SFT2 EOR2
134 134 
 		ROT STZ2
135 135 
 	;render JSR2
136 136 
 	( release ) #00 .Mouse/state DEO