changeset 17:972825b01d81

Label some data tables. Add labels for the keywrod list and the demo game command list.
author William Astle <lost@l-w.ca>
date Wed, 24 Dec 2014 21:36:31 -0700
parents 03f9d6493148
children 7c4ca17c8436
files dod.s
diffstat 1 files changed, 60 insertions(+), 60 deletions(-) [+]
line wrap: on
line diff
--- a/dod.s	Wed Dec 24 14:01:34 2014 -0700
+++ b/dod.s	Wed Dec 24 21:36:31 2014 -0700
@@ -1205,11 +1205,11 @@
 		tst 11,y
 		bne LC632
 		lda 9,y
-		ldx #LD8F4
+		ldx #kw_supreme
 		bsr LC63E
 		clr -1,u
 LC632		lda 10,y
-		ldx #LD96B
+		ldx #kw_flask
 		bsr LC63E
 		ldx #V313
 LC63C		puls a,b,y,u,pc
@@ -2039,18 +2039,18 @@
 		tst V313			; set flags for whether we have a filename
 		puls a,x,u,pc			; restore registers and return
 LCBBA		clr V290
-		ldx #LD96A
+		ldx #kwlist_obj
 		bsr LCBEC
 		bmi LCBC8
 		beq LCBDF
 		std V28E
 		rts
 LCBC8		dec V290
-		ldx #LD8F3
+		ldx #kwlist_adj
 		bsr LCBE7
 		ble LCBDF
 		std V28E
-		ldx #LD96A
+		ldx #kwlist_obj
 		bsr LCBEC
 		ble LCBDF
 		cmpb V28F
@@ -2097,7 +2097,7 @@
 LCC2B		ldd V203
 LCC2D		std ,s
 LCC2F		puls a,b,x,y,u,pc
-LCC31		ldx #LD8D9
+LCC31		ldx #kwlist_dir
 		bsr LCBEC
 		ble LCBDF
 		ldu #V21F
@@ -2872,7 +2872,7 @@
 		bra LD2B4
 LD28C		fcb $00,$24,$24,$1c
 		fcb $24,$ff
-LD292		ldx #LD894
+LD292		ldx #kwlist_cmd
 		jsr LCBEC
 		beq LD2A7
 		bpl LD2A1
@@ -3091,7 +3091,7 @@
 		jsr LCFE1
 		bmi LD46F
 		sta V2C1
-		ldx #LD8D9
+		ldx #kwlist_dir
 		jsr LCBEC
 		ble LD46F
 		ldb V2C1
@@ -3263,7 +3263,7 @@
 LD5B7		dod S0D
 		dod S0E
 		rts
-cmd_incant	ldx #LD8F3
+cmd_incant	ldx #kwlist_adj
 		jsr LCBEC
 		ble LD5EF
 		tst V27B
@@ -3319,7 +3319,7 @@
 		clr 11,u
 		dod S0D
 LD63E		rts
-cmd_turn	ldx #LD8D9
+cmd_turn	ldx #kwlist_dir
 		jsr LCBEC
 		ble LD693
 		ldb V223
@@ -3387,7 +3387,7 @@
 LD6C6		fcb $10,$00,$10,$ff
 		fcb $ff,$88,$00,$88
 		fcb $ff,$fe
-cmd_move	ldx #LD8D9
+cmd_move	ldx #kwlist_dir
 		jsr LCBEC
 		blt LD693
 		bgt LD6E3
@@ -3540,7 +3540,7 @@
 		fcb $4c				V208
 		fdb LD870			screenvis - pointer to primary display screen info
 		fdb LD876			screendraw - pointer to secondary display screen info
-		fdb LD988			V20D - pointer to demo game command sequence
+		fdb demogame			V20D - pointer to demo game command sequence
 		fdb VB15			V20F
 		fdb V2F1			V211
 		fcb $0c				V213
@@ -3607,31 +3607,31 @@
 ; This is the keyword table used for command parsing. Each keyword is stored in packed format.
 ; Each keyword is preceded by a value which indicates the object type. Where the object type is
 ; not relevant, that value will be zero. The value is shown in parentheses below.
-LD894		fcb 15				15 keywords in the command list
-LD895		fcb $30,$03,$4a,$04,$6b		"ATTACK" keyword
+kwlist_cmd	fcb 15				15 keywords in the command list
+kw_attack	fcb $30,$03,$4a,$04,$6b		"ATTACK" keyword
 		fcb $28,$06,$c4,$b4,$40		"CLIMB" keyword
 		fcb $20,$09,$27,$c0		"DROP" keyword
-LD8A3		fcb $38,$0b,$80,$b5,$2e,$28	"EXAMINE" keyword
+kw_examine	fcb $38,$0b,$80,$b5,$2e,$28	"EXAMINE" keyword
 		fcb $18,$0e,$5a,$00		"GET" keyword
 		fcb $30,$12,$e1,$85,$d4		"INCANT" keyword
-LD8B2		fcb $20,$18,$f7,$ac		"LOOK" keyword
-LD8B6		fcb $20,$1A,$fb,$14		"MOVE" keyword
-LD8BA		fcb $20,$21,$56,$30		"PULL" keyword
+kw_look		fcb $20,$18,$f7,$ac		"LOOK" keyword
+kw_move		fcb $20,$1A,$fb,$14		"MOVE" keyword
+kw_pull		fcb $20,$21,$56,$30		"PULL" keyword
 		fcb $30,$24,$5b,$14,$2c		"REVEAL" keyword
 		fcb $20,$27,$47,$dc		"STOW" keyword
-LD8C7		fcb $20,$29,$59,$38		"TURN" keyword
-LD8CB		fcb $18,$2b,$32,$80		"USE" keyword
+kw_turn		fcb $20,$29,$59,$38		"TURN" keyword
+kw_use		fcb $18,$2b,$32,$80		"USE" keyword
 		fcb $28,$34,$c7,$84,$80		"ZLOAD" keyword
 		fcb $28,$35,$30,$d8,$a0		"ZSAVE" keyword
-LD8D9		fcb 6				6 keywords in direction list
-LD8DA		fcb $20,$18,$53,$50		"LEFT" keyword
-LD8DE		fcb $28,$24,$93,$a2,$80		"RIGHT" keyword
+kwlist_dir	fcb 6				6 keywords in direction list
+kw_left		fcb $20,$18,$53,$50		"LEFT" keyword
+kw_right	fcb $28,$24,$93,$a2,$80		"RIGHT" keyword
 		fcb $20,$04,$11,$ac		"BACK" keyword
 		fcb $30,$03,$27,$d5,$c4		"AROUND" keyword		
 		fcb $10,$2b,$00			"UP" keyword
 		fcb $20,$08,$fb,$b8		"DOWN" keyword
-LD8F3		fcb 25				25 keywords in the misc keywords list
-LD8F4		fcb $38,$67,$58,$48,$ad,$28	"SUPREME" keyword (1)
+kwlist_adj	fcb 25				25 keywords in the misc keywords list
+kw_supreme	fcb $38,$67,$58,$48,$ad,$28	"SUPREME" keyword (1)
 		fcb $28,$54,$fa,$b0,$a0		"JOULE" keyword (1)
 		fcb $31,$0a,$cb,$26,$68		"ELVISH" keyword (4)
 		fcb $38,$da,$9a,$22,$49,$60	"MITHRIL" keyword (3)
@@ -3656,58 +3656,58 @@
 		fcb $20,$4e,$f6,$10		"GOLD" keyword (1)
 		fcb $28,$0a,$d8,$53,$20		"EMPTY" keyword (0)
 		fcb $21,$48,$50,$90		"DEAD" keyword (5)
-LD96A		fcb 6				6 object types in the following list
-LD96B		fcb $28,$0c,$c0,$cd,$60		"FLASK" keyword (0)
+kwlist_obj	fcb 6				6 object types in the following list
+kw_flask	fcb $28,$0c,$c0,$cd,$60		"FLASK" keyword (0)
 		fcb $20,$64,$97,$1c		"RING" keyword (1)
 		fcb $30,$a6,$39,$3d,$8c		"SCROLL" keyword (2)
-LD979		fcb $30,$e6,$84,$95,$84		"SHIELD" keyword (3)
-LD97E		fcb $29,$27,$77,$c8,$80		"SWORD" keyword (4)
-LD983		fcb $29,$68,$f9,$0d,$00		"TORCH" keyword (5)
+kw_shield	fcb $30,$e6,$84,$95,$84		"SHIELD" keyword (3)
+kw_sword	fcb $29,$27,$77,$c8,$80		"SWORD" keyword (4)
+kw_torch	fcb $29,$68,$f9,$0d,$00		"TORCH" keyword (5)
 ; The following is the sequence of commands used in the demo game
-LD988		fcb 1				EXAMINE
-		fdb LD8A3
+demogame	fcb 1				EXAMINE
+		fdb kw_examine
 		fcb 3				PULL RIGHT TORCH
-		fdb LD8BA
-		fdb LD8DE
-		fdb LD983
+		fdb kw_pull
+		fdb kw_right
+		fdb kw_torch
 		fcb 2				USE RIGHT
-		fdb LD8CB
-		fdb LD8DE
+		fdb kw_use
+		fdb kw_right
 		fcb 1				LOOK
-		fdb LD8B2
+		fdb kw_look
 		fcb 1				MOVE
-		fdb LD8B6
+		fdb kw_move
 		fcb 3				PULL LEFT SHIELD
-		fdb LD8BA
-		fdb LD8DA
-		fdb LD979
+		fdb kw_pull
+		fdb kw_left
+		fdb kw_shield
 		fcb 3				PULL RIGHT SWORD
-		fdb LD8BA
-		fdb LD8DE
-		fdb LD97E
+		fdb kw_pull
+		fdb kw_right
+		fdb kw_sword
 		fcb 1				MOVE
-		fdb LD8B6
+		fdb kw_move
 		fcb 1				MOVE
-		fdb LD8B6
+		fdb kw_move
 		fcb 2				ATTACK RIGHT
-		fdb LD895
-		fdb LD8DE
+		fdb kw_attack
+		fdb kw_right
 		fcb 2				TURN RIGHT
-		fdb LD8C7
-		fdb LD8DE
-		fcb 1				MOVE
-		fdb LD8B6
-		fcb 1				MOVE
-		fdb LD8B6
+		fdb kw_turn
+		fdb kw_right
 		fcb 1				MOVE
-		fdb LD8B6
+		fdb kw_move
+		fcb 1				MOVE
+		fdb kw_move
+		fcb 1				MOVE
+		fdb kw_move
 		fcb 2				TURN RIGHT
-		fdb LD8C7
-		fdb LD8DE
+		fdb kw_turn
+		fdb kw_right
 		fcb 1				MOVE
-		fdb LD8B6
+		fdb kw_move
 		fcb 1				MOVE
-		fdb LD8B6
+		fdb kw_move
 		fcb $ff
 ; jump table for commands
 LD9D0		fdb cmd_attack			ATTACK