Skip to content

Commit 6aeb13a

Browse files
committed
Merge 'Go back to file select screen after entering the correct password instead of file information screen' (#2479)
2 parents a038a87 + 71654c8 commit 6aeb13a

9 files changed

Lines changed: 26120 additions & 26113 deletions

File tree

ASM/build/asm_symbols.txt

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

ASM/build/bundle.o

16 Bytes
Binary file not shown.

ASM/build/c_symbols.txt

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

ASM/c/file_select.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,8 @@ void manage_password(z64_disp_buf_t* db, z64_menudata_t* menu_data) {
179179
extended->password[i] = buffer_password[i];
180180
}
181181
Sram_WriteSave(NULL, file);
182+
// Go back to main file select to avoid starting the game by error.
183+
menu_data->menu_transition++;
182184
return;
183185
} else {
184186
if (z64_game.common.input[0].pad_pressed.a) {

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
* It is no longer required to have either the goron tunic or the Fewer Tunic Requirements trick for adult to go from the Bolero warp pad to the Fire temple in logic.
3131
* Further shortening of version number in file select screen.
3232
* Areas which have all locations hinted will not be selected for important checks hints.
33+
* Successfully entering a password will now take you back to the file select screen.
3334

3435
# 9.0
3536

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)