summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTal Hayon <talhayon1@gmail.com>2022-04-06 12:06:20 +0300
committerTal Hayon <talhayon1@gmail.com>2022-04-06 12:06:20 +0300
commitefbd375eb48572090bb543d54f56ba83ca2b6792 (patch)
treee8925456ea451c45baf0d1ee97089fe450225056 /src
parent5db4564087109ad55c8cd85fee330d96a2ef43b4 (diff)
Match sub_080A65AC
Diffstat (limited to 'src')
-rw-r--r--src/subtask2.c24
1 files changed, 23 insertions, 1 deletions
diff --git a/src/subtask2.c b/src/subtask2.c
index e21f5720..11ac02be 100644
--- a/src/subtask2.c
+++ b/src/subtask2.c
@@ -504,7 +504,29 @@ void sub_080A6534(void) {
SetFade(4, 8);
}
-ASM_FUNC("asm/non_matching/subtask2/sub_080A65AC.inc", void sub_080A65AC())
+void sub_080A65AC(void) {
+ if (!gFadeControl.active) {
+ gGenericMenu.unk2c++;
+ switch (gMenu.transitionTimer) {
+ case 0x1e:
+ gGenericMenu.unk10.h[0] = gGenericMenu.unk10.h[1];
+ gGenericMenu.unk2c = 0x20;
+ SoundReq(SFX_103);
+ default:
+ gMenu.transitionTimer--;
+ break;
+ case 0:
+ switch (gInput.newKeys) {
+ case A_BUTTON:
+ case B_BUTTON:
+ case START_BUTTON:
+ Subtask_Exit();
+ break;
+ }
+ break;
+ }
+ }
+}
void sub_080A6608(void) {
extern void (*const gUnk_08128E78[])(void);