From 8757e450930eba4879c58938b9114e33e28b9ecf Mon Sep 17 00:00:00 2001
From: Seeky <58006653+SeekyCt@users.noreply.github.com>
Date: Tue, 3 Sep 2024 14:04:51 +0100
Subject: [PATCH] Cleanup non-matched notation

---
 src/filemgr.c     | 72 ++++++--------------------------------
 src/mario_pouch.c | 53 +++++-----------------------
 src/memory.c      |  6 ++--
 src/rel/dan.c     | 16 ++-------
 src/seq_title.c   |  2 +-
 src/spmario.c     | 27 +++------------
 src/system.c      | 16 ++-------
 src/windowdrv.c   | 88 ++++++-----------------------------------------
 src/wpadmgr.c     |  5 +--
 9 files changed, 43 insertions(+), 242 deletions(-)

diff --git a/src/filemgr.c b/src/filemgr.c
index 615e0d8..f8ccf8b 100644
--- a/src/filemgr.c
+++ b/src/filemgr.c
@@ -137,18 +137,9 @@ void PackTexPalette(TPLHeader * palette)
     }
 }
 
-void fileGarbageDataAdrClear(FileEntry * entry)
-{
-    // Not decompiled
-    (void) entry;
-}
+// NOT_DECOMPILED fileGarbageDataAdrClear
 
-void fileGarbageDataAdrSet(void * data, s32 fileType)
-{
-    // Not decompiled
-    (void) data;
-    (void) fileType;
-}
+// NOT_DECOMPILED fileGarbageDataAdrSet
 
 void fileGarbageMoveMem(void * dest, FileEntry * src)
 {
@@ -181,63 +172,20 @@ void fileGarbageMoveMem(void * dest, FileEntry * src)
     }
 }
 
-void _fileGarbage(s32)
-{
-    // Not decompiled
-}
+// NOT_DECOMPILED _fileGarbage
 
-FileEntry * fileAllocf(s32 fileType, const char * format, ...)
-{
-    // Not decompiled
-    (void) fileType;
-    (void) format;
-    return NULL;
-}
+// NOT_DECOMPILED fileAllocf
 
-FileEntry * fileAlloc(const char * path, s32 fileType)
-{
-    // Not decompiled
-    (void) path;
-    (void) fileType;
-    return NULL;
-}
+// NOT_DECOMPILED fileAlloc
 
-FileEntry * _fileAlloc(const char * path, s32 fileType, s32 p3)
-{
-    // Not decompiled
-    (void) path;
-    (void) fileType;
-    (void) p3;
-    return NULL;
-}
+// NOT_DECOMPILED _fileAlloc
 
-void fileFree(FileEntry * entry)
-{
-    // Not decompiled
-    (void) entry;
-}
+// NOT_DECOMPILED fileFree
 
-static UNKNOWN_FUNCTION(dvdReadDoneCallback)
-{
-    // Not decompiled
-}
+// NOT_DECOMPILED dvdReadDoneCallback
 
-FileEntry * fileAsyncf(s32 fileType, s32 p2, const char * format, ...)
-{
-    // Not decompiled
-    (void) fileType;
-    (void) p2;
-    (void) format;
-    return NULL;
-}
+// NOT_DECOMPILED fileAsyncf
 
-FileEntry * fileAsync(const char * path, s32 fileType, s32 p3)
-{
-    // Not decompiled
-    (void) path;
-    (void) fileType;
-    (void) p3;
-    return NULL;
-}
+// NOT_DECOMPILED fileAsync
 
 }
diff --git a/src/mario_pouch.c b/src/mario_pouch.c
index d56b7df..a7b6355 100644
--- a/src/mario_pouch.c
+++ b/src/mario_pouch.c
@@ -379,11 +379,7 @@ s32 pouchGetLevel()
     return pp->level;
 }
 
-s32 pouchGetNextLevelXp()
-{
-    // Not decompiled
-    return 0;
-}
+// NOT_DECOMPILED pouchGetNextLevelXp
 
 void pouchSetAttack(s32 attack)
 {
@@ -580,52 +576,19 @@ void pouchAddCoin(s32 increase)
         pouchAddTotalCoin(increase);
 }
 
-bool pouchAddItem(s32 itemId)
-{
-    // Not decompiled
-    (void) itemId;
-    return false;
-}
+// NOT_DECOMPILED pouchAddItem
 
-bool pouchCheckHaveItem(s16 itemId)
-{
-    // Not decompiled
-    (void) itemId;
-    return false;
-}
+// NOT_DECOMPILED pouchCheckHaveItem
 
-void pouchRemoveItem(s16 itemId)
-{
-    // Not decompiled
-    (void) itemId;
-}
+// NOT_DECOMPILED pouchRemoveItem
 
-void pouchRemoveItemIdx(s16 itemId, s32 idx)
-{
-    // Not decompiled
-    (void) itemId;
-    (void) idx;
-}
+// NOT_DECOMPILED pouchRemoveItemIdx
 
-bool pouchAddShopItem(s16 itemId)
-{
-    // Not decompiled
-    (void) itemId;
-    return false;
-}
+// NOT_DECOMPILED pouchAddShopItem
 
-void pouchRemoveShopItem(s16 itemId)
-{
-    // Not decompiled
-    (void) itemId;
-}
+// NOT_DECOMPILED pouchRemoveShopItem
 
-void pouchRemoveShopItemIdx(s16 itemId, s32 idx)
-{
-    // Not decompiled
-    (void) itemId;
-    (void) idx;
-}
+// NOT_DECOMPILED pouchRemoveShopItemIdx
 
 PouchCharOrPixlInfo * pouchGetCharInfo(s32 slot)
 {
diff --git a/src/memory.c b/src/memory.c
index f6cdcff..d9dfad9 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -75,7 +75,7 @@ static MEMHeapHandle fallbackHeap;
 #define IS_LAST_SMART_ALLOC(allocation) (allocation->next == NULL)
 #define GET_SMART_HEAP_SIZE() (MEMGetSizeForMBlockExpHeap(swp->heapStart))
 
-// Not matching - https://decomp.me/scratch/fZFB1
+// NON_MATCHING - https://decomp.me/scratch/fZFB1
 void memInit()
 {
     // Register usage not matching
@@ -354,7 +354,7 @@ void smartFree(SmartAllocation * lp)
     }
 }
 
-// Not matching
+// NON_MATCHING
 SmartAllocation * smartAlloc(size_t size, u8 type)
 {
     // Special behaviour if this is the first time running
@@ -509,7 +509,7 @@ SmartAllocation * smartAlloc(size_t size, u8 type)
     }
 }
 
-// Not matching
+// NON_MATCHING
 void smartGarbage()
 {
     sysWaitDrawSync();
diff --git a/src/rel/dan.c b/src/rel/dan.c
index b5d4036..d353aae 100644
--- a/src/rel/dan.c
+++ b/src/rel/dan.c
@@ -802,13 +802,7 @@ void func_80c839cc(const char * param_1, bool param_2)
     }
 }
 
-void wracktailDispCb(void * param, s32 animGroupIdx, s32 param_3) 
-{
-    // Not decompiled
-    (void) param;
-    (void) animGroupIdx;
-    (void) param_3;
-}
+// NOT_DECOMPILED wracktailDispCb
 
 s32 evt_dan_set_wracktail_disp_cb(EvtEntry * entry, bool isFirstCall)
 {
@@ -822,13 +816,7 @@ s32 evt_dan_set_wracktail_disp_cb(EvtEntry * entry, bool isFirstCall)
     return EVT_RET_CONTINUE;
 }
 
-s32 func_80c83c48(EvtEntry * entry, bool isFirstCall)
-{
-    // Not decompiled
-    (void) entry;
-    (void) isFirstCall;
-    return 0;
-}
+// NOT_DECOMPILED func_80c83c48
 
 void screenBlinkDisp(s32 cameraId, void * param)
 {
diff --git a/src/seq_title.c b/src/seq_title.c
index c93d26c..8cd0a1e 100644
--- a/src/seq_title.c
+++ b/src/seq_title.c
@@ -153,7 +153,7 @@ static const char * languageNames[] = {
     "uk"
 };
 
-// Not matching: try-catches are wrong
+// NON_MATCHING: try-catches are wrong
 void seqTitleInitLayout()
 {
     // Load archive
diff --git a/src/spmario.c b/src/spmario.c
index ea26988..0ee7526 100644
--- a/src/spmario.c
+++ b/src/spmario.c
@@ -87,15 +87,9 @@ static void viPostCallback(u32 retraceCount);
 static void wiiDvdCheckThread(void * param);
 static void wiiRumbleCheck();
 
-void spmarioInit()
-{
-    // Not decompiled
-}
+// NOT_DECOMPILED spmarioInit
 
-void spmarioMain()
-{
-    // Not decompiled
-}
+// NOT_DECOMPILED spmarioMain
 
 void spmarioDisp()
 {
@@ -132,22 +126,11 @@ s32 spmarioGetSystemLevel()
     return _spmarioSystemLevel;
 }
 
-void viPostCallback(u32 retraceCount)
-{
-    // Not decompiled
-    (void) retraceCount;
-}
+// NOT_DECOMPILED viPostCallback
 
-void wiiDvdCheckThread(void * param)
-{
-    // Not decompiled
-    (void) param;
-}
+// NOT_DECOMPILED wiiDvdCheckThread
 
-void wiiRumbleCheck()
-{
-    // Not decompiled
-}
+// NOT_DECOMPILED wiiRumbleCheck
 
 void resetButtonRestart()
 {
diff --git a/src/system.c b/src/system.c
index e7586a7..ab8f0b5 100644
--- a/src/system.c
+++ b/src/system.c
@@ -206,21 +206,9 @@ void movePos(f32 distance, f32 angle, f32 * x, f32 * z)
     *z -= distance * c;
 }
 
-static void fsort(char ** table, size_t size)
-{
-    // Not decompiled
-    (void) table;
-    (void) size;
-}
+// NOT_DECOMPILED fsort
 
-void qqsort(char * list, size_t nel, size_t size, void * compare)
-{
-    // Not decompiled
-    (void) list;
-    (void) nel;
-    (void) size;
-    (void) compare;
-}
+// NOT_DECOMPILED qqsort
 
 static s32 _rand_advance()
 {
diff --git a/src/windowdrv.c b/src/windowdrv.c
index 87f9bc7..c5eaff3 100644
--- a/src/windowdrv.c
+++ b/src/windowdrv.c
@@ -91,93 +91,27 @@ void windowMain()
     }
 }
 
-UNKNOWN_FUNCTION(func_80038b08)
-{
-    // Not decompiled
-}
+// NOT_DECOMPILED func_80038b08
 
-UNKNOWN_FUNCTION(func_80038cc0)
-{
-    // Not decompiled
-}
+// NOT_DECOMPILED func_80038cc0
 
-UNKNOWN_FUNCTION(func_80038fb8)
-{
-    // Not decompiled
-}
+// NOT_DECOMPILED func_80038fb8
 
-void windowDispGX_Kanban(s32 type, GXColor * colour, f32 x, f32 y, f32 width, f32 height)
-{
-    // Not decompiled
-    (void) type;
-    (void) colour;
-    (void) x;
-    (void) y;
-    (void) width;
-    (void) height;
-}
+// NOT_DECOMPILED windowDispGX_Kanban
 
-UNKNOWN_FUNCTION(func_800393c8)
-{
-    // Not decompiled
-}
+// NOT_DECOMPILED func_800393c8
 
-void windowDispGX_System(s32 type, u8 alpha, f32 x, f32 y, f32 width, f32 height)
-{
-    // Not decompiled
-    (void) type;
-    (void) alpha;
-    (void) x;
-    (void) y;
-    (void) width;
-    (void) height;
-}
+// NOT_DECOMPILED windowDispGX_System
 
-UNKNOWN_FUNCTION(func_80039b80)
-{
-    // Not decompiled
-}
+// NOT_DECOMPILED func_80039b80
 
-UNKNOWN_FUNCTION(func_80039d40) 
-{
-    // Not decompiled
-}
+// NOT_DECOMPILED func_80039d40
 
-void windowDispGX_Message(s32 type, Unk param_2, u8 alpha, f32 x, f32 y, f32 width, f32 height, f32, f32)
-{
-    // Not decompiled
-    (void) type;
-    (void) param_2;
-    (void) alpha;
-    (void) x;
-    (void) y;
-    (void) width;
-    (void) height;
-}
+// NOT_DECOMPILED windowDispGX_Message
 
-void windowDispGX_ItemBox(Unk param_1, GXColor * colour, f32 x, f32 y, f32 width, f32 height)
-{
-    // Not decompiled
-    (void) param_1;
-    (void) colour;
-    (void) x;
-    (void) y;
-    (void) width;
-    (void) height;
-}
+// NOT_DECOMPILED windowDispGX_ItemBox
 
-void windowDispGX2_Waku_col(Mtx34 * mtx, u32 gxTexMapId, const GXColor * colour, f32 x, f32 y, f32 width, f32 height, f32 curve)
-{
-    // Not decompiled
-    (void) mtx;
-    (void) gxTexMapId;
-    (void) colour;
-    (void) x;
-    (void) y;
-    (void) width;
-    (void) height;
-    (void) curve;
-}
+// NOT_DECOMPILED windowDispGX2_Waku_col
 
 s32 windowCheckID(s32 id)
 {
diff --git a/src/wpadmgr.c b/src/wpadmgr.c
index d25be22..2c4c098 100644
--- a/src/wpadmgr.c
+++ b/src/wpadmgr.c
@@ -75,10 +75,7 @@ void wpadAllRumbleOff()
         WPADControlMotor(i, 0);
 }
 
-void wpadMain() 
-{
-    // Not decompiled
-}
+// NOT_DECOMPILED wpadMain
 
 void wpadCursorOn()
 {