Merge remote-tracking branch 'origin/main'

Z3DR · Jan 27, 2024 · 4f914f9 · 4f914f9
2 parents 5ca9558 + a064cb1
commit 4f914f9
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 44 deletions.
diff --git a/.github/workflows/create-build.yml b/.github/workflows/create-build.yml
@@ -385,7 +385,7 @@ jobs:
               "url": "https://phlexplexi.co/unistore",
               "file": "MM3DR.unistore",
               "sheetURL": "https://phlexplexi.co/icon.t3x",
-              "sheet": "MM3DR.t3x",
+              "sheet": "icon.t3x",
               "bg_index": 1,
               "bg_sheet": 0,
               "revision": <REV_NUMBER>,

diff --git a/Z3DR b/Z3DR
diff --git a/source/custom_messages.cpp b/source/custom_messages.cpp
@@ -133,7 +133,7 @@ void CreateBaselineCustomMessages() {
 
     // Great Bay
     CreateMessage(0x6141, 0xFFFF, 0x3FFFFFFF, 0xFF0000, 
-    "You got the #boss key# for the #Great Bay Temple#! ow you can enter the chamber where the boss lurks!",
+    "You got the #boss key# for the #Great Bay Temple#! Now you can enter the chamber where the boss lurks!",
     {QM_GREEN, QM_RED}, {}, {}, 0x0, false, false);
 
     // Stone Tower

diff --git a/source/hint_list.cpp b/source/hint_list.cpp
@@ -272,6 +272,10 @@ void HintTable_Init() {
     hintTable[GORON_VILLAGE_LENS_OF_TRUTH_CHEST] = HintText::Sometimes({ Text{"a lonely peak contains", "", ""}});
     hintTable[GORON_VILLAGE_SCRUB_TRADE] = HintText::Sometimes({ Text{"a northern merchant trades", "", ""}});
     hintTable[GORON_VILLAGE_LEDGE] = HintText::Sometimes({ Text{"a cold ledge contains", "", ""}});
+    hintTable[GORON_VILLAGE_POWDER_KEG_CHALLENGE_SPRING] = HintText::Sometimes({ Text{"a large goron rewards", "", ""}});
+    hintTable[GORON_VILLAGE_SCRUB_PURCHASE_SPRING] = HintText::Sometimes({ Text{"a northern merchant sells", "", ""}});
+    hintTable[GORON_VILLAGE_SCRUB_TRADE_SPRING] = HintText::Sometimes({ Text{"a northern merchant trades", "", ""}});
+    hintTable[GORON_VILLAGE_LEDGE_SPRING] = HintText::Sometimes({ Text{"a cold ledge contains", "", ""}});
     hintTable[GORON_VILLAGE_GORON_LULLABY] = HintText::Sometimes({ Text{"a lonely child teaches", "", ""}});
     hintTable[LENS_CAVE_RED_RUPEE] = HintText::Sometimes({ Text{"a lonely peak contains", "", ""}});
     hintTable[LENS_CAVE_PURPLE_RUPEE] = HintText::Sometimes({ Text{"a lonely peak contains", "", ""}});
@@ -448,7 +452,6 @@ void HintTable_Init() {
     hintTable[W_CLOCK_TOWN_SWORDSMANS_SCHOOL] = HintText::Sometimes({Text{"a town game rewards", "", ""}});
     hintTable[W_CLOCK_TOWN_ALL_NIGHT_MASK_BUY] = HintText::Sometimes({Text{"a shady town merchant sells", "", ""}});
     hintTable[W_CLOCK_TOWN_BOMB_SHOP_GORON] = HintText::Sometimes({Text{"a town goron merchant sells", "", ""}});
-    hintTable[W_CLOCK_TOWN_POSTBOX] = HintText::Sometimes({Text{"a correspondence box contains", "", ""}});
   //hintTable[W_CLOCK_TOWN_LOTTERY] = HintText::Sometimes({Text{"", "", ""}});
     hintTable[TRADING_POST_ITEM_1] = HintText::Sometimes({Text{"a town merchant sells", "", ""}});
     hintTable[TRADING_POST_ITEM_2] = HintText::Sometimes({Text{"a town merchant sells", "", ""}});

diff --git a/source/include/keys.hpp b/source/include/keys.hpp
@@ -281,6 +281,10 @@ typedef enum {
   GORON_VILLAGE_LEDGE,
   LENS_CAVE_RED_RUPEE,
   LENS_CAVE_PURPLE_RUPEE,
+  GORON_VILLAGE_POWDER_KEG_CHALLENGE_SPRING,
+  GORON_VILLAGE_SCRUB_PURCHASE_SPRING,
+  GORON_VILLAGE_SCRUB_TRADE_SPRING,
+  GORON_VILLAGE_LEDGE_SPRING,
   GORON_SHOP_ITEM_1,
   GORON_SHOP_ITEM_2,
   GORON_SHOP_ITEM_3,
@@ -455,7 +459,6 @@ typedef enum {
   W_CLOCK_TOWN_ALL_NIGHT_MASK_BUY,
   W_CLOCK_TOWN_LOTTERY,
   W_CLOCK_TOWN_BOMB_SHOP_GORON,
-  W_CLOCK_TOWN_POSTBOX,
   TRADING_POST_ITEM_1,
   TRADING_POST_ITEM_2,
   TRADING_POST_ITEM_3,

diff --git a/source/include/version.hpp b/source/include/version.hpp
@@ -1,4 +1,4 @@
 #pragma once
 
-#define RANDOMIZER_VERSION "v1.0.1"
+#define RANDOMIZER_VERSION "v1.1.1"
 #define COMMIT_NUMBER "develop"
diff --git a/source/item_list.cpp b/source/item_list.cpp
@@ -111,7 +111,7 @@ void ItemTable_Init() {    //repeatable denotes that an item in a vanilla playth
     itemTable[BOTTLE_WITH_ZORA_EGG]              = Item(false,     true,           &HasBottle,                   Text{"Bottle with Zora Egg",            "Bottle with Zora Egg",                             "Bottle with Zora Egg",},                            BOTTLE_WITH_ZORA_EGG,         (u32)GetItemID::GI_BOTTLE_ZORA_EGG,           ITEMTYPE_ITEM);
     itemTable[BOTTLE_WITH_MUSHROOM]              = Item(false,     true,           &HasBottle,                   Text{"Bottle with Mushroom",            "Bottle with Mushroom",                             "Bottle with Mushroom",},                            BOTTLE_WITH_MUSHROOM,         (u32)GetItemID::GI_BOTTLE_MAGIC_MUSHROOM,     ITEMTYPE_ITEM);
     itemTable[ZORA_EGG]							 = Item(false,     true,           &ZoraEgg,                     Text{"Zora Egg", 					     "Oeuf de Zora",						             "Huevo de Zora"},							          ZORA_EGG,			    	    (u32)GetItemID::GI_BOTTLE_ZORA_EGG,           ITEMTYPE_ITEM);
-	itemTable[SEAHORSE]							 = Item(false,     true,           &Seahorse,                    Text{"Seahorse",						 "Hippocampe",						                 "Caballo de mar"},							          SEAHORSE,				        (u32)GetItemID::GI_BOTTLE_SEAHORSE,           ITEMTYPE_ITEM);
+	itemTable[SEAHORSE]							 = Item(true,     true,           &Seahorse,                    Text{"Seahorse",						 "Hippocampe",						                 "Caballo de mar"},							          SEAHORSE,				        (u32)GetItemID::GI_BOTTLE_SEAHORSE,           ITEMTYPE_ITEM);
 
     //Upgrades
     itemTable[RAZOR_SWORD]                       = Item(true,      false,          &RazorSword,                  Text{"Razor Sword",				       "Lame Rasoir",					                   "Espada Afilada" },                                RAZOR_SWORD,          (u32)GetItemID::GI_RAZOR_SWORD,     ITEMTYPE_ITEM );
+7 −1		code/include/game/actor.h
+10 −0		code/include/rnd/entrance.h
+25 −21		code/include/rnd/item_override.h
+14 −3		code/include/rnd/savefile.h
+30 −2		code/mm.ld
+37 −7		code/source/asm/hooks.s
+46 −0		code/source/asm/patches.s
+13 −0		code/source/rnd/entrance.cpp
+155 −106		code/source/rnd/item_override.cpp
+32 −17		code/source/rnd/savefile.cpp
+4 −0		code/source/rnd/spoiler_data.cpp