mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-05-31 01:25:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop-zhora' into z-to-rn

Browse Source
This commit is contained in:
briaguya
2022-08-23 21:05:35 -04:00
parent b7e07bef2f 0573a1b2ac
commit 133cbcd6c8
73 changed files with 2501 additions and 1802 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/include/z64actor.h
+2 -1
View File
@@ -271,7 +271,8 @@ typedef enum {
/* 0x16 */ ITEM00_SHIELD_HYLIAN,
/* 0x17 */ ITEM00_TUNIC_ZORA,
/* 0x18 */ ITEM00_TUNIC_GORON,
/* 0x19 */ ITEM00_BOMBS_SPECIAL
/* 0x19 */ ITEM00_BOMBS_SPECIAL,
/* 0x20 */ ITEM00_BOMBCHU,
} Item00Type;
struct EnItem00;
soh/include/z64player.h
+1 -1
View File
@@ -359,7 +359,7 @@ typedef struct {
/* 0x00 */ s32 active;
/* 0x04 */ Vec3f tip;
/* 0x10 */ Vec3f base;
} WeaponInfo; // size = 0x1C\
} WeaponInfo; // size = 0x1C
typedef enum {
FLAG_NONE,