mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-09-02 09:51:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

En_Zot (#320)

Browse Source 
* En_Zot

* PR
This commit is contained in:
Maide
2021-09-28 14:28:06 +01:00
committed by GitHub
parent 0f4bdbc020
commit edb1dd4675
7 changed files with 1373 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+4 -4
View File
@@ -807,8 +807,8 @@ s32 func_800B863C(Actor* actor, GlobalContext* globalCtx);
u32 func_800B867C(Actor* actor, GlobalContext* globalCtx);
UNK_TYPE4 func_800B86C8(Actor* actor1, GlobalContext* globalCtx, Actor* actor2);
s32 func_800B8708(GlobalContext* globalCtx);
// void func_800B8718(void);
// void func_800B874C(void);
s32 func_800B8718(Actor* actor, GlobalContext* globalCtx);
void func_800B874C(Actor* actor, GlobalContext* globalCtx, f32 arg2, f32 arg3);
// void func_800B8804(void);
// void func_800B882C(void);
// void func_800B886C(void);
@@ -3792,7 +3792,7 @@ void func_8019AEC0(UNK_PTR param_1, UNK_PTR param_2);
// void func_8019B38C(void);
// void func_8019B3D0(void);
// void func_8019B4B8(void);
// void func_8019B544(void);
void func_8019B544(u16 arg0);
// void func_8019B568(void);
// void func_8019B5AC(void);
// void func_8019B5EC(void);
@@ -3804,7 +3804,7 @@ void func_8019AEC0(UNK_PTR param_1, UNK_PTR param_2);
// void func_8019C1D0(void);
// void func_8019C268(void);
// void func_8019C2E4(void);
// void func_8019C300(void);
void func_8019C300(s32 arg0);
// void func_8019C398(void);
// void func_8019C5A0(void);
// void func_8019C8D8(void);
include/macros.h
+1
View File
@@ -56,6 +56,7 @@
#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 REMOVE_QUEST_ITEM(item) (gSaveContext.inventory.questItems = (((void)0, gSaveContext.inventory.questItems) & (-1 - gBitFlags[item])))
#define CAPACITY(upg, value) gUpgradeCapacities[upg][value]
#define CUR_CAPACITY(upg) CAPACITY(upg, CUR_UPG_VALUE(upg) - 4)