Handle title screen and file select screen stuff separately

This makes it so that the checks for drawing the title screen and file select screen stuff is not running every frame.

Author: Zephiles

ttyd-tools/rel/include/lst/ttyd.eu.lst

@@ -85,7 +85,7 @@
 // 80008A54:pressStartGX
 // 80008EFC:disp2
 // 80009264:disp1
-// 800093F0:titleMain
+800093F0:titleMain
 // 80009CAC:L_titleInit
 // 80009E90:N_getDebugMode
 // 80009E9C:seq_titleMain
@@ -1668,6 +1668,14 @@
 // 800F1E54:evt_pouch_add_coin
 // 800F1E84:evt_pouch_get_coin
 
+// seq_load.o
+// 800F4848:continueGame
+// 800F4D98:loadDraw
+// 800F6940:loadMain
+800F7DD4:seq_loadMain
+// 800F80E8:seq_loadExit
+// 800F8124:seq_loadInit
+
 // battle.o
 // text
 // 800F8320:BattleConsumeReserveItem

ttyd-tools/rel/include/lst/ttyd.jp.lst

@@ -85,7 +85,7 @@
 // 800087B0:pressStartGX
 // 80008C50:disp2
 // 80008F68:disp1
-// 800090F4:titleMain
+800090F4:titleMain
 // 80009958:L_titleInit
 // 80009B3C:N_getDebugMode
 // 80009B48:seq_titleMain
@@ -1664,6 +1664,14 @@
 // 800EC32C:evt_pouch_add_coin
 // 800EC35C:evt_pouch_get_coin
 
+// seq_load.o
+// 800EED20:continueGame
+// 800EF270:loadDraw
+// 800F0BE8:loadMain
+800F207C:seq_loadMain
+// 800F2330:seq_loadExit
+// 800F236C:seq_loadInit
+
 // battle.o
 // text
 // 800F2568:BattleConsumeReserveItem

ttyd-tools/rel/include/lst/ttyd.us.lst

@@ -85,7 +85,7 @@
 // 80008888:pressStartGX
 // 80008D30:disp2
 // 80009098:disp1
-// 80009224:titleMain
+80009224:titleMain
 // 80009AE8:L_titleInit
 // 80009CCC:N_getDebugMode
 // 80009CD8:seq_titleMain
@@ -1666,6 +1666,14 @@
 // 800F0FE8:evt_pouch_add_coin
 // 800F1018:evt_pouch_get_coin
 
+// seq_load.o
+// 800F39DC:continueGame
+// 800F3F2C:loadDraw
+// 800F5AD4:loadMain
+800F6F68:seq_loadMain
+// 800F727C:seq_loadExit
+// 800F72B8:seq_loadInit
+
 // battle.o
 // text
 // 800F74B4:BattleConsumeReserveItem

ttyd-tools/rel/include/mod.h

@@ -44,6 +44,8 @@ class Mod
     void preventViPostCallBackOnPause(uint32_t);
     bool disableBGM(int32_t, const char *, uint16_t, uint16_t, bool);
     bool disableENVSounds(int32_t, const char *, int32_t, bool);
+    void displayTitleScreenInfo(ttyd::seqdrv::SeqInfo *);
+    void displayFileSelectScreenInfo(ttyd::seqdrv::SeqInfo *);
 
 private:
     void (*mPFN_marioStMain_trampoline)() = nullptr;
@@ -78,6 +80,8 @@ class Mod
     void (*mPFN_viPostCallback_trampoline)(uint32_t) = nullptr;
     bool (*mPFN_psndBGMOn_f_d_trampoline)(int32_t, const char *, uint16_t, uint16_t, bool) = nullptr;
     bool (*mPFN_psndENVOn_f_d_trampoline)(int32_t, const char *, int32_t, bool) = nullptr;
+    void (*mPFN_titleMain_trampoline)(ttyd::seqdrv::SeqInfo *) = nullptr;
+    void (*mPFN_seq_loadMain_trampoline)(ttyd::seqdrv::SeqInfo *) = nullptr;
 };
 
 }

ttyd-tools/rel/include/ttyd/seq_load.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <ttyd/seqdrv.h>
+
+#include <cstdint>
+
+namespace ttyd::seq_load {
+
+extern "C" {
+
+// continueGame
+// loadDraw
+// loadMain
+void seq_loadMain(ttyd::seqdrv::SeqInfo *seqInfo);
+// seq_loadExit
+// seq_loadInit
+
+}
+
+}

ttyd-tools/rel/include/ttyd/seq_title.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <ttyd/seqdrv.h>
+
 #include <cstdint>
 
 namespace ttyd::seq_title {
@@ -9,7 +11,7 @@ extern "C" {
 // pressStartGX
 // disp2
 // disp1
-// titleMain
+void titleMain(ttyd::seqdrv::SeqInfo *seqInfo);
 // L_titleInit
 // N_getDebugMode
 // seq_titleMain

ttyd-tools/rel/source/codes.cpp

@@ -637,7 +637,7 @@ void levitate()
     }
 
     ttyd::mario::Player *player = ttyd::mario::marioGetPtr();
-    player->wJumpVelocityY = 4.540000915527344;
+    player->wJumpVelocityY = 4.540000915527344f;
 }
 
 uint32_t autoMashText(uint32_t controllerPort)

ttyd-tools/rel/source/main.cpp

@@ -277,33 +277,37 @@ void *jumpOnWater(void *ptr)
     }
 }
 
-void displayTitleScreenAndFileSelectScreenInfo()
+void Mod::displayTitleScreenInfo(ttyd::seqdrv::SeqInfo *seqInfo)
 {
-    if (checkForSpecificSeq(ttyd::seqdrv::SeqIndex::kTitle))
+    // Check to see if the title screen is ready
+    // Check to see if the curtain is fully displayed or not
+    uint32_t TitleMainCheck = *reinterpret_cast<uint32_t *>(
+        reinterpret_cast<uint32_t>(ttyd::seq_title::seqTitleWorkPointer2) + 0x8);
+    
+    if ((TitleMainCheck >= 2) && (TitleMainCheck < 12))
     {
-        // Check to see if the title screen is ready
-        // Check to see if the curtain is fully displayed or not
-        uint32_t TitleMainCheck = *reinterpret_cast<uint32_t *>(
-            reinterpret_cast<uint32_t>(ttyd::seq_title::seqTitleWorkPointer2) + 0x8);
-        
-        if ((TitleMainCheck >= 2) && (TitleMainCheck < 12))
-        {
-            // Curtain is not fully displayed
-            // Draw the title screen info
-            drawFunctionOn2DLayerWithOrder(drawTitleScreenInfo, -1.f);
-        }
+        // Curtain is not fully displayed
+        // Draw the title screen info
+        drawFunctionOn2DLayerWithOrder(drawTitleScreenInfo, -1.f);
     }
-    else if (checkForSpecificSeq(ttyd::seqdrv::SeqIndex::kLoad))
+    
+    // Call original function
+    mPFN_titleMain_trampoline(seqInfo);
+}
+
+void Mod::displayFileSelectScreenInfo(ttyd::seqdrv::SeqInfo *seqInfo)
+{
+    // Check to see if the curtain is down or not
+    uint32_t SeqMainCheck = ttyd::seqdrv::seqWork.wFileSelectScreenProgress;
+    
+    if (SeqMainCheck == 2)
     {
-        // Check to see if the curtain is down or not
-        uint32_t SeqMainCheck = ttyd::seqdrv::seqWork.wFileSelectScreenProgress;
-        
-        if (SeqMainCheck == 2)
-        {
-            // Draw the file select screen info
-            drawFunctionOn2DLayerWithOrder(drawFileSelectScreenInfo, -1.f);
-        }
+        // Draw the file select screen info
+        drawFunctionOn2DLayerWithOrder(drawFileSelectScreenInfo, -1.f);
     }
+    
+    // Call original function
+    mPFN_seq_loadMain_trampoline(seqInfo);
 }
 
 int32_t Mod::pauseMenuPreventUnpause(void *pauseMenuPointer)
@@ -1013,9 +1017,6 @@ void initAddressOverwrites()
 
 void Mod::run()
 {
-    // Display the title screen and file select screen info
-    displayTitleScreenAndFileSelectScreenInfo();
-    
     // Update the On-Screen Timer variables if the display is on
     updateOnScreenTimerVars();
 

ttyd-tools/rel/source/mod.cpp

@@ -27,6 +27,8 @@
 #include <ttyd/seqdrv.h>
 #include <ttyd/pmario_sound.h>
 #include <ttyd/fontmgr.h>
+#include <ttyd/seq_title.h>
+#include <ttyd/seq_load.h>
 #include <ttyd/windowdrv.h>
 #include <ttyd/seq_logo.h>
 
@@ -207,6 +209,18 @@ void Mod::init()
         return gMod->disableENVSounds(flags, envName, wFadeTime, unused);
     });
 
+    mPFN_titleMain_trampoline = patch::hookFunction(
+        ttyd::seq_title::titleMain, [](ttyd::seqdrv::SeqInfo *seqInfo)
+    {
+        gMod->displayTitleScreenInfo(seqInfo);
+    });
+    
+    mPFN_seq_loadMain_trampoline = patch::hookFunction(
+        ttyd::seq_load::seq_loadMain, [](ttyd::seqdrv::SeqInfo *seqInfo)
+    {
+        gMod->displayFileSelectScreenInfo(seqInfo);
+    });
+    
     // Initialize typesetting early
     ttyd::fontmgr::fontmgrTexSetup();
     patch::hookFunction(ttyd::fontmgr::fontmgrTexSetup, [](){});