Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next

Hopefully everything works here. Need to do some testing.

soh/include/functions.h

@@ -1057,6 +1057,7 @@ s32 Inventory_HasEmptyBottle(void);
 s32 Inventory_HasSpecificBottle(u8 bottleItem);
 void Inventory_UpdateBottleItem(GlobalContext* globalCtx, u8 item, u8 cButton);
 s32 Inventory_ConsumeFairy(GlobalContext* globalCtx);
+bool Inventory_HatchPocketCucco(GlobalContext* globalCtx);
 void Interface_SetDoAction(GlobalContext* globalCtx, u16 action);
 void Interface_SetNaviCall(GlobalContext* globalCtx, u16 naviCallState);
 void Interface_LoadActionLabelB(GlobalContext* globalCtx, u16 action);

soh/include/z64player.h

@@ -6,6 +6,8 @@
 
 struct Player;
 
+extern GetItemEntry sGetItemTable[195];
+
 typedef enum {
     /* 0 */ PLAYER_SWORD_NONE,
     /* 1 */ PLAYER_SWORD_KOKIRI,
@@ -366,6 +368,7 @@ typedef enum {
     FLAG_SCENE_CLEAR,
     FLAG_SCENE_COLLECTIBLE,
     FLAG_EVENT_CHECK_INF,
+    FLAG_COW_MILKED
 } FlagType;
 
 typedef struct {
@@ -627,9 +630,10 @@ typedef struct Player {
     /* 0x0A86 */ s8         unk_A86;
     /* 0x0A87 */ u8         unk_A87;
     /* 0x0A88 */ Vec3f      unk_A88; // previous body part 0 position
-    /* 0x0A94 */ PendingFlag pendingFlag;
-    /* 0x0AA0 */ u8         boomerangQuickRecall; // Has the player pressed the boomerang button while it's in the air still?
-    /* 0x0AA1 */ GetItemEntry getItemEntry;
-} Player; // size = 0xAA9
+    /* 0x0A89 */ bool       pendingIceTrap;
+    /* 0x0A95 */ PendingFlag pendingFlag;
+    /* 0x0AA1 */ u8         boomerangQuickRecall; // Has the player pressed the boomerang button while it's in the air still?
+    /* 0x0AA2 */ GetItemEntry getItemEntry;
+} Player; // size = 0xAAA
 
 #endif

soh/include/z64save.h

@@ -175,7 +175,7 @@ typedef struct {
     /* 0x1422 */ s16 sunsSongState; // controls the effects of suns song
     /* 0x1424 */ s16 healthAccumulator;
     RandoSetting randoSettings[300];
-    ItemLocationRando itemLocations[500];
+    ItemLocationRando itemLocations[RC_MAX];
     HintLocationRando hintLocations[50];
     char childAltarText[250];
     char adultAltarText[750];
@@ -184,7 +184,9 @@ typedef struct {
     u8 seedIcons[5];
     u8 dungeonsDone[8];
     u8 trialsDone[6];
+    u8 cowsMilked[10];
     u8 temporaryWeapon;
+    u16 adultTradeItems;
 } SaveContext; // size = 0x1428
 
 typedef enum {