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

Match sub_080A6C1C

This commit is contained in:
Tal Hayon 2022-04-03 09:15:15 +03:00
parent 53dd89e3b6
commit 2d54d7fa21
2 changed files with 20 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
asm/non_matching/subtask2/sub_080A6C1C.inc
View File

@ -1,45 +0,0 @@
.syntax unified
push {lr}
ldr r0, _080A6C34 @ =gFadeControl
ldrb r0, [r0]
cmp r0, #0
bne _080A6C6A
ldr r0, _080A6C38 @ =gMenu
ldrh r0, [r0, #8]
cmp r0, #0
beq _080A6C3C
cmp r0, #1
beq _080A6C5C
b _080A6C62
.align 2, 0
_080A6C34: .4byte gFadeControl
_080A6C38: .4byte gMenu
_080A6C3C:
bl sub_080A66D0
ldr r0, _080A6C58 @ =gInput
ldrh r0, [r0, #2]
cmp r0, #1
blt _080A6C6A
cmp r0, #2
ble _080A6C50
cmp r0, #8
bne _080A6C6A
_080A6C50:
bl Subtask_Exit
b _080A6C6A
.align 2, 0
_080A6C58: .4byte gInput
_080A6C5C:
ldr r0, _080A6C6C @ =0x00000103
bl SoundReq
_080A6C62:
ldr r1, _080A6C70 @ =gMenu
ldrh r0, [r1, #8]
subs r0, #1
strh r0, [r1, #8]
_080A6C6A:
pop {pc}
.align 2, 0
_080A6C6C: .4byte 0x00000103
_080A6C70: .4byte gMenu
.syntax divided

21
src/subtask2.c
View File

@ -467,7 +467,26 @@ void Subtask_LocalMapHint() {
ASM_FUNC("asm/non_matching/subtask2/sub_080A6B04.inc", void sub_080A6B04())
ASM_FUNC("asm/non_matching/subtask2/sub_080A6C1C.inc", void sub_080A6C1C())
void sub_080A6C1C(void) {
if (!gFadeControl.active) {
switch (gMenu.transitionTimer) {
case 0:
sub_080A66D0();
switch (gInput.newKeys) {
case 1:
case 2:
case 8:
Subtask_Exit();
break;
}
return;
case 1:
SoundReq(SFX_103);
break;
}
gMenu.transitionTimer--;
}
}
void Subtask_FastTravel(void) {
FlushSprites();