Merge branch 'master' into mapper_edit

Author: zohassadar

src/nmi/render_mode_play_and_demo.asm

@@ -231,10 +231,6 @@ updateLineClearingAnimation:
         tay
         lda vramPlayfieldRows,y
         sta generalCounter
-        lda generalCounter
-        clc
-        adc #$06
-        sta generalCounter
 
         iny
         lda vramPlayfieldRows,y

src/nmi/render_util.asm

@@ -55,11 +55,11 @@ render_playfield:
         rts
 
 vramPlayfieldRows:
-        .word   $20C6,$20E6,$2106,$2126
-        .word   $2146,$2166,$2186,$21A6
-        .word   $21C6,$21E6,$2206,$2226
-        .word   $2246,$2266,$2286,$22A6
-        .word   $22C6,$22E6,$2306,$2326
+        .word   $20CC,$20EC,$210C,$212C
+        .word   $214C,$216C,$218C,$21AC
+        .word   $21CC,$21EC,$220C,$222C
+        .word   $224C,$226C,$228C,$22AC
+        .word   $22CC,$22EC,$230C,$232C
 
 copyPlayfieldRowToVRAM:
         ldx vramRow
@@ -76,8 +76,6 @@ copyPlayfieldRowToVRAM:
         dex
 
         lda vramPlayfieldRows,x
-        clc
-        adc #$06
         sta PPUADDR
 @copyRow:
         ldx #$0A

src/playstate/preparenext.asm

@@ -44,36 +44,18 @@ playState_prepareNext:
         lda linecapState
         cmp #LINECAP_HALT
         bne @linecapHaltEnd
-        lda #'G'
-        sta playfield+$67
-        sta playfield+$68
-        lda #$28
-        sta playfield+$6A
-        lda #0
-        sta vramRow
-        jsr typeBEndingStuffEnd
-        rts
+        ldx #<haltEndingGraphic
+        ldy #>haltEndingGraphic
+        jmp copyGraphic
 @linecapHaltEnd:
-
         jsr practisePrepareNext
         inc playState
         rts
-
 typeBEndingStuff:
-        ; copy success graphic
-        ldx #$5C
-        ldy #$0
-@copySuccessGraphic:
-        lda typebSuccessGraphic,y
-        cmp #$80
-        beq @graphicCopied
-        sta playfield,x
-        inx
-        iny
-        jmp @copySuccessGraphic
-@graphicCopied:
-        lda #$00
-        sta vramRow
+        ldx #<typebSuccessGraphic
+        ldy #>typebSuccessGraphic
+copyGraphic:
+        jsr copyGraphicToPlayfield
 
 typeBEndingStuffEnd:
         ; play sfx
@@ -98,5 +80,30 @@ sleep_gameplay_nextSprite:
         bne @loop
         rts
 
+copyGraphicToPlayfield:
+        lda #$09 ; default row
+copyGraphicToPlayfieldAtCustomRow:
+        stx generalCounter
+        sty generalCounter2
+        tax
+        lda multBy10Table,x
+        clc
+        adc #$02 ; indent
+        tax
+        ldy #$00
+@copySuccessGraphic:
+        lda (generalCounter),y
+        beq @graphicCopied
+        sta playfield,x
+        inx
+        iny
+        bne @copySuccessGraphic
+@graphicCopied: ; 0 in accumulator
+        sta vramRow
+        rts
+
+; $28 is ! in game tileset
+haltEndingGraphic:
+        .byte   $FF,"G","G",$FF,$28,$00
 typebSuccessGraphic:
-        .byte   $17,$12,$0C,$0E,$FF,$28,$80
+        .byte   "N","I","C","E",$FF,$28,$00