diff --git a/Art/Assets/Font16x16.gif b/Art/Assets/Font16x16.gif index 6d032bd..14143b5 100644 Binary files a/Art/Assets/Font16x16.gif and b/Art/Assets/Font16x16.gif differ diff --git a/Art/Assets/Font16x16.xcf b/Art/Assets/Font16x16.xcf index 5c5f342..90de66d 100644 Binary files a/Art/Assets/Font16x16.xcf and b/Art/Assets/Font16x16.xcf differ diff --git a/fonts.s b/fonts.s index bf5e101..08d70d7 100644 --- a/fonts.s +++ b/fonts.s @@ -6420,156 +6420,156 @@ font16char32: font16char33: tya tcs - ; Line 15, Pixel values: 2222 2000 0000 0000 + ; Line 15, Pixel values: faaa a000 0000 0000 tsc sec sbc #6 tcs - pea $2222 + pea $aafa lda 3,S and #$ff0f - ora #$0020 + ora #$00a0 sta 3,S - ; Line 14, Pixel values: 2222 2000 0000 0000 + ; Line 14, Pixel values: fbbb a000 0000 0000 tsc sec sbc #158 tcs - pea $2222 + pea $bbfb lda 3,S and #$ff0f - ora #$0020 + ora #$00a0 sta 3,S - ; Line 13, Pixel values: 2222 2000 0000 0000 + ; Line 13, Pixel values: fbbb a000 0000 0000 tsc sec sbc #158 tcs - pea $2222 + pea $bbfb lda 3,S and #$ff0f - ora #$0020 + ora #$00a0 sta 3,S - ; Line 12, Pixel values: 2222 2000 0000 0000 + ; Line 12, Pixel values: fbbb a000 0000 0000 tsc sec sbc #158 tcs - pea $2222 + pea $bbfb lda 3,S and #$ff0f - ora #$0020 + ora #$00a0 sta 3,S - ; Line 11, Pixel values: 2222 2000 0000 0000 + ; Line 11, Pixel values: ffff f000 0000 0000 tsc sec sbc #158 tcs - pea $2222 + pea $ffff lda 3,S and #$ff0f - ora #$0020 + ora #$00f0 sta 3,S ; Line 10, Pixel values: 0000 0000 0000 0000 - ; Line 9, Pixel values: 2222 2000 0000 0000 + ; Line 9, Pixel values: faaa a000 0000 0000 tsc sec sbc #318 tcs - pea $2222 + pea $aafa lda 3,S and #$ff0f - ora #$0020 + ora #$00a0 sta 3,S - ; Line 8, Pixel values: 2222 2000 0000 0000 + ; Line 8, Pixel values: fbbb a000 0000 0000 tsc sec sbc #158 tcs - pea $2222 + pea $bbfb lda 3,S and #$ff0f - ora #$0020 + ora #$00a0 sta 3,S - ; Line 7, Pixel values: 8222 2000 0000 0000 + ; Line 7, Pixel values: fbbb a000 0000 0000 tsc sec sbc #158 tcs - pea $2282 + pea $bbfb lda 3,S and #$ff0f - ora #$0020 + ora #$00a0 sta 3,S - ; Line 6, Pixel values: 8822 2000 0000 0000 + ; Line 6, Pixel values: fbbb a000 0000 0000 tsc sec sbc #158 tcs - pea $2288 + pea $bbfb lda 3,S and #$ff0f - ora #$0020 + ora #$00a0 sta 3,S - ; Line 5, Pixel values: 8882 2000 0000 0000 + ; Line 5, Pixel values: fbbb a000 0000 0000 tsc sec sbc #158 tcs - pea $8288 + pea $bbfb lda 3,S and #$ff0f - ora #$0020 + ora #$00a0 sta 3,S - ; Line 4, Pixel values: 8888 2000 0000 0000 + ; Line 4, Pixel values: fbbb a000 0000 0000 tsc sec sbc #158 tcs - pea $8888 + pea $bbfb lda 3,S and #$ff0f - ora #$0020 + ora #$00a0 sta 3,S - ; Line 3, Pixel values: 8888 8000 0000 0000 + ; Line 3, Pixel values: fbbb a000 0000 0000 tsc sec sbc #158 tcs - pea $8888 + pea $bbfb lda 3,S and #$ff0f - ora #$0080 + ora #$00a0 sta 3,S - ; Line 2, Pixel values: 8888 8000 0000 0000 + ; Line 2, Pixel values: fbbb a000 0000 0000 tsc sec sbc #158 tcs - pea $8888 + pea $bbfb lda 3,S and #$ff0f - ora #$0080 + ora #$00a0 sta 3,S - ; Line 1, Pixel values: 8888 8000 0000 0000 + ; Line 1, Pixel values: fbbb a000 0000 0000 tsc sec sbc #158 tcs - pea $8888 + pea $bbfb lda 3,S and #$ff0f - ora #$0080 + ora #$00a0 sta 3,S - ; Line 0, Pixel values: 8888 8000 0000 0000 + ; Line 0, Pixel values: ffff f000 0000 0000 tsc sec sbc #158 tcs - pea $8888 + pea $ffff lda 3,S and #$ff0f - ora #$0080 + ora #$00f0 sta 3,S jmp renderCharJumpReturn_font16 diff --git a/gamemanager.s b/gamemanager.s index c82dbb9..8cc58e9 100644 --- a/gamemanager.s +++ b/gamemanager.s @@ -334,8 +334,28 @@ endTurnWrap: ; Handles someone winning ; endGame: + SAVE_AXY + + lda currentPlayer + beq endGame0 + + lda #victoryText1 + bra endGameRender + +endGame0: + lda #victoryText0 + +endGameRender: + sta PARAML0 + ldy #$48b7 + lda #2 + jsl renderStringFar + + jsr kbdWaitForAnyKey lda #1 sta quitRequested + + RESTORE_AXY rts @@ -535,3 +555,7 @@ mapScrollPos: rightScreenEdge: ; Right edge minus one game object width, for easy render clipping .word 160-GAMEOBJECTWIDTH/4-2 +victoryText0: + pstring "SPROCKET WINS!" +victoryText1: + pstring " TINKER WINS!"