Skip to content

Commit b1744d3

Browse files
kirjavascriptkirjavascript
committed
remove game type menu nametable
1 parent 14eeab3 commit b1744d3

File tree

9 files changed

+90
-80
lines changed

9 files changed

+90
-80
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@ target
1414

1515
!src/nametables/enter_high_score_nametable.bin
1616
!src/nametables/game_nametable.bin
17-
!src/nametables/game_type_menu_nametable.bin
1817
!src/nametables/level_menu_nametable.bin

‎CHANGELOG.md

Lines changed: 1 addition & 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 Simulation
55
* Crunch Mode
66
* Marathon Mode
77
* Hidden Score Mode

‎src/nametables/enter_high_score.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ ui!###g@######()
3131

3232
lookup = [...lookup].map((d, i) => d === '#' ? String.fromCharCode(9472 + i) : d).join``;
3333

34-
printNT(buffer, lookup);
35-
3634
drawTiles(buffer, lookup, `
3735
################################
3836
#qwwwwwwwwwwwwwwwwwwwwwwwwwwwwe#

‎src/nametables/game.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ WXYZ-+!>˙^()#.##
2828
###############
2929
`);
3030

31-
printNT(buffer, lookup);
32-
3331
drawTiles(buffer, lookup, `
3432
################################
3533
################################

‎src/nametables/game_type_menu.js

Lines changed: 62 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const {
2-
readStripe,
32
writeRLE,
4-
printNT,
3+
blankNT,
54
drawTiles,
65
drawRect,
76
drawAttrs,
@@ -27,78 +26,74 @@ WXYZ-,˙>########
2726
###############
2827
`);
2928

30-
const buffer = readStripe(__dirname + '/game_type_menu_nametable.bin');
29+
const buffer = blankNT();
3130
const extra = [...buffer];
3231

33-
printNT(buffer, lookup);
34-
3532
drawTiles(buffer, lookup, `
36-
#a d#
37-
#a d#
38-
#a d#
39-
#a d#
40-
#a d#
41-
#a d#
42-
#a d#
43-
#a d#
44-
#a d#
45-
#a TETRIS d#
46-
#a T-SPINS d#
47-
#a SEED d#
48-
#a STACKING d#
49-
#a PACE d#
50-
#a SETUPS d#
51-
#a B-TYPE d#
52-
#a FLOOR d#
53-
#a CRUNCH d#
54-
#a (QUICK)TAP d#
55-
#a TRANSITION d#
56-
#a MARATHON d#
57-
#a TAP QUANTITY d#
58-
#a CHECKERBOARD d#
59-
#a GARBAGE d#
60-
#a DROUGHT d#
61-
#a DAS DELAY d#
62-
#a KILLSCREEN »2 d#
63-
#a INVISIBLE d#
64-
#a HARD DROP d#
65-
#a TAP/ROLL SPEED d#
33+
ɢa dɳ
34+
ɲa dɢ
35+
ɲa dɲ
36+
ʂa dʡ
37+
ʀa dɢ
38+
ɢa dɂ
39+
ɀa dʂ
40+
ʂa dɢ
41+
ʀa dɂ
42+
ʐa TETRIS dʂ
43+
ɲa T-SPINS dɡ
44+
ʂa SEED dɲ
45+
ɢa STACKING dʂ
46+
ɲa PACE dʃ
47+
ʠa SETUPS dɡ
48+
ɠa B-TYPE dʂ
49+
ɰa FLOOR dʃ
50+
ʁa CRUNCH dʁ
51+
ɡa (QUICK)TAP dʃ
52+
ʂa TRANSITION dɢ
53+
ɳa MARATHON dʠ
54+
ʃa TAP QUANTITY dɳ
55+
ɡa CHECKERBOARD dɡ
56+
ɱa GARBAGE dʂ
57+
ɡa DROUGHT dɡ
58+
ʂa DAS DELAY dɱ
59+
ɢa KILLSCREEN »2 dʁ
60+
ɲa INVISIBLE dɢ
61+
ɲa HARD DROP dɲ
62+
ʂa TAP/ROLL SPEED dʡ
6663
`);drawTiles(extra, lookup, `
67-
#a SCORING d#
68-
#a CRASH d#
69-
#a HZ DISPLAY d#
70-
#a INPUT DISPLAY d#
71-
#a DISABLE FLASH d#
72-
#a DISABLE PAUSE d#
73-
#a GOOFY FOOT d#
74-
#a BLOCK TOOL d#
75-
#a LINECAP d#
76-
#a DAS ONLY d#
77-
#a QUAL MODE d#
78-
#a PAL MODE d#
79-
#a d#
80-
#a d#
81-
#a V5 d#
82-
#a d#
83-
#a d#
84-
#a d#
85-
#a d#
86-
#a d#
87-
#a d#
88-
#a d#
89-
#a d#
90-
#a d#
91-
#a d#
92-
#a d#
93-
#a d#
94-
#a d#
95-
#a d#
96-
#a d#
64+
ɢa SCORING dɳ
65+
ɲa CRASH dɢ
66+
ɲa HZ DISPLAY dɲ
67+
ʂa INPUT DISPLAY dʡ
68+
ʀa DISABLE FLASH dɢ
69+
ɢa DISABLE PAUSE dɂ
70+
ɀa GOOFY FOOT dʂ
71+
ʂa BLOCK TOOL dɢ
72+
ʀa LINECAP dɂ
73+
ʐa DAS ONLY dʂ
74+
ɲa QUAL MODE dɡ
75+
ʂa PAL MODE dɲ
76+
ɢa dʂ
77+
ɲa dʃ
78+
ʠa V5 dɡ
79+
ɠa dʂ
80+
ɰa dʃ
81+
ʁa dʁ
82+
ɡa dʃ
83+
ʂa dɢ
84+
ɳa dʠ
85+
ʃa dɳ
86+
ɡa dɡ
87+
ɱa dʂ
88+
ɡa dɡ
89+
ʂa dɱ
90+
ɢa dʁ
91+
ɲa dɢ
92+
ɲa dɲ
93+
ʂa dʡ
9794
`);
9895

99-
10096
drawRect(buffer, 8, 2, 10, 5, 0xB0); // draw logo
101-
// drawRect(extra, 20, 0, 5, 5, 0x9A); // draw QR code
10297

10398
const urlX = 3;
10499
const urlY = 14;

‎src/nametables/game_type_menu_nametable.bin

-1.09 KB
Binary file not shown.

‎src/nametables/level_menu.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ ui!###g@ß#####()
3030

3131
lookup = [...lookup].map((d, i) => d === '#' ? String.fromCharCode(9472 + i) : d).join``;
3232

33-
printNT(buffer, lookup);
34-
3533
// heart
3634

3735
// ###a rtutututututy d###

‎src/nametables/nametables.js

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,35 @@ function writeRLE(filename, buffer) {
2222
writeFileSync(filename, compressed);
2323
}
2424

25+
const STR_OFFSET = 512;
26+
2527
function printNT(buffer, lookup) {
26-
const chars = [...buffer].map(value => lookup[value] || '__NOWAYNOWAY');
27-
// console.log(chars.join('').match(/.{32}/g).join('\n'));
28+
const chars = [...buffer].map(value => {
29+
const char = lookup[value];
30+
31+
if (char === '#') {
32+
return String.fromCharCode(value + STR_OFFSET);
33+
}
34+
35+
return char;
36+
});
37+
38+
console.log(chars.join('').match(/.{32}/g).join('\n'));
39+
}
40+
41+
function blankNT() {
42+
return Array.from({ length: 1024 }, () => 0xFF);
2843
}
2944

3045
function drawTiles(buffer, lookup, tiles) {
3146
[...tiles.trim().split('\n').join('')].forEach((d, i) => {
3247
if (d !== '#') {
33-
buffer[i] = lookup.indexOf(d);
48+
const charCode = d.charCodeAt(0);
49+
if (charCode > STR_OFFSET) {
50+
buffer[i] = charCode - STR_OFFSET;
51+
} else {
52+
buffer[i] = lookup.indexOf(d);
53+
}
3454
}
3555
});
3656
}
@@ -70,6 +90,7 @@ module.exports = {
7090
readStripe,
7191
writeRLE,
7292
printNT,
93+
blankNT,
7394
drawTiles,
7495
drawRect,
7596
drawAttrs,

‎src/nametables/rocket_legal.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
const {
22
writeRLE,
3+
blankNT,
34
drawTiles,
45
flatLookup,
56
drawAttrs,
67
} = require('./nametables');
78

8-
const legal = Array.from({ length: 1024 }, () => 0xFF);
9-
const rocket = [...legal];
9+
const legal = blankNT();
10+
const rocket = blankNT();
1011

1112
const lookup = flatLookup(`
1213
0123456789ABCDEF

0 commit comments

Comments
 (0)