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.

Celeste: Oshiro opens the resort lobby's door

Mason Chene21d7441932b
diff --git a/README.md b/README.md
index 8111146c..cb5976ff 100644
--- a/README.md
+++ b/README.md
@@ -393,7 +393,7 @@ Upsilon support is new. If it doesn't work on your calculator, please [email me]
- The **Nunito** and **Rammetto One** fonts, under the SIL Open Font License ([LICENSES](LICENSES)).
- **reversal_lava63**, a beta tester who plays NumPlay's apps on a real calculator and reports what's wrong.
- **[Gabriel](https://github.com/tomcalif9-stack)**, who made the home screen's moving backgrounds, translated NumPlay into French first, and tests it on Upsilon and an N0115.
-- Everyone who reported a bug: **NEE** ([reversallava63](https://github.com/reversallava63)), **Gabriel**, **[briac134](https://github.com/briac134)**, **[Raphanobie](https://github.com/Raphanobie)**, **[zbigzo](https://github.com/zbigzo)**, **Yacine**, **Ewnet Tewodros** and **PelicanMan75**. Thank you!
+- Everyone who reported a bug: **NEE** ([reversallava63](https://github.com/reversallava63)), **Gabriel**, **[briac134](https://github.com/briac134)**, **[Raphanobie](https://github.com/Raphanobie)**, **[zbigzo](https://github.com/zbigzo)**, **Yacine**, **Ewnet Tewodros**, **PelicanMan75** and **[Spykube](https://github.com/Spykube)**. Thank you!
- The **Fusion Pixel** font by TakWolf (with glyphs from **Ark Pixel**), under the SIL Open Font License ([license](LICENSES/OFL-1.1-Fusion-Pixel.txt)), for the Chinese letters.
- **[Upsilon](https://github.com/UpsilonNumworks/Upsilon)**, the custom software NumPlay-Upsilon.nwa runs on.
diff --git a/games/celeste/src/ch3.c b/games/celeste/src/ch3.c
index 3d2169af..f384f42d 100644
--- a/games/celeste/src/ch3.c
+++ b/games/celeste/src/ch3.c
@@ -2688,15 +2688,14 @@ static bool lobby_event(void *ctx, int index) { /* ZoomOut */
EV_WAIT(0.2f);
EV_END;
}
-static void gdoor_open(Ent *e, bool instant);
-static void lobby_doors(bool instant) { /* every MrOshiroDoor: Open / InstantOpen */
+static void lobby_doors(bool instant) { /* every MrOshiroDoor (a GDOOR marked oshiro): Open / InstantOpen */
for (int i = 0; i < g_nents; i++)
- if (g_ents[i].cls && g_ents[i].dead != 1 && g_ents[i].cls->name && !strcmp(g_ents[i].cls->name, "oshirodoor")) gdoor_open(&g_ents[i], instant);
+ if (g_ents[i].cls == &GDOOR && g_ents[i].dead != 1 && ST(&g_ents[i], GDoor)->oshiro) gdoor_open(&g_ents[i], instant);
}
static void lobby_end(Ent *e, bool skipped) {
Lobby *s = ST(e, Lobby);
player_free();
- if (skipped) lobby_doors(true);
+ lobby_doors(skipped); /* skipped: InstantOpen (played through, Open has opened them already: this does nothing) */
g_level.lighting = s->start_light;
level_set_flag("oshiro_resort_talked_1", true);
if (skipped && s->osh->cls == &OSH3) ent_remove(s->osh);
diff --git a/games/celeste/tests/check.py b/games/celeste/tests/check.py
index 8f9f60f9..c8fb1789 100644
--- a/games/celeste/tests/check.py
+++ b/games/celeste/tests/check.py
@@ -113,6 +113,14 @@ out = run(["--chapter", "7", "--room", "s3", "--nowipe"], 780,
"250-300:l,264-265:x,302-330:u,332-344:j,332-346:l,400-415:l,440-760:r,523-535:j", what="3A's key and locked door")
check("room 0x-a " in out and " deaths 0 " in out, f"3A's start room was not crossed with its key: {out[-160:]}")
+# 3A's lobby (0x-a): Oshiro's cutscene, played through (OK pressed through) or skipped from the pause menu, opens his
+# ghost door (MrOshiroDoor) on the right, the way on to 00-a
+for how, frames, keys in (("played", 2250, ",".join(f"{f}-{f + 2}:o" for f in range(300, 1900, 12)) + ",2000-2240:r"),
+ ("skipped", 650, "200-201:p,215-216:d,230-231:o,400-640:r")):
+ out = run(["--chapter", "7", "--room", "0x-a", "--nowipe", "--at", "160,152"], frames, "20-21:x," + keys,
+ what=f"3A's lobby ({how})")
+ check("room 00-a " in out, f"3A's lobby: Oshiro's door stayed shut, the cutscene {how}: {out[-160:]}")
+
# 5A's c-10: its two touch switches (below the middle cracked block, on top of it) open the temple gate (TouchSwitches)
# up on the right, the way to c-12
out = run(["--chapter", "13", "--room", "c-10", "--nowipe"], 520,