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

menu def

This commit is contained in:
theo3 2020-07-16 02:57:14 -07:00
parent ccb6ec4a9c
commit 18069fcd80
37 changed files with 1470 additions and 1494 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/bigGoron.s
View File

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

8
asm/code_08019444.s
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
@ -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

254
asm/code_08050038.s
View File

@ -581,7 +581,7 @@ sub_08050450: @ 0x08050450
strh r0, [r1, #0x18]
strh r0, [r1, #0x22]
strh r0, [r1, #0x24]
ldr r0, _080504E8 @ =gUnk_02000080
ldr r0, _080504E8 @ =gMenu
movs r1, #0x30
bl _DmaZero
_0805048A:
@ -619,7 +619,7 @@ _080504D8: .4byte gUnk_080FC8A4
_080504DC: .4byte gUnk_03001000
_080504E0: .4byte gUnk_02032EC0
_080504E4: .4byte gScreen
_080504E8: .4byte gUnk_02000080
_080504E8: .4byte gMenu
_080504EC: .4byte gUnk_080FC8B0
_080504F0: .4byte gUnk_02019EE0
@ -1007,7 +1007,7 @@ _0805081C: .4byte gUnk_0200AF00
sub_08050820: @ 0x08050820
push {lr}
ldr r1, _0805083C @ =gUnk_080FC8FC
ldr r0, _08050840 @ =gUnk_02000080
ldr r0, _08050840 @ =gMenu
ldrb r0, [r0, #5]
lsls r0, r0, #2
adds r0, r0, r1
@ -1019,7 +1019,7 @@ sub_08050820: @ 0x08050820
pop {pc}
.align 2, 0
_0805083C: .4byte gUnk_080FC8FC
_08050840: .4byte gUnk_02000080
_08050840: .4byte gMenu
_08050844: .4byte gUnk_02019EE0
thumb_func_start sub_08050848
@ -1043,7 +1043,7 @@ _08050868: .4byte gUnk_02019EE0
sub_0805086C: @ 0x0805086C
push {lr}
ldr r1, _08050880 @ =gUnk_080FC908
ldr r0, _08050884 @ =gUnk_02000080
ldr r0, _08050884 @ =gMenu
ldrb r0, [r0, #6]
lsls r0, r0, #2
adds r0, r0, r1
@ -1052,7 +1052,7 @@ sub_0805086C: @ 0x0805086C
pop {pc}
.align 2, 0
_08050880: .4byte gUnk_080FC908
_08050884: .4byte gUnk_02000080
_08050884: .4byte gMenu
thumb_func_start sub_08050888
sub_08050888: @ 0x08050888
@ -1079,7 +1079,7 @@ sub_08050888: @ 0x08050888
adds r1, #1
movs r0, #0
bl sub_08050318
ldr r1, _080508CC @ =gUnk_02000080
ldr r1, _080508CC @ =gMenu
movs r0, #0x1e
strh r0, [r1, #8]
movs r0, #1
@ -1087,24 +1087,24 @@ sub_08050888: @ 0x08050888
.align 2, 0
_080508C4: .4byte gUnk_03000FD0
_080508C8: .4byte gUnk_02019EE0
_080508CC: .4byte gUnk_02000080
_080508CC: .4byte gMenu
_080508D0:
adds r0, r1, #0
bl sub_0805194C
_080508D6:
ldr r1, _080508E0 @ =gUnk_02000080
ldr r1, _080508E0 @ =gMenu
movs r0, #2
_080508DA:
strb r0, [r1, #6]
_080508DC:
pop {r4, pc}
.align 2, 0
_080508E0: .4byte gUnk_02000080
_080508E0: .4byte gMenu
thumb_func_start sub_080508E4
sub_080508E4: @ 0x080508E4
push {lr}
ldr r2, _08050900 @ =gUnk_02000080
ldr r2, _08050900 @ =gMenu
ldrh r0, [r2, #8]
cmp r0, #0
bne _08050908
@ -1118,7 +1118,7 @@ sub_080508E4: @ 0x080508E4
strb r0, [r2, #6]
b _0805090C
.align 2, 0
_08050900: .4byte gUnk_02000080
_08050900: .4byte gMenu
_08050904: .4byte gUnk_03000FF0
_08050908:
subs r0, #1
@ -1145,13 +1145,13 @@ sub_08050910: @ 0x08050910
.align 2, 0
_08050930: .4byte gUnk_02019EE0
_08050934:
ldr r1, _0805093C @ =gUnk_02000080
ldr r1, _0805093C @ =gMenu
movs r0, #0
strb r0, [r1, #6]
_0805093A:
pop {pc}
.align 2, 0
_0805093C: .4byte gUnk_02000080
_0805093C: .4byte gMenu
thumb_func_start sub_08050940
sub_08050940: @ 0x08050940
@ -1539,7 +1539,7 @@ _08050C28: .4byte 0xFFFFF24D
sub_08050C2C: @ 0x08050C2C
push {lr}
ldr r1, _08050C48 @ =gUnk_080FC93C
ldr r0, _08050C4C @ =gUnk_02000080
ldr r0, _08050C4C @ =gMenu
ldrb r0, [r0, #5]
lsls r0, r0, #2
adds r0, r0, r1
@ -1551,7 +1551,7 @@ sub_08050C2C: @ 0x08050C2C
pop {pc}
.align 2, 0
_08050C48: .4byte gUnk_080FC93C
_08050C4C: .4byte gUnk_02000080
_08050C4C: .4byte gMenu
_08050C50: .4byte gUnk_02019EE0
thumb_func_start sub_08050C54
@ -1563,7 +1563,7 @@ sub_08050C54: @ 0x08050C54
beq _08050C60
b _08050D60
_08050C60:
ldr r0, _08050C7C @ =gUnk_02000080
ldr r0, _08050C7C @ =gMenu
ldrb r4, [r0, #1]
ldr r0, _08050C80 @ =gUnk_03000FF0
ldrh r0, [r0, #2]
@ -1577,7 +1577,7 @@ _08050C60:
mov pc, r0
.align 2, 0
_08050C78: .4byte gUnk_02019EE0
_08050C7C: .4byte gUnk_02000080
_08050C7C: .4byte gMenu
_08050C80: .4byte gUnk_03000FF0
_08050C84: .4byte _08050C88
_08050C88: @ jump table
@ -1619,7 +1619,7 @@ _08050D08:
ldr r0, _08050D28 @ =0x80080000
bl PlaySFX
_08050D12:
ldr r1, _08050D2C @ =gUnk_02000080
ldr r1, _08050D2C @ =gMenu
movs r0, #0xf
strh r0, [r1, #8]
movs r0, #1
@ -1629,7 +1629,7 @@ _08050D12:
b _08050D44
.align 2, 0
_08050D28: .4byte 0x80080000
_08050D2C: .4byte gUnk_02000080
_08050D2C: .4byte gMenu
_08050D30:
movs r0, #0x6c
bl PlaySFX
@ -1650,7 +1650,7 @@ _08050D4A:
ble _08050D50
movs r4, #2
_08050D50:
ldr r1, _08050D64 @ =gUnk_02000080
ldr r1, _08050D64 @ =gMenu
ldrb r0, [r1, #1]
cmp r0, r4
beq _08050D60
@ -1660,12 +1660,12 @@ _08050D50:
_08050D60:
pop {r4, pc}
.align 2, 0
_08050D64: .4byte gUnk_02000080
_08050D64: .4byte gMenu
thumb_func_start sub_08050D68
sub_08050D68: @ 0x08050D68
push {lr}
ldr r1, _08050D84 @ =gUnk_02000080
ldr r1, _08050D84 @ =gMenu
ldrh r0, [r1, #8]
cmp r0, #0
bne _08050D94
@ -1680,7 +1680,7 @@ _08050D80:
movs r0, #7
b _08050D8E
.align 2, 0
_08050D84: .4byte gUnk_02000080
_08050D84: .4byte gMenu
_08050D88:
movs r0, #5
b _08050D8E
@ -1700,7 +1700,7 @@ _08050D98:
sub_08050D9C: @ 0x08050D9C
push {lr}
ldr r1, _08050DB0 @ =gUnk_080FC944
ldr r0, _08050DB4 @ =gUnk_02000080
ldr r0, _08050DB4 @ =gMenu
ldrb r0, [r0, #5]
lsls r0, r0, #2
adds r0, r0, r1
@ -1709,7 +1709,7 @@ sub_08050D9C: @ 0x08050D9C
pop {pc}
.align 2, 0
_08050DB0: .4byte gUnk_080FC944
_08050DB4: .4byte gUnk_02000080
_08050DB4: .4byte gMenu
thumb_func_start sub_08050DB8
sub_08050DB8: @ 0x08050DB8
@ -1720,7 +1720,7 @@ sub_08050DB8: @ 0x08050DB8
bl _DmaZero
movs r0, #0xc
bl sub_080503A8
ldr r1, _08050DE0 @ =gUnk_02000080
ldr r1, _08050DE0 @ =gMenu
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #7]
@ -1730,7 +1730,7 @@ sub_08050DB8: @ 0x08050DB8
pop {pc}
.align 2, 0
_08050DDC: .4byte gUnk_020344B0
_08050DE0: .4byte gUnk_02000080
_08050DE0: .4byte gMenu
thumb_func_start sub_08050DE4
sub_08050DE4: @ 0x08050DE4
@ -1771,7 +1771,7 @@ _08050E22:
_08050E26:
movs r0, #0x6a
bl PlaySFX
ldr r0, _08050E44 @ =gUnk_02000080
ldr r0, _08050E44 @ =gMenu
ldrb r0, [r0, #4]
cmp r0, r4
beq _08050E48
@ -1782,13 +1782,13 @@ _08050E26:
bl sub_08050318
b _08050E62
.align 2, 0
_08050E44: .4byte gUnk_02000080
_08050E44: .4byte gMenu
_08050E48:
movs r0, #0
bl sub_080503BC
b _08050E62
_08050E50:
ldr r0, _08050E84 @ =gUnk_02000080
ldr r0, _08050E84 @ =gMenu
ldrb r4, [r0, #4]
strb r4, [r1, #7]
movs r0, #0x6c
@ -1815,7 +1815,7 @@ _08050E6E:
_08050E80:
pop {r4, pc}
.align 2, 0
_08050E84: .4byte gUnk_02000080
_08050E84: .4byte gMenu
thumb_func_start sub_08050E88
sub_08050E88: @ 0x08050E88
@ -1833,7 +1833,7 @@ _08050E9A:
sub_08050E9C: @ 0x08050E9C
push {lr}
ldr r1, _08050EB0 @ =gUnk_080FC950
ldr r0, _08050EB4 @ =gUnk_02000080
ldr r0, _08050EB4 @ =gMenu
ldrb r0, [r0, #5]
lsls r0, r0, #2
adds r0, r0, r1
@ -1842,7 +1842,7 @@ sub_08050E9C: @ 0x08050E9C
pop {pc}
.align 2, 0
_08050EB0: .4byte gUnk_080FC950
_08050EB4: .4byte gUnk_02000080
_08050EB4: .4byte gMenu
thumb_func_start sub_08050EB8
sub_08050EB8: @ 0x08050EB8
@ -1861,7 +1861,7 @@ sub_08050EB8: @ 0x08050EB8
strb r0, [r2, #4]
ldrb r0, [r1, #3]
strb r0, [r2, #5]
ldr r1, _08050EF0 @ =gUnk_02000080
ldr r1, _08050EF0 @ =gMenu
strb r3, [r1, #1]
movs r0, #0xff
strh r0, [r1, #8]
@ -1871,7 +1871,7 @@ sub_08050EB8: @ 0x08050EB8
.align 2, 0
_08050EE8: .4byte gUnk_02019EE0
_08050EEC: .4byte 0x000004B4
_08050EF0: .4byte gUnk_02000080
_08050EF0: .4byte gMenu
thumb_func_start sub_08050EF4
sub_08050EF4: @ 0x08050EF4
@ -1889,7 +1889,7 @@ sub_08050EF4: @ 0x08050EF4
adds r0, r6, #0
adds r0, #0xc
adds r1, r1, r0
ldr r0, _08050F48 @ =gUnk_02000080
ldr r0, _08050F48 @ =gMenu
ldrb r3, [r0, #1]
adds r4, r1, #3
mov ip, r0
@ -1916,7 +1916,7 @@ _08050F1E:
.align 2, 0
_08050F40: .4byte gUnk_02019EE0
_08050F44: .4byte 0x000004B4
_08050F48: .4byte gUnk_02000080
_08050F48: .4byte gMenu
_08050F4C: .4byte gUnk_03000FF0
_08050F50:
cmp r0, #8
@ -2026,7 +2026,7 @@ sub_08050FFC: @ 0x08050FFC
beq _0805102A
b _08051030
_08051014:
ldr r1, _08051034 @ =gUnk_02000080
ldr r1, _08051034 @ =gMenu
movs r0, #0x1e
strh r0, [r1, #8]
ldr r0, _08051038 @ =gUnk_02019EE0
@ -2041,13 +2041,13 @@ _0805102A:
_08051030:
pop {pc}
.align 2, 0
_08051034: .4byte gUnk_02000080
_08051034: .4byte gMenu
_08051038: .4byte gUnk_02019EE0
thumb_func_start sub_0805103C
sub_0805103C: @ 0x0805103C
push {lr}
ldr r0, _08051050 @ =gUnk_02000080
ldr r0, _08051050 @ =gMenu
ldrb r1, [r0, #8]
adds r2, r0, #0
cmp r1, #0
@ -2056,7 +2056,7 @@ sub_0805103C: @ 0x0805103C
beq _0805106C
b _08051060
.align 2, 0
_08051050: .4byte gUnk_02000080
_08051050: .4byte gMenu
_08051054:
ldr r0, _08051068 @ =gUnk_03000FF0
ldrh r1, [r0, #2]
@ -2081,7 +2081,7 @@ _08051072:
sub_08051074: @ 0x08051074
push {lr}
ldr r1, _08051088 @ =gUnk_080FC960
ldr r0, _0805108C @ =gUnk_02000080
ldr r0, _0805108C @ =gMenu
ldrb r0, [r0, #5]
lsls r0, r0, #2
adds r0, r0, r1
@ -2090,7 +2090,7 @@ sub_08051074: @ 0x08051074
pop {pc}
.align 2, 0
_08051088: .4byte gUnk_080FC960
_0805108C: .4byte gUnk_02000080
_0805108C: .4byte gMenu
thumb_func_start sub_08051090
sub_08051090: @ 0x08051090
@ -2182,7 +2182,7 @@ _08051128:
_0805112E:
movs r6, #1
_08051130:
ldr r4, _0805117C @ =gUnk_02000080
ldr r4, _0805117C @ =gMenu
ldrb r0, [r4, #0x11]
adds r0, r0, r5
adds r0, #6
@ -2220,7 +2220,7 @@ _08051172:
strb r0, [r4, #0x12]
b _0805123A
.align 2, 0
_0805117C: .4byte gUnk_02000080
_0805117C: .4byte gMenu
_08051180: .4byte gUnk_080FC980
_08051184:
movs r0, #0x80
@ -2250,14 +2250,14 @@ _080511A8:
.align 2, 0
_080511B4: .4byte gUnk_080FC9A0
_080511B8:
ldr r0, _080511C4 @ =gUnk_02000080
ldr r0, _080511C4 @ =gMenu
ldrb r0, [r0, #0x13]
cmp r0, #0
beq _080511EC
movs r7, #5
b _0805123A
.align 2, 0
_080511C4: .4byte gUnk_02000080
_080511C4: .4byte gMenu
_080511C8:
movs r0, #0x80
lsls r0, r0, #0x12
@ -2267,7 +2267,7 @@ _080511C8:
bne _080511D6
movs r1, #4
_080511D6:
ldr r2, _080511E8 @ =gUnk_02000080
ldr r2, _080511E8 @ =gMenu
ldrb r0, [r2, #0x11]
cmp r0, #5
bne _080511EC
@ -2277,12 +2277,12 @@ _080511D6:
movs r7, #8
b _0805123A
.align 2, 0
_080511E8: .4byte gUnk_02000080
_080511E8: .4byte gMenu
_080511EC:
bl sub_08051358
b _0805123A
_080511F2:
ldr r1, _08051210 @ =gUnk_02000080
ldr r1, _08051210 @ =gMenu
ldrb r0, [r1, #0x11]
cmp r0, #5
bne _08051218
@ -2299,7 +2299,7 @@ _0805120A:
ldrb r7, [r0]
b _0805123A
.align 2, 0
_08051210: .4byte gUnk_02000080
_08051210: .4byte gMenu
_08051214: .4byte gUnk_080FC970
_08051218:
movs r7, #6
@ -2322,7 +2322,7 @@ _0805122C:
bne _0805123A
movs r7, #7
_0805123A:
ldr r0, _08051250 @ =gUnk_02000080
ldr r0, _08051250 @ =gMenu
ldrb r4, [r0, #1]
subs r0, r7, #1
cmp r0, #7
@ -2333,7 +2333,7 @@ _0805123A:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08051250: .4byte gUnk_02000080
_08051250: .4byte gMenu
_08051254: .4byte _08051258
_08051258: @ jump table
.4byte _08051278 @ case 0
@ -2357,7 +2357,7 @@ _08051284:
adds r4, #1
b _08051322
_08051288:
ldr r3, _080512B0 @ =gUnk_02000080
ldr r3, _080512B0 @ =gMenu
ldrb r0, [r3, #0x13]
cmp r0, #0
beq _08051322
@ -2377,7 +2377,7 @@ _08051288:
bl sub_08051574
b _08051322
.align 2, 0
_080512B0: .4byte gUnk_02000080
_080512B0: .4byte gMenu
_080512B4: .4byte gUnk_02002A40
_080512B8:
movs r0, #0
@ -2385,7 +2385,7 @@ _080512B8:
b _08051322
_080512C0:
ldr r2, _080512E4 @ =gUnk_02001A40
ldr r0, _080512E8 @ =gUnk_02000080
ldr r0, _080512E8 @ =gMenu
ldrb r1, [r0, #0x10]
lsls r1, r1, #1
ldrb r0, [r0, #0x11]
@ -2402,7 +2402,7 @@ _080512C0:
b _08051322
.align 2, 0
_080512E4: .4byte gUnk_02001A40
_080512E8: .4byte gUnk_02000080
_080512E8: .4byte gMenu
_080512EC:
movs r3, #5
ldr r0, _08051350 @ =gUnk_02002A40
@ -2445,7 +2445,7 @@ _08051330:
adds r0, r4, r1
bl __modsi3
adds r4, r0, #0
ldr r1, _08051354 @ =gUnk_02000080
ldr r1, _08051354 @ =gMenu
ldrb r0, [r1, #1]
cmp r0, r4
beq _0805134C
@ -2457,12 +2457,12 @@ _0805134C:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08051350: .4byte gUnk_02002A40
_08051354: .4byte gUnk_02000080
_08051354: .4byte gMenu
thumb_func_start sub_08051358
sub_08051358: @ 0x08051358
push {lr}
ldr r2, _08051384 @ =gUnk_02000080
ldr r2, _08051384 @ =gMenu
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #7]
@ -2485,14 +2485,14 @@ _0805136A:
_08051382:
pop {pc}
.align 2, 0
_08051384: .4byte gUnk_02000080
_08051384: .4byte gMenu
_08051388: .4byte 0x0000050B
thumb_func_start sub_0805138C
sub_0805138C: @ 0x0805138C
push {lr}
ldr r1, _080513A0 @ =gUnk_080FC9B0
ldr r0, _080513A4 @ =gUnk_02000080
ldr r0, _080513A4 @ =gMenu
ldrb r0, [r0, #6]
lsls r0, r0, #2
adds r0, r0, r1
@ -2501,7 +2501,7 @@ sub_0805138C: @ 0x0805138C
pop {pc}
.align 2, 0
_080513A0: .4byte gUnk_080FC9B0
_080513A4: .4byte gUnk_02000080
_080513A4: .4byte gMenu
thumb_func_start sub_080513A8
sub_080513A8: @ 0x080513A8
@ -2509,12 +2509,12 @@ sub_080513A8: @ 0x080513A8
movs r0, #5
movs r1, #0
bl sub_08050318
ldr r1, _080513BC @ =gUnk_02000080
ldr r1, _080513BC @ =gMenu
movs r0, #1
strb r0, [r1, #6]
pop {pc}
.align 2, 0
_080513BC: .4byte gUnk_02000080
_080513BC: .4byte gMenu
thumb_func_start sub_080513C0
sub_080513C0: @ 0x080513C0
@ -2552,7 +2552,7 @@ _080513F8:
movs r0, #6
movs r1, #0
bl sub_08050318
ldr r1, _08051418 @ =gUnk_02000080
ldr r1, _08051418 @ =gMenu
movs r0, #0x1e
strh r0, [r1, #8]
movs r0, #2
@ -2561,12 +2561,12 @@ _08051412:
pop {pc}
.align 2, 0
_08051414: .4byte gUnk_02019EE0
_08051418: .4byte gUnk_02000080
_08051418: .4byte gMenu
thumb_func_start sub_0805141C
sub_0805141C: @ 0x0805141C
push {lr}
ldr r1, _0805143C @ =gUnk_02000080
ldr r1, _0805143C @ =gMenu
ldrh r0, [r1, #8]
cmp r0, #0
bne _08051444
@ -2580,7 +2580,7 @@ sub_0805141C: @ 0x0805141C
bl sub_080A7114
b _08051448
.align 2, 0
_0805143C: .4byte gUnk_02000080
_0805143C: .4byte gMenu
_08051440: .4byte gUnk_03000FF0
_08051444:
subs r0, #1
@ -2600,7 +2600,7 @@ sub_0805144C: @ 0x0805144C
thumb_func_start sub_08051458
sub_08051458: @ 0x08051458
push {lr}
ldr r0, _08051474 @ =gUnk_02000080
ldr r0, _08051474 @ =gMenu
ldrb r0, [r0, #1]
adds r0, #9
bl sub_080503A8
@ -2611,7 +2611,7 @@ sub_08051458: @ 0x08051458
bl sub_0801D66C
pop {pc}
.align 2, 0
_08051474: .4byte gUnk_02000080
_08051474: .4byte gMenu
_08051478: .4byte gUnk_02001B40
_0805147C: .4byte gUnk_02022030
@ -2620,7 +2620,7 @@ sub_08051480: @ 0x08051480
push {r4, lr}
adds r4, r0, #0
bl sub_080514BC
ldr r2, _080514B4 @ =gUnk_02000080
ldr r2, _080514B4 @ =gMenu
ldrb r1, [r2, #0x13]
cmp r0, #0
beq _080514B0
@ -2644,7 +2644,7 @@ _0805149E:
_080514B0:
pop {r4, pc}
.align 2, 0
_080514B4: .4byte gUnk_02000080
_080514B4: .4byte gMenu
_080514B8: .4byte gUnk_02002A40
thumb_func_start sub_080514BC
@ -2666,7 +2666,7 @@ _080514D6:
movs r0, #1
b _08051572
_080514DA:
ldr r0, _08051500 @ =gUnk_02000080
ldr r0, _08051500 @ =gMenu
ldrb r1, [r0, #0x13]
cmp r1, #0
beq _08051570
@ -2686,7 +2686,7 @@ _080514DA:
beq _0805150E
b _0805153C
.align 2, 0
_08051500: .4byte gUnk_02000080
_08051500: .4byte gMenu
_08051504: .4byte gUnk_02002A40
_08051508:
cmp r2, #0xf
@ -2780,7 +2780,7 @@ _0805159C: .4byte 0x000004B4
sub_080515A0: @ 0x080515A0
push {lr}
ldr r1, _080515BC @ =gUnk_080FC9BC
ldr r0, _080515C0 @ =gUnk_02000080
ldr r0, _080515C0 @ =gMenu
ldrb r0, [r0, #5]
lsls r0, r0, #2
adds r0, r0, r1
@ -2792,7 +2792,7 @@ sub_080515A0: @ 0x080515A0
pop {pc}
.align 2, 0
_080515BC: .4byte gUnk_080FC9BC
_080515C0: .4byte gUnk_02000080
_080515C0: .4byte gMenu
_080515C4: .4byte gUnk_02019EE0
thumb_func_start sub_080515C8
@ -2812,7 +2812,7 @@ sub_080515D4: @ 0x080515D4
beq _080515E0
b _080516D8
_080515E0:
ldr r1, _08051600 @ =gUnk_02000080
ldr r1, _08051600 @ =gMenu
movs r0, #4
strh r0, [r1, #8]
ldrb r4, [r1, #1]
@ -2828,7 +2828,7 @@ _080515E0:
mov pc, r0
.align 2, 0
_080515FC: .4byte gUnk_02019EE0
_08051600: .4byte gUnk_02000080
_08051600: .4byte gMenu
_08051604: .4byte gUnk_03000FF0
_08051608: .4byte _0805160C
_0805160C: @ jump table
@ -2865,7 +2865,7 @@ _0805160C: @ jump table
.4byte _080516C8 @ case 30
.4byte _080516C2 @ case 31
_0805168C:
ldr r1, _080516B0 @ =gUnk_02000080
ldr r1, _080516B0 @ =gMenu
movs r0, #0
strb r0, [r1, #1]
movs r4, #0
@ -2881,7 +2881,7 @@ _08051694:
bl PlaySFX
b _080516C8
.align 2, 0
_080516B0: .4byte gUnk_02000080
_080516B0: .4byte gMenu
_080516B4:
movs r0, #0
bl sub_080503BC
@ -2894,7 +2894,7 @@ _080516C2:
_080516C6:
movs r4, #1
_080516C8:
ldr r1, _080516DC @ =gUnk_02000080
ldr r1, _080516DC @ =gMenu
ldrb r0, [r1, #1]
cmp r0, r4
beq _080516D8
@ -2904,7 +2904,7 @@ _080516C8:
_080516D8:
pop {r4, pc}
.align 2, 0
_080516DC: .4byte gUnk_02000080
_080516DC: .4byte gMenu
thumb_func_start sub_080516E0
sub_080516E0: @ 0x080516E0
@ -2918,7 +2918,7 @@ sub_080516E0: @ 0x080516E0
bl sub_0805194C
ldrb r0, [r4, #6]
bl sub_08050AFC
ldr r1, _0805170C @ =gUnk_02000080
ldr r1, _0805170C @ =gMenu
movs r0, #2
strh r0, [r1, #8]
movs r0, #0
@ -2927,13 +2927,13 @@ _08051706:
pop {r4, pc}
.align 2, 0
_08051708: .4byte gUnk_02019EE0
_0805170C: .4byte gUnk_02000080
_0805170C: .4byte gMenu
thumb_func_start sub_08051710
sub_08051710: @ 0x08051710
push {lr}
ldr r1, _0805172C @ =gUnk_080FC9C8
ldr r0, _08051730 @ =gUnk_02000080
ldr r0, _08051730 @ =gMenu
ldrb r0, [r0, #5]
lsls r0, r0, #2
adds r0, r0, r1
@ -2945,7 +2945,7 @@ sub_08051710: @ 0x08051710
pop {pc}
.align 2, 0
_0805172C: .4byte gUnk_080FC9C8
_08051730: .4byte gUnk_02000080
_08051730: .4byte gMenu
_08051734: .4byte gUnk_02019EE0
thumb_func_start sub_08051738
@ -2989,7 +2989,7 @@ _08051774:
bls _0805174C
cmp r4, #0
bne _0805179C
ldr r1, _08051798 @ =gUnk_02000080
ldr r1, _08051798 @ =gMenu
movs r0, #0x3c
strh r0, [r1, #8]
movs r0, #1
@ -2999,20 +2999,20 @@ _08051774:
bl sub_080A7114
b _080517A2
.align 2, 0
_08051798: .4byte gUnk_02000080
_08051798: .4byte gMenu
_0805179C:
movs r0, #1
bl sub_080A7114
_080517A2:
adds r4, #1
ldr r0, _080517B0 @ =gUnk_02000080
ldr r0, _080517B0 @ =gMenu
strb r4, [r0, #0x16]
movs r1, #4
strb r1, [r0, #0x13]
strb r4, [r0, #0x14]
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080517B0: .4byte gUnk_02000080
_080517B0: .4byte gMenu
thumb_func_start sub_080517B4
sub_080517B4: @ 0x080517B4
@ -3160,7 +3160,7 @@ _080518C4:
movs r0, #3
movs r1, #0
bl sub_08050318
ldr r1, _080518E0 @ =gUnk_02000080
ldr r1, _080518E0 @ =gMenu
movs r0, #0x1e
strh r0, [r1, #8]
movs r0, #3
@ -3168,12 +3168,12 @@ _080518C4:
_080518DE:
pop {r4, pc}
.align 2, 0
_080518E0: .4byte gUnk_02000080
_080518E0: .4byte gMenu
thumb_func_start sub_080518E4
sub_080518E4: @ 0x080518E4
push {lr}
ldr r1, _08051904 @ =gUnk_02000080
ldr r1, _08051904 @ =gMenu
ldrh r0, [r1, #8]
cmp r0, #0
bne _0805190C
@ -3187,7 +3187,7 @@ sub_080518E4: @ 0x080518E4
bl sub_080503BC
b _08051910
.align 2, 0
_08051904: .4byte gUnk_02000080
_08051904: .4byte gMenu
_08051908: .4byte gUnk_03000FF0
_0805190C:
subs r0, #1
@ -3199,7 +3199,7 @@ _08051910:
thumb_func_start sub_08051914
sub_08051914: @ 0x08051914
push {lr}
ldr r1, _08051940 @ =gUnk_02000080
ldr r1, _08051940 @ =gMenu
ldrb r0, [r1, #5]
cmp r0, #0
bne _0805193E
@ -3221,7 +3221,7 @@ sub_08051914: @ 0x08051914
_0805193E:
pop {pc}
.align 2, 0
_08051940: .4byte gUnk_02000080
_08051940: .4byte gMenu
_08051944: .4byte gUnk_02002A40
_08051948: .4byte gUnk_03001000
@ -3775,7 +3775,7 @@ _08051E64: .4byte gUnk_02002A40
sub_08051E68: @ 0x08051E68
push {lr}
ldr r1, _08051E7C @ =gUnk_080FCA08
ldr r0, _08051E80 @ =gUnk_02000080
ldr r0, _08051E80 @ =gMenu
ldrb r0, [r0, #5]
lsls r0, r0, #2
adds r0, r0, r1
@ -3784,7 +3784,7 @@ sub_08051E68: @ 0x08051E68
pop {pc}
.align 2, 0
_08051E7C: .4byte gUnk_080FCA08
_08051E80: .4byte gUnk_02000080
_08051E80: .4byte gMenu
thumb_func_start sub_08051E84
sub_08051E84: @ 0x08051E84
@ -3819,7 +3819,7 @@ sub_08051E84: @ 0x08051E84
ldrh r1, [r5, #8]
adds r0, r0, r1
strh r0, [r5, #0xc]
ldr r1, _08051F00 @ =gUnk_02000080
ldr r1, _08051F00 @ =gMenu
ldrb r0, [r4, #2]
strb r0, [r1]
ldrb r2, [r4, #3]
@ -3841,13 +3841,13 @@ _08051EF0: .4byte gUnk_02032EC0
_08051EF4: .4byte gUnk_080FCA20
_08051EF8: .4byte gRoomControls
_08051EFC: .4byte gArea
_08051F00: .4byte gUnk_02000080
_08051F00: .4byte gMenu
thumb_func_start sub_08051F04
sub_08051F04: @ 0x08051F04
push {lr}
ldr r1, _08051F38 @ =gUnk_080FCA14
ldr r0, _08051F3C @ =gUnk_02000080
ldr r0, _08051F3C @ =gMenu
ldrb r0, [r0]
lsls r0, r0, #2
adds r0, r0, r1
@ -3864,7 +3864,7 @@ sub_08051F04: @ 0x08051F04
pop {pc}
.align 2, 0
_08051F38: .4byte gUnk_080FCA14
_08051F3C: .4byte gUnk_02000080
_08051F3C: .4byte gMenu
thumb_func_start sub_08051F40
sub_08051F40: @ 0x08051F40
@ -3955,23 +3955,23 @@ _08051FEC: .4byte gUnk_0200B644
thumb_func_start sub_08051FF0
sub_08051FF0: @ 0x08051FF0
push {lr}
ldr r0, _08052000 @ =gUnk_02000080
ldr r0, _08052000 @ =gMenu
ldr r1, [r0, #0xc]
ldrb r0, [r1]
ldrb r1, [r1, #1]
bl sub_0804B0B0
pop {pc}
.align 2, 0
_08052000: .4byte gUnk_02000080
_08052000: .4byte gMenu
thumb_func_start sub_08052004
sub_08052004: @ 0x08052004
ldr r1, _0805200C @ =gUnk_02000080
ldr r1, _0805200C @ =gMenu
movs r0, #2
strb r0, [r1, #5]
bx lr
.align 2, 0
_0805200C: .4byte gUnk_02000080
_0805200C: .4byte gMenu
thumb_func_start sub_08052010
sub_08052010: @ 0x08052010
@ -4000,7 +4000,7 @@ sub_08052010: @ 0x08052010
lsls r0, r0, #0x13
movs r1, #0x20
bl _DmaZero
ldr r0, _08052084 @ =gUnk_02000080
ldr r0, _08052084 @ =gMenu
movs r1, #0x30
bl _DmaZero
ldr r1, _08052088 @ =gScreen
@ -4021,7 +4021,7 @@ sub_08052010: @ 0x08052010
.align 2, 0
_0805207C: .4byte gUnk_02021F30
_08052080: .4byte gUnk_020344B0
_08052084: .4byte gUnk_02000080
_08052084: .4byte gMenu
_08052088: .4byte gScreen
_0805208C: .4byte 0x00001C01
_08052090: .4byte 0x00001D05
@ -4067,7 +4067,7 @@ sub_080520D8: @ 0x080520D8
cmp r0, #0
bne _08052114
bl sub_08052010
ldr r1, _0805211C @ =gUnk_02000080
ldr r1, _0805211C @ =gMenu
movs r0, #0x50
strb r0, [r1, #0x10]
movs r2, #0x3c
@ -4091,7 +4091,7 @@ _08052114:
pop {r4, pc}
.align 2, 0
_08052118: .4byte gUnk_03000FD0
_0805211C: .4byte gUnk_02000080
_0805211C: .4byte gMenu
_08052120: .4byte gUnk_02002A40
_08052124: .4byte gUnk_03001000
_08052128: .4byte 0xFFFF0001
@ -4107,7 +4107,7 @@ sub_0805212C: @ 0x0805212C
ldrb r0, [r1, #5]
cmp r0, #0
bne _08052198
ldr r1, _08052154 @ =gUnk_02000080
ldr r1, _08052154 @ =gMenu
ldrb r0, [r1, #0x10]
cmp r0, #0x25
bls _08052158
@ -4117,7 +4117,7 @@ sub_0805212C: @ 0x0805212C
.align 2, 0
_0805214C: .4byte gUnk_03000FD0
_08052150: .4byte gUnk_03001000
_08052154: .4byte gUnk_02000080
_08052154: .4byte gMenu
_08052158:
ldrh r0, [r1, #8]
subs r0, #1
@ -4162,7 +4162,7 @@ sub_080521A0: @ 0x080521A0
beq _080521AC
b _080522E8
_080521AC:
ldr r0, _080521C8 @ =gUnk_02000080
ldr r0, _080521C8 @ =gMenu
ldrb r1, [r0, #5]
adds r2, r0, #0
cmp r1, #4
@ -4176,7 +4176,7 @@ _080521B8:
mov pc, r0
.align 2, 0
_080521C4: .4byte gUnk_03000FD0
_080521C8: .4byte gUnk_02000080
_080521C8: .4byte gMenu
_080521CC: .4byte _080521D0
_080521D0: @ jump table
.4byte _080521E4 @ case 0
@ -4238,7 +4238,7 @@ _0805223E:
bl sub_08050318
movs r2, #2
_08052248:
ldr r1, _08052274 @ =gUnk_02000080
ldr r1, _08052274 @ =gMenu
movs r0, #0x3c
strh r0, [r1, #8]
adds r0, r2, #0
@ -4246,7 +4246,7 @@ _08052248:
movs r0, #0x6a
bl PlaySFX
_0805225A:
ldr r1, _08052274 @ =gUnk_02000080
ldr r1, _08052274 @ =gMenu
ldrb r0, [r1, #3]
cmp r0, r4
beq _080522E8
@ -4258,12 +4258,12 @@ _0805225A:
bl PlaySFX
b _080522E8
.align 2, 0
_08052274: .4byte gUnk_02000080
_08052274: .4byte gMenu
_08052278:
movs r0, #0
bl sub_0807CDA4
adds r1, r0, #0
ldr r2, _08052298 @ =gUnk_02000080
ldr r2, _08052298 @ =gMenu
strb r1, [r2]
movs r0, #1
rsbs r0, r0, #0
@ -4275,7 +4275,7 @@ _08052278:
bl sub_080A7114
b _080522E8
.align 2, 0
_08052298: .4byte gUnk_02000080
_08052298: .4byte gMenu
_0805229C:
movs r0, #0x3c
strh r0, [r2, #8]
@ -4323,7 +4323,7 @@ _080522F0: .4byte 0x0000FDFF
thumb_func_start sub_080522F4
sub_080522F4: @ 0x080522F4
push {r4, lr}
ldr r0, _08052320 @ =gUnk_02000080
ldr r0, _08052320 @ =gMenu
ldrb r1, [r0, #5]
adds r3, r0, #0
cmp r1, #1
@ -4343,7 +4343,7 @@ sub_080522F4: @ 0x080522F4
bl sub_08052418
b _080523CC
.align 2, 0
_08052320: .4byte gUnk_02000080
_08052320: .4byte gMenu
_08052324:
ldr r2, _08052340 @ =gScreen
ldrh r1, [r2]
@ -4399,7 +4399,7 @@ _08052384:
movs r1, #8
bl DoFade
_0805238C:
ldr r1, _080523A8 @ =gUnk_02000080
ldr r1, _080523A8 @ =gMenu
ldrb r0, [r1, #3]
cmp r0, r4
beq _080523CC
@ -4411,7 +4411,7 @@ _0805238C:
bl PlaySFX
b _080523CC
.align 2, 0
_080523A8: .4byte gUnk_02000080
_080523A8: .4byte gMenu
_080523AC:
ldr r0, _080523C4 @ =gUnk_03000FD0
ldrb r0, [r0]
@ -4446,7 +4446,7 @@ sub_080523D4: @ 0x080523D4
movs r0, #0x86
lsls r0, r0, #8
strh r0, [r1, #8]
ldr r0, _0805240C @ =gUnk_02000080
ldr r0, _0805240C @ =gMenu
ldrb r0, [r0, #0x10]
strh r0, [r1, #2]
movs r4, #0
@ -4465,6 +4465,6 @@ _080523F0:
pop {r4, r5, r6, pc}
.align 2, 0
_08052408: .4byte gUnk_03001010
_0805240C: .4byte gUnk_02000080
_0805240C: .4byte gMenu
_08052410: .4byte gUnk_080FCA84
_08052414: .4byte 0x000001FD

174
asm/code_080526F8.s
View File

@ -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
@ -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
@ -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]
@ -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

1075
asm/code_0805436C.s
View File

File diff suppressed because it is too large Load Diff

28
asm/code_0805E744.s
View File

@ -2586,7 +2586,7 @@ sub_0805FA04: @ 0x0805FA04
movs r1, #0xed
lsls r1, r1, #2
bl _DmaZero
ldr r4, _0805FA8C @ =gUnk_02000080
ldr r4, _0805FA8C @ =gMenu
adds r0, r4, #0
movs r1, #0x30
bl _DmaZero
@ -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

2
asm/code_08070698.s
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

4
asm/code_080732D0.s
View File

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

2
asm/code_08076C80.s
View File

@ -1887,7 +1887,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

20
asm/code_0807CC3C.s
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

62
asm/code_080A3480.s
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
@ -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
@ -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
@ -594,7 +594,7 @@ sub_080A38D0: @ 0x080A38D0
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
@ -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

188
asm/code_080A3BD0.s
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
@ -267,7 +267,7 @@ sub_080A3DB8: @ 0x080A3DB8
bl sub_080A7138
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
@ -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
@ -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
@ -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
@ -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
@ -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
@ -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
@ -2324,7 +2324,7 @@ sub_080A4DB8: @ 0x080A4DB8
movs r1, #0xc0
lsls r1, r1, #2
bl _DmaZero
ldr r4, _080A4E68 @ =gUnk_02000080
ldr r4, _080A4E68 @ =gMenu
adds r0, r4, #0
movs r1, #0x30
bl _DmaZero
@ -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
@ -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

266
asm/code_080A5574.s
View File

File diff suppressed because it is too large Load Diff

4
asm/drawKinstoneMenu.s
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

367
asm/non_matching/code_0805457C.inc Normal file
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

120
asm/non_matching/putItemOnSlot.s Normal file
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

31
asm/non_matching/sub_08054524.inc Normal file
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

2
asm/object45.s
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

32
asm/object48.s
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

4
asm/object4B.s
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

8
asm/objectA2.s
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

8
asm/objectB4.s
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

42
asm/sub_0801D630.s
View File

@ -1,42 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start _DmaZero
_DmaZero: @ 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 _DmaFill16
b _0801D668
_0801D65E:
strb r4, [r3]
adds r3, #1
subs r2, #1
cmp r2, #0
bne _0801D65E
_0801D668:
pop {r4, pc}
.align 2, 0

4
asm/sub_08055E24.s
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

4
asm/sub_080AD3F4.s
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

10
asm/sub_080AD474.s
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
@ -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

4
asm/sub_080AD670.s
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

4
asm/sub_080AD6Ac.s
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

8
asm/sub_080AD76C.s
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

4
asm/sub_080AD84C.s
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

4
asm/sub_080AD89C.s
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

4
asm/waterfallOpening.s
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

13
include/menu.h
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

3
linker.ld
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 = .;
@ -456,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);

188
src/code_0805436C.c Normal file
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]();
}

5
src/introSetTransition.c
View File

@ -14,15 +14,14 @@ typedef struct {
extern u32 DoFade(u32, u32);
extern void _DmaZero(u32*, u32, u32);
extern u32 gUnk_02000080;
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;
_DmaZero(&gUnk_02000080, 48, param_3);
_DmaZero((u32 *)&gMenu, 48, param_3);
return DoFade(7, 8);
}

6
src/sub_08055E08.c
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]);
}