Skip to content

Commit 57c8f7a

Browse files
committed
More mixed pools preparation, put menu on dpad and improve map textbox
1 parent eb1f70d commit 57c8f7a

9 files changed

Lines changed: 32497 additions & 8392 deletions

File tree

ASM/c/dpad.c

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ void draw_dpad_and_menu_utilities() {
178178
}
179179
sprite_draw(db, &dpad_sprite, 0, left_main_dpad, top_main_dpad, 16, 16);
180180

181-
// Menu dpad
181+
// Menu dpad, items screen
182182
if (CAN_DRAW_DUNGEON_INFO && CFG_DPAD_DUNGEON_INFO_ENABLE) {
183183
// Zora sapphire on D-down
184184
sprite_load(db, &stones_sprite, 2, 1);
@@ -192,6 +192,22 @@ void draw_dpad_and_menu_utilities() {
192192
sprite_load(db, &quest_items_sprite, 16, 1);
193193
sprite_draw(db, &quest_items_sprite, 0, left_main_dpad - 11, top_main_dpad + 2, 12, 12);
194194

195+
}
196+
// Menu dpad, map screen
197+
else if (CAN_DRAW_WORLD_INFO && CFG_DPAD_DUNGEON_INFO_ENABLE) {
198+
bool mixed_dungeons = CFG_DUNGEON_BOSS_INFO[0] > 1;
199+
bool mixed_bosses = CFG_DUNGEON_BOSS_INFO[0] > 1;
200+
bool mixed = mixed_dungeons || mixed_bosses;
201+
if (mixed) {
202+
// boss key on D-right
203+
sprite_load(db, &quest_items_sprite, 14, 1);
204+
sprite_draw(db, &quest_items_sprite, 0, left_main_dpad + 14, top_main_dpad + 2, 12, 12);
205+
}
206+
207+
// map on D-left
208+
sprite_load(db, &quest_items_sprite, 16, 1);
209+
sprite_draw(db, &quest_items_sprite, 0, left_main_dpad - 11, top_main_dpad + 2, 12, 12);
210+
195211
} else { // Main game dpad
196212
if (!CAN_USE_DPAD) {
197213
gDPSetPrimColor(db->p++, 0, 0, 0xFF, 0xFF, 0xFF, alpha * 0x46 / 0xFF);

0 commit comments

Comments
 (0)