From 7967035cc33409c8eb53972221dc0f4527a3440a Mon Sep 17 00:00:00 2001 From: blondie7575 Date: Sun, 28 Jan 2024 12:12:58 -0700 Subject: [PATCH] Added victory screen --- Art/Assets/Font16x16.gif | Bin 2724 -> 2720 bytes Art/Assets/Font16x16.xcf | Bin 8174 -> 7861 bytes fonts.s | 90 +++++++++++++++++++-------------------- gamemanager.s | 24 +++++++++++ 4 files changed, 69 insertions(+), 45 deletions(-) diff --git a/Art/Assets/Font16x16.gif b/Art/Assets/Font16x16.gif index 6d032bd9e9bee67a98b33bf700e91e44512775c1..14143b56eb8fe1cd12715b5f2c1d71e70c83379b 100644 GIT binary patch delta 2592 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 C@g-OQ delta 2596 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 delta 853 zcmZ8fJ&P1U5Ur}7S!cV(o;_|6+#PZ8az8*!7P&K4@X%jy;H3tq27dqLzL(7)9KHRN_~ zZr!`TeP?uI>*4m!Xzh|kiEUWs&n!2-<=f1$l5xHV?P9zs<14o;q+POmNRBF_f_zxk zWNP-;_$aJRRD7xI7wQ#M^k+~FExd7f>u8U-n#SEQimyUAS5X>hn(Gk%9c}pxQ|w?Qb+Y4=)xpr@ z4&)4SfwP5$FXE@wGaLW=JGuxesFFf7mCRw_vJ*&m>M(kH9ws6=ZuaZEE%&&8`nr{a mCtcTefy68cOP!X-UAFIqb%gGGqS`m1xBt8UzWW!N=W^=+ 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!"