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

1 files changed, 70 insertions, 0 deletions

diff --git a/src/libultra_code_O2/osPfsDeleteFile.c b/src/libultra_code_O2/osPfsDeleteFile.c
new file mode 100644
index 000000000..b9ec018c2
--- /dev/null
+++ b/src/libultra_code_O2/osPfsDeleteFile.c
@@ -0,0 +1,70 @@
+#include "ultra64/pfs.h"
+#include "global.h"
+
+s32 osPfsDeleteFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName) {
+
+    s32 file_no;
+    s32 ret;
+    __OSInode inode;
+    __OSDir dir;
+    __OSInodeUnit last_page;
+    u8 startpage;
+    u8 bank;
+
+    if ((companyCode == 0) || (gameCode == 0)) {
+        return PFS_ERR_INVALID;
+    }
+    if ((ret = osPfsFindFile(pfs, companyCode, gameCode, gameName, extName, &file_no)) != 0) {
+        return ret;
+    }
+    if ((pfs->activebank != 0) && (ret = __osPfsSelectBank(pfs, 0)) != 0) {
+        return ret;
+    }
+
+    if ((ret = __osContRamRead(pfs->queue, pfs->channel, pfs->dir_table + file_no, (u8*)&dir)) != 0) {
+        return ret;
+    }
+    startpage = dir.start_page.inode_t.page;
+    for (bank = dir.start_page.inode_t.bank; bank < pfs->banks;) {
+        if ((ret = __osPfsRWInode(pfs, &inode, PFS_READ, bank)) != 0) {
+            return ret;
+        }
+        if ((ret = __osPfsReleasePages(pfs, &inode, startpage, bank, &last_page)) != 0) {
+            return ret;
+        }
+        if ((ret = __osPfsRWInode(pfs, &inode, PFS_WRITE, bank)) != 0) {
+            return ret;
+        }
+        if (last_page.ipage == PFS_EOF) {
+            break;
+        }
+        bank = last_page.inode_t.bank;
+        startpage = last_page.inode_t.page;
+    }
+
+    if (bank >= pfs->banks) {
+        return PFS_ERR_INCONSISTENT;
+    }
+    bzero(&dir, sizeof(__OSDir));
+
+    ret = __osContRamWrite(pfs->queue, pfs->channel, pfs->dir_table + file_no, (u8*)&dir, 0);
+    return ret;
+}
+
+s32 __osPfsReleasePages(OSPfs* pfs, __OSInode* inode, u8 initialPage, u8 bank, __OSInodeUnit* finalPage) {
+    __OSInodeUnit next;
+    __OSInodeUnit prev;
+    s32 ret = 0;
+
+    next.ipage = (u16)((bank << 8) + initialPage);
+
+    do {
+        prev = next;
+        next = inode->inodePage[next.inode_t.page];
+        inode->inodePage[prev.inode_t.page].ipage = PFS_PAGE_NOT_USED;
+    } while (next.ipage >= pfs->inodeStartPage && next.inode_t.bank == bank);
+
+    *finalPage = next;
+
+    return ret;
+}