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/libultra_boot_O2/_Ldtob.c

@@ -1,14 +1,11 @@
-#include <global.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ultra64/printf.h>
+#include "global.h"
 
 #define BUFF_LEN 0x20
 
 s16 _Ldunscale(s16*, _Pft*);
 void _Genld(_Pft*, u8, u8*, s16, s16);
 
-const double D_800122E0[] = { 10e0L, 10e1L, 10e3L, 10e7L, 10e15L, 10e31L, 10e63L, 10e127L, 10e255L };
+const f64 D_800122E0[] = { 10e0L, 10e1L, 10e3L, 10e7L, 10e15L, 10e31L, 10e63L, 10e127L, 10e255L };
 
 /* float properties */
 #define _D0 0
@@ -161,8 +158,8 @@ void _Ldtob(_Pft* args, u8 type) {
 
 s16 _Ldunscale(s16* pex, _Pft* px) {
 
-    unsigned short* ps = (unsigned short*)px;
-    short xchar = (ps[_D0] & _DMASK) >> _DOFF;
+    u16* ps = (u16*)px;
+    s16 xchar = (ps[_D0] & _DMASK) >> _DOFF;
     if (xchar == _DMAX) { /* NaN or INF */
         *pex = 0;
         return (s16)(ps[_D0] & _DFRAC || ps[_D1] || ps[_D2] || ps[_D3] ? NAN : INF);
@@ -275,7 +272,7 @@ void _Genld(_Pft* px, u8 code, u8* p, s16 nsig, s16 xexp) {
         px->n2 = p - (u8*)&px->s[px->n1];
     }
     if ((px->flags & (FLAGS_ZERO | FLAGS_MINUS)) == FLAGS_ZERO) { /* pad with leading zeros */
-        int n = px->n0 + px->n1 + px->nz1 + px->n2 + px->nz2;
+        s32 n = px->n0 + px->n1 + px->nz1 + px->n2 + px->nz2;
 
         if (n < px->width) {
             px->nz0 = px->width - n;

src/libultra_boot_O2/_Litob.c

@@ -1,7 +1,4 @@
-#include <global.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ultra64/printf.h>
+#include "global.h"
 
 #define BUFF_LEN 0x18
 

src/libultra_boot_O2/_Printf.c

@@ -1,7 +1,4 @@
-#include <ultra64.h>
-#include <ultra64/printf.h>
-#include <stdarg.h>
-#include <string.h>
+#include "global.h"
 
 #define ATOI(i, a)                           \
     for (i = 0; *a >= '0' && *a <= '9'; a++) \
@@ -17,8 +14,8 @@
     }
 #define _PAD(m, src, extracond)      \
     if (extracond && m > 0) {        \
-        int i;                       \
-        int j;                       \
+        s32 i;                       \
+        s32 j;                       \
         for (j = m; j > 0; j -= i) { \
             if ((u32)j > 32)         \
                 i = 32;              \
@@ -203,7 +200,7 @@ void _Putfld(_Pft* px, va_list* pap, u8 code, u8* ac) {
             break;
 
         case 'p':
-            px->v.ll = (long)va_arg(*pap, void*);
+            px->v.ll = (s64)va_arg(*pap, void*);
             px->s = (char*)&ac[px->n0];
             _Litob(px, 'x');
             break;

src/libultra_boot_O2/__osDevMgrMain.c

@@ -1,5 +1,5 @@
-#include <global.h>
-#include <ultra64/hardware.h>
+#include "global.h"
+#include "ultra64/internal.h"
 
 void __osDevMgrMain(void* arg) {
     OSIoMesg* ioMesg;

src/libultra_boot_O2/__osEPiRawReadIo.c

@@ -1,5 +1,4 @@
-#include <global.h>
-#include <ultra64/hardware.h>
+#include "global.h"
 
 s32 __osEPiRawReadIo(OSPiHandle* handle, u32 devAddr, u32* data) {
     s32 status;

src/libultra_boot_O2/__osEPiRawStartDma.c

@@ -1,5 +1,4 @@
-#include <global.h>
-#include <ultra64/hardware.h>
+#include "global.h"
 
 s32 __osEPiRawStartDma(OSPiHandle* handle, s32 direction, u32 cartAddr, void* dramAddr, size_t size) {
     s32 status;

src/libultra_boot_O2/__osEPiRawWriteIo.c

@@ -1,5 +1,4 @@
-#include <global.h>
-#include <ultra64/hardware.h>
+#include "global.h"
 
 s32 __osEPiRawWriteIo(OSPiHandle* handle, u32 devAddr, u32 data) {
     s32 status;

src/libultra_boot_O2/__osPiRawStartDma.c

@@ -1,16 +1,15 @@
-#include <global.h>
-#include <ultra64/hardware.h>
+#include "global.h"
 
-s32 __osPiRawStartDma(s32 dir, u32 cart_addr, void* dram_addr, size_t size) {
-    register int status;
+s32 __osPiRawStartDma(s32 dir, u32 cartAddr, void* dramAddr, size_t size) {
+    register s32 status;
     status = HW_REG(PI_STATUS_REG, u32);
     while (status & (PI_STATUS_BUSY | PI_STATUS_IOBUSY | PI_STATUS_ERROR)) {
         status = HW_REG(PI_STATUS_REG, u32);
     }
 
-    HW_REG(PI_DRAM_ADDR_REG, void*) = (void*)osVirtualToPhysical(dram_addr);
+    HW_REG(PI_DRAM_ADDR_REG, void*) = (void*)osVirtualToPhysical(dramAddr);
 
-    HW_REG(PI_CART_ADDR_REG, void*) = (void*)((osRomBase | cart_addr) & 0x1fffffff);
+    HW_REG(PI_CART_ADDR_REG, void*) = (void*)((osRomBase | cartAddr) & 0x1fffffff);
 
     switch (dir) {
         case OS_READ:

src/libultra_boot_O2/__osSiDeviceBusy.c

@@ -1,5 +1,4 @@
-#include <global.h>
-#include <ultra64/hardware.h>
+#include "global.h"
 
 s32 __osSiDeviceBusy() {
     register u32 status;

src/libultra_boot_O2/__osSiRawReadIo.c

@@ -1,5 +1,4 @@
-#include <global.h>
-#include <ultra64/hardware.h>
+#include "global.h"
 
 s32 __osSiRawReadIo(void* a0, u32* a1) {
     if (__osSiDeviceBusy()) {

src/libultra_boot_O2/__osSiRawWriteIo.c

@@ -1,5 +1,4 @@
-#include <global.h>
-#include <ultra64/hardware.h>
+#include "global.h"
 
 s32 __osSiRawWriteIo(void* a0, u32 a1) {
     if (__osSiDeviceBusy()) {

src/libultra_boot_O2/__osViGetCurrentContext.c

@@ -1,4 +1,4 @@
-#include <global.h>
+#include "global.h"
 
 OSViContext* __osViGetCurrentContext() {
     return __osViCurr;

src/libultra_boot_O2/__osViInit.c

@@ -1,5 +1,4 @@
-#include <global.h>
-#include <ultra64/hardware.h>
+#include "global.h"
 
 OSViContext vi[2] = { 0 };
 OSViContext* __osViCurr = &vi[0];

src/libultra_boot_O2/__osViSwapContext.c

@@ -1,5 +1,4 @@
-#include <global.h>
-#include <ultra64/hardware.h>
+#include "global.h"
 
 void __osViSwapContext() {
     register OSViMode* s0;

src/libultra_boot_O2/ldiv.c

@@ -1,7 +1,6 @@
-#include <global.h>
-#include <stdlib.h>
+#include "global.h"
 
-ldiv_t ldiv(long num, long denom) {
+ldiv_t ldiv(s32 num, s32 denom) {
     ldiv_t ret;
 
     ret.quot = num / denom;
@@ -14,7 +13,7 @@ ldiv_t ldiv(long num, long denom) {
     return ret;
 }
 
-lldiv_t lldiv(long long num, long long denom) {
+lldiv_t lldiv(s64 num, s64 denom) {
     lldiv_t ret;
 
     ret.quot = num / denom;

src/libultra_boot_O2/osCartRomInit.c

@@ -1,5 +1,4 @@
-#include <global.h>
-#include <ultra64/hardware.h>
+#include "global.h"
 
 OSPiHandle __CartRomHandle;
 

src/libultra_boot_O2/osDriveRomInit.c

@@ -1,5 +1,4 @@
-#include <global.h>
-#include <ultra64/hardware.h>
+#include "global.h"
 
 OSPiHandle __DriveRomHandle;
 

src/libultra_boot_O2/osEPiReadIo.c

@@ -1,4 +1,4 @@
-#include <global.h>
+#include "global.h"
 
 s32 osEPiReadIo(OSPiHandle* handle, u32 devAddr, u32* data) {
     register s32 ret;

src/libultra_boot_O2/osEPiStartDma.c

@@ -1,4 +1,5 @@
-#include <global.h>
+#include "global.h"
+#include "ultra64/internal.h"
 
 s32 osEPiStartDma(OSPiHandle* handle, OSIoMesg* mb, s32 direction) {
     s32 ret;

src/libultra_boot_O2/osEPiWriteIo.c

@@ -1,4 +1,4 @@
-#include <global.h>
+#include "global.h"
 
 s32 osEPiWriteIo(OSPiHandle* handle, u32 devAddr, u32 data) {
     register s32 ret;

src/libultra_boot_O2/osPiGetCmdQueue.c

@@ -1,4 +1,5 @@
-#include <global.h>
+#include "global.h"
+#include "ultra64/internal.h"
 
 OSMesgQueue* osPiGetCmdQueue() {
     if (!__osPiDevMgr.initialized) {

src/libultra_boot_O2/osViBlack.c

@@ -1,4 +1,4 @@
-#include <global.h>
+#include "global.h"
 
 // TODO: name magic constants
 void osViBlack(u8 active) {

src/libultra_boot_O2/osViGetNextFramebuffer.c

@@ -1,4 +1,4 @@
-#include <global.h>
+#include "global.h"
 
 void* osViGetNextFramebuffer() {
     s32 prevInt = __osDisableInt();

src/libultra_boot_O2/osViModeFpalLan1.c

@@ -1,4 +1,4 @@
-#include <global.h>
+#include "global.h"
 
 OSViMode osViModeFpalLan1 = {
     0x2C, // type

src/libultra_boot_O2/osViModeMpalLan1.c

@@ -1,4 +1,4 @@
-#include <global.h>
+#include "global.h"
 
 OSViMode osViModeMpalLan1 = {
     0x1E, // type

src/libultra_boot_O2/osViModeNtscLan1.c

@@ -1,4 +1,4 @@
-#include <global.h>
+#include "global.h"
 
 OSViMode osViModeNtscLan1 = {
     2, // type

src/libultra_boot_O2/osViSetMode.c

@@ -1,4 +1,4 @@
-#include <global.h>
+#include "global.h"
 
 void osViSetMode(OSViMode* mode) {
     register u32 int_disabled = __osDisableInt();

src/libultra_boot_O2/osViSetSpecialFeatures.c

@@ -1,4 +1,4 @@
-#include <global.h>
+#include "global.h"
 
 void osViSetSpecialFeatures(u32 func) {
     register u32 int_disabled = __osDisableInt();

src/libultra_boot_O2/osViSetXScale.c

@@ -1,4 +1,4 @@
-#include <global.h>
+#include "global.h"
 
 void osViSetXScale(f32 value) {
     register u32 nomValue;

src/libultra_boot_O2/osViSetYScale.c

@@ -1,6 +1,6 @@
-#include <global.h>
+#include "global.h"
 
-void osViSetYScale(float scale) {
+void osViSetYScale(f32 scale) {
     register s32 prevInt;
 
     prevInt = __osDisableInt();

src/libultra_boot_O2/osViSwapBuffer.c

@@ -1,4 +1,4 @@
-#include <global.h>
+#include "global.h"
 
 void osViSwapBuffer(void* vaddr) {
     u32 int_disabled = __osDisableInt();

src/libultra_boot_O2/pimgr.c

@@ -1,4 +1,5 @@
-#include <global.h>
+#include "global.h"
+#include "ultra64/internal.h"
 
 OSMgrArgs __osPiDevMgr = { 0 };
 

src/libultra_boot_O2/sprintf.c

@@ -1,4 +1,4 @@
-#include <global.h>
+#include "global.h"
 
 char* proutSprintf(char* dst, const char* fmt, size_t size) {
     return (char*)memcpy(dst, fmt, size) + size;

src/libultra_boot_O2/string.c

@@ -1,4 +1,4 @@
-#include <global.h>
+#include "global.h"
 
 const u8* strchr(const u8* str, s32 ch) {
     u8 c = ch;

src/libultra_boot_O2/vimgr.c

@@ -1,4 +1,5 @@
-#include <global.h>
+#include "global.h"
+#include "ultra64/internal.h"
 
 typedef struct {
     u16 unk00;