Skip to content

Commit c18e8f3

Browse files
committed
Prevent switching boots in the dungeon menu and fix small key counter
1 parent d31a289 commit c18e8f3

9 files changed

Lines changed: 34371 additions & 34292 deletions

File tree

ASM/build/asm_symbols.txt

Lines changed: 691 additions & 691 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ASM/build/bundle.o

304 Bytes
Binary file not shown.

ASM/build/c_symbols.txt

Lines changed: 674 additions & 674 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ASM/c/dpad.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ extern uint8_t CFG_CHILD_TRADE_SHUFFLE;
5858
(z64_file.game_mode == 0) && \
5959
((z64_event_state_1 & 0x20) == 0) && \
6060
(!CAN_DRAW_DUNGEON_INFO || !CFG_DPAD_DUNGEON_INFO_ENABLE) && \
61+
!CAN_DRAW_WORLD_INFO && \
6162
!(debug_menu_is_drawn()))
6263
// Not in pause menu
6364
// Ocarina in inventory

ASM/c/dungeon_info.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ void draw_world_info(z64_disp_buf_t* db) {
206206

207207
if (!mixed) {
208208

209-
if (z64_ctxt.input[0].pad_pressed.dl && show_dungeons) {
209+
if ((z64_ctxt.input[0].pad_pressed.dl || z64_ctxt.input[0].pad_pressed.a) && show_dungeons) {
210210
world_display = world_display ? false : true;
211211
boss_display = false;
212212
}

ASM/src/key_counter.asm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ move_key_icon:
33
addiu t8, $zero, 0x00BE
44

55
li s0, bk_display
6-
lw s0, 0x00 (s0)
6+
lb s0, 0x00 (s0)
77
beqz s0, @@return_icon
88
nop
99

@@ -18,7 +18,7 @@ move_key_counter:
1818
addiu t8, $zero, 0x00BE
1919

2020
li s0, bk_display
21-
lw s0, 0x00 (s0)
21+
lb s0, 0x00(s0)
2222
beqz s0, @@return_counter
2323
nop
2424

data/generated/patch_symbols.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)