mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-06-08 20:39:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop-zhora' into zhornext

Browse Source
This commit is contained in:
briaguya
2022-08-02 15:49:59 -04:00
parent 8aa20e1732 cec0bc6fca
commit ac776ce7bc
12 changed files with 178 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/include/z64player.h
+16 -2
View File
@@ -366,7 +366,20 @@ typedef struct {
/* 0x00 */ s32 active;
/* 0x04 */ Vec3f tip;
/* 0x10 */ Vec3f base;
} WeaponInfo; // size = 0x1C
} WeaponInfo; // size = 0x1C\
typedef enum {
FLAG_NONE,
FLAG_SCENE_SWITCH,
FLAG_SCENE_TREASURE,
FLAG_SCENE_CLEAR,
FLAG_SCENE_COLLECTIBLE,
} FlagType;
typedef struct {
/* 0x00 */ s32 flagID; // which flag to set when Player_SetPendingFlag is called
/* 0x04 */ FlagType flagType; // type of flag to set when Player_SetPendingFlag is called
} PendingFlag; // size = 0x06
#define PLAYER_STATE1_0 (1 << 0)
#define PLAYER_STATE1_1 (1 << 1)
@@ -623,6 +636,7 @@ typedef struct Player {
/* 0x0A87 */ u8 unk_A87;
/* 0x0A88 */ Vec3f unk_A88; // previous body part 0 position
/* 0x0A89 */ bool pendingIceTrap;
} Player; // size = 0xA94
/* 0x0A95 */ PendingFlag pendingFlag;
} Player; // size = 0xAA1
#endif