Skip to content

Maps and Compasses give Dungeon and Boss locations #2453

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

Open
wants to merge 11 commits into
base: Dev
Choose a base branch
from
+44,716 −42,852
Open

Maps and Compasses give Dungeon and Boss locations #2453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bcab391
New menu to display dungeon ER and bosses
GSKirox Jul 20, 2025
a640005
Change alpha every line and fix the settings conditions
GSKirox Jul 21, 2025
03c5291
Accurate dungeons and bosses + compass usage
GSKirox Jul 31, 2025
620da09
mutiselect enhance map compass and change map textbox
GSKirox Aug 22, 2025
f6fe58b
Move new data into auto-tracker context
fenhl Aug 22, 2025
eb1f70d
Rework for mixed pools + map gives boss info
GSKirox Sep 7, 2025
57c8f7a
More mixed pools preparation, put menu on dpad and improve map textbox
GSKirox Sep 9, 2025
50086d9
Fix Messages errors and don't show dpad if setting is disabled
GSKirox Sep 15, 2025
cf3f975
Fix no map textbox update case and solve preset conflict on dev
GSKirox Sep 22, 2025
d31a289
Put boss info on compass instead
GSKirox Oct 5, 2025
c18e8f3
Prevent switching boots in the dungeon menu and fix small key counter
GSKirox Nov 13, 2025
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
2,899 changes: 1,456 additions & 1,443 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,343 changes: 677 additions & 666 deletions ASM/build/c_symbols.txt
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 16 additions & 1 deletion ASM/c/dpad.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ void draw_dpad_and_menu_utilities() {
}
sprite_draw(db, &dpad_sprite, 0, left_main_dpad, top_main_dpad, 16, 16);

// Menu dpad
// Menu dpad, items screen
if (CAN_DRAW_DUNGEON_INFO && CFG_DPAD_DUNGEON_INFO_ENABLE) {
// Zora sapphire on D-down
sprite_load(db, &stones_sprite, 2, 1);
Expand All @@ -192,6 +192,21 @@ void draw_dpad_and_menu_utilities() {
sprite_load(db, &quest_items_sprite, 16, 1);
sprite_draw(db, &quest_items_sprite, 0, left_main_dpad - 11, top_main_dpad + 2, 12, 12);

}
// Menu dpad, map screen
else if (CAN_DRAW_WORLD_INFO && CFG_DPAD_DUNGEON_INFO_ENABLE) {
bool shuffle_dungeons = CFG_DUNGEON_BOSS_INFO[0] > 0;
bool shuffle_bosses = CFG_DUNGEON_BOSS_INFO[0] > 0;
// map on D-left
if (shuffle_dungeons) {
sprite_load(db, &quest_items_sprite, 16, 1);
sprite_draw(db, &quest_items_sprite, 0, left_main_dpad - 11, top_main_dpad + 2, 12, 12);
}
// boss key on D-right
if (shuffle_bosses) {
sprite_load(db, &quest_items_sprite, 14, 1);
sprite_draw(db, &quest_items_sprite, 0, left_main_dpad + 14, top_main_dpad + 2, 12, 12);
}
} else { // Main game dpad
if (!CAN_USE_DPAD) {
gDPSetPrimColor(db->p++, 0, 0, 0xFF, 0xFF, 0xFF, alpha * 0x46 / 0xFF);
Expand Down
1 change: 1 addition & 0 deletions ASM/c/dpad.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ extern uint8_t CFG_CHILD_TRADE_SHUFFLE;
(z64_file.game_mode == 0) && \
((z64_event_state_1 & 0x20) == 0) && \
(!CAN_DRAW_DUNGEON_INFO || !CFG_DPAD_DUNGEON_INFO_ENABLE) && \
!CAN_DRAW_WORLD_INFO && \
!(debug_menu_is_drawn()))
// Not in pause menu
// Ocarina in inventory
Expand Down
Loading