mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 14:50:15 +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

2
src/overlays/actors/ovl_En_Ds/z_en_ds.c
View file

@ -158,7 +158,7 @@ void EnDs_OfferOddPotion(EnDs* this, GlobalContext* globalCtx) {
}
}
int EnDs_CheckRupeesAndBottle() {
s32 EnDs_CheckRupeesAndBottle() {
if (gSaveContext.rupees < 100) {
return 0;
} else if (Inventory_HasEmptyBottle() == 0) {

6
src/overlays/actors/ovl_En_Ds/z_en_ds.h
View file

@ -1,8 +1,8 @@
#ifndef _Z_EN_DS_H_
#define _Z_EN_DS_H_
#include <ultra64.h>
#include <global.h>
#include "ultra64.h"
#include "global.h"
struct EnDs;
@ -17,7 +17,7 @@ typedef struct EnDs {
/* 0x01BA */ char unk_1B8[0x1E];
/* 0x01D8 */ Vec3s unk_1D8;
/* 0x01DE */ Vec3s unk_1DE;
/* 0x01E4 */ float unk_1E4;
/* 0x01E4 */ f32 unk_1E4;
/* 0x01E8 */ u16 unk_1E8;
/* 0x01EA */ u16 brewTimer;
/* 0x01EC */ EnDsActionFunc actionFunc;