Skip to content

Commit

Permalink
Nightly fixes from last reports (#55)
Browse files Browse the repository at this point in the history 
Fix: Diety -> Deity
Fix: StockPotInn -> Stock Pot Inn
Fix: Lens and Progressive Items are now big chests
Fix: Chests now override their proper textures
  • Loading branch information
@PhlexPlexico
PhlexPlexico authored Feb 21, 2024
1 parent e60440f commit 332f226
Show file tree
Hide file tree
Showing 14 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion Z3DR
Submodule Z3DR updated 7 files
+1 −1 code/include/rnd/settings.h
+6 −1 code/mm.ld
+5 −5 code/source/asm/hooks.s
+6 −0 code/source/asm/patches.s
+7 −32 code/source/rnd/chest.cpp
+7 −7 code/source/rnd/item_table.cpp
+1 −1 code/source/rnd/savefile.cpp
12 changes: 6 additions & 6 deletions source/hint_list.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ void HintTable_Init() {
hintTable[GAROS_MASK] = HintText::Item({ Text{"the mask of spies", "the mask of spies", "the mask of spies"}});
hintTable[CAPTAINS_HAT] = HintText::Item({ Text{"a commanding presence", "a commanding presence", "a commanding presence"}});
hintTable[GIANTS_MASK] = HintText::Item({ Text{"a growth spurt", "a growth spurt", "a growth spurt"}});
hintTable[FIERCE_DIETY_MASK] = HintText::Item({ Text{"the wrath of a god", "the wrath of a god", "the wrath of a god"}});
hintTable[FIERCE_DEITY_MASK] = HintText::Item({ Text{"the wrath of a god", "the wrath of a god", "the wrath of a god"}});
hintTable[MASK_OF_TRUTH] = HintText::Item({ Text{"a piercing gaze", "a piercing gaze", "a piercing gaze"}});
hintTable[FISHING_PASS] = HintText::Item({Text{"a fishing pass", "a fishing passs", "a fishing pass"}});
hintTable[ICE_TRAP] = HintText::Item({Text{"a frosty surprise", "a frosty surprise", "a frosty surprise"}});
Expand Down Expand Up @@ -411,7 +411,7 @@ void HintTable_Init() {
hintTable[POTION_SHOP_ITEM_1] = HintText::Sometimes({Text{"a potion maker sells", "", ""}});
hintTable[POTION_SHOP_ITEM_2] = HintText::Sometimes({Text{"a potion maker sells", "", ""}});
hintTable[POTION_SHOP_ITEM_3] = HintText::Sometimes({Text{"a potion maker sells", "", ""}});
//StockPotInn
//Stock Pot Inn
hintTable[STOCKPOTINN_RESERVATION] = HintText::Sometimes({Text{"checking-in rewards", "", ""}});
hintTable[STOCKPOTINN_MIDNIGHT_MEETING] = HintText::Sometimes({Text{"a late meeting rewards", "", ""}});
hintTable[STOCKPOTINN_TOILET_HAND] = HintText::Sometimes({Text{"a strange palm rewards", "", ""}});
Expand Down Expand Up @@ -705,10 +705,10 @@ void HintTable_Init() {
hintTable[CLOCK_TOWN_FAIRY_FOUNTAIN] = HintText::Region({Text{"Clock Town Fairy Fountain", "", ""}});
hintTable[CLOCK_TOWN_DEKU_PLAYGROUND] = HintText::Region({Text{"Deku Playground", "", ""}});
hintTable[E_CLOCK_TOWN] = HintText::Region({Text{"E Clock Town", "", ""}});
hintTable[STOCKPOTINN] = HintText::Region({Text{"StockPotInn", "", ""}});
hintTable[STOCKPOTINN_GUEST_ROOM] = HintText::Region({Text{"StockPotInn", "", ""}});
hintTable[STOCKPOTINN_STAFF_ROOM] = HintText::Region({Text{"StockPotInn", "", ""}});
hintTable[STOCKPOTINN_GRANDMA_ROOM] = HintText::Region({Text{"StockPotInn", "", ""}});
hintTable[STOCKPOTINN] = HintText::Region({Text{"Stock Pot Inn", "", ""}});
hintTable[STOCKPOTINN_GUEST_ROOM] = HintText::Region({Text{"Stock Pot Inn", "", ""}});
hintTable[STOCKPOTINN_STAFF_ROOM] = HintText::Region({Text{"Stock Pot Inn", "", ""}});
hintTable[STOCKPOTINN_GRANDMA_ROOM] = HintText::Region({Text{"Stock Pot Inn", "", ""}});
hintTable[CLOCK_TOWN_OBSERVATORY] = HintText::Region({Text{"Observatory", "", ""}});
hintTable[CLOCK_TOWN_BAR] = HintText::Region({Text{"Milk Bar", "", ""}});
hintTable[CLOCK_TOWN_HONEY_DARLING] = HintText::Region({Text{"E Clock Town", "", ""}});
Expand Down
4 changes: 2 additions & 2 deletions source/include/keys.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ typedef enum {
GAROS_MASK,
CAPTAINS_HAT,
GIANTS_MASK,
FIERCE_DIETY_MASK,
FIERCE_DEITY_MASK,
MASK_OF_TRUTH,
SWAMP_SKULLTULA_TOKEN,
OCEANSIDE_SKULLTULA_TOKEN,
Expand Down Expand Up @@ -418,7 +418,7 @@ typedef enum {
POTION_SHOP_ITEM_1,
POTION_SHOP_ITEM_2,
POTION_SHOP_ITEM_3,
//StockPotInn
//Stock Pot Inn
STOCKPOTINN_RESERVATION,
STOCKPOTINN_MIDNIGHT_MEETING,
STOCKPOTINN_TOILET_HAND,
Expand Down
2 changes: 1 addition & 1 deletion source/include/logic.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ namespace Logic {
extern bool GarosMask;
extern bool CaptainsHat;
extern bool GiantsMask;
extern bool FierceDietyMask;
extern bool FierceDeityMask;
extern bool MaskOfTruth;
extern bool OneMask;
extern bool TwoMasks;
Expand Down
4 changes: 2 additions & 2 deletions source/include/setting_descriptions.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ extern string_view blastLong;
extern string_view blastVeryLong;

extern string_view underwaterOcarinaDesc;
extern string_view fierceDietyAnywhereDesc;
extern string_view fierceDeityAnywhereDesc;
extern string_view skipMinigamePhasesDesc;
extern string_view fastLabFishDesc;
extern string_view fastBankDesc;
Expand Down Expand Up @@ -207,7 +207,7 @@ extern string_view shuffleHeartContainersDesc;
extern string_view shufflePiecesOfHeartDesc;
extern string_view shuffleMainInventoryDesc;
extern string_view shuffleTransformationDesc;
extern string_view shuffleFierceDietyDesc;
extern string_view shuffleFierceDeityDesc;
extern string_view shuffleMoonItemsDesc;
extern string_view shuffleBombersNotebookDesc;
extern string_view ocarinaDiveDesc;
Expand Down
6 changes: 3 additions & 3 deletions source/include/settings.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ namespace Settings {
extern Option StartingGaroMask;
extern Option StartingCaptainsHat;
extern Option StartingGiantsMask;
extern Option StartingFierceDietyMask;
extern Option StartingFierceDeityMask;
extern Option StartingMaskOfTruth;
//Excluded Locations
extern std::vector<Option*> excludeLocationsOptions;
Expand Down Expand Up @@ -400,7 +400,7 @@ namespace Settings {
extern Option ItemPoolValue;
extern Option ShuffleMainInventory;
extern Option ShuffleTransformation;
extern Option ShuffleFierceDiety;
extern Option ShuffleFierceDeity;
extern Option ShuffleChests;
extern Option ShuffleMasks;
extern Option ShuffleGFRewards;
Expand All @@ -427,7 +427,7 @@ namespace Settings {
//Comfort
extern Option BlastMaskCooldown;
extern Option UnderwaterOcarina;
extern Option FierceDietyAnywhere;
extern Option FierceDeityAnywhere;
extern Option ProgressiveGildedSword;
extern Option StartingSpin;
extern Option AmmoDrops;
Expand Down
2 changes: 1 addition & 1 deletion source/item_list.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ void ItemTable_Init() { //repeatable denotes that an item in a vanilla playth
itemTable[GAROS_MASK] = Item(true, false, &GarosMask, Text{"Garo's Mask", "Masque de Garo", "Máscara de Garo"}, GAROS_MASK, (u32)GetItemID::GI_MASK_GARO, ITEMTYPE_MASK );
itemTable[CAPTAINS_HAT] = Item(true, false, &CaptainsHat, Text{"Captain's Hat", "Chapeau de capitaine", "Sombrero de Capitan"}, CAPTAINS_HAT, (u32)GetItemID::GI_MASK_CAPTAINS_HAT, ITEMTYPE_MASK );
itemTable[GIANTS_MASK] = Item(true, false, &GiantsMask, Text{"Giant's Mask", "Masque de geant", "Máscara de gigante"}, GIANTS_MASK, (u32)GetItemID::GI_MASK_GIANTS, ITEMTYPE_MASK );
itemTable[FIERCE_DIETY_MASK] = Item(true, false, &FierceDietyMask, Text{"Fierce Diety Mask", "Masque Dietetique Fiere", "Máscara Fiere Diety"}, FIERCE_DIETY_MASK, (u32)GetItemID::GI_MASK_FIERCE_DEITY, ITEMTYPE_MASK );
itemTable[FIERCE_DEITY_MASK] = Item(true, false, &FierceDeityMask, Text{"Fierce Deity Mask", "Masque Dietetique Fiere", "Máscara Fiere Deity"}, FIERCE_DEITY_MASK, (u32)GetItemID::GI_MASK_FIERCE_DEITY, ITEMTYPE_MASK );
itemTable[MASK_OF_TRUTH] = Item(true, false, &MaskOfTruth, Text{"Mask of Truth", "Masque de vérité", "Máscara de la Verdad"}, MASK_OF_TRUTH, (u32)GetItemID::GI_MASK_OF_TRUTH, ITEMTYPE_MASK );
itemTable[FISHING_PASS] = Item(false, true, &noVariable, Text{"Fishing Pass", "Fishing Pass", "Fishing Pass"}, FISHING_PASS, 0xBA, ITEMTYPE_ITEM );
//
Expand Down
2 changes: 1 addition & 1 deletion source/item_location.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ void LocationTable_Init() {
locationTable[THE_MOON_LINK_TRIAL_BONUS] = ItemLocation::Collectable(0x66, 0x00, false, "The Moon Link Trial Bonus", THE_MOON_LINK_TRIAL_BONUS, PIECE_OF_HEART, {Category::cTheMoon,Category::cDayThree}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_THE_MOON );
locationTable[THE_MOON_GARO_CHEST] = ItemLocation::Chest (0x66, 0x01, true, "The Moon Garo Chest", THE_MOON_GARO_CHEST, ARROWS_30, {Category::cTheMoon,Category::cDayThree}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_THE_MOON );
locationTable[THE_MOON_IRON_KNUCKLE_CHEST] = ItemLocation::Chest (0x67, 0x02, true, "The Moon Iron Knuckle Chest", THE_MOON_IRON_KNUCKLE_CHEST, BOMBCHU_10, {Category::cTheMoon,Category::cDayThree}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_THE_MOON );
locationTable[THE_MOON_MAJORA_CHILD] = ItemLocation::Base (0x67, 0x7B, false, "The Moon Majora Child", THE_MOON_MAJORA_CHILD, FIERCE_DIETY_MASK, {Category::cTheMoon,Category::cDayThree}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_DUNGEON_THE_MOON );
locationTable[THE_MOON_MAJORA_CHILD] = ItemLocation::Base (0x67, 0x7B, false, "The Moon Majora Child", THE_MOON_MAJORA_CHILD, FIERCE_DEITY_MASK, {Category::cTheMoon,Category::cDayThree}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_DUNGEON_THE_MOON );

/*-------------------------------
--- BOSSES ---
Expand Down
10 changes: 5 additions & 5 deletions source/item_pool.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ const std::array<ItemKey, 83> easyItems = {
GAROS_MASK,
CAPTAINS_HAT,
GIANTS_MASK,
FIERCE_DIETY_MASK,
FIERCE_DEITY_MASK,
MASK_OF_TRUTH,
EMPTY_BOTTLE1,
EMPTY_BOTTLE2,
Expand Down Expand Up @@ -1045,12 +1045,12 @@ void GenerateItemPool() {
PlaceItemInLocation(GBC_MIKAU, ZORA_MASK);
}

//FIERECE DIETY SHUFFLE
if(ShuffleFierceDiety){
AddItemToMainPool(FIERCE_DIETY_MASK);
//FIERECE DEITY SHUFFLE
if(ShuffleFierceDeity){
AddItemToMainPool(FIERCE_DEITY_MASK);
}
else{
PlaceItemInLocation(THE_MOON_MAJORA_CHILD,FIERCE_DIETY_MASK);
PlaceItemInLocation(THE_MOON_MAJORA_CHILD,FIERCE_DEITY_MASK);
}

//PIECEOFHEART SHUFFLE
Expand Down
10 changes: 5 additions & 5 deletions source/location_access.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ void AreaTable_Init() {
Entrance(N_CLOCK_TOWN, {[]{return true;}}),
Entrance(TERMINA_FIELD, {[]{return true;}}),
Entrance(CLOCK_TOWN_OBSERVATORY, {[]{return BombersNotebook || SkipBombersMinigame;}}),
Entrance(STOCKPOTINN, {[]{return true;}}),//to-Do StockPotInn Night Access
Entrance(STOCKPOTINN, {[]{return true;}}),//to-Do Stock Pot Inn Night Access
Entrance(CLOCK_TOWN_BAR, {[]{return RomanisMask;}}),
Entrance(CLOCK_TOWN_HONEY_DARLING, {[]{return true;}}),
Entrance(CLOCK_TOWN_TREASURE_CHEST_GAME, {[]{return true;}}),
Expand All @@ -293,7 +293,7 @@ void AreaTable_Init() {
Entrance(S_CLOCK_TOWN, {[]{return true;}}),
});

areaTable[STOCKPOTINN] = Area("StockPotInn", "StockPotInn", STOCKPOTINN, {
areaTable[STOCKPOTINN] = Area("Stock Pot Inn", "Stock Pot Inn", STOCKPOTINN, {
//Events
},
{
Expand All @@ -309,7 +309,7 @@ void AreaTable_Init() {
Entrance(E_CLOCK_TOWN, {[]{return true;}}),
});

areaTable[STOCKPOTINN_GUEST_ROOM] = Area("StockPotInn Guest Room", "StockPotInn Guest Room", NONE, {
areaTable[STOCKPOTINN_GUEST_ROOM] = Area("Stock Pot Inn Guest Room", "Stock Pot Inn Guest Room", NONE, {
//Events
//Listen to Anju? --probably not needed as its not hard required
},
Expand All @@ -322,7 +322,7 @@ void AreaTable_Init() {
Entrance(STOCKPOTINN, {[]{return true;}}),
});

areaTable[STOCKPOTINN_STAFF_ROOM] = Area("StockPotInn Staff Room", "StockPotInn Staff Room", NONE, {
areaTable[STOCKPOTINN_STAFF_ROOM] = Area("Stock Pot Inn Staff Room", "Stock Pot Inn Staff Room", NONE, {
//Events
},
{
Expand All @@ -336,7 +336,7 @@ void AreaTable_Init() {
Entrance(STOCKPOTINN, {[]{return true;}}),
});

areaTable[STOCKPOTINN_GRANDMA_ROOM] = Area("StockPotInn Grandma's Room", "StockPotInn Grandma's Room", NONE, {
areaTable[STOCKPOTINN_GRANDMA_ROOM] = Area("Stock Pot Inn Grandma's Room", "Stock Pot Inn Grandma's Room", NONE, {
//Events
},
{
Expand Down
8 changes: 4 additions & 4 deletions source/logic.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ namespace Logic {
bool GarosMask = false;
bool CaptainsHat = false;
bool GiantsMask = false;
bool FierceDietyMask = false;
bool FierceDeityMask = false;
bool MaskOfTruth = false;
bool OneMask = false;
bool TwoMasks = false;
Expand Down Expand Up @@ -364,7 +364,7 @@ namespace Logic {
(item == GAROS_MASK) ||
(item == CAPTAINS_HAT) ||
(item == GIANTS_MASK) ||
(item == FIERCE_DIETY_MASK) ||
(item == FIERCE_DEITY_MASK) ||
(item == MASK_OF_TRUTH);
}
static bool HasItem(ItemKey itemName) {
Expand Down Expand Up @@ -398,7 +398,7 @@ namespace Logic {
(itemName == GAROS_MASK && GarosMask) ||
(itemName == CAPTAINS_HAT && CaptainsHat) ||
(itemName == GIANTS_MASK && GiantsMask) ||
(itemName == FIERCE_DIETY_MASK && FierceDietyMask) ||
(itemName == FIERCE_DEITY_MASK && FierceDeityMask) ||
(itemName == MASK_OF_TRUTH && MaskOfTruth);
}

Expand Down Expand Up @@ -618,7 +618,7 @@ namespace Logic {
GarosMask = false;
CaptainsHat = false;
GiantsMask = false;
FierceDietyMask = false;
FierceDeityMask = false;
MaskOfTruth = false;
OneMask = false;
TwoMasks = false;
Expand Down
6 changes: 3 additions & 3 deletions source/setting_descriptions.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ string_view shuffleMainInventoryDesc = "Shuffle Main Inventory Items\n"
"Magic Beans and Fire, Ice, and Light Arrows"; //
//
string_view shuffleTransformationDesc = "Shuffles Deku, Goron, and Zora Masks"; //
string_view shuffleFierceDietyDesc = "Shuffles Fierce Diety Mask"; //
string_view shuffleFierceDeityDesc = "Shuffles Fierce Deity Mask"; //
string_view shuffleMoonItemsDesc = "Shuffles Items from the Moon into the pool\n" //
"Includes 4 Pieces of Heart, and 2 junk items"; //
/*------------------------------ //
Expand Down Expand Up @@ -420,8 +420,8 @@ string_view skipMinigamePhasesDesc = "**OPTION CURRENTLY WIP**\n"
"both rewards at once for that minigame." //
"Also skips the first beaver race."; //
//
string_view fierceDietyAnywhereDesc = "**OPTION CURRENTLY WIP**\n" //
"Enables the use of the Fierce Diety Mask anywhere";//
string_view fierceDeityAnywhereDesc = "**OPTION CURRENTLY WIP**\n" //
"Enables the use of the Fierce Deity Mask anywhere";//
//
string_view underwaterOcarinaDesc = "**OPTION CURRENTLY WIP**\n" //
"Enables the use of the ocarina while underwater.";//
Expand Down
Loading

0 comments on commit 332f226

Please sign in to comment.