diff options
| author | Maide <34639600+Kelebek1@users.noreply.github.com> | 2021-09-02 16:27:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-02 11:27:26 -0400 |
| commit | 1f4973d9b4fbb39b01bf2e60564991c19dad2f1e (patch) | |
| tree | cf51a229bfd9e06427946b71ab4a1a65379a266d /include | |
| parent | b3816cd26bd4a58a5ee4a8f822f3c46a9e7c91d4 (diff) | |
En_Kgy (#244)
* En_Kgy
* NBS
* PR
* PR
* PR
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 2 | ||||
| -rw-r--r-- | include/macros.h | 2 | ||||
| -rw-r--r-- | include/z64.h | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/include/functions.h b/include/functions.h index 33f1843e6..d28605436 100644 --- a/include/functions.h +++ b/include/functions.h @@ -2135,7 +2135,7 @@ void Interface_ChangeAlpha(u16 param_1); // void func_80111CB4(void); // void func_801129E4(void); void func_80112AFC(GlobalContext* globalCtx); -// void func_80112B40(void); +void func_80112B40(GlobalContext* globalCtx, s32 arg1); // void func_80112BE4(void); // void func_80112C0C(void); u32 Item_Give(GlobalContext* globalCtx, u8 param_2); diff --git a/include/macros.h b/include/macros.h index be3ec0c93..b7a0ff217 100644 --- a/include/macros.h +++ b/include/macros.h @@ -52,6 +52,8 @@ #define ALL_EQUIP_VALUE(equip) ((gSaveContext.inventory.equipment & gEquipMasks[equip]) >> gEquipShifts[equip]) #define CUR_EQUIP_VALUE(equip) ((gSaveContext.equips.equipment & gEquipMasks[equip]) >> gEquipShifts[equip]) #define CUR_UPG_VALUE(upg) ((gSaveContext.inventory.upgrades & gUpgradeMasks[upg]) >> gUpgradeShifts[upg]) +#define TAKE_EQUIPPED_ITEM(equip) (gSaveContext.equips.equipment = ((((void)0, gSaveContext.equips.equipment) & (gEquipNegMasks[equip])) | (u16)(0 << gEquipShifts[equip]))) +#define CUR_FORM_EQUIP(button) (gSaveContext.equips.buttonItems[gSaveContext.playerForm == PLAYER_FORM_HUMAN ? 0 : gSaveContext.playerForm][button]) #define CHECK_QUEST_ITEM(item) (((void)0, gSaveContext.inventory.questItems) & gBitFlags[item]) #define CAPACITY(upg, value) gUpgradeCapacities[upg][value] diff --git a/include/z64.h b/include/z64.h index fd85a21a4..d6f097cfb 100644 --- a/include/z64.h +++ b/include/z64.h @@ -56,6 +56,11 @@ #define Z_PRIORITY_DMAMGR 17 #define Z_PRIORITY_IRQMGR 18 +#define EQUIP_SLOT_B 0 +#define EQUIP_SLOT_C_LEFT 1 +#define EQUIP_SLOT_C_DOWN 2 +#define EQUIP_SLOT_C_RIGHT 3 + typedef struct { /* 0x0 */ s16 priority; // Lower means higher priority. -1 means it ignores priority /* 0x2 */ s16 length; |