libultra cleanup (#215)

* cleanup libultra

* fixes

- use quotes instead of <> for includes
- add macros for zelda specific thread priorities
- fix Makefile
- properly format the remaining pfs structs

* fix button macros + add CHECK_BTN_ANY/CHECK_BTN_ALL

* remove ULTRA_ABS

* fix includes

* update z_player.c/z_lib.c + run format.sh

* merge upstream/master

* fix include in En_Goroiwa

* fix includes

src/boot/assert.c

@@ -1,4 +1,4 @@
-#include <z64.h>
+#include "global.h"
 
 void __assert(const char* exp, const char* file, s32 line) {
     char msg[256];

src/boot/boot_main.c

@@ -1,5 +1,4 @@
-#include <ultra64.h>
-#include <global.h>
+#include "global.h"
 
 StackEntry sBootThreadInfo;
 OSThread sIdleThread;
@@ -25,6 +24,6 @@ void bootproc(void) {
     Locale_Init();
 
     StackCheck_Init(&sIdleThreadInfo, sIdleThreadStack, sIdleThreadStack + sizeof(sIdleThreadStack), 0, 256, "idle");
-    osCreateThread(&sIdleThread, 1, Idle_ThreadEntry, 0, sIdleThreadStack + sizeof(sIdleThreadStack), 10);
+    osCreateThread(&sIdleThread, 1, Idle_ThreadEntry, 0, sIdleThreadStack + sizeof(sIdleThreadStack), Z_PRIORITY_MAIN);
     osStartThread(&sIdleThread);
 }

src/boot/idle.c

@@ -1,6 +1,5 @@
-#include <ultra64.h>
-#include <global.h>
-#include <vt.h>
+#include "global.h"
+#include "vt.h"
 
 OSThread gMainThread;
 u8 sMainStack[0x900];
@@ -11,7 +10,7 @@ OSViMode gViConfigMode;
 u8 D_80013960;
 
 s8 D_80009430 = 1;
-u8 volatile gViConfigUseDefault = 1;
+vu8 gViConfigUseDefault = 1;
 u8 gViConfigAdditionalScanLines = 0;
 u32 gViConfigFeatures = OS_VI_DITHER_FILTER_ON | OS_VI_GAMMA_OFF;
 f32 gViConfigXScale = 1.0;
@@ -21,7 +20,7 @@ void Main_ThreadEntry(void* arg0) {
     OSTime var1;
 
     osSyncPrintf("mainx 実行開始\n");
-    DmaMgr_Start();
+    DmaMgr_Init();
     osSyncPrintf("codeセグメントロード中...");
     var1 = osGetTime();
     DmaMgr_SendRequest1(_codeSegmentStart, (u32)_codeSegmentRomStart, _codeSegmentRomEnd - _codeSegmentRomStart,
@@ -50,7 +49,7 @@ void Idle_ThreadEntry(void* a0) {
     osSyncPrintf("オーディオヒープのサイズは %d キロバイトです\n", ((s32)gSystemHeap - (s32)gAudioHeap) / 1024);
     osSyncPrintf(VT_RST);
 
-    osCreateViManager(0xFE);
+    osCreateViManager(OS_PRIORITY_VIMGR);
 
     gViConfigFeatures = 0x42;
     gViConfigXScale = 1.0f;
@@ -79,11 +78,11 @@ void Idle_ThreadEntry(void* a0) {
     ViConfig_UpdateVi(1);
     osViBlack(1);
     osViSwapBuffer(0x803DA80); //! @bug Invalid vram address (probably intended to be 0x803DA800)
-    osCreatePiManager(150, &gPiMgrCmdQ, sPiMgrCmdBuff, 50);
+    osCreatePiManager(OS_PRIORITY_PIMGR, &gPiMgrCmdQ, sPiMgrCmdBuff, 50);
     StackCheck_Init(&sMainStackInfo, sMainStack, sMainStack + sizeof(sMainStack), 0, 0x400, "main");
-    osCreateThread(&gMainThread, 3, Main_ThreadEntry, a0, sMainStack + sizeof(sMainStack), 10);
+    osCreateThread(&gMainThread, 3, Main_ThreadEntry, a0, sMainStack + sizeof(sMainStack), Z_PRIORITY_MAIN);
     osStartThread(&gMainThread);
-    osSetThreadPri(NULL, 0);
+    osSetThreadPri(NULL, OS_PRIORITY_IDLE);
 
     while (1) {
         ;

src/boot/is_debug.c

@@ -1,5 +1,4 @@
-#include <z64.h>
-#include <global.h>
+#include "global.h"
 
 OSPiHandle* sISVHandle; // official name : is_Handle
 

src/boot/logutils.c

@@ -1,9 +1,8 @@
-#include <z64.h>
-#include <global.h>
-#include <vt.h>
+#include "global.h"
+#include "vt.h"
 
-float LogUtils_CheckFloatRange(const char* exp, s32 arg1, const char* var1Name, float var1, const char* var2Name,
-                               float var2, const char* var3Name, float var3) {
+f32 LogUtils_CheckFloatRange(const char* exp, s32 arg1, const char* var1Name, f32 var1, const char* var2Name, f32 var2,
+                             const char* var3Name, f32 var3) {
     if (var1 < var2 || var3 < var1) {
         osSyncPrintf("%s %d: range error %s(%f) < %s(%f) < %s(%f)\n", exp, arg1, var2Name, var2, var1Name, var1,
                      var3Name, var3);
@@ -90,7 +89,6 @@ void LogUtils_CheckNullPointer(const char* exp, void* ptr, const char* file, s32
     }
 }
 
-// check valid pointer
 void LogUtils_CheckValidPointer(const char* exp, void* ptr0, const char* file, s32 line) {
     u32 ptr = (u32)ptr0;
     if (!ptr || ptr < 0x80000000U || (0x80000000U + osMemSize) <= ptr) {

src/boot/stackcheck.c

@@ -1,6 +1,5 @@
-#include <z64.h>
-#include <global.h>
-#include <vt.h>
+#include "global.h"
+#include "vt.h"
 
 StackEntry* sStackInfoListStart = NULL;
 StackEntry* sStackInfoListEnd = NULL;

src/boot/viconfig.c

@@ -1,6 +1,5 @@
-#include <ultra64.h>
-#include <global.h>
-#include <vt.h>
+#include "global.h"
+#include "vt.h"
 
 // this should probably go elsewhere but right now viconfig.o is the only object between idle and z_std_dma
 OSPiHandle* gCartHandle = 0;

src/boot/yaz0.c

@@ -1,5 +1,4 @@
-#include <z64.h>
-#include <global.h>
+#include "global.h"
 
 u8 sYaz0DataBuffer[0x400];
 u32 sYaz0CurDataEnd;

src/boot/z_locale.c

@@ -1,6 +1,5 @@
-#include <ultra64.h>
-#include <global.h>
-#include <vt.h>
+#include "global.h"
+#include "vt.h"
 
 u32 gCurrentRegion = 0;
 LocaleCartInfo sCartInfo;

src/boot/z_std_dma.c

@@ -1,6 +1,5 @@
-#include <ultra64.h>
-#include <global.h>
-#include <vt.h>
+#include "global.h"
+#include "vt.h"
 
 StackEntry sDmaMgrStackInfo;
 OSMesgQueue sDmaMgrMsgQueue;
@@ -1815,9 +1814,9 @@ void DmaMgr_ProcessMsg(DmaRequest* req) {
                                  "圧縮されたセグメントの一部だけをＤＭＡ転送することはできません");
                 }
 
-                osSetThreadPri(NULL, 0x0A);
+                osSetThreadPri(NULL, Z_PRIORITY_MAIN);
                 Yaz0_Decompress(romStart, ram, romSize);
-                osSetThreadPri(NULL, 0x10);
+                osSetThreadPri(NULL, Z_PRIORITY_DMAMGR);
                 found = true;
 
                 "   Press ROM:%X RAM:%X SIZE:%X\n";
@@ -1910,7 +1909,7 @@ s32 DmaMgr_SendRequest0(u32 ram, u32 vrom, u32 size) {
     return 0;
 }
 
-void DmaMgr_Start() {
+void DmaMgr_Init() {
     const char** name;
     s32 idx;
     DmaEntry* iter;
@@ -1952,7 +1951,8 @@ void DmaMgr_Start() {
 
     osCreateMesgQueue(&sDmaMgrMsgQueue, sDmaMgrMsgs, sizeof(sDmaMgrMsgs) / sizeof(sDmaMgrMsgs[0]));
     StackCheck_Init(&sDmaMgrStackInfo, sDmaMgrStack, sDmaMgrStack + sizeof(sDmaMgrStack), 0, 0x100, "dmamgr");
-    osCreateThread(&sDmaMgrThread, 0x12, &DmaMgr_ThreadEntry, 0, sDmaMgrStack + sizeof(sDmaMgrStack), 0x10);
+    osCreateThread(&sDmaMgrThread, 0x12, &DmaMgr_ThreadEntry, 0, sDmaMgrStack + sizeof(sDmaMgrStack),
+                   Z_PRIORITY_DMAMGR);
     osStartThread(&sDmaMgrThread);
 }