mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-06 16:04:35 +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

13
src/code/z_camera.c
View file

@ -1,6 +1,5 @@
#include <ultra64.h>
#include <global.h>
#include <vt.h>
#include "global.h"
#include "vt.h"
typedef struct {
s16 val;
@ -3328,19 +3327,19 @@ s32 func_80058D34(Camera* camera) {
if (D_8011D394 == 0) {
if (camera->globalCtx->activeCamera == 0) {
if (CHECK_PAD(D_8015BD7C->state.input[2].press, U_CBUTTONS)) {
if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CUP)) {
osSyncPrintf("attention sound URGENCY\n");
func_80078884(NA_SE_SY_ATTENTION_URGENCY);
}
if (CHECK_PAD(D_8015BD7C->state.input[2].press, D_CBUTTONS)) {
if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CDOWN)) {
osSyncPrintf("attention sound NORMAL\n");
func_80078884(NA_SE_SY_ATTENTION_ON);
}
if (CHECK_PAD(D_8015BD7C->state.input[2].press, R_CBUTTONS)) {
if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CRIGHT)) {
phi_a2 = 1;
}
if (CHECK_PAD(D_8015BD7C->state.input[2].press, L_CBUTTONS)) {
if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CLEFT)) {
phi_a2 = -1;
}
if (phi_a2 != 0) {