Merge remote-tracking branch 'upstream/master' into d_a_player

This commit is contained in:
Pheenoh
2022-12-21 23:22:19 -07:00
89 changed files with 2113 additions and 2611 deletions
+380 -33
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -433,7 +433,7 @@ public:
static BOOL checkDungeonWarpItem(int);
static BOOL checkMasterSwordEquip();
static BOOL checkWoodShieldEquip();
f32 getAttentionOffsetY();
static f32 getAttentionOffsetY();
s16 checkNowWolfEyeUp();
static void forceRestartRoom(int, u32, int);
static void setFmChainPos(fopAc_ac_c*, cXyz*, int);