diff --git a/PCCS b/PCCS index cf28a92..a685b60 160000 --- a/PCCS +++ b/PCCS @@ -1 +1 @@ -Subproject commit cf28a9237f4d140e73f530aa6dee6c74a12ad0bf +Subproject commit a685b60eb24350cc8a7491ed3d59022b5fd96f3f diff --git a/README.md b/README.md index 20d91f9..67b98df 100644 --- a/README.md +++ b/README.md @@ -87,13 +87,9 @@ See [BUILDING.md](BUILDING.md). - [Smogon's Practical Guides to RNG Abuse](https://www.smogon.com/ingame/rng/) ## ROM Data: -- [PokeRuby](https://github.com/pret/pokeruby) -- [PokeFireRed](https://github.com/pret/pokefirered) -- [PokeEmerald](https://github.com/pret/pokeemerald) -- [PokeRed](https://github.com/pret/pokered) -- [PokeYellow](https://github.com/pret/pokeyellow) -- [PokeGold](https://github.com/pret/pokegold) -- [PokeCrystal](https://github.com/pret/pokecrystal) +- [PRET](https://github.com/pret) +- [Narishma-gb](https://github.com/Narishma-gb) +- [Hatena Blogのvs_prof_oak] (https://vs-prof-oak.hatenablog.com/entry/2024/03/02/134741) ## Pokémon Data: - [Bulbapedia](https://bulbapedia.bulbagarden.net/wiki/Main_Page) diff --git a/source/link_handler.cpp b/source/link_handler.cpp index 61e9d64..403c916 100644 --- a/source/link_handler.cpp +++ b/source/link_handler.cpp @@ -633,6 +633,11 @@ void LinkConnection::handleStateLogic() else if (inData == 0xFD && dataOutBufferCurrIndex > 0) { loadCurrGameFromChecksum(); + if (currROM == GB_ROM_ERROR) + { + while(true){} + // Add in an error message thrown here once we, ya know, rewrite the text engine to make that possible + } loadPayloadByROM(currROM); exitState = SEND_SPECIFIC_PAYLOAD; } diff --git a/tools/text_helper/text.xlsx b/tools/text_helper/text.xlsx index a190e16..9c07652 100644 Binary files a/tools/text_helper/text.xlsx and b/tools/text_helper/text.xlsx differ