Skip to content

Free games for graphing calculators: NumWorks, TI-Nspire CX, Casio fx-CG50 and soon TI-84 Plus CE. Balatro, Celeste, Hollow Knight, Minecraft and more.

Merge branch 'turborush' into angrybirds

Mason363fd2f065191ef
diff --cc .github/workflows/build.yml
index 89425052,5fea0f85..0b5fbd0c
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@@ -89,7 -89,7 +89,8 @@@ jobs
make -C games/coreball host test
make -C games/uno host test
make -C games/fnf host test BUILD_DIR=../../build/data/games/fnf
+ make -C games/turborush host test BUILD_DIR=../../build/data/games/turborush
+ make -C games/angrybirds host test
diff --cc Makefile
index 6a1b8437,fe75eb4e..ef4fc25e
--- a/Makefile
+++ b/Makefile
@@@ -18,7 -18,7 +18,7 @@@ PY ?= python
CARGO ?= cargo
B = build/data
# Conventional games honor a configurable output directory; special layouts are kept local.
- GAMES_REDIRECT = angrybirds balatro blockblast breakout buckshot celeste championisland chess connectfour cookieclicker coreball dinorun donkeykong doodlejump doom dune finalearth2 flappybird flappydunk fnaf fnf g2048 hillclimb hollowknight invaders isaac jetpackjoyride leveldevil minesweeper monkeymart numblocks numpowder numvisuals pacman portal pvz snake sokoban solitaire sonic stickmanhook subway sudoku suika tombofthemask towerblock twoplayer undertale uno uttt
-GAMES_REDIRECT = balatro blockblast breakout buckshot celeste championisland chess connectfour cookieclicker coreball dinorun donkeykong doodlejump doom dune finalearth2 flappybird flappydunk fnaf fnf g2048 hillclimb hollowknight invaders isaac jetpackjoyride leveldevil minesweeper monkeymart numblocks numpowder numvisuals pacman portal pvz snake sokoban solitaire sonic stickmanhook subway sudoku suika tombofthemask towerblock turborush twoplayer undertale uno uttt
++GAMES_REDIRECT = angrybirds balatro blockblast breakout buckshot celeste championisland chess connectfour cookieclicker coreball dinorun donkeykong doodlejump doom dune finalearth2 flappybird flappydunk fnaf fnf g2048 hillclimb hollowknight invaders isaac jetpackjoyride leveldevil minesweeper monkeymart numblocks numpowder numvisuals pacman portal pvz snake sokoban solitaire sonic stickmanhook subway sudoku suika tombofthemask towerblock turborush twoplayer undertale uno uttt
GAMES_OUT = dinorun
GAME_REDIRECT_ARG = $(if $(filter $(1),$(GAMES_OUT)),OUT=../../$(B)/games/$(1),BUILD_DIR=../../$(B)/games/$(1))
# the RAM the oldest calculator software that runs apps gives them (23.2: 148928 bytes; 25.2 gives 153676).
@@@ -29,7 -29,7 +29,7 @@@ RAM_LIMIT = 14892
# custom builds of Epsilon 25.2's source give apps less: 133652 bytes; every game fits there too, in NumPlay and on
# its own (their big buffers are on the stack, 32 KB apart from that RAM, or in the RAM the software has left)
CUSTOM_RAM = 133652
- BIG_APPS = Celeste HollowKnight Undertale ChampionIsland FinalEarth2 NumPowder NumBlocks NumDrive SubwaySurfers FiveNightsAtFreddys Doom BindingOfIsaac HillClimbRacing PlantsVsZombies SonicTheHedgehog CookieClicker LevelDevil JetpackJoyride StickmanHook DonkeyKong Dune MonkeyMart TombOfTheMask UNO FridayNightFunkin AngryBirds
-BIG_APPS = Celeste HollowKnight Undertale ChampionIsland FinalEarth2 NumPowder NumBlocks NumDrive SubwaySurfers FiveNightsAtFreddys Doom BindingOfIsaac HillClimbRacing PlantsVsZombies SonicTheHedgehog CookieClicker LevelDevil JetpackJoyride StickmanHook DonkeyKong Dune MonkeyMart TombOfTheMask UNO FridayNightFunkin TurboRush
++BIG_APPS = Celeste HollowKnight Undertale ChampionIsland FinalEarth2 NumPowder NumBlocks NumDrive SubwaySurfers FiveNightsAtFreddys Doom BindingOfIsaac HillClimbRacing PlantsVsZombies SonicTheHedgehog CookieClicker LevelDevil JetpackJoyride StickmanHook DonkeyKong Dune MonkeyMart TombOfTheMask UNO FridayNightFunkin TurboRush AngryBirds
# the calculator's space for installed apps: from the end of its software (64 KiB aligned) to 64 KiB before the
# end of its 4 MiB slot of flash, 0x903F0000. The software's size sets the start: 0x90200000 is the latest a
# NumPlay counts on (1.94 MB, APP_SPACE); Epsilon 26.4 on an N0120 ends at 0x90180000 (2.44 MB, the
@@@ -47,7 -47,7 +47,7 @@@ XL_APP_SPACE = 629145
# the spaces the customizer website offers (kit.json "spaces"; tools/kit.py links a NumPlay at each)
SPACES = std:$(APP_START):$(APP_END) e26:$(APP_START_26):$(APP_END) xl:$(APP_START):$(XL_END) xl26:$(APP_START_26):$(XL_END)
# big games that must install on their own without Enlarged Extra Apps: make check holds them to APP_SPACE
- APP_SPACE_APPS = HillClimbRacing FridayNightFunkin AngryBirds
-APP_SPACE_APPS = HillClimbRacing FridayNightFunkin TurboRush
++APP_SPACE_APPS = HillClimbRacing FridayNightFunkin TurboRush AngryBirds
# Upsilon, the N0110 and N0115's custom software, gives .nwa apps less RAM: NumPlay-Upsilon.nwa has
# the games that fit it (NumPlay draws their text there: see launcher/src/compat.c)
UPSILON_RAM = 107674
@@@ -323,7 -323,7 +323,8 @@@ APP_monkeymart = $(B)/games/monkeymart/
APP_tombofthemask = $(B)/games/tombofthemask/tombofthemask.nwa:TombOfTheMask.nwa
APP_uno = $(B)/games/uno/uno.nwa:UNO.nwa
APP_fnf = $(B)/games/fnf/fnf.nwa:FridayNightFunkin.nwa
+ APP_turborush = $(B)/games/turborush/turborush.nwa:TurboRush.nwa
+APP_angrybirds = $(B)/games/angrybirds/angrybirds.nwa:AngryBirds.nwa
# the big games' modules are made from these (the kit)
$(foreach g,$(XL_GAMES),$(eval MOD_$(g) = $$(word 1,$$(subst :, ,$$(APP_$(g))))))
@@@ -359,7 -359,7 +360,8 @@@ apps: | $(B
$(MAKE) -C games/tombofthemask build NWLINK="$(NWLINK)" BUILD_DIR=../../$(B)/games/tombofthemask
$(MAKE) -C games/uno build NWLINK="$(NWLINK)" BUILD_DIR=../../$(B)/games/uno
$(MAKE) -C games/fnf build NWLINK="$(NWLINK)" BUILD_DIR=../../$(B)/games/fnf
+ $(MAKE) -C games/turborush build NWLINK="$(NWLINK)" BUILD_DIR=../../$(B)/games/turborush
+ $(MAKE) -C games/angrybirds build NWLINK="$(NWLINK)" BUILD_DIR=../../$(B)/games/angrybirds
cd games/tetris/tetris && NWLINK="$(NWLINK)" $(CARGO) build --release --quiet
cp $(word 1,$(subst :, ,$(APP_numdash))) $(B)/apps/$(word 2,$(subst :, ,$(APP_numdash)))
cp $(word 1,$(subst :, ,$(APP_crossyroad))) $(B)/apps/$(word 2,$(subst :, ,$(APP_crossyroad)))
@@@ -393,7 -393,7 +395,8 @@@
cp $(word 1,$(subst :, ,$(APP_tombofthemask))) $(B)/apps/$(word 2,$(subst :, ,$(APP_tombofthemask)))
cp $(word 1,$(subst :, ,$(APP_uno))) $(B)/apps/$(word 2,$(subst :, ,$(APP_uno)))
cp $(word 1,$(subst :, ,$(APP_fnf))) $(B)/apps/$(word 2,$(subst :, ,$(APP_fnf)))
+ cp $(word 1,$(subst :, ,$(APP_turborush))) $(B)/apps/$(word 2,$(subst :, ,$(APP_turborush)))
+ cp $(word 1,$(subst :, ,$(APP_angrybirds))) $(B)/apps/$(word 2,$(subst :, ,$(APP_angrybirds)))
arm-none-eabi-strip --strip-unneeded $(B)/apps/Tetris.nwa
STD_APPS = $(foreach g,$(STD_GAMES),$(B)/apps/$(NWA_$(g)))
@@@ -467,6 -467,6 +470,7 @@@ clean
-$(MAKE) -C games/tombofthemask clean
-$(MAKE) -C games/uno clean
-$(MAKE) -C games/fnf clean
+ -$(MAKE) -C games/turborush clean
+ -$(MAKE) -C games/angrybirds clean
-cd games/tetris/tetris && $(CARGO) clean
-$(foreach g,$(STD_GAMES),$(MAKE) -C games/$(g) clean;)
diff --cc games/games.json
index 3fe3f8a3,cadce010..4f8ab288
--- a/games/games.json
+++ b/games/games.json
@@@ -677,7 -677,7 +677,7 @@@
},
{
"id": "championisland",
-- "rank": 21,
++ "rank": 22,
"title": "Champion Island",
"tagline": "Seven sports, one island",
"credit": "Based on Google's Champion Island Games",
@@@ -699,7 -699,7 +699,7 @@@
},
{
"id": "finalearth2",
-- "rank": 22,
++ "rank": 23,
"title": "The Final Earth 2",
"tagline": "Build a city in space",
"credit": "Based on the game by Florian van Strien",
@@@ -923,7 -923,7 +923,7 @@@
},
{
"id": "cookieclicker",
-- "rank": 24,
++ "rank": 25,
"title": "Cookie Clicker",
"tagline": "Bake billions of cookies",
"credit": "Based on Cookie Clicker by Orteil",
@@@ -944,7 -944,7 +944,7 @@@
},
{
"id": "leveldevil",
-- "rank": 23,
++ "rank": 24,
"title": "Level Devil",
"tagline": "Run to the door",
"credit": "Based on Level Devil by Unept",
@@@ -1131,26 -1131,25 +1131,47 @@@
"default": false,
"xl": true
},
+ {
+ "id": "turborush",
- "rank": 20,
++ "rank": 21,
+ "title": "Turbo Rush",
+ "tagline": "Race seven rivals on six circuits",
+ "credit": "A game by Bobydeluxe",
+ "top": "0x3C8CCB",
+ "bottom": "0x1A2630",
+ "accent": "0xFFD052",
+ "colors": 16,
+ "records": [
+ "turborush.sav",
+ "turborush_saves.py"
+ ],
+ "shots": [
+ "docs/shot.png"
+ ],
+ "repo": "https://github.com/Mason363/NumPlay/tree/main/games/turborush",
+ "default": false,
+ "xl": true
++ },
+ {
+ "id": "angrybirds",
+ "rank": 5,
+ "title": "Angry Birds",
+ "tagline": "Fling the birds at the pigs",
+ "credit": "Based on Angry Birds by Rovio",
+ "top": "0x8FD3F4",
+ "bottom": "0x3D7A24",
+ "accent": "0xE0262B",
+ "colors": 16,
+ "heap": 65536,
+ "records": [
+ "angrybirds.sav",
+ "angrybirds_saves.py"
+ ],
+ "shots": [
+ "docs/shot.png"
+ ],
+ "repo": "https://github.com/Mason363/NumPlay/tree/main/games/angrybirds",
+ "default": false,
+ "xl": true
}
]
diff --cc tests/test_games.py
index 01ea487a,e2a44a1c..00e4b232
--- a/tests/test_games.py
+++ b/tests/test_games.py
@@@ -254,11 -254,10 +254,15 @@@ GAMES =
# guide read. Next time, from the copy: Options, downscroll on (Back saves it), quit with On/Off
"fnf": ("FridayNightFunkin.nwa", "fnf.sav", presses((1500, "ok"), (2200, "ok"), (2900, "ok"), (3600, "back")), 7000,
presses((1500, "ok"), (2200, "down"), (2700, "down"), (3200, "ok"), (3900, "ok"), (4600, "back")), 6000),
+ # the title's Play, Start, the first-run guide's OK, then the race: flat out, Back to pause, Home. Next time,
+ # from the copy, Continue: the race again (after a 3, 2, 1), quit with On/Off
+ "turborush": ("TurboRush.nwa", "turborush.sav", presses((1500, "ok"), (2200, "ok"), (2900, "ok"), (9500, "back"))
+ + [(3500, 9000, K["up"])], 11000, presses((1500, "ok")) + [(3500, 6500, K["up"])], 7500),
+ # the title, Poached Eggs, its first level, the story, how to play (the first time), then a bird launched; Home
+ # keeps the play time. Next time, from the copy, the same level without the guide, quit with On/Off
+ "angrybirds": ("AngryBirds.nwa", "angrybirds.sav",
+ presses((1500, "ok"), (2200, "ok"), (2900, "ok"), (3600, "ok"), (4300, "ok"), (5500, "ok")), 9000,
+ presses((1500, "ok"), (2200, "ok"), (2900, "ok"), (3600, "ok")), 6000),
# a level, its message, then play; then back to the level select
"portal": ("PortalReturns.nwa", "portal.sav",
presses((1500, "ok"), (2500, "ok"), (3500, "ok")) + every(4000, 7000, 400, "right", 300), 8000,
@@@ -325,8 -324,7 +329,8 @@@ COPIES = {"championisland": "champion_s
"jetpackjoyride": "jetpackjoyride_saves.py", "stickmanhook": "stickmanhook_saves.py",
"donkeykong": "donkeykong_saves.py", "dune": "dune_saves.py", "monkeymart": "monkeymart_saves.py",
"tombofthemask": "tombofthemask_saves.py", "uno": "uno_saves.py",
- "fnf": "fnf_saves.py",
- "fnf": "fnf_saves.py", "turborush": "turborush_saves.py"}
++ "fnf": "fnf_saves.py", "turborush": "turborush_saves.py",
+ "angrybirds": "angrybirds_saves.py"}
def dk_frames(v):
@@@ -479,12 -477,12 +483,18 @@@ CHECKS =
# on (at 8), the guide still read
"fnf": (lambda v: len(v) == 1552 and v[:4] == b"FNFS" and v[4] == 1 and v[9] == 1 and v[8] == 0,
lambda v: len(v) == 1552 and v[:4] == b"FNFS" and v[9] == 1 and v[8] == 1),
+ # "TRU1", version 1, its size (492): the guide read (85), a race kept (114) and going (phase at 127), its clock
+ # (164) running; after the reinstall, from the copy, the same race goes on
+ "turborush": (lambda v: len(v) == 492 and v[:4] == b"TRU1" and v[85] == 1 and v[114] == 1 and v[127] == 1
+ and struct.unpack_from("<I", v, 164)[0] >= 1000,
+ lambda v: len(v) == 492 and v[:4] == b"TRU1" and v[114] == 1 and v[127] == 1
+ and struct.unpack_from("<I", v, 164)[0] >= 4000),
+ # "ABS1", version 1, its size (3032): how to play shown (guide at 3014), the first level last played (3012), some
+ # seconds of play (3024); after the reinstall, from the copy, more of them
+ "angrybirds": (lambda v: len(v) == 3032 and v[:4] == b"ABS1" and v[3014] == 1
+ and struct.unpack_from("<H", v, 3012)[0] == 0 and struct.unpack_from("<I", v, 3024)[0] >= 2,
+ lambda v: len(v) == 3032 and v[:4] == b"ABS1" and v[3014] == 1
+ and struct.unpack_from("<I", v, 3024)[0] >= 4),
"breakout": (lambda v: len(v) == 12 and v[:2] == b"B\2" and v[4] == 1 and struct.unpack_from("<I", v, 8)[0] >= 10,
lambda v: v[4] == 0 and struct.unpack_from("<I", v, 8)[0] >= 1), # best kept, shake off
# Air Hockey and the easy computer chosen; then the normal computer and Tanks, the tallies of the six games kept
diff --cc tools/release.py
index ddf17e56,270195d9..28438e65
--- a/tools/release.py
+++ b/tools/release.py
@@@ -50,7 -50,7 +50,8 @@@ ALONE =
"tombofthemask": ("Tomb of the Mask", "dash through the tomb: the endless arcade climb and all 200 stages, with the 16 masks"),
"uno": ("UNO", "the card game against one to three bots, with the official rules and scoring to 500"),
"fnf": ("Friday Night Funkin'", "the Tutorial, Weeks 1 to 7, Weekend 1 and LE SSERAFIM, in story mode and freeplay"),
+ "turborush": ("Turbo Rush", "an arcade racer by Bobydeluxe: six circuits, a Grand Prix, single races and Free Ride"),
+ "angrybirds": ("Angry Birds", "the 429 levels of the Chrome edition, its seven birds and the Mighty Eagle"),
}
VARIANTS = [
("NumPlay-Invisible.nwa", "The same app, hidden: a blank icon with no name"),