add tower to dungeon_entry_t

Author: jdunn596

ASM/build/asm_symbols.txt

@@ -11,22 +11,23 @@
 int dungeon_count = 13;
 
 dungeon_entry_t dungeons[] = {
-    {  0, 0, 0, 0, 1, 0x0F, "Deku",      {-1, -1, -1, -1}, {-1, -1, -1, -1} },
-    {  1, 0, 0, 0, 1, 0x1F, "Dodongo",   {-1, -1, -1, -1}, { 0, -1, -1, -1} },
-    {  2, 0, 0, 0, 1, 0x0F, "Jabu",      {-1, -1, -1, -1}, {-1, -1, -1, -1} },
-
-    {  3, 1, 1, 0, 1, 0x1F, "Forest",    {-1, -1, -1, -1}, {-1, -1, -1, -1} },
-    {  4, 1, 1, 0, 1, 0x1F, "Fire",      {-1, -1, -1, -1}, {-1, -1, -1, -1} },
-    {  5, 1, 1, 0, 1, 0x1F, "Water",     {-1, -1, -1, -1}, {-1, -1, -1, -1} },
-    {  7, 1, 1, 0, 1, 0x1F, "Shadow",    { 4,  6,  7, -1}, { 4,  5,  6,  7} },
-    {  6, 1, 1, 0, 1, 0x1F, "Spirit",    {11, 14, 12, -1}, {13, 15, -1, -1} },
-
-    {  8, 1, 0, 0, 1, 0x07, "BotW",      { 3, -1, -1, -1}, {-1, -1, -1, -1} },
-    {  9, 0, 0, 0, 1, 0x07, "Ice",       { 1,  2, -1, -1}, {-1, -1, -1, -1} },
-    { 12, 1, 0, 1, 0, 0x00, "Hideout",   {-1, -1, -1, -1}, {-1, -1, -1, -1} },
-    { 11, 1, 0, 0, 0, 0x00, "GTG",       { 8,  9, 10, -1}, { 8,  9, 10, -1} },
-    { 13, 1, 1, 0, 0, 0x00, "Ganon",     {16, 17, 18, 21}, {18, 19, 20, -1} },
-    { 16, 1, 0, 0, 0, 0x00, "Chest Game",{-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",        "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} },
 };
 
 boss_entry_t bosses[] = {
@@ -283,7 +284,7 @@ void draw_world_info(z64_disp_buf_t* db) {
                 gDPPipeSync(db->p++);
                 dungeon_entry_t dungeon = dungeons[i];
                 top += font_height + padding;
-                text_print_size(db, dungeon.name, left, top, font_width, font_height);
+                text_print_size(db, dungeon.short_name, left, top, font_width, font_height);
             }
 
             // Draw the list of dungeons interiors.
@@ -358,7 +359,7 @@ void draw_world_info(z64_disp_buf_t* db) {
                 gDPPipeSync(db->p++);
                 dungeon_entry_t dungeon = dungeons[i];
                 top += font_height + padding;
-                text_print_size(db, dungeon.name, left, top, font_width, font_height);
+                text_print_size(db, dungeon.short_name, left, top, font_width, font_height);
             }
             // List of bosses, located in CFG_BOSSES after the first list of 12 for the dpad left menu.
             for (uint8_t i = 0; i < rows - 1; i++) {
@@ -437,7 +438,7 @@ void draw_world_info(z64_disp_buf_t* db) {
                 }
                 dungeon_entry_t dungeon = dungeons[i];
                 top += font_height + padding;
-                text_print_size(db, dungeon.name, left, top, font_width, font_height);
+                text_print_size(db, dungeon.short_name, left, top, font_width, font_height);
             }
             // Draw the area each dungeon is located in.
             for (uint8_t i = 0; i < rows - 1; i++) {

ASM/build/bundle.o

@@ -13,7 +13,8 @@ typedef struct {
         uint8_t has_map : 1;
     };
     uint8_t skulltulas;
-    char name[11];
+    char short_name[11];
+    char name[22];
     uint8_t silver_rupee_puzzles_vanilla[4];
     uint8_t silver_rupee_puzzles_mq[4];
 } dungeon_entry_t;
@@ -25,7 +26,7 @@ typedef struct {
 } boss_entry_t;
 
 extern int dungeon_count;
-extern dungeon_entry_t dungeons[14];
+extern dungeon_entry_t dungeons[15];
 
 void draw_dungeon_info(z64_disp_buf_t* db);
 void draw_world_info(z64_disp_buf_t* db);

ASM/build/c_symbols.txt

@@ -187,6 +187,11 @@ bool Message_Decode_Additional_Control_Codes(uint8_t currChar, uint32_t* pDecode
                     break;
                 }
                 case 0x41B:
+                case 0x427: {
+                    // Ganon's Tower
+                    Message_AddString(msgCtx, pFont, pDecodedBufPos, pCharTexIdx, dungeons[12].name);
+                    break;
+                }
                 case 0x467:
                 case 0x534:
                 case 0x538:
@@ -195,8 +200,8 @@ bool Message_Decode_Additional_Control_Codes(uint8_t currChar, uint32_t* pDecode
                 case 0x544:
                 case 0x548:
                 case 0x54C: {
-                    // Ganon
-                    Message_AddString(msgCtx, pFont, pDecodedBufPos, pCharTexIdx, dungeons[12].name);
+                    // Ganon's Castle
+                    Message_AddString(msgCtx, pFont, pDecodedBufPos, pCharTexIdx, dungeons[13].name);
                     break;
                 }
                 default: {