Merge "Change Farore's Wind Text to Display Full Dungeon Names (inc Tower)" (#2518)

# Conflicts:
#	ASM/build/asm_symbols.txt
#	ASM/build/bundle.o
#	ASM/build/c_symbols.txt
#	data/generated/patch_symbols.json
#	data/generated/rom_patch.txt
#	data/generated/symbols.json

Author: fenhl

ASM/build/asm_symbols.txt

@@ -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/bundle.o

@@ -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: {

ASM/build/c_symbols.txt

@@ -4,6 +4,7 @@
 * New hint distribution field `boss_goal_names` can be set to `false` to force dungeon reward names to be used for goal text instead of boss names even if dungeon rewards are on bosses.
 * The `Free Reward from Rauru` has a new `Yes (Forced)` option which forces the check to be a dungeon reward even if these are otherwise shuffled.
 * The `Maps & Compasses` shuffle setting has been split into separate `Maps` and `Compasses` settings.
+* The Farore's Wind text box now distinguishes between Ganon's Castle and Ganon's Tower.
 
 ## Bug fixes
 * Fix a potential softlock when talking to Pierre (the upper scarecrow) as child in Lake Hylia.