mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-21 14:31:17 +00:00
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
This commit is contained in:
parent
6136ee6deb
commit
174af7384d
890 changed files with 2628 additions and 5625 deletions
|
@ -284,9 +284,8 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) {
|
|||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if ((globalCtx->state.input[0].press.in.button &
|
||||
(A_BUTTON | B_BUTTON | R_TRIG | U_CBUTTONS | L_CBUTTONS | R_CBUTTONS | D_CBUTTONS))) {
|
||||
if ((CHECK_BTN_ANY(globalCtx->state.input[0].press.button,
|
||||
(BTN_A | BTN_B | BTN_R | BTN_CUP | BTN_CLEFT | BTN_CRIGHT | BTN_CDOWN)))) {
|
||||
this->timer = 0;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#ifndef _Z_ARMS_HOOK_H_
|
||||
#define _Z_ARMS_HOOK_H_
|
||||
|
||||
#include <ultra64.h>
|
||||
#include <global.h>
|
||||
#include "ultra64.h"
|
||||
#include "global.h"
|
||||
|
||||
struct ArmsHook;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue