Merge 'Shorten GTG name in FW text' (#2564)

Author: fenhl

ASM/build/bundle.o

@@ -11,23 +11,23 @@
 int dungeon_count = 13;
 
 dungeon_entry_t dungeons[] = {
-    {  0, 0, 0, 0, 1, 0x0F, "Deku",       "Deku Tree",              {-1, -1, -1, -1}, {-1, -1, -1, -1} },
-    {  1, 0, 0, 0, 1, 0x1F, "Dodongo",    "Dodongo's Cavern",       {-1, -1, -1, -1}, { 0, -1, -1, -1} },
-    {  2, 0, 0, 0, 1, 0x0F, "Jabu",       "Jabu Jabu's Belly",      {-1, -1, -1, -1}, {-1, -1, -1, -1} },
-
-    {  3, 1, 1, 0, 1, 0x1F, "Forest",     "Forest Temple",          {-1, -1, -1, -1}, {-1, -1, -1, -1} },
-    {  4, 1, 1, 0, 1, 0x1F, "Fire",       "Fire Temple",            {-1, -1, -1, -1}, {-1, -1, -1, -1} },
-    {  5, 1, 1, 0, 1, 0x1F, "Water",      "Water Temple",           {-1, -1, -1, -1}, {-1, -1, -1, -1} },
-    {  7, 1, 1, 0, 1, 0x1F, "Shadow",     "Shadow Temple",          { 4,  6,  7, -1}, { 4,  5,  6,  7} },
-    {  6, 1, 1, 0, 1, 0x1F, "Spirit",     "Spirit Temple",          {11, 14, 12, -1}, {13, 15, -1, -1} },
-
-    {  8, 1, 0, 0, 1, 0x07, "BotW",       "Bottom of the Well",     { 3, -1, -1, -1}, {-1, -1, -1, -1} },
-    {  9, 0, 0, 0, 1, 0x07, "Ice",        "Ice Cavern",             { 1,  2, -1, -1}, {-1, -1, -1, -1} },
-    { 12, 1, 0, 1, 0, 0x00, "Hideout",    "Thieves' Hideout",       {-1, -1, -1, -1}, {-1, -1, -1, -1} },
-    { 11, 1, 0, 0, 0, 0x00, "GTG",        "Gerudo Training Ground", { 8,  9, 10, -1}, { 8,  9, 10, -1} },
-    { 10, 0, 0, 0, 0, 0x00, "Tower",      "Ganon's Tower",          {-1, -1, -1, -1}, {-1, -1, -1, -1} },
-    { 13, 1, 1, 0, 0, 0x00, "Ganon",      "Ganon's Castle",         {16, 17, 18, 21}, {18, 19, 20, -1} },
-    { 16, 1, 0, 0, 0, 0x00, "Chest Game", "Treasure Box Shop",      {-1, -1, -1, -1}, {-1, -1, -1, -1} },
+    {  0, 0, 0, 0, 1, 0x0F, "Deku",       "Deku Tree",          {-1, -1, -1, -1}, {-1, -1, -1, -1} },
+    {  1, 0, 0, 0, 1, 0x1F, "Dodongo",    "Dodongo's Cavern",   {-1, -1, -1, -1}, { 0, -1, -1, -1} },
+    {  2, 0, 0, 0, 1, 0x0F, "Jabu",       "Jabu Jabu's Belly",  {-1, -1, -1, -1}, {-1, -1, -1, -1} },
+
+    {  3, 1, 1, 0, 1, 0x1F, "Forest",     "Forest Temple",      {-1, -1, -1, -1}, {-1, -1, -1, -1} },
+    {  4, 1, 1, 0, 1, 0x1F, "Fire",       "Fire Temple",        {-1, -1, -1, -1}, {-1, -1, -1, -1} },
+    {  5, 1, 1, 0, 1, 0x1F, "Water",      "Water Temple",       {-1, -1, -1, -1}, {-1, -1, -1, -1} },
+    {  7, 1, 1, 0, 1, 0x1F, "Shadow",     "Shadow Temple",      { 4,  6,  7, -1}, { 4,  5,  6,  7} },
+    {  6, 1, 1, 0, 1, 0x1F, "Spirit",     "Spirit Temple",      {11, 14, 12, -1}, {13, 15, -1, -1} },
+
+    {  8, 1, 0, 0, 1, 0x07, "BotW",       "Bottom of the Well", { 3, -1, -1, -1}, {-1, -1, -1, -1} },
+    {  9, 0, 0, 0, 1, 0x07, "Ice",        "Ice Cavern",         { 1,  2, -1, -1}, {-1, -1, -1, -1} },
+    { 12, 1, 0, 1, 0, 0x00, "Hideout",    "Thieves' Hideout",   {-1, -1, -1, -1}, {-1, -1, -1, -1} },
+    { 11, 1, 0, 0, 0, 0x00, "GTG",        "GTG",                { 8,  9, 10, -1}, { 8,  9, 10, -1} },
+    { 10, 0, 0, 0, 0, 0x00, "Tower",      "Ganon's Tower",      {-1, -1, -1, -1}, {-1, -1, -1, -1} },
+    { 13, 1, 1, 0, 0, 0x00, "Ganon",      "Ganon's Castle",     {16, 17, 18, 21}, {18, 19, 20, -1} },
+    { 16, 1, 0, 0, 0, 0x00, "Chest Game", "Treasure Box Shop",  {-1, -1, -1, -1}, {-1, -1, -1, -1} },
 };
 
 boss_entry_t bosses[] = {

ASM/c/dungeon_info.c

@@ -7,8 +7,6 @@
 * The Farore's Wind text box now distinguishes between Ganon's Castle and Ganon's Tower.
 * New `Water Hop` trick and `BotW Cucco Dive` glitch added to advanced logic.
 * Improve Debug menu with new options.
-* Refill items sold as special deals are now less likely to cost more than the "market price" of a repeatable purchase.
-* The heart chest texture has been tweaked to display heart icons on the lid rather than triangles.
 
 ## Bug fixes
 * Fix a potential softlock when talking to Pierre (the upper scarecrow) as child in Lake Hylia.
@@ -23,14 +21,15 @@
 * Added some missing or incorrectly named locations in advanced logic.
 * Various minor fixes for advanced logic.
 * Fix for advanced logic tricks being cached when switching to glitchless logic.
-* Fix for failure to generate when special deal prices are set to vanilla.
 * Fix for misc hints when the hinted item was randomly selected as a starting item.
 
 ## Other Changes
 * It is no longer required to have either the goron tunic or the Fewer Tunic Requirements trick for adult to go from the Bolero warp pad to the Fire temple in logic.
 * Further shortening of version number in file select screen.
 * Areas which have all locations hinted will not be selected for important checks hints.
 * Successfully entering a password will now take you back to the file select screen.
+* Refill items sold as special deals are now less likely to cost more than the "market price" of a repeatable purchase.
+* The heart chest texture has been tweaked to display heart icons on the lid rather than triangles.
 
 # 9.0
 

CHANGELOG.md

@@ -1,4 +1,4 @@
-__version__ = '9.0.38'
+__version__ = '9.0.39'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0