Skip to content

remove unneeded legacy tables #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 30, 2025
Merged

remove unneeded legacy tables #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions src/data/orientation.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,10 @@ orientationTable:
.byte $00,$00,$7B,$01,$00,$FF,$00,$00
.byte $FF,$00,$00,$FF,$00,$00,$FF,$00

; Only cares about orientations selected by spawnTable
orientationToSpriteTable:
.byte $00,$00,$06,$00,$00,$00,$00,$09
.byte $08,$00,$0B,$07,$00,$00,$0A,$00
.byte $00,$00,$0C

tetriminoTypeFromOrientation:
.byte $00,$00,$00,$00,$01,$01,$01,$01
.byte $02,$02,$03,$04,$04,$05,$05,$05
.byte $05,$06,$06
spawnTable:
.byte $02,$07,$08,$0A,$0B,$0E,$12
.byte $02
spawnOrientationFromOrientation:
.byte $02,$02,$02,$02,$07,$07,$07,$07
.byte $08,$08,$0A,$0B,$0B,$0E,$0E,$0E
.byte $0E,$12,$12
3 changes: 1 addition & 2 deletions src/playstate/spawnnext.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ playState_spawnNextTetrimino:
sta tetriminoY
lda #$05
sta tetriminoX
ldx nextPiece
lda spawnOrientationFromOrientation,x
lda nextPiece
sta currentPiece
jsr incrementPieceStat
jsr chooseNextTetrimino
Expand Down
30 changes: 15 additions & 15 deletions src/sprites/loadsprite.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ oamContentLookup:
.addr sprite02Blank
.addr sprite02Blank
.addr sprite06TPiece
.addr sprite07SPiece
.addr sprite07JPiece
.addr sprite08ZPiece
.addr sprite09JPiece
.addr sprite0ALPiece
.addr sprite0BOPiece
.addr sprite09OPiece
.addr sprite0ASPiece
.addr sprite0BLPiece
.addr sprite0CIPiece
.addr sprite0EHighScoreNameCursor
.addr sprite0EHighScoreNameCursor
Expand Down Expand Up @@ -95,26 +95,26 @@ sprite06TPiece:
.byte $00,$7B,$02,$FC,$00,$7B,$02,$04
.byte $00,$7B,$02,$0C,$08,$7B,$02,$04
.byte $FF
sprite07SPiece:
.byte $00,$7D,$02,$04,$00,$7D,$02,$0C
.byte $08,$7D,$02,$FC,$08,$7D,$02,$04
sprite07JPiece:
.byte $00,$7D,$02,$FC,$00,$7D,$02,$04
.byte $00,$7D,$02,$0C,$08,$7D,$02,$0C
.byte $FF
sprite08ZPiece:
.byte $00,$7C,$02,$FC,$00,$7C,$02,$04
.byte $08,$7C,$02,$04,$08,$7C,$02,$0C
.byte $FF
sprite09JPiece:
.byte $00,$7D,$02,$FC,$00,$7D,$02,$04
.byte $00,$7D,$02,$0C,$08,$7D,$02,$0C
sprite09OPiece:
.byte $00,$7B,$02,$00,$00,$7B,$02,$08
.byte $08,$7B,$02,$00,$08,$7B,$02,$08
.byte $FF
sprite0ASPiece:
.byte $00,$7D,$02,$04,$00,$7D,$02,$0C
.byte $08,$7D,$02,$FC,$08,$7D,$02,$04
.byte $FF
sprite0ALPiece:
sprite0BLPiece:
.byte $00,$7C,$02,$FC,$00,$7C,$02,$04
.byte $00,$7C,$02,$0C,$08,$7C,$02,$FC
.byte $FF
sprite0BOPiece:
.byte $00,$7B,$02,$00,$00,$7B,$02,$08
.byte $08,$7B,$02,$00,$08,$7B,$02,$08
.byte $FF
sprite0CIPiece:
.byte $04,$7B,$02,$F8,$04,$7B,$02,$00
.byte $04,$7B,$02,$08,$04,$7B,$02,$10
Expand Down
4 changes: 3 additions & 1 deletion src/sprites/piece.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,9 @@ stageSpriteForNextPiece:
lda #$77
sta spriteYOffset
ldx nextPiece
lda orientationToSpriteTable,x
lda tetriminoTypeFromOrientation,x
clc
adc #$6 ; piece sprites start at index 6
sta spriteIndexInOamContentLookup
jmp loadSpriteIntoOamStaging

Expand Down