mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-08-15 04:50:28 -04:00
Code Issues Packages 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
890 changed files with 2628 additions and 5625 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/code_8008E6A0.c
+5 -5
View File
@@ -1,4 +1,4 @@
#include <global.h>
#include "global.h"
void func_8008E6A0(SubGlobalContext7B8* this) {
this->counter = 0;
@@ -6,20 +6,20 @@ void func_8008E6A0(SubGlobalContext7B8* this) {
}
u32 func_8008E6AC(SubGlobalContext7B8* this, Input* input) {
if (CHECK_PAD(input->cur, R_TRIG) && CHECK_PAD(input->press, D_JPAD)) {
if (CHECK_BTN_ALL(input->cur.button, BTN_R) && CHECK_BTN_ALL(input->press.button, BTN_DDOWN)) {
this->toggle = !this->toggle;
}
if (!this->toggle) {
goto ret_true;
}
if (CHECK_PAD(input->cur, Z_TRIG)) {
if (CHECK_BTN_ALL(input->cur.button, BTN_Z)) {
if (CHECK_PAD(input->press, R_TRIG)) {
if (CHECK_BTN_ALL(input->press.button, BTN_R)) {
goto ret_true;
}
if (CHECK_PAD(input->cur, R_TRIG)) {
if (CHECK_BTN_ALL(input->cur.button, BTN_R)) {
this->counter++;
if (this->counter >= 9) {
goto ret_true;