Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fenhl merged 2 commits into from
Feb 3, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41fc234
add tower to dungeon_entry_t
jdunn596 Jan 9, 2026
acf5c68
adjust pause menu info
jdunn596 Jan 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,458 changes: 729 additions & 729 deletions ASM/build/asm_symbols.txt
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified ASM/build/bundle.o
View file
Open in desktop
Binary file not shown.
1,424 changes: 712 additions & 712 deletions ASM/build/c_symbols.txt
View file
Open in desktop

Large diffs are not rendered by default.

132 changes: 85 additions & 47 deletions ASM/c/dungeon_info.c
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions ASM/c/dungeon_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
9 changes: 7 additions & 2 deletions ASM/c/message.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion data/generated/patch_symbols.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading