falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match sub_080A65AC

This commit is contained in:
Tal Hayon 2022-04-06 12:06:20 +03:00
parent 5db4564087
commit efbd375eb4
2 changed files with 23 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
asm/non_matching/subtask2/sub_080A65AC.inc
View File

@ -1,47 +0,0 @@
.syntax unified
push {r4, lr}
ldr r0, _080A65E4 @ =gFadeControl
ldrb r0, [r0]
cmp r0, #0
bne _080A6600
ldr r4, _080A65E8 @ =gMenu
adds r1, r4, #0
adds r1, #0x2c
ldrb r0, [r1]
adds r0, #1
strb r0, [r1]
ldrh r0, [r4, #8]
cmp r0, #0
beq _080A65EC
cmp r0, #0x1e
bne _080A65DA
ldrh r0, [r4, #0x12]
strh r0, [r4, #0x10]
movs r0, #0x20
strb r0, [r1]
adds r0, #0xe3
bl SoundReq
_080A65DA:
ldrh r0, [r4, #8]
subs r0, #1
strh r0, [r4, #8]
b _080A6600
.align 2, 0
_080A65E4: .4byte gFadeControl
_080A65E8: .4byte gMenu
_080A65EC:
ldr r0, _080A6604 @ =gInput
ldrh r0, [r0, #2]
cmp r0, #1
blt _080A6600
cmp r0, #2
ble _080A65FC
cmp r0, #8
bne _080A6600
_080A65FC:
bl Subtask_Exit
_080A6600:
pop {r4, pc}
.align 2, 0
_080A6604: .4byte gInput
.syntax divided

24
src/subtask2.c
View File

@ -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);