mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-06-08 12:27:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

En_Kz OK (#176)

Browse Source 
* start kz

* remove irrelevant file

* kz progress

* en_kz progress

* match kz switch

* progress

* kz OK

* kz OK

* sync

* kz done

* delete asm files

* pr suggestions 1
This commit is contained in:
fig02
2020-05-29 17:20:00 -04:00
committed by GitHub
parent 038ab888f6
commit ac97807762
35 changed files with 479 additions and 1468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+1
View File
@@ -1073,6 +1073,7 @@ void Inventory_ChangeAmmo(s16 item, s16 ammoChange);
void func_80087680(GlobalContext* globalCtx);
void func_800876C8(GlobalContext* globalCtx);
s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2);
void func_80088AA0(s16 seconds);
void func_80088B34(s16 arg0);
void Interface_Draw(GlobalContext* globalCtx);
void Interface_Update(GlobalContext* globalCtx);
include/macros.h
+1
View File
@@ -36,6 +36,7 @@
#define ALL_EQUIP_VALUE(equip) ((s32)(gSaveContext.equipment & gEquipMasks[equip]) >> gEquipShifts[equip])
#define CUR_EQUIP_VALUE(equip) ((s32)(gSaveContext.equips.equipment & gEquipMasks[equip]) >> gEquipShifts[equip])
#define CHECK_OWNED_EQUIP(equip, value) ((gBitFlags[value] << gEquipShifts[equip]) & gSaveContext.equipment)
#define CUR_UPG_VALUE(upg) ((s32)(gSaveContext.upgrades & gUpgradeMasks[upg]) >> gUpgradeShifts[upg])
#define CAPACITY(upg, value) gUpgradeCapacities[upg][value]
include/z64actor.h
+2
View File
@@ -28,6 +28,8 @@ typedef struct {
} CollisionPoly; // size = 0x10
typedef void (*ActorFunc)(struct Actor*, struct GlobalContext*);
typedef u16 (*callback1_800343CC)(struct GlobalContext*, struct Actor*);
typedef s16 (*callback2_800343CC)(struct GlobalContext*, struct Actor*);
typedef struct {
/* 0x00 */ s16 id;
include/z64item.h
+2
View File
@@ -371,4 +371,6 @@ typedef enum {
/* 0x7D */ GI_TEXT_0 // no model appears over Link, shows text id 0 (pocket egg)
} GetItemID;
#define ITEM_TRADE_ADULT ITEM_POCKET_EGG
#endif