Skip to content

Commit b79e4f4

Browse files
zohassadarzohassadar
authored
Merge branch 'master' into mapper_edit
2 parents ffac191 + b82bafa commit b79e4f4

26 files changed

+285
-187
lines changed

‎.gitignore

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,3 @@ tetris.map
1111
tetris.dbg
1212
release/*
1313
target
14-
15-
!src/nametables/enter_high_score_nametable.bin
16-
!src/nametables/game_nametable.bin
17-
!src/nametables/game_type_menu_nametable.bin
18-
!src/nametables/level_menu_nametable.bin

‎CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Changelog
22

33
## [unreleased]
4-
* Crash Detection / Simulation
4+
* Crash Behaviours
55
* Crunch Mode
66
* Marathon Mode
77
* Hidden Score Mode
@@ -13,6 +13,7 @@
1313
* Fixed ingame score display at 8 million with Classic Scoring
1414
* Fixed CNROM legal screen CHR bank
1515
* Fixed CNROM legal to title flicker
16+
* Fixed piece skip when doing Sonic Drop then Hard Drop immediately
1617
* Block Tool pieces wrap around
1718
* Always Next Box removed
1819
* 0001 seeds are ignored

‎src/gamemode/gametypemenu/menu.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ gameMode_gameTypeMenu:
99
jsr calc_menuScrollY
1010
sta menuScrollY
1111
lda #0
12-
sta displayNextPiece
12+
sta hideNextPiece
1313
lda #$1
1414
sta renderMode
1515
jsr updateAudioWaitForNmiAndDisablePpuRendering

‎src/gamemode/levelmenu.asm

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,16 +159,14 @@ levelMenuCheckGoBack:
159159
shredSeedAndContinue:
160160
; seed shredder
161161
@chooseRandomHole_player1:
162-
ldx #$17
163-
ldy #$02
162+
ldx #rng_seed
164163
jsr generateNextPseudorandomNumber
165164
lda rng_seed
166165
and #$0F
167166
cmp #$0A
168167
bpl @chooseRandomHole_player1
169168
@chooseRandomHole_player2:
170-
ldx #$17
171-
ldy #$02
169+
ldx #rng_seed
172170
jsr generateNextPseudorandomNumber
173171
lda rng_seed
174172
and #$0F

‎src/gamemodestate/initstate.asm

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ gameModeState_initGameState:
103103
sta currentPiece
104104
jsr incrementPieceStat
105105
ldx #rng_seed
106-
ldy #$02
107106
jsr generateNextPseudorandomNumber
108107
jsr chooseNextTetrimino
109108
sta nextPiece
@@ -269,8 +268,7 @@ L87E7: lda generalCounter
269268
sta vramRow
270269
lda #$09
271270
sta generalCounter3
272-
L87FC: ldx #$17
273-
ldy #$02
271+
L87FC: ldx #rng_seed
274272
jsr generateNextPseudorandomNumber
275273
lda rng_seed
276274
and #$07
@@ -289,8 +287,7 @@ L87FC: ldx #$17
289287
dec generalCounter3
290288
jmp L87FC
291289

292-
L8824: ldx #$17
293-
ldy #$02
290+
L8824: ldx #rng_seed
294291
jsr generateNextPseudorandomNumber
295292
lda rng_seed
296293
and #$0F

‎src/gamemodestate/updatecounters.asm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ gameModeState_updateCountersAndNonPlayerState:
88
lda newlyPressedButtons_player1
99
and #BUTTON_SELECT
1010
beq @ret
11-
lda displayNextPiece
11+
lda hideNextPiece
1212
eor #$01
13-
sta displayNextPiece
13+
sta hideNextPiece
1414
@ret: inc gameModeState ; 3
1515
rts

‎src/modes/tspins.asm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ advanceGameTSpins_actual:
7070

7171
generateNewTSpin:
7272
ldx #rng_seed
73-
ldy #$2
7473
jsr generateNextPseudorandomNumber
7574
lda rng_seed
7675
tax

‎src/nametables/enter_high_score.js

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
const {
2-
readStripe,
32
writeRLE,
4-
printNT,
3+
blankNT,
54
drawTiles,
65
drawAttrs,
76
flatLookup,
87
} = require('./nametables');
98

109

11-
const buffer = readStripe(__dirname + '/enter_high_score_nametable.bin');
10+
const buffer = blankNT();
1211

1312
let lookup = flatLookup(`
1413
0123456789ABCDEF
@@ -29,41 +28,37 @@ ui!###g@######()
2928
###############
3029
`);
3130

32-
lookup = [...lookup].map((d, i) => d === '#' ? String.fromCharCode(9472 + i) : d).join``;
33-
34-
printNT(buffer, lookup);
35-
3631
drawTiles(buffer, lookup, `
37-
################################
38-
#qwwwwwwwwwwwwwwwwwwwwwwwwwwwwe#
39-
#a d#
40-
#a d#
41-
#a d#
42-
#a d#
43-
#a GOOD GAME d#
44-
#a d#
45-
#a d#
46-
#a d#
47-
#a YOU ARE A d#
48-
#a d#
49-
#a TETRIS MASTER# d#
50-
#a d#
51-
#a d#
52-
#a PLEASE ENTER YOUR NAME d#
53-
#a d#
54-
#a rtttttttttttttttttttttttty d#
55-
#a fNAME SCORE LNS LVh d#
56-
#a jbbbbbbbbbbbbbbbbbbbbbbbbl d#
57-
#a f h d#
58-
#a f h d#
59-
#a f h d#
60-
#a f h d#
61-
#a f h d#
62-
#a f h d#
63-
#a vbbbbbbbbbbbbbbbbbbbbbbbbn d#
64-
#a d#
65-
#zxxxxxxxxxxxxxxxxxxxxxxxxxxxxc#
66-
################################
32+
╲▂╢╢╢▀░▀╃▃╢╲╠╡▂▐▃╲▐▁▃▂╢▂╢╲╢▀▁▁▃╲
33+
╲qwwwwwwwwwwwwwwwwwwwwwwwwwwwwe□
34+
▂a d╢
35+
▀a d□
36+
╢a d╢
37+
╂a d□
38+
▂a GOOD GAME d▀
39+
╢a d╡
40+
╀a d╱
41+
▂a d▀
42+
╠a YOU ARE A d▃
43+
╰a d▃
44+
╠a TETRIS MASTER. d╢
45+
╰a d╀
46+
▀a d▂
47+
╢a PLEASE ENTER YOUR NAME d╢
48+
╀a d╲
49+
▂a rtttttttttttttttttttttttty d╲
50+
▃a fNAME SCORE LNS LVh d▂
51+
▀a jbbbbbbbbbbbbbbbbbbbbbbbbl d▀
52+
▀a f h d▃
53+
▐a f h d▀
54+
╲a f h d▃
55+
▂a f h d▀
56+
▃a f h d▀
57+
▀a f h d╡
58+
▀a vbbbbbbbbbbbbbbbbbbbbbbbbn d╱
59+
▁a d╢
60+
╠zxxxxxxxxxxxxxxxxxxxxxxxxxxxxc□
61+
╰╱╰╱▐▃▀▁□╲■▁▃▂╀▃▂▀╂╀▃▀░▀╂╲╢╰╱╲▂╢
6762
`);
6863

6964
drawAttrs(buffer, [`

‎src/nametables/enter_high_score_nametable.bin

-1.09 KB
Binary file not shown.

‎src/nametables/game.js

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
const {
2-
readStripe,
32
writeRLE,
4-
printNT,
3+
blankNT,
54
drawTiles,
65
drawAttrs,
76
flatLookup,
87
} = require('./nametables');
98

10-
const buffer = readStripe(__dirname + '/game_nametable.bin');
9+
const buffer = blankNT();
1110

1211
const lookup = flatLookup(`
1312
0123456789ABCDEF
@@ -28,8 +27,6 @@ WXYZ-+!>˙^()#.##
2827
###############
2928
`);
3029

31-
printNT(buffer, lookup);
32-
3330
drawTiles(buffer, lookup, `
3431
################################
3532
################################
@@ -63,6 +60,39 @@ drawTiles(buffer, lookup, `
6360
################################
6461
`);
6562

63+
drawTiles(buffer, lookup, `
64+
ɺɧɷɷɲɹɺɸɵɺɧɷɸʃɸʃɷʇɧɸɳʇɰɱɧʇɸɵɺɲɺɧ
65+
ɲʃʇɷʇɧɸɳʇɲʃʇɸɹɹɺʇɸʄɺʂɺʀʁʂɹɺʇɸʃɸʅ
66+
ʇɲɺʇɸʄɺʂɺʇɧ####################ʇ
67+
ɧɷ########ɷ####################ɧ
68+
ɷʇ########ɷ####################ɷ
69+
ʀɺ########ʇȰȱȱȱȱȱȱȱȱȱȱȲ########ɷ
70+
ɸɹɹɺɧɰɱɧɸɹɳȳ##########ȴ########ʇ
71+
ɹɺɸɹʃʀʁʂɹɺʇȳ##########ȴ########ɧ
72+
ɳ##########ȳ##########ȴ########ʂ
73+
ɷ#ɩɪɫɬɭɮɯɟ#ȳ##########ȴ########ɧ
74+
ʇ##########ȳ##########ȴ########ɷ
75+
ɺ##ɀɁɂ#####ȳ##########ȴɸɹɹɺɸɹɳɸʃ
76+
ɺ##ɐɑɒ#####ȳ##########ȴȰȱȱȱȱȲʇɧɸ
77+
ɺ##ɉɊɋ#####ȳ##########ȴȳ####ȴɲʃɸ
78+
ɧ##əɚɛ#####ȳ##########ȴȳ####ȴʇɲɺ
79+
ɷ##Ɇɇ######ȳ##########ȴȳ####ȴɸʃɰ
80+
ɷ##ɖɗɘ#####ȳ##########ȴȳ####ȴɲɺʀ
81+
ʇ##ɠɡ######ȳ##########ȴȳ####ȴɷɸɳ
82+
ɱ##ɢɣ######ȳ##########ȴȵȶȶȶȶȷʇɧɷ
83+
ʁ##ɃɄɅ#####ȳ##########ȴ#######ɷʇ
84+
ɺ##ɓɔɕ#####ȳ##########ȴ#######ɷɸ
85+
ɺ##ɌɍɎ#####ȳ##########ȴ#######ʇɧ
86+
ɧ##ɜɝɞ#####ȳ##########ȴ#######ɸʅ
87+
ʃ##########ȳ##########ȴɧɸɵɺɧɲɹɺʇ
88+
ɳ##ɤɥɦ#####ȳ##########ȴɴɺʇɸʅʇɧɸɹ
89+
ɷ##########ȳ##########ȴʇɸɹɳʇɲʃɲɺ
90+
ʇ##########ȵȶȶȶȶȶȶȶȶȶȶȷɧɰɱʇɧʇɸʃɧ
91+
ɧɧɸɵɺɲɹɺɧɸɳɸɳɧɲɺɲɹɺɸɹɹɺɷʀʁɸʅɧɸɹʃ
92+
ɷʂɳʇɧʇɧɲʃɧʂɺɷɷɷɧʇɧɰɱɲɺɧʀɺɸɳʇɷɸɹɹ
93+
ʀɺʇɸʄɺɷʇɸʄɺɧʇɷʇɷɲʃʀʁɷɧʂɹɺɧɷɸʃɲɺɧ
94+
`);
95+
6696
drawAttrs(buffer, [`
6797
3333333333333333
6898
3333333333333333

0 commit comments

Comments
 (0)