Skip to content

Commit

Permalink
twoplayer: Update line numbers in diff
Browse files Browse the repository at this point in the history
  • Loading branch information
@ejona86
ejona86 committed Mar 18, 2020
1 parent 579292a commit 7a551b7
Showing 1 changed file with 32 additions and 32 deletions.
64 changes: 32 additions & 32 deletions twoplayer-tetris-PRG.s.diff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@
lda #$25
sta player1_lines
sta player2_lines
@@ -1550,17 +1608,17 @@ stageSpriteForCurrentPiece:
@@ -1557,17 +1615,17 @@ stageSpriteForCurrentPiece:
lda numberOfPlayers
cmp #$01
beq L8A2C
Expand All @@ -299,7 +299,7 @@
lda tetriminoY
rol a
rol a
@@ -1594,11 +1652,12 @@ L8A4B: lda orientationTable,x
@@ -1601,11 +1659,12 @@ L8A4B: lda orientationTable,x
lda orientationTable,x
sta oamStaging,y
inc oamStagingLength
Expand All @@ -313,7 +313,7 @@
cmp #$2F
bcs L8A84
inc oamStagingLength
@@ -1880,36 +1939,61 @@ sprite03PausePalette6:
@@ -1887,36 +1946,61 @@ sprite03PausePalette6:
sprite05PausePalette4:
.byte $00,$19,$00,$00,$00,$0A,$00,$08
.byte $00,$1E,$00,$10,$00,$1C,$00,$18
Expand Down Expand Up @@ -389,7 +389,7 @@
.byte $00,$FC,$21,$00,$FF
; Unused, but referenced from unreferenced_orientationToSpriteTable
sprite0FTPieceOffset:
@@ -2350,20 +2434,38 @@ render_mode_play_and_demo:
@@ -2357,20 +2441,38 @@ render_mode_play_and_demo:
lda #$00
sta player1_vramRow
jmp @renderPlayer2Playfield
Expand Down Expand Up @@ -428,7 +428,7 @@
cmp #$02
bne @renderLines
lda player2_playState
@@ -2391,20 +2493,34 @@ @renderPlayer2Playfield:
@@ -2398,20 +2500,34 @@ @renderPlayer2Playfield:
lda #$00
sta player2_vramRow
jmp @renderLines
Expand Down Expand Up @@ -463,7 +463,7 @@
and #$01
beq @renderLevel
lda numberOfPlayers
@@ -2422,36 +2538,36 @@ @renderLines:
@@ -2429,36 +2545,36 @@ @renderLines:
and #$FE
sta outOfDateRenderFlags
jmp @renderLevel
Expand Down Expand Up @@ -507,7 +507,7 @@
sta generalCounter
lda #$22
sta PPUADDR
@@ -2462,12 +2578,17 @@ @renderLevel:
@@ -2469,12 +2585,17 @@ @renderLevel:
jsr updatePaletteForLevel
lda outOfDateRenderFlags
and #$FD
Expand All @@ -527,7 +527,7 @@
and #$04
beq @renderStats
lda #$21
@@ -2515,13 +2636,14 @@ @renderTetrisFlashAndSound:
@@ -2522,13 +2643,14 @@ @renderTetrisFlashAndSound:
lda #$3F
sta PPUADDR
lda #$0E
Expand All @@ -545,7 +545,7 @@
bne @setPaletteColor
ldx #$30
lda frameCounter
@@ -2530,17 +2652,28 @@ @renderTetrisFlashAndSound:
@@ -2537,17 +2659,28 @@ @renderTetrisFlashAndSound:
lda #$09
sta soundEffectSlot1Init
@setPaletteColor:
Expand Down Expand Up @@ -577,7 +577,7 @@
.dbyt $2286,$22C6,$2306
levelDisplayTable:
.byte $00,$01,$02,$03,$04,$05,$06,$07
@@ -2550,63 +2683,74 @@ levelDisplayTable:
@@ -2557,63 +2690,74 @@ levelDisplayTable:
multBy10Table:
.byte $00,$0A,$14,$1E,$28,$32,$3C,$46
.byte $50,$5A,$64,$6E,$78,$82,$8C,$96
Expand Down Expand Up @@ -671,7 +671,7 @@
sta PPUADDR
@copyRow:
ldx #$0A
@@ -2630,15 +2774,15 @@ updateLineClearingAnimation:
@@ -2637,15 +2781,15 @@ updateLineClearingAnimation:
bne @ret
lda #$00
sta generalCounter3
Expand All @@ -691,7 +691,7 @@
cmp #$01
bne @twoPlayers
lda generalCounter
@@ -2651,22 +2795,22 @@ @twoPlayers:
@@ -2658,22 +2802,22 @@ @twoPlayers:
lda playfieldAddr+1
cmp #$04
bne @player2
Expand All @@ -718,7 +718,7 @@
ldx rowY
lda leftColumns,x
clc
@@ -2700,45 +2844,47 @@ leftColumns:
@@ -2707,45 +2851,47 @@ leftColumns:
rightColumns:
.byte $05,$06,$07,$08,$09
; Set Background palette 2 and Sprite palette 2
Expand Down Expand Up @@ -778,7 +778,7 @@
.dbyt $0F30,$2112,$0F30,$291A
.dbyt $0F30,$2414,$0F30,$2A12
.dbyt $0F30,$2B15,$0F30,$222B
@@ -2765,11 +2911,12 @@ @ret: rts
@@ -2772,11 +2918,12 @@ @ret: rts

playState_spawnNextTetrimino:
lda vramRow
Expand All @@ -792,7 +792,7 @@
lda twoPlayerPieceDelayCounter
cmp #$00
bne @twoPlayerPieceDelay
@@ -2794,24 +2941,30 @@ @notDelaying:
@@ -2801,24 +2948,30 @@ @notDelaying:
sta tetriminoY
lda #$01
sta playState
Expand Down Expand Up @@ -826,7 +826,7 @@
sta autorepeatY
@ret: rts

@@ -2830,43 +2983,47 @@ chooseNextTetrimino:
@@ -2837,43 +2990,47 @@ chooseNextTetrimino:
tax
lda spawnTable,x
rts
Expand Down Expand Up @@ -884,7 +884,7 @@
tetriminoTypeFromOrientation:
.byte $00,$00,$00,$00,$01,$01,$01,$01
.byte $02,$02,$03,$04,$04,$05,$05,$05
@@ -3026,12 +3183,15 @@ @checkForStartButton:
@@ -3033,12 +3190,15 @@ @checkForStartButton:
lda newlyPressedButtons_player1
cmp #$10
bne @ret2
Expand All @@ -902,7 +902,7 @@
playState_checkForCompletedRows:
lda vramRow
cmp #$20
@@ -3126,11 +3286,12 @@ @ret: rts
@@ -3133,11 +3293,12 @@ @ret: rts

playState_receiveGarbage:
lda numberOfPlayers
Expand All @@ -916,7 +916,7 @@
cmp #$20
bmi L9B52
lda multBy10Table,y
@@ -3152,11 +3313,11 @@ L9B31: cpx garbageHole
@@ -3159,11 +3320,11 @@ L9B31: cpx garbageHole
beq @garbageEmptySpace
lda #$78
jmp @placeGarbage
Expand All @@ -929,7 +929,7 @@
inx
cpx #$0A
bne L9B45
@@ -3340,26 +3501,39 @@ L9C75: lda score+2
@@ -3347,26 +3508,39 @@ L9C75: lda score+2
clc
adc #$06
sta score+2
Expand Down Expand Up @@ -970,7 +970,7 @@
.word $1200
updatePlayfield:
ldx tetriminoY
@@ -3387,11 +3561,12 @@ gameModeState_handleGameOver:
@@ -3394,11 +3568,12 @@ gameModeState_handleGameOver:
sta generalCounter2
lda player2_playState
cmp #$00
Expand All @@ -984,7 +984,7 @@
lda #$09
sta gameModeState
rts
@@ -3436,23 +3611,31 @@ @checkForBlockInRow:
@@ -3443,23 +3618,31 @@ @checkForBlockInRow:
bne @foundBlockInRow
iny
dex
Expand Down Expand Up @@ -1021,7 +1021,7 @@
adc #$04
tax
lda musicSelectionTable,x
@@ -3821,11 +4004,11 @@ L9FE9: ldy #$00
@@ -3828,11 +4011,11 @@ L9FE9: ldy #$00
sty PPUSCROLL
sty PPUSCROLL
rts
Expand All @@ -1034,7 +1034,7 @@
jmp LA085

L9FFB: jsr bulkCopyToPpu
@@ -3918,11 +4101,11 @@ byteToBcdTable:
@@ -3925,11 +4108,11 @@ byteToBcdTable:
.byte $16,$17,$18,$19,$20,$21,$22,$23
.byte $24,$25,$26,$27,$28,$29,$30,$31
.byte $32,$33,$34,$35,$36,$37,$38,$39
Expand All @@ -1047,7 +1047,7 @@
sta highScoreEntryRawPos
lda gameType
beq @compareWithPos
@@ -3934,26 +4117,26 @@ @compareWithPos:
@@ -3941,26 +4124,26 @@ @compareWithPos:
asl a
clc
adc generalCounter2
Expand Down Expand Up @@ -1077,7 +1077,7 @@
@tooSmall:
inc highScoreEntryRawPos
lda highScoreEntryRawPos
@@ -3996,22 +4179,22 @@ @clearNameLetter:
@@ -4003,22 +4186,22 @@ @clearNameLetter:
inx
dey
bne @clearNameLetter
Expand Down Expand Up @@ -1111,7 +1111,7 @@
; reg a: start byte to copy
copyHighScoreNameToNextIndex:
sta generalCounter
@@ -4074,11 +4257,11 @@ copyHighScoreLevelToNextIndex:
@@ -4081,11 +4264,11 @@ copyHighScoreLevelToNextIndex:
tax
@xAdjustedForGameType:
lda highScoreLevels,x
Expand All @@ -1124,7 +1124,7 @@
highScoreIndexToHighScoreScoresOffset:
.byte $00,$03,$06,$09,$0C,$0F,$12,$15
highScoreEntryScreen:
@@ -4108,11 +4291,11 @@ highScoreEntryScreen:
@@ -4115,11 +4298,11 @@ highScoreEntryScreen:
adc gameType
sta PPUDATA
jsr showHighScores
Expand All @@ -1137,7 +1137,7 @@
jsr updateAudioWaitForNmiAndResetOamStaging
lda highScoreEntryRawPos
asl a
@@ -4141,20 +4324,20 @@ @renderFrame:
@@ -4148,20 +4331,20 @@ @renderFrame:
and #$03
bne @flickerStateSelected_checkForStartPressed
lda #$02
Expand All @@ -1162,7 +1162,7 @@
lda #$01
sta soundEffectSlot1Init
inc highScoreEntryNameOffsetForLetter
@@ -4162,22 +4345,22 @@ @checkForAOrRightPressed:
@@ -4169,22 +4352,22 @@ @checkForAOrRightPressed:
cmp #$06
bmi @checkForBOrLeftPressed
lda #$00
Expand All @@ -1187,7 +1187,7 @@
lda frameCounter
and #$07
bne @checkForUpPressed
@@ -4185,24 +4368,24 @@ @checkForDownPressed:
@@ -4192,24 +4375,24 @@ @checkForDownPressed:
sta soundEffectSlot1Init
lda highScoreEntryNameOffsetForRow
sta generalCounter
Expand Down Expand Up @@ -1216,7 +1216,7 @@
lda frameCounter
and #$07
bne @waitForVBlank
@@ -6202,17 +6385,17 @@ dmc1: .byte $6D,$6E,$6F,$5F,$3C,$33,
@@ -6209,17 +6392,17 @@ dmc1: .byte $6D,$6E,$6F,$5F,$3C,$33,
.byte $87,$78,$84,$7A,$77,$87,$78,$84
.byte $7A,$67,$87,$77,$87,$77,$72,$83
.byte $80,$81,$77,$67,$82,$79,$7A,$67
Expand Down

0 comments on commit 7a551b7

Please sign in to comment.