mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-10 23:22:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29 from notyouraveragehooman/master

Browse Source 
misc decomp
This commit is contained in:
notyouraveragehooman
2020-07-17 19:17:35 -07:00
committed by GitHub
parent 9cc26a8a5d 6328c148d2
commit 53d7e6c48f
95 changed files with 2079 additions and 2337 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2
View File
@@ -1,5 +1,7 @@
# The Legend of Zelda: The Minish Cap
**Progress:** [⬛⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜] 5%
```diff
- WARNING! -
asm/bigGoron.s
+2 -2
View File
@@ -95,7 +95,7 @@ sub_0806D0B0: @ 0x0806D0B0
movs r1, #0x80
lsls r1, r1, #6
adds r0, r5, #0
bl sub_0801D630
bl _DmaZero
cmp r4, #0
beq _0806D0DA
adds r0, r4, #0
@@ -771,7 +771,7 @@ sub_0806D5D4: @ 0x0806D5D4
push {lr}
bl sub_08053500
movs r0, #0xd
bl sub_0805436C
bl IsItemEquipped
adds r1, r0, #0
cmp r1, #2
beq _0806D5F0
asm/bird.s
+1 -1
View File
@@ -675,7 +675,7 @@ _0809D454:
str r1, [r0, #0x40]
movs r0, #9
movs r1, #0
bl sub_080A7138
bl MenuFadeIn
_0809D478:
ldr r4, [r5, #0x54]
cmp r4, #0
asm/code_08016DF8.s
+2 -2
View File
@@ -601,7 +601,7 @@ _08017268:
strb r5, [r0]
ldr r0, _080172EC @ =gUnk_03003BE0
movs r1, #0x8c
bl sub_0801D630
bl _DmaZero
adds r2, r4, #0
adds r2, #0x3f
ldrb r0, [r2]
@@ -1080,7 +1080,7 @@ sub_08017640: @ 0x08017640
movs r1, #0x80
lsls r1, r1, #1
adds r0, r4, #0
bl sub_0801D630
bl _DmaZero
ldr r0, _08017664 @ =gUnk_02018EA0
str r4, [r0]
str r4, [r4]
asm/code_08018500.s
+1 -1
View File
@@ -58,7 +58,7 @@ sub_0801855C: @ 0x0801855C
ldr r4, _08018570 @ =gUnk_02033AB8
adds r0, r4, #0
movs r1, #0x14
bl sub_0801D630
bl _DmaZero
adds r5, r4, #0
ldr r4, _08018574 @ =gUnk_080B3D20
movs r6, #0
asm/code_08019444.s
+6 -6
View File
@@ -295,7 +295,7 @@ _08019678: .4byte gUnk_080B4400
sub_0801967C: @ 0x0801967C
push {lr}
ldr r1, _08019690 @ =gUnk_080B4458
ldr r0, _08019694 @ =gUnk_02000080
ldr r0, _08019694 @ =gMenu
ldrb r0, [r0, #6]
lsls r0, r0, #2
adds r0, r0, r1
@@ -304,7 +304,7 @@ sub_0801967C: @ 0x0801967C
pop {pc}
.align 2, 0
_08019690: .4byte gUnk_080B4458
_08019694: .4byte gUnk_02000080
_08019694: .4byte gMenu
thumb_func_start sub_08019698
sub_08019698: @ 0x08019698
@@ -434,7 +434,7 @@ sub_080197A0: @ 0x080197A0
push {lr}
movs r0, #2
movs r1, #0xb
bl sub_080A7138
bl MenuFadeIn
pop {pc}
thumb_func_start sub_080197AC
@@ -3466,7 +3466,7 @@ _0801AE70:
movs r2, #0x80
lsls r2, r2, #4
movs r0, #0xf
bl sub_0801D5EC
bl _DmaFill16
movs r0, #1
rsbs r0, r0, #0
bl sub_0805BB74
@@ -4054,7 +4054,7 @@ sub_0801B2CC: @ 0x0801B2CC
bl sub_08078930
_0801B2DE:
movs r0, #8
bl sub_0805436C
bl IsItemEquipped
cmp r0, #1
beq _0801B2F6
cmp r0, #1
@@ -4765,7 +4765,7 @@ sub_0801B804: @ 0x0801B804
push {r4, r5, lr}
adds r5, r0, #0
movs r0, #0xc
bl sub_0805436C
bl IsItemEquipped
cmp r0, #1
beq _0801B820
cmp r0, #1
asm/code_0801C370.s
+3 -3
View File
@@ -32,7 +32,7 @@ _0801C398:
movs r1, #0xcd
lsls r1, r1, #2
adds r0, r5, #0
bl sub_0801D630
bl _DmaZero
strb r6, [r5, #3]
strh r4, [r5, #0xe]
ldr r0, _0801C474 @ =gUnk_02002A40
@@ -48,7 +48,7 @@ _0801C398:
movs r1, #0x80
lsls r1, r1, #4
adds r0, r4, #0
bl sub_0801D630
bl _DmaZero
ldr r1, _0801C47C @ =gScreen
str r4, [r1, #0x10]
ldr r0, _0801C480 @ =0x00001F0C
@@ -93,7 +93,7 @@ _0801C398:
adds r0, #0x34
movs r1, #0xc0
lsls r1, r1, #2
bl sub_0801D630
bl _DmaZero
movs r0, #5
movs r1, #9
bl sub_0801CA6C
asm/code_0801C85C.s
+2 -2
View File
@@ -996,7 +996,7 @@ sub_0801CFA8: @ 0x0801CFA8
adds r5, r0, #0
ldr r0, _0801CFCC @ =gUnk_02001A00
movs r1, #0x40
bl sub_0801D630
bl _DmaZero
movs r4, #0
_0801CFB6:
adds r0, r4, #0
@@ -1451,7 +1451,7 @@ sub_0801D2C8: @ 0x0801D2C8
lsls r1, r4, #5
adds r1, r1, r2
movs r2, #0x20
bl sub_0801D5EC
bl _DmaFill16
b _0801D33C
.align 2, 0
_0801D2F8: .4byte gUnk_0200B644
asm/code_0801D79C.s
+16 -16
View File
@@ -339,7 +339,7 @@ _0801D9D8:
strh r0, [r3]
adds r0, r4, #0
mov r1, ip
bl sub_0801D630
bl _DmaZero
adds r0, r4, #0
b _0801DA02
.align 2, 0
@@ -418,7 +418,7 @@ sub_0801DA7C: @ 0x0801DA7C
ldr r0, _0801DA8C @ =gUnk_02035540
movs r1, #0x80
lsls r1, r1, #5
bl sub_0801D630
bl _DmaZero
pop {pc}
.align 2, 0
_0801DA8C: .4byte gUnk_02035540
@@ -459,11 +459,11 @@ sub_0801DA90: @ 0x0801DA90
bl sub_0801DB34
ldr r0, _0801DB08 @ =0x0600C000
movs r1, #0x20
bl sub_0801D630
bl _DmaZero
ldr r0, _0801DB0C @ =gUnk_02034CB0
movs r1, #0x80
lsls r1, r1, #4
bl sub_0801D630
bl _DmaZero
strh r4, [r5, #0xe]
pop {r4, r5, pc}
.align 2, 0
@@ -505,7 +505,7 @@ sub_0801DB34: @ 0x0801DB34
ldr r4, _0801DB6C @ =gScreen
adds r0, r4, #0
movs r1, #0x7c
bl sub_0801D630
bl _DmaZero
ldr r0, _0801DB70 @ =gUnk_02034CB0
str r0, [r4, #0x10]
ldr r0, _0801DB74 @ =0x00001F0C
@@ -560,7 +560,7 @@ sub_0801DBA0: @ 0x0801DBA0
adds r5, r1, #0
adds r1, r2, #0
adds r0, r5, #0
bl sub_0801D630
bl _DmaZero
movs r0, #1
strb r0, [r5]
ldr r2, _0801DBE4 @ =gUnk_030010A0
@@ -592,7 +592,7 @@ _0801DBF0:
ldrb r0, [r6]
ldrb r1, [r6, #1]
movs r2, #3
bl sub_0804B0FC
bl GetRoomProperty
adds r4, r0, #0
cmp r4, #0
bne _0801DC04
@@ -835,7 +835,7 @@ _0801DDB8:
ldr r0, _0801DDE0 @ =gUnk_02019EE0
movs r1, #0x80
lsls r1, r1, #8
bl sub_0801D630
bl _DmaZero
b _0801DEE2
.align 2, 0
_0801DDD8: .4byte gUnk_080C9C50
@@ -845,7 +845,7 @@ _0801DDE4:
ldrb r0, [r4]
ldrb r1, [r4, #1]
movs r2, #3
bl sub_0804B0FC
bl GetRoomProperty
adds r6, r0, #0
adds r0, r4, #0
bl sub_0801DF10
@@ -1104,7 +1104,7 @@ sub_0801DFB4: @ 0x0801DFB4
ldr r7, _0801E004 @ =gUnk_02022740
adds r0, r7, #0
movs r1, #0x10
bl sub_0801D630
bl _DmaZero
strh r4, [r7, #6]
strh r5, [r7, #8]
strh r6, [r7, #0xa]
@@ -1178,7 +1178,7 @@ sub_0801E044: @ 0x0801E044
bne _0801E06A
movs r0, #4
movs r1, #0
bl sub_080A7138
bl MenuFadeIn
ldr r0, _0801E070 @ =gUnk_02022740
movs r1, #4
strb r1, [r0]
@@ -1345,7 +1345,7 @@ sub_0801E160: @ 0x0801E160
adds r0, r0, r4
movs r1, #0xa0
lsls r1, r1, #4
bl sub_0801D630
bl _DmaZero
adds r0, r6, #0
mov r1, r8
mov r2, sb
@@ -1415,7 +1415,7 @@ sub_0801E1EC: @ 0x0801E1EC
adds r0, r0, r5
movs r1, #0xa0
lsls r1, r1, #4
bl sub_0801D630
bl _DmaZero
adds r0, r4, #0
movs r1, #0
bl sub_0801E24C
@@ -1579,7 +1579,7 @@ sub_0801E31C: @ 0x0801E31C
adds r0, r0, r1
movs r1, #0xa0
lsls r1, r1, #4
bl sub_0801D630
bl _DmaZero
cmp sl, sb
bge _0801E3DC
movs r6, #0
@@ -1764,7 +1764,7 @@ sub_0801E49C: @ 0x0801E49C
movs r2, #0xf0
lsls r2, r2, #3
ldr r1, _0801E5E8 @ =gUnk_02018EE0
bl sub_0801D5EC
bl _DmaFill16
adds r3, r5, #0
subs r3, #0x40
movs r2, #0xff
@@ -1874,7 +1874,7 @@ sub_0801E49C: @ 0x0801E49C
adds r0, r0, r6
movs r1, #0xa0
lsls r1, r1, #4
bl sub_0801D630
bl _DmaZero
ldr r2, _0801E5E8 @ =gUnk_02018EE0
ldrb r1, [r5]
lsls r0, r1, #2
asm/code_0804AA84.s
+1 -122
View File
@@ -4,127 +4,6 @@
.syntax unified
.text
thumb_func_start sub_0804AA84
sub_0804AA84: @ 0x0804AA84
push {lr}
ldr r3, _0804AA98 @ =gArea
ldrb r0, [r3, #0x19]
cmp r0, #0
bne _0804AA9C
strb r0, [r3, #0x18]
strb r0, [r3, #0x19]
movs r0, #0
b _0804AAB0
.align 2, 0
_0804AA98: .4byte gArea
_0804AA9C:
ldr r2, _0804AAB4 @ =gUnk_03001000
movs r1, #0
movs r0, #4
strb r0, [r2, #4]
strb r1, [r3, #0xe]
strb r1, [r3, #0xf]
strh r1, [r3, #0x10]
bl sub_0805E5A8
movs r0, #1
_0804AAB0:
pop {pc}
.align 2, 0
_0804AAB4: .4byte gUnk_03001000
thumb_func_start sub_0804AAB8
sub_0804AAB8: @ 0x0804AAB8
push {lr}
ldr r1, _0804AACC @ =gUnk_080D4120
ldr r0, _0804AAD0 @ =gArea
ldrb r0, [r0, #0xe]
lsls r0, r0, #2
adds r0, r0, r1
ldr r0, [r0]
bl _call_via_r0
pop {pc}
.align 2, 0
_0804AACC: .4byte gUnk_080D4120
_0804AAD0: .4byte gArea
thumb_func_start sub_0804AAD4
sub_0804AAD4: @ 0x0804AAD4
push {r4, lr}
ldr r4, _0804AAFC @ =gUnk_02018EB0
adds r0, r4, #0
movs r1, #0x28
bl sub_0801D630
movs r0, #0
str r0, [r4, #0x14]
bl sub_0805E60C
ldr r4, _0804AB00 @ =gArea
ldrb r1, [r4, #0x17]
movs r0, #0x3d
movs r2, #0
bl CreateObject
ldrb r0, [r4, #0xe]
adds r0, #1
strb r0, [r4, #0xe]
pop {r4, pc}
.align 2, 0
_0804AAFC: .4byte gUnk_02018EB0
_0804AB00: .4byte gArea
thumb_func_start sub_0804AB04
sub_0804AB04: @ 0x0804AB04
push {lr}
bl sub_0805E5C0
ldr r0, _0804AB20 @ =gArea
ldrh r0, [r0, #0x10]
cmp r0, #0
beq _0804AB1E
bl sub_080AD90C
bl sub_080AD9B0
bl sub_080AD918
_0804AB1E:
pop {pc}
.align 2, 0
_0804AB20: .4byte gArea
thumb_func_start sub_0804AB24
sub_0804AB24: @ 0x0804AB24
push {r4, r5, lr}
ldr r5, _0804AB48 @ =gUnk_03000FD0
ldrb r1, [r5]
cmp r1, #0
bne _0804AB46
ldr r0, _0804AB4C @ =gScreen
movs r4, #0
strh r1, [r0]
bl sub_0801E104
ldr r0, _0804AB50 @ =gArea
strb r4, [r0, #0xe]
movs r0, #6
movs r1, #0
bl sub_080A7138
strb r4, [r5]
_0804AB46:
pop {r4, r5, pc}
.align 2, 0
_0804AB48: .4byte gUnk_03000FD0
_0804AB4C: .4byte gScreen
_0804AB50: .4byte gArea
thumb_func_start sub_0804AB54
sub_0804AB54: @ 0x0804AB54
push {lr}
ldr r1, _0804AB68 @ =gUnk_080D412C
ldr r0, _0804AB6C @ =gArea
ldrb r0, [r0, #0xe]
lsls r0, r0, #2
adds r0, r0, r1
ldr r0, [r0]
bl _call_via_r0
pop {pc}
.align 2, 0
_0804AB68: .4byte gUnk_080D412C
_0804AB6C: .4byte gArea
thumb_func_start sub_0804AB70
sub_0804AB70: @ 0x0804AB70
@@ -173,7 +52,7 @@ _0804ABA4:
lsls r1, r1, #0xe
orrs r0, r1
str r0, [r2]
bl sub_0805E60C
bl EraseAllEntities
ldr r1, _0804AC18 @ =gUnk_080D4110
lsls r0, r5, #2
adds r0, r0, r1
asm/code_0804B058.s
-118
View File
@@ -2,124 +2,6 @@
.text
.syntax unified
thumb_func_start sub_0804B058
sub_0804B058: @ 0x0804B058
push {r4, r5, lr}
adds r4, r0, #0
cmp r4, #0
beq _0804B0AE
ldrb r0, [r4]
cmp r0, #0xff
beq _0804B0AE
movs r5, #0
_0804B068:
cmp r5, #0x1f
bhi _0804B09E
ldrb r1, [r4]
movs r0, #0xf
ands r0, r1
cmp r0, #3
bne _0804B09E
adds r0, r5, #0
bl sub_08049D1C
cmp r0, #0
beq _0804B0A4
adds r0, r4, #0
bl CreateEntity
adds r2, r0, #0
cmp r2, #0
beq _0804B0A4
ldrb r0, [r2, #8]
cmp r0, #3
bne _0804B0A4
movs r0, #0x80
adds r2, #0x6c
adds r1, r5, #0
orrs r1, r0
strb r1, [r2]
b _0804B0A4
_0804B09E:
adds r0, r4, #0
bl CreateEntity
_0804B0A4:
adds r5, #1
adds r4, #0x10
ldrb r0, [r4]
cmp r0, #0xff
bne _0804B068
_0804B0AE:
pop {r4, r5, pc}
thumb_func_start sub_0804B0B0
sub_0804B0B0: @ 0x0804B0B0
push {lr}
movs r2, #1
bl sub_0804B0FC
bl LoadRoomEntityList
pop {pc}
.align 2, 0
thumb_func_start sub_0804B0C0
sub_0804B0C0: @ 0x0804B0C0
push {lr}
adds r2, r1, #0
ldr r3, _0804B0E0 @ =gUnk_02017654
movs r1, #0
str r1, [r3]
ldr r1, _0804B0E4 @ =gUnk_080D50FC
lsls r0, r0, #2
adds r0, r0, r1
ldr r1, [r0]
cmp r1, #0
beq _0804B0DE
lsls r0, r2, #2
adds r0, r0, r1
ldr r0, [r0]
str r0, [r3]
_0804B0DE:
pop {pc}
.align 2, 0
_0804B0E0: .4byte gUnk_02017654
_0804B0E4: .4byte gUnk_080D50FC
thumb_func_start sub_0804B0E8
sub_0804B0E8: @ 0x0804B0E8
push {lr}
movs r2, #4
bl sub_0804B0FC
cmp r0, #0
beq _0804B0F8
bl _call_via_r0
_0804B0F8:
pop {pc}
.align 2, 0
thumb_func_start sub_0804B0FC
sub_0804B0FC: @ 0x0804B0FC
push {r4, lr}
adds r3, r1, #0
adds r4, r2, #0
movs r2, #0
ldr r1, _0804B124 @ =gUnk_080D50FC
lsls r0, r0, #2
adds r0, r0, r1
ldr r1, [r0]
cmp r1, #0
beq _0804B120
lsls r0, r3, #2
adds r0, r0, r1
ldr r2, [r0]
cmp r2, #0
beq _0804B120
lsls r0, r4, #2
adds r0, r0, r2
ldr r2, [r0]
_0804B120:
adds r0, r2, #0
pop {r4, pc}
.align 2, 0
_0804B124: .4byte gUnk_080D50FC
thumb_func_start GetCurrentRoomProperty
GetCurrentRoomProperty: @ 0x0804B128
push {lr}
asm/code_0804B9F8.s
+3 -3
View File
@@ -3176,7 +3176,7 @@ sub_0804CD48: @ 0x0804CD48
bl SetLocalFlag
movs r0, #5
movs r1, #0
bl sub_080A7138
bl MenuFadeIn
ldr r0, _0804CD94 @ =gUnk_02000070
strb r4, [r0]
ldr r0, _0804CD98 @ =gUnk_03000FD0
@@ -11466,10 +11466,10 @@ sub_0804FFE4: @ 0x0804FFE4
ldr r4, _08050000 @ =gUnk_03000FD0
adds r0, r4, #0
movs r1, #0x1c
bl sub_0801D630
bl _DmaZero
ldr r0, _08050004 @ =gUnk_020354C0
movs r1, #0x80
bl sub_0801D630
bl _DmaZero
movs r0, #1
rsbs r0, r0, #0
str r0, [r4, #4]
asm/code_08050038.s
+150 -150
View File
File diff suppressed because it is too large Load Diff
asm/code_080526F8.s
+100 -100
View File
@@ -791,7 +791,7 @@ sub_08052CFC: @ 0x08052CFC
ldr r4, _08052D44 @ =gArea
ldr r1, _08052D48 @ =0x00000894
adds r0, r4, #0
bl sub_0801D630
bl _DmaZero
ldr r0, _08052D4C @ =gRoomControls
ldrb r1, [r0, #4]
lsls r1, r1, #2
@@ -996,7 +996,7 @@ sub_08052EA0: @ 0x08052EA0
ldr r4, _08052EE4 @ =gRoomVars
adds r0, r4, #0
movs r1, #0xcc
bl sub_0801D630
bl _DmaZero
movs r0, #0xff
strb r0, [r4, #0x10]
strb r0, [r4, #0x11]
@@ -1178,7 +1178,7 @@ sub_08052FF4: @ 0x08052FF4
ldr r5, _08053074 @ =gUnk_020342CC
adds r0, r5, #0
movs r1, #0x20
bl sub_0801D630
bl _DmaZero
str r5, [r5, #0x20]
ldr r0, _08053078 @ =gUnk_0811E214
lsls r6, r6, #2
@@ -1570,17 +1570,17 @@ sub_08053320: @ 0x08053320
movs r4, #0x80
lsls r4, r4, #4
adds r1, r4, #0
bl sub_0801D630
bl _DmaZero
ldr r0, _08053380 @ =gUnk_02021F30
adds r1, r4, #0
bl sub_0801D630
bl _DmaZero
ldr r0, _08053384 @ =gUnk_020344B0
adds r1, r4, #0
bl sub_0801D630
bl _DmaZero
ldr r0, _08053388 @ =gUnk_02001A40
movs r1, #0x80
lsls r1, r1, #5
bl sub_0801D630
bl _DmaZero
movs r0, #0x10
bl sub_0801D7EC
movs r0, #0x17
@@ -1712,7 +1712,7 @@ sub_08053434: @ 0x08053434
bl sub_08053460
movs r0, #5
movs r1, #6
bl sub_080A7138
bl MenuFadeIn
_0805345A:
pop {pc}
.align 2, 0
@@ -1878,7 +1878,7 @@ _0805358C: .4byte 0x0000FFFF
sub_08053590: @ 0x08053590
push {lr}
ldr r1, _080535A4 @ =gUnk_080FCBB4
ldr r0, _080535A8 @ =gUnk_02000080
ldr r0, _080535A8 @ =gMenu
ldrb r0, [r0, #6]
lsls r0, r0, #2
adds r0, r0, r1
@@ -1887,12 +1887,12 @@ sub_08053590: @ 0x08053590
pop {pc}
.align 2, 0
_080535A4: .4byte gUnk_080FCBB4
_080535A8: .4byte gUnk_02000080
_080535A8: .4byte gMenu
thumb_func_start sub_080535AC
sub_080535AC: @ 0x080535AC
push {lr}
ldr r2, _080535DC @ =gUnk_02000080
ldr r2, _080535DC @ =gMenu
movs r1, #1
strb r1, [r2, #6]
movs r0, #0x78
@@ -1913,7 +1913,7 @@ sub_080535AC: @ 0x080535AC
bl DoFade
pop {pc}
.align 2, 0
_080535DC: .4byte gUnk_02000080
_080535DC: .4byte gMenu
_080535E0: .4byte gUnk_02032EC0
_080535E4: .4byte gUnk_02000070
_080535E8: .4byte gScreen
@@ -1928,14 +1928,14 @@ sub_080535F4: @ 0x080535F4
cmp r0, #0
bne _08053608
bl sub_0805E5B4
ldr r1, _08053610 @ =gUnk_02000080
ldr r1, _08053610 @ =gMenu
movs r0, #2
strb r0, [r1, #6]
_08053608:
pop {pc}
.align 2, 0
_0805360C: .4byte gUnk_03000FD0
_08053610: .4byte gUnk_02000080
_08053610: .4byte gMenu
thumb_func_start nullsub_481
nullsub_481: @ 0x08053614
@@ -1945,7 +1945,7 @@ nullsub_481: @ 0x08053614
thumb_func_start sub_08053618
sub_08053618: @ 0x08053618
push {lr}
ldr r1, _08053630 @ =gUnk_02000080
ldr r1, _08053630 @ =gMenu
ldrh r0, [r1, #8]
subs r0, #1
strh r0, [r1, #8]
@@ -1956,7 +1956,7 @@ sub_08053618: @ 0x08053618
_0805362C:
pop {pc}
.align 2, 0
_08053630: .4byte gUnk_02000080
_08053630: .4byte gMenu
thumb_func_start sub_08053634
sub_08053634: @ 0x08053634
@@ -1999,13 +1999,13 @@ _08053678: .4byte gRoomControls
thumb_func_start sub_0805367C
sub_0805367C: @ 0x0805367C
ldr r1, _08053688 @ =gUnk_02000080
ldr r1, _08053688 @ =gMenu
ldrb r0, [r1, #6]
adds r0, #1
strb r0, [r1, #6]
bx lr
.align 2, 0
_08053688: .4byte gUnk_02000080
_08053688: .4byte gMenu
thumb_func_start sub_0805368C
sub_0805368C: @ 0x0805368C
@@ -2051,7 +2051,7 @@ sub_080536B8: @ 0x080536B8
sub_080536D4: @ 0x080536D4
push {lr}
ldr r1, _080536E8 @ =gUnk_080FCCFC
ldr r0, _080536EC @ =gUnk_02000080
ldr r0, _080536EC @ =gMenu
ldrb r0, [r0, #6]
lsls r0, r0, #2
adds r0, r0, r1
@@ -2060,13 +2060,13 @@ sub_080536D4: @ 0x080536D4
pop {pc}
.align 2, 0
_080536E8: .4byte gUnk_080FCCFC
_080536EC: .4byte gUnk_02000080
_080536EC: .4byte gMenu
thumb_func_start sub_080536F0
sub_080536F0: @ 0x080536F0
push {lr}
ldr r1, _08053704 @ =gUnk_080FCD38
ldr r0, _08053708 @ =gUnk_02000080
ldr r0, _08053708 @ =gMenu
ldrb r0, [r0, #6]
lsls r0, r0, #2
adds r0, r0, r1
@@ -2075,12 +2075,12 @@ sub_080536F0: @ 0x080536F0
pop {pc}
.align 2, 0
_08053704: .4byte gUnk_080FCD38
_08053708: .4byte gUnk_02000080
_08053708: .4byte gMenu
thumb_func_start sub_0805370C
sub_0805370C: @ 0x0805370C
push {lr}
ldr r1, _08053730 @ =gUnk_02000080
ldr r1, _08053730 @ =gMenu
ldrb r0, [r1, #6]
adds r0, #1
strb r0, [r1, #6]
@@ -2095,7 +2095,7 @@ sub_0805370C: @ 0x0805370C
bl DoFade
pop {pc}
.align 2, 0
_08053730: .4byte gUnk_02000080
_08053730: .4byte gMenu
_08053734: .4byte gUnk_02000070
_08053738: .4byte gUnk_080FCC54
@@ -2103,7 +2103,7 @@ _08053738: .4byte gUnk_080FCC54
sub_0805373C: @ 0x0805373C
push {lr}
ldr r1, _08053750 @ =gUnk_080FCD40
ldr r0, _08053754 @ =gUnk_02000080
ldr r0, _08053754 @ =gMenu
ldrb r0, [r0, #6]
lsls r0, r0, #2
adds r0, r0, r1
@@ -2112,12 +2112,12 @@ sub_0805373C: @ 0x0805373C
pop {pc}
.align 2, 0
_08053750: .4byte gUnk_080FCD40
_08053754: .4byte gUnk_02000080
_08053754: .4byte gMenu
thumb_func_start sub_08053758
sub_08053758: @ 0x08053758
push {r4, lr}
ldr r1, _080537DC @ =gUnk_02000080
ldr r1, _080537DC @ =gMenu
movs r2, #0
movs r3, #1
strb r3, [r1, #6]
@@ -2177,7 +2177,7 @@ sub_08053758: @ 0x08053758
bl DoFade
pop {r4, pc}
.align 2, 0
_080537DC: .4byte gUnk_02000080
_080537DC: .4byte gMenu
_080537E0: .4byte gUnk_02032EC0
_080537E4: .4byte gUnk_02025EB0
_080537E8: .4byte gUnk_0200B650
@@ -2194,7 +2194,7 @@ sub_08053800: @ 0x08053800
ldrb r0, [r0]
cmp r0, #0
bne _0805387A
ldr r1, _08053880 @ =gUnk_02000080
ldr r1, _08053880 @ =gMenu
ldrb r5, [r1, #0x10]
lsls r4, r5, #1
adds r4, r4, r5
@@ -2222,7 +2222,7 @@ sub_08053800: @ 0x08053800
ldr r0, _08053888 @ =gUnk_02021F30
movs r1, #0x80
lsls r1, r1, #4
bl sub_0801D630
bl _DmaZero
ldr r0, _0805388C @ =0x00000F01
adds r5, r5, r0
ldr r1, [r4]
@@ -2249,7 +2249,7 @@ _0805387A:
pop {r4, r5, pc}
.align 2, 0
_0805387C: .4byte gUnk_03000FD0
_08053880: .4byte gUnk_02000080
_08053880: .4byte gMenu
_08053884: .4byte gUnk_080FCCB4
_08053888: .4byte gUnk_02021F30
_0805388C: .4byte 0x00000F01
@@ -2262,7 +2262,7 @@ sub_08053894: @ 0x08053894
ldrb r0, [r0]
cmp r0, #0
bne _080538F8
ldr r1, _080538B8 @ =gUnk_02000080
ldr r1, _080538B8 @ =gMenu
ldrh r0, [r1, #8]
subs r0, #1
strh r0, [r1, #8]
@@ -2275,7 +2275,7 @@ sub_08053894: @ 0x08053894
b _080538E4
.align 2, 0
_080538B4: .4byte gUnk_03000FD0
_080538B8: .4byte gUnk_02000080
_080538B8: .4byte gMenu
_080538BC:
ldr r0, _080538FC @ =gUnk_030010A0
ldr r0, [r0]
@@ -2320,7 +2320,7 @@ sub_08053904: @ 0x08053904
ldrb r0, [r0]
cmp r0, #0
bne _08053968
ldr r1, _08053928 @ =gUnk_02000080
ldr r1, _08053928 @ =gMenu
ldrh r0, [r1, #8]
subs r0, #1
strh r0, [r1, #8]
@@ -2333,7 +2333,7 @@ sub_08053904: @ 0x08053904
b _08053954
.align 2, 0
_08053924: .4byte gUnk_03000FD0
_08053928: .4byte gUnk_02000080
_08053928: .4byte gMenu
_0805392C:
ldr r0, _0805396C @ =gUnk_030010A0
ldr r0, [r0]
@@ -2389,7 +2389,7 @@ sub_08053974: @ 0x08053974
lsls r1, r1, #1
movs r0, #5
bl DoFade
ldr r1, _080539B4 @ =gUnk_02000080
ldr r1, _080539B4 @ =gMenu
ldrb r0, [r1, #6]
adds r0, #1
strb r0, [r1, #6]
@@ -2398,7 +2398,7 @@ _080539A8:
.align 2, 0
_080539AC: .4byte gUnk_03000FD0
_080539B0: .4byte gUnk_080FCBC4
_080539B4: .4byte gUnk_02000080
_080539B4: .4byte gMenu
thumb_func_start nullsub_482
nullsub_482: @ 0x080539B8
@@ -2420,14 +2420,14 @@ sub_080539BC: @ 0x080539BC
bl sub_0804B0B0
ldr r0, _080539EC @ =gUnk_080FCC14
bl LoadRoomEntityList
ldr r1, _080539F0 @ =gUnk_02000080
ldr r1, _080539F0 @ =gMenu
ldrb r0, [r1, #6]
adds r0, #1
strb r0, [r1, #6]
pop {pc}
.align 2, 0
_080539EC: .4byte gUnk_080FCC14
_080539F0: .4byte gUnk_02000080
_080539F0: .4byte gMenu
thumb_func_start sub_080539F4
sub_080539F4: @ 0x080539F4
@@ -2438,7 +2438,7 @@ sub_080539F4: @ 0x080539F4
bne _08053A10
movs r0, #1
bl sub_0801DA90
ldr r0, _08053A18 @ =gUnk_02000080
ldr r0, _08053A18 @ =gMenu
ldrb r1, [r0, #6]
adds r1, #1
strb r1, [r0, #6]
@@ -2448,12 +2448,12 @@ _08053A10:
pop {pc}
.align 2, 0
_08053A14: .4byte gUnk_03000FD0
_08053A18: .4byte gUnk_02000080
_08053A18: .4byte gMenu
thumb_func_start sub_08053A1C
sub_08053A1C: @ 0x08053A1C
push {r4, lr}
ldr r1, _08053A50 @ =gUnk_02000080
ldr r1, _08053A50 @ =gMenu
ldrh r0, [r1, #8]
subs r0, #1
strh r0, [r1, #8]
@@ -2478,7 +2478,7 @@ sub_08053A1C: @ 0x08053A1C
_08053A4E:
pop {r4, pc}
.align 2, 0
_08053A50: .4byte gUnk_02000080
_08053A50: .4byte gMenu
_08053A54: .4byte 0x00000F07
_08053A58: .4byte gTextBox
@@ -2491,7 +2491,7 @@ sub_08053A5C: @ 0x08053A5C
ands r0, r1
cmp r0, #0
bne _08053A86
ldr r1, _08053A8C @ =gUnk_02000080
ldr r1, _08053A8C @ =gMenu
ldrh r0, [r1, #8]
subs r0, #1
strh r0, [r1, #8]
@@ -2508,7 +2508,7 @@ _08053A86:
pop {pc}
.align 2, 0
_08053A88: .4byte gTextBox
_08053A8C: .4byte gUnk_02000080
_08053A8C: .4byte gMenu
thumb_func_start sub_08053A90
sub_08053A90: @ 0x08053A90
@@ -2531,7 +2531,7 @@ _08053AAC: .4byte gUnk_02032EC0
sub_08053AB0: @ 0x08053AB0
push {lr}
ldr r1, _08053AC4 @ =gUnk_080FCDD4
ldr r0, _08053AC8 @ =gUnk_02000080
ldr r0, _08053AC8 @ =gMenu
ldrb r0, [r0, #6]
lsls r0, r0, #2
adds r0, r0, r1
@@ -2540,12 +2540,12 @@ sub_08053AB0: @ 0x08053AB0
pop {pc}
.align 2, 0
_08053AC4: .4byte gUnk_080FCDD4
_08053AC8: .4byte gUnk_02000080
_08053AC8: .4byte gMenu
thumb_func_start sub_08053ACC
sub_08053ACC: @ 0x08053ACC
push {lr}
ldr r1, _08053AF4 @ =gUnk_02000080
ldr r1, _08053AF4 @ =gMenu
ldrb r0, [r1, #6]
adds r0, #1
strb r0, [r1, #6]
@@ -2561,19 +2561,19 @@ sub_08053ACC: @ 0x08053ACC
bl DoFade
pop {pc}
.align 2, 0
_08053AF4: .4byte gUnk_02000080
_08053AF4: .4byte gMenu
_08053AF8: .4byte gUnk_02000070
_08053AFC: .4byte gUnk_080FCD84
thumb_func_start sub_08053B00
sub_08053B00: @ 0x08053B00
ldr r1, _08053B0C @ =gUnk_02000080
ldr r1, _08053B0C @ =gMenu
ldrb r0, [r1, #6]
adds r0, #1
strb r0, [r1, #6]
bx lr
.align 2, 0
_08053B0C: .4byte gUnk_02000080
_08053B0C: .4byte gMenu
thumb_func_start sub_08053B10
sub_08053B10: @ 0x08053B10
@@ -2582,7 +2582,7 @@ sub_08053B10: @ 0x08053B10
bl CheckRoomFlag
cmp r0, #0
beq _08053B34
ldr r0, _08053B38 @ =gUnk_02000080
ldr r0, _08053B38 @ =gMenu
ldrb r1, [r0, #5]
adds r1, #1
strb r1, [r0, #5]
@@ -2595,7 +2595,7 @@ sub_08053B10: @ 0x08053B10
_08053B34:
pop {pc}
.align 2, 0
_08053B38: .4byte gUnk_02000080
_08053B38: .4byte gMenu
thumb_func_start sub_08053B3C
sub_08053B3C: @ 0x08053B3C
@@ -2616,7 +2616,7 @@ sub_08053B3C: @ 0x08053B3C
sub_08053B58: @ 0x08053B58
push {lr}
ldr r1, _08053B6C @ =gUnk_080FCEB0
ldr r0, _08053B70 @ =gUnk_02000080
ldr r0, _08053B70 @ =gMenu
ldrb r0, [r0, #6]
lsls r0, r0, #2
adds r0, r0, r1
@@ -2625,12 +2625,12 @@ sub_08053B58: @ 0x08053B58
pop {pc}
.align 2, 0
_08053B6C: .4byte gUnk_080FCEB0
_08053B70: .4byte gUnk_02000080
_08053B70: .4byte gMenu
thumb_func_start sub_08053B74
sub_08053B74: @ 0x08053B74
push {lr}
ldr r1, _08053BA0 @ =gUnk_02000080
ldr r1, _08053BA0 @ =gMenu
ldrb r0, [r1, #6]
adds r0, #1
strb r0, [r1, #6]
@@ -2647,19 +2647,19 @@ sub_08053B74: @ 0x08053B74
bl DoFade
pop {pc}
.align 2, 0
_08053BA0: .4byte gUnk_02000080
_08053BA0: .4byte gMenu
_08053BA4: .4byte gUnk_02000070
_08053BA8: .4byte gUnk_080FCDE0
thumb_func_start sub_08053BAC
sub_08053BAC: @ 0x08053BAC
ldr r1, _08053BB8 @ =gUnk_02000080
ldr r1, _08053BB8 @ =gMenu
ldrb r0, [r1, #6]
adds r0, #1
strb r0, [r1, #6]
bx lr
.align 2, 0
_08053BB8: .4byte gUnk_02000080
_08053BB8: .4byte gMenu
thumb_func_start sub_08053BBC
sub_08053BBC: @ 0x08053BBC
@@ -2668,7 +2668,7 @@ sub_08053BBC: @ 0x08053BBC
bl CheckRoomFlag
cmp r0, #0
beq _08053BE0
ldr r0, _08053BE4 @ =gUnk_02000080
ldr r0, _08053BE4 @ =gMenu
ldrb r1, [r0, #5]
adds r1, #1
strb r1, [r0, #5]
@@ -2681,7 +2681,7 @@ sub_08053BBC: @ 0x08053BBC
_08053BE0:
pop {pc}
.align 2, 0
_08053BE4: .4byte gUnk_02000080
_08053BE4: .4byte gMenu
thumb_func_start sub_08053BE8
sub_08053BE8: @ 0x08053BE8
@@ -2702,7 +2702,7 @@ sub_08053BE8: @ 0x08053BE8
sub_08053C04: @ 0x08053C04
push {lr}
ldr r1, _08053C18 @ =gUnk_080FCEEC
ldr r0, _08053C1C @ =gUnk_02000080
ldr r0, _08053C1C @ =gMenu
ldrb r0, [r0, #6]
lsls r0, r0, #2
adds r0, r0, r1
@@ -2711,12 +2711,12 @@ sub_08053C04: @ 0x08053C04
pop {pc}
.align 2, 0
_08053C18: .4byte gUnk_080FCEEC
_08053C1C: .4byte gUnk_02000080
_08053C1C: .4byte gMenu
thumb_func_start sub_08053C20
sub_08053C20: @ 0x08053C20
push {lr}
ldr r1, _08053C50 @ =gUnk_02000080
ldr r1, _08053C50 @ =gMenu
movs r2, #1
strb r2, [r1, #6]
movs r0, #0x78
@@ -2735,7 +2735,7 @@ sub_08053C20: @ 0x08053C20
bl PlaySFX
pop {pc}
.align 2, 0
_08053C50: .4byte gUnk_02000080
_08053C50: .4byte gMenu
_08053C54: .4byte gUnk_02000070
_08053C58: .4byte gUnk_080FCEBC
@@ -2762,18 +2762,18 @@ _08053C80: .4byte 0x80100000
thumb_func_start sub_08053C84
sub_08053C84: @ 0x08053C84
ldr r1, _08053C8C @ =gUnk_02000080
ldr r1, _08053C8C @ =gMenu
movs r0, #2
strb r0, [r1, #6]
bx lr
.align 2, 0
_08053C8C: .4byte gUnk_02000080
_08053C8C: .4byte gMenu
thumb_func_start sub_08053C90
sub_08053C90: @ 0x08053C90
push {lr}
ldr r1, _08053CA4 @ =gUnk_080FCEF8
ldr r0, _08053CA8 @ =gUnk_02000080
ldr r0, _08053CA8 @ =gMenu
ldrb r0, [r0, #3]
lsls r0, r0, #2
adds r0, r0, r1
@@ -2782,13 +2782,13 @@ sub_08053C90: @ 0x08053C90
pop {pc}
.align 2, 0
_08053CA4: .4byte gUnk_080FCEF8
_08053CA8: .4byte gUnk_02000080
_08053CA8: .4byte gMenu
thumb_func_start sub_08053CAC
sub_08053CAC: @ 0x08053CAC
push {lr}
ldr r1, _08053CC0 @ =gUnk_080FCFA4
ldr r0, _08053CC4 @ =gUnk_02000080
ldr r0, _08053CC4 @ =gMenu
ldrb r0, [r0, #6]
lsls r0, r0, #2
adds r0, r0, r1
@@ -2797,12 +2797,12 @@ sub_08053CAC: @ 0x08053CAC
pop {pc}
.align 2, 0
_08053CC0: .4byte gUnk_080FCFA4
_08053CC4: .4byte gUnk_02000080
_08053CC4: .4byte gMenu
thumb_func_start sub_08053CC8
sub_08053CC8: @ 0x08053CC8
push {r4, r5, r6, lr}
ldr r6, _08053D20 @ =gUnk_02000080
ldr r6, _08053D20 @ =gMenu
ldrb r4, [r6, #3]
lsls r4, r4, #4
ldr r0, _08053D24 @ =gUnk_080FCF04
@@ -2815,12 +2815,12 @@ sub_08053CC8: @ 0x08053CC8
ldrb r0, [r4, #4]
ldrb r1, [r4, #5]
movs r2, #1
bl sub_0804B0FC
bl GetRoomProperty
bl LoadRoomEntityList
ldrb r0, [r4, #4]
ldrb r1, [r4, #5]
movs r2, #2
bl sub_0804B0FC
bl GetRoomProperty
bl LoadRoomEntityList
movs r5, #1
strb r5, [r6, #6]
@@ -2841,7 +2841,7 @@ sub_08053CC8: @ 0x08053CC8
_08053D1E:
pop {r4, r5, r6, pc}
.align 2, 0
_08053D20: .4byte gUnk_02000080
_08053D20: .4byte gMenu
_08053D24: .4byte gUnk_080FCF04
_08053D28: .4byte gScreen
_08053D2C: .4byte 0x0000FEFF
@@ -2850,7 +2850,7 @@ _08053D30: .4byte gUnk_02000070
thumb_func_start sub_08053D34
sub_08053D34: @ 0x08053D34
push {r4, lr}
ldr r1, _08053D88 @ =gUnk_02000080
ldr r1, _08053D88 @ =gMenu
ldrh r0, [r1, #0xa]
cmp r0, #0
beq _08053D72
@@ -2882,7 +2882,7 @@ _08053D72:
ldrb r0, [r0]
cmp r0, #0
bne _08053D86
ldr r1, _08053D88 @ =gUnk_02000080
ldr r1, _08053D88 @ =gMenu
movs r0, #0x78
strh r0, [r1, #8]
ldrb r0, [r1, #6]
@@ -2891,13 +2891,13 @@ _08053D72:
_08053D86:
pop {r4, pc}
.align 2, 0
_08053D88: .4byte gUnk_02000080
_08053D88: .4byte gMenu
_08053D8C: .4byte gUnk_03000FD0
thumb_func_start sub_08053D90
sub_08053D90: @ 0x08053D90
push {lr}
ldr r1, _08053DB0 @ =gUnk_02000080
ldr r1, _08053DB0 @ =gMenu
ldrh r0, [r1, #8]
subs r0, #1
strh r0, [r1, #8]
@@ -2912,7 +2912,7 @@ sub_08053D90: @ 0x08053D90
_08053DAC:
pop {pc}
.align 2, 0
_08053DB0: .4byte gUnk_02000080
_08053DB0: .4byte gMenu
thumb_func_start sub_08053DB4
sub_08053DB4: @ 0x08053DB4
@@ -2921,7 +2921,7 @@ sub_08053DB4: @ 0x08053DB4
ldrb r0, [r0]
cmp r0, #0
bne _08053E1C
ldr r5, _08053E24 @ =gUnk_02000080
ldr r5, _08053E24 @ =gMenu
ldr r4, [r5, #0xc]
ldrb r0, [r4, #4]
ldrb r1, [r4, #5]
@@ -2946,12 +2946,12 @@ sub_08053DB4: @ 0x08053DB4
ldrb r0, [r4, #4]
ldrb r1, [r4, #5]
movs r2, #1
bl sub_0804B0FC
bl GetRoomProperty
bl LoadRoomEntityList
ldrb r0, [r4, #4]
ldrb r1, [r4, #5]
movs r2, #2
bl sub_0804B0FC
bl GetRoomProperty
bl LoadRoomEntityList
movs r0, #0x78
strh r0, [r5, #8]
@@ -2964,7 +2964,7 @@ _08053E1C:
pop {r4, r5, pc}
.align 2, 0
_08053E20: .4byte gUnk_03000FD0
_08053E24: .4byte gUnk_02000080
_08053E24: .4byte gMenu
_08053E28: .4byte gUnk_02000070
_08053E2C: .4byte gRoomControls
@@ -2975,7 +2975,7 @@ sub_08053E30: @ 0x08053E30
ldrb r0, [r0]
cmp r0, #0
bne _08053E4E
ldr r1, _08053E54 @ =gUnk_02000080
ldr r1, _08053E54 @ =gMenu
ldrh r0, [r1, #8]
subs r0, #1
strh r0, [r1, #8]
@@ -2989,13 +2989,13 @@ _08053E4E:
pop {pc}
.align 2, 0
_08053E50: .4byte gUnk_03000FD0
_08053E54: .4byte gUnk_02000080
_08053E54: .4byte gMenu
thumb_func_start sub_08053E58
sub_08053E58: @ 0x08053E58
push {lr}
ldr r1, _08053E6C @ =gUnk_080FD108
ldr r0, _08053E70 @ =gUnk_02000080
ldr r0, _08053E70 @ =gMenu
ldrb r0, [r0, #6]
lsls r0, r0, #2
adds r0, r0, r1
@@ -3004,13 +3004,13 @@ sub_08053E58: @ 0x08053E58
pop {pc}
.align 2, 0
_08053E6C: .4byte gUnk_080FD108
_08053E70: .4byte gUnk_02000080
_08053E70: .4byte gMenu
thumb_func_start sub_08053E74
sub_08053E74: @ 0x08053E74
push {r4, lr}
ldr r0, _08053EB0 @ =gUnk_080FCFB8
ldr r4, _08053EB4 @ =gUnk_02000080
ldr r4, _08053EB4 @ =gMenu
str r0, [r4, #0xc]
ldr r0, [r0]
bl LoadRoomEntityList
@@ -3037,7 +3037,7 @@ sub_08053E74: @ 0x08053E74
pop {r4, pc}
.align 2, 0
_08053EB0: .4byte gUnk_080FCFB8
_08053EB4: .4byte gUnk_02000080
_08053EB4: .4byte gMenu
_08053EB8: .4byte gScreen
_08053EBC: .4byte 0x0000FEFF
_08053EC0: .4byte gUnk_02000070
@@ -3049,7 +3049,7 @@ sub_08053EC4: @ 0x08053EC4
ldrb r0, [r0]
cmp r0, #0
bne _08053EF0
ldr r4, _08053EF8 @ =gUnk_02000080
ldr r4, _08053EF8 @ =gMenu
ldrh r0, [r4, #0xa]
subs r0, #1
strh r0, [r4, #0xa]
@@ -3069,12 +3069,12 @@ _08053EF0:
pop {r4, pc}
.align 2, 0
_08053EF4: .4byte gUnk_03000FD0
_08053EF8: .4byte gUnk_02000080
_08053EF8: .4byte gMenu
thumb_func_start sub_08053EFC
sub_08053EFC: @ 0x08053EFC
push {lr}
ldr r1, _08053F1C @ =gUnk_02000080
ldr r1, _08053F1C @ =gMenu
ldrh r0, [r1, #8]
subs r0, #1
strh r0, [r1, #8]
@@ -3089,7 +3089,7 @@ sub_08053EFC: @ 0x08053EFC
_08053F18:
pop {pc}
.align 2, 0
_08053F1C: .4byte gUnk_02000080
_08053F1C: .4byte gMenu
thumb_func_start sub_08053F20
sub_08053F20: @ 0x08053F20
@@ -3099,7 +3099,7 @@ sub_08053F20: @ 0x08053F20
cmp r0, #0
bne _08053F74
bl sub_0805E89C
ldr r5, _08053F7C @ =gUnk_02000080
ldr r5, _08053F7C @ =gMenu
ldr r4, [r5, #0xc]
ldrb r0, [r4, #8]
ldrb r1, [r4, #9]
@@ -3134,7 +3134,7 @@ _08053F74:
pop {r4, r5, pc}
.align 2, 0
_08053F78: .4byte gUnk_03000FD0
_08053F7C: .4byte gUnk_02000080
_08053F7C: .4byte gMenu
_08053F80: .4byte gUnk_02000070
_08053F84: .4byte gRoomControls
@@ -3145,7 +3145,7 @@ sub_08053F88: @ 0x08053F88
ldrb r0, [r0]
cmp r0, #0
bne _08053FAA
ldr r1, _08053FB0 @ =gUnk_02000080
ldr r1, _08053FB0 @ =gMenu
ldrh r0, [r1, #8]
subs r0, #1
strh r0, [r1, #8]
@@ -3160,13 +3160,13 @@ _08053FAA:
pop {pc}
.align 2, 0
_08053FAC: .4byte gUnk_03000FD0
_08053FB0: .4byte gUnk_02000080
_08053FB0: .4byte gMenu
thumb_func_start sub_08053FB4
sub_08053FB4: @ 0x08053FB4
push {lr}
ldr r1, _08053FC8 @ =gUnk_080FD138
ldr r0, _08053FCC @ =gUnk_02000080
ldr r0, _08053FCC @ =gMenu
ldrb r0, [r0, #3]
lsls r0, r0, #2
adds r0, r0, r1
@@ -3175,7 +3175,7 @@ sub_08053FB4: @ 0x08053FB4
pop {pc}
.align 2, 0
_08053FC8: .4byte gUnk_080FD138
_08053FCC: .4byte gUnk_02000080
_08053FCC: .4byte gMenu
thumb_func_start GetSaleItemConfirmMessageID
GetSaleItemConfirmMessageID: @ 0x08053FD0
asm/code_0805436C.s
+189 -890
View File
File diff suppressed because it is too large Load Diff
asm/code_08055FF4.s
+1 -1
View File
@@ -156,7 +156,7 @@ _08056112:
ldr r4, _0805612C @ =gUnk_02000010
adds r0, r4, #0
movs r1, #0x20
bl sub_0801D630
bl _DmaZero
ldr r0, _08056130 @ =0x4D435A33
str r0, [r4]
_08056124:
asm/code_08056418.s
+7 -7
View File
@@ -16,7 +16,7 @@ sub_08056458: @ 0x08056458
bne _08056470
ldr r0, _08056488 @ =gUnk_02022780
movs r1, #0xa8
bl sub_0801D630
bl _DmaZero
movs r0, #1
bl sub_080564C8
_08056470:
@@ -91,14 +91,14 @@ sub_080564EC: @ 0x080564EC
push {r4, lr}
ldr r0, _08056598 @ =gUnk_02036A40
movs r1, #8
bl sub_0801D630
bl _DmaZero
ldr r0, _0805659C @ =gUnk_02024030
movs r1, #0x18
bl sub_0801D630
bl _DmaZero
ldr r4, _080565A0 @ =gUnk_02022780
adds r0, r4, #0
movs r1, #0xa8
bl sub_0801D630
bl _DmaZero
ldr r0, _080565A4 @ =gTextBox
adds r1, r4, #0
movs r2, #0x20
@@ -572,11 +572,11 @@ _080568B2:
beq _080568D2
adds r0, r6, #0
movs r1, #4
bl sub_0801D630
bl _DmaZero
ldr r4, _08056910 @ =gUnk_02024030
adds r0, r4, #0
movs r1, #0x18
bl sub_0801D630
bl _DmaZero
movs r0, #1
strb r0, [r4]
strb r0, [r6]
@@ -777,7 +777,7 @@ _08056A30:
movs r1, #3
strb r1, [r2]
movs r1, #0x18
bl sub_0801D630
bl _DmaZero
movs r0, #0x6a
bl PlaySFX
adds r1, r6, #0
asm/code_0805E3B0.s
+5 -5
View File
@@ -354,21 +354,21 @@ sub_0805E5F8: @ 0x0805E5F8
.align 2, 0
_0805E608: .4byte gUnk_03005F40
thumb_func_start sub_0805E60C
sub_0805E60C: @ 0x0805E60C
thumb_func_start EraseAllEntities
EraseAllEntities: @ 0x0805E60C
push {lr}
bl sub_0805E89C
ldr r0, _0805E654 @ =gUnk_03003DC0
movs r1, #0xc
bl sub_0801D630
bl _DmaZero
ldr r0, _0805E658 @ =gLinkEntity
movs r1, #0xaa
lsls r1, r1, #6
bl sub_0801D630
bl _DmaZero
ldr r0, _0805E65C @ =gUnk_02033290
movs r1, #0x80
lsls r1, r1, #4
bl sub_0801D630
bl _DmaZero
bl sub_0805E98C
ldr r0, _0805E660 @ =gUnk_03003DBC
movs r1, #0
asm/code_0805E744.s
+23 -23
View File
@@ -252,7 +252,7 @@ sub_0805E900: @ 0x0805E900
bl sub_0805EA98
adds r0, r4, #0
movs r1, #0x40
bl sub_0801D630
bl _DmaZero
ldr r1, _0805E928 @ =gUnk_020354B4
ldrb r0, [r1]
subs r0, #1
@@ -1594,7 +1594,7 @@ _0805F2D0:
bne _0805F2F0
adds r0, r5, #0
movs r1, #0xc
bl sub_0801D630
bl _DmaZero
ldrb r0, [r4]
movs r1, #1
orrs r0, r1
@@ -1624,7 +1624,7 @@ _0805F308:
cmp r0, r2
bne _0805F318
movs r1, #0xc
bl sub_0801D630
bl _DmaZero
b _0805F320
.align 2, 0
_0805F314: .4byte gUnk_02036540
@@ -1787,7 +1787,7 @@ sub_0805F440: @ 0x0805F440
adds r4, r0, #0
adds r5, r1, #0
movs r1, #0x30
bl sub_0801D630
bl _DmaZero
ldr r0, _0805F45C @ =0x0000FFFF
cmp r5, r0
bls _0805F460
@@ -1965,7 +1965,7 @@ _0805F596:
_0805F59E:
ldr r0, _0805F5C8 @ =gUnk_02034330
movs r1, #0x18
bl sub_0801D630
bl _DmaZero
_0805F5A6:
mov r0, sb
mov r1, sp
@@ -2562,11 +2562,11 @@ sub_0805FA04: @ 0x0805FA04
ldr r0, _0805FA78 @ =gUnk_02034CB0
movs r1, #0x80
lsls r1, r1, #4
bl sub_0801D630
bl _DmaZero
ldr r0, _0805FA7C @ =gUnk_02001A40
movs r1, #0x80
lsls r1, r1, #5
bl sub_0801D630
bl _DmaZero
ldr r0, _0805FA80 @ =gScreen
movs r2, #0
movs r1, #0x94
@@ -2585,11 +2585,11 @@ sub_0805FA04: @ 0x0805FA04
ldr r0, _0805FA88 @ =gUnk_02032EC0
movs r1, #0xed
lsls r1, r1, #2
bl sub_0801D630
ldr r4, _0805FA8C @ =gUnk_02000080
bl _DmaZero
ldr r4, _0805FA8C @ =gMenu
adds r0, r4, #0
movs r1, #0x30
bl sub_0801D630
bl _DmaZero
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #7]
@@ -2609,7 +2609,7 @@ _0805FA7C: .4byte gUnk_02001A40
_0805FA80: .4byte gScreen
_0805FA84: .4byte 0x00001E0F
_0805FA88: .4byte gUnk_02032EC0
_0805FA8C: .4byte gUnk_02000080
_0805FA8C: .4byte gMenu
_0805FA90: .4byte 0x00001144
_0805FA94: .4byte gUnk_03001000
@@ -2641,23 +2641,23 @@ _0805FAB8:
beq _0805FAE8
b _0805FB4A
_0805FACA:
ldr r1, _0805FAD4 @ =gUnk_02000080
ldr r1, _0805FAD4 @ =gMenu
ldrb r0, [r1, #0x11]
subs r0, #1
strb r0, [r1, #0x11]
b _0805FBA4
.align 2, 0
_0805FAD4: .4byte gUnk_02000080
_0805FAD4: .4byte gMenu
_0805FAD8:
ldr r1, _0805FAE4 @ =gUnk_02000080
ldr r1, _0805FAE4 @ =gMenu
ldrb r0, [r1, #0x11]
adds r0, #1
strb r0, [r1, #0x11]
b _0805FBA4
.align 2, 0
_0805FAE4: .4byte gUnk_02000080
_0805FAE4: .4byte gMenu
_0805FAE8:
ldr r0, _0805FB04 @ =gUnk_02000080
ldr r0, _0805FB04 @ =gMenu
ldrb r1, [r0, #0x10]
movs r2, #1
eors r1, r2
@@ -2671,7 +2671,7 @@ _0805FAE8:
strh r1, [r0, #0x2c]
b _0805FBA4
.align 2, 0
_0805FB04: .4byte gUnk_02000080
_0805FB04: .4byte gMenu
_0805FB08: .4byte gScreen
_0805FB0C: .4byte 0x00001F0C
_0805FB10:
@@ -2688,7 +2688,7 @@ _0805FB24: .4byte 0x00001E0C
_0805FB28:
movs r2, #0x80
lsls r2, r2, #0x12
ldr r1, _0805FB40 @ =gUnk_02000080
ldr r1, _0805FB40 @ =gMenu
ldrb r0, [r1, #0x16]
strb r0, [r2, #7]
ldrb r0, [r1, #0x14]
@@ -2698,7 +2698,7 @@ _0805FB28:
bl TextboxNoOverlapFollow
b _0805FBA4
.align 2, 0
_0805FB40: .4byte gUnk_02000080
_0805FB40: .4byte gMenu
_0805FB44:
bl sub_08056418
b _0805FBA4
@@ -2717,7 +2717,7 @@ _0805FB5A:
_0805FB5E:
movs r1, #0
_0805FB60:
ldr r4, _0805FB74 @ =gUnk_02000080
ldr r4, _0805FB74 @ =gMenu
ldrb r0, [r4, #0x11]
cmp r0, #1
beq _0805FB8E
@@ -2727,7 +2727,7 @@ _0805FB60:
beq _0805FB7E
b _0805FBA4
.align 2, 0
_0805FB74: .4byte gUnk_02000080
_0805FB74: .4byte gMenu
_0805FB78:
cmp r0, #2
beq _0805FB96
@@ -2753,7 +2753,7 @@ _0805FB96:
bl __modsi3
strb r0, [r4, #0x16]
_0805FBA4:
ldr r4, _0805FBBC @ =gUnk_02000080
ldr r4, _0805FBBC @ =gMenu
ldrb r0, [r4, #0x11]
adds r0, #3
movs r1, #3
@@ -2764,7 +2764,7 @@ _0805FBA4:
strh r0, [r1, #0x32]
pop {r4, pc}
.align 2, 0
_0805FBBC: .4byte gUnk_02000080
_0805FBBC: .4byte gMenu
_0805FBC0: .4byte gScreen
thumb_func_start sub_0805FBC4
asm/code_0806ED78.s
+1 -1
View File
@@ -842,7 +842,7 @@ sub_0806F364: @ 0x0806F364
adds r1, r2, r3
adds r0, r0, r1
movs r1, #0x10
bl sub_0801D630
bl _DmaZero
pop {pc}
.align 2, 0
_0806F384: .4byte gArea
asm/code_0806FA6C.s
+3 -3
View File
@@ -385,7 +385,7 @@ sub_0806FD8C: @ 0x0806FD8C
ldr r0, _0806FD9C @ =gUnk_020000C0
movs r1, #0xc0
lsls r1, r1, #4
bl sub_0801D630
bl _DmaZero
pop {pc}
.align 2, 0
_0806FD9C: .4byte gUnk_020000C0
@@ -534,7 +534,7 @@ _0806FE9E:
bls _0806FE9E
adds r0, r6, #0
movs r1, #0x40
bl sub_0801D630
bl _DmaZero
_0806FEB4:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -1454,7 +1454,7 @@ sub_0807059C: @ 0x0807059C
push {lr}
ldr r0, _080705A8 @ =gUnk_02034490
movs r1, #0x18
bl sub_0801D630
bl _DmaZero
pop {pc}
.align 2, 0
_080705A8: .4byte gUnk_02034490
asm/code_08070698.s
+1 -1
View File
@@ -77,7 +77,7 @@ sub_08070698: @ 0x08070698
bl sub_08016A30
_08070726:
movs r0, #0x10
bl sub_0805436C
bl IsItemEquipped
cmp r0, #2
beq _08070734
bl sub_08077728
asm/code_080732D0.s
+3 -3
View File
@@ -4198,7 +4198,7 @@ sub_080751E8: @ 0x080751E8
ldr r4, _08075230 @ =gUnk_02022750
adds r0, r4, #0
movs r1, #0x24
bl sub_0801D630
bl _DmaZero
str r6, [r4]
ldr r0, _08075234 @ =gLinkEntity
adds r0, #0x84
@@ -5250,7 +5250,7 @@ sub_08075A0C: @ 0x08075A0C
adds r4, r0, #0
adds r5, r1, #0
ldrb r0, [r4, #1]
bl sub_0805436C
bl IsItemEquipped
adds r6, r0, #0
ldr r1, _08075A64 @ =gLinkState
ldrb r0, [r1, #5]
@@ -5421,7 +5421,7 @@ sub_08075B54: @ 0x08075B54
b _08075C80
_08075B70:
ldrb r0, [r6, #1]
bl sub_0805436C
bl IsItemEquipped
adds r4, r0, #0
adds r0, r6, #0
bl sub_08077F10
asm/code_08076C80.s
+1 -188
View File
@@ -6,193 +6,6 @@
.text
thumb_func_start PacciCane
PacciCane: @ 0x08076C80
push {lr}
ldr r3, _08076C94 @ =gUnk_0811BDE0
ldrb r2, [r0, #4]
lsls r2, r2, #2
adds r2, r2, r3
ldr r2, [r2]
bl _call_via_r2
pop {pc}
.align 2, 0
_08076C94: .4byte gUnk_0811BDE0
thumb_func_start sub_08076C98
sub_08076C98: @ 0x08076C98
push {r4, lr}
adds r4, r0, #0
ldrb r2, [r4, #9]
movs r0, #0xf
orrs r0, r2
strb r0, [r4, #9]
adds r0, r4, #0
bl sub_08077D38
ldr r0, _08076CB8 @ =gLinkEntity
bl sub_0806F948
adds r0, r4, #0
bl sub_08077BB8
pop {r4, pc}
.align 2, 0
_08076CB8: .4byte gLinkEntity
thumb_func_start sub_08076CBC
sub_08076CBC: @ 0x08076CBC
push {r4, lr}
adds r4, r0, #0
ldrb r2, [r4, #0xe]
movs r0, #0x80
ands r0, r2
cmp r0, #0
beq _08076CD2
adds r0, r4, #0
bl sub_08077E78
b _08076CE8
_08076CD2:
movs r0, #0x40
ands r0, r2
cmp r0, #0
beq _08076CE2
adds r0, r4, #0
movs r1, #0x12
bl CreatePlayerBomb
_08076CE2:
adds r0, r4, #0
bl UpdateItemAnim
_08076CE8:
pop {r4, pc}
.align 2, 0
thumb_func_start Shield
Shield: @ 0x08076CEC
push {lr}
ldr r3, _08076D00 @ =gUnk_0811BDE8
ldrb r2, [r0, #4]
lsls r2, r2, #2
adds r2, r2, r3
ldr r2, [r2]
bl _call_via_r2
pop {pc}
.align 2, 0
_08076D00: .4byte gUnk_0811BDE8
thumb_func_start sub_08076D04
sub_08076D04: @ 0x08076D04
push {r4, r5, lr}
adds r4, r0, #0
adds r5, r1, #0
ldr r1, _08076D2C @ =gLinkState
movs r0, #0x81
strb r0, [r1, #3]
movs r0, #2
strb r0, [r4, #9]
ldr r0, _08076D30 @ =gLinkEntity
bl sub_0806F948
adds r0, r4, #0
adds r1, r5, #0
bl sub_08077D38
adds r0, r4, #0
bl sub_08077BB8
pop {r4, r5, pc}
.align 2, 0
_08076D2C: .4byte gLinkState
_08076D30: .4byte gLinkEntity
thumb_func_start sub_08076D34
sub_08076D34: @ 0x08076D34
push {r4, r5, r6, lr}
adds r4, r0, #0
adds r6, r1, #0
bl sub_08077EFC
adds r1, r0, #0
cmp r1, #0
beq _08076D80
ldr r5, _08076D78 @ =gLinkState
ldrb r0, [r5, #3]
movs r1, #1
orrs r1, r0
strb r1, [r5, #3]
adds r0, r4, #0
bl UpdateItemAnim
ldrb r0, [r4, #0xe]
cmp r0, #0
beq _08076D8C
ldrb r0, [r4, #4]
adds r0, #1
strb r0, [r4, #4]
movs r0, #0
strb r0, [r4, #0xf]
movs r1, #8
asrs r1, r6
ldrb r0, [r5, #0xa]
bics r0, r1
strb r0, [r5, #0xa]
ldr r0, _08076D7C @ =0x0000015D
bl PlaySFX
b _08076D8C
.align 2, 0
_08076D78: .4byte gLinkState
_08076D7C: .4byte 0x0000015D
_08076D80:
ldr r0, _08076D90 @ =gLinkState
strb r1, [r0, #3]
adds r0, r4, #0
adds r1, r6, #0
bl sub_08077E78
_08076D8C:
pop {r4, r5, r6, pc}
.align 2, 0
_08076D90: .4byte gLinkState
thumb_func_start sub_08076D94
sub_08076D94: @ 0x08076D94
push {r4, r5, lr}
adds r4, r0, #0
adds r5, r1, #0
bl sub_08077EFC
adds r1, r0, #0
cmp r1, #0
beq _08076DBC
ldr r2, _08076DB8 @ =gLinkState
ldrb r1, [r2, #3]
movs r0, #1
orrs r0, r1
strb r0, [r2, #3]
adds r0, r4, #0
bl UpdateItemAnim
b _08076DC8
.align 2, 0
_08076DB8: .4byte gLinkState
_08076DBC:
ldr r0, _08076DCC @ =gLinkState
strb r1, [r0, #3]
adds r0, r4, #0
adds r1, r5, #0
bl sub_08077E78
_08076DC8:
pop {r4, r5, pc}
.align 2, 0
_08076DCC: .4byte gLinkState
thumb_func_start GustJar
GustJar: @ 0x08076DD0
push {lr}
ldr r2, _08076DEC @ =gLinkState
adds r2, #0xa8
movs r3, #3
strb r3, [r2]
ldr r3, _08076DF0 @ =gUnk_0811BDF4
ldrb r2, [r0, #4]
lsls r2, r2, #2
adds r2, r2, r3
ldr r2, [r2]
bl _call_via_r2
pop {pc}
.align 2, 0
_08076DEC: .4byte gLinkState
_08076DF0: .4byte gUnk_0811BDF4
thumb_func_start sub_08076DF4
sub_08076DF4: @ 0x08076DF4
push {r4, r5, r6, r7, lr}
@@ -1887,7 +1700,7 @@ sub_08077AEC: @ 0x08077AEC
ands r0, r1
str r0, [r2, #0x30]
movs r0, #0x10
bl sub_0805436C
bl IsItemEquipped
adds r1, r0, #0
cmp r1, #2
beq _08077B12
asm/code_08077B98.s
+1 -1
View File
@@ -642,7 +642,7 @@ sub_080784C8: @ 0x080784C8
movs r1, #0xc4
lsls r1, r1, #1
adds r0, r4, #0
bl sub_0801D630
bl _DmaZero
ldr r0, _080784E0 @ =gUnk_0811C000
str r0, [r4, #4]
pop {r4, pc}
asm/code_08078778.s
+2 -2
View File
@@ -70,7 +70,7 @@ sub_080788E0: @ 0x080788E0
ldr r1, _08078900 @ =gUnk_03003DF8
adds r0, r0, r1
movs r1, #0xc
bl sub_0801D630
bl _DmaZero
_080788FC:
pop {pc}
.align 2, 0
@@ -542,7 +542,7 @@ sub_08078C24: @ 0x08078C24
ldr r0, _08078CB0 @ =gUnk_03003DF0
movs r1, #0xc4
lsls r1, r1, #1
bl sub_0801D630
bl _DmaZero
pop {pc}
.align 2, 0
_08078CAC: .4byte gLinkState
asm/code_0807B9B8.s
+17 -17
View File
@@ -822,14 +822,14 @@ sub_0807BFD0: @ 0x0807BFD0
adds r0, r7, #0
adds r1, r6, #0
mov r2, r8
bl sub_0801D5EC
bl _DmaFill16
movs r5, #0
strh r5, [r6]
ldr r4, _0807C0C0 @ =gUnk_02010654
adds r0, r7, #0
adds r1, r4, #0
mov r2, r8
bl sub_0801D5EC
bl _DmaFill16
strh r5, [r4]
ldr r2, _0807C0C4 @ =gRoomControls
ldr r0, _0807C0C8 @ =gArea
@@ -873,7 +873,7 @@ _0807C04E:
adds r0, r7, #0
adds r1, r6, #0
mov r2, r8
bl sub_0801D5EC
bl _DmaFill16
movs r2, #0
ldr r3, _0807C0D8 @ =0x000007FF
adds r4, r7, #0
@@ -899,7 +899,7 @@ _0807C078:
ldr r4, _0807C0B8 @ =0x0000FFFF
adds r0, r4, #0
adds r1, r6, #0
bl sub_0801D5EC
bl _DmaFill16
movs r2, #0
ldr r3, _0807C0D8 @ =0x000007FF
_0807C096:
@@ -948,19 +948,19 @@ sub_0807C0DC: @ 0x0807C0DC
lsls r6, r6, #6
adds r0, r5, #0
adds r1, r6, #0
bl sub_0801D630
bl _DmaZero
adds r0, r5, r6
movs r1, #0x80
lsls r1, r1, #5
bl sub_0801D630
bl _DmaZero
ldr r0, _0807C160 @ =gUnk_02019EE0
movs r4, #0x80
lsls r4, r4, #8
adds r1, r4, #0
bl sub_0801D630
bl _DmaZero
ldr r0, _0807C164 @ =gUnk_02002F00
adds r1, r4, #0
bl sub_0801D630
bl _DmaZero
ldr r0, _0807C168 @ =gArea
ldr r1, _0807C16C @ =0x0000085C
adds r0, r0, r1
@@ -999,7 +999,7 @@ _0807C174: .4byte 0x0000FFFF
_0807C178:
adds r0, r2, #4
adds r1, r6, #0
bl sub_0801D630
bl _DmaZero
movs r3, #1
mov sb, r3
_0807C184:
@@ -1167,7 +1167,7 @@ _0807C2E4:
bl sub_0807C5F4
adds r0, r5, #0
adds r1, r6, #0
bl sub_0801D630
bl _DmaZero
ldr r4, _0807C350 @ =gUnk_02002F00
adds r5, r4, r6
adds r0, r4, #0
@@ -1179,7 +1179,7 @@ _0807C2E4:
bl sub_0807C5F4
adds r0, r5, #0
adds r1, r6, #0
bl sub_0801D630
bl _DmaZero
_0807C326:
mov r1, sb
cmp r1, #0
@@ -1406,10 +1406,10 @@ sub_0807C4F8: @ 0x0807C4F8
movs r4, #0x80
lsls r4, r4, #8
adds r1, r4, #0
bl sub_0801D630
bl _DmaZero
ldr r0, _0807C59C @ =gUnk_02002F00
adds r1, r4, #0
bl sub_0801D630
bl _DmaZero
ldr r5, _0807C5A0 @ =gUnk_02022830
ldr r0, _0807C5A4 @ =gArea
ldr r1, _0807C5A8 @ =0x0000085C
@@ -1455,7 +1455,7 @@ _0807C54A:
bl sub_0807C5F4
adds r0, r5, #0
adds r1, r6, #0
bl sub_0801D630
bl _DmaZero
ldr r4, _0807C59C @ =gUnk_02002F00
adds r5, r4, r6
adds r0, r4, #0
@@ -1467,7 +1467,7 @@ _0807C54A:
bl sub_0807C5F4
adds r0, r5, #0
adds r1, r6, #0
bl sub_0801D630
bl _DmaZero
_0807C592:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -1694,7 +1694,7 @@ _0807C710:
_0807C726:
adds r0, r4, #0
movs r1, #0x40
bl sub_0801D630
bl _DmaZero
adds r4, #0x40
adds r5, #1
cmp r5, r7
@@ -1984,7 +1984,7 @@ _0807C92E:
_0807C946:
adds r0, r4, #0
movs r1, #0x80
bl sub_0801D630
bl _DmaZero
adds r4, #0x80
adds r5, #1
cmp r5, r6
asm/code_0807CC3C.s
+21 -21
View File
@@ -15,7 +15,7 @@ sub_0807CD9C: @ 0x0807CD9C
sub_0807CDA4: @ 0x0807CDA4
push {lr}
ldr r2, _0807CDB8 @ =gUnk_0811E478
ldr r1, _0807CDBC @ =gUnk_02000080
ldr r1, _0807CDBC @ =gMenu
ldrb r1, [r1, #7]
lsls r1, r1, #2
adds r1, r1, r2
@@ -24,7 +24,7 @@ sub_0807CDA4: @ 0x0807CDA4
pop {pc}
.align 2, 0
_0807CDB8: .4byte gUnk_0811E478
_0807CDBC: .4byte gUnk_02000080
_0807CDBC: .4byte gMenu
thumb_func_start sub_0807CDC0
sub_0807CDC0: @ 0x0807CDC0
@@ -37,7 +37,7 @@ sub_0807CDC0: @ 0x0807CDC0
ldrsh r0, [r0, r1]
cmp r0, #0
bgt _0807CDDC
ldr r0, _0807CDE4 @ =gUnk_02000080
ldr r0, _0807CDE4 @ =gMenu
movs r1, #8
strh r1, [r0, #0xa]
movs r1, #1
@@ -47,13 +47,13 @@ _0807CDDC:
pop {pc}
.align 2, 0
_0807CDE0: .4byte gUnk_02021EE0
_0807CDE4: .4byte gUnk_02000080
_0807CDE4: .4byte gMenu
thumb_func_start sub_0807CDE8
sub_0807CDE8: @ 0x0807CDE8
push {r4, r5, lr}
adds r4, r0, #0
ldr r1, _0807CE08 @ =gUnk_02000080
ldr r1, _0807CE08 @ =gMenu
ldrh r0, [r1, #0xa]
cmp r0, #0
bne _0807CE4C
@@ -66,7 +66,7 @@ sub_0807CDE8: @ 0x0807CDE8
beq _0807CE2E
b _0807CE38
.align 2, 0
_0807CE08: .4byte gUnk_02000080
_0807CE08: .4byte gMenu
_0807CE0C:
movs r0, #0x80
lsls r0, r0, #0x12
@@ -90,14 +90,14 @@ _0807CE2E:
_0807CE36:
adds r5, r0, #0
_0807CE38:
ldr r1, _0807CE48 @ =gUnk_02000080
ldr r1, _0807CE48 @ =gMenu
strh r5, [r1, #0xa]
movs r0, #2
strb r0, [r1, #7]
bl sub_08056208
b _0807CE50
.align 2, 0
_0807CE48: .4byte gUnk_02000080
_0807CE48: .4byte gMenu
_0807CE4C:
subs r0, #1
strh r0, [r1, #0xa]
@@ -122,7 +122,7 @@ sub_0807CE54: @ 0x0807CE54
bgt _0807CE84
strh r3, [r2, #0xa]
bl sub_08050384
ldr r0, _0807CE8C @ =gUnk_02000080
ldr r0, _0807CE8C @ =gMenu
movs r1, #0
strb r1, [r0, #7]
ldrh r0, [r0, #0xa]
@@ -135,7 +135,7 @@ _0807CE84:
pop {r4, r5, pc}
.align 2, 0
_0807CE88: .4byte gUnk_02021EE0
_0807CE8C: .4byte gUnk_02000080
_0807CE8C: .4byte gMenu
thumb_func_start sub_0807CE90
sub_0807CE90: @ 0x0807CE90
@@ -1773,14 +1773,14 @@ sub_0807DA70: @ 0x0807DA70
ldr r4, _0807DA94 @ =gUnk_02033280
adds r0, r4, #0
movs r1, #0xc
bl sub_0801D630
bl _DmaZero
ldr r0, _0807DA98 @ =gUnk_02036570
movs r1, #0x90
lsls r1, r1, #3
bl sub_0801D630
bl _DmaZero
ldr r0, _0807DA9C @ =gUnk_02022750
movs r1, #0x24
bl sub_0801D630
bl _DmaZero
movs r0, #8
strb r0, [r4, #8]
pop {r4, pc}
@@ -1816,7 +1816,7 @@ _0807DAC2:
sub_0807DAC4: @ 0x0807DAC4
push {lr}
movs r1, #0x24
bl sub_0801D630
bl _DmaZero
pop {pc}
.align 2, 0
@@ -1880,7 +1880,7 @@ StartPlayerScript: @ 0x0807DB2C
ldr r4, _0807DB5C @ =gUnk_02022750
adds r0, r4, #0
movs r1, #0x24
bl sub_0801D630
bl _DmaZero
str r5, [r4]
ldr r0, _0807DB60 @ =gLinkEntity
adds r0, #0x84
@@ -1927,7 +1927,7 @@ sub_0807DB88: @ 0x0807DB88
adds r4, r0, #0
adds r5, r1, #0
movs r1, #0x24
bl sub_0801D630
bl _DmaZero
str r5, [r4]
pop {r4, r5, pc}
@@ -5472,7 +5472,7 @@ sub_0807F420: @ 0x0807F420
lsls r2, r2, #0x18
lsrs r2, r2, #0x18
adds r1, r2, #0
bl sub_080A7138
bl MenuFadeIn
pop {pc}
thumb_func_start sub_0807F434
@@ -7919,11 +7919,11 @@ sub_08080668: @ 0x08080668
ldr r5, _080806A4 @ =gRoomControls
adds r0, r5, #0
movs r1, #0x38
bl sub_0801D630
bl _DmaZero
ldr r4, _080806A8 @ =gUnk_03004030
adds r0, r4, #0
movs r1, #0xc
bl sub_0801D630
bl _DmaZero
ldr r0, _080806AC @ =0x0000FFFF
strh r0, [r5, #0x22]
movs r0, #0xff
@@ -7935,10 +7935,10 @@ sub_08080668: @ 0x08080668
movs r4, #0x80
lsls r4, r4, #8
adds r1, r4, #0
bl sub_0801D630
bl _DmaZero
ldr r0, _080806B8 @ =gUnk_02002F00
adds r1, r4, #0
bl sub_0801D630
bl _DmaZero
pop {r4, r5, pc}
.align 2, 0
_080806A4: .4byte gRoomControls
asm/code_080A29BC.s
+1 -1
View File
@@ -995,7 +995,7 @@ sub_080A3210: @ 0x080A3210
ldr r4, _080A3230 @ =gUnk_02021EE0
adds r0, r4, #0
movs r1, #0x18
bl sub_0801D630
bl _DmaZero
bl sub_080A35C8
movs r0, #0x80
lsls r0, r0, #1
asm/code_080A3480.s
+36 -36
View File
@@ -232,7 +232,7 @@ sub_080A3608: @ 0x080A3608
bl SetGlobalFlag
ldr r0, _080A3644 @ =gUnk_03001000
strb r4, [r0, #3]
ldr r2, _080A3648 @ =gUnk_02000080
ldr r2, _080A3648 @ =gMenu
strb r5, [r2, #5]
movs r1, #0
movs r0, #0xb4
@@ -252,7 +252,7 @@ sub_080A3608: @ 0x080A3608
.align 2, 0
_080A3640: .4byte gUnk_02002A40
_080A3644: .4byte gUnk_03001000
_080A3648: .4byte gUnk_02000080
_080A3648: .4byte gMenu
_080A364C: .4byte gUnk_08127998
_080A3650:
cmp r0, #1
@@ -307,7 +307,7 @@ _080A36BC: .4byte 0x00001E4D
sub_080A36C0: @ 0x080A36C0
push {lr}
ldr r1, _080A36D4 @ =gUnk_08127D10
ldr r0, _080A36D8 @ =gUnk_02000080
ldr r0, _080A36D8 @ =gMenu
ldrb r0, [r0, #5]
lsls r0, r0, #2
adds r0, r0, r1
@@ -316,12 +316,12 @@ sub_080A36C0: @ 0x080A36C0
pop {pc}
.align 2, 0
_080A36D4: .4byte gUnk_08127D10
_080A36D8: .4byte gUnk_02000080
_080A36D8: .4byte gMenu
thumb_func_start sub_080A36DC
sub_080A36DC: @ 0x080A36DC
push {lr}
ldr r1, _080A36F4 @ =gUnk_02000080
ldr r1, _080A36F4 @ =gMenu
ldrh r0, [r1, #8]
subs r0, #1
strh r0, [r1, #8]
@@ -332,7 +332,7 @@ sub_080A36DC: @ 0x080A36DC
_080A36F0:
pop {pc}
.align 2, 0
_080A36F4: .4byte gUnk_02000080
_080A36F4: .4byte gMenu
thumb_func_start sub_080A36F8
sub_080A36F8: @ 0x080A36F8
@@ -341,7 +341,7 @@ sub_080A36F8: @ 0x080A36F8
ldrb r0, [r0]
cmp r0, #0
bne _080A3752
ldr r5, _080A3758 @ =gUnk_02000080
ldr r5, _080A3758 @ =gMenu
movs r0, #0x10
ldrsh r4, [r5, r0]
lsls r4, r4, #1
@@ -354,7 +354,7 @@ sub_080A36F8: @ 0x080A36F8
ldr r0, _080A3760 @ =gUnk_02021F30
movs r1, #0x80
lsls r1, r1, #4
bl sub_0801D630
bl _DmaZero
ldr r1, _080A3764 @ =gScreen
movs r2, #0
movs r0, #1
@@ -381,7 +381,7 @@ _080A3752:
pop {r4, r5, pc}
.align 2, 0
_080A3754: .4byte gUnk_03000FD0
_080A3758: .4byte gUnk_02000080
_080A3758: .4byte gMenu
_080A375C: .4byte gUnk_08127CEC
_080A3760: .4byte gUnk_02021F30
_080A3764: .4byte gScreen
@@ -389,7 +389,7 @@ _080A3764: .4byte gScreen
thumb_func_start sub_080A3768
sub_080A3768: @ 0x080A3768
push {r4, lr}
ldr r4, _080A377C @ =gUnk_02000080
ldr r4, _080A377C @ =gMenu
ldrb r1, [r4, #6]
cmp r1, #1
beq _080A37C4
@@ -399,7 +399,7 @@ sub_080A3768: @ 0x080A3768
beq _080A378A
b _080A384C
.align 2, 0
_080A377C: .4byte gUnk_02000080
_080A377C: .4byte gMenu
_080A3780:
cmp r1, #2
beq _080A3804
@@ -410,7 +410,7 @@ _080A378A:
ldr r0, _080A37B8 @ =gUnk_02021F30
movs r1, #0x80
lsls r1, r1, #4
bl sub_0801D630
bl _DmaZero
movs r1, #0x10
ldrsh r0, [r4, r1]
ldr r2, _080A37BC @ =gUnk_081272E0
@@ -518,7 +518,7 @@ _080A3860: .4byte gUnk_03000FD0
thumb_func_start sub_080A3864
sub_080A3864: @ 0x080A3864
push {lr}
ldr r1, _080A3884 @ =gUnk_02000080
ldr r1, _080A3884 @ =gMenu
ldrh r0, [r1, #8]
subs r0, #1
strh r0, [r1, #8]
@@ -532,7 +532,7 @@ sub_080A3864: @ 0x080A3864
_080A3880:
pop {pc}
.align 2, 0
_080A3884: .4byte gUnk_02000080
_080A3884: .4byte gMenu
thumb_func_start sub_080A3888
sub_080A3888: @ 0x080A3888
@@ -543,7 +543,7 @@ sub_080A3888: @ 0x080A3888
movs r0, #5
movs r1, #4
bl DoFade
ldr r0, _080A38B0 @ =gUnk_02000080
ldr r0, _080A38B0 @ =gMenu
ldrh r0, [r0, #8]
bl sub_08050038
bl sub_080A3954
@@ -551,7 +551,7 @@ sub_080A3888: @ 0x080A3888
.align 2, 0
_080A38A8: .4byte gUnk_03000FD0
_080A38AC: .4byte 0xFFFF7FFF
_080A38B0: .4byte gUnk_02000080
_080A38B0: .4byte gMenu
thumb_func_start sub_080A38B4
sub_080A38B4: @ 0x080A38B4
@@ -559,13 +559,13 @@ sub_080A38B4: @ 0x080A38B4
movs r0, #4
movs r1, #4
bl DoFade
ldr r0, _080A38CC @ =gUnk_02000080
ldr r0, _080A38CC @ =gMenu
ldrh r0, [r0, #8]
bl sub_08050038
bl sub_080A3954
pop {pc}
.align 2, 0
_080A38CC: .4byte gUnk_02000080
_080A38CC: .4byte gMenu
thumb_func_start sub_080A38D0
sub_080A38D0: @ 0x080A38D0
@@ -580,7 +580,7 @@ sub_080A38D0: @ 0x080A38D0
movs r6, #0x80
lsls r6, r6, #4
adds r1, r6, #0
bl sub_0801D630
bl _DmaZero
ldr r4, _080A3924 @ =gScreen
movs r0, #0
mov r8, r0
@@ -588,13 +588,13 @@ sub_080A38D0: @ 0x080A38D0
strh r5, [r4, #0x1a]
ldr r0, _080A3928 @ =gUnk_020344B0
adds r1, r6, #0
bl sub_0801D630
bl _DmaZero
strh r5, [r4, #0x26]
adds r4, #0x68
movs r0, #0x80
lsls r0, r0, #5
strh r0, [r4]
ldr r0, _080A392C @ =gUnk_02000080
ldr r0, _080A392C @ =gMenu
mov r1, r8
strb r1, [r0, #5]
movs r0, #4
@@ -609,7 +609,7 @@ _080A391C: .4byte gUnk_03000FD0
_080A3920: .4byte gUnk_02021F30
_080A3924: .4byte gScreen
_080A3928: .4byte gUnk_020344B0
_080A392C: .4byte gUnk_02000080
_080A392C: .4byte gMenu
thumb_func_start sub_080A3930
sub_080A3930: @ 0x080A3930
@@ -632,7 +632,7 @@ _080A3950: .4byte gUnk_03001000
thumb_func_start sub_080A3954
sub_080A3954: @ 0x080A3954
ldr r2, _080A397C @ =gUnk_02000080
ldr r2, _080A397C @ =gMenu
ldr r1, [r2, #0xc]
ldrb r0, [r1]
movs r3, #0
@@ -652,7 +652,7 @@ sub_080A3954: @ 0x080A3954
str r1, [r2, #0xc]
bx lr
.align 2, 0
_080A397C: .4byte gUnk_02000080
_080A397C: .4byte gMenu
thumb_func_start sub_080A3980
sub_080A3980: @ 0x080A3980
@@ -670,7 +670,7 @@ _080A3990: .4byte gUnk_03000FD0
thumb_func_start sub_080A3994
sub_080A3994: @ 0x080A3994
push {r4, r5, lr}
ldr r0, _080A39AC @ =gUnk_02000080
ldr r0, _080A39AC @ =gMenu
ldrb r1, [r0, #6]
adds r2, r0, #0
cmp r1, #4
@@ -683,7 +683,7 @@ _080A39A2:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080A39AC: .4byte gUnk_02000080
_080A39AC: .4byte gMenu
_080A39B0: .4byte _080A39B4
_080A39B4: @ jump table
.4byte _080A39C8 @ case 0
@@ -712,7 +712,7 @@ _080A39C8:
movs r0, #0xc0
lsls r0, r0, #0x13
movs r1, #0x20
bl sub_0801D630
bl _DmaZero
movs r0, #0
movs r1, #0
bl sub_08052418
@@ -785,14 +785,14 @@ _080A3A82:
bl sub_08050318
movs r0, #2
_080A3A8C:
ldr r1, _080A3AB4 @ =gUnk_02000080
ldr r1, _080A3AB4 @ =gMenu
strb r0, [r1, #6]
movs r0, #0x3c
strh r0, [r1, #8]
movs r0, #0x6a
bl PlaySFX
_080A3A9A:
ldr r1, _080A3AB4 @ =gUnk_02000080
ldr r1, _080A3AB4 @ =gMenu
ldrb r0, [r1, #3]
cmp r0, r4
beq _080A3B36
@@ -804,12 +804,12 @@ _080A3A9A:
bl PlaySFX
b _080A3B36
.align 2, 0
_080A3AB4: .4byte gUnk_02000080
_080A3AB4: .4byte gMenu
_080A3AB8:
movs r0, #0
bl sub_0807CDA4
adds r1, r0, #0
ldr r4, _080A3AD8 @ =gUnk_02000080
ldr r4, _080A3AD8 @ =gMenu
strb r1, [r4]
movs r0, #1
rsbs r0, r0, #0
@@ -821,7 +821,7 @@ _080A3AB8:
strb r0, [r4, #6]
b _080A3B36
.align 2, 0
_080A3AD8: .4byte gUnk_02000080
_080A3AD8: .4byte gMenu
_080A3ADC:
movs r0, #0x3c
strh r0, [r4, #8]
@@ -865,7 +865,7 @@ _080A3B14:
ldr r1, _080A3B40 @ =gUnk_03001000
movs r0, #3
strb r0, [r1, #3]
ldr r0, _080A3B44 @ =gUnk_02000080
ldr r0, _080A3B44 @ =gMenu
strb r4, [r0, #6]
_080A3B36:
pop {r4, r5, pc}
@@ -873,7 +873,7 @@ _080A3B36:
_080A3B38: .4byte gScreen
_080A3B3C: .4byte 0x0000FDFF
_080A3B40: .4byte gUnk_03001000
_080A3B44: .4byte gUnk_02000080
_080A3B44: .4byte gMenu
thumb_func_start sub_080A3B48
sub_080A3B48: @ 0x080A3B48
@@ -902,10 +902,10 @@ _080A3B70: .4byte 0x0000012B
thumb_func_start sub_080A3B74
sub_080A3B74: @ 0x080A3B74
ldr r0, _080A3B80 @ =gUnk_02000080
ldr r0, _080A3B80 @ =gMenu
adds r0, #0x2f
movs r1, #0
strb r1, [r0]
bx lr
.align 2, 0
_080A3B80: .4byte gUnk_02000080
_080A3B80: .4byte gMenu
asm/code_080A3BD0.s
+110 -110
View File
@@ -9,7 +9,7 @@
thumb_func_start sub_080A3BD0
sub_080A3BD0: @ 0x080A3BD0
push {r4, lr}
ldr r0, _080A3C54 @ =gUnk_02000080
ldr r0, _080A3C54 @ =gMenu
movs r1, #0
movs r4, #1
strb r4, [r0, #1]
@@ -67,7 +67,7 @@ _080A3C0A:
bl DoFade
pop {r4, pc}
.align 2, 0
_080A3C54: .4byte gUnk_02000080
_080A3C54: .4byte gMenu
_080A3C58: .4byte gScreen
_080A3C5C: .4byte 0x00001C01
_080A3C60: .4byte 0x00001D02
@@ -83,7 +83,7 @@ sub_080A3C6C: @ 0x080A3C6C
beq _080A3C78
b _080A3DA8
_080A3C78:
ldr r5, _080A3CA0 @ =gUnk_02000080
ldr r5, _080A3CA0 @ =gMenu
movs r0, #2
strb r0, [r5, #1]
adds r0, r5, #0
@@ -104,7 +104,7 @@ _080A3C92:
b _080A3CDE
.align 2, 0
_080A3C9C: .4byte gUnk_03000FD0
_080A3CA0: .4byte gUnk_02000080
_080A3CA0: .4byte gMenu
_080A3CA4: .4byte 0x00001FFD
_080A3CA8:
movs r0, #1
@@ -200,7 +200,7 @@ _080A3D5A:
adds r4, #1
b _080A3D8A
_080A3D5E:
ldr r2, _080A3DAC @ =gUnk_02000080
ldr r2, _080A3DAC @ =gMenu
ldrb r0, [r2, #1]
cmp r0, #2
bne _080A3D8A
@@ -243,14 +243,14 @@ _080A3DA0:
_080A3DA8:
pop {r4, r5, pc}
.align 2, 0
_080A3DAC: .4byte gUnk_02000080
_080A3DAC: .4byte gMenu
_080A3DB0: .4byte 0x0000FFFF
_080A3DB4: .4byte gUnk_02002A40
thumb_func_start sub_080A3DB8
sub_080A3DB8: @ 0x080A3DB8
push {lr}
ldr r0, _080A3DDC @ =gUnk_02000080
ldr r0, _080A3DDC @ =gMenu
ldrb r1, [r0, #1]
cmp r1, #6
bne _080A3DEE
@@ -264,10 +264,10 @@ sub_080A3DB8: @ 0x080A3DB8
cmp r0, #0
beq _080A3DE8
ldrb r1, [r1, #4]
bl sub_080A7138
bl MenuFadeIn
b _080A3DF8
.align 2, 0
_080A3DDC: .4byte gUnk_02000080
_080A3DDC: .4byte gMenu
_080A3DE0: .4byte gUnk_02022740
_080A3DE4: .4byte gUnk_080C9CBC
_080A3DE8:
@@ -286,7 +286,7 @@ _080A3DFC: .4byte gUnk_02022740
thumb_func_start sub_080A3E00
sub_080A3E00: @ 0x080A3E00
push {lr}
ldr r1, _080A3E18 @ =gUnk_02000080
ldr r1, _080A3E18 @ =gMenu
movs r0, #3
strb r0, [r1, #1]
ldr r2, _080A3E1C @ =gUnk_081280F4
@@ -297,13 +297,13 @@ sub_080A3E00: @ 0x080A3E00
bl _call_via_r0
pop {pc}
.align 2, 0
_080A3E18: .4byte gUnk_02000080
_080A3E18: .4byte gMenu
_080A3E1C: .4byte gUnk_081280F4
thumb_func_start sub_080A3E20
sub_080A3E20: @ 0x080A3E20
push {lr}
ldr r2, _080A3E44 @ =gUnk_02000080
ldr r2, _080A3E44 @ =gMenu
movs r0, #0
strh r0, [r2, #0x18]
adds r1, r2, #0
@@ -322,13 +322,13 @@ sub_080A3E20: @ 0x080A3E20
_080A3E42:
pop {pc}
.align 2, 0
_080A3E44: .4byte gUnk_02000080
_080A3E44: .4byte gMenu
thumb_func_start sub_080A3E48
sub_080A3E48: @ 0x080A3E48
push {r4, lr}
ldr r2, _080A3E78 @ =gUnk_080C9CBC
ldr r3, _080A3E7C @ =gUnk_02000080
ldr r3, _080A3E7C @ =gMenu
adds r0, r3, #0
adds r0, #0x2a
ldrb r0, [r0]
@@ -350,7 +350,7 @@ sub_080A3E48: @ 0x080A3E48
b _080A3EC8
.align 2, 0
_080A3E78: .4byte gUnk_080C9CBC
_080A3E7C: .4byte gUnk_02000080
_080A3E7C: .4byte gMenu
_080A3E80: .4byte gUnk_02022740
_080A3E84:
movs r2, #0
@@ -424,7 +424,7 @@ _080A3F0C: .4byte 0x0000DFFF
thumb_func_start sub_080A3F10
sub_080A3F10: @ 0x080A3F10
push {r4, lr}
ldr r2, _080A3F48 @ =gUnk_02000080
ldr r2, _080A3F48 @ =gMenu
movs r0, #4
strb r0, [r2, #1]
adds r3, r2, #0
@@ -451,13 +451,13 @@ sub_080A3F10: @ 0x080A3F10
_080A3F46:
pop {r4, pc}
.align 2, 0
_080A3F48: .4byte gUnk_02000080
_080A3F48: .4byte gMenu
thumb_func_start sub_080A3F4C
sub_080A3F4C: @ 0x080A3F4C
push {lr}
ldr r1, _080A3F60 @ =gUnk_08128100
ldr r0, _080A3F64 @ =gUnk_02000080
ldr r0, _080A3F64 @ =gMenu
ldrb r0, [r0, #6]
lsls r0, r0, #2
adds r0, r0, r1
@@ -466,12 +466,12 @@ sub_080A3F4C: @ 0x080A3F4C
pop {pc}
.align 2, 0
_080A3F60: .4byte gUnk_08128100
_080A3F64: .4byte gUnk_02000080
_080A3F64: .4byte gMenu
thumb_func_start sub_080A3F68
sub_080A3F68: @ 0x080A3F68
push {r4, r5, lr}
ldr r5, _080A3FB4 @ =gUnk_02000080
ldr r5, _080A3FB4 @ =gMenu
movs r0, #5
strb r0, [r5, #1]
ldr r4, _080A3FB8 @ =gUnk_02002C81
@@ -505,7 +505,7 @@ _080A3F96:
strh r0, [r5, #8]
pop {r4, r5, pc}
.align 2, 0
_080A3FB4: .4byte gUnk_02000080
_080A3FB4: .4byte gMenu
_080A3FB8: .4byte gUnk_02002C81
_080A3FBC: .4byte gUnk_02022740
_080A3FC0: .4byte 0xFFFFFED6
@@ -521,7 +521,7 @@ sub_080A3FCC: @ 0x080A3FCC
ands r0, r1
cmp r0, #0
bne _080A3FE6
ldr r0, _080A3FEC @ =gUnk_02000080
ldr r0, _080A3FEC @ =gMenu
movs r1, #2
strb r1, [r0, #6]
ldr r0, _080A3FF0 @ =0x00000147
@@ -530,13 +530,13 @@ _080A3FE6:
pop {pc}
.align 2, 0
_080A3FE8: .4byte gTextBox
_080A3FEC: .4byte gUnk_02000080
_080A3FEC: .4byte gMenu
_080A3FF0: .4byte 0x00000147
thumb_func_start sub_080A3FF4
sub_080A3FF4: @ 0x080A3FF4
push {lr}
ldr r2, _080A4014 @ =gUnk_02000080
ldr r2, _080A4014 @ =gMenu
ldrh r0, [r2, #8]
subs r0, #1
strh r0, [r2, #8]
@@ -551,7 +551,7 @@ sub_080A3FF4: @ 0x080A3FF4
strh r0, [r2, #0x1a]
b _080A4036
.align 2, 0
_080A4014: .4byte gUnk_02000080
_080A4014: .4byte gMenu
_080A4018:
movs r0, #6
strb r0, [r2, #1]
@@ -572,7 +572,7 @@ _080A4036:
thumb_func_start sub_080A4038
sub_080A4038: @ 0x080A4038
push {lr}
ldr r1, _080A4050 @ =gUnk_02000080
ldr r1, _080A4050 @ =gMenu
ldrh r0, [r1, #8]
subs r0, #1
strh r0, [r1, #8]
@@ -584,7 +584,7 @@ sub_080A4038: @ 0x080A4038
_080A404E:
pop {pc}
.align 2, 0
_080A4050: .4byte gUnk_02000080
_080A4050: .4byte gMenu
thumb_func_start sub_080A4054
sub_080A4054: @ 0x080A4054
@@ -617,7 +617,7 @@ sub_080A4080: @ 0x080A4080
movs r0, #0
strh r0, [r4, #4]
strh r0, [r4, #6]
ldr r5, _080A4138 @ =gUnk_02000080
ldr r5, _080A4138 @ =gMenu
adds r0, r5, #0
adds r0, #0x2f
movs r1, #0
@@ -700,7 +700,7 @@ _080A4130:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A4134: .4byte gUnk_03001010
_080A4138: .4byte gUnk_02000080
_080A4138: .4byte gMenu
_080A413C: .4byte 0x000001FB
_080A4140: .4byte gUnk_03001000
_080A4144: .4byte gUnk_08128110
@@ -716,7 +716,7 @@ sub_080A414C: @ 0x080A414C
movs r0, #0
strh r0, [r4, #4]
strh r0, [r4, #6]
ldr r0, _080A4214 @ =gUnk_02000080
ldr r0, _080A4214 @ =gMenu
ldrh r0, [r0, #0x10]
ldr r1, _080A4218 @ =0x00000B21
bl __divsi3
@@ -769,7 +769,7 @@ _080A41BC:
asrs r0, r0, #8
subs r0, #0x10
strh r0, [r7]
ldr r2, _080A4214 @ =gUnk_02000080
ldr r2, _080A4214 @ =gMenu
ldr r0, [r2, #0x10]
cmp r0, #0
bge _080A41CE
@@ -812,7 +812,7 @@ _080A4200:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A4210: .4byte gUnk_03001010
_080A4214: .4byte gUnk_02000080
_080A4214: .4byte gMenu
_080A4218: .4byte 0x00000B21
_080A421C: .4byte gSineTable
_080A4220: .4byte gUnk_02002B6B
@@ -822,7 +822,7 @@ _080A4228: .4byte gUnk_02002A40
thumb_func_start sub_080A422C
sub_080A422C: @ 0x080A422C
push {r4, r5, lr}
ldr r5, _080A42A4 @ =gUnk_02000080
ldr r5, _080A42A4 @ =gMenu
ldrh r0, [r5, #0x18]
lsrs r0, r0, #8
movs r1, #0x1b
@@ -877,7 +877,7 @@ sub_080A422C: @ 0x080A422C
subs r4, r1, r0
b _080A42C6
.align 2, 0
_080A42A4: .4byte gUnk_02000080
_080A42A4: .4byte gMenu
_080A42A8: .4byte gUnk_08128120
_080A42AC: .4byte gUnk_03001010
_080A42B0:
@@ -949,7 +949,7 @@ _080A4324:
ldrsh r4, [r1, r0]
movs r2, #2
ldrsh r5, [r1, r2]
ldr r0, _080A4354 @ =gUnk_02000080
ldr r0, _080A4354 @ =gMenu
ldrb r0, [r0, #1]
cmp r0, #0
bne _080A4358
@@ -963,7 +963,7 @@ _080A4324:
_080A4348: .4byte gUnk_02019EE0
_080A434C: .4byte gUnk_03001010
_080A4350: .4byte 0x00003AE0
_080A4354: .4byte gUnk_02000080
_080A4354: .4byte gMenu
_080A4358:
ldrh r0, [r1]
adds r0, #8
@@ -1003,7 +1003,7 @@ sub_080A4398: @ 0x080A4398
push {lr}
ldr r0, _080A43A4 @ =gUnk_02019EE0
movs r1, #0x40
bl sub_0801D630
bl _DmaZero
pop {pc}
.align 2, 0
_080A43A4: .4byte gUnk_02019EE0
@@ -1125,7 +1125,7 @@ sub_080A4468: @ 0x080A4468
ldr r0, _080A448C @ =gUnk_02022740
ldrb r0, [r0, #3]
bl sub_0801E6C8
ldr r0, _080A4490 @ =gUnk_02000080
ldr r0, _080A4490 @ =gMenu
adds r0, #0x2a
ldrb r0, [r0]
bl sub_0801E798
@@ -1133,7 +1133,7 @@ sub_080A4468: @ 0x080A4468
.align 2, 0
_080A4488: .4byte gUnk_03003DF0
_080A448C: .4byte gUnk_02022740
_080A4490: .4byte gUnk_02000080
_080A4490: .4byte gMenu
thumb_func_start sub_080A4494
sub_080A4494: @ 0x080A4494
@@ -1187,7 +1187,7 @@ sub_080A44E0: @ 0x080A44E0
mov r8, r0
ldr r0, [r4, #8]
mov r1, r8
bl sub_0801D630
bl _DmaZero
adds r0, r6, #0
adds r1, r4, #0
bl sub_0805F76C
@@ -1281,7 +1281,7 @@ sub_080A45A4: @ 0x080A45A4
cmp r0, #0xff
bne _080A45D0
ldr r1, _080A45C8 @ =gUnk_0812815C
ldr r0, _080A45CC @ =gUnk_02000080
ldr r0, _080A45CC @ =gMenu
ldrb r0, [r0, #5]
lsls r0, r0, #2
adds r0, r0, r1
@@ -1291,10 +1291,10 @@ sub_080A45A4: @ 0x080A45A4
.align 2, 0
_080A45C4: .4byte gUnk_02032EC0
_080A45C8: .4byte gUnk_0812815C
_080A45CC: .4byte gUnk_02000080
_080A45CC: .4byte gMenu
_080A45D0:
ldr r1, _080A4600 @ =gUnk_0812814C
ldr r0, _080A4604 @ =gUnk_02000080
ldr r0, _080A4604 @ =gMenu
ldrb r0, [r0, #5]
lsls r0, r0, #2
adds r0, r0, r1
@@ -1311,7 +1311,7 @@ _080A45E0:
pop {pc}
.align 2, 0
_080A4600: .4byte gUnk_0812814C
_080A4604: .4byte gUnk_02000080
_080A4604: .4byte gMenu
thumb_func_start sub_080A4608
sub_080A4608: @ 0x080A4608
@@ -1337,11 +1337,11 @@ sub_080A4608: @ 0x080A4608
ldr r0, _080A46A4 @ =gUnk_02034CB0
movs r1, #0x80
lsls r1, r1, #4
bl sub_0801D630
bl _DmaZero
ldr r0, _080A46A8 @ =gUnk_02001A40
movs r1, #0x80
lsls r1, r1, #5
bl sub_0801D630
bl _DmaZero
ldr r2, _080A46AC @ =gScreen
adds r1, r2, #0
adds r1, #0x58
@@ -1359,7 +1359,7 @@ sub_080A4608: @ 0x080A4608
movs r0, #1
strh r0, [r2, #0x1a]
movs r2, #0xee
ldr r3, _080A46B4 @ =gUnk_02000080
ldr r3, _080A46B4 @ =gMenu
movs r1, #0xf
adds r0, r3, #0
adds r0, #0x1f
@@ -1393,7 +1393,7 @@ _080A46A4: .4byte gUnk_02034CB0
_080A46A8: .4byte gUnk_02001A40
_080A46AC: .4byte gScreen
_080A46B0: .4byte 0x00007898
_080A46B4: .4byte gUnk_02000080
_080A46B4: .4byte gMenu
_080A46B8: .4byte gUnk_02032EC0
_080A46BC: .4byte gUnk_02002A40
@@ -1427,7 +1427,7 @@ sub_080A46EC: @ 0x080A46EC
cmp r0, #0
bne _080A4710
ldr r1, _080A4718 @ =gUnk_080FC3E4
ldr r0, _080A471C @ =gUnk_02000080
ldr r0, _080A471C @ =gMenu
ldrb r0, [r0, #0x1c]
lsls r0, r0, #3
adds r0, r0, r1
@@ -1442,12 +1442,12 @@ _080A4710:
.align 2, 0
_080A4714: .4byte gUnk_03000FD0
_080A4718: .4byte gUnk_080FC3E4
_080A471C: .4byte gUnk_02000080
_080A471C: .4byte gMenu
thumb_func_start sub_080A4720
sub_080A4720: @ 0x080A4720
push {r4, lr}
ldr r4, _080A4744 @ =gUnk_02000080
ldr r4, _080A4744 @ =gMenu
ldrb r0, [r4]
cmp r0, #0
beq _080A47C4
@@ -1464,7 +1464,7 @@ sub_080A4720: @ 0x080A4720
beq _080A4788
b _080A475A
.align 2, 0
_080A4744: .4byte gUnk_02000080
_080A4744: .4byte gMenu
_080A4748:
ldr r0, _080A477C @ =gUnk_02002B0E
ldrb r1, [r4, #0x1c]
@@ -1475,7 +1475,7 @@ _080A4748:
movs r0, #1
strb r0, [r4, #1]
_080A475A:
ldr r0, _080A4780 @ =gUnk_02000080
ldr r0, _080A4780 @ =gMenu
adds r0, #0x20
ldrb r0, [r0]
lsrs r1, r0, #2
@@ -1494,7 +1494,7 @@ _080A476A:
b _080A47C4
.align 2, 0
_080A477C: .4byte gUnk_02002B0E
_080A4780: .4byte gUnk_02000080
_080A4780: .4byte gMenu
_080A4784: .4byte gScreen
_080A4788:
ldr r2, _080A47C8 @ =gScreen
@@ -1534,7 +1534,7 @@ _080A47CC: .4byte gUnk_0812813C
thumb_func_start sub_080A47D0
sub_080A47D0: @ 0x080A47D0
push {r4, lr}
ldr r0, _080A47EC @ =gUnk_02000080
ldr r0, _080A47EC @ =gMenu
movs r4, #0x1f
ldrsb r4, [r0, r4]
ldr r0, _080A47F0 @ =gUnk_03000FF0
@@ -1547,7 +1547,7 @@ sub_080A47D0: @ 0x080A47D0
beq _080A47FE
b _080A480A
.align 2, 0
_080A47EC: .4byte gUnk_02000080
_080A47EC: .4byte gMenu
_080A47F0: .4byte gUnk_03000FF0
_080A47F4:
cmp r0, #0x10
@@ -1564,7 +1564,7 @@ _080A4804:
_080A4808:
subs r4, #8
_080A480A:
ldr r1, _080A4828 @ =gUnk_02000080
ldr r1, _080A4828 @ =gMenu
ldrb r0, [r1, #0x1e]
cmp r4, #0
bge _080A4814
@@ -1581,7 +1581,7 @@ _080A481A:
strh r0, [r1, #0x18]
pop {r4, pc}
.align 2, 0
_080A4828: .4byte gUnk_02000080
_080A4828: .4byte gMenu
_080A482C: .4byte gScreen
thumb_func_start sub_080A4830
@@ -1597,7 +1597,7 @@ sub_080A4830: @ 0x080A4830
strh r0, [r2]
ldr r0, _080A485C @ =gUnk_0812813C
bl sub_080A70AC
ldr r1, _080A4860 @ =gUnk_02000080
ldr r1, _080A4860 @ =gMenu
movs r0, #0xff
strb r0, [r1, #1]
movs r0, #1
@@ -1606,7 +1606,7 @@ sub_080A4830: @ 0x080A4830
.align 2, 0
_080A4858: .4byte gScreen
_080A485C: .4byte gUnk_0812813C
_080A4860: .4byte gUnk_02000080
_080A4860: .4byte gMenu
thumb_func_start sub_080A4864
sub_080A4864: @ 0x080A4864
@@ -1615,7 +1615,7 @@ sub_080A4864: @ 0x080A4864
ldrb r0, [r0]
cmp r0, #0
bne _080A4926
ldr r0, _080A4898 @ =gUnk_02000080
ldr r0, _080A4898 @ =gMenu
movs r5, #0x1f
ldrsb r5, [r0, r5]
ldrb r4, [r0, #0x1c]
@@ -1636,7 +1636,7 @@ sub_080A4864: @ 0x080A4864
b _080A48DE
.align 2, 0
_080A4894: .4byte gUnk_03000FD0
_080A4898: .4byte gUnk_02000080
_080A4898: .4byte gMenu
_080A489C: .4byte gUnk_03000FF0
_080A48A0:
cmp r1, #0x80
@@ -1693,7 +1693,7 @@ _080A48F0:
bge _080A48F6
adds r4, r1, #0
_080A48F6:
ldr r6, _080A492C @ =gUnk_02000080
ldr r6, _080A492C @ =gMenu
ldrb r0, [r6, #0x1c]
cmp r0, r4
beq _080A490E
@@ -1722,7 +1722,7 @@ _080A4926:
pop {r4, r5, r6, pc}
.align 2, 0
_080A4928: .4byte gUnk_02002A40
_080A492C: .4byte gUnk_02000080
_080A492C: .4byte gMenu
_080A4930: .4byte gScreen
thumb_func_start sub_080A4934
@@ -1796,7 +1796,7 @@ sub_080A4978: @ 0x080A4978
bne _080A49AC
movs r2, #0x82
_080A49AC:
ldr r3, _080A4B24 @ =gUnk_02000080
ldr r3, _080A4B24 @ =gMenu
ldrb r1, [r3, #1]
movs r0, #2
ands r0, r1
@@ -1852,7 +1852,7 @@ _080A4A10:
ands r0, r1
cmp r0, #0
beq _080A4A6A
ldr r5, _080A4B24 @ =gUnk_02000080
ldr r5, _080A4B24 @ =gMenu
ldrb r1, [r5, #1]
adds r0, r2, #0
ands r0, r1
@@ -1895,7 +1895,7 @@ _080A4A6A:
ldrb r0, [r0, #7]
cmp r0, #0
beq _080A4ABE
ldr r2, _080A4B24 @ =gUnk_02000080
ldr r2, _080A4B24 @ =gMenu
ldrb r1, [r2, #1]
movs r0, #4
ands r0, r1
@@ -1931,7 +1931,7 @@ _080A4A8E:
cmp r6, #0
bge _080A4A8E
_080A4ABE:
ldr r4, _080A4B24 @ =gUnk_02000080
ldr r4, _080A4B24 @ =gMenu
ldrb r1, [r4, #1]
movs r0, #1
ands r0, r1
@@ -1977,7 +1977,7 @@ _080A4ABE:
.align 2, 0
_080A4B1C: .4byte gUnk_03001010
_080A4B20: .4byte gUnk_02002A40
_080A4B24: .4byte gUnk_02000080
_080A4B24: .4byte gMenu
_080A4B28: .4byte gUnk_03001000
_080A4B2C: .4byte gUnk_081281A8
_080A4B30: .4byte 0x06014000
@@ -1994,7 +1994,7 @@ _080A4B40: .4byte 0x06014000
thumb_func_start sub_080A4B44
sub_080A4B44: @ 0x080A4B44
push {r4, r5, lr}
ldr r5, _080A4B9C @ =gUnk_02000080
ldr r5, _080A4B9C @ =gMenu
ldrb r4, [r5, #0x1c]
ldrb r1, [r5, #1]
movs r0, #0x10
@@ -2034,7 +2034,7 @@ _080A4B6E:
_080A4B98:
pop {r4, r5, pc}
.align 2, 0
_080A4B9C: .4byte gUnk_02000080
_080A4B9C: .4byte gMenu
thumb_func_start sub_080A4BA0
sub_080A4BA0: @ 0x080A4BA0
@@ -2044,7 +2044,7 @@ sub_080A4BA0: @ 0x080A4BA0
adds r6, r1, #0
add r0, sp, #0x18
movs r1, #0x30
bl sub_0801D630
bl _DmaZero
ldr r0, _080A4C08 @ =gUnk_0812816C
mov r1, sp
movs r2, #0x18
@@ -2115,7 +2115,7 @@ _080A4C38:
_080A4C3C:
adds r5, r5, r0
_080A4C3E:
ldr r0, _080A4C94 @ =gUnk_02000080
ldr r0, _080A4C94 @ =gMenu
lsls r1, r6, #1
adds r0, #0x10
adds r1, r1, r0
@@ -2130,7 +2130,7 @@ _080A4C3E:
_080A4C56:
ldr r1, [sp]
movs r2, #0x80
bl sub_0801D5EC
bl _DmaFill16
cmp r5, #0
ble _080A4CAC
ldr r0, _080A4C9C @ =0x00007FFF
@@ -2159,7 +2159,7 @@ _080A4C72:
bl sub_0805F46C
b _080A4CAC
.align 2, 0
_080A4C94: .4byte gUnk_02000080
_080A4C94: .4byte gMenu
_080A4C98: .4byte 0x0000F00B
_080A4C9C: .4byte 0x00007FFF
_080A4CA0: .4byte 0x00000889
@@ -2181,7 +2181,7 @@ _080A4CB8: .4byte gScreen
sub_080A4CBC: @ 0x080A4CBC
push {r4, r5, r6, lr}
adds r6, r0, #0
ldr r1, _080A4D0C @ =gUnk_02000080
ldr r1, _080A4D0C @ =gMenu
ldrb r0, [r1, #0x1a]
cmp r0, r6
beq _080A4CFE
@@ -2191,7 +2191,7 @@ sub_080A4CBC: @ 0x080A4CBC
lsls r5, r5, #4
adds r0, r4, #0
adds r1, r5, #0
bl sub_0801D630
bl _DmaZero
ldr r1, _080A4D14 @ =0x0600E000
adds r0, r4, #0
adds r2, r5, #0
@@ -2218,7 +2218,7 @@ _080A4CFE:
movs r2, #0
b _080A4D28
.align 2, 0
_080A4D0C: .4byte gUnk_02000080
_080A4D0C: .4byte gMenu
_080A4D10: .4byte gUnk_02021F30
_080A4D14: .4byte 0x0600E000
_080A4D18: .4byte gUnk_08128190
@@ -2285,10 +2285,10 @@ sub_080A4D88: @ 0x080A4D88
push {lr}
ldr r0, _080A4DA4 @ =gUnk_020344A0
movs r1, #8
bl sub_0801D630
bl _DmaZero
movs r0, #1
movs r1, #0
bl sub_080A7138
bl MenuFadeIn
movs r0, #0x80
bl sub_080A3248
pop {pc}
@@ -2313,21 +2313,21 @@ sub_080A4DB8: @ 0x080A4DB8
movs r4, #0x80
lsls r4, r4, #4
adds r1, r4, #0
bl sub_0801D630
bl _DmaZero
ldr r0, _080A4E5C @ =gUnk_02021F30
adds r1, r4, #0
bl sub_0801D630
bl _DmaZero
ldr r0, _080A4E60 @ =gUnk_020344B0
adds r1, r4, #0
bl sub_0801D630
bl _DmaZero
ldr r0, _080A4E64 @ =gUnk_0200AF34
movs r1, #0xc0
lsls r1, r1, #2
bl sub_0801D630
ldr r4, _080A4E68 @ =gUnk_02000080
bl _DmaZero
ldr r4, _080A4E68 @ =gMenu
adds r0, r4, #0
movs r1, #0x30
bl sub_0801D630
bl _DmaZero
ldr r0, _080A4E6C @ =0x0000FFFF
strh r0, [r4, #0x2e]
ldr r0, _080A4E70 @ =gUnk_02034490
@@ -2384,7 +2384,7 @@ _080A4E58: .4byte gUnk_02034CB0
_080A4E5C: .4byte gUnk_02021F30
_080A4E60: .4byte gUnk_020344B0
_080A4E64: .4byte gUnk_0200AF34
_080A4E68: .4byte gUnk_02000080
_080A4E68: .4byte gMenu
_080A4E6C: .4byte 0x0000FFFF
_080A4E70: .4byte gUnk_02034490
_080A4E74: .4byte gUnk_08128A38
@@ -2496,7 +2496,7 @@ _080A4F38:
bl sub_0801DB94
strb r0, [r4, #7]
movs r0, #0x10
bl sub_0805436C
bl IsItemEquipped
movs r1, #0xf
cmp r0, #2
beq _080A4F66
@@ -2544,7 +2544,7 @@ sub_080A4FB8: @ 0x080A4FB8
bl sub_080A51F4
cmp r0, #0
beq _080A5052
ldr r0, _080A4FE4 @ =gUnk_02000080
ldr r0, _080A4FE4 @ =gMenu
ldr r1, [r0, #0xc]
adds r2, r0, #0
cmp r1, #0
@@ -2561,7 +2561,7 @@ sub_080A4FB8: @ 0x080A4FB8
beq _080A500A
b _080A500C
.align 2, 0
_080A4FE4: .4byte gUnk_02000080
_080A4FE4: .4byte gMenu
_080A4FE8: .4byte gUnk_03000FF0
_080A4FEC:
movs r0, #0x80
@@ -2611,7 +2611,7 @@ _080A5028:
bne _080A503A
movs r1, #2
_080A503A:
ldr r0, _080A5078 @ =gUnk_02000080
ldr r0, _080A5078 @ =gMenu
ldr r0, [r0, #0xc]
adds r0, r0, r1
ldrb r5, [r0]
@@ -2621,7 +2621,7 @@ _080A5042:
strb r5, [r0, #0x14]
movs r0, #0x65
bl PlaySFX
ldr r0, _080A5078 @ =gUnk_02000080
ldr r0, _080A5078 @ =gMenu
str r4, [r0, #0xc]
_080A5052:
ldr r4, _080A507C @ =gUnk_02034490
@@ -2640,7 +2640,7 @@ _080A5052:
bl sub_080A4E90
b _080A5096
.align 2, 0
_080A5078: .4byte gUnk_02000080
_080A5078: .4byte gMenu
_080A507C: .4byte gUnk_02034490
_080A5080:
movs r0, #3
@@ -2648,7 +2648,7 @@ _080A5080:
ldr r0, _080A5098 @ =gUnk_02034CB0
movs r1, #0x80
lsls r1, r1, #4
bl sub_0801D630
bl _DmaZero
ldr r1, _080A509C @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
@@ -2828,14 +2828,14 @@ sub_080A51D4: @ 0x080A51D4
bhi _080A51E8
adds r0, #2
adds r0, r1, r0
ldr r1, _080A51F0 @ =gUnk_02000080
ldr r1, _080A51F0 @ =gMenu
ldrb r1, [r1, #3]
strb r1, [r0]
_080A51E8:
pop {pc}
.align 2, 0
_080A51EC: .4byte gUnk_02034490
_080A51F0: .4byte gUnk_02000080
_080A51F0: .4byte gMenu
thumb_func_start sub_080A51F4
sub_080A51F4: @ 0x080A51F4
@@ -2863,7 +2863,7 @@ _080A5214: .4byte gUnk_02034490
sub_080A5218: @ 0x080A5218
push {lr}
ldr r1, _080A5230 @ =gUnk_08128B48
ldr r0, _080A5234 @ =gUnk_02000080
ldr r0, _080A5234 @ =gMenu
ldrb r0, [r0, #5]
lsls r0, r0, #2
adds r0, r0, r1
@@ -2873,12 +2873,12 @@ sub_080A5218: @ 0x080A5218
pop {pc}
.align 2, 0
_080A5230: .4byte gUnk_08128B48
_080A5234: .4byte gUnk_02000080
_080A5234: .4byte gMenu
thumb_func_start sub_080A5238
sub_080A5238: @ 0x080A5238
push {r4, r5, lr}
ldr r4, _080A528C @ =gUnk_02000080
ldr r4, _080A528C @ =gMenu
movs r0, #0
str r0, [r4, #0xc]
ldr r0, _080A5290 @ =gUnk_08128B50
@@ -2919,7 +2919,7 @@ _080A527E:
bl sub_080A7114
pop {r4, r5, pc}
.align 2, 0
_080A528C: .4byte gUnk_02000080
_080A528C: .4byte gMenu
_080A5290: .4byte gUnk_08128B50
_080A5294: .4byte gUnk_080FD5B4
_080A5298: .4byte gUnk_02034490
@@ -2930,7 +2930,7 @@ sub_080A529C: @ 0x080A529C
bl sub_080A51F4
cmp r0, #0
beq _080A5380
ldr r1, _080A52D0 @ =gUnk_02000080
ldr r1, _080A52D0 @ =gMenu
ldr r0, _080A52D4 @ =gUnk_08128BF4
str r0, [r1, #0xc]
ldrb r4, [r1, #3]
@@ -2951,7 +2951,7 @@ sub_080A529C: @ 0x080A529C
bgt _080A531E
b _080A5318
.align 2, 0
_080A52D0: .4byte gUnk_02000080
_080A52D0: .4byte gMenu
_080A52D4: .4byte gUnk_08128BF4
_080A52D8: .4byte gUnk_08128B64
_080A52DC: .4byte gUnk_03000FF0
@@ -2962,7 +2962,7 @@ _080A52E0:
bl sub_080A4E84
b _080A530A
_080A52EC:
ldr r0, _080A5314 @ =gUnk_02000080
ldr r0, _080A5314 @ =gMenu
adds r0, #0x10
adds r2, r4, r0
ldrb r0, [r2]
@@ -2981,7 +2981,7 @@ _080A530A:
bl PlaySFX
b _080A5336
.align 2, 0
_080A5314: .4byte gUnk_02000080
_080A5314: .4byte gMenu
_080A5318:
cmp r0, #0x10
beq _080A5334
@@ -3004,7 +3004,7 @@ _080A5330:
_080A5334:
ldrb r4, [r1, #3]
_080A5336:
ldr r5, _080A535C @ =gUnk_02000080
ldr r5, _080A535C @ =gMenu
ldrb r0, [r5, #3]
cmp r0, r4
beq _080A5346
@@ -3024,7 +3024,7 @@ _080A5346:
beq _080A5374
b _080A5376
.align 2, 0
_080A535C: .4byte gUnk_02000080
_080A535C: .4byte gMenu
_080A5360:
cmp r1, #0
beq _080A5376
@@ -3073,7 +3073,7 @@ sub_080A5384: @ 0x080A5384
mov r8, r2
movs r6, #0
_080A53B4:
ldr r0, _080A5408 @ =gUnk_02000080
ldr r0, _080A5408 @ =gMenu
adds r0, #0x10
adds r2, r5, r0
ldrb r0, [r2]
@@ -3115,7 +3115,7 @@ _080A53E0:
.align 2, 0
_080A5400: .4byte gUnk_03001010
_080A5404: .4byte gUnk_02002A40
_080A5408: .4byte gUnk_02000080
_080A5408: .4byte gMenu
_080A540C: .4byte gUnk_08128B64
_080A5410: .4byte gBombBagSizes
_080A5414:
@@ -3162,7 +3162,7 @@ _080A5456:
movs r1, #0x80
lsls r1, r1, #4
strh r1, [r0, #8]
ldr r1, _080A5538 @ =gUnk_02000080
ldr r1, _080A5538 @ =gMenu
ldrb r1, [r1, #3]
mov sb, r0
cmp r1, #0x10
@@ -3264,7 +3264,7 @@ _080A5522:
_080A552C: .4byte gQuiverSizes
_080A5530: .4byte gUnk_03001010
_080A5534: .4byte gUnk_080FDFD8
_080A5538: .4byte gUnk_02000080
_080A5538: .4byte gMenu
_080A553C: .4byte gUnk_08128B64
_080A5540: .4byte gUnk_03001000
_080A5544: .4byte 0x000001FB
asm/code_080A5574.s
+148 -164
View File
File diff suppressed because it is too large Load Diff
asm/code_080AD90C.s
+4 -4
View File
@@ -567,7 +567,7 @@ sub_080ADD30: @ 0x080ADD30
movs r1, #0x85
lsls r1, r1, #2
adds r0, r4, #0
bl sub_0801D630
bl _DmaZero
movs r5, #0
adds r4, #4
movs r0, #0x10
@@ -718,7 +718,7 @@ _080ADE54: .4byte gUnk_02024494
_080ADE58:
adds r0, r1, #0
movs r1, #0xc
bl sub_0801D630
bl _DmaZero
_080ADE60:
adds r5, #0xc
adds r4, #1
@@ -1084,7 +1084,7 @@ sub_080AE104: @ 0x080AE104
adds r1, r1, r5
lsls r1, r1, #2
adds r0, r4, #0
bl sub_0801D630
bl _DmaZero
strb r5, [r4, #1]
strh r6, [r4, #4]
adds r0, r4, #0
@@ -1396,7 +1396,7 @@ _080AE350:
stm r0!, {r2, r3, r7}
adds r0, r6, #0
movs r1, #0xc
bl sub_0801D630
bl _DmaZero
adds r6, #0xc
adds r5, #0xc
movs r0, #0xc
asm/drawKinstoneMenu.s
+2 -2
View File
@@ -16,7 +16,7 @@ sub_080A3B84: @ 0x080A3B84
strb r0, [r4]
bl sub_080AD90C
ldr r1, _080A3BC8 @ =gUnk_081280C4
ldr r0, _080A3BCC @ =gUnk_02000080
ldr r0, _080A3BCC @ =gMenu
ldrb r0, [r0, #5]
lsls r0, r0, #2
adds r0, r0, r1
@@ -34,4 +34,4 @@ sub_080A3B84: @ 0x080A3B84
.align 2, 0
_080A3BC4: .4byte gUnk_030010A0
_080A3BC8: .4byte gUnk_081280C4
_080A3BCC: .4byte gUnk_02000080
_080A3BCC: .4byte gMenu
asm/figurineDevice.s
+2 -2
View File
@@ -173,7 +173,7 @@ _08087CCA:
bl SetRoomFlag
movs r0, #7
movs r1, #0xff
bl sub_080A7138
bl MenuFadeIn
b _08087D1A
_08087CFA:
movs r0, #5
@@ -332,7 +332,7 @@ _08087E10:
bl SetRoomFlag
ldrb r1, [r4, #0xf]
movs r0, #7
bl sub_080A7138
bl MenuFadeIn
b _08087E5A
_08087E3C:
movs r0, #2
asm/gyorgFemale.s
+5 -5
View File
@@ -112,10 +112,10 @@ sub_0804614C: @ 0x0804614C
movs r4, #0x80
lsls r4, r4, #8
adds r1, r4, #0
bl sub_0801D630
bl _DmaZero
ldr r0, _08046250 @ =gUnk_02002F00
adds r1, r4, #0
bl sub_0801D630
bl _DmaZero
adds r0, r6, #0
movs r1, #0
bl sub_0804660C
@@ -445,10 +445,10 @@ sub_08046498: @ 0x08046498
movs r4, #0x80
lsls r4, r4, #8
adds r1, r4, #0
bl sub_0801D630
bl _DmaZero
ldr r0, _080464BC @ =gUnk_02002F00
adds r1, r4, #0
bl sub_0801D630
bl _DmaZero
adds r0, r5, #0
bl sub_080464C0
pop {r4, r5, pc}
@@ -486,7 +486,7 @@ _080464DE:
ldr r0, _0804650C @ =gUnk_02019EE0
movs r1, #0x80
lsls r1, r1, #4
bl sub_0801D630
bl _DmaZero
ldr r1, _08046514 @ =gUnk_02000070
movs r0, #1
strb r0, [r1]
asm/initializeLink.s
+3 -3
View File
@@ -8,11 +8,11 @@ InitializeLink: @ 0x080524A8
bl sub_080784C8
ldr r0, _08052510 @ =gUnk_03000B80
movs r1, #0x70
bl sub_0801D630
bl _DmaZero
ldr r6, _08052514 @ =gLinkState
adds r0, r6, #0
movs r1, #0xb0
bl sub_0801D630
bl _DmaZero
movs r0, #1
rsbs r0, r0, #0
adds r1, r6, #0
@@ -22,7 +22,7 @@ InitializeLink: @ 0x080524A8
ldr r4, _08052518 @ =gLinkEntity
adds r0, r4, #0
movs r1, #0x88
bl sub_0801D630
bl _DmaZero
ldr r0, _0805251C @ =gRoomControls
str r4, [r0, #0x30]
ldr r1, _08052520 @ =gUnk_080FCAC8
asm/manager10.s
+1 -1
View File
@@ -338,7 +338,7 @@ _08059800:
lsls r5, r5, #4
adds r0, r4, #0
adds r1, r5, #0
bl sub_0801D630
bl _DmaZero
ldr r1, _08059820 @ =0x0600E800
adds r0, r4, #0
adds r2, r5, #0
asm/manager1A.s
+1 -1
View File
@@ -28,7 +28,7 @@ sub_0805B048: @ 0x0805B048
adds r0, r4, #0
adds r0, #0x20
movs r1, #0x20
bl sub_0801D630
bl _DmaZero
movs r0, #1
strb r0, [r4, #0xc]
ldr r2, _0805B08C @ =gRoomControls
asm/manager22.s
+1 -1
View File
@@ -297,7 +297,7 @@ _0805BB28:
movs r2, #0x80
lsls r2, r2, #4
movs r0, #0xf
bl sub_0801D5EC
bl _DmaFill16
ldr r0, _0805BB58 @ =gScreen
ldr r1, _0805BB5C @ =0x00001E0C
strh r1, [r0, #0x2c]
asm/manager2C.s
+1 -1
View File
@@ -44,7 +44,7 @@ _0805D184:
ldr r4, _0805D1F8 @ =gUnk_030010AC
adds r0, r4, #0
movs r1, #0x20
bl sub_0801D630
bl _DmaZero
subs r4, #0xc
movs r1, #0
movs r0, #1
asm/manager39.s
+2 -2
View File
@@ -120,7 +120,7 @@ sub_0805E1D8: @ 0x0805E1D8
push {lr}
ldr r0, _0805E1F0 @ =gUnk_02034DF0
movs r1, #0x80
bl sub_0801D630
bl _DmaZero
ldr r1, _0805E1F4 @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
@@ -138,7 +138,7 @@ sub_0805E1F8: @ 0x0805E1F8
adds r5, r1, #0
ldr r0, _0805E234 @ =gUnk_02034DF0
movs r1, #0x80
bl sub_0801D630
bl _DmaZero
ldr r0, _0805E238 @ =gUnk_08108E60
mov r1, sp
movs r2, #9
asm/managerB.s
+1 -1
View File
@@ -216,7 +216,7 @@ sub_08058760: @ 0x08058760
adds r0, r4, #0
adds r0, #0x20
movs r1, #0x20
bl sub_0801D630
bl _DmaZero
adds r0, r4, #0
movs r1, #8
bl sub_0805EA2C
asm/managerF.s
+1 -1
View File
@@ -199,7 +199,7 @@ _08059034:
strb r0, [r4, #0xc]
ldrb r1, [r4, #0xd]
movs r0, #5
bl sub_080A7138
bl MenuFadeIn
b _08059060
.align 2, 0
_0805904C: .4byte gLinkEntity
asm/non_matching/code_0805457C.inc
+367
View File
@@ -0,0 +1,367 @@
.syntax unified
push {r4, r5, r6, r7, lr}
sub sp, #0x20
adds r6, r0, #0
adds r3, r1, #0
ldr r0, _080545A4 @ =gRoomVars
ldrb r1, [r0, #2]
adds r5, r0, #0
cmp r1, #1
bne _08054590
b _0805474C
_08054590:
ldr r2, _080545A8 @ =gUnk_08001A1C
movs r4, #0
cmp r3, #0x19
bhi _0805463C
lsls r0, r3, #2
ldr r1, _080545AC @ =_080545B0
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080545A4: .4byte gRoomVars
_080545A8: .4byte gUnk_08001A1C
_080545AC: .4byte _080545B0
_080545B0: @ jump table
.4byte _0805463C @ case 0
.4byte _08054618 @ case 1
.4byte _08054618 @ case 2
.4byte _08054618 @ case 3
.4byte _08054618 @ case 4
.4byte _08054618 @ case 5
.4byte _08054618 @ case 6
.4byte _08054618 @ case 7
.4byte _08054618 @ case 8
.4byte _08054618 @ case 9
.4byte _08054618 @ case 10
.4byte _08054618 @ case 11
.4byte _08054618 @ case 12
.4byte _0805463C @ case 13
.4byte _0805463C @ case 14
.4byte _0805463A @ case 15
.4byte _08054634 @ case 16
.4byte _08054634 @ case 17
.4byte _08054634 @ case 18
.4byte _08054634 @ case 19
.4byte _08054634 @ case 20
.4byte _08054634 @ case 21
.4byte _08054634 @ case 22
.4byte _08054634 @ case 23
.4byte _08054624 @ case 24
.4byte _08054624 @ case 25
_08054618:
lsls r1, r3, #5
ldr r0, _08054620 @ =gUnk_0800137C
adds r4, r1, r0
b _0805463C
.align 2, 0
_08054620: .4byte gUnk_0800137C
_08054624:
ldrb r0, [r5, #0xa]
ldr r4, _08054630 @ =gUnk_0800191C
cmp r0, #0
beq _0805463C
adds r4, #0x20
b _0805463C
.align 2, 0
_08054630: .4byte gUnk_0800191C
_08054634:
lsls r1, r3, #5
ldr r0, _08054650 @ =gUnk_0800161C
adds r2, r1, r0
_0805463A:
ldr r4, _08054654 @ =gUnk_02034398
_0805463C:
cmp r4, #0
bne _08054642
b _0805474C
_08054642:
ldr r0, _08054658 @ =gUnk_02002A40
adds r0, #0xb3
ldrb r1, [r0]
cmp r1, #0
bne _08054660
ldr r3, _0805465C @ =gUnk_08001A1C
b _08054666
.align 2, 0
_08054650: .4byte gUnk_0800161C
_08054654: .4byte gUnk_02034398
_08054658: .4byte gUnk_02002A40
_0805465C: .4byte gUnk_08001A1C
_08054660:
lsls r1, r1, #5
ldr r0, _0805473C @ =gUnk_0800143C
adds r3, r1, r0
_08054666:
mov r0, sp
adds r1, r4, #0
bl sub_08000F14
ldr r4, _08054740 @ =gUnk_02002A40
adds r0, r4, #0
adds r0, #0xaa
ldrb r0, [r0]
cmp r0, #8
bhi _08054684
mov r1, sp
mov r0, sp
ldrh r0, [r0, #8]
adds r0, #5
strh r0, [r1, #8]
_08054684:
adds r0, r4, #0
adds r0, #0xac
ldrb r0, [r0]
cmp r0, #0
bne _08054698
mov r1, sp
mov r0, sp
ldrh r0, [r0, #0xc]
adds r0, #3
strh r0, [r1, #0xc]
_08054698:
adds r0, r4, #0
adds r0, #0xad
ldrb r0, [r0]
cmp r0, #0
bne _080546AC
mov r1, sp
mov r0, sp
ldrh r0, [r0, #0xe]
adds r0, #3
strh r0, [r1, #0xe]
_080546AC:
adds r0, r4, #0
adds r0, #0xc0
ldrh r0, [r0]
cmp r0, #0xa
bhi _080546C0
mov r1, sp
mov r0, sp
ldrh r0, [r0, #4]
adds r0, #1
strh r0, [r1, #4]
_080546C0:
ldr r2, _08054744 @ =gUnk_08001A1C
adds r0, r4, #0
adds r0, #0xbb
ldrb r0, [r0]
adds r3, r2, #0
cmp r0, #0
beq _080546D0
adds r2, #0x20
_080546D0:
movs r1, #0x8b
lsls r1, r1, #1
adds r0, r4, r1
ldrb r0, [r0]
cmp r0, #0
beq _080546DE
adds r3, #0x40
_080546DE:
mov r0, sp
mov r1, sp
bl sub_08000F2C
adds r4, r0, #0
bl Random
adds r2, r0, #0
asrs r5, r2, #0x18
movs r0, #0xf
ands r5, r0
adds r0, r2, #0
adds r1, r4, #0
bl __modsi3
adds r2, r0, #0
movs r3, #0
lsls r0, r5, #1
add r0, sp
movs r4, #0
ldrsh r1, [r0, r4]
cmp r1, r2
bgt _08054726
movs r4, #0xf
_0805470E:
adds r3, #1
adds r5, #1
ands r5, r4
cmp r3, #0xf
bhi _08054726
lsls r0, r5, #1
add r0, sp
movs r7, #0
ldrsh r0, [r0, r7]
adds r1, r1, r0
cmp r1, r2
ble _0805470E
_08054726:
ldr r0, _08054748 @ =gUnk_080FE1B4
adds r0, r5, r0
ldrb r1, [r0]
cmp r1, #0
beq _0805474C
adds r0, r6, #0
movs r2, #0
bl CreateItemDrop
b _0805474E
.align 2, 0
_0805473C: .4byte gUnk_0800143C
_08054740: .4byte gUnk_02002A40
_08054744: .4byte gUnk_08001A1C
_08054748: .4byte gUnk_080FE1B4
_0805474C:
movs r0, #0
_0805474E:
add sp, #0x20
pop {r4, r5, r6, r7, pc}
.align 2, 0
thumb_func_start CreateItemDrop
CreateItemDrop: @ 0x08054754
push {r4, r5, r6, lr}
adds r6, r0, #0
adds r4, r1, #0
adds r5, r2, #0
cmp r4, #0x5e
beq _08054786
cmp r4, #0x5e
bhi _08054772
cmp r4, #0x5c
beq _080547A6
cmp r4, #0x5c
bhi _08054782
cmp r4, #0x3f
beq _08054794
b _080547DA
_08054772:
cmp r4, #0xfc
blo _080547DA
cmp r4, #0xfe
bls _080547A6
cmp r4, #0xff
bne _080547DA
movs r0, #1
b _08054788
_08054782:
movs r0, #0x65
b _08054788
_08054786:
movs r0, #9
_08054788:
bl GetInventoryValue
cmp r0, #0
bne _080547DA
_08054790:
movs r0, #0
b _0805486C
_08054794:
movs r0, #0x40
bl GetInventoryValue
cmp r0, #0
beq _08054790
cmp r5, #0
bne _080547DA
movs r5, #1
b _080547DA
_080547A6:
movs r0, #0x67
bl GetInventoryValue
cmp r0, #0
beq _08054790
ldr r0, _080547FC @ =gRoomVars
ldrb r0, [r0, #5]
cmp r0, #3
bhi _08054790
cmp r4, #0x5c
beq _080547DA
adds r5, r4, #0
subs r5, #0xfc
bl Random
movs r1, #0x3f
ands r1, r0
ldr r2, _08054800 @ =gUnk_080FE1DD
lsls r0, r5, #6
adds r1, r1, r0
adds r1, r1, r2
ldrb r5, [r1]
movs r4, #0x5c
cmp r5, #0
bne _080547DA
movs r4, #0
_080547DA:
cmp r4, #0
beq _0805486A
cmp r4, #0xff
beq _08054842
movs r0, #0
adds r1, r4, #0
adds r2, r5, #0
bl CreateObject
adds r2, r0, #0
cmp r2, #0
beq _0805486A
ldr r0, _08054804 @ =gLinkEntity
cmp r6, r0
bne _08054808
movs r0, #1
b _0805480A
.align 2, 0
_080547FC: .4byte gRoomVars
_08054800: .4byte gUnk_080FE1DD
_08054804: .4byte gLinkEntity
_08054808:
movs r0, #0
_0805480A:
strb r0, [r2, #0xe]
ldrb r0, [r6, #8]
cmp r0, #6
bne _08054838
ldrb r0, [r6, #9]
cmp r0, #0x63
bne _0805481C
str r2, [r6, #0x54]
b _08054838
_0805481C:
cmp r0, #0x1e
bne _08054838
ldrb r0, [r6, #0x14]
lsls r0, r0, #3
movs r3, #0x80
rsbs r3, r3, #0
adds r1, r3, #0
orrs r0, r1
strb r0, [r2, #0x15]
movs r0, #0xc0
strh r0, [r2, #0x24]
movs r0, #0xc0
lsls r0, r0, #9
str r0, [r2, #0x20]
_08054838:
adds r0, r6, #0
adds r1, r2, #0
bl CopyPosition
b _0805486A
_08054842:
movs r0, #7
movs r1, #0
bl CreateEnemy
adds r2, r0, #0
cmp r2, #0
beq _0805486A
ldrh r0, [r6, #0x2e]
strh r0, [r2, #0x2e]
ldrh r0, [r6, #0x32]
strh r0, [r2, #0x32]
adds r0, r6, #0
adds r0, #0x38
ldrb r1, [r0]
adds r0, r2, #0
adds r0, #0x38
strb r1, [r0]
adds r0, r2, #0
bl UpdateSpriteForCollisionLayer
_0805486A:
adds r0, r4, #0
_0805486C:
pop {r4, r5, r6, pc}
.align 2, 0
.syntax divided
asm/non_matching/mainLoop.inc
+1 -1
View File
@@ -35,7 +35,7 @@
ldr r4, _08055F04 @ =gUnk_03001000
adds r0, r4, #0
movs r1, #0x10
bl sub_0801D630
bl _DmaZero
movs r0, #0
bl sub_08056010
adds r6, r4, #0
asm/non_matching/putItemOnSlot.s
+120
View File
@@ -0,0 +1,120 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
push {r4, r5, lr}
adds r5, r0, #0
cmp r5, #0x46
bhi _080543A8
movs r0, #0
movs r1, #1
bl sub_0807CAA0
_080543A8:
subs r0, r5, #1
cmp r0, #0x1e
bhi _08054410
movs r1, #2
ldr r2, _080543C0 @ =gUnk_02002A40
adds r0, r2, #0
adds r0, #0xb4
ldrb r0, [r0]
cmp r0, #0
bne _080543C4
movs r1, #0
b _080543D0
.align 2, 0
_080543C0: .4byte gUnk_02002A40
_080543C4:
adds r0, r2, #0
adds r0, #0xb5
ldrb r0, [r0]
cmp r0, #0
bne _080543D0
movs r1, #1
_080543D0:
cmp r1, #2
bne _0805440A
ldr r3, _080543F0 @ =gUnk_080FD5B4
lsls r0, r5, #3
adds r0, r0, r3
ldrb r4, [r0]
adds r0, r2, #0
adds r0, #0xb4
ldrb r0, [r0]
lsls r0, r0, #3
adds r0, r0, r3
ldrb r0, [r0]
cmp r4, r0
bne _080543F4
movs r1, #0
b _08054406
.align 2, 0
_080543F0: .4byte gUnk_080FD5B4
_080543F4:
adds r0, r2, #0
adds r0, #0xb5
ldrb r0, [r0]
lsls r0, r0, #3
adds r0, r0, r3
ldrb r0, [r0]
cmp r4, r0
bne _08054406
movs r1, #1
_08054406:
cmp r1, #2
beq _08054410
_0805440A:
adds r0, r5, #0
bl ForceEquipItem
_08054410:
pop {r4, r5, pc}
.align 2, 0
thumb_func_start ForceEquipItem
ForceEquipItem: @ 0x08054414
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
subs r0, r4, #1
cmp r0, #0x1e
bhi _08054456
cmp r1, #1
bhi _08054456
movs r2, #0
cmp r1, #0
bne _0805442A
movs r2, #1
_0805442A:
ldr r0, _08054458 @ =gUnk_02002A40
adds r0, #0xb4
adds r6, r1, r0
ldrb r7, [r6]
adds r5, r2, r0
ldrb r3, [r5]
ldr r2, _0805445C @ =gUnk_080FD5B4
lsls r1, r3, #3
adds r1, r1, r2
lsls r0, r4, #3
adds r0, r0, r2
ldrb r1, [r1]
ldrb r0, [r0]
cmp r1, r0
bne _0805444A
adds r3, r7, #0
_0805444A:
strb r4, [r6]
strb r3, [r5]
ldr r1, _08054460 @ =gUnk_0200AF00
movs r0, #0x7f
strb r0, [r1, #0x13]
strb r0, [r1, #0x14]
_08054456:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08054458: .4byte gUnk_02002A40
_0805445C: .4byte gUnk_080FD5B4
_08054460: .4byte gUnk_0200AF00
.syntax divided
asm/non_matching/sub_08054524.inc
+31
View File
@@ -0,0 +1,31 @@
.syntax unified
push {lr}
ldr r0, _08054550 @ =gArea
ldrb r1, [r0, #1]
cmp r1, #0
bne _08054534
ldr r0, _08054554 @ =gUnk_030010A0
adds r0, #0x2e
ldrb r1, [r0]
_08054534:
cmp r1, #0x16
bls _0805453A
movs r1, #0
_0805453A:
ldr r0, _08054558 @ =gUnk_080FE1C6
adds r0, r1, r0
ldrb r1, [r0]
lsls r0, r1, #5
ldr r1, _0805455C @ =gUnk_080015BC
adds r0, r0, r1
ldr r1, _08054560 @ =gUnk_02034398
movs r2, #0x20
bl sub_0801D66C
pop {pc}
.align 2, 0
_08054550: .4byte gArea
_08054554: .4byte gUnk_030010A0
_08054558: .4byte gUnk_080FE1C6
_0805455C: .4byte gUnk_080015BC
_08054560: .4byte gUnk_02034398
.syntax divided
asm/object3D.s
+1 -1
View File
@@ -170,7 +170,7 @@ sub_0808D030: @ 0x0808D030
adds r0, r4, #0
subs r0, #0x20
ldr r1, _0808D05C @ =0x00000B74
bl sub_0801D630
bl _DmaZero
movs r1, #0xa8
lsls r1, r1, #2
adds r0, r1, #0
asm/object45.s
+1 -1
View File
@@ -41,7 +41,7 @@ sub_0808E448: @ 0x0808E448
push {r4, lr}
adds r4, r0, #0
movs r0, #0x10
bl sub_0805436C
bl IsItemEquipped
cmp r0, #1
bls _0808E45A
bl DeleteThisEntity
asm/object48.s
+16 -16
View File
@@ -482,7 +482,7 @@ _0808EB1C:
movs r2, #0x38
b _0808EB68
_0808EB26:
ldr r3, _0808EB3C @ =gUnk_02000080
ldr r3, _0808EB3C @ =gMenu
adds r0, r3, #0
adds r0, #0x10
ldrb r1, [r5, #0xa]
@@ -494,7 +494,7 @@ _0808EB26:
movs r2, #0x28
b _0808EB68
.align 2, 0
_0808EB3C: .4byte gUnk_02000080
_0808EB3C: .4byte gMenu
_0808EB40:
cmp r1, #0
blt _0808EB68
@@ -588,17 +588,17 @@ _0808EBD8: @ jump table
.4byte _0808EC00 @ case 4
.4byte _0808EC14 @ case 5
_0808EBF0:
ldr r0, _0808EBF8 @ =gUnk_02000080
ldr r0, _0808EBF8 @ =gMenu
ldrb r0, [r0, #1]
adds r1, r0, #4
b _0808EC1E
.align 2, 0
_0808EBF8: .4byte gUnk_02000080
_0808EBF8: .4byte gMenu
_0808EBFC:
movs r1, #2
b _0808EC1E
_0808EC00:
ldr r0, _0808EC10 @ =gUnk_02000080
ldr r0, _0808EC10 @ =gMenu
ldrb r0, [r0, #1]
movs r1, #6
cmp r0, #0
@@ -606,7 +606,7 @@ _0808EC00:
movs r1, #7
b _0808EC1E
.align 2, 0
_0808EC10: .4byte gUnk_02000080
_0808EC10: .4byte gMenu
_0808EC14:
movs r1, #4
b _0808EC1E
@@ -707,7 +707,7 @@ _0808ECB8:
sub_0808ECBC: @ 0x0808ECBC
push {r4, lr}
adds r3, r0, #0
ldr r0, _0808ECD8 @ =gUnk_02000080
ldr r0, _0808ECD8 @ =gMenu
ldrb r4, [r0, #1]
ldr r0, _0808ECDC @ =gUnk_02032EC0
ldrb r0, [r0, #2]
@@ -719,7 +719,7 @@ sub_0808ECBC: @ 0x0808ECBC
beq _0808ECEA
b _0808ED04
.align 2, 0
_0808ECD8: .4byte gUnk_02000080
_0808ECD8: .4byte gMenu
_0808ECDC: .4byte gUnk_02032EC0
_0808ECE0:
cmp r0, #6
@@ -803,7 +803,7 @@ sub_0808ED64: @ 0x0808ED64
ldrb r0, [r0, #2]
cmp r0, #1
bne _0808ED8A
ldr r1, _0808ED94 @ =gUnk_02000080
ldr r1, _0808ED94 @ =gMenu
ldrb r0, [r1, #0x11]
cmp r0, #5
beq _0808ED8A
@@ -820,7 +820,7 @@ _0808ED8A:
pop {pc}
.align 2, 0
_0808ED90: .4byte gUnk_02032EC0
_0808ED94: .4byte gUnk_02000080
_0808ED94: .4byte gMenu
thumb_func_start sub_0808ED98
sub_0808ED98: @ 0x0808ED98
@@ -840,7 +840,7 @@ sub_0808ED98: @ 0x0808ED98
.align 2, 0
_0808EDB4: .4byte gUnk_02032EC0
_0808EDB8:
ldr r0, _0808EDF8 @ =gUnk_02000080
ldr r0, _0808EDF8 @ =gMenu
ldrb r0, [r0, #0x13]
cmp r0, #5
bls _0808EDC2
@@ -874,7 +874,7 @@ _0808EDCE:
bl sub_0808EF6C
pop {pc}
.align 2, 0
_0808EDF8: .4byte gUnk_02000080
_0808EDF8: .4byte gMenu
_0808EDFC: .4byte gUnk_08121D10
thumb_func_start sub_0808EE00
@@ -924,7 +924,7 @@ _0808EE56:
adds r0, r4, #0
adds r0, #0x6a
strh r1, [r0]
ldr r1, _0808EE8C @ =gUnk_02000080
ldr r1, _0808EE8C @ =gMenu
ldrb r0, [r1, #0x11]
movs r2, #9
cmp r0, #5
@@ -948,7 +948,7 @@ _0808EE6E:
strb r0, [r2]
pop {r4, r5, pc}
.align 2, 0
_0808EE8C: .4byte gUnk_02000080
_0808EE8C: .4byte gMenu
_0808EE90: .4byte gUnk_02019EE0
thumb_func_start nullsub_522
@@ -1017,7 +1017,7 @@ _0808EEF4:
strb r0, [r2, #0x18]
ldrb r1, [r2, #0xa]
subs r1, #0x13
ldr r0, _0808EF20 @ =gUnk_02000080
ldr r0, _0808EF20 @ =gMenu
ldrb r0, [r0, #1]
movs r3, #3
cmp r0, r1
@@ -1033,7 +1033,7 @@ _0808EF12:
_0808EF1E:
pop {pc}
.align 2, 0
_0808EF20: .4byte gUnk_02000080
_0808EF20: .4byte gMenu
thumb_func_start sub_0808EF24
sub_0808EF24: @ 0x0808EF24
asm/object4B.s
+2 -2
View File
@@ -256,7 +256,7 @@ sub_0808F940: @ 0x0808F940
lsls r0, r0, #0x18
cmp r0, #0
bne _0808F960
ldr r1, _0808F964 @ =gUnk_02000080
ldr r1, _0808F964 @ =gMenu
ldrb r0, [r1, #6]
adds r0, #1
strb r0, [r1, #6]
@@ -264,4 +264,4 @@ sub_0808F940: @ 0x0808F940
_0808F960:
pop {r4, pc}
.align 2, 0
_0808F964: .4byte gUnk_02000080
_0808F964: .4byte gMenu
asm/objectA2.s
+4 -4
View File
@@ -164,21 +164,21 @@ _0809F41C:
movs r1, #0x43
movs r2, #0
bl CreateFx
ldr r1, _0809F434 @ =gUnk_02000080
ldr r1, _0809F434 @ =gMenu
movs r0, #1
strb r0, [r1]
b _0809F442
.align 2, 0
_0809F434: .4byte gUnk_02000080
_0809F434: .4byte gMenu
_0809F438:
ldr r1, _0809F444 @ =gUnk_02000080
ldr r1, _0809F444 @ =gMenu
movs r0, #1
strb r0, [r1, #4]
bl DeleteThisEntity
_0809F442:
pop {pc}
.align 2, 0
_0809F444: .4byte gUnk_02000080
_0809F444: .4byte gMenu
thumb_func_start sub_0809F448
sub_0809F448: @ 0x0809F448
asm/objectB4.s
+4 -4
View File
@@ -105,7 +105,7 @@ _080A0C46:
bl sub_0806FB38
cmp r0, #0
bne _080A0C58
ldr r0, _080A0CE4 @ =gUnk_02000080
ldr r0, _080A0CE4 @ =gMenu
ldrb r0, [r0, #5]
cmp r0, #1
bls _080A0CE0
@@ -178,7 +178,7 @@ _080A0CC0:
_080A0CE0:
pop {r4, r5, pc}
.align 2, 0
_080A0CE4: .4byte gUnk_02000080
_080A0CE4: .4byte gMenu
thumb_func_start sub_080A0CE8
sub_080A0CE8: @ 0x080A0CE8
@@ -219,7 +219,7 @@ _080A0D28:
bl sub_0806FB38
cmp r0, #0
bne _080A0D3A
ldr r0, _080A0D68 @ =gUnk_02000080
ldr r0, _080A0D68 @ =gMenu
ldrb r0, [r0, #5]
cmp r0, #1
bls _080A0D66
@@ -249,7 +249,7 @@ _080A0D3A:
_080A0D66:
pop {r4, pc}
.align 2, 0
_080A0D68: .4byte gUnk_02000080
_080A0D68: .4byte gMenu
_080A0D6C: .4byte gUnk_08124B10
thumb_func_start sub_080A0D70
asm/stockwell.s
+1 -1
View File
@@ -382,7 +382,7 @@ sub_08065314: @ 0x08065314
strb r0, [r2, #0xd]
movs r0, #3
movs r1, #3
bl sub_080A7138
bl MenuFadeIn
_08065332:
pop {pc}
.align 2, 0
asm/sub_0801D630.s
-42
View File
@@ -1,42 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_0801D630
sub_0801D630: @ 0x0801D630
push {r4, lr}
adds r3, r0, #0
adds r2, r1, #0
movs r4, #0
adds r1, r3, #0
orrs r1, r2
movs r0, #3
ands r1, r0
cmp r1, #0
beq _0801D64A
cmp r1, #2
beq _0801D654
b _0801D65E
_0801D64A:
movs r0, #0
adds r1, r3, #0
bl _DmaFill32
b _0801D668
_0801D654:
movs r0, #0
adds r1, r3, #0
bl sub_0801D5EC
b _0801D668
_0801D65E:
strb r4, [r3]
adds r3, #1
subs r2, #1
cmp r2, #0
bne _0801D65E
_0801D668:
pop {r4, pc}
.align 2, 0
asm/sub_08052418.s
+1 -1
View File
@@ -14,7 +14,7 @@ sub_08052418: @ 0x08052418
ldr r0, _08052494 @ =gUnk_02021F30
movs r1, #0x80
lsls r1, r1, #4
bl sub_0801D630
bl _DmaZero
ldr r0, _08052498 @ =gUnk_020227E8
movs r1, #0xf
str r1, [r0]
asm/sub_08055E24.s
+2 -2
View File
@@ -8,7 +8,7 @@
thumb_func_start sub_08055E24
sub_08055E24: @ 0x08055E24
push {r4, lr}
ldr r4, _08055E5C @ =gUnk_02000080
ldr r4, _08055E5C @ =gMenu
ldrb r0, [r4, #6]
adds r0, #1
strb r0, [r4, #6]
@@ -31,7 +31,7 @@ sub_08055E24: @ 0x08055E24
bl DoFade
pop {r4, pc}
.align 2, 0
_08055E5C: .4byte gUnk_02000080
_08055E5C: .4byte gMenu
_08055E60: .4byte gUnk_02000070
_08055E64: .4byte gUnk_080FF400
asm/sub_08055F70.s
+1 -1
View File
@@ -23,7 +23,7 @@ sub_08055F70: @ 0x08055F70
ldr r2, _08055FD4 @ =0x0003FFD0
ldr r0, _08055FD8 @ =gUnk_02000030
adds r1, r2, #0
bl sub_0801D630
bl _DmaZero
ldr r0, _08055FDC @ =gUnk_080B2CD8
ldr r3, _08055FE0 @ =sub_080B197C
subs r2, r0, r3
asm/sub_080AD380.s
+1 -1
View File
@@ -30,7 +30,7 @@ _080AD3A2:
ldr r0, _080AD3B8 @ =gUnk_02032EC0
movs r1, #0xed
lsls r1, r1, #2
bl sub_0801D630
bl _DmaZero
movs r0, #0
bl IntroSetTransition
b _080AD3EA
asm/sub_080AD3F4.s
+2 -2
View File
@@ -11,7 +11,7 @@ sub_080AD3F4: @ 0x080AD3F4
push {r4, r5, lr}
bl sub_080AD84C
adds r1, r0, #0
ldr r4, _080AD450 @ =gUnk_02000080
ldr r4, _080AD450 @ =gMenu
ldrb r0, [r4, #5]
cmp r0, #0
bne _080AD458
@@ -49,7 +49,7 @@ _080AD42C:
movs r1, #0
b _080AD45E
.align 2, 0
_080AD450: .4byte gUnk_02000080
_080AD450: .4byte gMenu
_080AD454: .4byte gScreen
_080AD458:
cmp r1, #1
asm/sub_080AD474.s
+6 -6
View File
@@ -9,7 +9,7 @@
thumb_func_start sub_080AD474
sub_080AD474: @ 0x080AD474
push {r4, r5, r6, lr}
ldr r5, _080AD490 @ =gUnk_02000080
ldr r5, _080AD490 @ =gMenu
ldrb r0, [r5, #0x12]
adds r0, #1
strb r0, [r5, #0x12]
@@ -24,7 +24,7 @@ _080AD486:
beq _080AD49C
b _080AD5C8
.align 2, 0
_080AD490: .4byte gUnk_02000080
_080AD490: .4byte gMenu
_080AD494:
cmp r0, #2
bne _080AD49A
@@ -40,7 +40,7 @@ _080AD49C:
strh r0, [r5, #8]
movs r0, #7
strb r0, [r5, #4]
bl sub_0805E60C
bl EraseAllEntities
movs r0, #0
bl sub_0801CFA8
bl sub_080ADD30
@@ -185,7 +185,7 @@ _080AD5E0:
bl PlaySFX
_080AD5EC:
bl sub_080AD644
ldr r0, _080AD638 @ =gUnk_02000080
ldr r0, _080AD638 @ =gMenu
ldrh r1, [r0, #8]
movs r0, #0x20
ands r0, r1
@@ -201,7 +201,7 @@ _080AD5EC:
movs r1, #0
bl sub_080ADA14
_080AD610:
ldr r2, _080AD638 @ =gUnk_02000080
ldr r2, _080AD638 @ =gMenu
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r1, [r0, #7]
@@ -219,6 +219,6 @@ _080AD632:
pop {r4, r5, r6, pc}
.align 2, 0
_080AD634: .4byte 0x80080000
_080AD638: .4byte gUnk_02000080
_080AD638: .4byte gMenu
_080AD63C: .4byte gUnk_03001010
_080AD640: .4byte 0x000001FF
asm/sub_080AD670.s
+2 -2
View File
@@ -23,7 +23,7 @@ sub_080AD670: @ 0x080AD670
mov r0, sp
strh r2, [r0, #0x10]
mov r2, sp
ldr r0, _080AD6A4 @ =gUnk_02000080
ldr r0, _080AD6A4 @ =gMenu
ldr r0, [r0, #0x2c]
strh r0, [r1, #0xc]
strh r0, [r2, #0xe]
@@ -34,5 +34,5 @@ sub_080AD670: @ 0x080AD670
add sp, #0x14
pop {pc}
.align 2, 0
_080AD6A4: .4byte gUnk_02000080
_080AD6A4: .4byte gMenu
_080AD6A8: .4byte gBgControls
asm/sub_080AD6Ac.s
+2 -2
View File
@@ -9,7 +9,7 @@
thumb_func_start sub_080AD6AC
sub_080AD6AC: @ 0x080AD6AC
push {r4, r5, r6, lr}
ldr r4, _080AD6C0 @ =gUnk_02000080
ldr r4, _080AD6C0 @ =gMenu
ldrb r0, [r4, #6]
cmp r0, #1
beq _080AD724
@@ -19,7 +19,7 @@ sub_080AD6AC: @ 0x080AD6AC
beq _080AD6CA
b _080AD76A
.align 2, 0
_080AD6C0: .4byte gUnk_02000080
_080AD6C0: .4byte gMenu
_080AD6C4:
cmp r0, #2
beq _080AD758
asm/sub_080AD76C.s
+4 -4
View File
@@ -9,7 +9,7 @@
thumb_func_start sub_080AD76C
sub_080AD76C: @ 0x080AD76C
push {lr}
ldr r1, _080AD780 @ =gUnk_02000080
ldr r1, _080AD780 @ =gMenu
ldrb r0, [r1, #6]
cmp r0, #1
beq _080AD7B4
@@ -19,7 +19,7 @@ sub_080AD76C: @ 0x080AD76C
beq _080AD78A
b _080AD80E
.align 2, 0
_080AD780: .4byte gUnk_02000080
_080AD780: .4byte gMenu
_080AD784:
cmp r0, #2
beq _080AD7DC
@@ -95,7 +95,7 @@ _080AD80E:
bl sub_080AD84C
cmp r0, #0
beq _080AD82A
ldr r0, _080AD830 @ =gUnk_02000080
ldr r0, _080AD830 @ =gMenu
ldrb r1, [r0, #5]
adds r1, #1
strb r1, [r0, #5]
@@ -105,4 +105,4 @@ _080AD82A:
pop {pc}
.align 2, 0
_080AD82C: .4byte gUnk_03000FD0
_080AD830: .4byte gUnk_02000080
_080AD830: .4byte gMenu
asm/sub_080AD84C.s
+2 -2
View File
@@ -27,7 +27,7 @@ _080AD86C:
movs r2, #9
ands r2, r0
_080AD874:
ldr r1, _080AD88C @ =gUnk_02000080
ldr r1, _080AD88C @ =gMenu
ldrh r0, [r1, #8]
subs r0, #1
strh r0, [r1, #8]
@@ -38,7 +38,7 @@ _080AD874:
b _080AD89A
.align 2, 0
_080AD888: .4byte gUnk_03000FF0
_080AD88C: .4byte gUnk_02000080
_080AD88C: .4byte gMenu
_080AD890:
cmp r2, #0
bne _080AD898
asm/sub_080AD89C.s
+2 -2
View File
@@ -8,7 +8,7 @@
thumb_func_start sub_080AD89C
sub_080AD89C: @ 0x080AD89C
push {r4, lr}
ldr r4, _080AD8E4 @ =gUnk_02000080
ldr r4, _080AD8E4 @ =gMenu
ldrb r1, [r4, #0x12]
movs r0, #7
ands r0, r1
@@ -44,6 +44,6 @@ _080AD8BC:
_080AD8E0:
pop {r4, pc}
.align 2, 0
_080AD8E4: .4byte gUnk_02000080
_080AD8E4: .4byte gMenu
_080AD8E8: .4byte gScreen
_080AD8EC: .4byte gUnk_081320FC
asm/waterfallOpening.s
+2 -2
View File
@@ -120,7 +120,7 @@ _080A0038:
bne _080A005A
movs r0, #3
strb r0, [r4, #0xd]
ldr r1, _080A0064 @ =gUnk_02000080
ldr r1, _080A0064 @ =gMenu
ldrb r0, [r1, #6]
adds r0, #1
strb r0, [r1, #6]
@@ -131,7 +131,7 @@ _080A005A:
bl sub_080A00B0
b _080A00AA
.align 2, 0
_080A0064: .4byte gUnk_02000080
_080A0064: .4byte gMenu
_080A0068:
ldrb r0, [r4, #0xa]
cmp r0, #0
asm/wizzrobeIce.s
+2 -2
View File
@@ -383,7 +383,7 @@ sub_080300AC: @ 0x080300AC
ldr r4, _080300C0 @ =gUnk_0300110C
adds r0, r4, #0
movs r1, #0x44
bl sub_0801D630
bl _DmaZero
adds r4, #0x42
movs r0, #0xff
strh r0, [r4]
@@ -406,7 +406,7 @@ sub_080300C4: @ 0x080300C4
strh r1, [r0]
subs r0, #0x40
movs r1, #0x40
bl sub_0801D630
bl _DmaZero
_080300E2:
pop {pc}
.align 2, 0
include/area.h
+3 -1
View File
@@ -8,7 +8,9 @@ typedef struct {
u8 locationIndex;
u8 unk;
u16 localFlagOffset;
u8 filler[19];
u8 filler[10];
u16 field_0x10;
u8 filler3[7];
u8 fadeOut;
u8 filler2[14];
} Area;
include/functions.h
+11 -1
View File
@@ -29,6 +29,8 @@ extern u32 GetFacingDirection(Entity*, Entity*);
extern Entity* CreatePlayerItem(u32, u32, u32, u32);
extern Entity* GetEmptyEntity(void);
extern u32 GetTileTypeByPos(s32 x, s32 y, u32 layer);
extern void _DmaZero(void* src, u32 count);
extern void EraseAllEntities(void);
// Unidentified
extern void sub_0806ED78(Entity*);
@@ -89,11 +91,19 @@ extern Entity *sub_0804A98C(Entity *, u32, u32);
extern u32 sub_080544DC(u8);
extern void sub_08077E54(Entity*);
extern void sub_080042BA(Entity*);
extern void sub_0801D630(void*, u32);
extern void _DmaZero(void*, u32);
extern void sub_08077F24(ItemBehavior*, u32);
extern void sub_08079184();
extern void sub_08077F50(ItemBehavior *beh, u32 arg1);
extern void sub_0807AA80(Entity*);
extern s32 sub_0807887C(Entity*, u32, u32);
extern s32 sub_08078904();
extern void sub_0805E5A8(void);
extern void sub_0805E5C0(void);
extern void sub_080AD90C(void);
extern void sub_080AD9B0(void);
extern void sub_080AD918(void);
extern void sub_0801E104(void);
extern void MenuFadeIn(u32, u32);
extern void sub_080A57F4(void);
#endif
include/greatFairy.h
-14
View File
@@ -19,20 +19,6 @@ extern void sub_080045D4();
extern void sub_0806F69C();
extern u32 Random();
enum {
BEHAVIORS,
WINGS,
WAKE,
MINI,
MINIAFFINE,
DROPLET,
RIPPLE,
BIGRIPPLE,
FORM8,
FORM9,
};
extern void (*const GreatFairy_Main[])(Entity*);
extern void (*const GreatFairy_Behaviors[])(Entity*);
extern void (*const GreatFairy_WingsBehaviors[])(Entity*);
include/link.h
+1
View File
@@ -82,6 +82,7 @@ typedef struct {
/*0x2*/ u8 field_0x2[2];
/*0x4*/ u8 stateID;
/*0x5*/ u8 field_0x5[10];
/*0xf*/ u8 field_0xf;
} ItemBehavior;
extern u8 gBombBagSizes[];
include/main.h
+1 -1
View File
@@ -24,7 +24,7 @@ extern void sub_0804FFE4();
extern s32 sub_0804FF84(s32);
extern s32 sub_08056418(s32);
extern void sub_080ADD30(s32);
extern s32 sub_0801D630(s32, u32, u32);
extern s32 _DmaZero(s32, u32, u32);
extern s32 sub_08056010(s32);
extern s32 sub_08016E78(s32);
extern s32 ReadKeyInput();
include/menu.h
+13
View File
@@ -15,6 +15,19 @@ typedef struct {
u16 fadeInTime;
u8 filler2[4];
u32 filler3[3];
} MenuControls;
typedef struct {
u8 field_0x0;
u16 field_0x1;
u8 field_0x2;
u8 secret;
u8 overlayType;
u8 storyPanelIndex;
u8 field_0x7;
u8 transitionTimer;
} Menu;
extern Menu gMenu;
#endif
include/screen.h
+1
View File
@@ -5,6 +5,7 @@
typedef struct {
u16 lcdControl2;
u16 unk2;
u32 unk;
u16 lcdControl1;
} LcdControls;
linker.ld
+5 -5
View File
@@ -16,7 +16,7 @@ SECTIONS {
. = 0x00000050; gTextBox = .;
. = 0x0000005C; gUnk_0200005C = .;
. = 0x00000070; gUnk_02000070 = .;
. = 0x00000080; gUnk_02000080 = .;
. = 0x00000080; gMenu = .;
. = 0x00000090; gUnk_02000090 = .;
. = 0x000000B0; gUnk_020000B0 = .;
. = 0x000000C0; gUnk_020000C0 = .;
@@ -315,9 +315,7 @@ SECTIONS {
asm/drawHealth.o(.text);
asm/sub_0801C824.o(.text);
asm/code_0801C85C.o(.text);
src/sub_0801D5EC.o(.text);
src/_dmaFill32.o(.text);
asm/sub_0801D630.o(.text);
src/dma.o(.text);
asm/sub_0801D66C.o(.text);
src/input.o(.text);
asm/code_0801D714.o(.text);
@@ -435,7 +433,7 @@ SECTIONS {
asm/code_08049CD4.o(.text);
asm/sub_0804AA30.o(.text);
src/createEnemy.o(.text);
src/sub_0804AA84.o(.text);
src/code_0804AA84.o(.text);
asm/code_0804AA84.o(.text);
src/loadRoomEntityList.o(.text);
asm/createEntity.o(.text);
@@ -458,6 +456,7 @@ SECTIONS {
asm/code_080526F8.o(.text);
asm/modBombs.o(.text);
asm/modArrows.o(.text);
src/code_0805436C.o(.text);
asm/code_0805436C.o(.text);
src/sub_08055E08.o(.text);
asm/sub_08055E24.o(.text);
@@ -642,6 +641,7 @@ SECTIONS {
asm/stairsInteract.o(.text);
asm/code_080732D0.o(.text);
asm/ocarina.o(.text);
src/item.o(.text);
asm/code_08076C80.o(.text);
asm/respawnLink.o(.text);
src/code_08077B98.o(.text);
src/_dmaFill32.c
-5
View File
@@ -1,5 +0,0 @@
#include "global.h"
void _DmaFill32(u32 a1, u32 a2, u32 a3) {
DmaFill32(3, a1, a2, a3);
}
src/code_0804AA84.c
+94
View File
@@ -0,0 +1,94 @@
#include "global.h"
#include "entity.h"
#include "area.h"
#include "functions.h"
#include "screen.h"
typedef struct {
u8 interruptFlag;
u8 field_0x1;
u8 loadType;
u8 funcIndex;
u8 transition;
u16 field_0x5;
u8 muteAudio;
u8 field_0x8;
u8 countdown;
u8 field_0xa;
u8 field_0xb;
u8 ticks;
u8 field_0xe;
u8 field_0xf;
} Main;
typedef struct {
u8 filler [18];
u32 unk;
} struct_02018EB0;
extern void sub_0805E5A8();
extern void (*const gUnk_080D4120[])();
extern void (*const gUnk_080D412C[])();
extern Main gUnk_03001000;
extern struct_02018EB0 gUnk_02018EB0;
extern u8 gUnk_03000FD0;
u32 sub_0804AA84(void)
{
if (gArea.fadeOut != 0) {
gUnk_03001000.transition = 4;
gArea.filler[8] = 0;
gArea.filler[9] = 0;
*(u16*)&gArea.filler[10] = 0;
sub_0805E5A8();
return 1;
}
else {
gArea.filler[18] = gArea.fadeOut;
*(vu8*)&gArea.fadeOut = gArea.fadeOut;
return 0;
}
}
void sub_0804AAB8(void)
{
gUnk_080D4120[gArea.filler[8]]();
}
void sub_0804AAD4(void)
{
_DmaZero((void *)&gUnk_02018EB0, 0x28);
gUnk_02018EB0.unk = 0;
EraseAllEntities();
CreateObject(0x3d, gArea.filler3[5], 0);
gArea.filler[8]++;
}
void sub_0804AB04(void)
{
sub_0805E5C0();
if (gArea.field_0x10 != 0) {
sub_080AD90C();
sub_080AD9B0();
sub_080AD918();
}
}
void sub_0804AB24(void)
{
if (gUnk_03000FD0 == 0) {
gScreen.lcd.lcdControl2 = 0;
sub_0801E104();
gArea.filler[8] = 0;
MenuFadeIn(6, 0);
gUnk_03000FD0 = 0;
}
}
void sub_0804AB54(void)
{
gUnk_080D412C[gArea.filler[8]]();
}
src/code_0805436C.c
+188
View File
@@ -0,0 +1,188 @@
#include "global.h"
#include "entity.h"
#include "link.h"
#include "room.h"
#include "menu.h"
typedef struct {
u8 filler[0xa8];
Stats stats;
} struct_02002A40;
typedef struct {
u8 unk;
u8 filler[7];
} struct_080FD5B4;
typedef struct {
u8 filler[0x2e];
u8 unk;
} struct_030010A0;
extern struct_02002A40 gUnk_02002A40;
extern struct_080FD5B4 gUnk_080FD5B4[];
extern struct_030010A0 gUnk_030010A0;
extern u8 gUnk_0200AF13;
extern u8 gUnk_0200AF14;
extern u32 gUnk_080015BC;
extern u8 gUnk_080FE1C6[];
extern u32 gUnk_02034398;
extern void (*const gUnk_080FE2A0[])();
u32 IsItemEquipped(u32 itemID) {
u32 ret;
if (itemID == gUnk_02002A40.stats.itemOnA)
ret = 0;
else if (itemID == gUnk_02002A40.stats.itemOnB)
ret = 1;
else
ret = 2;
return ret;
}
#if NON_MATCHING // reg-alloc
void PutItemOnSlot(u32 itemID) {
u32 itemSlot;
if (itemID < 0x47) {
ModifyInventory(0, 1);
}
if (itemID - 1 < 0x1f) {
itemSlot = 2;
if (gUnk_02002A40.stats.itemOnA == 0) {
itemSlot = 0;
} else if (gUnk_02002A40.stats.itemOnB == 0) {
itemSlot = 1;
}
if (itemSlot == 2) {
u8 temp = gUnk_080FD5B4[itemID].unk;
if (temp == gUnk_080FD5B4[gUnk_02002A40.stats.itemOnA].unk) {
itemSlot = 0;
} else {
if (temp == gUnk_080FD5B4[gUnk_02002A40.stats.itemOnB].unk) {
itemSlot = 1;
}
}
if (itemSlot == 2) {
return;
}
}
ForceEquipItem(itemID, itemSlot);
}
}
#else
NAKED
void PutItemOnSlot(u32 itemID) {
asm(".include \"asm/non_matching/putItemOnSlot.s\"");
}
#endif
u32 SetBottleContents(u32 itemID, u32 bottleIndex) {
if (bottleIndex > 3) {
bottleIndex = 0;
if (gUnk_02002A40.stats.filler2[0] != 0x20) {
do {
bottleIndex++;
if (bottleIndex > 3) {
return bottleIndex;
}
} while (gUnk_02002A40.stats.filler2[bottleIndex] != 0x20);
}
if (bottleIndex > 3) {
return bottleIndex;
}
}
gUnk_02002A40.stats.filler2[bottleIndex] = itemID;
return bottleIndex;
}
u32 sub_0805449C(u32 arg0) {
switch (arg0) {
case 1:
case 2:
case 3:
case 4:
case 6:
return 1;
default:
return 0;
}
}
u32 sub_080544B4(u32 arg0) {
switch (arg0) {
case 13:
case 14:
return 1;
default:
return 0;
}
}
u32 sub_080544C8(u32 arg0) {
switch (arg0) {
case 28:
case 29:
case 30:
case 31:
return 1;
default:
return 0;
}
}
u32 sub_080544DC(u32 arg0) {
if (arg0 == gUnk_02002A40.stats.filler2[0]) {
return 1;
} else if (arg0 == gUnk_02002A40.stats.filler2[1]) {
return 2;
} else if (arg0 == gUnk_02002A40.stats.filler2[2]) {
return 3;
} else if (arg0 == gUnk_02002A40.stats.filler2[3]) {
return 4;
} else {
return 0;
}
}
#if NON_MATCHING // reg-alloc
void sub_08054524(void) {
u32 bVar1;
bVar1 = gArea.locationIndex;
if (gArea.locationIndex == 0) {
bVar1 = gUnk_030010A0.unk;
}
if (bVar1 > 0x16) {
bVar1 = 0;
}
sub_0801D66C(&gUnk_080015BC + gUnk_080FE1C6[bVar1] * 0x8, &gUnk_02034398, 0x20);
}
#else
NAKED
void sub_08054524(void) {
asm(".include \"asm/non_matching/sub_08054524.inc\"");
}
#endif
void sub_08054564(void) {
gRoomVars.filler[2] = 1;
}
void sub_08054570(void) {
gRoomVars.filler[2] = 0;
}
NAKED
u32 sub_0805457C(u32 arg0, u32 arg1) {
asm(".include \"asm/non_matching/code_0805457C.inc\"");
}
void sub_08054870(void)
{
gUnk_080FE2A0[gMenu.secret]();
}
src/code_08077DF4.c
+1 -1
View File
@@ -63,7 +63,7 @@ void sub_08077E78(void* arg0, u32 bits)
not = ~not;
gLinkState.field_0xa &= not;
gLinkState.keepFacing &= not;
sub_0801D630(arg0, 0x1c);
_DmaZero(arg0, 0x1c);
}
u32 sub_08077EC8(Unk_struct* arg0)
src/dma.c
+33
View File
@@ -0,0 +1,33 @@
#include "global.h"
#include "entity.h"
void _DmaFill32(u32, u8*, u32);
void _DmaFill16(u32, u8*, u32);
void _DmaFill16(u32 value, u8* dest, u32 size) {
DmaFill16(3, value, dest, size);
}
void _DmaFill32(u32 value, u8* dest, u32 size) {
DmaFill32(3, value, dest, size);
}
void _DmaZero(u8 *src, u32 size)
{
u32 zero = 0;
switch (((u32)src | size) & 3) {
case 0:
_DmaFill32(0,src, size);
break;
case 2:
_DmaFill16(0, src, size);
break;
default:
do {
*src = zero;
src++;
size--;
} while (size != 0);
}
}
src/introSetTransition.c
+3 -4
View File
@@ -13,16 +13,15 @@ typedef struct {
} TransitionStruct;
extern u32 DoFade(u32, u32);
extern void sub_0801D630(u32*, u32, u32);
extern u32 gUnk_02000080;
extern void _DmaZero(u32*, u32, u32);
extern TransitionStruct gUnk_03001000;
extern Menu gUnk_02032EC0;
extern MenuControls gUnk_02032EC0;
u32 IntroSetTransition(u8 transition, u32 param_2, u32 param_3)
{
gUnk_02032EC0.transitionType = transition;
gUnk_03001000.functionIndex = 2;
sub_0801D630(&gUnk_02000080, 48, param_3);
_DmaZero((u32 *)&gMenu, 48, param_3);
return DoFade(7, 8);
}
src/item.c
+120
View File
@@ -38,3 +38,123 @@ void (*const gItemFunctions[])(ItemBehavior*, u32) = {
JarEmpty,
JarEmpty,
};
extern void sub_08077E78(ItemBehavior*, u32);
extern void PlaySFX(u32);
extern void sub_08078F60(void);
extern void sub_08077D38(ItemBehavior*, u32);
extern void sub_0805E544(void);
extern void UpdateItemAnim(ItemBehavior*);
extern void CreateBird(void);
extern void UnfreezeTime(void);
extern void sub_0806F948(Entity*);
extern void sub_08077BB8(ItemBehavior*);
extern void CreatePlayerBomb(ItemBehavior*, u32);
extern u32 sub_08077EFC();
extern void (*const gOcarinaStates[4])(ItemBehavior*, u32);
extern void (*const gUnk_0811BDE0[])(ItemBehavior* beh, u32);
extern void (*const gUnk_0811BDE8[])(ItemBehavior* beh, u32);
extern void (*const gUnk_0811BDF4[])(ItemBehavior* beh, u32);
extern u8 gUnk_02034490;
#if 0
void Ocarina(ItemBehavior* beh, u32 inputFlags) {
gOcarinaStates[beh->stateID](beh, inputFlags);
gLinkEntity.field_0x7a++;
}
void OcarinaUse(ItemBehavior *beh, u32 arg1)
{
u32 bVar1;
if (gLinkState.linkAction == 0x18) {
LinkChangeState(beh, arg1);
}
else {
beh->field_0x5[4] = beh->field_0x5[4] | 0xf;
gLinkEntity.animationState = 4;
gLinkEntity.spriteSettings.b.flipX = 0;
gLinkEntity.flags &= 0x7f;
gLinkEntity.field_0x7a = 2;
gLinkState.flags.all |= 0x10000000;
gLinkState.field_0x27[0] = 0xff;
gUnk_02034490 = 1;
bVar1 = (8 >> arg1);
gLinkState.field_0xa |= bVar1;
gLinkState.keepFacing |= bVar1;
sub_08078F60();
sub_08077D38(beh, arg1);
PlaySFX(0x216);
sub_0805E544();
}
}
#endif
void PacciCane(ItemBehavior* beh, u32 arg1) {
gUnk_0811BDE0[beh->stateID](beh, arg1);
}
void sub_08076C98(ItemBehavior* beh, u32 arg1) {
beh->field_0x5[4] |= 0xf;
sub_08077D38(beh, arg1);
sub_0806F948(&gLinkEntity);
sub_08077BB8(beh);
}
void sub_08076CBC(ItemBehavior* beh, u32 arg1) {
if ((beh->field_0x5[9] & 0x80) != 0) {
sub_08077E78(beh, arg1);
} else {
if ((beh->field_0x5[9] & 0x40) != 0) {
CreatePlayerBomb(beh, 0x12);
}
UpdateItemAnim(beh);
}
}
void Shield(ItemBehavior* beh, u32 arg1) {
gUnk_0811BDE8[beh->stateID](beh, arg1);
}
void sub_08076D04(ItemBehavior* beh, u32 arg1) {
gLinkState.field_0x3[0] = 0x81;
beh->field_0x5[4] = 2;
sub_0806F948(&gLinkEntity);
sub_08077D38(beh, arg1);
sub_08077BB8(beh);
}
void sub_08076D34(ItemBehavior* beh, u32 arg1) {
if (sub_08077EFC() != 0) {
gLinkState.field_0x3[0] |= 1;
UpdateItemAnim(beh);
if (beh->field_0x5[9] != 0) {
beh->stateID++;
beh->field_0xf = 0;
gLinkState.field_0xa &= ~(u8)(8 >> arg1);
PlaySFX(0x15d);
}
} else {
gLinkState.field_0x3[0] = 0;
sub_08077E78(beh, arg1);
}
}
void sub_08076D94(ItemBehavior *beh, u32 arg1)
{
if (sub_08077EFC(beh)) {
gLinkState.field_0x3[0] |= 1;
UpdateItemAnim(beh);
}
else {
gLinkState.field_0x3[0] = 0;
sub_08077E78(beh, arg1);
}
}
void GustJar(ItemBehavior *beh, u32 arg1)
{
gLinkState.field_0xa8[0] = 3;
gUnk_0811BDF4[beh->stateID](beh, arg1);
}
src/loadRoom.c
+81 -15
View File
@@ -1,27 +1,93 @@
#include "global.h"
/* called when loading any room */
#include "room.h"
void LoadRoomEntityList();
void LoadRoomEntityList(EntityData* dat);
s32 CheckGlobalFlag(u32 flag);
extern s32* GetCurrentRoomProperty(u8 unk);
extern void sub_0804B058(s32* unk);
extern void sub_0804B1AC();
extern EntityData* GetCurrentRoomProperty(u32 unk);
extern void sub_0804B058(EntityData* dat);
extern void sub_0804B1AC(EntityData* dat);
extern void sub_0801AC98();
extern u32 sub_08049D1C(u32);
extern Entity* CreateEntity(EntityData*);
extern void* GetRoomProperty(u32, u32, u32);
void LoadRoom(void)
{
extern u32 gUnk_02017654;
extern u32* gUnk_080D50FC;
void LoadRoom(void) {
s32 iVar1;
s32* dat;
GetCurrentRoomProperty(1);
LoadRoomEntityList();
GetCurrentRoomProperty(0);
LoadRoomEntityList();
LoadRoomEntityList(GetCurrentRoomProperty(1));
LoadRoomEntityList(GetCurrentRoomProperty(0));
if (CheckGlobalFlag(21)) sub_0804B058(GetCurrentRoomProperty(2));
GetCurrentRoomProperty(3);
sub_0804B1AC();
if (CheckGlobalFlag(21))
sub_0804B058(GetCurrentRoomProperty(2));
sub_0804B1AC(GetCurrentRoomProperty(3));
sub_0801AC98();
}
void sub_0804B058(EntityData* dat) {
Entity* ent;
u32 uVar2;
if ((dat != NULL) && (dat->entityType != 0xff)) {
uVar2 = 0;
do {
if ((uVar2 < 0x20) && ((dat->entityType & 0xf) == 3)) {
if (sub_08049D1C(uVar2) != 0) {
ent = CreateEntity(dat);
if ((ent != NULL) && ((ent->entityType).type == 3)) {
ent->field_0x6c = uVar2 | 0x80;
}
}
} else {
CreateEntity(dat);
}
uVar2++;
dat++;
} while (dat->entityType != 0xff);
}
}
void sub_0804B0B0(u32 arg0, u32 arg1)
{
LoadRoomEntityList(GetRoomProperty(arg0, arg1, 1));
}
void SetCurrentRoomPropertyList(u32 arg0, u32 arg1)
{
u32** arr;
gUnk_02017654 = 0;
arr = &gUnk_080D50FC;
if (arr[arg0] != 0) {
gUnk_02017654 = arr[arg0][arg1];
}
}
void sub_0804B0E8(u32 arg0, u32 arg1)
{
void (* func)();
func = (void (*)())GetRoomProperty(arg0, arg1, 4);
if (func != NULL) {
func();
}
}
// returns multiple types of data?
void* GetRoomProperty(u32 arg0, u32 arg1, u32 arg2)
{
u32 temp;
u32** arr;
temp = 0;
arr = &gUnk_080D50FC;
if (arr[arg0] != NULL) {
temp = arr[arg0][arg1];
if (temp != 0) {
temp = *(u32 *)(arg2 * 4 + temp);
}
}
return (void*)temp;
}
src/mainLoop.c
+2 -2
View File
@@ -30,7 +30,7 @@ extern void sub_0804FFE4(void);
extern void sub_0804FF84(u32);
extern void sub_08056418(void);
extern void sub_080ADD30(void);
extern void sub_0801D630(void*, u32);
extern void _DmaZero(void*, u32);
extern void sub_08056010(u32);
extern void ReadKeyInput();
extern u32 sub_08055FF4();
@@ -68,7 +68,7 @@ void MainLoop(void) {
sub_080ADD30();
gRand = 0x1234567;
s = &gUnk_03001000;
sub_0801D630(s, 16);
_DmaZero(s, 16);
sub_08056010(0);
while (1) {
ReadKeyInput();
src/npc/cow.c
+3 -3
View File
@@ -183,7 +183,7 @@ void sub_080691E0(Entity* ent) {
}
// Show dialogue
void sub_080691F8(Entity* ent) {
void Cow_ShowDialogue(Entity* ent) {
u32 var0 = ent->entityType.form;
u32* var1 = gUnk_08111938 + (var0 * 2);
ShowNPCDialogue(ent, var1);
@@ -215,10 +215,10 @@ void sub_0806924C(Entity* ent) {
ent->action = 4;
sub_0806F118(ent);
} else {
sub_080691F8(ent);
Cow_ShowDialogue(ent);
}
} else {
sub_080691F8(ent);
Cow_ShowDialogue(ent);
sub_080791D0();
}
PlaySFX(212);
src/object/greatFairy.c
+30 -41
View File
@@ -4,6 +4,19 @@
#include "screen.h"
#include "greatFairy.h"
enum {
BEHAVIORS,
WINGS,
WAKE,
MINI,
MINIAFFINE,
DROPLET,
RIPPLE,
BIGRIPPLE,
FORM8,
FORM9,
};
// Main
void GreatFairy(Entity* this) {
u8 bVar1;
@@ -36,7 +49,6 @@ void GreatFairy_Init(Entity* this) {
this->cutsceneBeh.HWORD = 290;
}
// TODO: turn this into a switch statement
void GreatFairy_DormantUpdate(Entity* this) {
u16* pFrame; // r1@2
s32 frame; // r1@4
@@ -48,47 +60,24 @@ void GreatFairy_DormantUpdate(Entity* this) {
if (*pFrame != 0) {
--*pFrame;
}
frame = *pFrame;
if (frame == 0x96) {
goto LABEL_16;
}
if (frame < 0x97) {
if (frame != 0) {
if (frame == 0x82) {
goto LABEL_16;
} else {
return;
}
}
goto LABEL_17;
} else {
if (frame == 0xd2) {
goto LABEL_16;
}
if (frame < 0xd3) {
if (frame == 0xaa) {
goto LABEL_16;
} else
return;
}
if (frame == 289) {
goto LABEL_16;
} else {
return;
}
}
LABEL_17:
this->action = 2;
return;
LABEL_16:
ripple = GreatFairy_CreateForm(this, RIPPLE, 0);
if (ripple) {
PositionRelative(this, ripple, (s32)GreatFairy_RippleOffsets[this->actionDelay] << 16,
switch (*pFrame) {
case 0x96:
case 0x82:
goto e;
case 0x0:
this->action = 2;
break;
e:
case 0xd2:
case 0xaa:
case 0x121:
ripple = GreatFairy_CreateForm(this, RIPPLE, 0);
if (ripple) {
PositionRelative(this, ripple, (s32)GreatFairy_RippleOffsets[this->actionDelay] << 16,
(s32)GreatFairy_RippleOffsets[this->actionDelay + 1] << 16);
this->actionDelay += 2;
this->actionDelay += 2;
break;
}
}
}
src/ocarina.c
-55
View File
@@ -1,55 +0,0 @@
#include "global.h"
#include "item.h"
#include "entity.h"
#include "link.h"
extern void _call_via_r2();
extern void sub_08077E78(ItemBehavior*, u32);
extern void PlaySFX(u32);
extern void sub_08078F60(void);
extern void sub_08077D38(ItemBehavior*, u32);
extern void sub_0805E544(void);
extern void UpdateItemAnim(ItemBehavior*);
extern void CreateBird(void);
extern void UnfreezeTime(void);
extern Entity gLinkEntity;
extern LinkState gLinkState;
extern void (*gOcarinaStates[4])(ItemBehavior*, u32);
extern u8 gUnk_02034490;
void Ocarina(ItemBehavior* pItemBeh, u32 inputFlags)
{
// u32 *ocarinaStates = &gOcarinaStates;
//_call_via_r2(pItemBeh, inputFlags,(ocarinaStates)[pItemBeh->stateID]);
gOcarinaStates[pItemBeh->stateID](pItemBeh, inputFlags);
gLinkEntity.field_0x7a = gLinkEntity.field_0x7a + 1;
}
void OcarinaUse(ItemBehavior* itemBeh, s32 inputFlags) {
u32 bVar1;
u32 var;
if (gLinkState.linkAction == 24) {
sub_08077E78(itemBeh, inputFlags);
} else {
itemBeh->field_0x5[4] |= 15;
gLinkEntity.animationState = 4;
var = gLinkEntity.spriteSettings.raw & ~0x40;
gLinkEntity.spriteSettings.raw &= var;
gLinkEntity.flags &= 127;
gLinkEntity.field_0x7a = 2;
gLinkState.flags.all |= 0x10000000;
gLinkState.field_0x27[0] = 255;
gUnk_02034490 = 1;
bVar1 = (8 >> inputFlags);
gLinkState.field_0xa |= bVar1;
gLinkState.keepFacing |= bVar1;
sub_08078F60();
sub_08077D38(itemBeh, inputFlags);
PlaySFX(534);
sub_0805E544();
}
}
src/sub_0801D5EC.c
-4
View File
@@ -1,4 +0,0 @@
#include "global.h"
void sub_0801D5EC(u32 a1, u32 a2, u32 a3) {
DmaFill16(3, a1, a2, a3);
}
src/sub_0804AA84.c
-37
View File
@@ -1,37 +0,0 @@
#include "global.h"
// Very close!
/* extern void sub_0805E5A8();
extern u8 gArea;
extern u8 gUnk_03001000;
u32 sub_0804AA84(void)
{
u8 * r3 = &gArea;
u8 * r2;
u8 r0 = *(u8 *)(r3 + 0x19);
u8 r1;
if (!r0) {
*(r3 + 0x18) = r0;
*(r3 + 0x19) = r0;
r0 = 0;
}
else {
r2 = &gUnk_03001000;
r1 = 0;
r0 = 4;
*(r2 + 0x4) = r0;
*(r3 + 0xe) = r1;
*(r3 + 0xf) = r1;
*(u16*)(r3 + 0x10) = r1;
sub_0805E5A8();
r0 = 1;
}
return r0;
} */
// void sub_0804AA9C() {
src/sub_08050008.c
+2 -2
View File
@@ -2,12 +2,12 @@
extern u32 gUnk_020354C0;
extern s32 gUnk_03000FD0;
extern void sub_0801D630(u32, u32, u32);
extern void _DmaZero(u32, u32, u32);
void sub_08050008(u32 param_1, u32 param_2, u32 param_3) {
s32* unk;
sub_0801D630((u32)&gUnk_020354C0, 128, param_3);
_DmaZero((u32)&gUnk_020354C0, 128, param_3);
unk = &gUnk_03000FD0;
*(unk + 1) = -1;
src/sub_08055E08.c
+3 -3
View File
@@ -2,12 +2,12 @@
#include "global.h"
extern u32* _call_via_r0(u32* func);
extern u8 gUnk_02000080;
extern u8 gMenu;
extern u32* gUnk_080FF420;
void sub_08055E08() {
u32** arr = &gUnk_080FF420;
u8 i = gUnk_02000080;
i = *(&gUnk_02000080 + 6);
u8 i = gMenu;
i = *(&gMenu + 6);
_call_via_r0(arr[i]);
}
src/sub_080A554C.c
+17 -11
View File
@@ -1,20 +1,26 @@
#include "global.h"
#include "menu.h"
#include "functions.h"
extern void (*const gUnk_08128BF8[])(void);
extern u8 gUnk_02000090;
u32 sub_080A554C(u32 param_1)
u32 sub_080A554C(u32 arg0)
{
u32 uVar1;
u32 i;
if (param_1 != 0) {
uVar1 = 0;
do {
if (param_1 == (&gUnk_02000090)[uVar1]) {
return uVar1;
}
uVar1 = uVar1 + 1;
} while (uVar1 < 17);
if (arg0 != 0) {
for (i = 0; i < 17; i++) {
if (arg0 == (&gUnk_02000090)[i])
return i;
}
}
return 17;
}
void sub_080A5574(void)
{
gUnk_08128BF8[gMenu.secret]();
sub_080A57F4();
}
src/textbox.c
+7 -7
View File
@@ -3,7 +3,7 @@
#include "entity.h"
#include "textbox.h"
void sub_0801D630();
void _DmaZero();
void ShowTextbox();
void TextboxAtPosition();
@@ -62,7 +62,7 @@ void TextboxAtPosition(u32 index, u32 x, u32 y) {
}
void ShowTextbox(u32 index, u32 param_2, u32* dest) {
sub_0801D630(&gTextBox, 32, dest);
_DmaZero(&gTextBox, 32, dest);
gTextBox.textIndex = index;
gTextBox.textSpeed = 99;
gTextBox.textWindowWidth = 26;
@@ -75,10 +75,10 @@ void ShowTextbox(u32 index, u32 param_2, u32* dest) {
void sub_08056418(void) {
sub_0801D630(&gTextBox, 32);
sub_0801D630(&gUnk_02022780, 168);
sub_0801D630(&gUnk_02036A40, 8);
sub_0801D630(&gUnk_02036A38, 8);
sub_0801D630(&gUnk_02000040, 4);
_DmaZero(&gTextBox, 32);
_DmaZero(&gUnk_02022780, 168);
_DmaZero(&gUnk_02036A40, 8);
_DmaZero(&gUnk_02036A38, 8);
_DmaZero(&gUnk_02000040, 4);
return;
}