From 3504f3c530e77ef06a477db1110ab644151a13ab Mon Sep 17 00:00:00 2001
From: p4plus2 <p4plus2@gmail.com>
Date: Sat, 28 Feb 2015 21:50:51 -0800
Subject: [PATCH] Finished up most of the constants in the range 8000-FFFF

---
 bank_B4.asm |  2 +-
 bank_B6.asm | 58 ++++++++++++++++++++++++----------------------
 bank_B8.asm | 20 +++++++++-------
 bank_BA.asm | 66 ++++++++++++++++++++++++++++++-----------------------
 4 files changed, 81 insertions(+), 65 deletions(-)

diff --git a/bank_B4.asm b/bank_B4.asm
index 95e90d3..96a649c 100644
--- a/bank_B4.asm
+++ b/bank_B4.asm
@@ -6821,7 +6821,7 @@ CODE_B4BFF3:	LDY #$016C
 CODE_B4BFF6:	JSL CODE_BB842C
 CODE_B4BFFA:	LDX $68
 CODE_B4BFFC:	STX $066C
-CODE_B4BFFF:	LDX #$BED1
+CODE_B4BFFF:	LDX #DATA_B4BED1
 CODE_B4C002:	LDA $08CE
 CODE_B4C005:	BEQ CODE_B4C008
 CODE_B4C007:	DEC A
diff --git a/bank_B6.asm b/bank_B6.asm
index 01ab939..7075344 100644
--- a/bank_B6.asm
+++ b/bank_B6.asm
@@ -3628,7 +3628,7 @@ CODE_B6A844:	LDX #$A512
 CODE_B6A847:	LDA.l $000763
 CODE_B6A84B:	CMP #$0003
 CODE_B6A84E:	BNE CODE_B6A853
-CODE_B6A850:	LDX #$A5EF
+CODE_B6A850:	LDX #CODE_B6A5EF
 CODE_B6A853:	STX $42,y
 CODE_B6A855:	LDA #$0002
 CODE_B6A858:	STA $000761
@@ -4131,7 +4131,7 @@ CODE_B6AD28:	RTL
 
 CODE_B6AD29:	LDA #$0774
 CODE_B6AD2C:	JSL CODE_B58003
-CODE_B6AD30:	LDX #$D14B
+CODE_B6AD30:	LDX #DATA_B6D14B
 CODE_B6AD33:	LDA $0000,x
 CODE_B6AD36:	STA $000650
 CODE_B6AD3A:	LDY $0002,x
@@ -4278,28 +4278,30 @@ CODE_B6AE72:	RTL
 DATA_B6AE73:
 db $00, $00, $00, $00, $00, $00, $00, $00
 db $02, $00, $02, $00, $02, $00, $02, $00
-db $01, $00, $01, $00, $26, $00, $6E, $02
-db $6D, $01, $73, $AE, $27, $00, $00, $40
-db $26, $00, $04, $02, $6D, $01, $73, $AE
-db $27, $00, $00, $00, $26, $00, $D0, $01
-db $D8, $01, $73, $AE, $26, $00, $B6, $02
-db $D8, $01, $73, $AE, $27, $00, $00, $40
-db $26, $00, $B6, $02, $40, $02, $73, $AE
-db $26, $00, $D0, $01, $40, $02, $73, $AE
-db $27, $00, $00, $00, $26, $00, $D0, $01
-db $A8, $02, $73, $AE, $26, $00, $B6, $02
-db $A8, $02, $73, $AE, $27, $00, $00, $40
-db $26, $00, $74, $02, $CD, $02, $73, $AE
-db $26, $00, $04, $02, $CD, $02, $73, $AE
-db $27, $00, $00, $00, $26, $00, $D0, $01
-db $A8, $02, $73, $AE, $26, $00, $B6, $02
-db $A8, $02, $73, $AE, $27, $00, $00, $40
-db $26, $00, $B6, $02, $40, $02, $73, $AE
-db $26, $00, $D0, $01, $40, $02, $73, $AE
-db $27, $00, $00, $00, $26, $00, $D0, $01
-db $D8, $01, $73, $AE, $26, $00, $B6, $02
-db $D8, $01, $73, $AE, $27, $00, $00, $40
-db $02, $00, $00, $00
+db $01, $00, $01, $00
+
+DATA_B6AE87:
+db $26, $00, $6E, $02, $6D, $01, $73, $AE
+db $27, $00, $00, $40, $26, $00, $04, $02
+db $6D, $01, $73, $AE, $27, $00, $00, $00
+db $26, $00, $D0, $01, $D8, $01, $73, $AE
+db $26, $00, $B6, $02, $D8, $01, $73, $AE
+db $27, $00, $00, $40, $26, $00, $B6, $02
+db $40, $02, $73, $AE, $26, $00, $D0, $01
+db $40, $02, $73, $AE, $27, $00, $00, $00
+db $26, $00, $D0, $01, $A8, $02, $73, $AE
+db $26, $00, $B6, $02, $A8, $02, $73, $AE
+db $27, $00, $00, $40, $26, $00, $74, $02
+db $CD, $02, $73, $AE, $26, $00, $04, $02
+db $CD, $02, $73, $AE, $27, $00, $00, $00
+db $26, $00, $D0, $01, $A8, $02, $73, $AE
+db $26, $00, $B6, $02, $A8, $02, $73, $AE
+db $27, $00, $00, $40, $26, $00, $B6, $02
+db $40, $02, $73, $AE, $26, $00, $D0, $01
+db $40, $02, $73, $AE, $27, $00, $00, $00
+db $26, $00, $D0, $01, $D8, $01, $73, $AE
+db $26, $00, $B6, $02, $D8, $01, $73, $AE
+db $27, $00, $00, $40, $02, $00, $00, $00
 
 
 CODE_B6AF2F:	LDA $06,x
@@ -7392,7 +7394,7 @@ db $01, $00, $02, $00, $00, $00, $02, $00
 db $01, $00, $02, $00, $00, $00, $01, $00
 db $01, $00, $02, $00, $00, $00, $01, $00
 db $01, $00, $01, $00
-
+DATA_B6CEA7:
 
 CODE_B6CEA7:	PHB
 CODE_B6CEA8:	PHK
@@ -7701,6 +7703,8 @@ db $00, $00, $00, $00, $00, $00, $00, $00
 
 DATA_B6D143:
 db $00, $00, $90, $03, $00, $01, $55, $93
+
+DATA_B6D14B:
 db $03, $00, $38, $22, $F6, $FF, $F6, $FF
 db $00, $00, $00, $00, $80, $F9, $6A, $22
 db $00, $00, $F6, $FF, $00, $01, $00, $01
@@ -7973,12 +7977,12 @@ CODE_B6D3F2:	LDX $0654
 CODE_B6D3F5:	LDA $2E,x
 CODE_B6D3F7:	BIT #$0040
 CODE_B6D3FA:	BNE CODE_B6D407
-CODE_B6D3FC:	LDY #$D451
+CODE_B6D3FC:	LDY #DATA_B6D451
 CODE_B6D3FF:	JSR CODE_B6D424
 CODE_B6D402:	LDA DATA_B6D453,y
 CODE_B6D405:	BRA CODE_B6D410
 
-CODE_B6D407:	LDY #$D451
+CODE_B6D407:	LDY #DATA_B6D451
 CODE_B6D40A:	JSR CODE_B6D424
 CODE_B6D40D:	LDA DATA_B6D463,y
 CODE_B6D410:	LDY $68
diff --git a/bank_B8.asm b/bank_B8.asm
index e98ff51..5502cf7 100644
--- a/bank_B8.asm
+++ b/bank_B8.asm
@@ -1653,7 +1653,7 @@ CODE_B88F10:	STA $02,x
 CODE_B88F12:	CLC
 CODE_B88F13:	RTS
 
-CODE_B88F14:	LDY #$8F2F
+CODE_B88F14:	LDY #DATA_B88F2F
 CODE_B88F17:	STY $32
 CODE_B88F19:	LDA $6E
 CODE_B88F1B:	SEC
@@ -1667,10 +1667,10 @@ CODE_B88F27:	LDA $0000,y
 CODE_B88F2A:	JSL CODE_B58003
 CODE_B88F2E:	RTL
 
-CODE_B88F2F:	EOR $05
-CODE_B88F31:	EOR $05
-CODE_B88F33:	EOR $051805
-CODE_B88F37:	ROR $05
+DATA_B88F2F:
+db $45, $05, $45, $05, $4F, $05, $18, $05
+db $66, $05
+
 CODE_B88F39:	LDA $6C
 CODE_B88F3B:	BNE CODE_B88F3F
 CODE_B88F3D:	CLC
@@ -9835,16 +9835,16 @@ CODE_B8D24A:	LDA $052B
 CODE_B8D24D:	AND #$3000
 CODE_B8D250:	CMP #$3000
 CODE_B8D253:	BNE CODE_B8D25A
-CODE_B8D255:	LDA #$D332
+CODE_B8D255:	LDA #DATA_B8D332
 CODE_B8D258:	BRA CODE_B8D269
 
 CODE_B8D25A:	LDA $88
 CODE_B8D25C:	CMP #$0006
 CODE_B8D25F:	BEQ CODE_B8D266
-CODE_B8D261:	LDA #$D302
+CODE_B8D261:	LDA #DATA_B8D302
 CODE_B8D264:	BRA CODE_B8D269
 
-CODE_B8D266:	LDA #$D2D2
+CODE_B8D266:	LDA #DATA_B8D2D2
 CODE_B8D269:	STA $34
 CODE_B8D26B:	LDX $64
 CODE_B8D26D:	LDA $1E,x
@@ -9909,12 +9909,16 @@ db $00, $00, $00, $00, $00, $00, $00, $00
 db $00, $00, $00, $00, $00, $00, $00, $00
 db $00, $00, $00, $00, $00, $01, $C0, $00
 db $00, $02, $00, $00, $00, $00, $00, $00
+
+DATA_B8D302:
 db $00, $00, $00, $00, $00, $00, $00, $00
 db $00, $00, $00, $00, $00, $00, $00, $00
 db $00, $00, $00, $00, $00, $00, $00, $00
 db $00, $00, $00, $00, $00, $00, $80, $01
 db $00, $01, $00, $03, $00, $01, $C0, $00
 db $00, $02, $00, $00, $00, $00, $00, $00
+
+DATA_B8D332:
 db $00, $00, $00, $00, $00, $00, $00, $00
 db $00, $00, $00, $00, $00, $01, $00, $00
 db $00, $08, $80, $01, $00, $00, $00, $08
diff --git a/bank_BA.asm b/bank_BA.asm
index 12c3996..abfdd40 100644
--- a/bank_BA.asm
+++ b/bank_BA.asm
@@ -565,7 +565,7 @@ CODE_BA9058:	STZ $32,x
 CODE_BA905A:	STZ $06A1
 CODE_BA905D:	STZ $06A3
 CODE_BA9060:	STZ $06A5
-CODE_BA9063:	LDA #$AE87
+CODE_BA9063:	LDA #DATA_B6AE87
 CODE_BA9066:	STA $00065A
 CODE_BA906A:	LDA #$0009
 CODE_BA906D:	STA $000652
@@ -581,7 +581,7 @@ CODE_BA908A:	STA $42,x
 CODE_BA908C:	STZ $44,x
 CODE_BA908E:	LDA #$000A
 CODE_BA9091:	STA $000755
-CODE_BA9095:	LDA #$9318
+CODE_BA9095:	LDA #DATA_BA9318
 CODE_BA9098:	STA $000757
 CODE_BA909C:	JSR CODE_BA9B0E
 CODE_BA909F:	LDA.l $000652
@@ -824,16 +824,20 @@ CODE_BA92F5:	RTL
 CODE_BA92F6:	LDA #$0005
 CODE_BA92F9:	STA $0006ED
 CODE_BA92FD:	STA $000715
-CODE_BA9301:	LDA #$9314
+CODE_BA9301:	LDA #DATA_BA9314
 CODE_BA9304:	STA $0006EB
 CODE_BA9308:	STA $000713
-CODE_BA930C:	LDA #$9318
+CODE_BA930C:	LDA #DATA_BA9318
 CODE_BA930F:	STA $000711
 CODE_BA9313:	RTS
 
 DATA_BA9314:
-db $04, $6C, $E6, $6B, $98, $00, $99, $00
-db $9A, $00, $9B, $00, $9A, $00, $99, $00
+db $04, $6C, $E6, $6B
+
+DATA_BA9318:
+db $98, $00, $99, $00, $9A, $00, $9B, $00
+db $9A, $00, $99, $00
+DATA_BA9324:
 
 CODE_BA9324:	LDX $64
 CODE_BA9326:	LDA $0006E9
@@ -854,7 +858,7 @@ CODE_BA9348:	JSL CODE_BB8C40
 CODE_BA934C:	STZ $070D
 CODE_BA934F:	LDX $64
 CODE_BA9351:	STZ $44,x
-CODE_BA9353:	LDA #$AE87
+CODE_BA9353:	LDA #DATA_B6AE87
 CODE_BA9356:	STA $46,x
 CODE_BA9358:	JSR CODE_BA9B0E
 CODE_BA935B:	BRL CODE_BA9439
@@ -1070,7 +1074,7 @@ CODE_BA953D:	BRL CODE_BA95C3
 
 CODE_BA9540:	LDA #$00AA
 CODE_BA9543:	STA $000717
-CODE_BA9547:	LDX #$98E6
+CODE_BA9547:	LDX #DATA_BA98E6
 CODE_BA954A:	LDA $0000,x
 CODE_BA954D:	STA $000650
 CODE_BA9551:	PHX
@@ -1093,7 +1097,7 @@ CODE_BA957B:	ADC #$000C
 CODE_BA957E:	TAX
 CODE_BA957F:	DEC $0650
 CODE_BA9582:	JSR CODE_BA9736
-CODE_BA9585:	LDX #$9918
+CODE_BA9585:	LDX #DATA_BA9918
 CODE_BA9588:	LDA $0000,x
 CODE_BA958B:	STA $000650
 CODE_BA958F:	PHX
@@ -1126,9 +1130,9 @@ CODE_BA95D4:	LDA #$0235
 CODE_BA95D7:	JSL CODE_B9D0C6
 CODE_BA95DB:	LDX $0654
 CODE_BA95DE:	STX $64
-CODE_BA95E0:	LDA #$CE3B
+CODE_BA95E0:	LDA #DATA_B6CE3B
 CODE_BA95E3:	STA $20,x
-CODE_BA95E5:	LDA #$CEA7
+CODE_BA95E5:	LDA #DATA_B6CEA7
 CODE_BA95E8:	STA $22,x
 CODE_BA95EA:	LDA #$0001
 CODE_BA95ED:	STA $24,x
@@ -1142,7 +1146,7 @@ CODE_BA95FE:	BRA CODE_BA9603
 
 CODE_BA9600:	LDA #$0001
 CODE_BA9603:	STA $28,x
-CODE_BA9605:	LDA #$AF3E
+CODE_BA9605:	LDA #CODE_B6AF3E
 CODE_BA9608:	STA $44,x
 CODE_BA960A:	PLX
 CODE_BA960B:	STX $64
@@ -1190,9 +1194,9 @@ CODE_BA967C:	BRA CODE_BA9696
 CODE_BA967E:	LDA $2E,x
 CODE_BA9680:	ORA #$0400
 CODE_BA9683:	STA $2E,x
-CODE_BA9685:	LDA #$96CA
+CODE_BA9685:	LDA #DATA_BA96CA
 CODE_BA9688:	STA $20,x
-CODE_BA968A:	LDA #$9736
+CODE_BA968A:	LDA #DATA_BA9736
 CODE_BA968D:	STA $22,x
 CODE_BA968F:	LDA #$0001
 CODE_BA9692:	STA $24,x
@@ -1242,7 +1246,7 @@ db $FD, $FF, $FD, $FF, $03, $00, $03, $00
 db $03, $00, $FD, $FF, $FD, $FF, $FD, $FF
 db $03, $00, $03, $00, $03, $00, $FD, $FF
 db $FD, $FF, $FD, $FF
-
+DATA_BA9736:
 
 CODE_BA9736:	PHX
 CODE_BA9737:	LDY #$1EC8
@@ -1435,11 +1439,14 @@ db $F2, $FF, $C0, $FF, $00, $00, $02, $00
 db $51, $00, $FC, $FF, $E7, $FF, $A0, $FF
 db $00, $00, $02, $00, $51, $00, $14, $00
 db $E2, $FF, $A0, $FF, $00, $00, $02, $00
-db $51, $00, $03, $00, $00, $00, $D6, $FF
-db $80, $FF, $00, $00, $02, $00, $51, $00
-db $E7, $FF, $F2, $FF, $C0, $FF, $00, $00
-db $01, $00, $51, $00, $00, $00, $FA, $FF
-db $A0, $FF, $00, $00, $01, $00, $51, $00
+db $51, $00
+
+DATA_BA9918:
+db $03, $00, $00, $00, $D6, $FF, $80, $FF
+db $00, $00, $02, $00, $51, $00, $E7, $FF
+db $F2, $FF, $C0, $FF, $00, $00, $01, $00
+db $51, $00, $00, $00, $FA, $FF, $A0, $FF
+db $00, $00, $01, $00, $51, $00
 
 CODE_BA993E:	LDX $0654
 CODE_BA9941:	LDA $2E,x
@@ -1489,6 +1496,7 @@ CODE_BA99A0:	BRA CODE_BA99A6
 CODE_BA99A2:	JSL CODE_B9D100
 CODE_BA99A6:	JML [$05A9]
 
+%offset(DATA_BA99A7, -2)
 DATA_BA99A9:
 db $E7, $FF, $FE, $FF, $13, $00, $15, $00
 
@@ -1507,7 +1515,7 @@ CODE_BA99C7:	JSL CODE_BCFB58
 CODE_BA99CB:	LDA #$0000
 CODE_BA99CE:	JSL CODE_B6CF65
 CODE_BA99D2:	LDX $0656
-CODE_BA99D5:	LDY #$99A7
+CODE_BA99D5:	LDY #DATA_BA99A7
 CODE_BA99D8:	JSL CODE_B6E736
 CODE_BA99DC:	LDA #$0200
 CODE_BA99DF:	LDY #$0000
@@ -1577,9 +1585,9 @@ CODE_BA9A7D:	LDY $0757
 CODE_BA9A80:	LDA $0000,y
 CODE_BA9A83:	INY
 CODE_BA9A84:	INY
-CODE_BA9A85:	CPY #$9324
+CODE_BA9A85:	CPY #DATA_BA9324
 CODE_BA9A88:	BNE CODE_BA9A8D
-CODE_BA9A8A:	LDY #$9318
+CODE_BA9A8A:	LDY #DATA_BA9318
 CODE_BA9A8D:	STY $0757
 CODE_BA9A90:	LDX $64
 CODE_BA9A92:	JSL CODE_BB8C44
@@ -1684,7 +1692,7 @@ CODE_BA9B5F:	STZ $0703
 CODE_BA9B62:	STZ $06FB
 CODE_BA9B65:	LDA #$0010
 CODE_BA9B68:	STA $2E,x
-CODE_BA9B6A:	LDA #$AFE7
+CODE_BA9B6A:	LDA #DATA_B6AFE7
 CODE_BA9B6D:	STA $00065A
 CODE_BA9B71:	LDA #$0003
 CODE_BA9B74:	STA $000652
@@ -1801,7 +1809,7 @@ CODE_BA9C85:	LDY $0656
 CODE_BA9C88:	LDA #$01FC
 CODE_BA9C8B:	STY $68
 CODE_BA9C8D:	JSL CODE_B9D09B
-CODE_BA9C91:	LDA #$A0B8
+CODE_BA9C91:	LDA #DATA_BAA0B8
 CODE_BA9C94:	STA $000658
 CODE_BA9C98:	LDA #$000A
 CODE_BA9C9B:	STA $00065A
@@ -1826,9 +1834,9 @@ CODE_BA9CC7:	LDA #$0208
 CODE_BA9CCA:	JSL CODE_B9D0C6
 CODE_BA9CCE:	LDX $0654
 CODE_BA9CD1:	STX $64
-CODE_BA9CD3:	LDA #$CE3B
+CODE_BA9CD3:	LDA #DATA_B6CE3B
 CODE_BA9CD6:	STA $20,x
-CODE_BA9CD8:	LDA #$CEA7
+CODE_BA9CD8:	LDA #DATA_B6CEA7
 CODE_BA9CDB:	STA $22,x
 CODE_BA9CDD:	LDA #$0001
 CODE_BA9CE0:	STA $24,x
@@ -1842,7 +1850,7 @@ CODE_BA9CF1:	BRA CODE_BA9CF6
 
 CODE_BA9CF3:	LDA #$0001
 CODE_BA9CF6:	STA $28,x
-CODE_BA9CF8:	LDA #$CEBE
+CODE_BA9CF8:	LDA #CODE_B6CEBE
 CODE_BA9CFB:	STA $44,x
 CODE_BA9CFD:	PLX
 CODE_BA9CFE:	STX $64
@@ -3647,7 +3655,7 @@ CODE_BAB679:	LDA #$0038
 CODE_BAB67C:	JSL CODE_BB80B0
 CODE_BAB680:	LDA #$0037
 CODE_BAB683:	JSL CODE_BB80AC
-CODE_BAB687:	LDA #$B90B
+CODE_BAB687:	LDA #DATA_BAB90B
 CODE_BAB68A:	STA $000662
 CODE_BAB68E:	LDA #$0008
 CODE_BAB691:	STA $00065E