diff --git a/font.s b/font.s index fca127d..f570bc9 100644 --- a/font.s +++ b/font.s @@ -196,11 +196,11 @@ s_Number: qbyte $00F00F00 s_Dollar: - qbyte $00FFFF00 - qbyte $0F000FF0 - qbyte $0F000FF0 - qbyte $0FFFFFF0 - qbyte $00FFFF00 + qbyte $00666600 + qbyte $06616660 + qbyte $06166660 + qbyte $06666660 + qbyte $00666600 qbyte $00000000 s_Percent: diff --git a/gamemanager.s b/gamemanager.s index 4fecc11..1360522 100644 --- a/gamemanager.s +++ b/gamemanager.s @@ -377,11 +377,9 @@ fire: basePalette: - ; Color 0 and 1 must both be sky blue. Compiled rendering uses PHD (which must contain $0000), - ; and span rendering uses fill mode, so 0 can't be used there .word $0aef,$0080,$0080,$0861,$0c93,$0eb4,$0d66,$0f9a,$0777,$0f00,$0bbb,$ddd,$007b,$0ff0,$0000,$0fff statusBarPalette: - .word $0888,$0aef,$0F00,$0861,$0c93,$0eb4,$0d66,$0f9a,$00f0,$0fff,$0bbb,$ddd,$007b,$0000,$0ff0,$0fff + .word $0aef,$0fff,$0aef,$0aef,$0aef,$0aef,$0d66,$0aef,$0aef,$0aef,$0aef,$0aef,$0aef,$0aef,$0aef,$0000 diff --git a/gscats.2mg b/gscats.2mg index 401c3fe..9aac3f9 100644 Binary files a/gscats.2mg and b/gscats.2mg differ diff --git a/inventory.s b/inventory.s index 1f768ad..edf3ecf 100644 --- a/inventory.s +++ b/inventory.s @@ -157,6 +157,11 @@ awardTreats: clc lda playerData+PD_TREATS,y adc PARAML0 + cmp #999 + bmi awardTreatsStore + lda #999 ; Clamp treats at 3 digits + +awardTreatsStore: sta playerData+PD_TREATS,y ldy currentPlayer diff --git a/player.s b/player.s index 81e4e66..a2159d5 100644 --- a/player.s +++ b/player.s @@ -23,7 +23,7 @@ playerData: .word 1 ; Base Sprite .word 0,5,7,0,0,0,0,0 ; Prices .word 0 ; Current weapon - .word 7 ; Treats + .word 998 ; Treats .repeat 86 .byte 0 ; Padding to 256-byte boundary @@ -366,11 +366,11 @@ renderPlayerHeader: jsr drawNumber lda #treatsStr - ldx #126 + 321 + ldx #142 + 321 jsr DrawString lda playerData+PD_TREATS,y - ldx #130 + 321 + ldx #146 + 321 jsr drawNumber RESTORE_AXY @@ -383,6 +383,6 @@ powerStr: angerStr: pstring "): " treatsStr: - pstring "$ " + pstring "$ "