summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurice Henke <maurice@henke.gg>2021-09-05 20:15:28 +0200
committerMaurice Henke <maurice@henke.gg>2021-09-05 20:15:28 +0200
commite8d0b725a83163481d4751162a6f563ffec4fae5 (patch)
treec0ff4d4fad70c1ddab62a3f01e7943dc21be0199
parentd61b22f1c96ca782070bbc7181fd076dcd60f99f (diff)
Update gc namespace to gc_wii
m---------GameCube/externals/libtp_rel0
-rw-r--r--GameCube/source/rando/randomizer.cpp6
-rw-r--r--GameCube/source/rando/seed.cpp2
-rw-r--r--GameCube/source/rando/seedlist.cpp2
-rw-r--r--GameCube/source/user_patch/00_wallet.cpp10
5 files changed, 10 insertions, 10 deletions
diff --git a/GameCube/externals/libtp_rel b/GameCube/externals/libtp_rel
-Subproject 152d38271ee9c72bdd6b665c4cdf88619457290
+Subproject ae891d8b1c9866924f779ea51b501b7513c9e4f
diff --git a/GameCube/source/rando/randomizer.cpp b/GameCube/source/rando/randomizer.cpp
index 1e9f63f0..d6472c1f 100644
--- a/GameCube/source/rando/randomizer.cpp
+++ b/GameCube/source/rando/randomizer.cpp
@@ -9,8 +9,8 @@
#include <cstring>
#include "data/items.h"
-#include "gc/OSModule.h"
-#include "gc/card.h"
+#include "gc_wii/OSModule.h"
+#include "gc_wii/card.h"
#include "main.h"
#include "rando/data.h"
#include "rando/seed.h"
@@ -71,7 +71,7 @@ namespace mod::rando
RELCheck* relReplacements = m_Seed->m_RELChecks;
// Get the pointer to the current REL file
- libtp::gc::os_module::OSModuleInfo* moduleInfo = dmc->moduleInfo;
+ libtp::gc_wii::os_module::OSModuleInfo* moduleInfo = dmc->moduleInfo;
// If we don't have replacements just leave
if ( !numReplacements )
diff --git a/GameCube/source/rando/seed.cpp b/GameCube/source/rando/seed.cpp
index 0841e0e8..7c2dc936 100644
--- a/GameCube/source/rando/seed.cpp
+++ b/GameCube/source/rando/seed.cpp
@@ -13,7 +13,7 @@
#include <cstdio>
#include "data/stages.h"
-#include "gc/card.h"
+#include "gc_wii/card.h"
#include "main.h"
#include "rando/data.h"
#include "tools.h"
diff --git a/GameCube/source/rando/seedlist.cpp b/GameCube/source/rando/seedlist.cpp
index c0dfac6a..20d4388c 100644
--- a/GameCube/source/rando/seedlist.cpp
+++ b/GameCube/source/rando/seedlist.cpp
@@ -6,7 +6,7 @@
*/
#include "rando/seedlist.h"
-#include <gc/card.h>
+#include <gc_wii/card.h>
#include <cinttypes>
#include <cstdio>
diff --git a/GameCube/source/user_patch/00_wallet.cpp b/GameCube/source/user_patch/00_wallet.cpp
index 53ce5956..f5c61354 100644
--- a/GameCube/source/user_patch/00_wallet.cpp
+++ b/GameCube/source/user_patch/00_wallet.cpp
@@ -6,7 +6,7 @@
*/
#include <cinttypes>
-#include "gc/OSCache.h"
+#include "gc_wii/OSCache.h"
#include "main.h"
#include "rando/randomizer.h"
#include "tp/d_menu_collect.h"
@@ -48,10 +48,10 @@ namespace mod::user_patch
*reinterpret_cast<uint32_t*>( setWalletMaxNumPtr + 0x30 ) = ASM_COMPARE_WORD_IMMEDIATE( 0, values[1] );
// Update the cache
- gc::os_cache::DCFlushRange( reinterpret_cast<void*>( getRupeeMaxPtr ), 0x41 );
- gc::os_cache::ICInvalidateRange( reinterpret_cast<void*>( getRupeeMaxPtr ), 0x41 );
+ gc_wii::os_cache::DCFlushRange( reinterpret_cast<void*>( getRupeeMaxPtr ), 0x41 );
+ gc_wii::os_cache::ICInvalidateRange( reinterpret_cast<void*>( getRupeeMaxPtr ), 0x41 );
- gc::os_cache::DCFlushRange( reinterpret_cast<void*>( setWalletMaxNumPtr ), 0x31 );
- gc::os_cache::ICInvalidateRange( reinterpret_cast<void*>( setWalletMaxNumPtr ), 0x31 );
+ gc_wii::os_cache::DCFlushRange( reinterpret_cast<void*>( setWalletMaxNumPtr ), 0x31 );
+ gc_wii::os_cache::ICInvalidateRange( reinterpret_cast<void*>( setWalletMaxNumPtr ), 0x31 );
}
} // namespace mod::user_patch \ No newline at end of file