Faster episode booting

LunaDll/Defines.h

@@ -194,6 +194,9 @@ enum NPCTransformationCause {
 #define GM_PLAYER_KEY_SEL   8
 #define GM_PLAYER_KEY_STR   9
 
+#define GM_MAX_PLAYERS       200
+#define GM_MAX_CHARACTERS    5
+
 #define DEFMEM(name, type, addr) static auto& name = *(type*)(addr); \
     static constexpr std::uintptr_t name ## _ADDR = addr; \
     static auto name ## _POINTER = (type*)(addr);
@@ -207,7 +210,7 @@ DEFMEM(GM_DO_SCREENSHOT,    short, 0x00B2504C);
 DEFMEM(GM_CREDITS_MODE,     WORD,  0x00B2C89C);
 DEFMEM(GM_EPISODE_MODE,     WORD,  0x00B2C5B4);      // 0xFFFF = leave current level
 DEFMEM(GM_LEVEL_MODE,       WORD,  0x00B2C620);
-DEFMEM(GM_TITLE_INTRO_MODE, WORD,  0x00B2C620)
+DEFMEM(GM_TITLE_INTRO_MODE, WORD,  0x00B2C620);
 /*
 The modes work as followed:
 GM_CREDITS_MODE == -1                        --> Credits
@@ -254,6 +257,11 @@ DEFMEM(GM_PLAYERS_COUNT,    WORD,  0x00B2595E);
 DEFMEM(GM_EDIT_PLAYERS_PTR, void*, 0x00CF74D8);     // Editor Template player
 DEFMEM(GM_PLAYER_POS,       Momentum*, 0x00B25148);
 
+DEFMEM(GM_PLAYER_OWED_MOUNT_PTR, void*, 0x00B25180); // When a yoshi/boot is taken from the player this returns after going back to the world map
+DEFMEM(GM_PLAYER_OWED_MOUNT_COUNT, WORD, 0x00B25178);
+DEFMEM(GM_PLAYER_OWED_MOUNT_TYPE_PTR, void*, 0x00B2519C);
+DEFMEM(GM_PLAYER_OWED_MOUNT_TYPE_COUNT, WORD, 0x00B25194);
+
 // Star counting
 DEFMEM(GM_STAR_COUNT,       WORD, 0x00B251E0);
 DEFMEM(GM_STARS_PTR,        void*, 0x00B25714);
@@ -289,6 +297,7 @@ DEFMEM(GM_KEYRELEASED,      WORD,  0x00B2C884);
 // States
 DEFMEM(GM_FREEZWITCH_ACTIV, WORD,  0x00B2C8B4);
 DEFMEM(GM_PAUSE_OPEN,       WORD,  0x00B250E2);
+DEFMEM(GM_FORCED_CONTROLS,  WORD,  0x00B2D712);
 
 DEFMEM(GM_CHEAT_MONEYTREE_HAVEMONEY, DWORD, 0x00B2C8BA);
 
@@ -303,7 +312,7 @@ DEFMEM(GM_OVERWORLD_PTR,    void*, 0x00B2C5C8);
 // Overworld Level Array
 DEFMEM(GM_LEVEL_COUNT,      WORD,  0x00B25960);
 DEFMEM(GM_LEVEL_BASE,       void*, 0x00B25994);
-
+DEFMEM(GM_OVERWORLD_CUR_LVL, WORD, 0x00B2C5D6);
 
 // Level related memory
 DEFMEM(GM_LVLFILENAME_PTR,  VB6StrPtr, 0x00B2C5A4);   // Lvl filename
@@ -396,12 +405,14 @@ DEFMEM(GM_INPUTTYPE,        short*, 0x00B250A0);
 DEFMEM(GM_INPUTSTR_BUF_PTR, VB6StrPtr, 0x00B2C898);
 
 // Saves
-DEFMEM(GM_CUR_SAVE_SLOT,    WORD,  0x00B2C62A);      // 1 2 or 3
+DEFMEM(GM_CUR_SAVE_SLOT,       WORD,  0x00B2C62A);  // 1 2 or 3
+DEFMEM(GM_SAVE_PERCENTAGE_PTR, void*, 0x00B2C644);
 
 // Cheats
 DEFMEM(GM_PLAYER_INVULN,    WORD,   0x00B2C8C0);    // 0xFFFF = invuln
 DEFMEM(GM_PLAYER_INFJUMP,   WORD,   0x00B2C8AC);    // 0xFFFF = infinite jumps
 DEFMEM(GM_PLAYER_SHADOWSTAR,WORD,   0x00B2C8AA);    // 0xFFFF = shadowstar
+DEFMEM(GM_WORLD_UNLOCK,     WORD,   0x00B2C8B0);    // 0xFFFF = illparkwhereiwant
 DEFMEM(GM_CHEATED,          WORD,   0x00B2C8C4);    // 0xFFFF = cheated
 
 // Frame counter
@@ -628,6 +639,12 @@ DEFMEM(GM_GAMETITLE_1, VB6StrPtr, 0x8BD869);
 DEFMEM(GM_GAMETITLE_2, VB6StrPtr, 0x8BE25A);
 DEFMEM(GM_GAMETITLE_3, VB6StrPtr, 0x96AF26);
 
+// World Information
+DEFMEM(GM_WORLD_NAME,             VB6StrPtr, 0x00B2C624);
+DEFMEM(GM_WORLD_INTRO_FILENAME,   VB6StrPtr, 0x00B25724);
+DEFMEM(GM_HUB_STYLED_EPISODE,     WORD,      0x00B25728);
+DEFMEM(GM_RESTART_ON_DEATH,       WORD,      0x00B2572A);
+
 
 /////////////////////
 ///  -Assembly-   ///
@@ -842,6 +859,7 @@ DEFMEM(IMP_vbaInputFile, void*, 0x00401158); // Ptr to __cdecl
 #define GF_UPDATE_BLOCK_ANIM 0x009E14B0
 
 #define GF_CLEANUP_LEVEL    0x008DC6E0
+#define GF_CLEANUP_WORLD    0x008E2E40
 #define GF_LOAD_LEVEL       0x008D8F40
 #define GF_INIT_CAMERA      0x009502E0
 #define GF_RENDER_INIT_SCREEN 0x00987DE0
@@ -938,6 +956,7 @@ static const auto native_renderLevel    = (void(__stdcall *)(void))GF_RENDER_LEV
 static const auto native_updateBlockAnim = (void(__stdcall *)(void))GF_UPDATE_BLOCK_ANIM;
 
 static const auto native_cleanupLevel   = (void(__stdcall *)(void))GF_CLEANUP_LEVEL;
+static const auto native_cleanupWorld   = (void(__stdcall *)(void))GF_CLEANUP_WORLD;
 static const auto native_loadLevel      = (void(__stdcall *)(VB6StrPtr* /*path*/))GF_LOAD_LEVEL;
 static const auto native_initCamera     = (void(__stdcall *)(void))GF_INIT_CAMERA;
 static const auto native_renderInitScreen = (void(__stdcall *)(void))GF_RENDER_INIT_SCREEN;

LunaDll/EventStateMachine.cpp

@@ -8,6 +8,7 @@
 #include "Misc/LoadScreen.h"
 #include "Rendering/GL/GLEngineProxy.h"
 #include "SdlMusic/SdlMusPlayer.h"
+#include "SMBXInternal/Reconstructed/EpisodeMain.h"
 #include "SMBXInternal/Variables.h"
 
 // Global instance
@@ -193,7 +194,6 @@ void EventStateMachine::sendOnTick(void) {
     m_onTickReady = false;
 
     sendSimpleLuaEvent("onTick");
-
     m_onTickEndReady = true;
 }
 

LunaDll/FileManager/SMBXFileManager.cpp

@@ -22,6 +22,8 @@
 #include "../SMBXInternal/Layer.h"
 #include "../SMBXInternal/SMBXEvents.h"
 
+#include "../SMBXInternal/Reconstructed/EpisodeMain.h"
+
 #include <DirManager/dirman.h>
 
 SMBXLevelFileBase::SMBXLevelFileBase() :

LunaDll/GameConfig/GameAutostart.cpp

@@ -187,6 +187,7 @@ GameAutostart GameAutostart::createGameAutostartByIniConfig(IniProcessing &reade
     autostarter.selectedWldPath = L"";
     autostarter.selectedEpisode = reader.value("episode-name", "").toString();
     autostarter.singleplayer    = reader.value("singleplayer", true).toBool();
+    autostarter.playerCount     = reader.value("players", 1).toInt();
     autostarter.firstCharacter  = static_cast<Characters>(reader.value("character-player1", 1).toInt());
     autostarter.secondCharacter = static_cast<Characters>(reader.value("character-player2", 2).toInt());
     autostarter.saveSlot        = reader.value("save-slot", 1).toInt();
@@ -200,12 +201,26 @@ GameAutostart GameAutostart::createGameAutostartByStartupEpisodeSettings(const S
     autostarter.selectedWldPath = settings.wldPath;
     autostarter.selectedEpisode = "";
     autostarter.singleplayer = (settings.players == 1);
+    autostarter.playerCount = settings.players;
     autostarter.firstCharacter = static_cast<Characters>(settings.character1);
     autostarter.secondCharacter = static_cast<Characters>(settings.character2);
     autostarter.saveSlot = settings.saveSlot;
     return autostarter;
 }
 
+GameAutostart GameAutostart::createGameAutostartByManualSettings(std::wstring wldPath, int players, int character1, int character2, int saveSlot)
+{
+    GameAutostart autostarter;
+    autostarter.selectedWldPath = wldPath;
+    autostarter.selectedEpisode = "";
+    autostarter.singleplayer = (players == 1);
+    autostarter.playerCount = players;
+    autostarter.firstCharacter = static_cast<Characters>(character1);
+    autostarter.secondCharacter = static_cast<Characters>(character2);
+    autostarter.saveSlot = saveSlot;
+    return autostarter;
+}
+
 /*static*/ void GameAutostart::ClearAutostartPatch()
 {
     skipIntoPatch.Unapply();

LunaDll/GameConfig/GameAutostart.h

@@ -14,6 +14,7 @@ class GameAutostart
     std::string selectedEpisode;
     std::wstring selectedWldPath;
     bool singleplayer;
+    int playerCount;
     Characters firstCharacter;
     Characters secondCharacter;
     int saveSlot;
@@ -23,10 +24,41 @@ class GameAutostart
     ~GameAutostart();
     static GameAutostart createGameAutostartByIniConfig(IniProcessing& reader);
     static GameAutostart createGameAutostartByStartupEpisodeSettings(const StartupEpisodeSettings& settings);
+    static GameAutostart createGameAutostartByManualSettings(std::wstring wldPath, int players, int character1, int character2, int saveSlot);
     static void ClearAutostartPatch();
 
-    void setSelectedEpisode(std::string val) { selectedEpisode = val; }
-    void setSaveSlot(int val) { saveSlot = val; }
+    void setSelectedEpisode(std::string val)
+    {
+        selectedEpisode = val;
+    }
+    void setSelectedEpisodePath(std::wstring val)
+    {
+        selectedWldPath = val;
+    }
+    void setPlayerCount(int val)
+    {
+        playerCount = val;
+        if(val >= 2)
+        {
+            singleplayer = false;
+        }
+        else if(val <= 1)
+        {
+            singleplayer = true;
+        }
+    }
+    void setFirstCharacter(int val)
+    {
+        firstCharacter = (Characters)val;
+    }
+    void setSecondCharacter(int val)
+    {
+        secondCharacter = (Characters)val;
+    }
+    void setSaveSlot(int val)
+    {
+        saveSlot = val;
+    }
 
     bool applyAutostart();
 };