mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 14:20:11 +00:00
Code Issues Projects Releases Wiki Activity

libultra cleanup (#215)

Browse source 
* 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:
Random 2020-10-03 17:22:44 +02:00 • committed by GitHub
parent 6136ee6deb
commit 174af7384d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
890 changed files with 2628 additions and 5625 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/overlays/actors/ovl_En_Mag/z_en_mag.c
View file

@ -115,9 +115,9 @@ void EnMag_Update(Actor* thisx, GlobalContext* globalCtx) {
if (gSaveContext.fileNum != 0xFEDC) {
if (this->globalState < MAG_STATE_DISPLAY) {
if (CHECK_PAD(globalCtx->state.input[0].press, START_BUTTON) ||
CHECK_PAD(globalCtx->state.input[0].press, A_BUTTON) ||
CHECK_PAD(globalCtx->state.input[0].press, B_BUTTON)) {
if (CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_START) ||
CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_A) ||
CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_B)) {
Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
@ -142,9 +142,9 @@ void EnMag_Update(Actor* thisx, GlobalContext* globalCtx) {
}
} else if (this->globalState >= MAG_STATE_DISPLAY) {
if (sDelayTimer == 0) {
if (CHECK_PAD(globalCtx->state.input[0].press, START_BUTTON) ||
CHECK_PAD(globalCtx->state.input[0].press, A_BUTTON) ||
CHECK_PAD(globalCtx->state.input[0].press, B_BUTTON)) {
if (CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_START) ||
CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_A) ||
CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_B)) {
if (globalCtx->sceneLoadFlag != 20) {
func_800F68BC(0);

4
src/overlays/actors/ovl_En_Mag/z_en_mag.h
View file

@ -1,8 +1,8 @@
#ifndef _Z_EN_MAG_H_
#define _Z_EN_MAG_H_
#include <ultra64.h>
#include <global.h>
#include "ultra64.h"
#include "global.h"
struct EnMag;