Skip to content

Commit c2aa378

Browse files
authored
Merge branch 'kirjavascript:master' into Crash-Detection
2 parents 3748cd0 + 99aec4d commit c2aa378

File tree

20 files changed

+1362
-12
lines changed

20 files changed

+1362
-12
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ tetris.lbl
99
tetris.map
1010
tetris.dbg
1111
release/*
12+
target

CHANGELOG.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
## [unreleased]
44
* Crunch Mode
5-
* Invisible linecap turns entire playfield invisible
6-
* Invisible mode preserves original piece colors
5+
* Marathon Mode
6+
* Added hidden score option
77
* Famicom Keyboard support
8-
* Fixed Floor-0 disabled burns
98
* MMC3 Support
109
* MMC5 Support
10+
* Invisible linecap turns entire playfield invisible
11+
* Invisible mode preserves original piece colors
12+
* Floor no longer gobbled up by top line clear
13+
* Floor 0 has original no-burns behaviour again
1114
* Fixed CNROM legal screen CHR bank
1215
* Fixed CNROM legal to title flicker
1316
* Block Tool pieces wrap around
14-
* Added hidden score option
15-
* Added marathon mode
1617
* 0001 seeds are ignored
17-
* Floor no longer gobbled up by top line clear
1818

1919
## [v5 tournament]
2020
* Linecap Menu (from CTM Masters September 2022)

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* [Tap Quantity](#tap-quantity)
2222
* [Checkerboard](#checkerboard)
2323
* [Transition](#transition)
24+
* [Marathon](#marathon)
2425
* [Garbage](#garbage)
2526
* [Drought](#drought)
2627
* [DAS Delay](#das-delay)

build.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,9 @@ if (!fs.existsSync('clean.nes')) {
166166
} else {
167167
console.time('patch');
168168
const patcher = require('./tools/patch/create');
169-
patcher('clean.nes', 'tetris.nes', 'tetris.bps');
169+
const pct = patcher('clean.nes', 'tetris.nes', 'tetris.bps');
170170
console.timeEnd('patch');
171+
console.log(`using ${pct}% of original file`);
171172
}
172173

173174
// stats

0 commit comments

Comments
 (0)