Merge branch 'Rainchus:main' into main

src/REL/_minigameDLL/_minigameDLL.c

@@ -1,5 +1,6 @@
 #include "common.h"
 #include "REL/executor.h"
+#include "dolphin/os.h"
 
 void ModuleProlog(void) {
     OSReport("minigame dll setup\n");

src/game/decode.c

@@ -1,4 +1,5 @@
 #include "common.h"
+#include "dolphin/os.h"
 
 struct decode_data
 {

src/game/malloc.c

@@ -1,7 +1,7 @@
 #include "common.h"
+#include "dolphin/os.h"
 
-extern int __OSCurrHeap;
-extern int currentHeapHandle;
+extern OSHeapHandle currentHeapHandle;
 
 static u32 HeapSizeTbl[5] = { 0x240000, 0x140000, 0xA80000, 0x580000, 0 };
 static void *HeapTbl[5];

src/game/memory.c

@@ -1,4 +1,5 @@
 #include "common.h"
+#include "dolphin/os.h"
 
 #define DATA_GET_BLOCK(ptr) ((struct memory_block *)(((char *)(ptr))-32))
 #define BLOCK_GET_DATA(block) (((char *)(block))+32)