mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-06 18:03:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #492 from hatal175/subtask6

Browse Source
This commit is contained in:
notyourav
2022-04-14 09:33:39 -07:00
committed by GitHub
parent 57886f751b 518522239b
commit 20b9d87d00
13 changed files with 486 additions and 1901 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matching/subtask2/Subtask_FadeOut.inc
-117
View File
@@ -1,117 +0,0 @@
.syntax unified
push {r4, r5, lr}
ldr r0, _080A7468 @ =gFadeControl
ldrb r0, [r0]
cmp r0, #0
beq _080A73B4
b _080A74BC
_080A73B4:
bl DeleteAllEntities
bl sub_0805E974
ldr r1, _080A746C @ =gCurrentRoomProperties
ldr r5, _080A7470 @ =gUI
ldr r0, [r5, #0x10]
str r0, [r1]
ldr r0, _080A7474 @ =gPlayerState
ldrb r1, [r5, #0xc]
adds r0, #0x8b
strb r1, [r0]
ldr r1, _080A7478 @ =gMapBottom
ldr r0, [r5, #0x14]
str r0, [r1]
ldr r1, _080A747C @ =gMapTop
ldr r0, [r5, #0x18]
str r0, [r1]
movs r1, #0xea
lsls r1, r1, #2
adds r0, r5, r1
ldr r1, _080A7480 @ =gActiveScriptInfo
movs r2, #0xc
bl MemCopy
movs r1, #0xaa
lsls r1, r1, #2
adds r0, r5, r1
ldr r1, _080A7484 @ =gUnk_03000420
movs r2, #0x80
lsls r2, r2, #1
bl MemCopy
movs r1, #0x9a
lsls r1, r1, #2
adds r0, r5, r1
ldr r1, _080A7488 @ =gPaletteList
movs r2, #0x40
bl MemCopy
adds r0, r5, #0
adds r0, #0x54
ldr r1, _080A748C @ =gGFXSlots
movs r2, #0x85
lsls r2, r2, #2
bl MemCopy
adds r0, r5, #0
adds r0, #0x1c
ldr r4, _080A7490 @ =gRoomControls
adds r1, r4, #0
movs r2, #0x38
bl MemCopy
ldr r0, _080A7494 @ =gUnk_03001020
ldr r1, _080A7498 @ =gScreen
movs r2, #0x7c
bl MemCopy
ldrb r0, [r4, #4]
bl GetFlagBankOffset
ldr r4, _080A749C @ =gArea
strh r0, [r4, #4]
bl GetCurrentRoomInfo
ldr r1, _080A74A0 @ =0x0000085C
adds r4, r4, r1
str r0, [r4]
ldrb r0, [r5, #6]
bl RestoreGameTask
ldrb r1, [r5, #0xd]
rsbs r0, r1, #0
orrs r0, r1
lsrs r0, r0, #0x1f
bl sub_0801D000
bl sub_080A74F4
ldrh r1, [r5, #8]
ldr r0, _080A74A4 @ =0x0000FFFF
cmp r1, r0
beq _080A74A8
adds r0, r1, #0
ldrh r1, [r5, #0xa]
bl SetFade
b _080A74AE
.align 2, 0
_080A7468: .4byte gFadeControl
_080A746C: .4byte gCurrentRoomProperties
_080A7470: .4byte gUI
_080A7474: .4byte gPlayerState
_080A7478: .4byte gMapBottom
_080A747C: .4byte gMapTop
_080A7480: .4byte gActiveScriptInfo
_080A7484: .4byte gUnk_03000420
_080A7488: .4byte gPaletteList
_080A748C: .4byte gGFXSlots
_080A7490: .4byte gRoomControls
_080A7494: .4byte gUnk_03001020
_080A7498: .4byte gScreen
_080A749C: .4byte gArea
_080A74A0: .4byte 0x0000085C
_080A74A4: .4byte 0x0000FFFF
_080A74A8:
ldrh r0, [r5, #0xa]
bl SetFadeInverted
_080A74AE:
ldr r1, _080A74C0 @ =gUI
movs r2, #0
movs r0, #4
strb r0, [r1]
ldr r0, _080A74C4 @ =gRoomTransition
adds r0, #0x30
strb r2, [r0]
_080A74BC:
pop {r4, r5, pc}
.align 2, 0
_080A74C0: .4byte gUI
_080A74C4: .4byte gRoomTransition
.syntax divided
asm/non_matching/subtask2/sub_080A56A0.inc
-236
View File
@@ -1,236 +0,0 @@
.syntax unified
push {r4, lr}
bl sub_080A51F4
cmp r0, #0
bne _080A56AC
b _080A57F0
_080A56AC:
ldr r2, _080A56D0 @ =gMenu
ldr r0, _080A56D4 @ =gUnk_08128C00
str r0, [r2, #0xc]
ldrb r0, [r2, #3]
lsls r0, r0, #3
ldr r1, _080A56D8 @ =gUnk_08128C14
adds r4, r0, r1
movs r3, #0xff
ldr r0, _080A56DC @ =gInput
ldrh r1, [r0, #4]
cmp r1, #0x20
beq _080A56F2
cmp r1, #0x20
bgt _080A56E0
cmp r1, #0x10
beq _080A56F6
b _080A56F8
.align 2, 0
_080A56D0: .4byte gMenu
_080A56D4: .4byte gUnk_08128C00
_080A56D8: .4byte gUnk_08128C14
_080A56DC: .4byte gInput
_080A56E0:
cmp r1, #0x40
beq _080A56EA
cmp r1, #0x80
beq _080A56EE
b _080A56F8
_080A56EA:
ldrb r3, [r4]
b _080A56F8
_080A56EE:
ldrb r3, [r4, #1]
b _080A56F8
_080A56F2:
ldrb r3, [r4, #2]
b _080A56F8
_080A56F6:
ldrb r3, [r4, #3]
_080A56F8:
cmp r3, #0xff
beq _080A570C
ldr r0, _080A5708 @ =gMenu
strb r3, [r0, #3]
movs r0, #0x69
bl SoundReq
b _080A575E
.align 2, 0
_080A5708: .4byte gMenu
_080A570C:
ldrh r0, [r0, #2]
cmp r0, #1
bne _080A575E
ldrb r3, [r2, #3]
.ifdef DEMO_USA
movs r4, #0
.else
.ifdef DEMO_JP
movs r4, #0
.else
movs r1, #0
.endif
.endif
cmp r3, #2
beq _080A572E
cmp r3, #2
bhi _080A5724
cmp r3, #0
beq _080A572E
b _080A574E
_080A5724:
cmp r3, #4
beq _080A5748
cmp r3, #5
beq _080A574C
b _080A574E
_080A572E:
ldr r0, _080A5744 @ =gMenu
adds r0, #0x10
adds r0, r3, r0
ldrb r0, [r0]
cmp r0, #0
beq _080A574E
.ifdef DEMO_USA
movs r4, #8
.else
.ifdef DEMO_JP
movs r4, #8
.else
movs r1, #8
.endif
.endif
cmp r3, #0
bne _080A574E
.ifdef DEMO_USA
movs r4, #7
.else
.ifdef DEMO_JP
movs r4, #7
.else
movs r1, #7
.endif
.endif
b _080A5752
.align 2, 0
_080A5744: .4byte gMenu
_080A5748:
.ifdef DEMO_USA
movs r0, #0x6d
bl SoundReq
b _080A574E
_080A574C:
movs r0, #0x6d
bl SoundReq
.else
.ifdef DEMO_JP
movs r0, #0x6d
bl SoundReq
b _080A574E
_080A574C:
movs r0, #0x6d
bl SoundReq
.else
movs r1, #9
b _080A5752
_080A574C:
movs r1, #0xa
.endif
.endif
_080A574E:
.ifdef DEMO_USA
cmp r4, #0
.else
.ifdef DEMO_JP
cmp r4, #0
.else
cmp r1, #0
.endif
.endif
beq _080A575E
_080A5752:
.ifdef DEMO_USA
adds r0, r4, #0
.else
.ifdef DEMO_JP
adds r0, r4, #0
.else
adds r0, r1, #0
.endif
.endif
bl sub_080A4E84
movs r0, #0x6a
bl SoundReq
_080A575E:
ldr r0, _080A5780 @ =gMenu
ldrb r1, [r0, #3]
adds r2, r0, #0
cmp r1, #0
beq _080A576C
cmp r1, #2
bne _080A5788
_080A576C:
adds r0, r2, #0
adds r0, #0x10
adds r0, r1, r0
ldrb r0, [r0]
cmp r0, #0
beq _080A5788
ldr r1, _080A5784 @ =gUnk_0200AF00
movs r0, #0x10
b _080A578C
.align 2, 0
_080A5780: .4byte gMenu
_080A5784: .4byte gUnk_0200AF00
_080A5788:
ldr r1, _080A57AC @ =gUnk_0200AF00
ldr r0, _080A57B0 @ =0x0000FFF0
_080A578C:
strh r0, [r1, #0x1c]
ldrb r3, [r2, #3]
adds r0, r2, #0
adds r0, #0x10
adds r0, r3, r0
ldrb r2, [r0]
cmp r2, #0
beq _080A57E6
cmp r3, #5
bhi _080A57E6
lsls r0, r3, #2
ldr r1, _080A57B4 @ =_080A57B8
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080A57AC: .4byte gUnk_0200AF00
_080A57B0: .4byte 0x0000FFF0
_080A57B4: .4byte _080A57B8
_080A57B8: @ jump table
.4byte _080A57D0 @ case 0
.4byte _080A57D8 @ case 1
.4byte _080A57DC @ case 2
.4byte _080A57E6 @ case 3
.4byte _080A57E0 @ case 4
.4byte _080A57E4 @ case 5
_080A57D0:
cmp r2, #0x3d
beq _080A57E6
movs r2, #0x67
b _080A57E6
_080A57D8:
movs r2, #0x63
b _080A57E6
_080A57DC:
movs r2, #0x70
b _080A57E6
_080A57E0:
movs r2, #0x74
b _080A57E6
_080A57E4:
movs r2, #0x73
_080A57E6:
movs r0, #0x80
lsls r0, r0, #3
adds r0, r2, r0
bl sub_080A6F6C
_080A57F0:
pop {r4, pc}
.align 2, 0
.syntax divided
asm/non_matching/subtask2/sub_080A57F4.inc
-411
View File
@@ -1,411 +0,0 @@
.syntax unified
.ifdef EU
push {r4, r5, r6, r7, lr}
mov r7, sb
mov r6, r8
push {r6, r7}
ldr r2, _080A50A8 @ =gOamCmd
movs r1, #0
movs r0, #0x80
lsls r0, r0, #3
strh r0, [r2, #4]
strh r1, [r2, #6]
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #7]
ldr r1, _080A50AC @ =gUnk_08128C94
mov sb, r1
cmp r0, #0
bne _080A502E
ldr r3, _080A50B0 @ =gUnk_08128C14
mov sb, r3
_080A502E:
ldr r0, _080A50B4 @ =gMenu
ldrb r0, [r0, #3]
lsls r0, r0, #3
mov r1, sb
adds r3, r1, r0
movs r0, #0x80
lsls r0, r0, #4
strh r0, [r2, #8]
ldrb r0, [r3, #6]
strh r0, [r2]
ldrb r0, [r3, #7]
strh r0, [r2, #2]
ldrb r2, [r3, #4]
ldr r0, _080A50B8 @ =gMain
ldrh r1, [r0, #0xc]
movs r0, #0x10
ands r0, r1
adds r1, r2, #0
adds r1, #0xa
cmp r0, #0
bne _080A505A
adds r1, #1
_080A505A:
movs r0, #0xfd
lsls r0, r0, #1
bl DrawDirect
movs r3, #0
mov r8, r3
mov r7, sb
adds r7, #5
_080A506A:
ldr r0, _080A50B4 @ =gMenu
adds r0, #0x10
mov r1, r8
adds r6, r1, r0
ldrb r1, [r6]
cmp r1, #0
beq _080A50FA
mov r3, r8
lsls r5, r3, #3
mov r0, sb
adds r3, r0, r5
ldr r4, _080A50A8 @ =gOamCmd
ldrb r0, [r7, #1]
strh r0, [r4]
ldrb r2, [r7, #2]
strh r2, [r4, #2]
movs r0, #0xe8
lsls r0, r0, #8
strh r0, [r4, #8]
cmp r1, #0x33
bhi _080A50CA
mov r1, r8
cmp r1, #2
bne _080A50BC
ldrb r0, [r7]
adds r1, r0, #0
adds r1, #0xa
movs r0, #0xfd
lsls r0, r0, #1
b _080A50F6
.align 2, 0
_080A50A8: .4byte gOamCmd
_080A50AC: .4byte gUnk_08128C94
_080A50B0: .4byte gUnk_08128C14
_080A50B4: .4byte gMenu
_080A50B8: .4byte gMain
_080A50BC:
ldrb r0, [r6]
adds r0, #9
ldrb r3, [r3, #5]
adds r1, r0, r3
movs r0, #0xfd
lsls r0, r0, #1
b _080A50F6
_080A50CA:
ldr r3, _080A50E0 @ =0x0000EB80
adds r0, r5, r3
strh r0, [r4, #8]
cmp r1, #0x3d
beq _080A50E4
cmp r1, #0x3e
bne _080A50EA
adds r0, r2, #0
adds r0, #8
b _080A50E8
.align 2, 0
_080A50E0: .4byte 0x0000EB80
_080A50E4:
adds r0, r2, #0
adds r0, #0xd
_080A50E8:
strh r0, [r4, #2]
_080A50EA:
ldr r0, _080A5190 @ =gSpriteAnimations_322
lsls r1, r1, #2
adds r1, r1, r0
ldr r0, [r1]
ldrb r1, [r0]
ldr r0, _080A5194 @ =0x00000141
_080A50F6:
bl DrawDirect
_080A50FA:
adds r7, #8
movs r0, #1
add r8, r0
mov r1, r8
cmp r1, #0xf
bls _080A506A
ldr r4, _080A5198 @ =gMenu
ldrb r0, [r4, #0x12]
cmp r0, #0
beq _080A5132
ldr r2, _080A519C @ =gOamCmd
movs r3, #0x80
lsls r3, r3, #4
adds r1, r3, #0
adds r0, r0, r1
strh r0, [r2, #8]
mov r3, sb
adds r3, #0x10
ldrb r0, [r3, #6]
adds r0, #9
strh r0, [r2]
ldrb r0, [r3, #7]
adds r0, #7
strh r0, [r2, #2]
movs r0, #0
movs r1, #1
bl DrawDirect
_080A5132:
ldrb r0, [r4, #0x13]
cmp r0, #0x3f
bne _080A5188
mov r3, sb
adds r3, #0x18
ldr r1, _080A519C @ =gOamCmd
ldrb r0, [r3, #6]
adds r0, #8
strh r0, [r1]
ldrb r0, [r3, #7]
adds r0, #8
strh r0, [r1, #2]
ldr r0, _080A51A0 @ =gSave
adds r0, #0xc2
ldrh r4, [r0]
movs r0, #0
mov r8, r0
adds r5, r1, #0
_080A5156:
adds r0, r4, #0
movs r1, #0xa
bl __modsi3
movs r1, #0x80
lsls r1, r1, #4
adds r0, r0, r1
strh r0, [r5, #8]
movs r0, #0
movs r1, #1
bl DrawDirect
adds r0, r4, #0
movs r1, #0xa
bl __divsi3
adds r4, r0, #0
ldrh r0, [r5]
subs r0, #8
strh r0, [r5]
movs r3, #1
add r8, r3
mov r0, r8
cmp r0, #2
bls _080A5156
_080A5188:
pop {r3, r4}
mov r8, r3
mov sb, r4
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A5190: .4byte gSpriteAnimations_322
_080A5194: .4byte 0x00000141
_080A5198: .4byte gMenu
_080A519C: .4byte gOamCmd
_080A51A0: .4byte gSave
.else
push {r4, r5, r6, r7, lr}
mov r7, sb
mov r6, r8
push {r6, r7}
ldr r2, _080A5890 @ =gOamCmd
movs r1, #0
movs r0, #0x80
lsls r0, r0, #3
strh r0, [r2, #4]
strh r1, [r2, #6]
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #7]
ldr r1, _080A5894 @ =gUnk_08128C94
mov sb, r1
cmp r0, #0
bne _080A581A
ldr r3, _080A5898 @ =gUnk_08128C14
mov sb, r3
_080A581A:
ldr r0, _080A589C @ =gMenu
ldrb r0, [r0, #3]
lsls r0, r0, #3
mov r1, sb
adds r3, r1, r0
movs r0, #0x80
lsls r0, r0, #4
strh r0, [r2, #8]
ldrb r0, [r3, #6]
strh r0, [r2]
ldrb r0, [r3, #7]
strh r0, [r2, #2]
ldrb r2, [r3, #4]
ldr r0, _080A58A0 @ =gMain
ldrh r1, [r0, #0xc]
movs r0, #0x10
ands r0, r1
adds r1, r2, #0
adds r1, #0xa
cmp r0, #0
bne _080A5846
adds r1, #1
_080A5846:
ldr r0, _080A58A4 @ =0x000001FB
bl DrawDirect
movs r3, #0
mov r8, r3
mov r7, sb
adds r7, #5
_080A5854:
ldr r0, _080A589C @ =gMenu
adds r0, #0x10
mov r1, r8
adds r6, r1, r0
ldrb r1, [r6]
cmp r1, #0
beq _080A58E8
mov r3, r8
lsls r5, r3, #3
mov r0, sb
adds r3, r0, r5
ldr r4, _080A5890 @ =gOamCmd
ldrb r0, [r7, #1]
strh r0, [r4]
ldrb r2, [r7, #2]
strh r2, [r4, #2]
movs r0, #0xe8
lsls r0, r0, #8
strh r0, [r4, #8]
cmp r1, #0x33
bhi _080A58B8
mov r1, r8
cmp r1, #2
bne _080A58A8
ldrb r0, [r7]
adds r1, r0, #0
adds r1, #0xa
ldr r0, _080A58A4 @ =0x000001FB
b _080A58E4
.align 2, 0
_080A5890: .4byte gOamCmd
_080A5894: .4byte gUnk_08128C94
_080A5898: .4byte gUnk_08128C14
_080A589C: .4byte gMenu
_080A58A0: .4byte gMain
_080A58A4: .4byte 0x000001FB
_080A58A8:
ldrb r0, [r6]
adds r0, #9
ldrb r3, [r3, #5]
adds r1, r0, r3
ldr r0, _080A58B4 @ =0x000001FB
b _080A58E4
.align 2, 0
_080A58B4: .4byte 0x000001FB
_080A58B8:
ldr r3, _080A58CC @ =0x0000EB80
adds r0, r5, r3
strh r0, [r4, #8]
cmp r1, #0x3d
beq _080A58D0
cmp r1, #0x3e
bne _080A58D6
adds r0, r2, #0
adds r0, #8
b _080A58D4
.align 2, 0
_080A58CC: .4byte 0x0000EB80
_080A58D0:
adds r0, r2, #0
adds r0, #0xd
_080A58D4:
strh r0, [r4, #2]
_080A58D6:
ldr r0, _080A5980 @ =gSpriteAnimations_322
lsls r1, r1, #2
adds r1, r1, r0
ldr r0, [r1]
ldrb r1, [r0]
movs r0, #0xa1
lsls r0, r0, #1
_080A58E4:
bl DrawDirect
_080A58E8:
adds r7, #8
movs r0, #1
add r8, r0
mov r1, r8
cmp r1, #0xf
bls _080A5854
ldr r4, _080A5984 @ =gMenu
ldrb r0, [r4, #0x12]
cmp r0, #0
beq _080A5920
ldr r2, _080A5988 @ =gOamCmd
movs r3, #0x80
lsls r3, r3, #4
adds r1, r3, #0
adds r0, r0, r1
strh r0, [r2, #8]
mov r3, sb
adds r3, #0x10
ldrb r0, [r3, #6]
adds r0, #9
strh r0, [r2]
ldrb r0, [r3, #7]
adds r0, #7
strh r0, [r2, #2]
movs r0, #0
movs r1, #1
bl DrawDirect
_080A5920:
ldrb r0, [r4, #0x13]
cmp r0, #0x3f
bne _080A5976
mov r3, sb
adds r3, #0x18
ldr r1, _080A5988 @ =gOamCmd
ldrb r0, [r3, #6]
adds r0, #8
strh r0, [r1]
ldrb r0, [r3, #7]
adds r0, #8
strh r0, [r1, #2]
ldr r0, _080A598C @ =gSave
adds r0, #0xc2
ldrh r4, [r0]
movs r0, #0
mov r8, r0
adds r5, r1, #0
_080A5944:
adds r0, r4, #0
movs r1, #0xa
bl __modsi3
movs r1, #0x80
lsls r1, r1, #4
adds r0, r0, r1
strh r0, [r5, #8]
movs r0, #0
movs r1, #1
bl DrawDirect
adds r0, r4, #0
movs r1, #0xa
bl __divsi3
adds r4, r0, #0
ldrh r0, [r5]
subs r0, #8
strh r0, [r5]
movs r3, #1
add r8, r3
mov r0, r8
cmp r0, #2
bls _080A5944
_080A5976:
pop {r3, r4}
mov r8, r3
mov sb, r4
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A5980: .4byte gSpriteAnimations_322
_080A5984: .4byte gMenu
_080A5988: .4byte gOamCmd
_080A598C: .4byte gSave
.endif
.syntax divided
asm/non_matching/subtask2/sub_080A5D1C.inc
-513
View File
@@ -1,513 +0,0 @@
.syntax unified
.ifdef EU
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
mov r5, r8
push {r5, r6, r7}
ldr r0, _080A5690 @ =gArea
ldrb r0, [r0, #3]
lsls r0, r0, #2
ldr r1, _080A5694 @ =gUnk_080C9C6C
adds r7, r0, r1
ldr r1, _080A5698EU @ =gUnk_08128D3C
ldrb r0, [r7]
adds r0, r0, r1
ldrb r6, [r0]
bl sub_0801DB94
mov r8, r0
ldr r5, _080A569CEU @ =gOamCmd
movs r0, #0x80
lsls r0, r0, #3
strh r0, [r5, #4]
movs r0, #0
strh r0, [r5, #6]
strh r0, [r5, #8]
movs r0, #0x34
strh r0, [r5]
ldr r0, _080A56A0 @ =gMenu
ldrb r1, [r0, #3]
lsls r0, r1, #1
adds r0, r0, r1
lsls r0, r0, #2
adds r0, r6, r0
strh r0, [r5, #2]
ldr r1, _080A56A4 @ =gMain
mov sl, r1
ldrh r1, [r1, #0xc]
movs r0, #0x10
ands r0, r1
movs r1, #0x74
cmp r0, #0
bne _080A5560
movs r1, #0x75
_080A5560:
movs r0, #0xfd
lsls r0, r0, #1
bl DrawDirect
movs r0, #0x20
mov sb, r0
mov r1, sb
strh r1, [r5]
mov r1, r8
lsls r0, r1, #1
add r0, r8
lsls r0, r0, #2
adds r0, r6, r0
strh r0, [r5, #2]
mov r0, sl
ldrh r1, [r0, #0xc]
mov r0, sb
ands r0, r1
movs r1, #0x79
cmp r0, #0
beq _080A558C
movs r1, #0x78
_080A558C:
movs r0, #0xfd
lsls r0, r0, #1
bl DrawDirect
movs r0, #0x7e
strh r0, [r5, #2]
movs r0, #0x87
lsls r0, r0, #7
strh r0, [r5, #8]
bl HasDungeonSmallKey
cmp r0, #0
beq _080A55BE
movs r0, #0x18
strh r0, [r5]
ldr r0, _080A56A8 @ =gSpriteAnimations_322
movs r1, #0xa0
lsls r1, r1, #1
adds r0, r0, r1
ldr r0, [r0]
ldrb r4, [r0]
ldr r0, _080A56ACEU @ =0x00000143
adds r1, r4, #0
bl DrawDirect
_080A55BE:
bl HasDungeonCompass
cmp r0, #0
beq _080A55DE
movs r0, #0x2e
strh r0, [r5]
ldr r0, _080A56A8 @ =gSpriteAnimations_322
movs r1, #0xa4
lsls r1, r1, #1
adds r0, r0, r1
ldr r0, [r0]
ldrb r4, [r0]
ldr r0, _080A56ACEU @ =0x00000143
adds r1, r4, #0
bl DrawDirect
_080A55DE:
bl HasDungeonBigKey
cmp r0, #0
beq _080A563CEU
movs r0, #0x45
strh r0, [r5]
movs r0, #0xe0
lsls r0, r0, #2
strh r0, [r5, #8]
ldr r0, _080A56A8 @ =gSpriteAnimations_322
movs r1, #0xa2
lsls r1, r1, #1
adds r0, r0, r1
ldr r0, [r0]
ldrb r4, [r0]
ldr r0, _080A56ACEU @ =0x00000143
adds r1, r4, #0
bl DrawDirect
bl sub_080A5F24
cmp r0, #0
beq _080A563CEU
movs r0, #0
strh r0, [r5, #8]
movs r0, #0x46
strh r0, [r5]
ldrb r1, [r7, #1]
ldrb r0, [r7, #2]
subs r1, r1, r0
lsls r0, r1, #1
adds r0, r0, r1
lsls r0, r0, #2
adds r0, r6, r0
strh r0, [r5, #2]
mov r0, sl
ldrh r1, [r0, #0xc]
mov r0, sb
ands r0, r1
movs r1, #0x7b
cmp r0, #0
beq _080A5634EU
movs r1, #0x7a
_080A5634EU:
movs r0, #0xfd
lsls r0, r0, #1
bl DrawDirect
_080A563CEU:
ldr r1, _080A569CEU @ =gOamCmd
movs r0, #0
strh r0, [r1, #8]
movs r0, #0x34
strh r0, [r1]
strh r6, [r1, #2]
ldrb r0, [r7, #1]
adds r4, r0, #0
adds r4, #0x82
movs r5, #0
ldrb r0, [r7]
cmp r5, r0
bhs _080A5672
adds r6, r1, #0
_080A5658:
movs r0, #0xfd
lsls r0, r0, #1
adds r1, r4, #0
bl DrawDirect
subs r4, #1
ldrh r0, [r6, #2]
adds r0, #0xc
strh r0, [r6, #2]
adds r5, #1
ldrb r1, [r7]
cmp r5, r1
blo _080A5658
_080A5672:
ldr r5, _080A56B0 @ =gMapDataBottomSpecial
ldrb r0, [r5]
cmp r0, #0
beq _080A570E
ldr r7, _080A569CEU @ =gOamCmd
ldr r6, _080A56B4 @ =gScreen
_080A567E:
ldrb r0, [r5]
cmp r0, #2
beq _080A56D4EU
cmp r0, #2
bgt _080A56B8
cmp r0, #1
beq _080A56C2
b _080A56E6
.align 2, 0
_080A5690: .4byte gArea
_080A5694: .4byte gUnk_080C9C6C
_080A5698EU: .4byte gUnk_08128D3C
_080A569CEU: .4byte gOamCmd
_080A56A0: .4byte gMenu
_080A56A4: .4byte gMain
_080A56A8: .4byte gSpriteAnimations_322
_080A56ACEU: .4byte 0x00000143
_080A56B0: .4byte gMapDataBottomSpecial
_080A56B4: .4byte gScreen
_080A56B8:
cmp r0, #3
beq _080A56D8EU
cmp r0, #4
beq _080A56DCEU
b _080A56E6
_080A56C2:
movs r4, #0x7d
ldr r0, _080A56D0EU @ =gMenu
ldrb r0, [r0, #3]
cmp r8, r0
beq _080A56E8
movs r4, #0x7e
b _080A56E8
.align 2, 0
_080A56D0EU: .4byte gMenu
_080A56D4EU:
movs r4, #0x80
b _080A56E8
_080A56D8EU:
movs r4, #0x81
b _080A56E8
_080A56DCEU:
bl sub_080A5F24
movs r4, #0x7f
cmp r0, #0
bne _080A56E8
_080A56E6:
movs r4, #0xff
_080A56E8:
ldrb r0, [r5, #1]
adds r0, #0x50
ldrh r1, [r6, #0x16]
subs r0, r0, r1
strh r0, [r7]
ldrb r0, [r5, #2]
adds r0, #0x10
ldrh r1, [r6, #0x18]
subs r0, r0, r1
strh r0, [r7, #2]
movs r0, #0xfd
lsls r0, r0, #1
adds r1, r4, #0
bl DrawDirect
adds r5, #3
ldrb r0, [r5]
cmp r0, #0
bne _080A567E
_080A570E:
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
mov sl, r5
pop {r4, r5, r6, r7, pc}
.else
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
mov r5, r8
push {r5, r6, r7}
ldr r0, _080A5E98 @ =gArea
ldrb r0, [r0, #3]
lsls r0, r0, #2
ldr r1, _080A5E9C @ =gUnk_080C9C6C
adds r7, r0, r1
ldr r1, _080A5EA0 @ =gUnk_08128D3C
ldrb r0, [r7]
adds r0, r0, r1
ldrb r6, [r0]
bl sub_0801DB94
mov r8, r0
ldr r5, _080A5EA4 @ =gOamCmd
movs r0, #0x80
lsls r0, r0, #3
strh r0, [r5, #4]
movs r0, #0
strh r0, [r5, #6]
strh r0, [r5, #8]
movs r0, #0x34
strh r0, [r5]
ldr r0, _080A5EA8 @ =gMenu
ldrb r1, [r0, #3]
lsls r0, r1, #1
adds r0, r0, r1
lsls r0, r0, #2
adds r0, r6, r0
strh r0, [r5, #2]
ldr r1, _080A5EAC @ =gMain
mov sl, r1
ldrh r1, [r1, #0xc]
movs r0, #0x10
ands r0, r1
movs r1, #0x74
cmp r0, #0
bne _080A5D70
movs r1, #0x75
_080A5D70:
ldr r0, _080A5EB0 @ =0x000001FB
bl DrawDirect
movs r0, #0x20
mov sb, r0
mov r1, sb
strh r1, [r5]
mov r1, r8
lsls r0, r1, #1
add r0, r8
lsls r0, r0, #2
adds r0, r6, r0
strh r0, [r5, #2]
mov r0, sl
ldrh r1, [r0, #0xc]
mov r0, sb
ands r0, r1
movs r1, #0x79
cmp r0, #0
beq _080A5D9A
movs r1, #0x78
_080A5D9A:
ldr r0, _080A5EB0 @ =0x000001FB
bl DrawDirect
movs r0, #0x7e
strh r0, [r5, #2]
movs r0, #0x87
lsls r0, r0, #7
strh r0, [r5, #8]
bl HasDungeonSmallKey
cmp r0, #0
beq _080A5DCC
movs r0, #0x18
strh r0, [r5]
ldr r0, _080A5EB4 @ =gSpriteAnimations_322
movs r1, #0xa0
lsls r1, r1, #1
adds r0, r0, r1
ldr r0, [r0]
ldrb r4, [r0]
movs r0, #0xa2
lsls r0, r0, #1
adds r1, r4, #0
bl DrawDirect
_080A5DCC:
bl HasDungeonCompass
cmp r0, #0
beq _080A5DEE
movs r0, #0x2e
strh r0, [r5]
ldr r0, _080A5EB4 @ =gSpriteAnimations_322
movs r1, #0xa4
lsls r1, r1, #1
adds r0, r0, r1
ldr r0, [r0]
ldrb r4, [r0]
movs r0, #0xa2
lsls r0, r0, #1
adds r1, r4, #0
bl DrawDirect
_080A5DEE:
bl HasDungeonBigKey
cmp r0, #0
beq _080A5E48
movs r0, #0x45
strh r0, [r5]
movs r0, #0xe0
lsls r0, r0, #2
strh r0, [r5, #8]
ldr r1, _080A5EB4 @ =gSpriteAnimations_322
movs r0, #0xa2
lsls r0, r0, #1
adds r1, r1, r0
ldr r1, [r1]
ldrb r4, [r1]
adds r1, r4, #0
bl DrawDirect
bl sub_080A5F24
cmp r0, #0
beq _080A5E48
movs r0, #0
strh r0, [r5, #8]
movs r0, #0x46
strh r0, [r5]
ldrb r1, [r7, #1]
ldrb r0, [r7, #2]
subs r1, r1, r0
lsls r0, r1, #1
adds r0, r0, r1
lsls r0, r0, #2
adds r0, r6, r0
strh r0, [r5, #2]
mov r0, sl
ldrh r1, [r0, #0xc]
mov r0, sb
ands r0, r1
movs r1, #0x7b
cmp r0, #0
beq _080A5E42
movs r1, #0x7a
_080A5E42:
ldr r0, _080A5EB0 @ =0x000001FB
bl DrawDirect
_080A5E48:
ldr r1, _080A5EA4 @ =gOamCmd
movs r0, #0
strh r0, [r1, #8]
movs r0, #0x34
strh r0, [r1]
strh r6, [r1, #2]
ldrb r0, [r7, #1]
adds r4, r0, #0
adds r4, #0x82
movs r5, #0
ldrb r0, [r7]
cmp r5, r0
bhs _080A5E7C
adds r6, r1, #0
_080A5E64:
ldr r0, _080A5EB0 @ =0x000001FB
adds r1, r4, #0
bl DrawDirect
subs r4, #1
ldrh r0, [r6, #2]
adds r0, #0xc
strh r0, [r6, #2]
adds r5, #1
ldrb r1, [r7]
cmp r5, r1
blo _080A5E64
_080A5E7C:
ldr r5, _080A5EB8 @ =gMapDataBottomSpecial
ldrb r0, [r5]
cmp r0, #0
beq _080A5F14
ldr r7, _080A5EA4 @ =gOamCmd
ldr r6, _080A5EBC @ =gScreen
_080A5E88:
ldrb r0, [r5]
cmp r0, #2
beq _080A5EDC
cmp r0, #2
bgt _080A5EC0
cmp r0, #1
beq _080A5ECA
b _080A5EEE
.align 2, 0
_080A5E98: .4byte gArea
_080A5E9C: .4byte gUnk_080C9C6C
_080A5EA0: .4byte gUnk_08128D3C
_080A5EA4: .4byte gOamCmd
_080A5EA8: .4byte gMenu
_080A5EAC: .4byte gMain
_080A5EB0: .4byte 0x000001FB
_080A5EB4: .4byte gSpriteAnimations_322
_080A5EB8: .4byte gMapDataBottomSpecial
_080A5EBC: .4byte gScreen
_080A5EC0:
cmp r0, #3
beq _080A5EE0
cmp r0, #4
beq _080A5EE4
b _080A5EEE
_080A5ECA:
movs r4, #0x7d
ldr r0, _080A5ED8 @ =gMenu
ldrb r0, [r0, #3]
cmp r8, r0
beq _080A5EF0
movs r4, #0x7e
b _080A5EF0
.align 2, 0
_080A5ED8: .4byte gMenu
_080A5EDC:
movs r4, #0x80
b _080A5EF0
_080A5EE0:
movs r4, #0x81
b _080A5EF0
_080A5EE4:
bl sub_080A5F24
movs r4, #0x7f
cmp r0, #0
bne _080A5EF0
_080A5EEE:
movs r4, #0xff
_080A5EF0:
ldrb r0, [r5, #1]
adds r0, #0x50
ldrh r1, [r6, #0x16]
subs r0, r0, r1
strh r0, [r7]
ldrb r0, [r5, #2]
adds r0, #0x10
ldrh r1, [r6, #0x18]
subs r0, r0, r1
strh r0, [r7, #2]
ldr r0, _080A5F20 @ =0x000001FB
adds r1, r4, #0
bl DrawDirect
adds r5, #3
ldrb r0, [r5]
cmp r0, #0
bne _080A5E88
_080A5F14:
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
mov sl, r5
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A5F20: .4byte 0x000001FB
.endif
.syntax divided
asm/non_matching/subtask2/sub_080A6650.inc
-18
View File
@@ -1,18 +0,0 @@
.syntax unified
push {lr}
ldr r0, _080A6670 @ =gUnk_08128E84
bl sub_080A70AC
ldr r0, _080A6674 @ =gPauseMenuOptions
ldrb r0, [r0, #6]
ldr r1, _080A6678 @ =gMenu
strb r0, [r1, #3]
bl sub_080A67C4
bl sub_080A68D4
movs r0, #1
bl SetMenuType
pop {pc}
.align 2, 0
_080A6670: .4byte gUnk_08128E84
_080A6674: .4byte gPauseMenuOptions
_080A6678: .4byte gMenu
.syntax divided
asm/non_matching/subtask2/sub_080A66D0.inc
-248
View File
@@ -1,248 +0,0 @@
.syntax unified
.ifdef EU
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
mov r5, r8
push {r5, r6, r7}
ldr r6, _080A5F74 @ =gOamCmd
movs r0, #0
strh r0, [r6, #4]
strh r0, [r6, #6]
movs r0, #0x78
strh r0, [r6]
ldr r4, _080A5F78 @ =gMenu
ldrb r0, [r4, #3]
lsls r0, r0, #3
ldr r1, _080A5F7C @ =gUnk_08128E94
adds r5, r0, r1
adds r1, r4, #0
adds r1, #0x2c
ldrb r0, [r1]
adds r2, r0, #1
strb r2, [r1]
adds r0, r4, #0
adds r0, #0x2b
ldrb r0, [r0]
cmp r0, #1
beq _080A5F30
movs r0, #0x10
ands r2, r0
cmp r2, #0
beq _080A5F30
movs r0, #0x80
lsls r0, r0, #4
strh r0, [r6, #8]
ldrh r0, [r4, #0xa]
cmp r0, #0
beq _080A5F1A
movs r0, #0xc
strh r0, [r6, #2]
movs r0, #0xfd
lsls r0, r0, #1
movs r1, #0x71
bl DrawDirect
_080A5F1A:
ldrb r0, [r5, #2]
ldrh r4, [r4, #0xa]
cmp r0, r4
bls _080A5F30
movs r0, #0x84
strh r0, [r6, #2]
movs r0, #0xfd
lsls r0, r0, #1
movs r1, #0x72
bl DrawDirect
_080A5F30:
ldrb r0, [r5, #7]
mov sl, r0
ldrb r5, [r5, #3]
mov sb, r5
ldr r1, _080A5F78 @ =gMenu
ldrh r0, [r1, #0xa]
mov r8, r0
ldr r2, _080A5F74 @ =gOamCmd
movs r0, #0
strh r0, [r2, #4]
strh r0, [r2, #6]
movs r0, #0xc0
lsls r0, r0, #4
strh r0, [r2, #8]
adds r1, #0x2c
ldrb r1, [r1]
movs r0, #0x20
ands r0, r1
lsls r0, r0, #0x18
lsrs r6, r0, #0x18
ldr r4, _080A5F80 @ =gMapDataBottomSpecial
ldrh r0, [r4, #2]
cmp r0, #0
beq _080A5FAE
rsbs r5, r6, #0
orrs r5, r6
adds r7, r2, #0
_080A5F66:
movs r1, #0
ldrb r0, [r4]
cmp r0, #1
bne _080A5F84
lsrs r1, r5, #0x1f
b _080A5F8A
.align 2, 0
_080A5F74: .4byte gOamCmd
_080A5F78: .4byte gMenu
_080A5F7C: .4byte gUnk_08128E94
_080A5F80: .4byte gMapDataBottomSpecial
_080A5F84:
cmp r6, #0
bne _080A5F8A
movs r1, #1
_080A5F8A:
cmp r1, #0
beq _080A5FA6
ldrh r0, [r4, #4]
add r0, sl
strh r0, [r7]
ldrh r0, [r4, #6]
add r0, sb
mov r1, r8
subs r0, r0, r1
strh r0, [r7, #2]
ldrh r0, [r4, #2]
ldrb r1, [r4, #1]
bl DrawDirect
_080A5FA6:
adds r4, #8
ldrh r0, [r4, #2]
cmp r0, #0
bne _080A5F66
_080A5FAE:
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
mov sl, r5
pop {r4, r5, r6, r7, pc}
.else
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
mov r5, r8
push {r5, r6, r7}
ldr r6, _080A677C @ =gOamCmd
movs r0, #0
strh r0, [r6, #4]
strh r0, [r6, #6]
movs r0, #0x78
strh r0, [r6]
ldr r4, _080A6780 @ =gMenu
ldrb r0, [r4, #3]
lsls r0, r0, #3
ldr r1, _080A6784 @ =gUnk_08128E94
adds r5, r0, r1
adds r1, r4, #0
adds r1, #0x2c
ldrb r0, [r1]
adds r2, r0, #1
strb r2, [r1]
adds r0, r4, #0
adds r0, #0x2b
ldrb r0, [r0]
cmp r0, #1
beq _080A6738
movs r0, #0x10
ands r2, r0
cmp r2, #0
beq _080A6738
movs r0, #0x80
lsls r0, r0, #4
strh r0, [r6, #8]
ldrh r0, [r4, #0xa]
cmp r0, #0
beq _080A6724
movs r0, #0xc
strh r0, [r6, #2]
ldr r0, _080A6788 @ =0x000001FB
movs r1, #0x71
bl DrawDirect
_080A6724:
ldrb r0, [r5, #2]
ldrh r4, [r4, #0xa]
cmp r0, r4
bls _080A6738
movs r0, #0x84
strh r0, [r6, #2]
ldr r0, _080A6788 @ =0x000001FB
movs r1, #0x72
bl DrawDirect
_080A6738:
ldrb r0, [r5, #7]
mov sl, r0
ldrb r5, [r5, #3]
mov sb, r5
ldr r1, _080A6780 @ =gMenu
ldrh r0, [r1, #0xa]
mov r8, r0
ldr r2, _080A677C @ =gOamCmd
movs r0, #0
strh r0, [r2, #4]
strh r0, [r2, #6]
movs r0, #0xc0
lsls r0, r0, #4
strh r0, [r2, #8]
adds r1, #0x2c
ldrb r1, [r1]
movs r0, #0x20
ands r0, r1
lsls r0, r0, #0x18
lsrs r6, r0, #0x18
ldr r4, _080A678C @ =gMapDataBottomSpecial
ldrh r0, [r4, #2]
cmp r0, #0
beq _080A67BA
rsbs r5, r6, #0
orrs r5, r6
adds r7, r2, #0
_080A676E:
movs r1, #0
ldrb r0, [r4]
cmp r0, #1
bne _080A6790
lsrs r1, r5, #0x1f
b _080A6796
.align 2, 0
_080A677C: .4byte gOamCmd
_080A6780: .4byte gMenu
_080A6784: .4byte gUnk_08128E94
_080A6788: .4byte 0x000001FB
_080A678C: .4byte gMapDataBottomSpecial
_080A6790:
cmp r6, #0
bne _080A6796
movs r1, #1
_080A6796:
cmp r1, #0
beq _080A67B2
ldrh r0, [r4, #4]
add r0, sl
strh r0, [r7]
ldrh r0, [r4, #6]
add r0, sb
mov r1, r8
subs r0, r0, r1
strh r0, [r7, #2]
ldrh r0, [r4, #2]
ldrb r1, [r4, #1]
bl DrawDirect
_080A67B2:
adds r4, #8
ldrh r0, [r4, #2]
cmp r0, #0
bne _080A676E
_080A67BA:
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
mov sl, r5
pop {r4, r5, r6, r7, pc}
.endif
.syntax divided
asm/non_matching/subtask2/sub_080A67C4.inc
-132
View File
@@ -1,132 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
adds r0, #0xba
bl LoadPaletteGroup
adds r5, r4, #0
adds r5, #0x5f
cmp r4, #0xb
beq _080A67F4
cmp r4, #0xb
bhi _080A67E0
cmp r4, #9
beq _080A67E6
b _080A6822
_080A67E0:
cmp r4, #0xe
beq _080A6802
b _080A6822
_080A67E6:
movs r0, #0x18
bl CheckGlobalFlag
cmp r0, #0
beq _080A6822
movs r5, #0x70
b _080A6822
_080A67F4:
movs r0, #0xe
bl CheckKinstoneFused
cmp r0, #0
beq _080A6822
movs r5, #0x71
b _080A6822
_080A6802:
ldr r1, _080A68AC @ =gUI
adds r0, r1, #0
adds r0, #0x20
ldrb r0, [r0]
cmp r0, #8
bne _080A6822
adds r0, r1, #0
adds r0, #0x21
ldrb r0, [r0]
movs r1, #3
bl __modsi3
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
adds r5, r0, #0
adds r5, #0x72
_080A6822:
adds r0, r5, #0
bl LoadGfxGroup
lsls r1, r4, #3
ldr r0, _080A68B0 @ =gUnk_08128E94
adds r4, r1, r0
ldr r0, _080A68B4 @ =gUnk_03003DE4
ldrb r1, [r0]
lsls r0, r1, #2
adds r0, r0, r1
lsls r0, r0, #9
ldr r1, _080A68B8 @ =gUnk_02017AA0
adds r1, r0, r1
ldr r2, _080A68BC @ =0x00001E0A
adds r0, r2, #0
movs r2, #7
_080A6842:
strh r0, [r1]
adds r1, #2
subs r2, #1
cmp r2, #0
bge _080A6842
movs r2, #8
movs r0, #5
ldrsb r0, [r4, r0]
ldrb r3, [r4, #4]
adds r0, r0, r3
ldr r5, _080A68B4 @ =gUnk_03003DE4
ldr r6, _080A68B8 @ =gUnk_02017AA0
cmp r2, r0
bge _080A6874
ldr r7, _080A68C0 @ =0x00001E0B
adds r3, r7, #0
_080A6862:
strh r3, [r1]
adds r1, #2
adds r2, #1
movs r0, #5
ldrsb r0, [r4, r0]
ldrb r7, [r4, #4]
adds r0, r0, r7
cmp r2, r0
blt _080A6862
_080A6874:
cmp r2, #0x9f
bgt _080A6886
ldr r3, _080A68BC @ =0x00001E0A
adds r0, r3, #0
_080A687C:
strh r0, [r1]
adds r1, #2
adds r2, #1
cmp r2, #0x9f
ble _080A687C
_080A6886:
ldrb r1, [r5]
lsls r0, r1, #2
adds r0, r0, r1
lsls r0, r0, #9
adds r0, r0, r6
ldr r1, _080A68C4 @ =0x0400000E
ldr r2, _080A68C8 @ =0xA2600001
bl sub_0805622C
ldr r1, _080A68CC @ =gMenu
ldrb r0, [r4, #2]
lsrs r0, r0, #1
strh r0, [r1, #0xa]
ldr r0, _080A68D0 @ =gMapDataBottomSpecial
movs r1, #0x80
lsls r1, r1, #3
bl MemClear
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A68AC: .4byte gUI
_080A68B0: .4byte gUnk_08128E94
_080A68B4: .4byte gUnk_03003DE4
_080A68B8: .4byte gUnk_02017AA0
_080A68BC: .4byte 0x00001E0A
_080A68C0: .4byte 0x00001E0B
_080A68C4: .4byte 0x0400000E
_080A68C8: .4byte 0xA2600001
_080A68CC: .4byte gMenu
_080A68D0: .4byte gMapDataBottomSpecial
.syntax divided
asm/non_matching/subtask2/sub_080A6B04.inc
-128
View File
@@ -1,128 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
bl sub_080A4D34
movs r0, #6
bl sub_080A4DB8
ldr r0, _080A6BF0 @ =gFuseInfo
ldrb r2, [r0, #3]
lsls r2, r2, #3
ldr r0, _080A6BF4 @ =gUnk_080C9CBC
adds r2, r2, r0
ldrb r1, [r2, #4]
lsls r0, r1, #2
adds r0, r0, r1
lsls r0, r0, #2
ldr r1, _080A6BF8 @ =gUnk_080FE320
adds r0, r0, r1
ldrb r2, [r2, #7]
mov r8, r2
ldrh r6, [r0, #0xc]
ldrh r5, [r0, #0xe]
adds r0, r6, #0
adds r1, r5, #0
bl sub_080A6A80
ldrb r4, [r0, #4]
ldr r7, _080A6BFC @ =gMenu
strb r4, [r7, #3]
adds r1, r7, #0
adds r1, #0x2b
movs r0, #1
strb r0, [r1]
adds r0, r4, #0
bl sub_080A67C4
adds r0, r4, #0
movs r1, #2
bl sub_080A6FB4
ldr r4, _080A6C00 @ =0x0000475F
movs r0, #0
adds r1, r4, #0
bl SetColor
movs r0, #0x5f
adds r1, r4, #0
bl SetColor
ldr r0, _080A6C04 @ =0x00005001
ldr r1, _080A6C08 @ =gBG3Buffer
movs r2, #0x80
lsls r2, r2, #5
bl MemFill16
ldr r0, _080A6C0C @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #8
ands r0, r1
movs r2, #0x64
cmp r0, #0
beq _080A6B84
movs r2, #0x65
_080A6B84:
ldr r1, _080A6C10 @ =gRoomTransition
ldrh r0, [r1, #0x20]
ldrh r1, [r1, #0x22]
.ifdef EU
movs r4, #0xfd
lsls r4, r4, #0x1
.else
ldr r4, _080A6C14 @ =0x000001FB
.endif
movs r3, #0x80
lsls r3, r3, #1
adds r3, r2, r3
adds r2, r4, #0
bl sub_080A698C
mov r3, r8
adds r3, #0x64
adds r0, r6, #0
adds r1, r5, #0
adds r2, r4, #0
bl sub_080A698C
adds r0, r6, #0
adds r1, r5, #0
bl sub_080A69E0
asrs r5, r0, #0x10
ldrb r0, [r7, #3]
lsls r0, r0, #3
ldr r1, _080A6C18 @ =gUnk_08128E94
adds r1, r0, r1
movs r0, #0
strh r0, [r7, #0xa]
ldrb r0, [r1, #2]
cmp r0, #0
beq _080A6BD4
adds r0, r5, #0
subs r0, #0x3c
cmp r0, #0
ble _080A6BD4
ldrb r1, [r1, #2]
cmp r1, r0
bge _080A6BD2
adds r0, r1, #0
_080A6BD2:
strh r0, [r7, #0xa]
_080A6BD4:
ldr r1, _080A6BFC @ =gMenu
movs r0, #0x1e
strh r0, [r1, #8]
movs r0, #1
bl SetMenuType
movs r0, #4
movs r1, #8
bl SetFade
pop {r3}
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A6BF0: .4byte gFuseInfo
_080A6BF4: .4byte gUnk_080C9CBC
_080A6BF8: .4byte gUnk_080FE320
_080A6BFC: .4byte gMenu
_080A6C00: .4byte 0x0000475F
_080A6C04: .4byte 0x00005001
_080A6C08: .4byte gBG3Buffer
_080A6C0C: .4byte gPlayerState
_080A6C10: .4byte gRoomTransition
.ifndef EU
_080A6C14: .4byte 0x000001FB
.endif
_080A6C18: .4byte gUnk_08128E94
.syntax divided
asm/non_matching/subtask2/sub_080A6DD0.inc
-29
View File
@@ -1,29 +0,0 @@
.syntax unified
push {lr}
bl sub_08056338
cmp r0, #0
beq _080A65CC
cmp r0, #1
beq _080A65D8
b _080A65EA
_080A65CC:
ldr r1, _080A65D4 @ =gMenu
movs r0, #2
b _080A65DC
.align 2, 0
_080A65D4: .4byte gMenu
_080A65D8:
ldr r1, _080A65ECEU @ =gMenu
movs r0, #3
_080A65DC:
strb r0, [r1]
movs r0, #1
cmp r0, #0
beq _080A65EA
movs r0, #3
bl SetMenuType
_080A65EA:
pop {pc}
.align 2, 0
_080A65ECEU: .4byte gMenu
.syntax divided
asm/non_matching/subtask2/sub_080A6EE0.inc
-46
View File
@@ -1,46 +0,0 @@
.syntax unified
push {r4, r5, r6, lr}
lsls r1, r0, #2
adds r1, r1, r0
lsls r1, r1, #2
ldr r0, _080A6F34 @ =gUnk_08128024
adds r1, r1, r0
ldrh r3, [r1, #6]
ldrh r4, [r1, #8]
ldr r0, _080A6F38 @ =gAreaRoomHeaders
ldrb r2, [r1, #0xb]
lsls r2, r2, #2
adds r2, r2, r0
ldrb r1, [r1, #0xc]
lsls r0, r1, #2
adds r0, r0, r1
lsls r0, r0, #1
ldr r1, [r2]
adds r1, r1, r0
ldrh r0, [r1]
adds r3, r3, r0
ldrh r0, [r1, #2]
adds r4, r4, r0
ldr r6, _080A6F3C @ =gOamCmd
lsls r0, r3, #2
adds r0, r0, r3
lsls r0, r0, #5
movs r5, #0xf9
lsls r5, r5, #4
adds r1, r5, #0
bl __divsi3
adds r0, #0x28
strh r0, [r6]
lsls r0, r4, #2
adds r0, r0, r4
lsls r0, r0, #5
adds r1, r5, #0
bl __divsi3
adds r0, #0xc
strh r0, [r6, #2]
pop {r4, r5, r6, pc}
.align 2, 0
_080A6F34: .4byte gUnk_08128024
_080A6F38: .4byte gAreaRoomHeaders
_080A6F3C: .4byte gOamCmd
.syntax divided
include/common.h
+1
View File
@@ -140,5 +140,6 @@ void sub_0801E738(u32);
void sub_0801DFB4(struct Entity_*, u32, u32, u32);
u32 sub_0801E00C(void);
bool32 sub_0801E810(u32);
u32 sub_0801DB94(void);
#endif // COMMON_H
src/menu/pause_menu.c
-1
View File
@@ -58,7 +58,6 @@ struct_08127F94* sub_080A6A80(u32, u32);
extern u8 gUnk_02034492[];
void sub_0801E8D4(void);
u32 sub_0801DB94(void);
s32 sub_080A50A0(s32);
void PauseMenu_Variant0(void) {
src/subtask2.c
+485 -22
View File
@@ -33,6 +33,7 @@ extern u16* gMoreSpritePtrs[];
extern Screen gUnk_03001020;
extern u8 gUnk_02024090[];
extern u8 gUnk_03000420[];
extern u16 gUnk_02017AA0[];
void sub_080A5CFC(u32, void*, u32);
void sub_080A6FB4(u32, u32);
@@ -42,12 +43,14 @@ void sub_080A70AC(const KeyButtonLayout* layout);
u32 sub_080A6F40();
void sub_080A67C4(u32);
void sub_080A68D4();
u32 sub_080A69E0();
s32 sub_080A69E0();
void sub_080A6EE0(u32 param_1);
struct_08127F94* sub_080A6A80(u32 param_1, u32 param_2);
void sub_080A698C(u32 param_1, u32 param_2, u32 param_3, u32 param_4);
void sub_080A6438();
void sub_080A5F48(u32, u32);
void sub_080A6F6C(u32);
bool32 sub_080A5F24(void);
extern void DrawDungeonMap(u32 floor, struct_02019EE0* data, u32 size);
extern void LoadDungeonMap(void);
@@ -77,6 +80,14 @@ typedef struct {
extern sturct_gUnk_08128F58 gUnk_08128F58[];
typedef struct {
u8 unk0;
u8 unk1;
u16 unk2;
u16 unk4;
u16 unk6;
} struct_sub_080A698C;
extern void (*const gUnk_08128DCC[])(void);
void sub_080A6378(void);
@@ -118,6 +129,19 @@ typedef struct {
extern const struct_gUnk_08128E94 gUnk_08128E94[];
typedef struct {
u8 unk0;
u8 unk1;
u8 unk2;
u8 unk3;
u8 unk4;
u8 unk5;
u8 unk6;
u8 unk7;
} struct_gUnk_08128C14;
extern struct_gUnk_08128C14 gUnk_08128C14[];
extern struct_gUnk_08128C14 gUnk_08128C94[];
typedef struct {
u8 unk00 : 5;
u8 unk05 : 5;
@@ -214,9 +238,200 @@ void sub_080A5594(void) {
SetMenuType(1);
}
ASM_FUNC("asm/non_matching/subtask2/sub_080A56A0.inc", void sub_080A56A0())
void sub_080A56A0(void) {
int iVar1;
u32 uVar2;
u32 uVar4;
struct_gUnk_08128C14* ptr;
ASM_FUNC("asm/non_matching/subtask2/sub_080A57F4.inc", void sub_080A57F4())
if (!sub_080A51F4()) {
return;
}
gMenu.field_0xc = gUnk_08128C00;
ptr = &gUnk_08128C14[gMenu.field_0x3];
uVar2 = 0xff;
switch (gInput.unk4) {
case DPAD_UP:
uVar2 = ptr->unk0;
break;
case DPAD_DOWN:
uVar2 = ptr->unk1;
break;
case DPAD_LEFT:
uVar2 = ptr->unk2;
break;
case DPAD_RIGHT:
uVar2 = ptr->unk3;
break;
}
if (uVar2 != 0xff) {
gMenu.field_0x3 = uVar2;
SoundReq(SFX_TEXTBOX_CHOICE);
} else if (gInput.newKeys == A_BUTTON) {
uVar2 = gMenu.field_0x3;
iVar1 = 0;
switch (uVar2) {
case 0:
case 2:
if (gGenericMenu.unk10.a[uVar2] != 0) {
iVar1 = 8;
if (uVar2 == 0) {
iVar1 = 7;
}
}
break;
#if !defined(DEMO_USA) && !defined(DEMO_JP)
case 4:
iVar1 = 9;
break;
case 5:
iVar1 = 10;
break;
#else
case 4:
SoundReq(SFX_MENU_ERROR);
break;
case 5:
SoundReq(SFX_MENU_ERROR);
break;
#endif
}
if (iVar1 != 0) {
sub_080A4E84(iVar1);
SoundReq(SFX_TEXTBOX_SELECT);
}
}
switch (gMenu.field_0x3) {
case 0:
case 2:
if (gGenericMenu.unk10.a[gMenu.field_0x3] != 0) {
gUnk_0200AF00.buttonY[0] = 0x10;
} else {
gUnk_0200AF00.buttonY[0] = 0xfff0;
}
break;
default:
gUnk_0200AF00.buttonY[0] = 0xfff0;
break;
}
uVar2 = gMenu.field_0x3;
uVar4 = gGenericMenu.unk10.a[uVar2];
if (uVar4 != 0) {
switch (uVar2) {
case 0:
if (uVar4 != 0x3d) {
uVar4 = 0x67;
}
break;
case 1:
uVar4 = 99;
break;
case 2:
uVar4 = 0x70;
break;
case 4:
uVar4 = 0x74;
break;
case 5:
uVar4 = 0x73;
}
}
sub_080A6F6C(uVar4 + 0x400);
}
void sub_080A57F4(void) {
u32 bVar1;
u32 spriteIndex;
int frameIndex;
u32 uVar5;
struct_gUnk_08128C14* pbVar6;
u32 index;
int shells;
struct_gUnk_08128C14* puVar8;
struct_gUnk_08128C14* puVar10;
gOamCmd._4 = 0x400;
gOamCmd._6 = 0;
if (gSaveHeader->language == 0) {
puVar8 = gUnk_08128C14;
} else {
puVar8 = gUnk_08128C94;
}
puVar10 = &puVar8[gMenu.field_0x3];
gOamCmd._8 = 0x800;
gOamCmd.x = puVar10->unk6;
gOamCmd.y = puVar10->unk7;
frameIndex = puVar10->unk4 + 9;
if ((gMain.ticks.HWORD & 0x10) == 0) {
frameIndex += 2;
} else {
frameIndex += 1;
}
DrawDirect(DRAW_DIRECT_SPRITE_INDEX, frameIndex);
for (index = 0, pbVar6 = (struct_gUnk_08128C14*)((u8*)puVar8 + 5); index < 0x10; pbVar6++, index++) {
uVar5 = gGenericMenu.unk10.a[index];
if (uVar5 != 0) {
puVar10 = &puVar8[index];
gOamCmd.x = pbVar6->unk1;
bVar1 = pbVar6->unk2;
gOamCmd.y = bVar1;
gOamCmd._8 = 0xe800;
if (uVar5 < 0x34) {
if (index == 2) {
uVar5 = pbVar6->unk0 + 10;
spriteIndex = DRAW_DIRECT_SPRITE_INDEX;
} else {
uVar5 = gGenericMenu.unk10.a[index] + 9;
uVar5 += puVar10->unk5;
spriteIndex = DRAW_DIRECT_SPRITE_INDEX;
}
} else {
gOamCmd._8 = index * 8 + 0xeb80;
switch (uVar5) {
case 0x3e:
gOamCmd.y = bVar1 + 8;
break;
case 0x3d:
gOamCmd.y = bVar1 + 0xd;
break;
}
uVar5 = gSpriteAnimations_322[uVar5]->index;
#ifdef EU
spriteIndex = 0x141;
#else
spriteIndex = 0x142;
#endif
}
DrawDirect(spriteIndex, uVar5);
}
}
if (gGenericMenu.unk10.a[2] != 0) {
gOamCmd._8 = gGenericMenu.unk10.a[2] + 0x800;
puVar10 = puVar8 + 2;
gOamCmd.x = puVar10->unk6 + 9;
gOamCmd.y = puVar10->unk7 + 7;
DrawDirect(0, 1);
}
if (gGenericMenu.unk10.a[3] == 0x3f) {
puVar10 = puVar8 + 3;
gOamCmd.x = puVar10->unk6 + 8;
gOamCmd.y = puVar10->unk7 + 8;
shells = gSave.stats.shells;
for (index = 0; index < 3; index++) {
gOamCmd._8 = shells % 10 + 0x800;
DrawDirect(0, 1);
shells /= 10;
gOamCmd.x -= 8;
}
}
}
void sub_080A5990(void) {
extern void (*const gUnk_08128D14[])(void);
@@ -448,7 +663,105 @@ void sub_080A5CFC(u32 menuType, void* param_2, u32 param_3) {
DrawDungeonMap(menuType, &gMapDataBottomSpecial, 0x400);
}
ASM_FUNC("asm/non_matching/subtask2/sub_080A5D1C.inc", void sub_080A5D1C())
#ifdef EU
#define SUB_080A5D1C_SPRITE_INDEX 0x143
#else
#define SUB_080A5D1C_SPRITE_INDEX 0x144
#endif
void sub_080A5D1C(void) {
extern u8 gUnk_08128D3C[];
u32 bVar1;
int iVar3;
u32 uVar4;
u32 uVar6;
u32 index;
u8* puVar8;
u8* pbVar9;
pbVar9 = &gUnk_080C9C6C[gArea.dungeon_idx * 4];
bVar1 = gUnk_08128D3C[*pbVar9];
uVar4 = sub_0801DB94();
gOamCmd._4 = 0x400;
gOamCmd._6 = 0;
gOamCmd._8 = 0;
gOamCmd.x = 0x34;
gOamCmd.y = bVar1 + gMenu.field_0x3 * 0xc;
DrawDirect(DRAW_DIRECT_SPRITE_INDEX, (gMain.ticks.HWORD & 0x10) == 0 ? 0x75 : 0x74);
gOamCmd.x = 0x20;
gOamCmd.y = bVar1 + uVar4 * 0xc;
DrawDirect(DRAW_DIRECT_SPRITE_INDEX, (gMain.ticks.HWORD & 0x20) != 0 ? 0x78 : 0x79);
gOamCmd.y = 0x7e;
gOamCmd._8 = 0x4380;
if (HasDungeonSmallKey()) {
gOamCmd.x = 0x18;
iVar3 = gSpriteAnimations_322[0x50]->index;
DrawDirect(SUB_080A5D1C_SPRITE_INDEX, iVar3);
}
if (HasDungeonCompass()) {
gOamCmd.x = 0x2e;
iVar3 = gSpriteAnimations_322[0x52]->index;
DrawDirect(SUB_080A5D1C_SPRITE_INDEX, iVar3);
}
if (HasDungeonBigKey()) {
gOamCmd.x = 0x45;
gOamCmd._8 = 0x380;
iVar3 = gSpriteAnimations_322[0x51]->index;
DrawDirect(SUB_080A5D1C_SPRITE_INDEX, iVar3);
if (sub_080A5F24()) {
gOamCmd._8 = 0;
gOamCmd.x = 0x46;
gOamCmd.y = bVar1 + (pbVar9[1] - pbVar9[2]) * 0xc;
if ((gMain.ticks.HWORD & 0x20) != 0) {
uVar6 = 0x7a;
} else {
uVar6 = 0x7b;
}
DrawDirect(DRAW_DIRECT_SPRITE_INDEX, uVar6);
}
}
gOamCmd._8 = 0;
gOamCmd.x = 0x34;
gOamCmd.y = bVar1;
iVar3 = pbVar9[1] + 0x82;
for (index = 0; index < *pbVar9; index++) {
DrawDirect(DRAW_DIRECT_SPRITE_INDEX, iVar3);
iVar3--;
gOamCmd.y = gOamCmd.y + 0xc;
}
puVar8 = (u8*)&gMapDataBottomSpecial;
while (*puVar8 != 0) {
switch (*puVar8) {
case 1:
iVar3 = 0x7d;
if (uVar4 != gMenu.field_0x3) {
iVar3 = 0x7e;
}
break;
case 2:
iVar3 = 0x80;
break;
case 3:
iVar3 = 0x81;
break;
case 4:
if (sub_080A5F24()) {
iVar3 = 0x7f;
break;
}
default:
iVar3 = 0xff;
break;
}
gOamCmd.x = puVar8[1] + 0x50 - gScreen.bg1.xOffset;
gOamCmd.y = puVar8[2] + 0x10 - gScreen.bg1.yOffset;
DrawDirect(DRAW_DIRECT_SPRITE_INDEX, iVar3);
puVar8 += 3;
}
}
bool32 sub_080A5F24(void) {
bool32 result = TRUE;
@@ -696,7 +1009,7 @@ void sub_080A6378(void) {
gOamCmd._6 = 0;
gOamCmd._8 = 0x7000;
if ((gGenericMenu.unk2c & 0x20) == 0) {
gOamCmd.x = gRoomTransition.player_status.overworld_map_x * 0xa0 / 0xf90 + 0x28;
gOamCmd.x = gRoomTransition.player_status.overworld_map_x * DISPLAY_HEIGHT / 0xf90 + 0x28;
gOamCmd.y = (gRoomTransition.player_status.overworld_map_y << 7) / 0xc60 + 0xc;
if ((gPlayerState.flags & PL_NO_CAP) != 0) {
frameIndex = 0x5a;
@@ -850,9 +1163,105 @@ void sub_080A667C(void) {
sub_080A6FB4(gMenu.field_0x3, 0);
}
ASM_FUNC("asm/non_matching/subtask2/sub_080A66D0.inc", void sub_080A66D0())
void sub_080A66D0(void) {
u32 bVar2;
u32 bVar3;
u8 bVar4;
u32 uVar5;
u32 uVar8;
struct_sub_080A698C* ptr;
const struct_gUnk_08128E94* ptr2;
ASM_FUNC("asm/non_matching/subtask2/sub_080A67C4.inc", void sub_080A67C4(u32 param_1))
gOamCmd._4 = 0;
gOamCmd._6 = 0;
gOamCmd.x = 0x78;
ptr2 = &gUnk_08128E94[gMenu.field_0x3];
gGenericMenu.unk2c++;
if (gGenericMenu.unk2b != 1 && ((gGenericMenu.unk2c & 0x10) != 0)) {
gOamCmd._8 = 0x800;
if (gMenu.field_0xa != 0) {
gOamCmd.y = 0xc;
DrawDirect(DRAW_DIRECT_SPRITE_INDEX, 0x71);
}
if (ptr2->unk2 > gMenu.field_0xa) {
gOamCmd.y = 0x84;
DrawDirect(DRAW_DIRECT_SPRITE_INDEX, 0x72);
}
}
bVar2 = ptr2->unk7;
bVar3 = ptr2->unk3;
uVar5 = gMenu.field_0xa;
gOamCmd._4 = 0;
gOamCmd._6 = 0;
gOamCmd._8 = 0xc00;
bVar4 = gGenericMenu.unk2c & 0x20;
for (ptr = (struct_sub_080A698C*)&gMapDataBottomSpecial; ptr->unk2 != 0; ptr++) {
uVar8 = 0;
if (ptr->unk0 == 1) {
if (bVar4 != 0) {
uVar8 = 1;
}
} else if (bVar4 == 0) {
uVar8 = 1;
}
if (uVar8 != 0) {
gOamCmd.x = ptr->unk4 + bVar2;
gOamCmd.y = ptr->unk6 + bVar3 - uVar5;
DrawDirect(ptr->unk2, ptr->unk1);
}
}
}
void sub_080A67C4(u32 param_1) {
u16* puVar2;
int i;
int iVar4;
s32 room;
const struct_gUnk_08128E94* ptr;
LoadPaletteGroup(param_1 + 0xba);
iVar4 = param_1 + 0x5f;
switch (param_1) {
case 0x9:
if (CheckGlobalFlag(TATEKAKE_HOUSE)) {
iVar4 = 0x70;
}
break;
case 0xb:
if (CheckKinstoneFused(0xe)) {
iVar4 = 0x71;
}
break;
case 0xe:
if (gUI.roomControls.area == 8) {
room = gUI.roomControls.room;
iVar4 = (u8)(room % 3) + 0x72;
}
break;
}
LoadGfxGroup(iVar4);
ptr = &gUnk_08128E94[param_1];
puVar2 = &gUnk_02017AA0[gUnk_03003DE4 * 0x500];
for (i = 0; i <= 7; puVar2++, i++) {
*puVar2 = 0x1e0a;
}
for (i = 8; i < (int)(ptr->unk5 + ptr->unk4); puVar2++, i++) {
*puVar2 = 0x1e0b;
}
for (; i < 0xa0; puVar2++, i++) {
*puVar2 = 0x1e0a;
}
sub_0805622C(&gUnk_02017AA0[gUnk_03003DE4 * 0x500], REG_ADDR_BG3CNT, 0xa2600001);
gMenu.field_0xa = ptr->unk2 >> 1;
MemClear(&gMapDataBottomSpecial, 0x400);
}
void sub_080A68D4(void) {
u32 uVar1;
@@ -887,18 +1296,10 @@ void sub_080A68D4(void) {
}
}
typedef struct {
u8 unk0;
u8 unk1;
u16 unk2;
u16 unk4;
u16 unk6;
} struct_sub_080A698C;
void sub_080A698C(u32 param_1, u32 param_2, u32 param_3, u32 param_4) {
int iVar1;
iVar1 = sub_080A69E0();
iVar1 = sub_080A69E0(param_1, param_2);
if (0 < iVar1) {
((struct_sub_080A698C*)&gMapDataBottomSpecial)[gGenericMenu.unk2d].unk0 = param_4 >> 8;
((struct_sub_080A698C*)&gMapDataBottomSpecial)[gGenericMenu.unk2d].unk1 = param_4;
@@ -909,7 +1310,7 @@ void sub_080A698C(u32 param_1, u32 param_2, u32 param_3, u32 param_4) {
}
}
u32 sub_080A69E0(u32 param_1, u32 param_2) {
s32 sub_080A69E0(u32 param_1, u32 param_2) {
const struct_08127F94* pbVar1;
int iVar3;
@@ -968,7 +1369,56 @@ void Subtask_LocalMapHint() {
CopyOAM();
}
ASM_FUNC("asm/non_matching/subtask2/sub_080A6B04.inc", void sub_080A6B04())
void sub_080A6B04(void) {
u32 bVar1;
u32 uVar2;
u32 uVar3;
u32 uVar4;
int uVar6;
u32 uVar7;
struct_080C9CBC* ptr;
struct_080FE320* ptr2;
const struct_gUnk_08128E94* ptr3;
sub_080A4D34();
sub_080A4DB8(6);
ptr = &gUnk_080C9CBC[gFuseInfo._3];
ptr2 = &gUnk_080FE320[ptr->evt_type];
bVar1 = ptr->_5[1];
uVar3 = ptr2->_c;
uVar4 = ptr2->_e;
uVar2 = sub_080A6A80(uVar3, uVar4)->_4;
gMenu.field_0x3 = uVar2;
gGenericMenu.unk2b = 1;
sub_080A67C4(uVar2);
sub_080A6FB4(uVar2, 2);
SetColor(0, 0x475f);
SetColor(0x5f, 0x475f);
MemFill16(0x5001, &gBG3Buffer, sizeof(gBG3Buffer));
if ((gPlayerState.flags & PL_NO_CAP) != 0) {
uVar7 = 101;
} else {
uVar7 = 100;
}
sub_080A698C(gRoomTransition.player_status.overworld_map_x, gRoomTransition.player_status.overworld_map_y,
DRAW_DIRECT_SPRITE_INDEX, uVar7 + 0x100);
sub_080A698C(uVar3, uVar4, DRAW_DIRECT_SPRITE_INDEX, bVar1 + 100);
uVar4 = sub_080A69E0(uVar3, uVar4) >> 0x10;
ptr3 = &gUnk_08128E94[gMenu.field_0x3];
gMenu.field_0xa = 0;
if (ptr3->unk2 != 0) {
uVar6 = uVar4 - 0x3c;
if (uVar6 > 0) {
if (ptr3->unk2 < uVar6) {
uVar6 = ptr3->unk2;
}
gMenu.field_0xa = uVar6;
}
}
gMenu.transitionTimer = 0x1e;
SetMenuType(1);
SetFade(FADE_INSTANT, 8);
}
void sub_080A6C1C(void) {
if (!gFadeControl.active) {
@@ -976,9 +1426,9 @@ void sub_080A6C1C(void) {
case 0:
sub_080A66D0();
switch (gInput.newKeys) {
case 1:
case 2:
case 8:
case A_BUTTON:
case B_BUTTON:
case START_BUTTON:
Subtask_Exit();
break;
}
@@ -1147,7 +1597,20 @@ void sub_080A6E70(void) {
}
}
ASM_FUNC("asm/non_matching/subtask2/sub_080A6EE0.inc", void sub_080A6EE0(u32 param_1))
void sub_080A6EE0(u32 param_1) {
u32 x;
u32 y;
RoomHeader* roomHeader;
const ScreenTransitionData* ptr = &gUnk_08128024[param_1];
x = (u16)ptr->playerXPos;
y = (u16)ptr->playerYPos;
roomHeader = &gAreaRoomHeaders[ptr->area][ptr->room];
x += roomHeader->map_x;
y += roomHeader->map_y;
gOamCmd.x = (s32)(x * DISPLAY_HEIGHT) / 0xf90 + 0x28;
gOamCmd.y = (s32)(y * DISPLAY_HEIGHT) / 0xf90 + 0xc;
}
u32 sub_080A6F40(void) {
extern u8 gUnk_08128F38[];