Update patch.cpp, seqdrv.h, and ReloadScreenC.cpp

Zephiles · Zephiles · commit 1eaed32a2826 · 2018-07-04T08:46:43.000-05:00
Changed patch.cpp to clear the cache of whatever address it's modifying. Changed seqdrv to use int32_t instead of uint32_t, as the values can sometimes be -1. Changed ReloadScreenC.cpp to not load the sequence until actually checking it.
diff --git a/ttyd-tools/rel/include/ttyd.eu.lst b/ttyd-tools/rel/include/ttyd.eu.lst
@@ -827,6 +827,27 @@
 // w_atan2.c
 80276394:atan2
 
+// OSCache.c
+// 8029A84C:DCEnable
+// 8029A860:DCInvalidateRange
+8029A88C:DCFlushRange
+// 8029A8BC:DCStoreRange
+// 8029A8EC:DCFlushRangeNoSync
+// 8029A918:DCStoreRangeNoSync
+// 8029A944:DCZeroRange
+8029A970:ICInvalidateRange
+// 8029A9A4:ICFlashInvalidate
+// 8029A9B4:ICEnable
+// 8029A9C8:__LCEnable
+// 8029AA94:LCEnable
+// 8029AACC:LCDisable
+// 8029AAF4:LCStoreBlocks
+// 8029AB18:LCStoreData
+// 8029ABC4:LCQueueWait
+// 8029ABD8:L2GlobalInvalidate
+// 8029AC70:DMAErrorHandler
+// 8029ADD0:__OSCacheInit
+
 // GXGeometry.c
 // 802B9A68:__GXSetDirtyState
 802B9AE8:GXBegin
diff --git a/ttyd-tools/rel/include/ttyd.jp.lst b/ttyd-tools/rel/include/ttyd.jp.lst
@@ -824,6 +824,27 @@
 // w_atan2.c
 8026C588:atan2
 
+// OSCache.c
+// 802909FC:DCEnable
+// 80290A10:DCInvalidateRange
+80290A3C:DCFlushRange
+// 80290A6C:DCStoreRange
+// 80290A9C:DCFlushRangeNoSync
+// 80290AC8:DCStoreRangeNoSync
+// 80290AF4:DCZeroRange
+80290B20:ICInvalidateRange
+// 80290B54:ICFlashInvalidate
+// 80290B64:ICEnable
+// 80290B78:__LCEnable
+// 80290C44:LCEnable
+// 80290C7C:LCDisable
+// 80290CA4:LCStoreBlocks
+// 80290CC8:LCStoreData
+// 80290D74:LCQueueWait
+// 80290D88:L2GlobalInvalidate
+// 80290E20:DMAErrorHandler
+// 80290F80:__OSCacheInit
+
 // GXGeometry.c
 // 802AFBE8:__GXSetDirtyState
 802AFC68:GXBegin
diff --git a/ttyd-tools/rel/include/ttyd.us.lst b/ttyd-tools/rel/include/ttyd.us.lst
@@ -827,6 +827,27 @@
 // w_atan2.c
 802725A0:atan2
 
+// OSCache.c
+// 80296A14:DCEnable
+// 80296A28:DCInvalidateRange
+80296A54:DCFlushRange
+// 80296A84:DCStoreRange
+// 80296AB4:DCFlushRangeNoSync
+// 80296AE0:DCStoreRangeNoSync
+// unused:DCZeroRange
+80296B0C:ICInvalidateRange
+// 80296B40:ICFlashInvalidate
+// 80296B50:ICEnable
+// unused:__LCEnable
+// unused:LCEnable
+// 80296B64:LCDisable
+// unused:LCStoreBlocks
+// unused:LCStoreData
+// unused:LCQueueWait
+// 80296B8C:L2GlobalInvalidate
+// 80296C24:DMAErrorHandler
+// 80296D84:__OSCacheInit
+
 // GXGeometry.c
 // 802B59EC:__GXSetDirtyState
 802B5A6C:GXBegin
diff --git a/ttyd-tools/rel/include/ttyd/OSCache.h b/ttyd-tools/rel/include/ttyd/OSCache.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <cstdint>
+
+namespace ttyd::OSCache {
+
+extern "C" {
+
+// DCEnable
+// DCInvalidateRange
+void DCFlushRange(void *startAddress, uint32_t numberOfBytesToFlush);
+// DCStoreRange
+// DCFlushRangeNoSync
+// DCStoreRangeNoSync
+// DCZeroRange
+void ICInvalidateRange(void *startAddress, uint32_t numberOfBytesToInvalidate);
+// ICFlashInvalidate
+// ICEnable
+// __LCEnable
+// LCEnable
+// LCDisable
+// LCStoreBlocks
+// LCStoreData
+// LCQueueWait
+// L2GlobalInvalidate
+// DMAErrorHandler
+// __OSCacheInit
+
+}
+
+}
diff --git a/ttyd-tools/rel/include/ttyd/seqdrv.h b/ttyd-tools/rel/include/ttyd/seqdrv.h
@@ -4,7 +4,7 @@
 
 namespace ttyd::seqdrv {
 
-enum class SeqIndex : uint32_t
+enum class SeqIndex : int32_t
 {
   kLogo = 0,
   kTitle,
@@ -19,7 +19,7 @@ enum class SeqIndex : uint32_t
 struct SeqInfo
 {
   SeqIndex seq;
-  uint32_t state;
+  int32_t state;
   const char *mapName;
   const char *beroName;
   uint32_t counter;
@@ -33,9 +33,9 @@ extern "C" {
 void seqInit_MARIOSTORY();
 void seqMain();
 void seqSetSeq(SeqIndex seq, const char *mapName, const char *beroName);
-uint32_t seqGetSeq();
-uint32_t seqGetPrevSeq();
-uint32_t seqGetNextSeq();
+int32_t seqGetSeq();
+int32_t seqGetPrevSeq();
+int32_t seqGetNextSeq();
 bool seqCheckSeq();
 
 }
diff --git a/ttyd-tools/rel/source/codes/GameOverC.cpp b/ttyd-tools/rel/source/codes/GameOverC.cpp
@@ -13,7 +13,7 @@ void Mod::gameOver()
 {
   if ((ttyd::system::keyGetButton(0) & GameOverCombo) == (GameOverCombo))
   {
-    uint32_t Logo = static_cast<uint32_t>(ttyd::seqdrv::SeqIndex::kLogo);
+    int32_t Logo = static_cast<uint32_t>(ttyd::seqdrv::SeqIndex::kLogo);
     if (ttyd::seqdrv::seqGetNextSeq() != Logo)
     {
       // The game will crash if the following code runs during the Logo
diff --git a/ttyd-tools/rel/source/codes/ReloadScreenC.cpp b/ttyd-tools/rel/source/codes/ReloadScreenC.cpp
@@ -25,7 +25,6 @@ void Mod::reloadScreen()
     uint32_t NextSeq = ttyd::seqdrv::seqGetNextSeq();
     uint32_t Game = static_cast<uint32_t>(ttyd::seqdrv::SeqIndex::kGame);
     uint32_t MapChange = static_cast<uint32_t>(ttyd::seqdrv::SeqIndex::kMapChange);
-    uint32_t SystemLevel = ttyd::mariost::marioStGetSystemLevel();
     
     if ((NextSeq >= Game) && (NextSeq <= MapChange))
     {
@@ -37,6 +36,7 @@ void Mod::reloadScreen()
       ttyd::string::strcpy(NewMap, NextMap);
       ttyd::seqdrv::seqSetSeq(ttyd::seqdrv::SeqIndex::kMapChange, NewMap, NewBero);
       
+      uint32_t SystemLevel = ttyd::mariost::marioStGetSystemLevel();
       if (SystemLevel != 0)
       {
         if (SystemLevel == 15)
diff --git a/ttyd-tools/rel/source/codes/SaveAnywhereC.cpp b/ttyd-tools/rel/source/codes/SaveAnywhereC.cpp
@@ -19,7 +19,7 @@ void Mod::saveAnywhere()
     // Save Script is not running
     if ((ttyd::system::keyGetButton(0) & SaveAnywhereCombo) == (SaveAnywhereCombo))
     {
-      uint32_t Game = static_cast<uint32_t>(ttyd::seqdrv::SeqIndex::kGame);
+      int32_t Game = static_cast<uint32_t>(ttyd::seqdrv::SeqIndex::kGame);
       if ((ttyd::seqdrv::seqGetNextSeq() == Game) && (ttyd::mariost::marioStGetSystemLevel() != 15))
       {
         // Not in the Pause Menu
diff --git a/ttyd-tools/rel/source/codes/SpawnItemC.cpp b/ttyd-tools/rel/source/codes/SpawnItemC.cpp
@@ -20,7 +20,7 @@ void Mod::spawnItem()
   {
     if (!spawnItemDisable)
     {
-      uint32_t Game = static_cast<uint32_t>(ttyd::seqdrv::SeqIndex::kGame);
+      int32_t Game = static_cast<uint32_t>(ttyd::seqdrv::SeqIndex::kGame);
       if ((ttyd::seqdrv::seqGetNextSeq() == Game) && (ttyd::mariost::marioStGetSystemLevel() != 15))
       {
         // Not in pause menu
diff --git a/ttyd-tools/rel/source/patch.cpp b/ttyd-tools/rel/source/patch.cpp
@@ -1,5 +1,7 @@
 #include "patch.h"
 
+#include <ttyd/OSCache.h>
+
 #include <cstdint>
 
 namespace mod::patch {
@@ -12,6 +14,9 @@ void writeBranch(void *ptr, void *destination)
   
   uint32_t *p = reinterpret_cast<uint32_t *>(ptr);
   *p = value;
+  
+  ttyd::OSCache::DCFlushRange(destination, sizeof(uint32_t));
+  ttyd::OSCache::ICInvalidateRange(destination, sizeof(uint32_t));
 }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ void Mod::gameOver()`
`13`	`13`	`{`
`14`	`14`	`if ((ttyd::system::keyGetButton(0) & GameOverCombo) == (GameOverCombo))`
`15`	`15`	`{`
`16`		`- uint32_t Logo = static_cast<uint32_t>(ttyd::seqdrv::SeqIndex::kLogo);`
	`16`	`+ int32_t Logo = static_cast<uint32_t>(ttyd::seqdrv::SeqIndex::kLogo);`
`17`	`17`	`if (ttyd::seqdrv::seqGetNextSeq() != Logo)`
`18`	`18`	`{`
`19`	`19`	`// The game will crash if the following code runs during the Logo`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ void Mod::reloadScreen()`
`25`	`25`	`uint32_t NextSeq = ttyd::seqdrv::seqGetNextSeq();`
`26`	`26`	`uint32_t Game = static_cast<uint32_t>(ttyd::seqdrv::SeqIndex::kGame);`
`27`	`27`	`uint32_t MapChange = static_cast<uint32_t>(ttyd::seqdrv::SeqIndex::kMapChange);`
`28`		`- uint32_t SystemLevel = ttyd::mariost::marioStGetSystemLevel();`
`29`	`28`
`30`	`29`	`if ((NextSeq >= Game) && (NextSeq <= MapChange))`
`31`	`30`	`{`
`@@ -37,6 +36,7 @@ void Mod::reloadScreen()`
`37`	`36`	`ttyd::string::strcpy(NewMap, NextMap);`
`38`	`37`	`ttyd::seqdrv::seqSetSeq(ttyd::seqdrv::SeqIndex::kMapChange, NewMap, NewBero);`
`39`	`38`
	`39`	`+ uint32_t SystemLevel = ttyd::mariost::marioStGetSystemLevel();`
`40`	`40`	`if (SystemLevel != 0)`
`41`	`41`	`{`
`42`	`42`	`if (SystemLevel == 15)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ void Mod::saveAnywhere()`
`19`	`19`	`// Save Script is not running`
`20`	`20`	`if ((ttyd::system::keyGetButton(0) & SaveAnywhereCombo) == (SaveAnywhereCombo))`
`21`	`21`	`{`
`22`		`- uint32_t Game = static_cast<uint32_t>(ttyd::seqdrv::SeqIndex::kGame);`
	`22`	`+ int32_t Game = static_cast<uint32_t>(ttyd::seqdrv::SeqIndex::kGame);`
`23`	`23`	`if ((ttyd::seqdrv::seqGetNextSeq() == Game) && (ttyd::mariost::marioStGetSystemLevel() != 15))`
`24`	`24`	`{`
`25`	`25`	`// Not in the Pause Menu`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ void Mod::spawnItem()`
`20`	`20`	`{`
`21`	`21`	`if (!spawnItemDisable)`
`22`	`22`	`{`
`23`		`- uint32_t Game = static_cast<uint32_t>(ttyd::seqdrv::SeqIndex::kGame);`
	`23`	`+ int32_t Game = static_cast<uint32_t>(ttyd::seqdrv::SeqIndex::kGame);`
`24`	`24`	`if ((ttyd::seqdrv::seqGetNextSeq() == Game) && (ttyd::mariost::marioStGetSystemLevel() != 15))`
`25`	`25`	`{`
`26`	`26`	`// Not in pause menu`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`#include "patch.h"`
`2`	`2`
	`3`	`+#include <ttyd/OSCache.h>`
	`4`	`+`
`3`	`5`	`#include <cstdint>`
`4`	`6`
`5`	`7`	`namespace mod::patch {`
`@@ -12,6 +14,9 @@ void writeBranch(void ptr, void destination)`
`12`	`14`
`13`	`15`	`uint32_t p = reinterpret_cast<uint32_t >(ptr);`
`14`	`16`	`*p = value;`
	`17`	`+`
	`18`	`+ ttyd::OSCache::DCFlushRange(destination, sizeof(uint32_t));`
	`19`	`+ ttyd::OSCache::ICInvalidateRange(destination, sizeof(uint32_t));`
`15`	`20`	`}`
`16`	`21`
`17`	`22`	`}`