Skip to content

Restore A alpha when debug warping during pause #2600

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
djevangelia wants to merge 1 commit into
base: Dev
Choose a base branch
from
Open

Restore A alpha when debug warping during pause #2600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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,530 changes: 765 additions & 765 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,490 changes: 745 additions & 745 deletions ASM/build/c_symbols.txt
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions ASM/c/debug.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,7 @@ void draw_debug_menu(z64_disp_buf_t* db) {

z64_game.scene_load_flag = 0x14;
z64_game.fadeout_transition = 0x02;
z64_file.buttonStatus[4] = 0; // Restore A alpha if in pause menu
show_warp_menu = 0;
}
}
Expand Down Expand Up @@ -550,6 +551,7 @@ void draw_debug_menu(z64_disp_buf_t* db) {
z64_file.respawn[RESPAWN_MODE_RETURN].roomIndex = room->room_index;
z64_file.respawn_flag = 2;
z64_game.scene_load_flag = 0x14;
z64_file.buttonStatus[4] = 0;
show_warp_menu = 0;
}
}
Expand All @@ -573,6 +575,7 @@ void draw_debug_menu(z64_disp_buf_t* db) {
z64_game.entrance_index = d->entrance_index;
z64_game.scene_load_flag = 0x14;
z64_game.fadeout_transition = 0x02;
z64_file.buttonStatus[4] = 0;
show_warp_menu = 0;
}
break;
Expand All @@ -595,6 +598,7 @@ void draw_debug_menu(z64_disp_buf_t* db) {
z64_game.entrance_index = d->entrance_index;
z64_game.scene_load_flag = 0x14;
z64_game.fadeout_transition = 0x02;
z64_file.buttonStatus[4] = 0;
show_warp_menu = 0;
}
break;
Expand Down
3 changes: 2 additions & 1 deletion ASM/c/z64.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,8 @@ typedef struct {
char unk_14_[0x000A]; /* 0x13D6 */
int8_t seq_index; /* 0x13E0 */
int8_t night_sfx; /* 0x13E1 */
char unk_15_[0x0012]; /* 0x13E2 */
uint8_t buttonStatus[5]; /* 0x13E2 */
char unk_15_[0x000D]; /* 0x13E7 */
uint16_t magic_meter_size; /* 0x13F4 */
char unk_16_[0x0004]; /* 0x13F6 */
uint16_t event_inf[4]; /* 0x13FA */
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
Loading