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
2025-08-06 14:20:11 +00:00 · 2020-10-03 17:22:44 +02:00 · 2020-10-03 17:22:44 +02:00 · 174af7384d
commit 174af7384d
parent 6136ee6deb
890 changed files with 2628 additions and 5625 deletions
--- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_BLAST_H_
 #define _Z_EFF_SS_BLAST_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_BOMB_H_
 #define _Z_EFF_SS_BOMB_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_BOMB2_H_
 #define _Z_EFF_SS_BOMB2_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_BUBBLE_H_
 #define _Z_EFF_SS_BUBBLE_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h
+++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_D_FIRE_H_
 #define _Z_EFF_SS_D_FIRE_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_DEAD_DB_H_
 #define _Z_EFF_SS_DEAD_DB_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_DEAD_DD_H_
 #define _Z_EFF_SS_DEAD_DD_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_DEAD_DS_H_
 #define _Z_EFF_SS_DEAD_DS_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_DEAD_SOUND_H_
 #define _Z_EFF_SS_DEAD_SOUND_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_DT_BUBBLE_H_
 #define _Z_EFF_SS_DT_BUBBLE_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_DUST_H_
 #define _Z_EFF_SS_DUST_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h
+++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_EN_FIRE_H_
 #define _Z_EFF_SS_EN_FIRE_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Actor* actor;
--- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h
+++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_EN_ICE_H_
 #define _Z_EFF_SS_EN_ICE_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Actor* actor;
--- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_EXTRA_H_
 #define _Z_EFF_SS_EXTRA_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_FCIRCLE_H_
 #define _Z_EFF_SS_FCIRCLE_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Actor* actor;
--- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_FHGFLASH_h_
 #define _Z_EFF_SS_FHGFLASH_h_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_FIRE_TAIL_H_
 #define _Z_EFF_SS_FIRE_TAIL_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Actor* actor;
--- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_G_FIRE_H_
 #define _Z_EFF_SS_G_FIRE_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_G_MAGMA_H_
 #define _Z_EFF_SS_G_MAGMA_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_G_MAGMA2_H_
 #define _Z_EFF_SS_G_MAGMA2_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_G_RIPPLE_H_
 #define _Z_EFF_SS_G_RIPPLE_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_G_SPK_H_
 #define _Z_EFF_SS_G_SPK_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Actor* actor;
--- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_G_SPLASH_H_
 #define _Z_EFF_SS_G_SPLASH_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_HAHEN_H_
 #define _Z_EFF_SS_HAHEN_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h
+++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_HITMARK_H_
 #define _Z_EFF_SS_HITMARK_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ s32 type;
--- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_ICE_PIECE_H_
 #define _Z_EFF_SS_ICE_PIECE_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_ICE_SMOKE_H_
 #define _Z_EFF_SS_ICE_SMOKE_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h
+++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_K_FIRE_H_
 #define _Z_EFF_SS_K_FIRE_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_KAKERA_H_
 #define _Z_EFF_SS_KAKERA_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h
+++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_KIRAKIRA_H_
 #define _Z_EFF_SS_KIRAKIRA_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_LIGHTNING_H_
 #define _Z_EFF_SS_LIGHTNING_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_SIBUKI_H_
 #define _Z_EFF_SS_SIBUKI_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_SIBUKI2_H_
 #define _Z_EFF_SS_SIBUKI2_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_SOLDERSRCHBALL_H_
 #define _Z_EFF_SS_SOLDERSRCHBALL_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_STICK_H_
 #define _Z_EFF_SS_STICK_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;
--- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h
@ -1,8 +1,8 @@
 #ifndef _Z_EFF_SS_STONE1_H_
 #define _Z_EFF_SS_STONE1_H_

-#include <ultra64.h>
-#include <global.h>
+#include "ultra64.h"
+#include "global.h"

 typedef struct {
    /* 0x00 */ Vec3f pos;