rel: Skip logo on load

Author: PistonMiner

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

@@ -68,6 +68,15 @@
 80010e28:dispReInit
 80010e34:dispInit
 
+// seqdrv.o
+8002e2cc:seqCheckSeq
+8002e2e8:seqGetNextSeq
+8002e2f0:seqGetPrevSeq
+8002e2f8:seqGetSeq
+8002e300:seqSetSeq
+8002e310:seqMain
+8002e3ec:seqInit_MARIOSTORY
+
 // memory.o
 // unused:smartGetWorkPtr
 8002f424:smartTexObj
@@ -148,6 +157,16 @@
 80078e98:fontmgrTexSetup
 80078ec4:fontmgrInit
 
+// seq_logo.o
+// 80086d4c:progDisp
+// unused:arcLoad
+// unused:arcPreLoad
+// 8008726c:dummy_draw
+// 80087324:logoDisp
+80088118:seq_logoMain
+80088818:seq_logoExit
+8008885c:seq_logoInit
+
 // printf.o
 8026deac:sprintf
 // unused:snprintf

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

@@ -68,6 +68,15 @@
 80010ab8:dispReInit
 80010ac4:dispInit
 
+// seqdrv.o
+8002dbc0:seqCheckSeq
+8002dbdc:seqGetNextSeq
+8002dbe4:seqGetPrevSeq
+8002dbec:seqGetSeq
+8002dbf4:seqSetSeq
+8002dc04:seqMain
+8002dce0:seqInit_MARIOSTORY
+
 // memory.o
 // unused:smartGetWorkPtr
 8002ed18:smartTexObj
@@ -146,6 +155,16 @@
 80076e98:fontmgrTexSetup
 8007711c:fontmgrInit
 
+// seq_logo.o
+80084a6c:progDisp
+// unused:arcLoad
+// unused:arcPreLoad
+80084f84:dummy_draw
+8008503c:logoDisp
+80085998:seq_logoMain
+80085f50:seq_logoExit
+80085f94:seq_logoInit
+
 // printf.o
 80264108:sprintf
 // unused:snprintf

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

@@ -68,6 +68,15 @@
 80010c64:dispReInit
 80010c70:dispInit
 
+// seqdrv.o
+8002e1e4:seqCheckSeq
+8002e200:seqGetNextSeq
+8002e208:seqGetPrevSeq
+8002e210:seqGetSeq
+8002e218:seqSetSeq
+8002e228:seqMain
+8002e304:seqInit_MARIOSTORY
+
 // memory.o
 // unused:smartGetWorkPtr
 8002f33c:smartTexObj
@@ -148,6 +157,16 @@
 80077bdc:fontmgrTexSetup
 80077c08:fontmgrInit
 
+// seq_logo.o
+800859f8:progDisp
+// unused:arcLoad
+// unused:arcPreLoad
+80085f28:dummy_draw
+80085fe0:logoDisp
+80086d6c:seq_logoMain
+8008746c:seq_logoExit
+800874b0:seq_logoInit
+
 // printf.c
 8026a0b8:sprintf
 // unused:snprintf

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

@@ -0,0 +1,17 @@
+#pragma once
+
+#include "seqdrv.h"
+
+#include <cstdint>
+
+namespace ttyd::seq_logo {
+
+extern "C" {
+
+void seq_logoInit(seqdrv::SeqInfo *info);
+void seq_logoExit(seqdrv::SeqInfo *info);
+void seq_logoMain(seqdrv::SeqInfo *info);
+
+}
+
+}

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

@@ -0,0 +1,31 @@
+#pragma once
+
+#include <cstdint>
+
+namespace ttyd::seqdrv {
+
+struct SeqInfo
+{
+	uint32_t seq;
+	uint32_t state;
+	const char *map;
+	const char *bero;
+	uint32_t counter;
+	uint32_t unk_14;
+	uint32_t unk_18;
+	uint32_t unk_1c;
+} __attribute__((__packed__));
+
+extern "C" {
+
+void seqInit_MARIOSTORY();
+void seqMain();
+void seqSetSeq(uint32_t seq, const char *mapName, const char *beroName);
+uint32_t seqGetSeq();
+uint32_t seqGetPrevSeq();
+uint32_t seqGetNextSeq();
+bool seqCheckSeq();
+
+}
+
+}

ttyd-tools/rel/source/mod.cpp

@@ -4,6 +4,8 @@
 #include <ttyd/mariost.h>
 #include <ttyd/fontmgr.h>
 #include <ttyd/dispdrv.h>
+#include <ttyd/seqdrv.h>
+#include <ttyd/seq_logo.h>
 
 #include "patch.h"
 
@@ -36,6 +38,12 @@ void Mod::init()
 	// Initialize typesetting early
 	ttyd::fontmgr::fontmgrTexSetup();
 	patch::hookFunction(ttyd::fontmgr::fontmgrTexSetup, [](){});
+
+	// Skip the logo
+	patch::hookFunction(ttyd::seq_logo::seq_logoMain, [](ttyd::seqdrv::SeqInfo *)
+	{
+		ttyd::seqdrv::seqSetSeq(1, nullptr, nullptr);
+	});
 }
 
 void Mod::updateEarly()
@@ -81,13 +89,12 @@ void Mod::draw()
 #else
 	#error Mario position and velocity not implemented for this version
 #endif
-
 
 	sprintf(mDisplayBuffer,
-			"Pos: %.2f %.2f %.2f\r\nSpdY: %.2f\r\nPST: %lu",
-			marioPos[0], marioPos[1], marioPos[2],
-			marioVel[0],
-			mPalaceSkipTimer.getValue());
+	        "Pos: %.2f %.2f %.2f\r\nSpdY: %.2f\r\nPST: %lu",
+	        marioPos[0], marioPos[1], marioPos[2],
+	        marioVel[0],
+	        mPalaceSkipTimer.getValue());
 	ttyd::fontmgr::FontDrawStart();
 	uint32_t color = 0xFFFFFFFF;
 	ttyd::fontmgr::FontDrawColor(reinterpret_cast<uint8_t *>(&color));