From 10c83abcbf625b458924810643715f30691b0eb8 Mon Sep 17 00:00:00 2001
From: gijs <ogre@noest.dev>
Date: Fri, 20 Oct 2023 18:33:02 +0200
Subject: [PATCH] Rename `PTR_CART_ROM_HANDLE` to `nuPiCartHandle`

---
 include/common.h                | 2 --
 linker_scripts/symbols/addr.txt | 2 +-
 src/_ob_icy_coast.c             | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/common.h b/include/common.h
index 60f87db..f2bfb52 100644
--- a/include/common.h
+++ b/include/common.h
@@ -138,8 +138,6 @@ extern OSMesg OSMESG_800BE048[0x32];
 
 extern OSMesgQueue MQ_800E7988;
 
-extern OSPiHandle* PTR_CART_ROM_HANDLE;
-
 extern s32 D_800C4B30;
 extern OSMesgQueue MQ_800E9BF0;
 extern u8 D_800A9FF8;
diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt
index 7ccc4de..0b04878 100644
--- a/linker_scripts/symbols/addr.txt
+++ b/linker_scripts/symbols/addr.txt
@@ -28,6 +28,7 @@ nuSiMesgBuf = 0x800BBE60;
 siMgrThread = 0x800BBE80;
 nuThreadIdle = 0x800AF440;
 nuStackIdle = 0x800B17A0;
+nuPiCartHandle = 0x800E7A20;
 
 nuBoot = 0x8007F880;
 nuScCreateScheduler = 0x80088C50; // rom:0x19050
@@ -684,7 +685,6 @@ __osPiTable = 0x800AA41C; // rom:0x3A81C
 osEPiLinkHandle = 0x8008BCE0l // rom:0x1C0E0
 CartRomHandle = 0x800C4C50; // size:0x2A
 osCartRomInit = 0x8008BD30;
-PTR_CART_ROM_HANDLE = 0x800E7A20;
 
 D_800A81C0 = 0x800A81C0; // size:0x30
 D_800C4BBC = 0x800C4BBC; // size:0x8
diff --git a/src/_ob_icy_coast.c b/src/_ob_icy_coast.c
index 804ced8..2800d38 100644
--- a/src/_ob_icy_coast.c
+++ b/src/_ob_icy_coast.c
@@ -49,7 +49,7 @@ INCLUDE_ASM(const s32, "_ob_icy_coast", nuSiMgrThread);
 
 void nuPiInit(void) {
     osCreatePiManager(OS_PRIORITY_PIMGR, &MQ_800BE030, OSMESG_800BE048, sizeof(OSMESG_800BE048) / sizeof(OSMesg));
-    PTR_CART_ROM_HANDLE = osCartRomInit();
+    nuPiCartHandle = osCartRomInit();
 }
 
 /* 1A380 80089F80 */
@@ -74,7 +74,7 @@ void nuPiReadRom(void *src, void *dst, u32 size) {
         ioMesg.dramAddr = dst;
         ioMesg.size = mesgSize;
         // Start the DMA transfer
-        osEPiStartDma(PTR_CART_ROM_HANDLE, &ioMesg, OS_READ);
+        osEPiStartDma(nuPiCartHandle, &ioMesg, OS_READ);
         // Wait for the DMA transfer to complete
         osRecvMesg(&queue, &mesg, OS_MESG_BLOCK);