Added Bunny Hood as a starting item option (#613)

gamestabled · Jan 4, 2023 · 327b04c · 327b04c
1 parent cdaf7f6
commit 327b04c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 0 deletions.
diff --git a/code/src/savefile.c b/code/src/savefile.c
@@ -478,6 +478,10 @@ void SaveFile_SetStartingInventory(void) {
             gSettingsContext.zorasFountain == ZORASFOUNTAIN_OPEN ? ITEM_BOTTLE : ITEM_LETTER_RUTO;
     }
 
+    if (gSettingsContext.startingChildTrade) {
+        gSaveContext.items[SLOT_TRADE_CHILD] = ITEM_MASK_BUNNY;
+    }
+
     if (gSettingsContext.startingOcarina > 0) {
         gSaveContext.items[SLOT_OCARINA] = ITEM_OCARINA_FAIRY + (gSettingsContext.startingOcarina - 1);
     }

diff --git a/code/src/settings.h b/code/src/settings.h
@@ -655,6 +655,7 @@ typedef struct {
     u8 startingBottle3;
     u8 startingBottle4;
     u8 startingRutoBottle;
+    u8 startingChildTrade;
     u8 startingOcarina;
     u8 startingKokiriSword;
     u8 startingBiggoronSword;

diff --git a/source/keys.hpp b/source/keys.hpp
@@ -40,6 +40,8 @@ typedef enum {
     DOUBLE_DEFENSE,
     GOLD_SKULLTULA_TOKEN,
 
+    BUNNY_HOOD,
+
     POCKET_EGG,
     POCKET_CUCCO,
     COJIRO,

diff --git a/source/settings.cpp b/source/settings.cpp
@@ -504,6 +504,7 @@ Option StartingBottle2          = Option::U8  ("Bottle 2",             bottleOpt
 Option StartingBottle3          = Option::U8  ("Bottle 3",             bottleOptions,                                                                   {""});
 Option StartingBottle4          = Option::U8  ("Bottle 4",             bottleOptions,                                                                   {""});
 Option StartingRutoBottle       = Option::U8  ("Ruto's Letter",        {"Off",             "On"},                                                       {""});
+Option StartingChildTrade       = Option::U8  ("Bunny Hood",           {"Off",             "On"},                                                       {""});
 std::vector<Option *> startingItemsOptions = {
     &StartingStickCapacity,
     &StartingNutCapacity,
@@ -530,6 +531,7 @@ std::vector<Option *> startingItemsOptions = {
     &StartingBottle3,
     &StartingBottle4,
     &StartingRutoBottle,
+    &StartingChildTrade,
 };
 
 Option StartingZeldasLullaby    = Option::U8  ("Zelda's Lullaby",      {"Off",             "On"},                                                       {""});
@@ -1549,6 +1551,7 @@ SettingsContext FillContext() {
     ctx.startingBottle3       = StartingBottle3.Value<u8>();
     ctx.startingBottle4       = StartingBottle4.Value<u8>();
     ctx.startingRutoBottle    = StartingRutoBottle.Value<u8>();
+    ctx.startingChildTrade    = StartingChildTrade.Value<u8>();
     ctx.startingOcarina       = StartingOcarina.Value<u8>();
     ctx.startingKokiriSword   = StartingKokiriSword.Value<u8>();
     ctx.startingBiggoronSword = StartingBiggoronSword.Value<u8>();

diff --git a/source/settings.hpp b/source/settings.hpp
@@ -509,6 +509,7 @@ extern Option StartingBottle2;
 extern Option StartingBottle3;
 extern Option StartingBottle4;
 extern Option StartingRutoBottle;
+extern Option StartingChildTrade;
 extern Option StartingOcarina;
 extern Option StartingZeldasLullaby;
 extern Option StartingEponasSong;

diff --git a/source/starting_inventory.cpp b/source/starting_inventory.cpp
@@ -111,6 +111,8 @@ void GenerateStartingInventory() {
         AddItemToInventory(EMPTY_BOTTLE, 1);
     }
     AddItemToInventory(RUTOS_LETTER, StartingRutoBottle.Value<u8>());
+    AddItemToInventory(BUNNY_HOOD, StartingChildTrade.Value<u8>());
+
     AddItemToInventory(PROGRESSIVE_OCARINA, StartingOcarina.Value<u8>());
     AddItemToInventory(ZELDAS_LULLABY, StartingZeldasLullaby.Value<u8>());
     AddItemToInventory(EPONAS_SONG, StartingEponasSong.Value<u8>());