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

fixed install.md

This commit is contained in:
theo 2020-06-06 13:49:18 -07:00
parent 7afbda2b4d
commit 2554a7df5a
76 changed files with 8332 additions and 8103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
INSTALL.md
View File

@ -29,14 +29,14 @@ Install the **devkitARM** toolchain of [devkitPro](https://devkitpro.org/wiki/Ge
To set up the repository:
git clone https://github.com/jiangzhengwenjz/zeldatmc
git clone https://github.com/zeldaret/tmc
git clone https://github.com/pret/agbcc
cd ./agbcc
sh build.sh
sh install.sh ../zeldatmc
sh install.sh ../tmc
cd ../zeldatmc
cd ../tmc
To build **zeldatmc.gba**:

24
asm/InitializeLink.s
View File

@ -9,7 +9,7 @@ InitializeLink: @ 0x080524A8
ldr r0, _08052510 @ =gUnk_03000B80
movs r1, #0x70
bl sub_0801D630
ldr r6, _08052514 @ =gUnk_03003F80
ldr r6, _08052514 @ =gLinkState
adds r0, r6, #0
movs r1, #0xb0
bl sub_0801D630
@ -52,7 +52,7 @@ _080524FA:
mov pc, r0
.align 2, 0
_08052510: .4byte gUnk_03000B80
_08052514: .4byte gUnk_03003F80
_08052514: .4byte gLinkState
_08052518: .4byte gLinkEntity
_0805251C: .4byte gRoomControls
_08052520: .4byte gUnk_080FCAC8
@ -77,7 +77,7 @@ _08052558:
.align 2, 0
_08052560: .4byte 0x0000FF40
_08052564:
ldr r0, _0805257C @ =gUnk_03003F80
ldr r0, _0805257C @ =gLinkState
adds r0, #0x38
movs r1, #0x10
strb r1, [r0]
@ -91,10 +91,10 @@ _08052576:
strh r0, [r4, #0x24]
b _080525C2
.align 2, 0
_0805257C: .4byte gUnk_03003F80
_0805257C: .4byte gLinkState
_08052580: .4byte gUnk_030010A0
_08052584:
ldr r1, _08052598 @ =gUnk_03003F80
ldr r1, _08052598 @ =gLinkState
adds r2, r1, #0
adds r2, #0x38
movs r0, #1
@ -105,24 +105,24 @@ _08052584:
strb r0, [r1]
b _080525C2
.align 2, 0
_08052598: .4byte gUnk_03003F80
_08052598: .4byte gLinkState
_0805259C: .4byte gUnk_030010A0
_080525A0:
ldr r0, _080525A8 @ =gUnk_03003F80
ldr r0, _080525A8 @ =gLinkState
adds r0, #0x38
movs r1, #1
b _080525BE
.align 2, 0
_080525A8: .4byte gUnk_03003F80
_080525A8: .4byte gLinkState
_080525AC:
ldr r0, _080525B4 @ =gUnk_03003F80
ldr r0, _080525B4 @ =gLinkState
adds r0, #0x38
movs r1, #3
b _080525BE
.align 2, 0
_080525B4: .4byte gUnk_03003F80
_080525B4: .4byte gLinkState
_080525B8:
ldr r0, _08052614 @ =gUnk_03003F80
ldr r0, _08052614 @ =gLinkState
adds r0, #0x38
movs r1, #4
_080525BE:
@ -169,6 +169,6 @@ _080525C2:
bl sub_08017640
pop {r4, r5, r6, pc}
.align 2, 0
_08052614: .4byte gUnk_03003F80
_08052614: .4byte gLinkState
_08052618: .4byte gUnk_030010A0
_0805261C: .4byte gUnk_02002A40

12
asm/bowUse.s
View File

@ -238,7 +238,7 @@ _08019336:
strb r0, [r4, #0x18]
b _08019402
_0801934A:
ldr r1, _0801938C @ =gUnk_03003F80
ldr r1, _0801938C @ =gLinkState
ldr r0, [r1, #0x2c]
cmp r0, r4
bne _0801935E
@ -259,7 +259,7 @@ _08019368:
ldrb r0, [r0]
cmp r0, #0xa
bne _08019398
ldr r0, _0801938C @ =gUnk_03003F80
ldr r0, _0801938C @ =gLinkState
adds r2, r0, #0
adds r2, #0x21
ldrb r0, [r2]
@ -272,7 +272,7 @@ _08019368:
strb r0, [r2]
b _08019398
.align 2, 0
_0801938C: .4byte gUnk_03003F80
_0801938C: .4byte gLinkState
_08019390:
adds r1, r4, #0
adds r1, #0x40
@ -319,14 +319,14 @@ _080193C2:
bl sub_08077CB8
cmp r0, #0
beq _080193FA
ldr r2, _0801940C @ =gUnk_03003F80
ldr r2, _0801940C @ =gLinkState
ldrb r1, [r2, #4]
movs r0, #0x80
orrs r0, r1
strb r0, [r2, #4]
movs r0, #1
rsbs r0, r0, #0
bl sub_08054330
bl ModArrows
_080193FA:
ldr r1, _08019408 @ =gLinkEntity
adds r0, r4, #0
@ -336,4 +336,4 @@ _08019402:
.align 2, 0
_08019404: .4byte gUnk_02002A40
_08019408: .4byte gLinkEntity
_0801940C: .4byte gUnk_03003F80
_0801940C: .4byte gLinkState

4
asm/catInteract.s
View File

@ -10,7 +10,7 @@
sub_08067C44: @ 0x08067C44
push {r4, r5, lr}
adds r4, r0, #0
ldr r0, _08067C6C @ =gUnk_03003F80
ldr r0, _08067C6C @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -27,7 +27,7 @@ sub_08067C44: @ 0x08067C44
bl sub_08078778
b _08067C7C
.align 2, 0
_08067C6C: .4byte gUnk_03003F80
_08067C6C: .4byte gLinkState
_08067C70:
adds r0, r4, #0
adds r0, #0x68

4
asm/chickInteract.s
View File

@ -15,7 +15,7 @@ sub_0806E838: @ 0x0806E838
ldrsb r2, [r0, r2]
cmp r2, #0
beq _0806E882
ldr r0, _0806E864 @ =gUnk_03003F80
ldr r0, _0806E864 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -29,7 +29,7 @@ sub_0806E838: @ 0x0806E838
bl sub_0806F118
b _0806E874
.align 2, 0
_0806E864: .4byte gUnk_03003F80
_0806E864: .4byte gLinkState
_0806E868:
adds r0, r4, #0
bl sub_0806E884

8
asm/code_08000E44.s
View File

@ -15,9 +15,9 @@ sub_08000E44: @ 0x08000E44
_08000E4E:
bx lr
thumb_func_start sub_08000E50
sub_08000E50: @ 0x08000E50
ldr r2, _08000EBC @ =gUnk_03001150
thumb_func_start Random
Random: @ 0x08000E50
ldr r2, _08000EBC @ =gRand
ldr r0, [r2]
lsls r1, r0, #1
adds r0, r0, r1
@ -82,7 +82,7 @@ _08000EB6:
pop {r4, r5}
bx lr
.align 2, 0
_08000EBC: .4byte gUnk_03001150
_08000EBC: .4byte gRand
_08000EC0: .4byte 0x55555555
_08000EC4: .4byte 0x33333333
_08000EC8: .4byte 0x0F0F0F0F

2
asm/code_080011C4.s
View File

@ -1360,7 +1360,7 @@ _080028F2:
sub_080028F4: @ 0x080028F4
push {r4, lr}
adds r4, r0, #0
bl sub_08000E50
bl Random
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
movs r1, #0

44
asm/code_0800857C.s
View File

@ -16,7 +16,7 @@ sub_0800857C: @ 0x0800857C
ldrb r1, [r0, #0xb]
lsrs r1, r1, #8
bhs _0800859C
ldr r1, _08008888 @ =gUnk_03003F80
ldr r1, _08008888 @ =gLinkState
ldrb r1, [r1, #2]
movs r2, #0x80
ands r1, r2
@ -52,7 +52,7 @@ sub_080085B0: @ 0x080085B0
thumb_func_start sub_080085CC
sub_080085CC: @ 0x080085CC
push {lr}
ldr r2, _0800888C @ =gUnk_03003F80
ldr r2, _0800888C @ =gLinkState
ldr r1, _08008890 @ =gUnk_080083FC
movs r3, #0x26
ldrb r3, [r2, r3]
@ -78,7 +78,7 @@ _080085E6:
ands r2, r3
bne _0800861A
ldr r1, _080088A4 @ =gUnk_080084BC
ldr r3, _080088A8 @ =gUnk_03003F80
ldr r3, _080088A8 @ =gLinkState
ldrb r2, [r3, #0x1c]
orrs r2, r2
bne _0800861A
@ -208,7 +208,7 @@ sub_080086D8: @ 0x080086D8
ldrb r2, [r0, r1]
push {r2}
mov r0, r8
ldr r1, _080088C8 @ =gUnk_03003F80
ldr r1, _080088C8 @ =gLinkState
movs r2, #0x26
ldrb r2, [r1, r2]
cmp r2, #0
@ -428,15 +428,15 @@ _0800887E:
adds r0, r5, #0
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08008888: .4byte gUnk_03003F80
_0800888C: .4byte gUnk_03003F80
_08008888: .4byte gLinkState
_0800888C: .4byte gLinkState
_08008890: .4byte gUnk_080083FC
_08008894: .4byte gUnk_0800839C
_08008898: .4byte gUnk_0800845C
_0800889C: .4byte 0x01000000
_080088A0: .4byte gUnk_0800833C
_080088A4: .4byte gUnk_080084BC
_080088A8: .4byte gUnk_03003F80
_080088A8: .4byte gLinkState
_080088AC: .4byte gUnk_0800851C
_080088B0: .4byte gUnk_080082DC
_080088B4: .4byte gUnk_03000BF6
@ -444,7 +444,7 @@ _080088B8: .4byte gUnk_03000BF8
_080088BC: .4byte gLinkEntity
_080088C0: .4byte 0x000003F0
_080088C4: .4byte gUnk_08000248
_080088C8: .4byte gUnk_03003F80
_080088C8: .4byte gLinkState
_080088CC: .4byte gUnk_0800823C
_080088D0: .4byte gUnk_08007DF4
_080088D4: .4byte gRoomControls
@ -487,13 +487,13 @@ sub_08008936: @ 0x08008936
ldrb r2, [r0, #0x14]
lsrs r2, r2, #1
lsls r2, r2, #3
ldr r1, _08008A68 @ =gUnk_03003F80
ldr r1, _08008A68 @ =gLinkState
b _08008960
non_word_aligned_thumb_func_start sub_08008942
sub_08008942: @ 0x08008942
push {lr}
ldr r1, _08008A6C @ =gUnk_03003F80
ldr r1, _08008A6C @ =gLinkState
ldrb r2, [r1, #7]
ldrb r3, [r1, #0xa]
orrs r2, r3
@ -502,7 +502,7 @@ sub_08008942: @ 0x08008942
b _08008956
_08008952:
push {lr}
ldr r1, _08008A70 @ =gUnk_03003F80
ldr r1, _08008A70 @ =gLinkState
_08008956:
movs r3, #0x15
strb r2, [r0, r3]
@ -559,7 +559,7 @@ _080089A8:
ldrsb r3, [r4, r3]
bl sub_08008A46
_080089C0:
ldr r1, _08008A80 @ =gUnk_03003F80
ldr r1, _08008A80 @ =gLinkState
movs r4, #0x8c
movs r2, #8
ldrsh r3, [r1, r4]
@ -636,7 +636,7 @@ _08008A3E:
non_word_aligned_thumb_func_start sub_08008A46
sub_08008A46: @ 0x08008A46
push {lr}
ldr r1, _08008A84 @ =gUnk_03003F80
ldr r1, _08008A84 @ =gLinkState
movs r4, #0x8c
ldrsh r5, [r1, r4]
adds r5, r5, r2
@ -651,14 +651,14 @@ _08008A60:
strh r3, [r1]
pop {pc}
.align 2, 0
_08008A68: .4byte gUnk_03003F80
_08008A6C: .4byte gUnk_03003F80
_08008A70: .4byte gUnk_03003F80
_08008A68: .4byte gLinkState
_08008A6C: .4byte gLinkState
_08008A70: .4byte gLinkState
_08008A74: .4byte _080088FC
_08008A78: .4byte _080088EC
_08008A7C: .4byte _0800890C
_08008A80: .4byte gUnk_03003F80
_08008A84: .4byte gUnk_03003F80
_08008A80: .4byte gLinkState
_08008A84: .4byte gLinkState
thumb_func_start sub_08008A88
sub_08008A88: @ 0x08008A88
@ -681,7 +681,7 @@ _08008A9C:
thumb_func_start sub_08008AA0
sub_08008AA0: @ 0x08008AA0
push {r4, r5, lr}
ldr r1, _08008B40 @ =gUnk_03003F80
ldr r1, _08008B40 @ =gLinkState
ldrb r2, [r1, #0x12]
cmp r2, #1
beq _08008AC4
@ -704,7 +704,7 @@ _08008AC4:
non_word_aligned_thumb_func_start sub_08008AC6
sub_08008AC6: @ 0x08008AC6
push {r0, lr}
ldr r1, _08008B48 @ =gUnk_03003F80
ldr r1, _08008B48 @ =gLinkState
movs r3, #0x26
ldrb r2, [r1, r3]
movs r3, #0xf
@ -774,9 +774,9 @@ sub_08008B2E: @ 0x08008B2E
.align 2, 0
_08008B38: .4byte 0x00000180
_08008B3C: .4byte 0xFFFFFE80
_08008B40: .4byte gUnk_03003F80
_08008B40: .4byte gLinkState
_08008B44: .4byte gUnk_080C9160
_08008B48: .4byte gUnk_03003F80
_08008B48: .4byte gLinkState
_08008B4C: .4byte gUnk_02000020
_08008B50: .4byte 0x00004000
_08008B54: .4byte gUnk_08007CAC

62
asm/code_08016DF8.s
View File

@ -166,7 +166,7 @@ sub_08016F28: @ 0x08016F28
ldrb r0, [r0]
cmp r0, #0
beq _08016F4C
ldr r0, _08016F48 @ =gUnk_03003F80
ldr r0, _08016F48 @ =gLinkState
ldr r1, [r0, #0x30]
movs r2, #0x80
lsls r2, r2, #7
@ -174,9 +174,9 @@ sub_08016F28: @ 0x08016F28
b _08016F54
.align 2, 0
_08016F44: .4byte gUnk_02002A40
_08016F48: .4byte gUnk_03003F80
_08016F48: .4byte gLinkState
_08016F4C:
ldr r0, _08016F98 @ =gUnk_03003F80
ldr r0, _08016F98 @ =gLinkState
ldr r1, [r0, #0x30]
ldr r2, _08016F9C @ =0xFFFFBFFF
ands r1, r2
@ -186,7 +186,7 @@ _08016F54:
bl sub_0805E3B0
cmp r0, #0
bne _08016FDC
ldr r5, _08016F98 @ =gUnk_03003F80
ldr r5, _08016F98 @ =gLinkState
ldr r0, [r5, #0x30]
movs r1, #0x80
lsls r1, r1, #0xc
@ -213,7 +213,7 @@ _08016F54:
strb r0, [r4, #0x10]
b _08016FB4
.align 2, 0
_08016F98: .4byte gUnk_03003F80
_08016F98: .4byte gLinkState
_08016F9C: .4byte 0xFFFFBFFF
_08016FA0: .4byte 0xFFF7FFFF
_08016FA4:
@ -286,7 +286,7 @@ sub_08016FF4: @ 0x08016FF4
movs r0, #0x86
bl PlaySFX
_0801702E:
ldr r4, _080170A8 @ =gUnk_03003F80
ldr r4, _080170A8 @ =gLinkState
ldr r0, [r4, #0x30]
ldr r1, _080170AC @ =0xFDFFFDFF
ands r0, r1
@ -320,7 +320,7 @@ _0801706E:
ldr r0, _080170B0 @ =gUnk_03003DF0
movs r4, #0
strb r4, [r0]
ldr r2, _080170A8 @ =gUnk_03003F80
ldr r2, _080170A8 @ =gLinkState
adds r1, r2, #0
adds r1, #0x27
ldrb r0, [r1]
@ -346,7 +346,7 @@ _08017084:
.align 2, 0
_080170A0: .4byte gUnk_0200AF00
_080170A4: .4byte gLinkEntity
_080170A8: .4byte gUnk_03003F80
_080170A8: .4byte gLinkState
_080170AC: .4byte 0xFDFFFDFF
_080170B0: .4byte gUnk_03003DF0
_080170B4:
@ -517,7 +517,7 @@ sub_080171F0: @ 0x080171F0
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
ldr r4, _080172DC @ =gUnk_03003F80
ldr r4, _080172DC @ =gLinkState
ldrb r0, [r4, #0x1a]
cmp r0, #0
beq _08017202
@ -634,7 +634,7 @@ _080172CC:
orrs r0, r1
b _080172FA
.align 2, 0
_080172DC: .4byte gUnk_03003F80
_080172DC: .4byte gLinkState
_080172E0: .4byte gLinkEntity
_080172E4: .4byte 0xFFFEFFFF
_080172E8: .4byte gUnk_0200AF00
@ -649,7 +649,7 @@ _080172FA:
ldr r4, _08017330 @ =gLinkEntity
adds r0, r4, #0
bl sub_0807A8D8
ldr r0, _08017334 @ =gUnk_03003F80
ldr r0, _08017334 @ =gLinkState
ldrb r1, [r0, #2]
movs r0, #0xc0
ands r0, r1
@ -673,7 +673,7 @@ _08017322:
.align 2, 0
_0801732C: .4byte 0xDFFFFFFF
_08017330: .4byte gLinkEntity
_08017334: .4byte gUnk_03003F80
_08017334: .4byte gLinkState
thumb_func_start sub_08017338
sub_08017338: @ 0x08017338
@ -1047,7 +1047,7 @@ _08017602:
cmp r0, #0
bne _08017638
ldr r1, _08017628 @ =gUnk_030059F0
ldr r0, _0801762C @ =gUnk_03003F80
ldr r0, _0801762C @ =gLinkState
adds r0, #0x8b
ldrb r0, [r0]
cmp r0, #0
@ -1063,7 +1063,7 @@ _08017602:
.align 2, 0
_08017624: .4byte gUnk_03003DC0
_08017628: .4byte gUnk_030059F0
_0801762C: .4byte gUnk_03003F80
_0801762C: .4byte gLinkState
_08017630: .4byte gLinkEntity
_08017634:
bl _call_via_r1
@ -1593,7 +1593,7 @@ sub_080179EC: @ 0x080179EC
adds r6, r0, #0
adds r5, r1, #0
ldr r4, _08017A8C @ =gUnk_080B3740
bl sub_08000E50
bl Random
movs r1, #3
ands r1, r0
adds r1, r1, r4
@ -1754,7 +1754,7 @@ sub_08017B1C: @ 0x08017B1C
push {lr}
adds r2, r0, #0
adds r3, r1, #0
ldr r0, _08017B38 @ =gUnk_03003F80
ldr r0, _08017B38 @ =gLinkState
ldrb r1, [r0, #0x1e]
movs r0, #0x60
ands r0, r1
@ -1766,7 +1766,7 @@ sub_08017B1C: @ 0x08017B1C
strb r0, [r3, #0x10]
b _08017B52
.align 2, 0
_08017B38: .4byte gUnk_03003F80
_08017B38: .4byte gLinkState
_08017B3C:
adds r1, r2, #0
adds r1, #0x42
@ -1800,7 +1800,7 @@ sub_08017B58: @ 0x08017B58
ldrb r1, [r2, #0x1d]
cmp r1, #0
beq _08017BA2
ldr r0, _08017B94 @ =gUnk_03003F80
ldr r0, _08017B94 @ =gLinkState
ldrb r0, [r0, #0x1d]
subs r0, r1, r0
movs r1, #0
@ -1816,7 +1816,7 @@ sub_08017B58: @ 0x08017B58
strh r1, [r0]
b _08017BA2
.align 2, 0
_08017B94: .4byte gUnk_03003F80
_08017B94: .4byte gLinkState
_08017B98:
strb r0, [r2, #0xd]
ldrb r0, [r3]
@ -1845,7 +1845,7 @@ sub_08017BBC: @ 0x08017BBC
adds r4, r0, #0
adds r6, r1, #0
adds r7, r2, #0
ldr r5, _08017C38 @ =gUnk_03003F80
ldr r5, _08017C38 @ =gLinkState
ldr r0, [r5, #0x30]
ldr r1, _08017C3C @ =0x00001481
ands r0, r1
@ -1903,7 +1903,7 @@ _08017C2E:
pop {r1}
bx r1
.align 2, 0
_08017C38: .4byte gUnk_03003F80
_08017C38: .4byte gLinkState
_08017C3C: .4byte 0x00001481
thumb_func_start sub_08017C40
@ -1911,7 +1911,7 @@ sub_08017C40: @ 0x08017C40
push {r4, r5, r6, lr}
adds r4, r0, #0
adds r5, r1, #0
ldr r6, _08017CB4 @ =gUnk_03003F80
ldr r6, _08017CB4 @ =gLinkState
ldr r0, [r6, #0x30]
ldr r1, _08017CB8 @ =0x00001881
ands r0, r1
@ -1968,7 +1968,7 @@ _08017CAA:
pop {r1}
bx r1
.align 2, 0
_08017CB4: .4byte gUnk_03003F80
_08017CB4: .4byte gLinkState
_08017CB8: .4byte 0x00001881
thumb_func_start sub_08017CBC
@ -2033,7 +2033,7 @@ _08017D1E:
sub_08017D28: @ 0x08017D28
push {lr}
adds r3, r0, #0
ldr r2, _08017D68 @ =gUnk_03003F80
ldr r2, _08017D68 @ =gLinkState
movs r0, #1
strb r0, [r2, #0x1a]
adds r2, r3, #0
@ -2064,7 +2064,7 @@ _08017D60:
pop {r1}
bx r1
.align 2, 0
_08017D68: .4byte gUnk_03003F80
_08017D68: .4byte gLinkState
thumb_func_start sub_08017D6C
sub_08017D6C: @ 0x08017D6C
@ -2158,7 +2158,7 @@ _08017DFE:
adds r2, #0x3d
movs r0, #0xf4
strb r0, [r2]
ldr r0, _08017E38 @ =gUnk_03003F80
ldr r0, _08017E38 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -2173,7 +2173,7 @@ _08017DFE:
b _08017E6E
.align 2, 0
_08017E34: .4byte gLinkEntity
_08017E38: .4byte gUnk_03003F80
_08017E38: .4byte gLinkState
_08017E3C:
adds r0, r5, #0
adds r0, #0x40
@ -2337,7 +2337,7 @@ sub_08017F40: @ 0x08017F40
bl sub_08079F8C
cmp r0, #0
beq _0801801E
ldr r2, _08017FB0 @ =gUnk_03003F80
ldr r2, _08017FB0 @ =gLinkState
ldr r3, [r2, #0x30]
movs r0, #0x80
ands r0, r3
@ -2378,7 +2378,7 @@ _08017F9A:
b _08017FC2
.align 2, 0
_08017FAC: .4byte gLinkEntity
_08017FB0: .4byte gUnk_03003F80
_08017FB0: .4byte gLinkState
_08017FB4:
movs r3, #0x80
lsls r3, r3, #9
@ -2626,7 +2626,7 @@ sub_08018168: @ 0x08018168
bl sub_08079F8C
cmp r0, #0
beq _0801821C
ldr r2, _080181F8 @ =gUnk_03003F80
ldr r2, _080181F8 @ =gLinkState
ldr r3, [r2, #0x30]
ldr r0, _080181FC @ =0x00040080
ands r0, r3
@ -2682,7 +2682,7 @@ sub_08018168: @ 0x08018168
b _0801821E
.align 2, 0
_080181F4: .4byte gLinkEntity
_080181F8: .4byte gUnk_03003F80
_080181F8: .4byte gLinkState
_080181FC: .4byte 0x00040080
_08018200:
adds r0, r4, #0

18
asm/code_08018500.s
View File

@ -163,7 +163,7 @@ _08018628: .4byte gUnk_080B3D20
thumb_func_start sub_0801862C
sub_0801862C: @ 0x0801862C
push {r4, r5, lr}
ldr r1, _0801864C @ =gUnk_03003F80
ldr r1, _0801864C @ =gLinkState
movs r2, #0
movs r0, #0x16
strb r0, [r1, #0xc]
@ -179,7 +179,7 @@ sub_0801862C: @ 0x0801862C
strh r0, [r5, #0x36]
b _0801868C
.align 2, 0
_0801864C: .4byte gUnk_03003F80
_0801864C: .4byte gLinkState
_08018650: .4byte gUnk_030010A0
_08018654: .4byte gUnk_02033AB8
_08018658:
@ -222,7 +222,7 @@ sub_08018690: @ 0x08018690
lsls r0, r4, #1
adds r5, r0, r6
_0801869E:
bl sub_08000E50
bl Random
adds r1, r4, #1
bl __modsi3
ldrh r2, [r5]
@ -1090,7 +1090,7 @@ sub_08018CBC: @ 0x08018CBC
_08018D50: .4byte gLinkEntity
_08018D54: .4byte gUnk_080B3E18
_08018D58:
ldr r7, _08018DDC @ =gUnk_03003F80
ldr r7, _08018DDC @ =gLinkState
ldrb r0, [r7, #0x1c]
cmp r0, #0
bne _08018D64
@ -1153,7 +1153,7 @@ _08018DD2:
bl sub_0801766C
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08018DDC: .4byte gUnk_03003F80
_08018DDC: .4byte gLinkState
_08018DE0: .4byte gUnk_080B3DE0
_08018DE4: .4byte gUnk_080B3DE8
@ -1171,11 +1171,11 @@ sub_08018DE8: @ 0x08018DE8
lsrs r1, r0, #0x18
cmp r1, #0
bne _08018E08
ldr r0, _08018E18 @ =gUnk_03003F80
ldr r0, _08018E18 @ =gLinkState
strb r1, [r0, #0x1c]
bl sub_0805E780
_08018E08:
ldr r0, _08018E18 @ =gUnk_03003F80
ldr r0, _08018E18 @ =gLinkState
ldrb r0, [r0, #0x1c]
cmp r0, #0
beq _08018E1C
@ -1183,7 +1183,7 @@ _08018E08:
beq _08018E24
b _08018E5A
.align 2, 0
_08018E18: .4byte gUnk_03003F80
_08018E18: .4byte gLinkState
_08018E1C:
adds r0, r4, #0
bl sub_08018F6C
@ -1303,7 +1303,7 @@ _08018EEE:
strb r0, [r1, #0x15]
ldr r1, [r4, #0x54]
adds r0, r4, #0
bl sub_0806FA24
bl CopyPosition
_08018F00:
ldrb r0, [r4, #0xb]
cmp r0, #0

176
asm/code_08019444.s
View File

@ -59,7 +59,7 @@ sub_08019498: @ 0x08019498
ldr r4, _08019504 @ =gLinkEntity
adds r0, r4, #0
adds r1, r5, #0
bl sub_0806FA24
bl CopyPosition
ldrb r0, [r5, #0xc]
adds r0, #1
movs r2, #0
@ -518,7 +518,7 @@ sub_08019840: @ 0x08019840
mov r7, sb
mov r6, r8
push {r6, r7}
ldr r0, _0801985C @ =gUnk_03003F80
ldr r0, _0801985C @ =gLinkState
adds r2, r0, #0
adds r2, #0xa8
ldrb r1, [r2]
@ -529,7 +529,7 @@ sub_08019840: @ 0x08019840
ldrb r0, [r0]
b _08019862
.align 2, 0
_0801985C: .4byte gUnk_03003F80
_0801985C: .4byte gLinkState
_08019860:
ldrb r0, [r2]
_08019862:
@ -838,7 +838,7 @@ _08019AA4:
adds r1, r3, #0
adds r0, r0, r1
strh r0, [r2]
ldr r2, _08019ADC @ =gUnk_03003F80
ldr r2, _08019ADC @ =gLinkState
ldr r1, [r2, #0x30]
movs r0, #0x80
ands r1, r0
@ -852,7 +852,7 @@ _08019AD0:
.align 2, 0
_08019AD4: .4byte 0x0000401B
_08019AD8: .4byte 0x00004030
_08019ADC: .4byte gUnk_03003F80
_08019ADC: .4byte gLinkState
_08019AE0:
ldr r0, _08019B04 @ =0x00004053
cmp r4, r0
@ -963,7 +963,7 @@ _08019B88:
ldr r4, _08019BB0 @ =0x00004001
adds r0, r0, r4
strh r0, [r1]
ldr r2, _08019BB4 @ =gUnk_03003F80
ldr r2, _08019BB4 @ =gLinkState
ldr r0, [r2, #0x30]
movs r1, #0x80
ands r0, r1
@ -976,9 +976,9 @@ _08019BAA:
b _0801A0FA
.align 2, 0
_08019BB0: .4byte 0x00004001
_08019BB4: .4byte gUnk_03003F80
_08019BB4: .4byte gLinkState
_08019BB8:
ldr r1, _08019C50 @ =gUnk_03003F80
ldr r1, _08019C50 @ =gLinkState
ldr r0, [r1, #0x30]
movs r2, #0x80
ands r0, r2
@ -1058,7 +1058,7 @@ _08019C38:
strh r0, [r5, #0x32]
b _08019C64
.align 2, 0
_08019C50: .4byte gUnk_03003F80
_08019C50: .4byte gLinkState
_08019C54: .4byte gUnk_080B4478
_08019C58: .4byte gRoomControls
_08019C5C:
@ -1091,7 +1091,7 @@ _08019C80:
adds r0, r0, r4
movs r3, #0
strh r0, [r1]
ldr r1, _08019CBC @ =gUnk_03003F80
ldr r1, _08019CBC @ =gLinkState
movs r0, #0xa0
strb r0, [r1, #6]
movs r0, #5
@ -1110,9 +1110,9 @@ _08019C80:
b _0801A2A6
.align 2, 0
_08019CB8: .4byte 0x0000401C
_08019CBC: .4byte gUnk_03003F80
_08019CBC: .4byte gLinkState
_08019CC0:
ldr r0, _08019CF8 @ =gUnk_03003F80
ldr r0, _08019CF8 @ =gLinkState
adds r2, r0, #0
adds r2, #0x35
ldrb r1, [r2]
@ -1143,9 +1143,9 @@ _08019CF4:
movs r0, #1
b _0801A2A6
.align 2, 0
_08019CF8: .4byte gUnk_03003F80
_08019CF8: .4byte gLinkState
_08019CFC:
ldr r2, _08019D40 @ =gUnk_03003F80
ldr r2, _08019D40 @ =gLinkState
ldr r0, [r2, #0x30]
movs r1, #0x80
ands r0, r1
@ -1182,14 +1182,14 @@ _08019D2C:
movs r0, #1
b _0801A2A6
.align 2, 0
_08019D40: .4byte gUnk_03003F80
_08019D40: .4byte gLinkState
_08019D44: .4byte gUnk_0200AF00
_08019D48:
cmp r3, #0
beq _08019D4E
b _0801A2A4
_08019D4E:
ldr r2, _08019D8C @ =gUnk_03003F80
ldr r2, _08019D8C @ =gLinkState
ldr r0, [r2, #0x30]
movs r1, #0x81
lsls r1, r1, #7
@ -1221,7 +1221,7 @@ _08019D76:
movs r0, #2
b _0801A2A6
.align 2, 0
_08019D8C: .4byte gUnk_03003F80
_08019D8C: .4byte gLinkState
_08019D90: .4byte gUnk_0200AF00
_08019D94:
bl sub_08052734
@ -1233,7 +1233,7 @@ _08019D9E:
adds r0, #0x2d
movs r1, #6
strb r1, [r0]
ldr r2, _08019DD0 @ =gUnk_03003F80
ldr r2, _08019DD0 @ =gLinkState
adds r0, r2, #0
adds r0, #0x92
ldrh r1, [r0]
@ -1254,9 +1254,9 @@ _08019DB8:
b _0801A2A6
.align 2, 0
_08019DCC: .4byte gUnk_0200AF00
_08019DD0: .4byte gUnk_03003F80
_08019DD0: .4byte gLinkState
_08019DD4:
ldr r4, _08019E3C @ =gUnk_03003F80
ldr r4, _08019E3C @ =gLinkState
ldr r0, [r4, #0x30]
movs r1, #0x80
lsls r1, r1, #7
@ -1313,7 +1313,7 @@ _08019E18:
movs r0, #1
b _0801A2A6
.align 2, 0
_08019E3C: .4byte gUnk_03003F80
_08019E3C: .4byte gLinkState
_08019E40: .4byte gLinkEntity
_08019E44:
mov r0, r8
@ -1358,7 +1358,7 @@ _08019E84:
strh r1, [r0]
mov sb, r2
_08019E98:
ldr r2, _08019EC4 @ =gUnk_03003F80
ldr r2, _08019EC4 @ =gLinkState
movs r3, #0
movs r0, #0xa0
strb r0, [r2, #6]
@ -1379,7 +1379,7 @@ _08019E98:
.align 2, 0
_08019EBC: .4byte gLinkEntity
_08019EC0: .4byte 0x0000400C
_08019EC4: .4byte gUnk_03003F80
_08019EC4: .4byte gLinkState
_08019EC8:
mov r0, r8
adds r1, r7, #0
@ -1399,7 +1399,7 @@ _08019ED8:
adds r0, r0, r2
movs r3, #0
strh r0, [r1]
ldr r2, _08019F08 @ =gUnk_03003F80
ldr r2, _08019F08 @ =gLinkState
movs r0, #0x98
strb r0, [r2, #6]
movs r0, #5
@ -1413,7 +1413,7 @@ _08019ED8:
b _0801A228
.align 2, 0
_08019F04: .4byte 0x0000405B
_08019F08: .4byte gUnk_03003F80
_08019F08: .4byte gLinkState
_08019F0C:
mov r0, r8
adds r1, r7, #0
@ -1433,7 +1433,7 @@ _08019F1C:
adds r0, r0, r3
movs r3, #0
strh r0, [r1]
ldr r2, _08019F4C @ =gUnk_03003F80
ldr r2, _08019F4C @ =gLinkState
movs r0, #0xa0
strb r0, [r2, #6]
movs r0, #5
@ -1447,13 +1447,13 @@ _08019F1C:
b _0801A228
.align 2, 0
_08019F48: .4byte 0x00004037
_08019F4C: .4byte gUnk_03003F80
_08019F4C: .4byte gLinkState
_08019F50:
cmp r3, #0
beq _08019F56
b _0801A2A4
_08019F56:
ldr r2, _08019FA0 @ =gUnk_03003F80
ldr r2, _08019FA0 @ =gLinkState
adds r0, r2, #0
adds r0, #0x35
ldrb r0, [r0]
@ -1492,10 +1492,10 @@ _08019F7C:
strh r3, [r5, #0x30]
b _0801A228
.align 2, 0
_08019FA0: .4byte gUnk_03003F80
_08019FA0: .4byte gLinkState
_08019FA4: .4byte 0x0000403F
_08019FA8:
ldr r0, _0801A07C @ =gUnk_03003F80
ldr r0, _0801A07C @ =gLinkState
adds r0, #0x35
ldrb r1, [r0]
movs r0, #0x80
@ -1592,7 +1592,7 @@ _0801A02A:
adds r0, r5, #0
adds r0, #0x38
strb r1, [r0]
ldr r2, _0801A07C @ =gUnk_03003F80
ldr r2, _0801A07C @ =gLinkState
movs r0, #0xa0
strb r0, [r2, #6]
movs r0, #5
@ -1606,7 +1606,7 @@ _0801A02A:
ldrb r0, [r5, #0x15]
b _0801A0B6
.align 2, 0
_0801A07C: .4byte gUnk_03003F80
_0801A07C: .4byte gLinkState
_0801A080: .4byte 0x0000FFFF
_0801A084: .4byte 0x00000FFF
_0801A088: .4byte gUnk_03004040
@ -1654,7 +1654,7 @@ _0801A0CC:
ldr r4, _0801A0F0 @ =0x0000404B
adds r0, r0, r4
strh r0, [r1]
ldr r2, _0801A0F4 @ =gUnk_03003F80
ldr r2, _0801A0F4 @ =gLinkState
ldr r0, [r2, #0x30]
movs r1, #0x80
ands r0, r1
@ -1665,7 +1665,7 @@ _0801A0CC:
b _0801A0FA
.align 2, 0
_0801A0F0: .4byte 0x0000404B
_0801A0F4: .4byte gUnk_03003F80
_0801A0F4: .4byte gLinkState
_0801A0F8:
movs r0, #0xa0
_0801A0FA:
@ -1688,7 +1688,7 @@ _0801A0FA:
.align 2, 0
_0801A11C: .4byte gLinkEntity
_0801A120:
ldr r0, _0801A134 @ =gUnk_03003F80
ldr r0, _0801A134 @ =gLinkState
adds r0, #0x35
ldrb r0, [r0]
cmp r0, #0
@ -1699,10 +1699,10 @@ _0801A12C:
adds r1, r5, #0
b _0801A28C
.align 2, 0
_0801A134: .4byte gUnk_03003F80
_0801A134: .4byte gLinkState
_0801A138: .4byte 0x00004054
_0801A13C:
ldr r0, _0801A150 @ =gUnk_03003F80
ldr r0, _0801A150 @ =gLinkState
adds r0, #0x35
ldrb r0, [r0]
cmp r0, #6
@ -1713,12 +1713,12 @@ _0801A148:
adds r1, r5, #0
b _0801A28C
.align 2, 0
_0801A150: .4byte gUnk_03003F80
_0801A150: .4byte gLinkState
_0801A154: .4byte 0x00004054
_0801A158:
subs r7, #1
_0801A15A:
ldr r0, _0801A190 @ =gUnk_03003F80
ldr r0, _0801A190 @ =gLinkState
adds r0, #0x35
ldrb r0, [r0]
cmp r0, #0
@ -1749,12 +1749,12 @@ _0801A186:
bls _0801A178
b _0801A2A4
.align 2, 0
_0801A190: .4byte gUnk_03003F80
_0801A190: .4byte gLinkState
_0801A194: .4byte gUnk_03004040
_0801A198:
subs r7, #0x40
_0801A19A:
ldr r0, _0801A1CC @ =gUnk_03003F80
ldr r0, _0801A1CC @ =gLinkState
adds r0, #0x35
ldrb r0, [r0]
cmp r0, #6
@ -1781,14 +1781,14 @@ _0801A1B6:
bls _0801A1B6
b _0801A2A4
.align 2, 0
_0801A1CC: .4byte gUnk_03003F80
_0801A1CC: .4byte gLinkState
_0801A1D0: .4byte gUnk_03004040
_0801A1D4:
movs r0, #2
ands r0, r1
cmp r0, #0
beq _0801A2A4
ldr r6, _0801A234 @ =gUnk_03003F80
ldr r6, _0801A234 @ =gLinkState
adds r0, r6, #0
adds r0, #0x35
ldrb r0, [r0]
@ -1832,12 +1832,12 @@ _0801A228:
movs r0, #1
b _0801A2A6
.align 2, 0
_0801A234: .4byte gUnk_03003F80
_0801A234: .4byte gLinkState
_0801A238: .4byte 0x00004074
_0801A23C:
cmp r3, #4
bne _0801A2A4
ldr r1, _0801A280 @ =gUnk_03003F80
ldr r1, _0801A280 @ =gLinkState
adds r0, r1, #0
adds r0, #0x35
ldrb r0, [r0]
@ -1867,7 +1867,7 @@ _0801A23C:
movs r0, #1
b _0801A2A6
.align 2, 0
_0801A280: .4byte gUnk_03003F80
_0801A280: .4byte gLinkState
_0801A284: .4byte 0x00004074
_0801A288:
ldr r0, _0801A29C @ =0x00004059
@ -1904,7 +1904,7 @@ sub_0801A2B0: @ 0x0801A2B0
lsls r0, r0, #1
adds r0, r0, r1
ldrh r3, [r0]
ldr r1, _0801A324 @ =gUnk_03003F80
ldr r1, _0801A324 @ =gLinkState
adds r0, r1, #0
adds r0, #0x35
ldrb r0, [r0]
@ -1947,7 +1947,7 @@ sub_0801A2B0: @ 0x0801A2B0
.align 2, 0
_0801A31C: .4byte gUnk_080B4488
_0801A320: .4byte gLinkEntity
_0801A324: .4byte gUnk_03003F80
_0801A324: .4byte gLinkState
_0801A328:
cmp r1, #0x74
beq _0801A36C
@ -2192,7 +2192,7 @@ _0801A4F2:
thumb_func_start sub_0801A4F8
sub_0801A4F8: @ 0x0801A4F8
push {r4, r5, lr}
ldr r4, _0801A538 @ =gUnk_03003F80
ldr r4, _0801A538 @ =gLinkState
ldr r0, [r4, #0x30]
movs r5, #0x80
ands r0, r5
@ -2222,7 +2222,7 @@ sub_0801A4F8: @ 0x0801A4F8
ldrh r0, [r2, #0x2a]
b _0801A55E
.align 2, 0
_0801A538: .4byte gUnk_03003F80
_0801A538: .4byte gLinkState
_0801A53C: .4byte gLinkEntity
_0801A540: .4byte gUnk_080B44A0
_0801A544:
@ -2974,7 +2974,7 @@ _0801AA94:
adds r0, r4, #0
adds r0, #0x38
strb r1, [r0]
ldr r2, _0801AAFC @ =gUnk_03003F80
ldr r2, _0801AAFC @ =gLinkState
movs r0, #0xa0
strb r0, [r2, #6]
movs r0, #5
@ -2992,7 +2992,7 @@ _0801AA94:
_0801AAF0: .4byte gUnk_080B4488
_0801AAF4: .4byte 0x00002004
_0801AAF8: .4byte gRoomControls
_0801AAFC: .4byte gUnk_03003F80
_0801AAFC: .4byte gLinkState
_0801AB00:
movs r0, #0
_0801AB02:
@ -3771,7 +3771,7 @@ sub_0801B0C4: @ 0x0801B0C4
ldr r0, [r4]
cmp r0, #0
bge _0801B0E6
bl sub_08000E50
bl Random
ldr r1, _0801B0E8 @ =gUnk_080B4550
ldrb r2, [r4]
lsls r2, r2, #2
@ -3936,7 +3936,7 @@ _0801B1E4:
ldrb r0, [r4, #0xd]
cmp r0, #1
bne _0801B204
ldr r0, _0801B244 @ =gUnk_03003F80
ldr r0, _0801B244 @ =gLinkState
strb r1, [r0, #5]
_0801B204:
movs r0, #3
@ -3963,12 +3963,12 @@ _0801B204:
movs r1, #0x20
movs r2, #0
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
adds r0, r4, #0
bl sub_0801B418
b _0801B24E
.align 2, 0
_0801B244: .4byte gUnk_03003F80
_0801B244: .4byte gLinkState
_0801B248:
adds r0, r4, #0
bl sub_0801B3A4
@ -4071,7 +4071,7 @@ _0801B2F6:
_0801B2FA:
movs r5, #0
_0801B2FC:
ldr r0, _0801B314 @ =gUnk_03003F80
ldr r0, _0801B314 @ =gLinkState
adds r0, #0x92
ldrh r0, [r0]
ands r5, r0
@ -4084,7 +4084,7 @@ _0801B2FC:
_0801B310:
pop {r4, r5, pc}
.align 2, 0
_0801B314: .4byte gUnk_03003F80
_0801B314: .4byte gLinkState
thumb_func_start sub_0801B318
sub_0801B318: @ 0x0801B318
@ -4338,7 +4338,7 @@ _0801B4C4: .4byte 0xFFFFE000
sub_0801B4C8: @ 0x0801B4C8
push {r4, r5, lr}
adds r4, r0, #0
ldr r3, _0801B52C @ =gUnk_03003F80
ldr r3, _0801B52C @ =gLinkState
str r4, [r3, #0x2c]
movs r2, #0
movs r0, #1
@ -4388,7 +4388,7 @@ _0801B518:
movs r0, #0x3c
b _0801B540
.align 2, 0
_0801B52C: .4byte gUnk_03003F80
_0801B52C: .4byte gLinkState
_0801B530: .4byte gUnk_081271CC
_0801B534: .4byte gLinkEntity
_0801B538:
@ -4437,7 +4437,7 @@ sub_0801B584: @ 0x0801B584
push {r4, r5, r6, r7, lr}
adds r6, r0, #0
bl sub_0801B804
ldr r1, _0801B5F8 @ =gUnk_03003F80
ldr r1, _0801B5F8 @ =gLinkState
ldrb r0, [r1, #4]
cmp r0, #0
beq _0801B5A8
@ -4452,7 +4452,7 @@ sub_0801B584: @ 0x0801B584
cmp r0, #1
beq _0801B5B8
_0801B5A8:
ldr r1, _0801B5F8 @ =gUnk_03003F80
ldr r1, _0801B5F8 @ =gLinkState
ldr r0, [r1, #0x2c]
cmp r0, r6
bne _0801B5B4
@ -4494,7 +4494,7 @@ _0801B5EE:
bl sub_08078E84
b _0801B674
.align 2, 0
_0801B5F8: .4byte gUnk_03003F80
_0801B5F8: .4byte gLinkState
_0801B5FC: .4byte gLinkEntity
_0801B600:
movs r5, #0
@ -4549,7 +4549,7 @@ _0801B600:
adds r0, r6, #0
movs r1, #0
bl sub_08004260
ldr r0, _0801B67C @ =gUnk_03003F80
ldr r0, _0801B67C @ =gLinkState
str r5, [r0, #0x2c]
ldrb r1, [r0, #4]
orrs r4, r1
@ -4558,7 +4558,7 @@ _0801B674:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0801B678: .4byte gUnk_080B7826
_0801B67C: .4byte gUnk_03003F80
_0801B67C: .4byte gLinkState
thumb_func_start sub_0801B680
sub_0801B680: @ 0x0801B680
@ -4575,7 +4575,7 @@ sub_0801B680: @ 0x0801B680
ldrb r0, [r0]
cmp r0, #0
bne _0801B6DC
ldr r3, _0801B6C4 @ =gUnk_03003F80
ldr r3, _0801B6C4 @ =gLinkState
ldrb r1, [r3, #0xd]
movs r0, #0x80
ands r0, r1
@ -4596,7 +4596,7 @@ sub_0801B680: @ 0x0801B680
adds r0, #0x40
b _0801B6D0
.align 2, 0
_0801B6C4: .4byte gUnk_03003F80
_0801B6C4: .4byte gLinkState
_0801B6C8:
adds r1, r4, #0
adds r1, #0x82
@ -4782,7 +4782,7 @@ _0801B820:
_0801B824:
movs r4, #0
_0801B826:
ldr r3, _0801B850 @ =gUnk_03003F80
ldr r3, _0801B850 @ =gLinkState
adds r0, r3, #0
adds r0, #0x90
ldrh r0, [r0]
@ -4803,7 +4803,7 @@ _0801B826:
strb r1, [r3, #0xb]
b _0801B862
.align 2, 0
_0801B850: .4byte gUnk_03003F80
_0801B850: .4byte gLinkState
_0801B854:
ldrb r1, [r3, #0xa]
movs r0, #0x80
@ -4860,7 +4860,7 @@ _0801B8AC: .4byte gUnk_080B7840
sub_0801B8B0: @ 0x0801B8B0
push {r4, lr}
adds r4, r0, #0
ldr r1, _0801B8F0 @ =gUnk_03003F80
ldr r1, _0801B8F0 @ =gLinkState
ldrb r0, [r1, #0x1e]
cmp r0, #0
beq _0801B8F4
@ -4887,7 +4887,7 @@ sub_0801B8B0: @ 0x0801B8B0
bl sub_0801B8FC
b _0801B8F8
.align 2, 0
_0801B8F0: .4byte gUnk_03003F80
_0801B8F0: .4byte gLinkState
_0801B8F4:
bl sub_0805E780
_0801B8F8:
@ -4897,14 +4897,14 @@ _0801B8F8:
thumb_func_start sub_0801B8FC
sub_0801B8FC: @ 0x0801B8FC
push {lr}
ldr r1, _0801B90C @ =gUnk_03003F80
ldr r1, _0801B90C @ =gLinkState
ldr r2, [r1, #0x2c]
cmp r2, r0
beq _0801B910
bl sub_0805E780
b _0801B934
.align 2, 0
_0801B90C: .4byte gUnk_03003F80
_0801B90C: .4byte gLinkState
_0801B910:
ldrb r0, [r1, #0x1e]
cmp r0, #0
@ -4991,7 +4991,7 @@ _0801B9A0:
lsls r3, r3, #1
ldr r0, _0801B9E4 @ =gUnk_080B7848
adds r3, r3, r0
ldr r0, _0801B9E8 @ =gUnk_03003F80
ldr r0, _0801B9E8 @ =gLinkState
adds r0, #0xac
ldrh r0, [r0]
movs r1, #8
@ -5014,7 +5014,7 @@ _0801B9A0:
.align 2, 0
_0801B9E0: .4byte gUnk_080B7850
_0801B9E4: .4byte gUnk_080B7848
_0801B9E8: .4byte gUnk_03003F80
_0801B9E8: .4byte gLinkState
_0801B9EC: .4byte gLinkEntity
thumb_func_start sub_0801B9F0
@ -5150,7 +5150,7 @@ _0801BB0A:
strb r0, [r4, #0xc]
movs r0, #0xff
strb r0, [r4, #0x1e]
ldr r0, _0801BB28 @ =gUnk_03003F80
ldr r0, _0801BB28 @ =gLinkState
str r4, [r0, #0x2c]
adds r0, r4, #0
movs r1, #1
@ -5161,13 +5161,13 @@ _0801BB0A:
_0801BB26:
pop {r4, pc}
.align 2, 0
_0801BB28: .4byte gUnk_03003F80
_0801BB28: .4byte gLinkState
thumb_func_start sub_0801BB2C
sub_0801BB2C: @ 0x0801BB2C
push {r4, r5, lr}
adds r5, r0, #0
ldr r0, _0801BB88 @ =gUnk_03003F80
ldr r0, _0801BB88 @ =gLinkState
ldr r0, [r0, #0x2c]
cmp r0, r5
beq _0801BB68
@ -5208,7 +5208,7 @@ _0801BB68:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0801BB88: .4byte gUnk_03003F80
_0801BB88: .4byte gLinkState
_0801BB8C: .4byte 0x00000109
_0801BB90: .4byte gLinkEntity
_0801BB94: .4byte _0801BB98
@ -5384,21 +5384,21 @@ _0801BD24:
movs r1, #0x68
movs r2, #0
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
b _0801BD6C
_0801BD32:
adds r0, r4, #0
movs r1, #0x68
movs r2, #1
movs r3, #1
bl sub_080A2988
bl CreateObjectWithParent
b _0801BD6C
_0801BD40:
adds r0, r4, #0
movs r1, #0x68
movs r2, #2
movs r3, #2
bl sub_080A2988
bl CreateObjectWithParent
movs r0, #0x20
bl ModHealth
b _0801BD6C
@ -5437,14 +5437,14 @@ _0801BD94:
movs r1, #0x68
movs r2, #0
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
b _0801BDAE
_0801BDA2:
adds r0, r4, #0
movs r1, #0x68
movs r2, #1
movs r3, #1
bl sub_080A2988
bl CreateObjectWithParent
_0801BDAE:
ldr r0, _0801BDC8 @ =gLinkEntity
adds r0, #0x5a
@ -5466,14 +5466,14 @@ _0801BDCC:
movs r1, #0x68
movs r2, #0
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
b _0801BDE6
_0801BDDA:
adds r0, r4, #0
movs r1, #0x68
movs r2, #1
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
_0801BDE6:
pop {r4, r5, pc}
@ -5677,7 +5677,7 @@ sub_0801BEF8: @ 0x0801BEF8
adds r0, #1
strb r0, [r1, #0xc]
_0801BF62:
ldr r2, _0801BFFC @ =gUnk_03003F80
ldr r2, _0801BFFC @ =gLinkState
mov sb, r2
ldrb r1, [r2, #0x1a]
movs r0, #0x80
@ -5752,7 +5752,7 @@ _0801BFDA:
_0801BFF0: .4byte gLinkEntity
_0801BFF4: .4byte gUnk_080B7B6C
_0801BFF8: .4byte gRoomControls
_0801BFFC: .4byte gUnk_03003F80
_0801BFFC: .4byte gLinkState
_0801C000: .4byte gUnk_03000FF0
_0801C004:
ldrh r2, [r6, #2]

18
asm/code_0801C85C.s
View File

@ -16,7 +16,7 @@ sub_0801C85C: @ 0x0801C85C
ands r0, r1
cmp r0, #0
bne _0801C878
ldr r0, _0801C888 @ =gUnk_03003F80
ldr r0, _0801C888 @ =gLinkState
adds r0, #0xa0
ldrb r1, [r0]
rsbs r0, r1, #0
@ -29,7 +29,7 @@ _0801C878:
b _0801C984
.align 2, 0
_0801C884: .4byte gUnk_0200AF00
_0801C888: .4byte gUnk_03003F80
_0801C888: .4byte gLinkState
_0801C88C:
ldrb r0, [r5, #4]
ldr r4, _0801C92C @ =gUnk_02034D30
@ -37,7 +37,7 @@ _0801C88C:
bls _0801C896
adds r4, #0x40
_0801C896:
ldr r0, _0801C930 @ =gUnk_03003F80
ldr r0, _0801C930 @ =gLinkState
adds r0, #0xa4
movs r1, #0
ldrsh r0, [r0, r1]
@ -100,7 +100,7 @@ _0801C90C:
ldr r0, _0801C94C @ =gLCDControls
strh r6, [r0, #0xe]
_0801C910:
ldr r0, _0801C930 @ =gUnk_03003F80
ldr r0, _0801C930 @ =gLinkState
adds r0, #0xa0
ldrb r0, [r0]
cmp r0, #5
@ -116,7 +116,7 @@ _0801C910:
b _0801C956
.align 2, 0
_0801C92C: .4byte gUnk_02034D30
_0801C930: .4byte gUnk_03003F80
_0801C930: .4byte gLinkState
_0801C934: .4byte 0x0000F016
_0801C938: .4byte 0x0000F416
_0801C93C: .4byte 0x040000D4
@ -658,15 +658,15 @@ _0801CD28:
adds r0, #0x80
strb r0, [r3]
_0801CD3C:
ldr r1, _0801CD48 @ =gUnk_080FD5A0
ldr r1, _0801CD48 @ =gBombBagSizes
adds r0, r5, #0
adds r0, #0xae
b _0801CD52
.align 2, 0
_0801CD44: .4byte gUnk_02002A40
_0801CD48: .4byte gUnk_080FD5A0
_0801CD48: .4byte gBombBagSizes
_0801CD4C:
ldr r1, _0801CD5C @ =gUnk_080FD5A4
ldr r1, _0801CD5C @ =gQuiverSizes
adds r0, r5, #0
adds r0, #0xaf
_0801CD52:
@ -675,7 +675,7 @@ _0801CD52:
ldrb r0, [r0]
b _0801CD64
.align 2, 0
_0801CD5C: .4byte gUnk_080FD5A4
_0801CD5C: .4byte gQuiverSizes
_0801CD60:
movs r0, #1
movs r2, #0

174
asm/code_0801D79C.s
View File

@ -2515,7 +2515,7 @@ _0801EA34:
adds r0, r1, r2
add r0, r8
strb r6, [r0]
bl sub_08000E50
bl Random
ldrb r4, [r7, #1]
movs r1, #0x64
bl __modsi3
@ -2542,7 +2542,7 @@ _0801EA6E:
thumb_func_start sub_0801EA74
sub_0801EA74: @ 0x0801EA74
push {r4, r5, r6, lr}
bl sub_08000E50
bl Random
movs r1, #0x12
bl __modsi3
adds r5, r0, #0
@ -2741,7 +2741,7 @@ sub_0801EBC8: @ 0x0801EBC8
ldrb r0, [r4, #0xa]
cmp r0, #2
beq _0801EBDE
bl sub_08000E50
bl Random
movs r1, #3
ands r0, r1
_0801EBDE:
@ -2767,7 +2767,7 @@ sub_0801EBF4: @ 0x0801EBF4
bne _0801EC1E
movs r0, #2
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
ldr r2, _0801EC28 @ =gUnk_080CA170
movs r1, #3
ands r1, r0
@ -2804,7 +2804,7 @@ sub_0801EC2C: @ 0x0801EC2C
ldrb r0, [r5, #0xa]
adds r0, r0, r1
ldrb r4, [r0]
bl sub_08000E50
bl Random
movs r1, #3
ands r0, r1
cmp r4, r0
@ -2889,7 +2889,7 @@ sub_0801ECFC: @ 0x0801ECFC
adds r4, r0, #0
movs r0, #1
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
movs r1, #0x38
ands r0, r1
adds r0, #0x18
@ -2911,7 +2911,7 @@ sub_0801ED14: @ 0x0801ED14
ldrb r0, [r5, #0xa]
cmp r0, #1
bne _0801ED46
bl sub_08000E50
bl Random
movs r1, #3
ands r1, r0
cmp r1, #0
@ -2922,10 +2922,10 @@ sub_0801ED14: @ 0x0801ED14
cmp r0, #0
bne _0801EDC4
_0801ED46:
bl sub_08000E50
bl Random
b _0801EDD0
_0801ED4C:
bl sub_08000E50
bl Random
movs r1, #3
ands r1, r0
cmp r1, #0
@ -2933,7 +2933,7 @@ _0801ED4C:
adds r0, r5, #0
bl sub_08049EE4
adds r4, r0, #0
bl sub_08000E50
bl Random
ldr r2, _0801ED74 @ =gUnk_080CA17E
movs r1, #1
ands r1, r0
@ -2944,7 +2944,7 @@ _0801ED4C:
.align 2, 0
_0801ED74: .4byte gUnk_080CA17E
_0801ED78:
bl sub_08000E50
bl Random
b _0801EDD0
_0801ED7E:
adds r0, r5, #0
@ -2956,10 +2956,10 @@ _0801ED7E:
bl sub_08049FA0
cmp r0, #0
beq _0801ED9A
bl sub_08000E50
bl Random
b _0801EDD0
_0801ED9A:
bl sub_08000E50
bl Random
movs r1, #3
ands r1, r0
cmp r1, #0
@ -2967,7 +2967,7 @@ _0801ED9A:
adds r0, r5, #0
bl sub_08049EE4
adds r4, r0, #0
bl sub_08000E50
bl Random
ldr r2, _0801EDC0 @ =gUnk_080CA17E
movs r1, #1
ands r1, r0
@ -3395,11 +3395,11 @@ sub_0801F0C8: @ 0x0801F0C8
movs r4, #3
movs r0, #3
strb r0, [r5, #0xc]
bl sub_08000E50
bl Random
ands r0, r4
adds r0, #0xc
strb r0, [r5, #0xe]
bl sub_08000E50
bl Random
strb r0, [r5, #0xf]
adds r0, r5, #0
movs r1, #1
@ -3480,7 +3480,7 @@ _0801F18A:
bl sub_08049F64
cmp r0, #0
beq _0801F1A6
bl sub_08000E50
bl Random
movs r1, #3
ands r0, r1
adds r0, #0xc
@ -3726,12 +3726,12 @@ sub_0801F360: @ 0x0801F360
adds r4, r0, #0
movs r0, #7
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
movs r1, #0x38
ands r0, r1
adds r0, #0xb4
strb r0, [r4, #0xe]
bl sub_08000E50
bl Random
strb r0, [r4, #0xf]
adds r0, r4, #0
movs r1, #1
@ -3831,7 +3831,7 @@ sub_0801F428: @ 0x0801F428
movs r4, #0
movs r0, #1
strb r0, [r5, #0xc]
bl sub_08000E50
bl Random
strb r0, [r5, #0xe]
adds r0, r5, #0
adds r0, #0x45
@ -3970,7 +3970,7 @@ _0801F51C:
bl sub_08049F64
cmp r0, #0
beq _0801F566
bl sub_08000E50
bl Random
movs r1, #1
ands r1, r0
cmp r1, #0
@ -4325,7 +4325,7 @@ sub_0801F7D8: @ 0x0801F7D8
movs r5, #0
movs r0, #1
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
strb r0, [r4, #0xe]
adds r0, r4, #0
adds r0, #0x45
@ -4969,7 +4969,7 @@ sub_0801FC9C: @ 0x0801FC9C
bl sub_0804A720
movs r0, #1
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
strb r0, [r4, #0xe]
pop {r4, pc}
@ -4983,7 +4983,7 @@ sub_0801FCB0: @ 0x0801FCB0
lsls r0, r0, #0x18
cmp r0, #0
bne _0801FD28
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r1, r0
adds r0, r5, #0
@ -5003,7 +5003,7 @@ sub_0801FCB0: @ 0x0801FCB0
adds r0, r5, #0
bl sub_080045C4
adds r4, r0, #0
bl sub_08000E50
bl Random
ldr r2, _0801FD18 @ =gUnk_080CA4C8
movs r1, #1
ands r1, r0
@ -5023,7 +5023,7 @@ sub_0801FCB0: @ 0x0801FCB0
_0801FD14: .4byte gUnk_020000B0
_0801FD18: .4byte gUnk_080CA4C8
_0801FD1C:
bl sub_08000E50
bl Random
movs r1, #0x18
ands r0, r1
adds r0, #8
@ -5414,7 +5414,7 @@ sub_0801FFDC: @ 0x0801FFDC
beq _08020010
adds r0, r4, #0
adds r1, r5, #0
bl sub_0806FA24
bl CopyPosition
ldrh r0, [r5, #0x36]
subs r0, #8
strh r0, [r5, #0x36]
@ -5594,15 +5594,15 @@ sub_08020130: @ 0x08020130
strb r5, [r4, #0xc]
movs r0, #0x10
strb r0, [r4, #0xe]
bl sub_08000E50
bl Random
strb r0, [r4, #0xf]
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
strb r0, [r4, #0x15]
movs r0, #0x12
strb r0, [r4, #0x1c]
bl sub_08000E50
bl Random
ands r0, r5
movs r1, #0xfe
cmp r0, #0
@ -5658,7 +5658,7 @@ _08020192:
beq _080201D4
movs r0, #2
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
movs r1, #3
ands r0, r1
strb r0, [r4, #0xd]
@ -5677,12 +5677,12 @@ _080201D4:
strb r0, [r4, #0xe]
adds r0, r4, #0
bl sub_08020604
bl sub_08000E50
bl Random
movs r1, #3
ands r1, r0
cmp r1, #0
bne _0802020C
bl sub_08000E50
bl Random
movs r1, #1
ands r1, r0
movs r2, #0xfe
@ -5736,7 +5736,7 @@ _0802024C:
adds r0, r5, #0
bl sub_080045C4
adds r4, r0, #0
bl sub_08000E50
bl Random
ldr r2, _08020280 @ =gUnk_080CA5D4
movs r1, #1
ands r1, r0
@ -5947,7 +5947,7 @@ _080203F2:
movs r0, #0xc0
lsls r0, r0, #9
str r0, [r4, #0x20]
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
strb r0, [r4, #0x15]
@ -5993,7 +5993,7 @@ _0802044E:
strb r0, [r4, #0xc]
movs r0, #0xf0
strb r0, [r4, #0xe]
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
strb r0, [r4, #0x15]
@ -6045,7 +6045,7 @@ _080204A6:
movs r0, #0xfd
ands r0, r1
strb r0, [r5]
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
strb r0, [r4, #0x15]
@ -6145,7 +6145,7 @@ sub_0802053C: @ 0x0802053C
strb r2, [r4, #0x18]
movs r0, #0x20
strh r0, [r4, #0x24]
bl sub_08000E50
bl Random
movs r1, #0x10
ands r0, r1
adds r0, #8
@ -6199,7 +6199,7 @@ _080205C8:
bne _080205F2
movs r0, #0x28
strb r0, [r4, #0xf]
bl sub_08000E50
bl Random
movs r1, #0x10
ands r0, r1
adds r0, #8
@ -6225,7 +6225,7 @@ sub_08020604: @ 0x08020604
bl sub_08049FA0
cmp r0, #0
bne _08020624
bl sub_08000E50
bl Random
movs r1, #3
ands r1, r0
cmp r1, #0
@ -6502,7 +6502,7 @@ sub_080207F4: @ 0x080207F4
adds r0, r4, #0
adds r0, #0x84
strb r1, [r0]
bl sub_08000E50
bl Random
movs r1, #0x18
ands r0, r1
strb r0, [r4, #0x15]
@ -6810,7 +6810,7 @@ sub_08020A30: @ 0x08020A30
ldrb r0, [r5]
cmp r0, #1
bhi _08020A68
bl sub_08000E50
bl Random
ldr r2, _08020A64 @ =gUnk_080CA6CC
movs r1, #7
ands r1, r0
@ -6845,7 +6845,7 @@ _08020A7A:
sub_08020A7C: @ 0x08020A7C
push {r4, r5, r6, lr}
adds r6, r0, #0
bl sub_08000E50
bl Random
ldrb r5, [r6, #0x15]
ldr r4, _08020ACC @ =gUnk_080CA6D4
movs r1, #3
@ -7961,7 +7961,7 @@ _080212DC:
strb r0, [r1]
ldr r4, _0802131C @ =gUnk_080CAB4A
_080212E2:
bl sub_08000E50
bl Random
movs r1, #7
ands r1, r0
adds r1, r1, r4
@ -7972,7 +7972,7 @@ _080212E2:
cmp r2, #2
bne _08021306
ldr r4, _08021320 @ =gUnk_080CAB52
bl sub_08000E50
bl Random
movs r1, #3
ands r1, r0
adds r1, r1, r4
@ -8288,7 +8288,7 @@ _0802153E:
sub_08021540: @ 0x08021540
push {r4, r5, lr}
adds r4, r0, #0
bl sub_08000E50
bl Random
adds r5, r0, #0
adds r0, r4, #0
bl sub_08049FA0
@ -8627,7 +8627,7 @@ sub_08021780: @ 0x08021780
beq _080217F4
b _080217FA
_08021792:
ldr r0, _080217A4 @ =gUnk_03003F80
ldr r0, _080217A4 @ =gLinkState
adds r0, #0xa8
ldrb r0, [r0]
cmp r0, #0x18
@ -8636,7 +8636,7 @@ _08021792:
bl sub_08021768
b _080217FA
.align 2, 0
_080217A4: .4byte gUnk_03003F80
_080217A4: .4byte gLinkState
_080217A8:
movs r1, #0
movs r0, #5
@ -8817,7 +8817,7 @@ sub_080218CC: @ 0x080218CC
movs r1, #1
bl sub_08049F84
adds r4, r0, #0
bl sub_08000E50
bl Random
movs r1, #0x10
eors r4, r1
ldr r2, _08021980 @ =gUnk_080CB5DC
@ -8866,7 +8866,7 @@ _08021948:
beq _0802197C
movs r0, #2
strb r0, [r5, #0xc]
bl sub_08000E50
bl Random
movs r1, #0x38
ands r0, r1
adds r0, #8
@ -8981,7 +8981,7 @@ sub_08021A10: @ 0x08021A10
bne _08021A5E
movs r0, #3
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
movs r1, #0x3f
ands r0, r1
adds r0, #0x1e
@ -9013,7 +9013,7 @@ sub_08021A64: @ 0x08021A64
bne _08021A96
movs r0, #2
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
adds r0, #0x1e
@ -9128,7 +9128,7 @@ _08021B60:
sub_08021B64: @ 0x08021B64
push {r4, r5, r6, lr}
adds r4, r0, #0
ldr r0, _08021B88 @ =gUnk_03003F80
ldr r0, _08021B88 @ =gLinkState
ldr r1, [r0, #0x30]
movs r2, #4
ands r1, r2
@ -9144,7 +9144,7 @@ sub_08021B64: @ 0x08021B64
bl sub_08004260
b _08021C4E
.align 2, 0
_08021B88: .4byte gUnk_03003F80
_08021B88: .4byte gLinkState
_08021B8C:
movs r5, #1
adds r0, r6, #0
@ -9498,7 +9498,7 @@ sub_08021DF0: @ 0x08021DF0
ldr r0, _08021E48 @ =0x0000FFF0
strh r0, [r4, #0x36]
_08021E14:
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
strb r0, [r4, #0x15]
@ -9621,7 +9621,7 @@ sub_08021EF0: @ 0x08021EF0
adds r4, r0, #0
movs r0, #1
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
ldr r2, _08021F20 @ =gUnk_080CB6D6
movs r1, #0xf
ands r1, r0
@ -9652,7 +9652,7 @@ sub_08021F24: @ 0x08021F24
bne _08021F48
movs r0, #2
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
ldr r2, _08021F44 @ =gUnk_080CB6F6
movs r1, #0xf
ands r1, r0
@ -9693,7 +9693,7 @@ _08021F80:
bl sub_08049FA0
cmp r0, #0
beq _08021F94
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
b _08021F9A
@ -10116,7 +10116,7 @@ _08022280: @ jump table
.4byte _08022356 @ case 23
.4byte _080222F2 @ case 24
_080222E4:
ldr r0, _08022340 @ =gUnk_03003F80
ldr r0, _08022340 @ =gLinkState
adds r0, #0xac
ldrh r1, [r0]
movs r0, #8
@ -10161,7 +10161,7 @@ _080222F2:
str r5, [r4, #0x54]
b _08022356
.align 2, 0
_08022340: .4byte gUnk_03003F80
_08022340: .4byte gLinkState
_08022344:
adds r0, r4, #0
adds r0, #0x3f
@ -10191,7 +10191,7 @@ sub_08022368: @ 0x08022368
bl sub_0804A720
movs r0, #1
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
strb r0, [r4, #0xe]
adds r0, r4, #0
movs r1, #1
@ -10222,7 +10222,7 @@ sub_08022390: @ 0x08022390
movs r1, #1
bl sub_08049F84
strb r0, [r4, #0x15]
bl sub_08000E50
bl Random
movs r1, #4
ands r0, r1
strb r0, [r4, #0xf]
@ -10238,7 +10238,7 @@ _080223CE:
strb r0, [r4, #0xf]
b _080223DA
_080223D4:
bl sub_08000E50
bl Random
strb r0, [r4, #0xe]
_080223DA:
adds r0, r4, #0
@ -10758,7 +10758,7 @@ _080227EE:
cmp r0, #0
beq _08022812
strb r3, [r4, #0xc]
bl sub_08000E50
bl Random
ldr r2, _08022818 @ =gUnk_080CBA60
movs r1, #3
ands r1, r0
@ -11117,7 +11117,7 @@ sub_08022A88: @ 0x08022A88
movs r5, #0
movs r0, #1
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
movs r1, #0xf
ands r0, r1
adds r0, #8
@ -11130,7 +11130,7 @@ sub_08022A88: @ 0x08022A88
sub_08022AA4: @ 0x08022AA4
push {r4, r5, lr}
adds r4, r0, #0
bl sub_08000E50
bl Random
adds r5, r0, #0
movs r0, #2
strb r0, [r4, #0xc]
@ -11394,7 +11394,7 @@ sub_08022C58: @ 0x08022C58
str r7, [r0, #0x50]
adds r0, r7, #0
mov r1, sb
bl sub_0806FA24
bl CopyPosition
movs r0, #0xd
movs r1, #2
bl CreateEnemy
@ -11412,7 +11412,7 @@ sub_08022C58: @ 0x08022C58
str r7, [r6, #0x50]
adds r0, r7, #0
adds r1, r6, #0
bl sub_0806FA24
bl CopyPosition
movs r0, #0xd
movs r1, #3
bl CreateEnemy
@ -11428,7 +11428,7 @@ sub_08022C58: @ 0x08022C58
str r7, [r5, #0x50]
adds r0, r7, #0
adds r1, r5, #0
bl sub_0806FA24
bl CopyPosition
adds r0, r7, #0
bl sub_0804A720
movs r0, #1
@ -11446,7 +11446,7 @@ sub_08022C58: @ 0x08022C58
adds r0, r7, #0
adds r0, #0x80
str r5, [r0]
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
strb r0, [r7, #0x15]
@ -11773,7 +11773,7 @@ _08022F4E:
bne _08022F84
movs r0, #8
strb r0, [r4, #0xf]
bl sub_08000E50
bl Random
ldr r2, _08022FA0 @ =gUnk_080CBBC4
movs r1, #1
ands r1, r0
@ -12043,7 +12043,7 @@ _08023132:
ldr r4, _08023194 @ =gLinkEntity
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldrb r1, [r4, #0x10]
movs r0, #0x80
orrs r0, r1
@ -12063,7 +12063,7 @@ _08023132:
adds r4, #0x3d
movs r0, #0xec
strb r0, [r4]
ldr r2, _08023198 @ =gUnk_03003F80
ldr r2, _08023198 @ =gLinkState
movs r0, #0x41
strb r0, [r2, #2]
ldr r0, [r2, #0x30]
@ -12077,7 +12077,7 @@ _0802318A:
pop {r4, r5, pc}
.align 2, 0
_08023194: .4byte gLinkEntity
_08023198: .4byte gUnk_03003F80
_08023198: .4byte gLinkState
_0802319C: .4byte 0xFFF7FFFF
_080231A0: .4byte gUnk_080CBC38
@ -12176,7 +12176,7 @@ sub_080231BC: @ 0x080231BC
movs r1, #5
orrs r0, r1
strb r0, [r6, #0x1a]
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
strb r0, [r6, #0x15]
@ -12218,7 +12218,7 @@ sub_08023288: @ 0x08023288
ands r0, r1
cmp r0, #0
bne _08023324
bl sub_08000E50
bl Random
adds r4, r0, #0
movs r0, #0x1e
ands r4, r0
@ -12307,7 +12307,7 @@ sub_08023330: @ 0x08023330
movs r0, #0x96
lsls r0, r0, #2
strh r0, [r1]
bl sub_08000E50
bl Random
movs r1, #0x1c
ands r0, r1
strb r0, [r5, #0x15]
@ -12323,7 +12323,7 @@ sub_08023330: @ 0x08023330
bl sub_08023A88
ldr r1, [r5, #0x54]
adds r0, r5, #0
bl sub_0806FA24
bl CopyPosition
adds r0, r5, #0
movs r1, #4
movs r2, #0
@ -12514,7 +12514,7 @@ sub_080234D8: @ 0x080234D8
movs r1, #5
orrs r0, r1
strb r0, [r4, #0x1a]
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
strb r0, [r4, #0x15]
@ -12577,7 +12577,7 @@ _0802355A:
adds r2, r4, #0
ands r2, r0
strb r2, [r5, #0x14]
ldr r3, _080235AC @ =gUnk_03003F80
ldr r3, _080235AC @ =gLinkState
ldr r0, [r3, #0x30]
movs r1, #0x80
lsls r1, r1, #0xc
@ -12602,7 +12602,7 @@ _0802355A:
b _080235B8
.align 2, 0
_080235A8: .4byte gLinkEntity
_080235AC: .4byte gUnk_03003F80
_080235AC: .4byte gLinkState
_080235B0: .4byte gUnk_080CBC90
_080235B4:
movs r0, #4
@ -13018,7 +13018,7 @@ sub_08023894: @ 0x08023894
ldrb r0, [r0, #0xb]
cmp r0, #0
bne _08023900
ldr r2, _08023904 @ =gUnk_03003F80
ldr r2, _08023904 @ =gLinkState
ldr r0, [r2, #0x30]
movs r1, #0x80
lsls r1, r1, #0xe
@ -13050,7 +13050,7 @@ sub_08023894: @ 0x08023894
_08023900:
pop {r4, r5, pc}
.align 2, 0
_08023904: .4byte gUnk_03003F80
_08023904: .4byte gLinkState
_08023908: .4byte gLinkEntity
thumb_func_start sub_0802390C
@ -13169,7 +13169,7 @@ _080239D4:
bl sub_080239F0
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldr r4, [r4, #0x54]
cmp r4, #0
bne _080239D4
@ -13520,12 +13520,12 @@ sub_08023C5C: @ 0x08023C5C
bl sub_0804A720
movs r0, #1
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
movs r1, #0x30
ands r0, r1
adds r0, #0xb4
strb r0, [r4, #0xe]
bl sub_08000E50
bl Random
movs r1, #0x18
ands r0, r1
strb r0, [r4, #0x15]
@ -13560,7 +13560,7 @@ sub_08023C8C: @ 0x08023C8C
strb r0, [r4, #0xe]
b _08023CDC
_08023CBC:
bl sub_08000E50
bl Random
movs r1, #0x30
ands r0, r1
adds r0, #0xb4

132
asm/code_08023E10.s
View File

@ -83,7 +83,7 @@ _08023E98: .4byte gUnk_080CBDF7
sub_08023E9C: @ 0x08023E9C
push {r4, r5, r6, lr}
adds r5, r0, #0
bl sub_08000E50
bl Random
adds r6, r0, #0
adds r0, r5, #0
bl sub_08049FA0
@ -379,7 +379,7 @@ sub_0802409C: @ 0x0802409C
sub_080240B8: @ 0x080240B8
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
bl sub_08000E50
bl Random
movs r1, #0xc0
ands r1, r0
lsrs r7, r1, #3
@ -460,7 +460,7 @@ _08024136:
orrs r1, r0
strb r1, [r4, #0x1b]
_08024150:
bl sub_08000E50
bl Random
movs r1, #0x40
ands r0, r1
adds r1, r4, #0
@ -528,7 +528,7 @@ sub_080241C0: @ 0x080241C0
beq _08024238
b _08024296
_080241D8:
ldr r0, _08024218 @ =gUnk_03003F80
ldr r0, _08024218 @ =gLinkState
ldrb r0, [r0, #0xf]
movs r2, #0x40
cmp r0, #0
@ -559,7 +559,7 @@ _080241E4:
bl sub_08024A14
b _08024296
.align 2, 0
_08024218: .4byte gUnk_03003F80
_08024218: .4byte gLinkState
_0802421C: .4byte gLinkEntity
_08024220:
ldrb r0, [r4, #0xf]
@ -1161,7 +1161,7 @@ _08024670:
movs r0, #0x7f
ands r0, r1
strb r0, [r2, #0x10]
ldr r2, _080246E0 @ =gUnk_03003F80
ldr r2, _080246E0 @ =gLinkState
ldr r0, [r2, #0x30]
movs r1, #0x80
lsls r1, r1, #1
@ -1181,7 +1181,7 @@ _080246D6:
b _08024924
.align 2, 0
_080246DC: .4byte gLinkEntity
_080246E0: .4byte gUnk_03003F80
_080246E0: .4byte gLinkState
_080246E4:
ldr r1, [r5, #0x54]
adds r0, r5, #0
@ -1205,7 +1205,7 @@ _080246F6:
strb r0, [r6]
ldr r0, [r5, #0x54]
adds r1, r5, #0
bl sub_0806FA24
bl CopyPosition
ldrh r0, [r5, #0x36]
subs r0, #0xe
strh r0, [r5, #0x36]
@ -1230,7 +1230,7 @@ _08024736:
ldr r1, [r5, #0x54]
str r1, [r4, #0x54]
adds r0, r4, #0
bl sub_0806FA24
bl CopyPosition
str r4, [r5, #0x54]
b _08024924
_0802474C:
@ -1498,7 +1498,7 @@ _0802493C: .4byte gLinkEntity
sub_08024940: @ 0x08024940
push {r4, r5, lr}
adds r4, r0, #0
bl sub_08000E50
bl Random
adds r5, r0, #0
movs r0, #0x70
ands r5, r0
@ -1677,7 +1677,7 @@ _08024A9E:
bl sub_08049FA0
cmp r0, #0
bne _08024ABA
bl sub_08000E50
bl Random
movs r1, #3
ands r1, r0
cmp r1, #0
@ -1714,7 +1714,7 @@ sub_08024AD8: @ 0x08024AD8
ands r0, r2
cmp r0, #3
bne _08024B12
ldr r0, _08024B0C @ =gUnk_03003F80
ldr r0, _08024B0C @ =gLinkState
ldrb r0, [r0, #0xf]
cmp r0, #0
bne _08024B10
@ -1726,7 +1726,7 @@ sub_08024AD8: @ 0x08024AD8
movs r0, #0
b _08024B34
.align 2, 0
_08024B0C: .4byte gUnk_03003F80
_08024B0C: .4byte gLinkState
_08024B10:
movs r1, #1
_08024B12:
@ -1756,7 +1756,7 @@ sub_08024B38: @ 0x08024B38
push {r4, r5, r6, r7, lr}
adds r5, r0, #0
movs r7, #0
ldr r0, _08024B5C @ =gUnk_03003F80
ldr r0, _08024B5C @ =gLinkState
ldrb r3, [r0, #0xf]
adds r2, r3, #0
adds r1, r0, #0
@ -1772,7 +1772,7 @@ sub_08024B38: @ 0x08024B38
strb r0, [r1, #0xf]
b _08024B62
.align 2, 0
_08024B5C: .4byte gUnk_03003F80
_08024B5C: .4byte gLinkState
_08024B60:
strb r7, [r1, #0xf]
_08024B62:
@ -2054,7 +2054,7 @@ _08024D60:
ldrb r0, [r1]
adds r0, #1
strb r0, [r1]
bl sub_08000E50
bl Random
movs r1, #0xf
ands r0, r1
adds r0, #0x20
@ -2094,7 +2094,7 @@ _08024DAE:
cmp r0, #0
bne _08024DCE
strb r0, [r1]
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
adds r0, #0x20
@ -2162,7 +2162,7 @@ _08024E30: .4byte gUnk_080CBF18
thumb_func_start sub_08024E34
sub_08024E34: @ 0x08024E34
push {lr}
bl sub_08000E50
bl Random
movs r1, #0x3c
ands r1, r0
lsrs r1, r1, #2
@ -2192,7 +2192,7 @@ sub_08024E4C: @ 0x08024E4C
bl sub_0807953C
cmp r0, #0
beq _08024E84
bl sub_08000E50
bl Random
adds r3, r4, #0
adds r3, #0x84
ldrb r2, [r3]
@ -2240,7 +2240,7 @@ _08024EC8: .4byte gUnk_02002A40
_08024ECC:
ldr r6, _08024F48 @ =gLinkEntity
bl sub_08077B2C
ldr r2, _08024F4C @ =gUnk_03003F80
ldr r2, _08024F4C @ =gLinkState
ldr r0, [r2, #0x30]
movs r1, #0x80
lsls r1, r1, #1
@ -2299,13 +2299,13 @@ _08024F46:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08024F48: .4byte gLinkEntity
_08024F4C: .4byte gUnk_03003F80
_08024F4C: .4byte gLinkState
thumb_func_start sub_08024F50
sub_08024F50: @ 0x08024F50
push {r4, r5, r6, lr}
adds r6, r0, #0
ldr r2, _08024FDC @ =gUnk_03003F80
ldr r2, _08024FDC @ =gLinkState
movs r4, #0
strb r4, [r2, #0xa]
ldr r0, [r2, #0x30]
@ -2315,7 +2315,7 @@ sub_08024F50: @ 0x08024F50
ldr r5, _08024FE4 @ =gLinkEntity
adds r0, r6, #0
adds r1, r5, #0
bl sub_0806FA24
bl CopyPosition
movs r0, #1
strb r0, [r5, #0xc]
ldrb r0, [r5, #0x10]
@ -2372,7 +2372,7 @@ sub_08024F50: @ 0x08024F50
strh r0, [r6, #0x24]
pop {r4, r5, r6, pc}
.align 2, 0
_08024FDC: .4byte gUnk_03003F80
_08024FDC: .4byte gLinkState
_08024FE0: .4byte 0xFFFFFEFF
_08024FE4: .4byte gLinkEntity
@ -2519,7 +2519,7 @@ _080250C2:
strb r1, [r3]
adds r0, r4, #0
adds r1, r2, #0
bl sub_0806FA24
bl CopyPosition
_08025104:
movs r0, #0xc3
lsls r0, r0, #1
@ -2591,7 +2591,7 @@ sub_08025180: @ 0x08025180
adds r4, r0, #0
movs r0, #1
strb r0, [r4, #0xd]
bl sub_08000E50
bl Random
strb r0, [r4, #0xe]
ldr r0, [r4, #0x4c]
ldrb r0, [r0, #0x15]
@ -2659,7 +2659,7 @@ sub_080251FC: @ 0x080251FC
movs r5, #0
movs r0, #0xf0
strb r0, [r1]
bl sub_08000E50
bl Random
movs r1, #0x1c
ands r0, r1
strb r0, [r4, #0x15]
@ -2697,7 +2697,7 @@ _08025242:
lsls r0, r0, #0x18
cmp r0, #0
bne _08025270
bl sub_08000E50
bl Random
movs r1, #3
ands r0, r1
adds r0, #4
@ -3162,12 +3162,12 @@ _080255D2:
lsls r0, r0, #0x18
cmp r0, #0
bne _0802560C
bl sub_08000E50
bl Random
movs r1, #3
ands r0, r1
adds r0, #4
strb r0, [r5, #0xe]
bl sub_08000E50
bl Random
adds r4, r0, #0
movs r0, #0xf
ands r4, r0
@ -3274,14 +3274,14 @@ sub_080256B4: @ 0x080256B4
adds r5, r0, #0
movs r0, #1
strb r0, [r5, #0xc]
bl sub_08000E50
bl Random
movs r1, #3
ands r0, r1
adds r0, #4
strb r0, [r5, #0xe]
movs r0, #0x1e
strb r0, [r5, #0xf]
bl sub_08000E50
bl Random
ldrb r4, [r5, #0x15]
adds r4, #7
movs r1, #7
@ -3291,7 +3291,7 @@ sub_080256B4: @ 0x080256B4
movs r0, #0x1c
ands r4, r0
strb r4, [r5, #0x15]
bl sub_08000E50
bl Random
ldr r2, _08025718 @ =gUnk_080CC000
movs r1, #0xf
ands r1, r0
@ -3302,7 +3302,7 @@ sub_080256B4: @ 0x080256B4
adds r0, #0x78
movs r4, #0
strh r1, [r0]
bl sub_08000E50
bl Random
movs r1, #0x18
bl __modsi3
lsls r0, r0, #1
@ -3592,7 +3592,7 @@ _08025926:
strb r0, [r4, #0xc]
movs r0, #1
strb r0, [r4, #0xe]
bl sub_08000E50
bl Random
ldr r2, _08025948 @ =gUnk_080CC050
movs r1, #0xf
ands r1, r0
@ -4024,7 +4024,7 @@ sub_08025C60: @ 0x08025C60
bl sub_08049FA0
cmp r0, #0
bne _08025C80
bl sub_08000E50
bl Random
movs r1, #1
ands r1, r0
cmp r1, #0
@ -4033,7 +4033,7 @@ sub_08025C60: @ 0x08025C60
bl sub_08049EE4
b _08025C98
_08025C80:
bl sub_08000E50
bl Random
ldr r2, _08025C9C @ =gUnk_080CC0C2
movs r1, #7
ands r1, r0
@ -4486,7 +4486,7 @@ _08025FE6:
movs r1, #0x49
movs r2, #1
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
adds r1, r0, #0
cmp r1, #0
beq _08025FFC
@ -4500,7 +4500,7 @@ _08025FFC:
movs r1, #0x49
movs r2, #3
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
adds r1, r0, #0
cmp r1, #0
beq _08026050
@ -4614,7 +4614,7 @@ _080260D8:
_080260E0:
ldr r0, [r4, #0x54]
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
b _08026106
_080260EA:
bl sub_08078B48
@ -4871,7 +4871,7 @@ sub_080262A8: @ 0x080262A8
ldrb r0, [r4, #0xb]
cmp r0, #0
bne _080262EC
ldr r1, _080262E8 @ =gUnk_03003F80
ldr r1, _080262E8 @ =gLinkState
movs r0, #0x82
lsls r0, r0, #1
strh r0, [r1, #8]
@ -4881,7 +4881,7 @@ sub_080262A8: @ 0x080262A8
strb r5, [r0, #3]
b _0802631A
.align 2, 0
_080262E8: .4byte gUnk_03003F80
_080262E8: .4byte gLinkState
_080262EC:
adds r0, r4, #0
adds r0, #0x7c
@ -5038,7 +5038,7 @@ _08026404:
adds r0, r4, #0
movs r1, #0x49
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
_08026410:
pop {r4, r5, pc}
.align 2, 0
@ -5301,7 +5301,7 @@ _080265EE:
strb r0, [r2]
b _08026626
_08026608:
bl sub_08000E50
bl Random
ldr r2, _08026630 @ =gUnk_080CC24F
movs r1, #7
ands r1, r0
@ -5376,7 +5376,7 @@ _0802668C:
ldrb r0, [r0, #4]
cmp r0, #2
bne _080266B0
bl sub_08000E50
bl Random
movs r1, #3
ands r1, r0
cmp r1, #0
@ -5933,7 +5933,7 @@ _08026A98:
movs r1, #0x15
movs r2, #0
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
adds r4, r0, #0
cmp r4, #0
beq _08026B4E
@ -6019,7 +6019,7 @@ _08026B4E:
adds r0, r5, #0
adds r0, #0x7a
strh r1, [r0]
bl sub_08000E50
bl Random
ldr r2, _08026BB4 @ =gUnk_080CC278
movs r1, #3
ands r1, r0
@ -6038,7 +6038,7 @@ _08026B4E:
movs r1, #0x49
movs r2, #0xa
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
adds r4, r0, #0
cmp r4, #0
beq _08026BD4
@ -8045,7 +8045,7 @@ _08027AC2:
adds r0, r5, #0
movs r1, #0x49
movs r2, #9
bl sub_080A2988
bl CreateObjectWithParent
ldr r0, _08027B3C @ =0x00000155
bl PlaySFX
adds r0, r5, #0
@ -8299,7 +8299,7 @@ sub_08027C9C: @ 0x08027C9C
push {r4, r5, lr}
adds r5, r0, #0
adds r4, r1, #0
bl sub_08000E50
bl Random
ands r0, r4
cmp r0, #0
bne _08027D1E
@ -8321,7 +8321,7 @@ sub_08027C9C: @ 0x08027C9C
ldrh r1, [r4, #0x2e]
adds r0, r0, r1
strh r0, [r4, #0x2e]
bl sub_08000E50
bl Random
ldr r1, [r5, #0x48]
ldrb r1, [r1, #6]
lsls r1, r1, #1
@ -8340,7 +8340,7 @@ sub_08027C9C: @ 0x08027C9C
ldrh r1, [r4, #0x32]
adds r0, r0, r1
strh r0, [r4, #0x32]
bl sub_08000E50
bl Random
ldr r1, [r5, #0x48]
ldrb r1, [r1, #7]
lsls r1, r1, #1
@ -8365,7 +8365,7 @@ sub_08027D20: @ 0x08027D20
movs r1, #0x15
movs r2, #0
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
adds r4, r0, #0
cmp r4, #0
beq _08027D66
@ -8628,7 +8628,7 @@ sub_08027EFC: @ 0x08027EFC
bl sub_08049FA0
cmp r0, #0
bne _08027F32
bl sub_08000E50
bl Random
movs r1, #0x30
ands r1, r0
cmp r1, #0
@ -8806,7 +8806,7 @@ sub_0802805C: @ 0x0802805C
bl sub_0807953C
cmp r0, #0
beq _0802807E
bl sub_08000E50
bl Random
ldrb r2, [r5, #0xf]
adds r2, #1
movs r1, #1
@ -8830,7 +8830,7 @@ _0802808E:
_08028098: .4byte gUnk_02002A40
_0802809C:
bl sub_08077B2C
ldr r2, _08028104 @ =gUnk_03003F80
ldr r2, _08028104 @ =gLinkState
ldrb r1, [r2, #0x1a]
movs r0, #0x80
orrs r0, r1
@ -8879,14 +8879,14 @@ _080280F0:
_08028102:
pop {r4, r5, pc}
.align 2, 0
_08028104: .4byte gUnk_03003F80
_08028104: .4byte gLinkState
_08028108: .4byte gLinkEntity
thumb_func_start sub_0802810C
sub_0802810C: @ 0x0802810C
push {r4, r5, lr}
adds r4, r0, #0
ldr r2, _08028198 @ =gUnk_03003F80
ldr r2, _08028198 @ =gLinkState
movs r1, #0
movs r0, #0x41
strb r0, [r2, #2]
@ -8956,7 +8956,7 @@ sub_0802810C: @ 0x0802810C
_08028196:
pop {r4, r5, pc}
.align 2, 0
_08028198: .4byte gUnk_03003F80
_08028198: .4byte gLinkState
_0802819C: .4byte gLinkEntity
thumb_func_start sub_080281A0
@ -9060,7 +9060,7 @@ sub_0802823C: @ 0x0802823C
cmp r0, #0
beq _08028266
adds r0, r4, #0
bl sub_0806FA24
bl CopyPosition
_08028266:
pop {r4, pc}
.align 2, 0
@ -9389,7 +9389,7 @@ _080284B4:
_080284D2:
strb r1, [r4, #0xc]
strh r2, [r4, #0x24]
bl sub_08000E50
bl Random
movs r1, #7
ands r0, r1
lsls r1, r0, #1
@ -9408,7 +9408,7 @@ _080284F0:
strb r0, [r3]
movs r0, #0x80
strh r0, [r4, #0x24]
bl sub_08000E50
bl Random
movs r1, #7
ands r0, r1
lsls r1, r0, #1
@ -9552,7 +9552,7 @@ sub_08028604: @ 0x08028604
ldrb r0, [r0]
cmp r0, #1
bne _080286B0
bl sub_08000E50
bl Random
ldr r2, _08028650 @ =gUnk_080CC7BC
movs r1, #3
ands r1, r0
@ -9565,7 +9565,7 @@ sub_08028604: @ 0x08028604
bl sub_08049FA0
cmp r0, #0
beq _08028658
bl sub_08000E50
bl Random
ldr r2, _08028654 @ =gUnk_080CC7D0
movs r1, #7
ands r1, r0
@ -9591,7 +9591,7 @@ _08028658:
ldrb r0, [r6]
cmp r0, #0
bne _08028684
bl sub_08000E50
bl Random
ldr r2, _08028680 @ =gUnk_080CC7C0
movs r1, #0xf
ands r1, r0
@ -9603,7 +9603,7 @@ _08028658:
.align 2, 0
_08028680: .4byte gUnk_080CC7C0
_08028684:
bl sub_08000E50
bl Random
ldr r2, _080286AC @ =gUnk_080CC7C0
movs r1, #7
ands r1, r0

16
asm/code_08028E40.s
View File

@ -518,7 +518,7 @@ sub_080291DC: @ 0x080291DC
beq _08029204
b _08029228
_080291EC:
ldr r2, _080291FC @ =gUnk_080FD5A0
ldr r2, _080291FC @ =gBombBagSizes
ldr r1, _08029200 @ =gUnk_02002A40
adds r0, r1, #0
adds r0, #0xae
@ -527,10 +527,10 @@ _080291EC:
adds r1, #0xac
b _08029212
.align 2, 0
_080291FC: .4byte gUnk_080FD5A0
_080291FC: .4byte gBombBagSizes
_08029200: .4byte gUnk_02002A40
_08029204:
ldr r2, _08029220 @ =gUnk_080FD5A4
ldr r2, _08029220 @ =gQuiverSizes
ldr r1, _08029224 @ =gUnk_02002A40
adds r0, r1, #0
adds r0, #0xaf
@ -545,7 +545,7 @@ _08029212:
movs r0, #1
b _0802922A
.align 2, 0
_08029220: .4byte gUnk_080FD5A4
_08029220: .4byte gQuiverSizes
_08029224: .4byte gUnk_02002A40
_08029228:
movs r0, #0
@ -993,7 +993,7 @@ _08029572:
_08029580: .4byte gUnk_02002A40
_08029584:
bl sub_08077B2C
ldr r2, _08029600 @ =gUnk_03003F80
ldr r2, _08029600 @ =gLinkState
ldrb r1, [r2, #0x1a]
movs r0, #0x80
orrs r0, r1
@ -1052,7 +1052,7 @@ _08029584:
_080295FE:
pop {r4, r5, pc}
.align 2, 0
_08029600: .4byte gUnk_03003F80
_08029600: .4byte gLinkState
_08029604: .4byte gLinkEntity
_08029608: .4byte gUnk_02002A40
_0802960C: .4byte gUnk_080CCC44
@ -1174,7 +1174,7 @@ sub_080296C8: @ 0x080296C8
sub_080296D8: @ 0x080296D8
push {r4, r5, lr}
adds r4, r0, #0
ldr r2, _08029764 @ =gUnk_03003F80
ldr r2, _08029764 @ =gLinkState
movs r0, #0x41
strb r0, [r2, #2]
ldr r0, [r2, #0x30]
@ -1244,7 +1244,7 @@ sub_080296D8: @ 0x080296D8
_08029762:
pop {r4, r5, pc}
.align 2, 0
_08029764: .4byte gUnk_03003F80
_08029764: .4byte gLinkState
_08029768: .4byte gLinkEntity
_0802976C: .4byte 0x0000FFFE

24
asm/code_08029A94.s
View File

@ -496,13 +496,13 @@ sub_08029E0C: @ 0x08029E0C
ldr r0, _08029EE0 @ =gUnk_080CCDC8
adds r1, r1, r0
str r1, [sp]
bl sub_08000E50
bl Random
movs r1, #1
ands r1, r0
lsls r1, r1, #1
subs r1, #1
mov sl, r1
bl sub_08000E50
bl Random
adds r1, r0, #0
movs r0, #0xf
ands r0, r1
@ -1057,14 +1057,14 @@ sub_0802A250: @ 0x0802A250
strb r1, [r5, #0xe]
ldr r0, _0802A2A8 @ =0xFFFD0000
str r0, [r5, #0x20]
bl sub_08000E50
bl Random
ldr r1, _0802A2AC @ =gUnk_080CD03C
movs r4, #3
ands r0, r4
adds r0, r0, r1
ldrb r0, [r0]
strh r0, [r5, #0x24]
bl sub_08000E50
bl Random
ldr r1, _0802A2B0 @ =gUnk_080CD040
ands r0, r4
adds r0, r0, r1
@ -1398,7 +1398,7 @@ sub_0802A4E4: @ 0x0802A4E4
adds r1, #0x38
movs r0, #3
strb r0, [r1]
bl sub_08000E50
bl Random
adds r1, r4, #0
adds r1, #0x7d
strb r0, [r1]
@ -1618,7 +1618,7 @@ sub_0802A69C: @ 0x0802A69C
push {r4, lr}
adds r4, r0, #0
bl sub_0802A7D0
ldr r2, _0802A6E4 @ =gUnk_03003F80
ldr r2, _0802A6E4 @ =gLinkState
ldrb r1, [r2, #0xa]
movs r0, #0x80
orrs r1, r0
@ -1651,7 +1651,7 @@ sub_0802A69C: @ 0x0802A69C
subs r0, r2, #1
b _0802A6EE
.align 2, 0
_0802A6E4: .4byte gUnk_03003F80
_0802A6E4: .4byte gLinkState
_0802A6E8: .4byte gLinkEntity
_0802A6EC:
adds r0, r2, #1
@ -1722,7 +1722,7 @@ _0802A768:
ldr r1, _0802A784 @ =0xFFFE0000
adds r0, r0, r1
str r0, [r4, #0x34]
ldr r1, _0802A788 @ =gUnk_03003F80
ldr r1, _0802A788 @ =gLinkState
ldrb r0, [r1, #0xa]
movs r2, #0x80
orrs r0, r2
@ -1734,7 +1734,7 @@ _0802A780:
pop {r4, pc}
.align 2, 0
_0802A784: .4byte 0xFFFE0000
_0802A788: .4byte gUnk_03003F80
_0802A788: .4byte gLinkState
thumb_func_start sub_0802A78C
sub_0802A78C: @ 0x0802A78C
@ -1939,7 +1939,7 @@ sub_0802A8F4: @ 0x0802A8F4
sub_0802A8FC: @ 0x0802A8FC
push {lr}
adds r2, r0, #0
ldr r0, _0802A914 @ =gUnk_03003F80
ldr r0, _0802A914 @ =gLinkState
ldrb r0, [r0, #0x1c]
movs r1, #0xf
ands r1, r0
@ -1951,7 +1951,7 @@ sub_0802A8FC: @ 0x0802A8FC
_0802A912:
pop {pc}
.align 2, 0
_0802A914: .4byte gUnk_03003F80
_0802A914: .4byte gLinkState
thumb_func_start nullsub_143
nullsub_143: @ 0x0802A918
@ -1981,7 +1981,7 @@ sub_0802A924: @ 0x0802A924
movs r4, #0
ldr r0, _0802A9A4 @ =0x0000FFD0
strh r0, [r7, #0x36]
bl sub_08000E50
bl Random
ands r0, r6
adds r1, r7, #0
adds r1, #0x80

10
asm/code_0802AE24.s
View File

@ -66,7 +66,7 @@ _0802AE8A:
beq _0802AEA8
adds r0, r1, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldrb r1, [r4, #0x18]
movs r0, #4
rsbs r0, r0, #0
@ -426,7 +426,7 @@ _0802B10E:
ldrb r0, [r4, #0xd]
cmp r0, #1
bne _0802B12E
ldr r0, _0802B188 @ =gUnk_03003F80
ldr r0, _0802B188 @ =gLinkState
strb r1, [r0, #5]
_0802B12E:
adds r0, r4, #0
@ -463,7 +463,7 @@ _0802B16C:
movs r1, #0x20
movs r2, #0
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
adds r5, r0, #0
cmp r5, #0
beq _0802B190
@ -473,7 +473,7 @@ _0802B16C:
strb r0, [r1]
b _0802B19E
.align 2, 0
_0802B188: .4byte gUnk_03003F80
_0802B188: .4byte gLinkState
_0802B18C: .4byte gUnk_080CD17C
_0802B190:
adds r0, r4, #0
@ -529,7 +529,7 @@ _0802B1E2:
beq _0802B1F6
adds r0, r1, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
b _0802B200
_0802B1F6:
movs r0, #2

244
asm/code_0802B234.s
View File

@ -144,7 +144,7 @@ sub_0802B2E0: @ 0x0802B2E0
movs r0, #0xe
strb r0, [r4, #0xe]
adds r0, r4, #0
bl sub_0806FA24
bl CopyPosition
_0802B334:
pop {r4, pc}
.align 2, 0
@ -373,7 +373,7 @@ sub_0802B4A8: @ 0x0802B4A8
movs r1, #0
movs r2, #0x60
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
adds r1, r0, #0
cmp r1, #0
beq _0802B4D0
@ -747,7 +747,7 @@ sub_0802B7A4: @ 0x0802B7A4
bne _0802B7F4
movs r0, #1
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
ldr r2, _0802B7F8 @ =gUnk_080CD314
movs r1, #3
ands r1, r0
@ -978,7 +978,7 @@ sub_0802B960: @ 0x0802B960
bl sub_08049FDC
cmp r0, #0
beq _0802B986
bl sub_08000E50
bl Random
movs r1, #7
ands r1, r0
cmp r1, #0
@ -993,7 +993,7 @@ _0802B986:
bl sub_08049FA0
cmp r0, #0
bne _0802B9A6
bl sub_08000E50
bl Random
movs r1, #3
ands r1, r0
cmp r1, #0
@ -1003,7 +1003,7 @@ _0802B986:
adds r0, #4
b _0802B9AA
_0802B9A6:
bl sub_08000E50
bl Random
_0802B9AA:
movs r1, #0x18
ands r0, r1
@ -1458,7 +1458,7 @@ sub_0802BCA8: @ 0x0802BCA8
ldrb r0, [r4, #0x14]
strb r0, [r1, #0x14]
adds r0, r4, #0
bl sub_0806FA24
bl CopyPosition
_0802BCF0:
ldrb r1, [r4, #0x14]
adds r1, #4
@ -1533,7 +1533,7 @@ sub_0802BD54: @ 0x0802BD54
bl sub_0804A720
movs r0, #1
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
adds r1, r4, #0
adds r1, #0x78
strb r0, [r1]
@ -1542,7 +1542,7 @@ sub_0802BD54: @ 0x0802BD54
adds r1, #1
movs r0, #0xff
strb r0, [r1]
bl sub_08000E50
bl Random
movs r1, #0x18
ands r0, r1
strb r0, [r4, #0x15]
@ -1615,7 +1615,7 @@ sub_0802BDE0: @ 0x0802BDE0
_0802BDFE:
movs r0, #1
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
movs r1, #0xf
ands r0, r1
adds r0, #0xf
@ -1913,7 +1913,7 @@ _0802C01C:
sub_0802C020: @ 0x0802C020
push {r4, r5, r6, lr}
adds r5, r0, #0
bl sub_08000E50
bl Random
adds r4, r0, #0
adds r0, r5, #0
bl sub_08049FA0
@ -2229,7 +2229,7 @@ sub_0802C258: @ 0x0802C258
str r0, [r4, #0x20]
movs r0, #2
strb r0, [r4, #0xe]
bl sub_08000E50
bl Random
adds r2, r0, #0
movs r0, #0x70
ands r2, r0
@ -2462,7 +2462,7 @@ _0802C420:
bge _0802C408
adds r0, r4, #0
bl sub_0802C62C
bl sub_08000E50
bl Random
movs r1, #0xff
ands r0, r1
movs r2, #0x80
@ -2496,7 +2496,7 @@ _0802C460:
ble _0802C48C
adds r0, r4, #0
bl sub_0802C62C
bl sub_08000E50
bl Random
movs r1, #0x7f
ands r0, r1
movs r1, #0x80
@ -2561,7 +2561,7 @@ _0802C4E0:
_0802C4E4:
movs r6, #0
_0802C4E6:
bl sub_08000E50
bl Random
adds r4, r0, #0
movs r0, #7
ands r4, r0
@ -2606,7 +2606,7 @@ _0802C534:
adds r1, r1, r0
ldrh r0, [r1]
strh r0, [r5, #0x24]
bl sub_08000E50
bl Random
adds r4, r0, #0
movs r0, #7
ands r4, r0
@ -2670,7 +2670,7 @@ _0802C5B2:
ldrb r0, [r1]
_0802C5B6:
strb r0, [r5, #0x15]
bl sub_08000E50
bl Random
adds r4, r0, #0
movs r0, #7
ands r4, r0
@ -3095,7 +3095,7 @@ sub_0802C8D8: @ 0x0802C8D8
movs r0, #0x3c
strb r0, [r5, #0xe]
strb r4, [r5, #0xf]
bl sub_08000E50
bl Random
movs r1, #0x18
ands r0, r1
movs r1, #4
@ -3246,7 +3246,7 @@ sub_0802C9D0: @ 0x0802C9D0
sub_0802CA10: @ 0x0802CA10
push {r4, lr}
adds r4, r0, #0
ldr r0, _0802CA30 @ =gUnk_03003F80
ldr r0, _0802CA30 @ =gLinkState
ldrb r0, [r0, #5]
cmp r0, #5
beq _0802CA42
@ -3260,7 +3260,7 @@ sub_0802CA10: @ 0x0802CA10
bl sub_0802CBC4
b _0802CA66
.align 2, 0
_0802CA30: .4byte gUnk_03003F80
_0802CA30: .4byte gLinkState
_0802CA34:
adds r0, r4, #0
bl sub_0802CC18
@ -3431,7 +3431,7 @@ sub_0802CB68: @ 0x0802CB68
movs r0, #1
strb r0, [r5, #0xc]
strb r1, [r5, #0xd]
bl sub_08000E50
bl Random
adds r2, r0, #0
movs r0, #0x18
ands r2, r0
@ -3500,7 +3500,7 @@ _0802CBF0:
movs r1, #0x20
movs r2, #0
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
adds r2, r0, #0
cmp r2, #0
beq _0802CC14
@ -3631,7 +3631,7 @@ sub_0802CCE0: @ 0x0802CCE0
strb r0, [r4, #0xc]
movs r0, #0x3c
strb r0, [r4, #0xe]
bl sub_08000E50
bl Random
strb r0, [r4, #0xf]
ldrb r1, [r4, #0x18]
movs r0, #0x31
@ -3648,7 +3648,7 @@ sub_0802CCE0: @ 0x0802CCE0
adds r1, #0x38
movs r0, #3
strb r0, [r1]
bl sub_08000E50
bl Random
adds r1, r4, #0
adds r1, #0x7a
strb r0, [r1]
@ -3704,13 +3704,13 @@ _0802CD76:
bne _0802CDC4
movs r0, #2
strb r0, [r5, #0xc]
bl sub_08000E50
bl Random
adds r4, r0, #0
lsrs r0, r4, #0x10
strb r0, [r5, #0xe]
movs r0, #0xc0
strh r0, [r5, #0x24]
bl sub_08000E50
bl Random
ldr r2, _0802CDC0 @ =gUnk_080CD728
movs r1, #3
ands r1, r0
@ -3794,7 +3794,7 @@ _0802CE3C:
strb r0, [r4, #0xe]
movs r0, #0x60
strh r0, [r4, #0x24]
bl sub_08000E50
bl Random
movs r1, #0x38
ands r0, r1
adds r0, #0x96
@ -3813,7 +3813,7 @@ _0802CE58:
sub_0802CE68: @ 0x0802CE68
push {r4, r5, lr}
adds r4, r0, #0
ldr r2, _0802CED4 @ =gUnk_03003F80
ldr r2, _0802CED4 @ =gLinkState
ldrb r1, [r2, #0xa]
movs r0, #0x80
orrs r1, r0
@ -3862,7 +3862,7 @@ _0802CEAC:
strb r0, [r4, #0xe]
b _0802CEF0
.align 2, 0
_0802CED4: .4byte gUnk_03003F80
_0802CED4: .4byte gLinkState
_0802CED8: .4byte gLinkEntity
_0802CEDC:
movs r0, #1
@ -3921,7 +3921,7 @@ _0802CF28:
orrs r1, r0
strb r1, [r4, #0x18]
_0802CF4A:
ldr r1, _0802CF60 @ =gUnk_03003F80
ldr r1, _0802CF60 @ =gLinkState
ldrb r0, [r1, #0xa]
movs r2, #0x80
orrs r0, r2
@ -3933,7 +3933,7 @@ _0802CF5A:
pop {r4, pc}
.align 2, 0
_0802CF5C: .4byte 0xFFFE0000
_0802CF60: .4byte gUnk_03003F80
_0802CF60: .4byte gLinkState
thumb_func_start sub_0802CF64
sub_0802CF64: @ 0x0802CF64
@ -3942,7 +3942,7 @@ sub_0802CF64: @ 0x0802CF64
bl sub_08049FA0
cmp r0, #0
beq _0802CF76
bl sub_08000E50
bl Random
b _0802CF7E
_0802CF76:
adds r0, r4, #0
@ -4148,7 +4148,7 @@ _0802D0F4:
bl sub_0804A7D4
b _0802D148
_0802D104:
ldr r5, _0802D14C @ =gUnk_03003F80
ldr r5, _0802D14C @ =gLinkState
movs r0, #1
strb r0, [r5, #0x14]
ldr r1, _0802D150 @ =gLinkEntity
@ -4182,7 +4182,7 @@ _0802D128:
_0802D148:
pop {r4, r5, pc}
.align 2, 0
_0802D14C: .4byte gUnk_03003F80
_0802D14C: .4byte gLinkState
_0802D150: .4byte gLinkEntity
_0802D154: .4byte gUnk_080CD75C
@ -4312,7 +4312,7 @@ sub_0802D218: @ 0x0802D218
adds r0, r4, #0
movs r1, #0x67
movs r2, #2
bl sub_080A2988
bl CreateObjectWithParent
_0802D254:
pop {r4, r5, pc}
.align 2, 0
@ -4405,7 +4405,7 @@ _0802D2F8:
ands r0, r1
cmp r0, #0
bne _0802D32E
bl sub_08000E50
bl Random
movs r1, #5
ands r1, r0
ldr r0, [r4]
@ -4676,7 +4676,7 @@ _0802D4D6:
adds r0, #8
strb r3, [r0]
_0802D52E:
ldr r0, _0802D540 @ =gUnk_03003F80
ldr r0, _0802D540 @ =gLinkState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
@ -4685,7 +4685,7 @@ _0802D52E:
bl sub_08004260
b _0802D63C
.align 2, 0
_0802D540: .4byte gUnk_03003F80
_0802D540: .4byte gLinkState
_0802D544:
ldrb r0, [r4, #0xb]
cmp r0, #1
@ -4762,7 +4762,7 @@ _0802D5A8:
strb r0, [r2]
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
adds r0, r4, #0
movs r1, #0x4f
bl sub_08004260
@ -4786,7 +4786,7 @@ _0802D5F6:
strb r0, [r2]
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
adds r0, r4, #0
movs r1, #0x2d
bl sub_080042AC
@ -4803,7 +4803,7 @@ _0802D61A:
strb r0, [r2]
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
adds r0, r4, #0
movs r1, #0x50
bl sub_08004260
@ -5038,7 +5038,7 @@ sub_0802D7B4: @ 0x0802D7B4
ldr r1, _0802D800 @ =gRoomControls
ldr r0, _0802D804 @ =gLinkEntity
str r0, [r1, #0x30]
ldr r0, _0802D808 @ =gUnk_03003F80
ldr r0, _0802D808 @ =gLinkState
adds r0, #0x8b
strb r2, [r0]
ldr r0, _0802D80C @ =gUnk_02034490
@ -5050,7 +5050,7 @@ sub_0802D7B4: @ 0x0802D7B4
_0802D7FC: .4byte gUnk_080CD7F8
_0802D800: .4byte gRoomControls
_0802D804: .4byte gLinkEntity
_0802D808: .4byte gUnk_03003F80
_0802D808: .4byte gLinkState
_0802D80C: .4byte gUnk_02034490
_0802D810:
strb r1, [r5, #0xe]
@ -5202,7 +5202,7 @@ _0802D924:
bne _0802D936
b _0802DB7E
_0802D936:
ldr r0, _0802D948 @ =gUnk_03003F80
ldr r0, _0802D948 @ =gLinkState
movs r1, #1
strb r1, [r0, #0x14]
adds r0, #0x3f
@ -5211,7 +5211,7 @@ _0802D936:
b _0802DB7E
.align 2, 0
_0802D944: .4byte gLinkEntity
_0802D948: .4byte gUnk_03003F80
_0802D948: .4byte gLinkState
_0802D94C:
adds r0, r4, #0
adds r0, #0x5a
@ -5241,7 +5241,7 @@ _0802D97A:
adds r0, r4, #0
movs r1, #0x67
movs r2, #0
bl sub_080A2988
bl CreateObjectWithParent
ldrb r0, [r4, #0xe]
adds r0, #1
strb r0, [r4, #0xe]
@ -5480,7 +5480,7 @@ _0802DB20:
str r1, [r0]
ldr r1, [r4, #0x54]
adds r0, r4, #0
bl sub_0806FA24
bl CopyPosition
b _0802D99C
_0802DB64:
ldr r1, _0802DB80 @ =gUnk_080CD810
@ -5832,7 +5832,7 @@ sub_0802DDD8: @ 0x0802DDD8
ldrb r0, [r0]
cmp r0, #2
bne _0802DE06
bl sub_08000E50
bl Random
movs r1, #1
ands r1, r0
cmp r1, #0
@ -5873,7 +5873,7 @@ _0802DE3E:
movs r4, #1
strb r4, [r5, #0xb]
strb r0, [r5, #0xf]
bl sub_08000E50
bl Random
ands r0, r4
cmp r0, #0
bne _0802DE58
@ -6225,7 +6225,7 @@ sub_0802E0B8: @ 0x0802E0B8
bl sub_0806FC80
cmp r0, #0
beq _0802E0F4
ldr r0, _0802E12C @ =gUnk_03003F80
ldr r0, _0802E12C @ =gLinkState
movs r1, #1
strb r1, [r0, #0x14]
adds r0, #0x3f
@ -6258,7 +6258,7 @@ _0802E0F4:
b _0802E1CA
.align 2, 0
_0802E128: .4byte gLinkEntity
_0802E12C: .4byte gUnk_03003F80
_0802E12C: .4byte gLinkState
_0802E130: .4byte gUnk_080CD844
_0802E134:
ldrb r1, [r4, #0x10]
@ -6372,7 +6372,7 @@ _0802E1F6:
bl sub_0806FC80
cmp r0, #0
beq _0802E218
ldr r0, _0802E284 @ =gUnk_03003F80
ldr r0, _0802E284 @ =gLinkState
movs r1, #1
strb r1, [r0, #0x14]
adds r0, #0x3f
@ -6431,7 +6431,7 @@ _0802E23A:
b _0802E2E4
.align 2, 0
_0802E280: .4byte gLinkEntity
_0802E284: .4byte gUnk_03003F80
_0802E284: .4byte gLinkState
_0802E288: .4byte gLCDControls
_0802E28C:
adds r4, r7, #0
@ -6448,7 +6448,7 @@ _0802E29E:
adds r0, r5, #0
movs r1, #0x67
movs r2, #1
bl sub_080A2988
bl CreateObjectWithParent
ldrh r0, [r4]
adds r0, #1
strh r0, [r4]
@ -6787,7 +6787,7 @@ sub_0802E518: @ 0x0802E518
mov sb, r0
ldr r1, [r0, #0x3c]
ldr r0, [r1, #0x50]
bl sub_0806FA24
bl CopyPosition
mov r0, sb
ldr r1, [r0, #0x3c]
ldrb r0, [r0, #1]
@ -6837,7 +6837,7 @@ _0802E580:
mov r2, sl
adds r5, r2, r4
ldr r1, [r5]
bl sub_0806FA24
bl CopyPosition
add r4, sb
ldrb r0, [r4, #0x19]
lsls r0, r0, #4
@ -7742,7 +7742,7 @@ sub_0802EBC4: @ 0x0802EBC4
_0802EC18: .4byte gUnk_080CD86C
_0802EC1C: .4byte gUnk_080CD878
_0802EC20:
bl sub_08000E50
bl Random
adds r1, r0, #0
movs r5, #1
ands r1, r5
@ -7983,7 +7983,7 @@ _0802EDE0:
strb r0, [r1]
adds r1, #0x34
strb r0, [r1]
bl sub_08000E50
bl Random
adds r1, r4, #0
adds r1, #0x78
strb r0, [r1]
@ -8035,13 +8035,13 @@ sub_0802EE38: @ 0x0802EE38
str r5, [r0, #0x50]
movs r0, #1
strb r0, [r5, #0xc]
bl sub_08000E50
bl Random
adds r4, r0, #0
movs r1, #3
ands r0, r1
adds r0, #1
strb r0, [r5, #0xe]
bl sub_08000E50
bl Random
lsrs r0, r0, #8
adds r1, r5, #0
adds r1, #0x78
@ -8193,7 +8193,7 @@ _0802EF5E:
bl UpdateSpriteOrderAndFlip
adds r0, r6, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
_0802EF86:
adds r5, #1
cmp r5, #6
@ -8227,7 +8227,7 @@ _0802EFB4: .4byte gUnk_080CDE90
sub_0802EFB8: @ 0x0802EFB8
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
bl sub_08000E50
bl Random
adds r6, r0, #0
lsrs r0, r6, #0x10
movs r1, #3
@ -8486,7 +8486,7 @@ _0802F196:
movs r0, #0xc0
b _0802F1B6
_0802F1A8:
bl sub_08000E50
bl Random
ldr r2, _0802F1DC @ =gUnk_080CDEF8
movs r1, #3
ands r1, r0
@ -8554,14 +8554,14 @@ sub_0802F210: @ 0x0802F210
movs r0, #1
strb r0, [r5, #0xc]
strb r4, [r5, #0xd]
bl sub_08000E50
bl Random
ldr r2, _0802F280 @ =gUnk_080CDEF8
movs r1, #3
ands r1, r0
adds r1, r1, r2
ldrb r0, [r1]
strb r0, [r5, #0xe]
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
ldrb r1, [r5, #0xe]
@ -8678,7 +8678,7 @@ sub_0802F300: @ 0x0802F300
bl sub_080AEF88
movs r0, #0x36
ldrsh r6, [r4, r0]
bl sub_08000E50
bl Random
adds r5, r0, #0
movs r0, #0xf
ands r5, r0
@ -8872,7 +8872,7 @@ _0802F472:
strb r0, [r4, #0x15]
b _0802F49E
_0802F48A:
bl sub_08000E50
bl Random
movs r1, #0xf
ands r1, r0
adds r1, #0x18
@ -9237,7 +9237,7 @@ _0802F742:
ldrb r0, [r2]
adds r0, #1
strb r0, [r2]
bl sub_08000E50
bl Random
movs r1, #0x3f
ands r0, r1
adds r0, #0x20
@ -9346,7 +9346,7 @@ _0802F818:
ldrb r0, [r2]
adds r0, #1
strb r0, [r2]
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
adds r0, #0x30
@ -9473,7 +9473,7 @@ sub_0802F8E4: @ 0x0802F8E4
ldr r1, _0802F9BC @ =gRoomControls
mov sb, r1
_0802F920:
bl sub_08000E50
bl Random
adds r4, r0, #0
ldr r2, [sp, #0xc]
ldrh r5, [r2]
@ -10038,7 +10038,7 @@ _0802FD6A:
ldrb r0, [r2]
adds r0, #1
strb r0, [r2]
bl sub_08000E50
bl Random
movs r1, #0x3f
ands r0, r1
adds r0, #0x1c
@ -10408,7 +10408,7 @@ _08030042:
ldrb r0, [r2]
adds r0, #1
strb r0, [r2]
bl sub_08000E50
bl Random
movs r1, #0x3f
ands r0, r1
adds r0, #0x18
@ -11309,7 +11309,7 @@ sub_080306C4: @ 0x080306C4
beq _080307CC
movs r0, #0
mov r8, r0
bl sub_08000E50
bl Random
movs r1, #7
ands r1, r0
cmp r1, #0
@ -11338,7 +11338,7 @@ _0803072A:
mov r7, r8
cmp r7, #0
bne _08030746
bl sub_08000E50
bl Random
movs r1, #2
ands r1, r0
subs r1, #1
@ -11514,7 +11514,7 @@ sub_0803086C: @ 0x0803086C
bne _08030880
b _0803099C
_08030880:
ldr r0, _08030928 @ =gUnk_03003F80
ldr r0, _08030928 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -11595,7 +11595,7 @@ _0803088E:
movs r0, #1
b _0803099E
.align 2, 0
_08030928: .4byte gUnk_03003F80
_08030928: .4byte gLinkState
_0803092C: .4byte gRoomControls
_08030930: .4byte 0x00004049
_08030934: .4byte gLinkEntity
@ -12335,7 +12335,7 @@ sub_08030E80: @ 0x08030E80
beq _08030EC0
adds r0, r6, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldr r1, _08030EFC @ =gUnk_080CE2F4
adds r0, r5, r1
ldrb r0, [r0]
@ -12362,7 +12362,7 @@ _08030EC0:
beq _08030EFA
adds r0, r6, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldr r1, _08030EFC @ =gUnk_080CE2F4
adds r0, r5, #2
adds r0, r0, r1
@ -13243,7 +13243,7 @@ _0803151E:
.align 2, 0
_08031574: .4byte gUnk_020000B0
_08031578:
bl sub_08000E50
bl Random
movs r1, #1
ands r1, r0
cmp r1, #0
@ -13317,7 +13317,7 @@ sub_08031600: @ 0x08031600
adds r4, r0, #0
movs r0, #2
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
movs r1, #0x30
ands r0, r1
adds r0, #0x3c
@ -13327,7 +13327,7 @@ sub_08031600: @ 0x08031600
adds r1, r4, #0
adds r1, #0x7a
strh r0, [r1]
bl sub_08000E50
bl Random
movs r1, #0x18
ands r0, r1
strb r0, [r4, #0x15]
@ -13478,7 +13478,7 @@ sub_08031714: @ 0x08031714
lsls r0, r0, #0x18
cmp r0, #0
bne _0803176E
bl sub_08000E50
bl Random
movs r1, #0xf
ands r0, r1
adds r0, #0x10
@ -13499,7 +13499,7 @@ _08031750:
ldrb r0, [r4, #0x15]
adds r0, #0x18
strb r0, [r4, #0x15]
bl sub_08000E50
bl Random
movs r1, #0xe
ands r0, r1
ldrb r1, [r4, #0x15]
@ -13534,7 +13534,7 @@ _08031790:
ldr r0, [r1, #0x54]
cmp r0, #0
bne _080317AA
bl sub_08000E50
bl Random
movs r1, #0x7f
ands r0, r1
movs r2, #0x80
@ -13555,7 +13555,7 @@ _080317B2:
sub_080317B4: @ 0x080317B4
push {r4, lr}
adds r4, r0, #0
bl sub_08000E50
bl Random
movs r1, #0x30
ands r1, r0
movs r2, #0xd
@ -13592,7 +13592,7 @@ sub_080317E0: @ 0x080317E0
sub_080317F8: @ 0x080317F8
push {r4, r5, r6, lr}
adds r4, r0, #0
bl sub_08000E50
bl Random
movs r1, #0x18
ands r0, r1
movs r5, #1
@ -13635,7 +13635,7 @@ sub_08031840: @ 0x08031840
beq _08031862
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
str r5, [r4, #0x50]
str r4, [r5, #0x54]
movs r0, #1
@ -13821,7 +13821,7 @@ _080319AC:
ldrb r0, [r1]
cmp r0, #0
bne _080319DE
bl sub_08000E50
bl Random
adds r2, r4, #0
adds r2, #0x3e
movs r1, #7
@ -13966,7 +13966,7 @@ sub_08031AA0: @ 0x08031AA0
adds r1, r4, #0
adds r1, #0x76
strh r0, [r1]
bl sub_08000E50
bl Random
adds r4, #0x79
strb r0, [r4]
pop {r4, pc}
@ -13988,7 +13988,7 @@ _08031AD8:
bl sub_08049FDC
cmp r0, #0
beq _08031B44
bl sub_08000E50
bl Random
adds r5, r0, #0
adds r0, r6, #0
adds r0, #0x74
@ -14061,7 +14061,7 @@ _08031B6C:
beq _08031B90
movs r0, #3
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
ldr r2, _08031B94 @ =gUnk_080CE5B0
movs r1, #7
ands r1, r0
@ -14159,7 +14159,7 @@ sub_08031C1C: @ 0x08031C1C
beq _08031C50
movs r0, #1
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
ldr r2, _08031C54 @ =gUnk_080CE5B8
movs r1, #7
ands r1, r0
@ -14197,7 +14197,7 @@ sub_08031C58: @ 0x08031C58
ldrb r0, [r0]
cmp r0, #0x42
bhi _08031D66
bl sub_08000E50
bl Random
adds r6, r0, #0
movs r0, #3
mov sb, r0
@ -14435,7 +14435,7 @@ sub_08031E48: @ 0x08031E48
push {r4, r5, lr}
adds r5, r0, #0
adds r4, r1, #0
bl sub_0806FA24
bl CopyPosition
adds r0, r5, #0
adds r0, #0x6c
ldrb r1, [r0]
@ -14505,7 +14505,7 @@ sub_08031EA8: @ 0x08031EA8
subs r0, r0, r1
lsls r0, r0, #1
strh r0, [r4, #0x36]
bl sub_08000E50
bl Random
adds r1, r4, #0
adds r1, #0x79
strb r0, [r1]
@ -14729,7 +14729,7 @@ _0803207C:
bl sub_08049FA0
cmp r0, #0
bne _0803209E
bl sub_08000E50
bl Random
movs r1, #1
ands r1, r0
cmp r1, #0
@ -14738,7 +14738,7 @@ _0803207C:
bl sub_08049EE4
b _080320A6
_0803209E:
bl sub_08000E50
bl Random
movs r1, #0x1e
ands r0, r1
_080320A6:
@ -14942,7 +14942,7 @@ sub_08032204: @ 0x08032204
beq _08032230
movs r0, #0
strb r0, [r2]
bl sub_08000E50
bl Random
movs r1, #0x30
ands r0, r1
adds r0, #0x1e
@ -15515,7 +15515,7 @@ _0803264E:
sub_08032650: @ 0x08032650
push {r4, r5, lr}
adds r4, r0, #0
bl sub_08000E50
bl Random
adds r5, r0, #0
ldr r1, _08032680 @ =gUnk_080CE7E0
movs r0, #0xf
@ -15605,7 +15605,7 @@ _080326F8:
sub_080326FC: @ 0x080326FC
push {r4, lr}
adds r4, r0, #0
bl sub_08000E50
bl Random
ldr r2, _08032718 @ =gUnk_080CE7F0
movs r1, #0xf
ands r1, r0
@ -16429,7 +16429,7 @@ _08032CF0:
ldrb r0, [r0]
strb r0, [r4, #0x15]
ldrb r5, [r4, #0x15]
bl sub_08000E50
bl Random
movs r1, #0x40
ands r1, r0
cmp r1, #0
@ -16895,7 +16895,7 @@ sub_08033058: @ 0x08033058
strb r6, [r5, #0xc]
adds r0, #0x80
strb r6, [r0]
bl sub_08000E50
bl Random
ldr r1, _080330A0 @ =gUnk_080CEA50
movs r4, #3
ands r0, r4
@ -16906,14 +16906,14 @@ sub_08033058: @ 0x08033058
bl sub_08049FA0
cmp r0, #0
bne _080330A8
bl sub_08000E50
bl Random
ands r0, r4
cmp r0, #0
beq _080330A8
adds r0, r5, #0
bl sub_08049EE4
adds r4, r0, #0
bl sub_08000E50
bl Random
ldr r1, _080330A4 @ =gUnk_080CEA54
ands r0, r6
adds r0, r0, r1
@ -16924,7 +16924,7 @@ sub_08033058: @ 0x08033058
_080330A0: .4byte gUnk_080CEA50
_080330A4: .4byte gUnk_080CEA54
_080330A8:
bl sub_08000E50
bl Random
_080330AC:
movs r1, #0x18
ands r0, r1
@ -16949,7 +16949,7 @@ sub_080330C0: @ 0x080330C0
ldrb r0, [r4, #0xa]
cmp r0, #0
bne _080330E2
bl sub_08000E50
bl Random
movs r1, #0x38
ands r0, r1
adds r0, #0x18
@ -17017,7 +17017,7 @@ _08033150:
adds r1, #0x83
movs r0, #0
strb r0, [r1]
bl sub_08000E50
bl Random
movs r1, #0x80
ands r0, r1
adds r1, r4, #0
@ -17050,7 +17050,7 @@ sub_08033174: @ 0x08033174
ldrb r0, [r4, #0xa]
cmp r0, #0
bne _080331A4
bl sub_08000E50
bl Random
movs r1, #0x18
ands r0, r1
adds r0, #0x18
@ -17069,7 +17069,7 @@ _080331A6:
sub_080331B4: @ 0x080331B4
push {r4, lr}
adds r4, r0, #0
bl sub_08000E50
bl Random
adds r1, r0, #0
movs r0, #0xf0
ands r1, r0
@ -17284,7 +17284,7 @@ sub_08033320: @ 0x08033320
beq _08033350
cmp r1, #2
beq _08033354
bl sub_08000E50
bl Random
movs r1, #0x10
ands r1, r0
movs r0, #0x1c
@ -17375,7 +17375,7 @@ sub_080333D4: @ 0x080333D4
bne _0803340E
movs r0, #1
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
movs r1, #0xf
ands r0, r1
strb r0, [r4, #0xe]
@ -17480,7 +17480,7 @@ _080334E0:
cmp r1, #0
beq _080334F6
adds r0, r4, #0
bl sub_0806FA24
bl CopyPosition
_080334F6:
bl sub_0805E780
_080334FA:
@ -17586,7 +17586,7 @@ _08033590:
movs r0, #0x9f
lsls r0, r0, #2
strh r0, [r1]
ldr r2, _080335DC @ =gUnk_03003F80
ldr r2, _080335DC @ =gLinkState
ldr r0, [r2, #0x30]
movs r1, #0x80
lsls r1, r1, #7
@ -17608,7 +17608,7 @@ _08033590:
bl sub_0805E780
b _08033628
.align 2, 0
_080335DC: .4byte gUnk_03003F80
_080335DC: .4byte gLinkState
_080335E0: .4byte gUnk_02002A40
_080335E4:
adds r1, r4, #0
@ -17641,7 +17641,7 @@ _080335EE:
movs r0, #0xe
strb r0, [r4, #0xe]
adds r0, r4, #0
bl sub_0806FA24
bl CopyPosition
_08033624:
bl sub_0805E780
_08033628:
@ -17807,7 +17807,7 @@ _08033740:
sub_08033744: @ 0x08033744
push {r4, r5, r6, lr}
adds r6, r0, #0
bl sub_08000E50
bl Random
adds r5, r0, #0
movs r0, #0xff
ands r5, r0
@ -18053,7 +18053,7 @@ sub_08033890: @ 0x08033890
_08033928:
adds r0, r6, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
str r4, [r6, #0x54]
str r6, [r4, #0x50]
ldrb r0, [r6, #0xa]
@ -18556,7 +18556,7 @@ _08033CD2:
bl sub_08049F84
adds r0, #0x14
strb r0, [r4, #0x15]
bl sub_08000E50
bl Random
adds r1, r0, #0
movs r0, #3
ands r1, r0
@ -18586,7 +18586,7 @@ _08033D2A:
lsls r0, r0, #0x18
cmp r0, #0
bne _08033D76
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
adds r0, #0x20
@ -18596,7 +18596,7 @@ _08033D2A:
bl sub_08049F84
adds r0, #0x14
strb r0, [r4, #0x15]
bl sub_08000E50
bl Random
adds r1, r0, #0
movs r0, #3
ands r1, r0
@ -18785,7 +18785,7 @@ _08033EA4: .4byte 0xFFF00000
sub_08033EA8: @ 0x08033EA8
push {lr}
adds r2, r0, #0
ldr r0, _08033EC4 @ =gUnk_03003F80
ldr r0, _08033EC4 @ =gLinkState
adds r0, #0xac
ldrh r1, [r0]
movs r0, #8
@ -18797,7 +18797,7 @@ sub_08033EA8: @ 0x08033EA8
movs r0, #0x95
b _08033ECE
.align 2, 0
_08033EC4: .4byte gUnk_03003F80
_08033EC4: .4byte gLinkState
_08033EC8:
adds r1, r2, #0
adds r1, #0x3f

542
asm/code_08033FFC.s
View File

File diff suppressed because it is too large Load Diff

6
asm/code_0804B058.s
View File

@ -1082,7 +1082,7 @@ sub_0804B7A8: @ 0x0804B7A8
bl sub_0807CBD0
cmp r0, #0
beq _0804B7C8
bl sub_08000E50
bl Random
movs r1, #3
bl __modsi3
adds r4, r0, #0
@ -1145,7 +1145,7 @@ sub_0804B82C: @ 0x0804B82C
bl sub_0807CBD0
cmp r0, #0
beq _0804B84A
bl sub_08000E50
bl Random
adds r4, r0, #0
movs r0, #1
ands r4, r0
@ -1208,7 +1208,7 @@ sub_0804B8B0: @ 0x0804B8B0
bl sub_0807CBD0
cmp r0, #0
beq _0804B8D0
bl sub_08000E50
bl Random
movs r1, #3
bl __modsi3
adds r4, r0, #0

14
asm/code_0804B9F8.s
View File

@ -7226,7 +7226,7 @@ _0804E3DE:
beq _0804E3EA
movs r6, #3
_0804E3EA:
bl sub_08000E50
bl Random
adds r4, r0, #0
ldr r1, _0804E448 @ =gUnk_080F0D58
lsls r0, r6, #2
@ -7745,7 +7745,7 @@ sub_0804E7A4: @ 0x0804E7A4
bl GetProgressFlag
cmp r0, #0
bne _0804E7CC
ldr r0, _0804E7D0 @ =gUnk_03003F80
ldr r0, _0804E7D0 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -7756,7 +7756,7 @@ sub_0804E7A4: @ 0x0804E7A4
_0804E7CC:
pop {pc}
.align 2, 0
_0804E7D0: .4byte gUnk_03003F80
_0804E7D0: .4byte gLinkState
_0804E7D4: .4byte gUnk_080F30CC
thumb_func_start sub_0804E7D8
@ -7807,7 +7807,7 @@ _0804E818:
ldr r0, _0804E858 @ =0x800B0036
bl PlaySFX
_0804E838:
ldr r0, _0804E85C @ =gUnk_03003F80
ldr r0, _0804E85C @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #8
ands r0, r1
@ -7822,7 +7822,7 @@ _0804E84C: .4byte gUnk_02000070
_0804E850: .4byte gUnk_08009B30
_0804E854: .4byte gUnk_02033A90
_0804E858: .4byte 0x800B0036
_0804E85C: .4byte gUnk_03003F80
_0804E85C: .4byte gLinkState
_0804E860: .4byte gUnk_080F31D8
thumb_func_start sub_0804E864
@ -8725,7 +8725,7 @@ _0804EEF4: .4byte gUnk_080F5758
_0804EEF8: .4byte gUnk_080F57E8
_0804EEFC: .4byte gUnk_080F57A8
_0804EF00:
ldr r1, _0804EF34 @ =gUnk_080FD5A0
ldr r1, _0804EF34 @ =gBombBagSizes
ldr r0, _0804EF38 @ =gUnk_02002A40
adds r0, #0xae
ldrb r0, [r0]
@ -8748,7 +8748,7 @@ _0804EF16:
bl LoadRoomEntityList
b _0804EF54
.align 2, 0
_0804EF34: .4byte gUnk_080FD5A0
_0804EF34: .4byte gBombBagSizes
_0804EF38: .4byte gUnk_02002A40
_0804EF3C: .4byte gUnk_080F57C8
_0804EF40: .4byte gUnk_080F5888

10
asm/code_08050038.s
View File

@ -812,7 +812,7 @@ _08050690:
bne _080506AA
movs r0, #1
strb r0, [r4, #2]
bl sub_08000E50
bl Random
movs r1, #7
ands r1, r0
lsls r1, r1, #4
@ -3550,7 +3550,7 @@ _08051C60: .4byte gTextBox
_08051C64: .4byte gUnk_03003DC0
_08051C68: .4byte gRoomControls
_08051C6C:
ldr r0, _08051C80 @ =gUnk_03003F80
ldr r0, _08051C80 @ =gLinkState
movs r1, #0x17
strb r1, [r0, #0xc]
ldr r0, _08051C84 @ =gUnk_03001000
@ -3559,10 +3559,10 @@ _08051C6C:
bl sub_08051D98
b _08051C9C
.align 2, 0
_08051C80: .4byte gUnk_03003F80
_08051C80: .4byte gLinkState
_08051C84: .4byte gUnk_03001000
_08051C88:
ldr r1, _08051CA0 @ =gUnk_03003F80
ldr r1, _08051CA0 @ =gLinkState
movs r0, #0x17
strb r0, [r1, #0xc]
ldr r1, _08051CA4 @ =gUnk_03001000
@ -3573,7 +3573,7 @@ _08051C88:
_08051C9C:
pop {pc}
.align 2, 0
_08051CA0: .4byte gUnk_03003F80
_08051CA0: .4byte gLinkState
_08051CA4: .4byte gUnk_03001000
thumb_func_start sub_08051CA8

3571
asm/code_080526F8.s
View File

File diff suppressed because it is too large Load Diff

3483
asm/code_0805436C.s Normal file
View File

File diff suppressed because it is too large Load Diff

80
asm/code_08056418.s
View File

@ -2478,7 +2478,7 @@ _080576EC:
_08057738: .4byte gUnk_02033A90
_0805773C: .4byte gUnk_08107C6C
_08057740:
ldr r2, _08057758 @ =gUnk_03003F80
ldr r2, _08057758 @ =gLinkState
ldr r0, [r2, #0x30]
movs r1, #0x20
ands r0, r1
@ -2491,7 +2491,7 @@ _08057740:
strb r0, [r5, #0x18]
b _0805776A
.align 2, 0
_08057758: .4byte gUnk_03003F80
_08057758: .4byte gLinkState
_0805775C:
bl sub_08057810
cmp r0, #0
@ -2540,7 +2540,7 @@ sub_080577AC: @ 0x080577AC
adds r6, r0, #0
adds r7, r1, #0
mov r8, r2
bl sub_08000E50
bl Random
adds r5, r0, #0
movs r0, #7
ands r0, r5
@ -2588,7 +2588,7 @@ _08057808:
thumb_func_start sub_08057810
sub_08057810: @ 0x08057810
push {lr}
ldr r2, _08057848 @ =gUnk_03003F80
ldr r2, _08057848 @ =gLinkState
ldr r0, [r2, #0x30]
movs r1, #0x80
ands r0, r1
@ -2616,7 +2616,7 @@ sub_08057810: @ 0x08057810
movs r0, #1
b _08057852
.align 2, 0
_08057848: .4byte gUnk_03003F80
_08057848: .4byte gLinkState
_0805784C: .4byte gUnk_02033A90
_08057850:
movs r0, #0
@ -3220,7 +3220,7 @@ _08057CD6:
ldrb r0, [r4, #0xe]
cmp r0, #0
beq _08057CE4
ldr r0, _08057D44 @ =gUnk_03003F80
ldr r0, _08057D44 @ =gLinkState
ldrb r0, [r0, #0x12]
cmp r0, #0x1e
bne _08057D42
@ -3242,7 +3242,7 @@ _08057CF2:
ands r0, r1
cmp r0, #0
beq _08057D3A
ldr r0, _08057D44 @ =gUnk_03003F80
ldr r0, _08057D44 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -3275,7 +3275,7 @@ _08057D3A:
_08057D42:
pop {r4, r5, r6, pc}
.align 2, 0
_08057D44: .4byte gUnk_03003F80
_08057D44: .4byte gLinkState
_08057D48: .4byte 0x0000FFFF
_08057D4C: .4byte gLinkEntity
@ -4145,7 +4145,7 @@ _08058404:
sub_08058408: @ 0x08058408
push {r4, r5, r6, lr}
adds r4, r0, #0
ldr r6, _0805843C @ =gUnk_03003F80
ldr r6, _0805843C @ =gLinkState
ldr r5, [r6, #0x30]
movs r0, #8
ands r5, r0
@ -4169,7 +4169,7 @@ sub_08058408: @ 0x08058408
beq _0805847C
b _08058450
.align 2, 0
_0805843C: .4byte gUnk_03003F80
_0805843C: .4byte gLinkState
_08058440:
adds r0, r4, #0
bl sub_080585DC
@ -4209,7 +4209,7 @@ _08058488:
thumb_func_start sub_0805848C
sub_0805848C: @ 0x0805848C
push {lr}
ldr r0, _080584A4 @ =gUnk_03003F80
ldr r0, _080584A4 @ =gLinkState
adds r0, #0xa8
ldrb r0, [r0]
subs r0, #5
@ -4221,7 +4221,7 @@ sub_0805848C: @ 0x0805848C
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080584A4: .4byte gUnk_03003F80
_080584A4: .4byte gLinkState
_080584A8: .4byte _080584AC
_080584AC: @ jump table
.4byte _0805850C @ case 0
@ -4275,7 +4275,7 @@ _08058528:
beq _08058584
b _080585A6
_08058532:
ldr r2, _08058564 @ =gUnk_03003F80
ldr r2, _08058564 @ =gLinkState
ldr r0, [r2, #0x30]
ldr r1, _08058568 @ =0x00001235
ands r0, r1
@ -4299,7 +4299,7 @@ _08058532:
strb r0, [r4, #0xe]
b _080585A6
.align 2, 0
_08058564: .4byte gUnk_03003F80
_08058564: .4byte gLinkState
_08058568: .4byte 0x00001235
_0805856C: .4byte gLinkEntity
_08058570:
@ -4321,11 +4321,11 @@ _08058584:
cmp r0, #9
bne _080585A6
_08058590:
ldr r0, _080585AC @ =gUnk_03003F80
ldr r0, _080585AC @ =gLinkState
adds r0, #0x8b
movs r1, #1
strb r1, [r0]
bl sub_0805E564
bl UnfreezeTime
ldrh r0, [r4, #0x3c]
bl sub_0807CCC8
bl sub_0805E780
@ -4333,7 +4333,7 @@ _080585A6:
pop {r4, pc}
.align 2, 0
_080585A8: .4byte gLinkEntity
_080585AC: .4byte gUnk_03003F80
_080585AC: .4byte gLinkState
thumb_func_start sub_080585B0
sub_080585B0: @ 0x080585B0
@ -4964,7 +4964,7 @@ sub_08058A04: @ 0x08058A04
ldrsh r2, [r6, r0]
cmp r2, #0
bne _08058A78
ldr r0, _08058A74 @ =gUnk_03003F80
ldr r0, _08058A74 @ =gLinkState
movs r1, #3
strb r1, [r0, #0xc]
adds r0, #0x38
@ -4980,7 +4980,7 @@ sub_08058A04: @ 0x08058A04
_08058A68: .4byte gLinkEntity
_08058A6C: .4byte gRoomControls
_08058A70: .4byte 0xFFFFFEE8
_08058A74: .4byte gUnk_03003F80
_08058A74: .4byte gLinkState
_08058A78:
mov r1, r8
cmp r1, #0x77
@ -6193,7 +6193,7 @@ _080593CA:
sub_080593CC: @ 0x080593CC
push {r4, lr}
adds r3, r0, #0
ldr r2, _08059418 @ =gUnk_03003F80
ldr r2, _08059418 @ =gLinkState
ldr r0, [r2, #0x30]
movs r1, #0x80
ands r0, r1
@ -6228,7 +6228,7 @@ sub_080593CC: @ 0x080593CC
bl sub_0806FCB8
b _08059422
.align 2, 0
_08059418: .4byte gUnk_03003F80
_08059418: .4byte gLinkState
_0805941C: .4byte gLinkEntity
_08059420:
movs r0, #0
@ -8712,7 +8712,7 @@ sub_0805A76C: @ 0x0805A76C
ldrsh r0, [r5, r1]
cmp r0, #0
bne _0805A7D0
ldr r0, _0805A7D8 @ =gUnk_03003F80
ldr r0, _0805A7D8 @ =gLinkState
ldr r6, [r0, #0x2c]
cmp r6, #0
bne _0805A7D0
@ -8749,14 +8749,14 @@ _0805A7D0:
pop {r4, r5, r6, pc}
.align 2, 0
_0805A7D4: .4byte gLinkEntity
_0805A7D8: .4byte gUnk_03003F80
_0805A7D8: .4byte gLinkState
_0805A7DC: .4byte gUnk_02034490
_0805A7E0: .4byte gRoomControls
thumb_func_start sub_0805A7E4
sub_0805A7E4: @ 0x0805A7E4
push {lr}
ldr r2, _0805A800 @ =gUnk_03003F80
ldr r2, _0805A800 @ =gLinkState
ldrb r0, [r2, #0xc]
cmp r0, #0x12
beq _0805A7FE
@ -8771,7 +8771,7 @@ sub_0805A7E4: @ 0x0805A7E4
_0805A7FE:
pop {pc}
.align 2, 0
_0805A800: .4byte gUnk_03003F80
_0805A800: .4byte gLinkState
thumb_func_start sub_0805A804
sub_0805A804: @ 0x0805A804
@ -10050,7 +10050,7 @@ sub_0805B1CC: @ 0x0805B1CC
bl sub_0806FBFC
cmp r0, #0
beq _0805B20C
ldr r2, _0805B1FC @ =gUnk_03003F80
ldr r2, _0805B1FC @ =gLinkState
ldr r1, [r2, #0x30]
movs r0, #5
ands r0, r1
@ -10062,7 +10062,7 @@ sub_0805B1CC: @ 0x0805B1CC
str r1, [r2, #0x30]
b _0805B20C
.align 2, 0
_0805B1FC: .4byte gUnk_03003F80
_0805B1FC: .4byte gLinkState
_0805B200:
movs r0, #0x80
lsls r0, r0, #8
@ -10095,7 +10095,7 @@ sub_0805B210: @ 0x0805B210
strb r0, [r2, #0xd]
ldrb r0, [r4, #3]
strb r0, [r2, #0x14]
ldr r0, _0805B250 @ =gUnk_03003F80
ldr r0, _0805B250 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -10107,7 +10107,7 @@ sub_0805B210: @ 0x0805B210
.align 2, 0
_0805B248: .4byte gUnk_030010A0
_0805B24C: .4byte gUnk_08108764
_0805B250: .4byte gUnk_03003F80
_0805B250: .4byte gLinkState
_0805B254:
movs r0, #2
_0805B256:
@ -10532,7 +10532,7 @@ sub_0805B55C: @ 0x0805B55C
adds r5, r0, #0
cmp r5, #0
beq _0805B5B4
bl sub_08000E50
bl Random
ldr r4, _0805B5B8 @ =gRoomControls
ldr r2, _0805B5BC @ =gUnk_08108C6C
movs r1, #7
@ -10544,7 +10544,7 @@ sub_0805B55C: @ 0x0805B55C
ldrh r1, [r4, #0xa]
adds r0, r0, r1
strh r0, [r5, #0x2e]
bl sub_08000E50
bl Random
ldr r2, _0805B5C0 @ =gUnk_08108C7C
movs r1, #3
ands r1, r0
@ -11095,7 +11095,7 @@ _0805B9B4:
_0805B9BC:
strh r0, [r2]
ldrb r4, [r5, #0xe]
ldr r0, _0805B9F0 @ =gUnk_03003F80
ldr r0, _0805B9F0 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
lsls r1, r1, #0x10
@ -11117,7 +11117,7 @@ _0805B9BC:
.align 2, 0
_0805B9E8: .4byte gLCDControls
_0805B9EC: .4byte 0x0000DFFF
_0805B9F0: .4byte gUnk_03003F80
_0805B9F0: .4byte gLinkState
_0805B9F4: .4byte gUnk_02033A90
_0805B9F8:
ldr r0, _0805BA24 @ =gUnk_030010A0
@ -12881,7 +12881,7 @@ sub_0805C7C4: @ 0x0805C7C4
sub_0805C7CC: @ 0x0805C7CC
push {lr}
adds r2, r0, #0
ldr r0, _0805C7F0 @ =gUnk_03003F80
ldr r0, _0805C7F0 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -12897,7 +12897,7 @@ sub_0805C7CC: @ 0x0805C7CC
movs r0, #1
b _0805C816
.align 2, 0
_0805C7F0: .4byte gUnk_03003F80
_0805C7F0: .4byte gLinkState
_0805C7F4: .4byte gLinkEntity
_0805C7F8:
movs r0, #0
@ -14835,7 +14835,7 @@ _0805D700:
bl GetProgressFlag
cmp r0, #0
bne _0805D760
bl sub_08000E50
bl Random
ldrh r1, [r4, #2]
bl __modsi3
adds r2, r0, #0
@ -15391,7 +15391,7 @@ sub_0805DAE8: @ 0x0805DAE8
rsbs r0, r0, #0
cmp r1, r0
bge _0805DB88
ldr r0, _0805DB54 @ =gUnk_03003F80
ldr r0, _0805DB54 @ =gLinkState
adds r0, #0xa8
ldrb r0, [r0]
cmp r0, #0x14
@ -15406,7 +15406,7 @@ sub_0805DAE8: @ 0x0805DAE8
.align 2, 0
_0805DB4C: .4byte gRoomControls
_0805DB50: .4byte gLinkEntity
_0805DB54: .4byte gUnk_03003F80
_0805DB54: .4byte gLinkState
_0805DB58:
ldrb r0, [r2, #0xe]
subs r0, #1
@ -16264,7 +16264,7 @@ sub_0805E18C: @ 0x0805E18C
cmp r0, #0
bne _0805E1BA
strb r0, [r4, #0xb]
ldr r0, _0805E1D4 @ =gUnk_03003F80
ldr r0, _0805E1D4 @ =gLinkState
adds r0, #0x8b
movs r1, #1
strb r1, [r0]
@ -16282,7 +16282,7 @@ _0805E1CC:
pop {r4, pc}
.align 2, 0
_0805E1D0: .4byte gUnk_03000FD0
_0805E1D4: .4byte gUnk_03003F80
_0805E1D4: .4byte gLinkState
thumb_func_start sub_0805E1D8
sub_0805E1D8: @ 0x0805E1D8

4
asm/code_0805E3B0.s
View File

@ -263,8 +263,8 @@ sub_0805E544: @ 0x0805E544
_0805E55C: .4byte gUnk_03003DC0
_0805E560: .4byte gLinkEntity
thumb_func_start sub_0805E564
sub_0805E564: @ 0x0805E564
thumb_func_start UnfreezeTime
UnfreezeTime: @ 0x0805E564
ldr r1, _0805E57C @ =gUnk_03003DC0
movs r0, #0
strb r0, [r1]

114
asm/code_0805E744.s
View File

@ -834,7 +834,7 @@ _0805ED10: .4byte 0x00000427
thumb_func_start sub_0805ED14
sub_0805ED14: @ 0x0805ED14
ldr r2, _0805ED2C @ =gUnk_03003F80
ldr r2, _0805ED2C @ =gLinkState
adds r1, r2, #0
adds r1, #0x9c
str r0, [r1]
@ -846,12 +846,12 @@ sub_0805ED14: @ 0x0805ED14
strh r1, [r0]
bx lr
.align 2, 0
_0805ED2C: .4byte gUnk_03003F80
_0805ED2C: .4byte gLinkState
thumb_func_start sub_0805ED30
sub_0805ED30: @ 0x0805ED30
push {r4, lr}
ldr r2, _0805ED50 @ =gUnk_03003F80
ldr r2, _0805ED50 @ =gLinkState
adds r0, r2, #0
adds r0, #0x9c
ldr r0, [r0]
@ -867,7 +867,7 @@ sub_0805ED30: @ 0x0805ED30
movs r4, #0
b _0805ED62
.align 2, 0
_0805ED50: .4byte gUnk_03003F80
_0805ED50: .4byte gLinkState
_0805ED54:
cmp r0, #2
beq _0805ED5E
@ -940,7 +940,7 @@ _0805EDC6:
_0805EDCA:
adds r0, r1, #0
bl sub_0805EE04
ldr r3, _0805EDFC @ =gUnk_03003F80
ldr r3, _0805EDFC @ =gLinkState
adds r1, r3, #0
adds r1, #0x90
ldrh r2, [r1]
@ -961,7 +961,7 @@ _0805EDCA:
pop {r4, pc}
.align 2, 0
_0805EDF8: .4byte gUnk_03000FF0
_0805EDFC: .4byte gUnk_03003F80
_0805EDFC: .4byte gLinkState
_0805EE00: .4byte gUnk_08109202
thumb_func_start sub_0805EE04
@ -2795,7 +2795,7 @@ sub_0805FBE8: @ 0x0805FBE8
ldr r4, _0805FC68 @ =gLinkEntity
adds r0, r4, #0
adds r1, r5, #0
bl sub_0806FA24
bl CopyPosition
ldrb r0, [r5, #0xc]
adds r0, #1
strb r0, [r5, #0xc]
@ -3694,7 +3694,7 @@ sub_080602BC: @ 0x080602BC
bl GetInventoryValue
cmp r0, #0
beq _080602D6
bl sub_08000E50
bl Random
movs r1, #1
ands r1, r0
adds r2, r1, #2
@ -3703,7 +3703,7 @@ _080602D6:
ldr r0, _08060300 @ =gUnk_02002A40
adds r2, r0, #0
adds r2, #0xac
ldr r1, _08060304 @ =gUnk_080FD5A0
ldr r1, _08060304 @ =gBombBagSizes
adds r0, #0xae
ldrb r0, [r0]
adds r0, r0, r1
@ -3723,14 +3723,14 @@ _080602F0:
pop {r4, pc}
.align 2, 0
_08060300: .4byte gUnk_02002A40
_08060304: .4byte gUnk_080FD5A0
_08060304: .4byte gBombBagSizes
_08060308: .4byte gUnk_0810A362
thumb_func_start sub_0806030C
sub_0806030C: @ 0x0806030C
push {lr}
ldr r0, [r1, #4]
bl sub_080542F4
bl ModBombs
pop {pc}
.align 2, 0
@ -4372,7 +4372,7 @@ _080607FC:
movs r5, #0
ldrsb r5, [r6, r5]
adds r6, #1
bl sub_08000E50
bl Random
adds r1, r5, #0
bl __modsi3
adds r0, r6, r0
@ -4412,7 +4412,7 @@ _08060846:
movs r5, #0
ldrsb r5, [r6, r5]
adds r6, #1
bl sub_08000E50
bl Random
adds r1, r5, #0
bl __modsi3
str r0, [sp, #4]
@ -4609,7 +4609,7 @@ CreateZeldaFollower: @ 0x080609AC
beq _080609E0
ldr r0, _080609E4 @ =gLinkEntity
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldrb r1, [r4, #0x10]
movs r0, #0x20
orrs r0, r1
@ -4639,7 +4639,7 @@ _080609FC: .4byte gUnk_0810AC1C
sub_08060A00: @ 0x08060A00
push {r4, r5, lr}
adds r5, r0, #0
ldr r0, _08060AD0 @ =gUnk_03003F80
ldr r0, _08060AD0 @ =gLinkState
ldrb r1, [r0, #2]
movs r0, #0x80
ands r0, r1
@ -4709,7 +4709,7 @@ _08060A76:
strh r1, [r2]
ldr r0, _08060AD4 @ =gLinkEntity
adds r1, r5, #0
bl sub_0806FA24
bl CopyPosition
movs r2, #1
movs r0, #1
strb r0, [r5, #0xc]
@ -4728,7 +4728,7 @@ _08060A76:
lsrs r1, r1, #0x19
adds r0, r5, #0
bl sub_080042AC
bl sub_08000E50
bl Random
movs r1, #0x7f
ands r0, r1
adds r0, #0x80
@ -4743,7 +4743,7 @@ _08060A76:
_08060ACE:
pop {r4, r5, pc}
.align 2, 0
_08060AD0: .4byte gUnk_03003F80
_08060AD0: .4byte gLinkState
_08060AD4: .4byte gLinkEntity
_08060AD8: .4byte gUnk_0810AC2C
_08060ADC: .4byte gRoomControls
@ -5242,7 +5242,7 @@ sub_08060E94: @ 0x08060E94
lsrs r1, r1, #1
adds r0, r4, #0
bl sub_080042AC
bl sub_08000E50
bl Random
movs r1, #0x7f
ands r0, r1
adds r0, #0x80
@ -5870,7 +5870,7 @@ _0806139C:
lsls r0, r0, #0x18
cmp r0, #0
bne _08061460
bl sub_08000E50
bl Random
adds r6, r0, #0
ands r5, r6
cmp r5, #0
@ -5902,7 +5902,7 @@ _080613D0:
ands r0, r1
lsrs r0, r0, #2
strb r0, [r4, #0x14]
bl sub_08000E50
bl Random
adds r1, r0, #0
movs r0, #1
ands r1, r0
@ -6834,7 +6834,7 @@ sub_08061AA8: @ 0x08061AA8
bl _call_via_r1
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
pop {r4, pc}
.align 2, 0
_08061AC8: .4byte gUnk_0810AC70
@ -7345,12 +7345,12 @@ sub_08061E90: @ 0x08061E90
bne _08061F04
adds r0, #1
strb r0, [r5, #0x18]
bl sub_08000E50
bl Random
movs r1, #0x3f
ands r0, r1
adds r0, #0x20
strh r0, [r5, #0x12]
bl sub_08000E50
bl Random
adds r1, r0, #0
movs r0, #0x18
ands r1, r0
@ -7964,7 +7964,7 @@ sub_080622F4: @ 0x080622F4
ldrh r0, [r1, #0x36]
ands r3, r6
orrs r3, r0
ldr r0, _080623A8 @ =gUnk_03003F80
ldr r0, _080623A8 @ =gLinkState
adds r0, #0xa8
ldrb r0, [r0]
lsls r0, r0, #0x10
@ -8031,7 +8031,7 @@ _08062390:
_0806239C: .4byte gLinkEntity
_080623A0: .4byte 0xFFFF0000
_080623A4: .4byte 0x0000FFFF
_080623A8: .4byte gUnk_03003F80
_080623A8: .4byte gLinkState
_080623AC: .4byte 0xFF00FFFF
_080623B0: .4byte 0xC0FFFFFF
_080623B4: .4byte 0x3FFFFFFF
@ -8257,7 +8257,7 @@ sub_0806252C: @ 0x0806252C
ldrh r0, [r4, #0x36]
ands r3, r6
orrs r3, r0
ldr r0, _08062624 @ =gUnk_03003F80
ldr r0, _08062624 @ =gLinkState
adds r0, #0xa8
ldrb r0, [r0]
lsls r0, r0, #0x10
@ -8357,7 +8357,7 @@ _080625C8:
_08062618: .4byte gLinkEntity
_0806261C: .4byte 0xFFFF0000
_08062620: .4byte 0x0000FFFF
_08062624: .4byte gUnk_03003F80
_08062624: .4byte gLinkState
_08062628: .4byte 0xFF00FFFF
_0806262C: .4byte 0xC0FFFFFF
_08062630: .4byte 0x3FFFFFFF
@ -8367,7 +8367,7 @@ sub_08062634: @ 0x08062634
push {r4, r5, lr}
adds r5, r0, #0
ldrb r4, [r5, #0xb]
bl sub_08000E50
bl Random
movs r1, #1
ands r1, r0
ldr r0, _08062658 @ =gUnk_0810BDE8
@ -8417,7 +8417,7 @@ _08062694: .4byte gUnk_0810BE10
sub_08062698: @ 0x08062698
push {r4, lr}
adds r4, r0, #0
bl sub_08000E50
bl Random
movs r1, #0x3f
ands r0, r1
adds r0, #0xc0
@ -8429,7 +8429,7 @@ sub_08062698: @ 0x08062698
sub_080626AC: @ 0x080626AC
push {r4, lr}
adds r4, r0, #0
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
adds r0, #0x40
@ -8503,7 +8503,7 @@ _0806270E:
subs r1, r1, r2
bl sub_080045DA
strb r0, [r5, #0x15]
bl sub_08000E50
bl Random
movs r1, #0xb
bl __modsi3
ldrb r1, [r5, #0x15]
@ -8746,12 +8746,12 @@ sub_08062948: @ 0x08062948
bne _080629B4
adds r0, #1
strb r0, [r6, #0x18]
bl sub_08000E50
bl Random
movs r1, #0x3f
ands r0, r1
adds r0, #0x20
strh r0, [r6, #0x12]
bl sub_08000E50
bl Random
adds r1, r0, #0
movs r0, #0x18
ands r1, r0
@ -9520,7 +9520,7 @@ _08062F12:
bl sub_0807CCB4
movs r4, #4
_08062F24:
bl sub_08000E50
bl Random
movs r1, #0xff
ands r1, r0
ldr r0, _08062F58 @ =gUnk_0810C430
@ -10392,7 +10392,7 @@ sub_08063584: @ 0x08063584
ldrb r0, [r4, #0xf]
cmp r0, #0
bne _080635B8
bl sub_08000E50
bl Random
movs r1, #0x3f
ands r1, r0
cmp r1, #0
@ -10717,7 +10717,7 @@ _08063804:
ldrb r0, [r5]
cmp r0, #0xfe
bne _08063828
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
adds r0, #0x1e
@ -10998,7 +10998,7 @@ _08063A40:
ldrb r0, [r5]
cmp r0, #0xfe
bne _08063A56
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
adds r0, #0x1e
@ -11075,7 +11075,7 @@ sub_08063AC0: @ 0x08063AC0
ldrb r0, [r4, #0xf]
cmp r0, #0
bne _08063AF4
bl sub_08000E50
bl Random
movs r1, #0x3f
ands r1, r0
cmp r1, #0
@ -11840,12 +11840,12 @@ sub_0806407C: @ 0x0806407C
bne _080640E8
adds r0, #1
strb r0, [r5, #0x18]
bl sub_08000E50
bl Random
movs r1, #0x3f
ands r0, r1
adds r0, #0x20
strh r0, [r5, #0x12]
bl sub_08000E50
bl Random
adds r1, r0, #0
movs r0, #0x18
ands r1, r0
@ -12357,7 +12357,7 @@ _0806446C: .4byte gUnk_0810D0A4
thumb_func_start sub_08064470
sub_08064470: @ 0x08064470
push {lr}
ldr r0, _08064484 @ =gUnk_03003F80
ldr r0, _08064484 @ =gLinkState
adds r0, #0xab
ldrb r0, [r0]
cmp r0, #1
@ -12367,12 +12367,12 @@ _0806447E:
str r0, [r1, #0x14]
pop {pc}
.align 2, 0
_08064484: .4byte gUnk_03003F80
_08064484: .4byte gLinkState
thumb_func_start sub_08064488
sub_08064488: @ 0x08064488
push {lr}
ldr r1, _080644A0 @ =gUnk_03003F80
ldr r1, _080644A0 @ =gLinkState
adds r0, r1, #0
adds r0, #0xa8
ldrb r0, [r0]
@ -12384,17 +12384,17 @@ sub_08064488: @ 0x08064488
_0806449C:
pop {pc}
.align 2, 0
_080644A0: .4byte gUnk_03003F80
_080644A0: .4byte gLinkState
thumb_func_start sub_080644A4
sub_080644A4: @ 0x080644A4
ldr r0, _080644B0 @ =gUnk_03003F80
ldr r0, _080644B0 @ =gLinkState
adds r0, #0xab
movs r1, #0
strb r1, [r0]
bx lr
.align 2, 0
_080644B0: .4byte gUnk_03003F80
_080644B0: .4byte gLinkState
thumb_func_start sub_080644B4
sub_080644B4: @ 0x080644B4
@ -12673,12 +12673,12 @@ sub_080646A4: @ 0x080646A4
bne _08064710
adds r0, #1
strb r0, [r5, #0x18]
bl sub_08000E50
bl Random
movs r1, #0x3f
ands r0, r1
adds r0, #0x20
strh r0, [r5, #0x12]
bl sub_08000E50
bl Random
adds r1, r0, #0
movs r0, #0x18
ands r1, r0
@ -14100,7 +14100,7 @@ _0806517C:
cmp r0, #0
beq _080651A0
ldr r4, _0806519C @ =gUnk_0810FDB8
bl sub_08000E50
bl Random
movs r1, #0xf
ands r1, r0
adds r1, r1, r4
@ -14404,7 +14404,7 @@ _080653AA:
bls _080653EC
cmp r5, #0x6f
bhi _0806543C
ldr r2, _080653C8 @ =gUnk_080FD5A4
ldr r2, _080653C8 @ =gQuiverSizes
ldr r1, _080653CC @ =gUnk_02002A40
adds r0, r1, #0
adds r0, #0xaf
@ -14413,7 +14413,7 @@ _080653AA:
adds r1, #0xad
b _080653FA
.align 2, 0
_080653C8: .4byte gUnk_080FD5A4
_080653C8: .4byte gQuiverSizes
_080653CC: .4byte gUnk_02002A40
_080653D0:
movs r0, #0xd
@ -14430,7 +14430,7 @@ _080653E4:
.align 2, 0
_080653E8: .4byte 0x00002C0B
_080653EC:
ldr r2, _08065408 @ =gUnk_080FD5A0
ldr r2, _08065408 @ =gBombBagSizes
ldr r1, _0806540C @ =gUnk_02002A40
adds r0, r1, #0
adds r0, #0xae
@ -14445,7 +14445,7 @@ _080653FA:
ldr r0, _08065410 @ =0x00002C0E
b _080654C2
.align 2, 0
_08065408: .4byte gUnk_080FD5A0
_08065408: .4byte gBombBagSizes
_0806540C: .4byte gUnk_02002A40
_08065410: .4byte 0x00002C0E
_08065414:
@ -14922,7 +14922,7 @@ sub_08065780: @ 0x08065780
push {r4, r5, lr}
adds r4, r0, #0
adds r5, r1, #0
bl sub_08000E50
bl Random
movs r2, #6
adds r1, r0, #0
ands r1, r2
@ -15312,7 +15312,7 @@ _08065A60: .4byte gUnk_08110080
sub_08065A64: @ 0x08065A64
push {r4, r5, lr}
adds r4, r0, #0
ldr r0, _08065A8C @ =gUnk_03003F80
ldr r0, _08065A8C @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -15329,7 +15329,7 @@ sub_08065A64: @ 0x08065A64
bl sub_08078778
b _08065A9C
.align 2, 0
_08065A8C: .4byte gUnk_03003F80
_08065A8C: .4byte gLinkState
_08065A90:
adds r0, r4, #0
adds r0, #0x68

22
asm/code_08065B1C.s
View File

@ -728,7 +728,7 @@ _0806606E:
movs r2, #0x20
bl CreateFX
ldr r4, _080660A4 @ =gUnk_08110380
bl sub_08000E50
bl Random
movs r1, #7
ands r1, r0
lsls r1, r1, #1
@ -978,7 +978,7 @@ nullsub_501: @ 0x08066254
sub_08066258: @ 0x08066258
push {r4, lr}
ldr r4, _08066270 @ =gUnk_081103D0
bl sub_08000E50
bl Random
movs r1, #7
ands r1, r0
lsls r1, r1, #1
@ -2476,7 +2476,7 @@ sub_08066D14: @ 0x08066D14
strb r0, [r4, #0x18]
adds r0, r2, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldr r1, [r4, #0x50]
adds r0, r4, #0
bl sub_08068680
@ -2496,7 +2496,7 @@ sub_08066D4C: @ 0x08066D4C
ldr r1, [r4, #0x50]
cmp r1, #0
beq _08066D90
bl sub_0806FA24
bl CopyPosition
ldr r3, [r4, #0x50]
ldrb r1, [r3, #0x18]
movs r2, #4
@ -2557,7 +2557,7 @@ sub_08066D94: @ 0x08066D94
strh r1, [r0]
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
_08066DD6:
bl sub_0805E780
pop {r4, r5, pc}
@ -2577,7 +2577,7 @@ sub_08066DE4: @ 0x08066DE4
beq _08066E06
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
adds r0, r5, #0
adds r1, r4, #0
bl sub_080686C4
@ -3959,7 +3959,7 @@ _08067872:
adds r0, r4, #0
adds r0, #0x75
strb r1, [r0]
bl sub_08000E50
bl Random
movs r1, #0x7f
ands r0, r1
adds r0, #0x1e
@ -4251,7 +4251,7 @@ sub_08067AAC: @ 0x08067AAC
adds r4, r0, #0
movs r0, #2
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
ldr r2, _08067AFC @ =gUnk_081110FC
movs r1, #3
ands r1, r0
@ -4294,7 +4294,7 @@ sub_08067B08: @ 0x08067B08
adds r4, r0, #0
movs r0, #1
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
ldr r2, _08067B30 @ =gUnk_08111104
movs r1, #3
ands r1, r0
@ -4316,7 +4316,7 @@ sub_08067B34: @ 0x08067B34
adds r4, r0, #0
movs r1, #0
bl sub_08067DCC
bl sub_08000E50
bl Random
movs r1, #0x30
ands r0, r1
adds r0, #0xb4
@ -4357,7 +4357,7 @@ sub_08067B80: @ 0x08067B80
strb r0, [r5, #0xc]
movs r0, #0x14
strb r0, [r5, #0xe]
bl sub_08000E50
bl Random
movs r1, #0x7f
ands r0, r1
adds r0, #0x1e

42
asm/code_08067D20.s
View File

@ -434,7 +434,7 @@ _0806802C:
cmp r0, #0
bne _08068068
ldr r4, _08068064 @ =gUnk_0811137A
bl sub_08000E50
bl Random
movs r1, #3
bl __modsi3
lsls r0, r0, #1
@ -446,7 +446,7 @@ _0806802C:
_08068064: .4byte gUnk_0811137A
_08068068:
ldr r4, _080680F4 @ =gUnk_08111374
bl sub_08000E50
bl Random
movs r1, #3
bl __modsi3
lsls r0, r0, #1
@ -502,7 +502,7 @@ _080680D2:
movs r0, #0xf7
ands r0, r1
strb r0, [r6]
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
ldrb r1, [r7]
@ -816,7 +816,7 @@ sub_08068318: @ 0x08068318
ands r3, r7
orrs r3, r0
adds r7, r3, #0
ldr r0, _08068420 @ =gUnk_03003F80
ldr r0, _08068420 @ =gLinkState
adds r0, #0xa8
ldrb r0, [r0]
lsls r0, r0, #0x10
@ -928,7 +928,7 @@ _080683E6:
_08068414: .4byte gLinkEntity
_08068418: .4byte 0xFFFF0000
_0806841C: .4byte 0x0000FFFF
_08068420: .4byte gUnk_03003F80
_08068420: .4byte gLinkState
_08068424: .4byte 0xFF00FFFF
_08068428: .4byte 0xC0FFFFFF
_0806842C: .4byte 0x3FFFFFFF
@ -1127,7 +1127,7 @@ sub_08068578: @ 0x08068578
ldrh r0, [r4, #0x36]
ands r3, r6
orrs r3, r0
ldr r0, _08068670 @ =gUnk_03003F80
ldr r0, _08068670 @ =gLinkState
adds r0, #0xa8
ldrb r0, [r0]
lsls r0, r0, #0x10
@ -1227,7 +1227,7 @@ _08068614:
_08068664: .4byte gLinkEntity
_08068668: .4byte 0xFFFF0000
_0806866C: .4byte 0x0000FFFF
_08068670: .4byte gUnk_03003F80
_08068670: .4byte gLinkState
_08068674: .4byte 0xFF00FFFF
_08068678: .4byte 0xC0FFFFFF
_0806867C: .4byte 0x3FFFFFFF
@ -1455,7 +1455,7 @@ _0806880E:
cmp r0, #0
bne _08068848
ldr r4, _08068844 @ =gUnk_0811153E
bl sub_08000E50
bl Random
movs r1, #3
bl __modsi3
lsls r0, r0, #1
@ -1467,7 +1467,7 @@ _0806880E:
_08068844: .4byte gUnk_0811153E
_08068848:
ldr r4, _0806887C @ =gUnk_08111538
bl sub_08000E50
bl Random
movs r1, #3
bl __modsi3
lsls r0, r0, #1
@ -2322,7 +2322,7 @@ _08068E8C: .4byte gUnk_08111714
thumb_func_start sub_08068E90
sub_08068E90: @ 0x08068E90
ldr r2, _08068EAC @ =gUnk_03003F80
ldr r2, _08068EAC @ =gLinkState
adds r2, #0xac
ldr r1, _08068EB0 @ =gUnk_08111740
ldrb r0, [r0, #0xe]
@ -2337,18 +2337,18 @@ sub_08068E90: @ 0x08068E90
strh r0, [r2]
bx lr
.align 2, 0
_08068EAC: .4byte gUnk_03003F80
_08068EAC: .4byte gLinkState
_08068EB0: .4byte gUnk_08111740
thumb_func_start sub_08068EB4
sub_08068EB4: @ 0x08068EB4
ldr r0, _08068EC0 @ =gUnk_03003F80
ldr r0, _08068EC0 @ =gLinkState
adds r0, #0xab
movs r1, #0
strb r1, [r0]
bx lr
.align 2, 0
_08068EC0: .4byte gUnk_03003F80
_08068EC0: .4byte gLinkState
thumb_func_start sub_08068EC4
sub_08068EC4: @ 0x08068EC4
@ -2358,7 +2358,7 @@ sub_08068EC4: @ 0x08068EC4
ldrb r4, [r0, #0xe]
lsls r1, r4, #2
adds r1, r1, r2
ldr r0, _08068EF0 @ =gUnk_03003F80
ldr r0, _08068EF0 @ =gLinkState
adds r0, #0xab
ldr r1, [r1]
ldrb r0, [r0]
@ -2373,7 +2373,7 @@ sub_08068EC4: @ 0x08068EC4
b _08068EFA
.align 2, 0
_08068EEC: .4byte gUnk_08111740
_08068EF0: .4byte gUnk_03003F80
_08068EF0: .4byte gLinkState
_08068EF4: .4byte gUnk_0811172A
_08068EF8:
movs r0, #0
@ -2543,7 +2543,7 @@ sub_08069018: @ 0x08069018
bne _0806903A
adds r0, #1
strb r0, [r4, #0xd]
bl sub_08000E50
bl Random
movs r1, #0x3f
ands r0, r1
adds r0, #0x3c
@ -2586,7 +2586,7 @@ sub_08069068: @ 0x08069068
bne _080690A4
adds r0, #1
strb r0, [r4, #0xd]
bl sub_08000E50
bl Random
movs r1, #2
ands r1, r0
subs r1, #1
@ -2597,7 +2597,7 @@ sub_08069068: @ 0x08069068
strb r1, [r4, #0x14]
lsls r1, r1, #3
strb r1, [r4, #0x15]
bl sub_08000E50
bl Random
movs r1, #0x3f
ands r0, r1
adds r0, #0x3c
@ -2696,7 +2696,7 @@ _08069144: .4byte gUnk_08111928
sub_08069148: @ 0x08069148
push {r4, lr}
adds r4, r0, #0
bl sub_08000E50
bl Random
movs r1, #3
ands r0, r1
adds r0, #3
@ -2809,7 +2809,7 @@ _08069208: .4byte gUnk_08111938
sub_0806920C: @ 0x0806920C
push {r4, r5, lr}
adds r4, r0, #0
ldr r0, _08069234 @ =gUnk_03003F80
ldr r0, _08069234 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -2826,7 +2826,7 @@ sub_0806920C: @ 0x0806920C
bl sub_08078778
b _08069244
.align 2, 0
_08069234: .4byte gUnk_03003F80
_08069234: .4byte gLinkState
_08069238:
adds r0, r4, #0
adds r0, #0x6c

40
asm/code_080692A0.s
View File

@ -885,7 +885,7 @@ sub_0806991C: @ 0x0806991C
push {r4, r5, r6, lr}
adds r5, r0, #0
adds r4, r1, #0
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
adds r0, #0x3c
@ -955,7 +955,7 @@ sub_080699AC: @ 0x080699AC
push {r4, r5, r6, lr}
adds r5, r0, #0
adds r4, r1, #0
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
adds r0, #0x3c
@ -1024,7 +1024,7 @@ _08069A38: .4byte gUnk_02033280
sub_08069A3C: @ 0x08069A3C
push {r4, lr}
adds r4, r0, #0
bl sub_08000E50
bl Random
ldr r2, _08069A5C @ =gUnk_08111C9C
movs r1, #1
ands r1, r0
@ -1044,7 +1044,7 @@ _08069A5C: .4byte gUnk_08111C9C
sub_08069A60: @ 0x08069A60
push {r4, lr}
adds r4, r0, #0
bl sub_08000E50
bl Random
ldr r2, _08069A80 @ =gUnk_08111CA8
movs r1, #1
ands r1, r0
@ -1064,7 +1064,7 @@ _08069A80: .4byte gUnk_08111CA8
sub_08069A84: @ 0x08069A84
push {r4, lr}
adds r4, r0, #0
bl sub_08000E50
bl Random
ldr r2, _08069AA4 @ =gUnk_08111CB4
movs r1, #1
ands r1, r0
@ -1084,7 +1084,7 @@ _08069AA4: .4byte gUnk_08111CB4
sub_08069AA8: @ 0x08069AA8
push {r4, lr}
adds r4, r0, #0
bl sub_08000E50
bl Random
ldr r2, _08069AC8 @ =gUnk_08111CB8
movs r1, #1
ands r1, r0
@ -1237,7 +1237,7 @@ _08069BD2:
ldrb r0, [r5, #0xa]
cmp r0, #0
bne _08069BF2
ldr r0, _08069C34 @ =gUnk_03003F80
ldr r0, _08069C34 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -1282,7 +1282,7 @@ _08069BF2:
_08069C30:
pop {r4, r5, r6, pc}
.align 2, 0
_08069C34: .4byte gUnk_03003F80
_08069C34: .4byte gLinkState
_08069C38: .4byte 0x00004072
_08069C3C: .4byte gRoomControls
@ -1295,7 +1295,7 @@ sub_08069C40: @ 0x08069C40
bl sub_08069F90
cmp r0, #0
beq _08069C80
ldr r0, _08069C68 @ =gUnk_03003F80
ldr r0, _08069C68 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -1305,7 +1305,7 @@ sub_08069C40: @ 0x08069C40
bl sub_08069CB8
b _08069C7A
.align 2, 0
_08069C68: .4byte gUnk_03003F80
_08069C68: .4byte gLinkState
_08069C6C:
adds r0, r4, #0
bl sub_0806EDC4
@ -1325,12 +1325,12 @@ _08069C80:
bne _08069CB2
movs r0, #2
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
adds r0, #0x1e
strb r0, [r4, #0xe]
bl sub_08000E50
bl Random
ldr r2, _08069CB4 @ =gUnk_08111DA8
movs r1, #7
ands r1, r0
@ -1403,7 +1403,7 @@ sub_08069D00: @ 0x08069D00
beq _08069D4E
strb r7, [r5]
_08069D2A:
bl sub_08000E50
bl Random
ldr r1, _08069D50 @ =0x000001FF
ands r1, r0
cmp r1, #2
@ -1502,7 +1502,7 @@ _08069DE6:
movs r0, #3
_08069DE8:
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
adds r0, #0x1e
@ -1532,7 +1532,7 @@ _08069E0E:
bl sub_08069D00
b _08069E42
_08069E22:
bl sub_08000E50
bl Random
movs r1, #0xff
ands r1, r0
cmp r1, #0x2f
@ -1543,7 +1543,7 @@ _08069E32:
movs r0, #3
_08069E34:
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
adds r0, #0x1e
@ -1756,7 +1756,7 @@ _08069FB8: .4byte gLinkEntity
sub_08069FBC: @ 0x08069FBC
push {lr}
adds r2, r0, #0
ldr r0, _08069FE4 @ =gUnk_03003F80
ldr r0, _08069FE4 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -1777,13 +1777,13 @@ _08069FDA:
_08069FE0:
pop {pc}
.align 2, 0
_08069FE4: .4byte gUnk_03003F80
_08069FE4: .4byte gLinkState
thumb_func_start sub_08069FE8
sub_08069FE8: @ 0x08069FE8
push {r4, r5, lr}
adds r4, r0, #0
ldr r0, _0806A010 @ =gUnk_03003F80
ldr r0, _0806A010 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -1800,7 +1800,7 @@ sub_08069FE8: @ 0x08069FE8
bl sub_08078778
b _0806A020
.align 2, 0
_0806A010: .4byte gUnk_03003F80
_0806A010: .4byte gLinkState
_0806A014:
adds r0, r4, #0
adds r0, #0x74

90
asm/code_0806A0A4.s
View File

@ -10,7 +10,7 @@
sub_0806A0A4: @ 0x0806A0A4
push {r4, r5, r6, lr}
adds r4, r0, #0
ldr r0, _0806A0F8 @ =gUnk_03003F80
ldr r0, _0806A0F8 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -47,7 +47,7 @@ sub_0806A0A4: @ 0x0806A0A4
bl sub_0807BA8C
b _0806A120
.align 2, 0
_0806A0F8: .4byte gUnk_03003F80
_0806A0F8: .4byte gLinkState
_0806A0FC: .4byte gRoomControls
_0806A100:
movs r5, #2
@ -85,7 +85,7 @@ sub_0806A144: @ 0x0806A144
push {r4, r5, lr}
adds r5, r0, #0
movs r4, #4
ldr r0, _0806A18C @ =gUnk_03003F80
ldr r0, _0806A18C @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -115,7 +115,7 @@ _0806A17A:
bl TextboxNoOverlap
pop {r4, r5, pc}
.align 2, 0
_0806A18C: .4byte gUnk_03003F80
_0806A18C: .4byte gLinkState
_0806A190: .4byte gUnk_08111FD8
thumb_func_start sub_0806A194
@ -244,7 +244,7 @@ sub_0806A26C: @ 0x0806A26C
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA30
bl sub_08000E50
bl Random
adds r5, r0, #0
ldr r2, _0806A2B0 @ =gUnk_081121DC
movs r1, #7
@ -671,7 +671,7 @@ sub_0806A5C0: @ 0x0806A5C0
ands r0, r1
cmp r0, #0
beq _0806A5E6
bl sub_08000E50
bl Random
movs r1, #3
ands r1, r0
adds r1, #4
@ -692,7 +692,7 @@ sub_0806A5E8: @ 0x0806A5E8
adds r0, r4, #0
movs r1, #0x10
bl sub_08004260
bl sub_08000E50
bl Random
movs r1, #0x3f
ands r0, r1
adds r0, #0x3c
@ -704,7 +704,7 @@ _0806A60A:
lsls r0, r0, #0x18
cmp r0, #0
bne _0806A628
bl sub_08000E50
bl Random
movs r1, #0x3f
ands r0, r1
adds r0, #0x78
@ -830,7 +830,7 @@ _0806A6E4:
ldrb r2, [r4, #0xe]
cmp r2, #0
bne _0806A724
bl sub_08000E50
bl Random
adds r2, r0, #0
movs r1, #7
ands r0, r1
@ -878,7 +878,7 @@ _0806A75A:
ldrb r2, [r4, #0xf]
cmp r2, #0
bne _0806A784
bl sub_08000E50
bl Random
adds r2, r0, #0
movs r1, #7
ands r0, r1
@ -1083,7 +1083,7 @@ sub_0806A8C8: @ 0x0806A8C8
beq _0806A8F0
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
str r5, [r4, #0x50]
_0806A8F0:
movs r0, #0x37
@ -1095,7 +1095,7 @@ _0806A8F0:
beq _0806A910
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldrh r0, [r4, #0x32]
adds r0, #2
strh r0, [r4, #0x32]
@ -1117,7 +1117,7 @@ sub_0806A914: @ 0x0806A914
beq _0806A938
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FAB0
@ -1199,7 +1199,7 @@ sub_0806A9B0: @ 0x0806A9B0
movs r0, #2
strb r0, [r4, #0xc]
strb r1, [r4, #0xd]
bl sub_08000E50
bl Random
ldr r2, _0806A9E4 @ =gUnk_081122A0
movs r1, #7
ands r1, r0
@ -1232,7 +1232,7 @@ sub_0806A9E8: @ 0x0806A9E8
beq _0806AA0C
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FAD8
@ -2645,7 +2645,7 @@ _0806B4B2:
ldrh r3, [r3, #4]
adds r0, r4, #0
bl sub_0801DFB4
ldr r0, _0806B4D0 @ =gUnk_03003F80
ldr r0, _0806B4D0 @ =gLinkState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
@ -2653,7 +2653,7 @@ _0806B4B2:
.align 2, 0
_0806B4C8: .4byte gLinkEntity
_0806B4CC: .4byte gUnk_08001A7C
_0806B4D0: .4byte gUnk_03003F80
_0806B4D0: .4byte gLinkState
_0806B4D4:
adds r0, r4, #0
movs r1, #0
@ -2972,7 +2972,7 @@ _0806B726:
beq _0806B76C
adds r0, r6, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
str r6, [r4, #0x50]
adds r0, r6, #0
adds r0, #0x29
@ -3002,7 +3002,7 @@ _0806B76C:
beq _0806B7A6
adds r0, r6, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
str r6, [r4, #0x50]
adds r0, r6, #0
adds r0, #0x29
@ -3079,7 +3079,7 @@ _0806B7E6:
_0806B80C:
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldr r0, _0806B828 @ =0x00001634
bl TextboxTryNoOverlap
ldrb r0, [r5, #0xd]
@ -4112,7 +4112,7 @@ sub_0806BFD8: @ 0x0806BFD8
beq _0806C002
b _0806C00A
_0806BFF0:
bl sub_08000E50
bl Random
adds r1, r0, #0
ands r1, r5
adds r1, #0xc
@ -4426,7 +4426,7 @@ sub_0806C23C: @ 0x0806C23C
movs r1, #0xf
movs r2, #0x43
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
movs r0, #0x2e
ldrsh r1, [r4, r0]
ldr r2, _0806C27C @ =gRoomControls
@ -5594,7 +5594,7 @@ sub_0806CAF4: @ 0x0806CAF4
str r5, [r4, #0x50]
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FAD8
@ -5609,7 +5609,7 @@ _0806CB2C:
str r5, [r4, #0x50]
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FAB0
@ -6222,7 +6222,7 @@ _0806CFD4:
lsls r0, r0, #0x18
cmp r0, #0
bne _0806D000
bl sub_08000E50
bl Random
adds r4, r0, #0
ldr r1, _0806D008 @ =gUnk_081140CC
movs r0, #3
@ -6535,7 +6535,7 @@ _0806D228:
lsls r0, r0, #0x18
cmp r0, #0
bne _0806D24A
bl sub_08000E50
bl Random
movs r1, #0x7f
ands r0, r1
adds r0, #0x30
@ -6883,7 +6883,7 @@ sub_0806D4C0: @ 0x0806D4C0
str r5, [r4, #0x50]
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FAB0
@ -8054,7 +8054,7 @@ _0806DD5A:
ldrb r0, [r4]
cmp r0, #0xfe
bne _0806DD74
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
adds r0, #0x14
@ -8246,7 +8246,7 @@ sub_0806DED0: @ 0x0806DED0
ldrb r0, [r4, #0xa]
cmp r0, #0
bne _0806DEF4
ldr r2, _0806DEFC @ =gUnk_03003F80
ldr r2, _0806DEFC @ =gLinkState
ldrb r1, [r2, #0x1a]
movs r0, #0x80
orrs r0, r1
@ -8255,7 +8255,7 @@ _0806DEF4:
pop {r4, pc}
.align 2, 0
_0806DEF8: .4byte gUnk_081142BC
_0806DEFC: .4byte gUnk_03003F80
_0806DEFC: .4byte gLinkState
thumb_func_start sub_0806DF00
sub_0806DF00: @ 0x0806DF00
@ -8382,7 +8382,7 @@ _0806DFD6:
str r4, [r1, #0x50]
str r1, [r4, #0x54]
adds r0, r4, #0
bl sub_0806FA24
bl CopyPosition
_0806DFF8:
adds r0, r4, #0
bl sub_080788E0
@ -8405,7 +8405,7 @@ nullsub_111: @ 0x0806E010
sub_0806E014: @ 0x0806E014
push {r4, r5, r6, r7, lr}
adds r5, r0, #0
bl sub_08000E50
bl Random
movs r1, #0x70
ands r1, r0
lsrs r4, r1, #4
@ -8451,7 +8451,7 @@ sub_0806E014: @ 0x0806E014
strb r0, [r1, #0xf]
ldr r1, [r5, #0x70]
adds r0, r5, #0
bl sub_0806FA24
bl CopyPosition
b _0806E0D6
.align 2, 0
_0806E084: .4byte gUnk_081142CC
@ -8737,7 +8737,7 @@ _0806E2A8:
movs r1, #0
bl sub_0807DD94
_0806E2B0:
ldr r0, _0806E2CC @ =gUnk_03003F80
ldr r0, _0806E2CC @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -8751,7 +8751,7 @@ _0806E2B0:
strb r1, [r4, #0x18]
b _0806E2DA
.align 2, 0
_0806E2CC: .4byte gUnk_03003F80
_0806E2CC: .4byte gLinkState
_0806E2D0:
ldrb r1, [r4, #0x18]
movs r0, #4
@ -8861,7 +8861,7 @@ _0806E398:
ldrh r3, [r3, #4]
adds r0, r4, #0
bl sub_0801DFB4
ldr r0, _0806E3B8 @ =gUnk_03003F80
ldr r0, _0806E3B8 @ =gLinkState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
@ -8869,7 +8869,7 @@ _0806E398:
.align 2, 0
_0806E3B0: .4byte gLinkEntity
_0806E3B4: .4byte gUnk_08001A7C
_0806E3B8: .4byte gUnk_03003F80
_0806E3B8: .4byte gLinkState
_0806E3BC:
adds r0, r4, #0
movs r1, #0
@ -9034,7 +9034,7 @@ sub_0806E4EC: @ 0x0806E4EC
bne _0806E50E
adds r0, #1
strb r0, [r5, #0xd]
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
adds r0, #0x3c
@ -9049,7 +9049,7 @@ _0806E50E:
lsls r0, r0, #0x18
cmp r0, #0
bne _0806E552
bl sub_08000E50
bl Random
movs r1, #1
ands r1, r0
cmp r1, #0
@ -9062,13 +9062,13 @@ _0806E52C:
strb r0, [r5, #0xc]
movs r0, #0
strb r0, [r5, #0xd]
bl sub_08000E50
bl Random
movs r1, #1
ands r1, r0
cmp r1, #0
beq _0806E552
ldr r4, _0806E560 @ =gUnk_081145C8
bl sub_08000E50
bl Random
movs r1, #3
ands r1, r0
lsls r1, r1, #1
@ -9093,7 +9093,7 @@ sub_0806E564: @ 0x0806E564
bne _0806E5AA
adds r0, #1
strb r0, [r4, #0xd]
bl sub_08000E50
bl Random
movs r2, #1
ands r0, r2
cmp r0, #0
@ -9108,7 +9108,7 @@ sub_0806E564: @ 0x0806E564
orrs r2, r1
strb r2, [r4, #0x18]
_0806E590:
bl sub_08000E50
bl Random
movs r1, #1
ands r0, r1
adds r0, #1
@ -9158,7 +9158,7 @@ sub_0806E5E4: @ 0x0806E5E4
bne _0806E622
adds r0, #1
strb r0, [r4, #0xd]
bl sub_08000E50
bl Random
movs r5, #1
ands r0, r5
cmp r0, #0
@ -9174,7 +9174,7 @@ sub_0806E5E4: @ 0x0806E5E4
orrs r2, r1
strb r2, [r4, #0x18]
_0806E612:
bl sub_08000E50
bl Random
adds r1, r0, #0
ands r1, r5
adds r1, #2

8
asm/code_0806E6A8.s
View File

@ -112,7 +112,7 @@ sub_0806E764: @ 0x0806E764
bne _0806E782
adds r0, #1
strb r0, [r4, #0xd]
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
adds r0, #0x1e
@ -129,7 +129,7 @@ _0806E782:
movs r0, #2
strb r0, [r4, #0xc]
strb r1, [r4, #0xd]
bl sub_08000E50
bl Random
movs r1, #1
ands r1, r0
cmp r1, #0
@ -150,7 +150,7 @@ sub_0806E7B0: @ 0x0806E7B0
bne _0806E7F2
adds r0, #1
strb r0, [r4, #0xd]
bl sub_08000E50
bl Random
movs r5, #1
ands r0, r5
cmp r0, #0
@ -166,7 +166,7 @@ sub_0806E7B0: @ 0x0806E7B0
orrs r2, r1
strb r2, [r4, #0x18]
_0806E7DE:
bl sub_08000E50
bl Random
movs r1, #3
ands r0, r1
adds r0, #1

34
asm/code_0806ED78.s
View File

@ -13,7 +13,7 @@ sub_0806ED78: @ 0x0806ED78
adds r4, r0, #0
cmp r4, #0
beq _0806ED94
ldr r0, _0806ED98 @ =gUnk_03003F80
ldr r0, _0806ED98 @ =gLinkState
ldrb r1, [r0, #0x1e]
movs r0, #0x40
ands r0, r1
@ -24,7 +24,7 @@ _0806ED94:
adds r0, r4, #0
pop {r4, pc}
.align 2, 0
_0806ED98: .4byte gUnk_03003F80
_0806ED98: .4byte gLinkState
thumb_func_start sub_0806ED9C
sub_0806ED9C: @ 0x0806ED9C
@ -548,14 +548,14 @@ sub_0806F118: @ 0x0806F118
ldrh r3, [r0, #4]
adds r0, r4, #0
bl sub_0801DFB4
ldr r0, _0806F144 @ =gUnk_03003F80
ldr r0, _0806F144 @ =gLinkState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
pop {r4, pc}
.align 2, 0
_0806F140: .4byte gUnk_08001A7C
_0806F144: .4byte gUnk_03003F80
_0806F144: .4byte gLinkState
thumb_func_start sub_0806F148
sub_0806F148: @ 0x0806F148
@ -574,14 +574,14 @@ sub_0806F148: @ 0x0806F148
.align 2, 0
_0806F164: .4byte gUnk_02022740
_0806F168:
ldr r0, _0806F184 @ =gUnk_03003F80
ldr r0, _0806F184 @ =gLinkState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
movs r4, #1
_0806F172:
bl sub_0807919C
ldr r0, _0806F184 @ =gUnk_03003F80
ldr r0, _0806F184 @ =gLinkState
adds r0, #0x8b
movs r1, #1
strb r1, [r0]
@ -589,7 +589,7 @@ _0806F17E:
adds r0, r4, #0
pop {r4, pc}
.align 2, 0
_0806F184: .4byte gUnk_03003F80
_0806F184: .4byte gLinkState
thumb_func_start sub_0806F188
sub_0806F188: @ 0x0806F188
@ -801,7 +801,7 @@ _0806F332:
movs r0, #0
b _0806F34E
_0806F336:
ldr r0, _0806F348 @ =gUnk_03003F80
ldr r0, _0806F348 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -811,7 +811,7 @@ _0806F342:
ldrh r0, [r6, #6]
b _0806F34E
.align 2, 0
_0806F348: .4byte gUnk_03003F80
_0806F348: .4byte gLinkState
_0806F34C:
ldrh r0, [r6, #4]
_0806F34E:
@ -907,7 +907,7 @@ sub_0806F3E4: @ 0x0806F3E4
push {r4, r5, r6, lr}
sub sp, #0x88
adds r5, r0, #0
ldr r2, _0806F408 @ =gUnk_03003F80
ldr r2, _0806F408 @ =gLinkState
ldrb r1, [r2, #0x1c]
movs r0, #0x7f
ands r0, r1
@ -922,7 +922,7 @@ sub_0806F3E4: @ 0x0806F3E4
beq _0806F416
b _0806F410
.align 2, 0
_0806F408: .4byte gUnk_03003F80
_0806F408: .4byte gLinkState
_0806F40C:
cmp r0, #3
beq _0806F42A
@ -999,7 +999,7 @@ _0806F444:
movs r0, #3
strb r0, [r5, #0xd]
str r5, [r6, #0x70]
ldr r1, _0806F4C4 @ =gUnk_03003F80
ldr r1, _0806F4C4 @ =gLinkState
movs r0, #7
strb r0, [r1, #0x1c]
movs r0, #0x11
@ -1018,11 +1018,11 @@ _0806F4B4:
.align 2, 0
_0806F4BC: .4byte gLinkEntity
_0806F4C0: .4byte gUnk_08126EE4
_0806F4C4: .4byte gUnk_03003F80
_0806F4C4: .4byte gLinkState
_0806F4C8:
cmp r1, #1
bne _0806F4D8
ldr r0, _0806F4DC @ =gUnk_03003F80
ldr r0, _0806F4DC @ =gLinkState
ldr r0, [r0, #0x2c]
strb r1, [r0, #0xa]
movs r0, #0xef
@ -1031,7 +1031,7 @@ _0806F4D8:
movs r0, #1
b _0806F4E2
.align 2, 0
_0806F4DC: .4byte gUnk_03003F80
_0806F4DC: .4byte gLinkState
_0806F4E0:
movs r0, #0
_0806F4E2:
@ -1657,7 +1657,7 @@ _0806F944:
sub_0806F948: @ 0x0806F948
push {r4, lr}
adds r4, r0, #0
ldr r1, _0806F974 @ =gUnk_03003F80
ldr r1, _0806F974 @ =gLinkState
ldrb r0, [r1, #0xd]
cmp r0, #0xff
beq _0806F994
@ -1677,7 +1677,7 @@ sub_0806F948: @ 0x0806F948
adds r0, r2, #0
b _0806F996
.align 2, 0
_0806F974: .4byte gUnk_03003F80
_0806F974: .4byte gLinkState
_0806F978:
movs r2, #0
cmp r3, #4

460
asm/code_0806FA6C.s
View File

File diff suppressed because it is too large Load Diff

2675
asm/code_080732D0.s
View File

File diff suppressed because it is too large Load Diff

1908
asm/code_08076C80.s Normal file
View File

File diff suppressed because it is too large Load Diff

388
asm/code_08077B98.s
View File

File diff suppressed because it is too large Load Diff

120
asm/code_0807CC3C.s
View File

@ -2089,7 +2089,7 @@ sub_0807DB2C: @ 0x0807DB2C
ldr r0, _0807DB60 @ =gLinkEntity
adds r0, #0x84
str r4, [r0]
ldr r2, _0807DB64 @ =gUnk_03003F80
ldr r2, _0807DB64 @ =gLinkState
movs r1, #0
movs r0, #0x1c
strb r0, [r2, #0xc]
@ -2104,7 +2104,7 @@ sub_0807DB2C: @ 0x0807DB2C
.align 2, 0
_0807DB5C: .4byte gUnk_02022750
_0807DB60: .4byte gLinkEntity
_0807DB64: .4byte gUnk_03003F80
_0807DB64: .4byte gLinkState
thumb_func_start sub_0807DB68
sub_0807DB68: @ 0x0807DB68
@ -2529,7 +2529,7 @@ _0807DE44:
ands r0, r1
cmp r0, #0
bne _0807DDEC
bl sub_08000E50
bl Random
ldr r2, _0807DE6C @ =gUnk_0811E510
movs r1, #3
ands r1, r0
@ -3201,7 +3201,7 @@ sub_0807E30C: @ 0x0807E30C
ands r0, r1
cmp r0, #0
bne _0807E348
ldr r0, _0807E374 @ =gUnk_03003F80
ldr r0, _0807E374 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -3241,7 +3241,7 @@ _0807E348:
strb r0, [r5, #0x14]
b _0807E37E
.align 2, 0
_0807E374: .4byte gUnk_03003F80
_0807E374: .4byte gLinkState
_0807E378: .4byte gLinkEntity
_0807E37C:
str r0, [r4, #0x14]
@ -3497,7 +3497,7 @@ sub_0807E538: @ 0x0807E538
adds r4, r1, #0
ldr r0, [r4]
bl sub_08016998
ldr r1, _0807E55C @ =gUnk_03003F80
ldr r1, _0807E55C @ =gLinkState
ldr r1, [r1, #0x30]
ands r0, r1
rsbs r1, r0, #0
@ -3511,12 +3511,12 @@ sub_0807E538: @ 0x0807E538
strb r0, [r2, #7]
pop {r4, pc}
.align 2, 0
_0807E55C: .4byte gUnk_03003F80
_0807E55C: .4byte gLinkState
_0807E560: .4byte gUnk_02033280
thumb_func_start sub_0807E564
sub_0807E564: @ 0x0807E564
ldr r0, _0807E57C @ =gUnk_03003F80
ldr r0, _0807E57C @ =gLinkState
ldr r0, [r0, #0x30]
lsrs r0, r0, #7
movs r2, #1
@ -3529,7 +3529,7 @@ sub_0807E564: @ 0x0807E564
strb r0, [r2, #7]
bx lr
.align 2, 0
_0807E57C: .4byte gUnk_03003F80
_0807E57C: .4byte gLinkState
_0807E580: .4byte gUnk_02033280
thumb_func_start sub_0807E584
@ -3964,41 +3964,41 @@ sub_0807E858: @ 0x0807E858
thumb_func_start sub_0807E864
sub_0807E864: @ 0x0807E864
push {lr}
ldr r0, _0807E874 @ =gUnk_03003F80
ldr r0, _0807E874 @ =gLinkState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
bl sub_08078B48
pop {pc}
.align 2, 0
_0807E874: .4byte gUnk_03003F80
_0807E874: .4byte gLinkState
thumb_func_start sub_0807E878
sub_0807E878: @ 0x0807E878
ldr r0, _0807E884 @ =gUnk_03003F80
ldr r0, _0807E884 @ =gLinkState
adds r0, #0x8b
movs r1, #1
strb r1, [r0]
bx lr
.align 2, 0
_0807E884: .4byte gUnk_03003F80
_0807E884: .4byte gLinkState
thumb_func_start sub_0807E888
sub_0807E888: @ 0x0807E888
ldr r0, _0807E894 @ =gUnk_03003F80
ldr r0, _0807E894 @ =gLinkState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
bx lr
.align 2, 0
_0807E894: .4byte gUnk_03003F80
_0807E894: .4byte gLinkState
thumb_func_start sub_0807E898
sub_0807E898: @ 0x0807E898
push {lr}
ldr r0, [r1]
bl sub_08016998
ldr r3, _0807E8C0 @ =gUnk_03003F80
ldr r3, _0807E8C0 @ =gLinkState
strb r0, [r3, #0xc]
lsrs r2, r0, #8
adds r1, r3, #0
@ -4014,7 +4014,7 @@ sub_0807E898: @ 0x0807E898
strb r0, [r1]
pop {pc}
.align 2, 0
_0807E8C0: .4byte gUnk_03003F80
_0807E8C0: .4byte gLinkState
thumb_func_start sub_0807E8C4
sub_0807E8C4: @ 0x0807E8C4
@ -4027,13 +4027,13 @@ sub_0807E8C4: @ 0x0807E8C4
thumb_func_start sub_0807E8D4
sub_0807E8D4: @ 0x0807E8D4
ldr r2, _0807E8E0 @ =gUnk_03003F80
ldr r2, _0807E8E0 @ =gLinkState
ldr r0, [r1]
ldrh r0, [r0, #2]
strh r0, [r2, #8]
bx lr
.align 2, 0
_0807E8E0: .4byte gUnk_03003F80
_0807E8E0: .4byte gLinkState
thumb_func_start sub_0807E8E4
sub_0807E8E4: @ 0x0807E8E4
@ -4204,7 +4204,7 @@ sub_0807E9F0: @ 0x0807E9F0
beq _0807EA24
cmp r0, #2
bne _0807EA40
ldr r0, _0807EA1C @ =gUnk_03003F80
ldr r0, _0807EA1C @ =gLinkState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
@ -4214,7 +4214,7 @@ sub_0807E9F0: @ 0x0807E9F0
b _0807EA28
.align 2, 0
_0807EA18: .4byte gUnk_02022740
_0807EA1C: .4byte gUnk_03003F80
_0807EA1C: .4byte gLinkState
_0807EA20: .4byte gUnk_02034490
_0807EA24:
movs r0, #0
@ -4223,13 +4223,13 @@ _0807EA28:
cmp r2, #0
beq _0807EA40
bl sub_0807919C
ldr r0, _0807EA3C @ =gUnk_03003F80
ldr r0, _0807EA3C @ =gLinkState
adds r0, #0x8b
movs r1, #1
strb r1, [r0]
b _0807EA46
.align 2, 0
_0807EA3C: .4byte gUnk_03003F80
_0807EA3C: .4byte gLinkState
_0807EA40:
ldr r1, _0807EA48 @ =gUnk_02033280
movs r0, #0
@ -4509,7 +4509,7 @@ sub_0807EC08: @ 0x0807EC08
push {lr}
adds r1, r0, #0
ldr r0, _0807EC14 @ =gLinkEntity
bl sub_0806FA24
bl CopyPosition
pop {pc}
.align 2, 0
_0807EC14: .4byte gLinkEntity
@ -5210,7 +5210,7 @@ _0807F0E8: .4byte gUnk_03000FF0
sub_0807F0EC: @ 0x0807F0EC
push {r4, lr}
adds r4, r1, #0
bl sub_08000E50
bl Random
ldr r1, [r4, #4]
bl __modsi3
str r0, [r4, #4]
@ -5222,7 +5222,7 @@ sub_0807F100: @ 0x0807F100
push {r4, r5, lr}
adds r4, r0, #0
adds r5, r1, #0
bl sub_08000E50
bl Random
movs r2, #6
adds r1, r0, #0
ands r1, r2
@ -5243,7 +5243,7 @@ sub_0807F128: @ 0x0807F128
push {r4, r5, lr}
adds r4, r0, #0
adds r5, r1, #0
bl sub_08000E50
bl Random
ldr r2, _0807F150 @ =gUnk_0811E758
movs r3, #7
adds r1, r0, #0
@ -5327,7 +5327,7 @@ _0807F1C0: .4byte gUnk_02033280
thumb_func_start sub_0807F1C4
sub_0807F1C4: @ 0x0807F1C4
push {lr}
ldr r2, _0807F1D8 @ =gUnk_03003F80
ldr r2, _0807F1D8 @ =gLinkState
ldr r0, [r2, #0x30]
movs r1, #8
ands r0, r1
@ -5336,7 +5336,7 @@ sub_0807F1C4: @ 0x0807F1C4
ldr r0, _0807F1DC @ =0x00000459
b _0807F1E4
.align 2, 0
_0807F1D8: .4byte gUnk_03003F80
_0807F1D8: .4byte gLinkState
_0807F1DC: .4byte 0x00000459
_0807F1E0:
movs r0, #0xde
@ -5348,7 +5348,7 @@ _0807F1E4:
thumb_func_start sub_0807F1E8
sub_0807F1E8: @ 0x0807F1E8
push {lr}
ldr r2, _0807F1FC @ =gUnk_03003F80
ldr r2, _0807F1FC @ =gLinkState
ldr r0, [r2, #0x30]
movs r1, #8
ands r0, r1
@ -5357,7 +5357,7 @@ sub_0807F1E8: @ 0x0807F1E8
ldr r0, _0807F200 @ =0x0000045A
b _0807F206
.align 2, 0
_0807F1FC: .4byte gUnk_03003F80
_0807F1FC: .4byte gLinkState
_0807F200: .4byte 0x0000045A
_0807F204:
ldr r0, _0807F20C @ =0x000002BD
@ -5370,7 +5370,7 @@ _0807F20C: .4byte 0x000002BD
thumb_func_start sub_0807F210
sub_0807F210: @ 0x0807F210
push {lr}
ldr r2, _0807F224 @ =gUnk_03003F80
ldr r2, _0807F224 @ =gLinkState
ldr r0, [r2, #0x30]
movs r1, #8
ands r0, r1
@ -5379,7 +5379,7 @@ sub_0807F210: @ 0x0807F210
ldr r0, _0807F228 @ =0x0000041C
b _0807F22E
.align 2, 0
_0807F224: .4byte gUnk_03003F80
_0807F224: .4byte gLinkState
_0807F228: .4byte 0x0000041C
_0807F22C:
ldr r0, _0807F234 @ =0x0000080C
@ -5391,12 +5391,12 @@ _0807F234: .4byte 0x0000080C
thumb_func_start sub_0807F238
sub_0807F238: @ 0x0807F238
ldr r2, _0807F240 @ =gUnk_03003F80
ldr r2, _0807F240 @ =gLinkState
ldr r0, [r1, #4]
strh r0, [r2, #8]
bx lr
.align 2, 0
_0807F240: .4byte gUnk_03003F80
_0807F240: .4byte gLinkState
thumb_func_start sub_0807F244
sub_0807F244: @ 0x0807F244
@ -5455,7 +5455,7 @@ sub_0807F29C: @ 0x0807F29C
thumb_func_start sub_0807F2A8
sub_0807F2A8: @ 0x0807F2A8
push {lr}
ldr r0, _0807F2C0 @ =gUnk_03003F80
ldr r0, _0807F2C0 @ =gLinkState
adds r0, #0x9c
ldr r0, [r0]
cmp r0, #0
@ -5467,7 +5467,7 @@ sub_0807F2A8: @ 0x0807F2A8
strb r0, [r2, #7]
b _0807F2CE
.align 2, 0
_0807F2C0: .4byte gUnk_03003F80
_0807F2C0: .4byte gLinkState
_0807F2C4: .4byte gUnk_02033280
_0807F2C8:
ldr r1, _0807F2D0 @ =gUnk_02033280
@ -5593,7 +5593,7 @@ sub_0807F36C: @ 0x0807F36C
adds r1, r4, #0
movs r2, #0
bl PositionRelative
bl sub_08000E50
bl Random
movs r5, #1
ands r0, r5
cmp r0, #0
@ -5603,7 +5603,7 @@ sub_0807F36C: @ 0x0807F36C
orrs r0, r1
strb r0, [r4, #0x18]
_0807F3B0:
bl sub_08000E50
bl Random
ands r0, r5
cmp r0, #0
beq _0807F3C2
@ -5875,7 +5875,7 @@ _0807F590: .4byte gLinkEntity
thumb_func_start sub_0807F594
sub_0807F594: @ 0x0807F594
push {lr}
ldr r0, _0807F5A8 @ =gUnk_03003F80
ldr r0, _0807F5A8 @ =gLinkState
adds r0, #0xa8
ldrb r0, [r0]
cmp r0, #0
@ -5886,18 +5886,18 @@ sub_0807F594: @ 0x0807F594
_0807F5A6:
pop {pc}
.align 2, 0
_0807F5A8: .4byte gUnk_03003F80
_0807F5A8: .4byte gLinkState
_0807F5AC: .4byte gUnk_02033280
thumb_func_start sub_0807F5B0
sub_0807F5B0: @ 0x0807F5B0
ldr r0, _0807F5BC @ =gUnk_03003F80
ldr r0, _0807F5BC @ =gLinkState
ldr r1, [r1, #4]
adds r0, #0x27
strb r1, [r0]
bx lr
.align 2, 0
_0807F5BC: .4byte gUnk_03003F80
_0807F5BC: .4byte gLinkState
thumb_func_start sub_0807F5C0
sub_0807F5C0: @ 0x0807F5C0
@ -5972,13 +5972,13 @@ sub_0807F634: @ 0x0807F634
ldrh r2, [r3, #2]
ldrh r3, [r3, #4]
bl sub_0801DFB4
ldr r0, _0807F64C @ =gUnk_03003F80
ldr r0, _0807F64C @ =gLinkState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
pop {pc}
.align 2, 0
_0807F64C: .4byte gUnk_03003F80
_0807F64C: .4byte gLinkState
thumb_func_start sub_0807F650
sub_0807F650: @ 0x0807F650
@ -5994,14 +5994,14 @@ sub_0807F650: @ 0x0807F650
ldrh r3, [r0, #4]
adds r0, r4, #0
bl sub_0801DFB4
ldr r0, _0807F67C @ =gUnk_03003F80
ldr r0, _0807F67C @ =gLinkState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
pop {r4, pc}
.align 2, 0
_0807F678: .4byte gUnk_08001A7C
_0807F67C: .4byte gUnk_03003F80
_0807F67C: .4byte gLinkState
thumb_func_start sub_0807F680
sub_0807F680: @ 0x0807F680
@ -6061,25 +6061,25 @@ _0807F6E4: .4byte gUnk_02033280
thumb_func_start sub_0807F6E8
sub_0807F6E8: @ 0x0807F6E8
ldr r2, _0807F6F4 @ =gUnk_03003F80
ldr r2, _0807F6F4 @ =gLinkState
ldr r0, [r2, #0x30]
ldr r1, [r1, #4]
orrs r0, r1
str r0, [r2, #0x30]
bx lr
.align 2, 0
_0807F6F4: .4byte gUnk_03003F80
_0807F6F4: .4byte gLinkState
thumb_func_start sub_0807F6F8
sub_0807F6F8: @ 0x0807F6F8
ldr r2, _0807F704 @ =gUnk_03003F80
ldr r2, _0807F704 @ =gLinkState
ldr r1, [r1, #4]
ldr r0, [r2, #0x30]
bics r0, r1
str r0, [r2, #0x30]
bx lr
.align 2, 0
_0807F704: .4byte gUnk_03003F80
_0807F704: .4byte gLinkState
thumb_func_start sub_0807F708
sub_0807F708: @ 0x0807F708
@ -6350,7 +6350,7 @@ sub_0807F8E8: @ 0x0807F8E8
movs r1, #0xa6
movs r2, #0
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
adds r2, r0, #0
cmp r2, #0
beq _0807F912
@ -6463,7 +6463,7 @@ sub_0807F994: @ 0x0807F994
thumb_func_start sub_0807F9A4
sub_0807F9A4: @ 0x0807F9A4
push {lr}
ldr r0, _0807F9BC @ =gUnk_03003F80
ldr r0, _0807F9BC @ =gLinkState
adds r0, #0xa8
ldrb r0, [r0]
subs r0, #5
@ -6475,7 +6475,7 @@ sub_0807F9A4: @ 0x0807F9A4
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0807F9BC: .4byte gUnk_03003F80
_0807F9BC: .4byte gLinkState
_0807F9C0: .4byte _0807F9C4
_0807F9C4: @ jump table
.4byte _0807FA24 @ case 0
@ -6523,7 +6523,7 @@ _0807FA3C: .4byte gUnk_02033280
thumb_func_start sub_0807FA40
sub_0807FA40: @ 0x0807FA40
push {lr}
ldr r0, _0807FA58 @ =gUnk_03003F80
ldr r0, _0807FA58 @ =gLinkState
adds r0, #0xa8
ldrb r0, [r0]
subs r0, #5
@ -6535,7 +6535,7 @@ sub_0807FA40: @ 0x0807FA40
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0807FA58: .4byte gUnk_03003F80
_0807FA58: .4byte gLinkState
_0807FA5C: .4byte _0807FA60
_0807FA60: @ jump table
.4byte _0807FAC0 @ case 0
@ -6669,7 +6669,7 @@ _0807FB70: .4byte gLinkEntity
thumb_func_start sub_0807FB74
sub_0807FB74: @ 0x0807FB74
ldr r0, _0807FB8C @ =gUnk_03003F80
ldr r0, _0807FB8C @ =gLinkState
adds r0, #0x26
movs r1, #0
strb r1, [r0]
@ -6681,7 +6681,7 @@ sub_0807FB74: @ 0x0807FB74
strb r0, [r1]
bx lr
.align 2, 0
_0807FB8C: .4byte gUnk_03003F80
_0807FB8C: .4byte gLinkState
_0807FB90: .4byte gLinkEntity
thumb_func_start sub_0807FB94
@ -6707,14 +6707,14 @@ _0807FBB0: .4byte gRoomControls
thumb_func_start sub_0807FBB4
sub_0807FBB4: @ 0x0807FBB4
ldr r2, _0807FBC0 @ =gUnk_03003F80
ldr r2, _0807FBC0 @ =gLinkState
ldrb r1, [r2, #0x1a]
movs r0, #0x80
orrs r0, r1
strb r0, [r2, #0x1a]
bx lr
.align 2, 0
_0807FBC0: .4byte gUnk_03003F80
_0807FBC0: .4byte gLinkState
thumb_func_start sub_0807FBC4
sub_0807FBC4: @ 0x0807FBC4

864
asm/code_08080974.s
View File

File diff suppressed because it is too large Load Diff

174
asm/code_0809D498.s
View File

@ -176,7 +176,7 @@ _0809D5E6:
orrs r0, r1
strb r0, [r6, #0x18]
bl sub_080791D0
bl sub_0805E564
bl UnfreezeTime
ldr r1, _0809D664 @ =gUnk_02034490
movs r0, #0
strb r0, [r1]
@ -302,8 +302,8 @@ _0809D6FA:
_0809D6FE:
pop {r4, pc}
thumb_func_start sub_0809D700
sub_0809D700: @ 0x0809D700
thumb_func_start CreateBird
CreateBird: @ 0x0809D700
push {r4, lr}
sub sp, #4
bl sub_08052654
@ -425,7 +425,7 @@ sub_0809D7A8: @ 0x0809D7A8
ldrb r0, [r5, #0x15]
cmp r0, #0x81
bne _0809D80C
bl sub_08000E50
bl Random
ldr r1, _0809D820 @ =gLinkEntity
ldrb r1, [r1, #0x14]
lsls r1, r1, #2
@ -538,7 +538,7 @@ sub_0809D8C8: @ 0x0809D8C8
push {r4, r5, r6, lr}
adds r5, r0, #0
adds r6, r1, #0
ldr r0, _0809D8E4 @ =gUnk_03003F80
ldr r0, _0809D8E4 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -548,7 +548,7 @@ sub_0809D8C8: @ 0x0809D8C8
bl sub_0800445C
b _0809D90A
.align 2, 0
_0809D8E4: .4byte gUnk_03003F80
_0809D8E4: .4byte gLinkState
_0809D8E8:
adds r0, r5, #0
bl sub_08017850
@ -1379,7 +1379,7 @@ _0809DF16:
cmp r1, #0
beq _0809DF52
adds r0, r5, #0
bl sub_0806FA24
bl CopyPosition
_0809DF52:
adds r0, r5, #0
bl sub_0805E79C
@ -1475,7 +1475,7 @@ _0809DFF4:
b _0809E034
_0809E008:
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
ldr r2, _0809E024 @ =gUnk_08124146
movs r1, #1
ands r1, r0
@ -1567,7 +1567,7 @@ sub_0809E0A0: @ 0x0809E0A0
strb r0, [r5, #0xf]
ldr r0, _0809E0CC @ =gLinkEntity
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldr r0, _0809E0D0 @ =0x0000FFF8
strh r0, [r4, #0x36]
_0809E0C8:
@ -1755,14 +1755,14 @@ sub_0809E210: @ 0x0809E210
movs r1, #0xfe
ands r0, r1
strb r0, [r4, #0x14]
ldr r1, _0809E234 @ =gUnk_03003F80
ldr r1, _0809E234 @ =gLinkState
movs r0, #0x80
lsls r0, r0, #1
strh r0, [r1, #8]
pop {r4, pc}
.align 2, 0
_0809E230: .4byte gLinkEntity
_0809E234: .4byte gUnk_03003F80
_0809E234: .4byte gLinkState
thumb_func_start sub_0809E238
sub_0809E238: @ 0x0809E238
@ -2189,7 +2189,7 @@ _0809E52E:
adds r4, r0, #0
adds r0, r6, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
adds r5, #1
movs r0, #0x9a
movs r1, #0xff
@ -2214,7 +2214,7 @@ _0809E52E:
adds r4, r0, #0
adds r0, r6, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
b _0809E5C4
.align 2, 0
_0809E5A0: .4byte gUnk_03003DBC
@ -2233,7 +2233,7 @@ _0809E5BA:
strb r5, [r6, #0x1e]
adds r0, r6, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
_0809E5C4:
adds r0, r6, #0
bl sub_0809E5F0
@ -3156,7 +3156,7 @@ sub_0809EC4C: @ 0x0809EC4C
beq _0809ED14
str r1, [r6, #0x54]
adds r0, r6, #0
bl sub_0806FA24
bl CopyPosition
b _0809ED14
.align 2, 0
_0809ECF4: .4byte gUnk_080FD168
@ -3977,7 +3977,7 @@ sub_0809F318: @ 0x0809F318
adds r4, r0, #0
movs r1, #0
bl sub_08004260
bl sub_08000E50
bl Random
movs r1, #0x10
ands r1, r0
cmp r1, #0
@ -4131,7 +4131,7 @@ _0809F444: .4byte gUnk_02000080
sub_0809F448: @ 0x0809F448
push {r4, r5, r6, r7, lr}
adds r6, r0, #0
bl sub_08000E50
bl Random
adds r5, r0, #0
ldrb r0, [r6, #0xf]
lsls r2, r0, #1
@ -4473,7 +4473,7 @@ sub_0809F6CC: @ 0x0809F6CC
lsls r0, r0, #0x18
cmp r0, #0
bne _0809F6F4
ldr r0, _0809F6FC @ =gUnk_03003F80
ldr r0, _0809F6FC @ =gLinkState
adds r0, #0x8b
movs r1, #1
strb r1, [r0]
@ -4482,7 +4482,7 @@ _0809F6F4:
pop {pc}
.align 2, 0
_0809F6F8: .4byte gRoomControls
_0809F6FC: .4byte gUnk_03003F80
_0809F6FC: .4byte gLinkState
thumb_func_start sub_0809F700
sub_0809F700: @ 0x0809F700
@ -4493,7 +4493,7 @@ sub_0809F700: @ 0x0809F700
bne _0809F722
movs r0, #1
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
movs r1, #0x1e
ands r0, r1
adds r0, #8
@ -4509,7 +4509,7 @@ _0809F722:
ands r0, r1
cmp r0, #0
bne _0809F750
bl sub_08000E50
bl Random
ldr r3, _0809F76C @ =gUnk_081247C0
movs r2, #7
adds r1, r0, #0
@ -4555,7 +4555,7 @@ sub_0809F770: @ 0x0809F770
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA30
bl sub_08000E50
bl Random
ldrh r2, [r4, #0x2e]
subs r2, #0x10
movs r3, #0x1f
@ -4592,7 +4592,7 @@ _0809F7C4:
adds r4, r0, #0
cmp r4, #0
beq _0809F7E8
bl sub_08000E50
bl Random
movs r1, #3
ands r1, r0
lsls r1, r1, #1
@ -4740,7 +4740,7 @@ _0809F8C6:
str r7, [r4, #0x54]
adds r0, r6, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
adds r1, r4, #0
adds r1, #0x68
adds r3, r5, #1
@ -5091,7 +5091,7 @@ sub_0809FB90: @ 0x0809FB90
sub_0809FBA4: @ 0x0809FBA4
push {lr}
adds r2, r0, #0
ldr r0, _0809FBC8 @ =gUnk_03003F80
ldr r0, _0809FBC8 @ =gLinkState
ldrb r1, [r0, #0x1c]
movs r0, #0xf
ands r0, r1
@ -5109,7 +5109,7 @@ _0809FBC2:
strb r0, [r2, #0xc]
b _0809FBD2
.align 2, 0
_0809FBC8: .4byte gUnk_03003F80
_0809FBC8: .4byte gLinkState
_0809FBCC:
adds r0, r2, #0
bl sub_0806F4E8
@ -5120,7 +5120,7 @@ _0809FBD2:
sub_0809FBD4: @ 0x0809FBD4
push {r4, r5, lr}
adds r4, r0, #0
ldr r0, _0809FBFC @ =gUnk_03003F80
ldr r0, _0809FBFC @ =gLinkState
ldrb r1, [r0, #0x1c]
movs r0, #0xf
ands r0, r1
@ -5139,7 +5139,7 @@ _0809FBF4:
strb r0, [r4, #0xc]
b _0809FC22
.align 2, 0
_0809FBFC: .4byte gUnk_03003F80
_0809FBFC: .4byte gLinkState
_0809FC00:
adds r0, r4, #0
bl sub_0806F3E4
@ -5171,7 +5171,7 @@ sub_0809FC28: @ 0x0809FC28
lsls r0, r0, #0x18
cmp r0, #0
bne _0809FCAC
bl sub_08000E50
bl Random
adds r5, r0, #0
ldrb r0, [r4, #0x10]
movs r1, #0x80
@ -5287,7 +5287,7 @@ _0809FD18: .4byte 0x00000B08
_0809FD1C:
adds r0, r2, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldrh r0, [r4, #0x36]
subs r0, #1
strh r0, [r4, #0x36]
@ -5340,7 +5340,7 @@ sub_0809FD4C: @ 0x0809FD4C
movs r0, #0xfb
strb r0, [r2]
ldr r0, [r1, #0x54]
bl sub_0806FA24
bl CopyPosition
pop {pc}
.align 2, 0
@ -5886,8 +5886,8 @@ sub_080A0190: @ 0x080A0190
movs r1, #1
strb r1, [r0, #0xd]
ldr r1, _080A01B8 @ =gLinkEntity
bl sub_0806FA24
ldr r2, _080A01BC @ =gUnk_03003F80
bl CopyPosition
ldr r2, _080A01BC @ =gLinkState
movs r0, #3
strb r0, [r2, #0xc]
adds r0, r2, #0
@ -5901,7 +5901,7 @@ sub_080A0190: @ 0x080A0190
pop {r4, pc}
.align 2, 0
_080A01B8: .4byte gLinkEntity
_080A01BC: .4byte gUnk_03003F80
_080A01BC: .4byte gLinkState
thumb_func_start sub_080A01C0
sub_080A01C0: @ 0x080A01C0
@ -5992,7 +5992,7 @@ _080A0246:
adds r0, r4, #0
movs r1, #0xad
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
cmp r0, #0
beq _080A027A
str r4, [r0, #0x50]
@ -6191,7 +6191,7 @@ sub_080A03E8: @ 0x080A03E8
bne _080A041A
movs r0, #0x5a
bl sub_0805E510
ldr r0, _080A0420 @ =gUnk_03003F80
ldr r0, _080A0420 @ =gLinkState
adds r0, #0x8b
movs r1, #1
strb r1, [r0]
@ -6203,7 +6203,7 @@ _080A041A:
pop {pc}
.align 2, 0
_080A041C: .4byte gTextBox
_080A0420: .4byte gUnk_03003F80
_080A0420: .4byte gLinkState
thumb_func_start sub_080A0424
sub_080A0424: @ 0x080A0424
@ -6521,7 +6521,7 @@ sub_080A0640: @ 0x080A0640
_080A065E:
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
_080A0666:
movs r0, #0
strh r0, [r4, #0x36]
@ -7294,7 +7294,7 @@ _080A0C08:
beq _080A0C40
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
movs r0, #0x68
strh r0, [r4, #0x32]
adds r0, r5, #0
@ -7335,7 +7335,7 @@ _080A0C6E:
beq _080A0C92
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
movs r0, #0x68
strh r0, [r4, #0x32]
adds r0, r5, #0
@ -7494,7 +7494,7 @@ sub_080A0D70: @ 0x080A0D70
strb r1, [r5, #0x1b]
movs r0, #0xb
strb r0, [r5, #0x1e]
bl sub_08000E50
bl Random
ands r0, r4
adds r0, #0x40
strb r0, [r5, #0xe]
@ -7524,7 +7524,7 @@ _080A0DC4:
ldrb r0, [r0]
cmp r0, #0xff
bne _080A0E02
bl sub_08000E50
bl Random
movs r1, #0x3f
ands r0, r1
adds r0, #0x40
@ -8021,14 +8021,14 @@ _080A11A8:
movs r1, #1
strb r1, [r2, #0xc]
strb r0, [r2, #0xd]
ldr r0, _080A11BC @ =gUnk_03003F80
ldr r0, _080A11BC @ =gLinkState
adds r0, #0x8b
strb r1, [r0]
bl sub_0805E564
bl UnfreezeTime
_080A11BA:
pop {r4, pc}
.align 2, 0
_080A11BC: .4byte gUnk_03003F80
_080A11BC: .4byte gLinkState
thumb_func_start sub_080A11C0
sub_080A11C0: @ 0x080A11C0
@ -8238,7 +8238,7 @@ _080A132E:
mov r0, sb
adds r0, #0x6a
strh r6, [r0]
ldr r0, _080A136C @ =gUnk_03003F80
ldr r0, _080A136C @ =gLinkState
adds r0, #0x27
movs r1, #0xff
strb r1, [r0]
@ -8255,7 +8255,7 @@ _080A132E:
bl sub_08050384
b _080A1376
.align 2, 0
_080A136C: .4byte gUnk_03003F80
_080A136C: .4byte gLinkState
_080A1370:
ldr r1, _080A1384 @ =gUnk_02033280
movs r0, #0
@ -8831,7 +8831,7 @@ _080A171E:
adds r0, #0x39
mov r2, sb
strb r2, [r0]
ldr r2, _080A183C @ =gUnk_03003F80
ldr r2, _080A183C @ =gLinkState
ldr r0, [r2, #0x30]
movs r1, #0x80
lsls r1, r1, #0xa
@ -8868,7 +8868,7 @@ _080A182C: .4byte gRoomControls
_080A1830: .4byte gLCDControls
_080A1834: .4byte 0x00001E07
_080A1838: .4byte gUnk_030010A0
_080A183C: .4byte gUnk_03003F80
_080A183C: .4byte gLinkState
_080A1840: .4byte 0x80100000
_080A1844: .4byte gUnk_02033A90
_080A1848: .4byte 0x00000864
@ -8896,7 +8896,7 @@ sub_080A184C: @ 0x080A184C
adds r0, #0x45
strb r2, [r0]
_080A1874:
ldr r2, _080A1894 @ =gUnk_03003F80
ldr r2, _080A1894 @ =gLinkState
ldr r1, _080A1898 @ =gRoomControls
movs r3, #0x80
lsls r3, r3, #2
@ -8912,7 +8912,7 @@ _080A1874:
strh r0, [r2, #0x18]
pop {pc}
.align 2, 0
_080A1894: .4byte gUnk_03003F80
_080A1894: .4byte gLinkState
_080A1898: .4byte gRoomControls
thumb_func_start sub_080A189C
@ -8953,7 +8953,7 @@ sub_080A189C: @ 0x080A189C
movs r1, #1
bl sub_08080964
_080A18E6:
ldr r2, _080A1904 @ =gUnk_03003F80
ldr r2, _080A1904 @ =gLinkState
ldr r1, _080A1908 @ =gRoomControls
movs r3, #0x80
lsls r3, r3, #2
@ -8969,7 +8969,7 @@ _080A18E6:
strh r0, [r2, #0x18]
pop {pc}
.align 2, 0
_080A1904: .4byte gUnk_03003F80
_080A1904: .4byte gLinkState
_080A1908: .4byte gRoomControls
thumb_func_start sub_080A190C
@ -9009,7 +9009,7 @@ sub_080A190C: @ 0x080A190C
movs r1, #0x18
strb r1, [r0]
_080A1956:
ldr r2, _080A1974 @ =gUnk_03003F80
ldr r2, _080A1974 @ =gLinkState
ldr r1, _080A1978 @ =gRoomControls
movs r3, #0x80
lsls r3, r3, #2
@ -9025,10 +9025,10 @@ _080A1956:
strh r0, [r2, #0x18]
b _080A1988
.align 2, 0
_080A1974: .4byte gUnk_03003F80
_080A1974: .4byte gLinkState
_080A1978: .4byte gRoomControls
_080A197C:
ldr r1, _080A198C @ =gUnk_03003F80
ldr r1, _080A198C @ =gLinkState
ldrh r0, [r2, #0x2e]
strh r0, [r1, #0x16]
ldr r0, [r3, #8]
@ -9037,7 +9037,7 @@ _080A197C:
_080A1988:
pop {r4, pc}
.align 2, 0
_080A198C: .4byte gUnk_03003F80
_080A198C: .4byte gLinkState
thumb_func_start sub_080A1990
sub_080A1990: @ 0x080A1990
@ -9075,7 +9075,7 @@ sub_080A1990: @ 0x080A1990
movs r1, #1
bl sub_08080964
_080A19D6:
ldr r2, _080A19F4 @ =gUnk_03003F80
ldr r2, _080A19F4 @ =gLinkState
ldr r1, _080A19F8 @ =gRoomControls
movs r3, #0x80
lsls r3, r3, #2
@ -9091,7 +9091,7 @@ _080A19D6:
strh r0, [r2, #0x18]
pop {pc}
.align 2, 0
_080A19F4: .4byte gUnk_03003F80
_080A19F4: .4byte gLinkState
_080A19F8: .4byte gRoomControls
thumb_func_start sub_080A19FC
@ -9131,7 +9131,7 @@ sub_080A19FC: @ 0x080A19FC
movs r1, #0x18
strb r1, [r0]
_080A1A46:
ldr r2, _080A1A64 @ =gUnk_03003F80
ldr r2, _080A1A64 @ =gLinkState
ldr r1, _080A1A68 @ =gRoomControls
movs r3, #0x80
lsls r3, r3, #2
@ -9147,10 +9147,10 @@ _080A1A46:
strh r0, [r2, #0x18]
b _080A1A78
.align 2, 0
_080A1A64: .4byte gUnk_03003F80
_080A1A64: .4byte gLinkState
_080A1A68: .4byte gRoomControls
_080A1A6C:
ldr r1, _080A1A7C @ =gUnk_03003F80
ldr r1, _080A1A7C @ =gLinkState
ldrh r0, [r2, #0x2e]
strh r0, [r1, #0x16]
ldr r0, [r3, #0xc]
@ -9159,7 +9159,7 @@ _080A1A6C:
_080A1A78:
pop {r4, pc}
.align 2, 0
_080A1A7C: .4byte gUnk_03003F80
_080A1A7C: .4byte gLinkState
thumb_func_start sub_080A1A80
sub_080A1A80: @ 0x080A1A80
@ -9194,7 +9194,7 @@ sub_080A1A80: @ 0x080A1A80
movs r1, #1
bl sub_08080964
_080A1AC0:
ldr r2, _080A1AE0 @ =gUnk_03003F80
ldr r2, _080A1AE0 @ =gLinkState
ldr r1, _080A1AE4 @ =gRoomControls
movs r3, #0x80
lsls r3, r3, #2
@ -9210,7 +9210,7 @@ _080A1AC0:
strh r0, [r2, #0x18]
pop {pc}
.align 2, 0
_080A1AE0: .4byte gUnk_03003F80
_080A1AE0: .4byte gLinkState
_080A1AE4: .4byte gRoomControls
thumb_func_start sub_080A1AE8
@ -9244,7 +9244,7 @@ sub_080A1AE8: @ 0x080A1AE8
movs r1, #0xc
strb r1, [r0]
_080A1B24:
ldr r2, _080A1B44 @ =gUnk_03003F80
ldr r2, _080A1B44 @ =gLinkState
ldr r1, _080A1B48 @ =gRoomControls
movs r3, #0x80
lsls r3, r3, #2
@ -9260,7 +9260,7 @@ _080A1B24:
strh r0, [r2, #0x18]
pop {r4, pc}
.align 2, 0
_080A1B44: .4byte gUnk_03003F80
_080A1B44: .4byte gLinkState
_080A1B48: .4byte gRoomControls
thumb_func_start sub_080A1B4C
@ -9315,20 +9315,20 @@ _080A1B80:
strb r6, [r4, #0x15]
movs r0, #0x60
strh r0, [r4, #0x24]
ldr r2, _080A1BF8 @ =gUnk_03003F80
ldr r2, _080A1BF8 @ =gLinkState
ldr r0, [r2, #0x30]
ldr r1, _080A1BFC @ =0xFFFDFFFF
ands r0, r1
str r0, [r2, #0x30]
adds r0, r3, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldr r0, _080A1C00 @ =gRoomControls
str r4, [r0, #0x30]
movs r0, #2
bl sub_08078A90
_080A1BD0:
ldr r2, _080A1BF8 @ =gUnk_03003F80
ldr r2, _080A1BF8 @ =gLinkState
ldr r1, _080A1C00 @ =gRoomControls
movs r3, #0x80
lsls r3, r3, #2
@ -9346,7 +9346,7 @@ _080A1BD0:
.align 2, 0
_080A1BF0: .4byte gUnk_030010A0
_080A1BF4: .4byte gLinkEntity
_080A1BF8: .4byte gUnk_03003F80
_080A1BF8: .4byte gLinkState
_080A1BFC: .4byte 0xFFFDFFFF
_080A1C00: .4byte gRoomControls
@ -9683,7 +9683,7 @@ sub_080A1E54: @ 0x080A1E54
adds r4, r0, #0
cmp r4, #0
beq _080A1ECA
bl sub_08000E50
bl Random
ldr r3, _080A1ECC @ =gRoomControls
movs r1, #0xf0
adds r2, r0, #0
@ -9902,7 +9902,7 @@ sub_080A1FF0: @ 0x080A1FF0
adds r4, r0, #0
cmp r4, #0
beq _080A2066
bl sub_08000E50
bl Random
ldr r3, _080A209C @ =gRoomControls
movs r1, #0x78
ands r0, r1
@ -10001,7 +10001,7 @@ _080A20C4:
ldrb r0, [r0]
cmp r0, #0
bne _080A20EC
ldr r0, _080A20F4 @ =gUnk_03003F80
ldr r0, _080A20F4 @ =gLinkState
ldrb r1, [r0, #0x14]
rsbs r0, r1, #0
orrs r0, r1
@ -10011,7 +10011,7 @@ _080A20EC:
b _080A20FA
.align 2, 0
_080A20F0: .4byte gLinkEntity
_080A20F4: .4byte gUnk_03003F80
_080A20F4: .4byte gLinkState
_080A20F8:
movs r0, #0
_080A20FA:
@ -10292,7 +10292,7 @@ _080A22FC:
strb r5, [r4, #0xf]
ldrb r0, [r4, #0x1e]
strb r0, [r4, #0xd]
bl sub_08000E50
bl Random
movs r1, #3
ands r0, r1
lsls r0, r0, #4
@ -10306,7 +10306,7 @@ _080A231C:
lsls r0, r0, #0x10
cmp r0, #0
bne _080A233E
bl sub_08000E50
bl Random
movs r1, #7
ands r0, r1
lsls r0, r0, #4
@ -10570,7 +10570,7 @@ sub_080A2508: @ 0x080A2508
ldrb r2, [r4, #0xa]
movs r1, #0
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
adds r2, r0, #0
cmp r2, #0
beq _080A252C
@ -10594,7 +10594,7 @@ sub_080A2534: @ 0x080A2534
ldrb r2, [r4, #0xa]
movs r1, #0
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
adds r2, r0, #0
cmp r2, #0
beq _080A2558
@ -10635,7 +10635,7 @@ sub_080A2578: @ 0x080A2578
thumb_func_start sub_080A2584
sub_080A2584: @ 0x080A2584
push {lr}
bl sub_0805E564
bl UnfreezeTime
ldr r1, _080A2598 @ =gUnk_02034490
movs r0, #0
strb r0, [r1]
@ -10737,7 +10737,7 @@ _080A25E6:
adds r0, r4, #0
movs r1, #6
bl sub_0805E3A0
ldr r0, _080A2670 @ =gUnk_03003F80
ldr r0, _080A2670 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #8
ands r0, r1
@ -10751,7 +10751,7 @@ _080A25E6:
adds r1, #3
b _080A2688
.align 2, 0
_080A2670: .4byte gUnk_03003F80
_080A2670: .4byte gLinkState
_080A2674: .4byte 0x0000045B
_080A2678:
ldrb r0, [r4, #0xa]
@ -10821,7 +10821,7 @@ _080A26B4:
adds r0, r5, #0
adds r0, #0x3d
strb r1, [r0]
ldr r1, _080A2768 @ =gUnk_03003F80
ldr r1, _080A2768 @ =gLinkState
adds r0, r4, #0
adds r0, #0x6b
ldrb r0, [r0]
@ -10873,7 +10873,7 @@ _080A2762:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A2764: .4byte gTextBox
_080A2768: .4byte gUnk_03003F80
_080A2768: .4byte gLinkState
thumb_func_start sub_080A276C
sub_080A276C: @ 0x080A276C
@ -10905,7 +10905,7 @@ sub_080A276C: @ 0x080A276C
ldr r4, _080A2828 @ =gLinkEntity
adds r0, r4, #0
adds r1, r6, #0
bl sub_0806FA24
bl CopyPosition
ldr r0, _080A282C @ =gUnk_03003DC0
mov r1, r8
strb r1, [r0]
@ -10926,7 +10926,7 @@ sub_080A276C: @ 0x080A276C
ldrb r0, [r0]
adds r1, #2
strb r0, [r1]
ldr r1, _080A2834 @ =gUnk_03003F80
ldr r1, _080A2834 @ =gLinkState
ldrb r0, [r1, #7]
adds r2, r6, #0
adds r2, #0x6b
@ -10972,4 +10972,4 @@ _080A2820:
_080A2828: .4byte gLinkEntity
_080A282C: .4byte gUnk_03003DC0
_080A2830: .4byte gUnk_02034490
_080A2834: .4byte gUnk_03003F80
_080A2834: .4byte gLinkState

26
asm/code_080A29BC.s
View File

@ -72,7 +72,7 @@ sub_080A2A20: @ 0x080A2A20
adds r3, r2, #0
movs r1, #0
adds r2, r4, #0
bl sub_080A2988
bl CreateObjectWithParent
adds r1, r0, #0
cmp r1, #0
beq _080A2A38
@ -91,7 +91,7 @@ sub_080A2A3C: @ 0x080A2A3C
movs r1, #0
adds r2, r4, #0
adds r3, r5, #0
bl sub_080A2988
bl CreateObjectWithParent
adds r1, r0, #0
cmp r1, #0
beq _080A2A5E
@ -132,7 +132,7 @@ sub_080A2A84: @ 0x080A2A84
adds r6, r0, #0
cmp r6, #0
beq _080A2AD2
bl sub_08000E50
bl Random
adds r4, r0, #0
adds r5, #1
adds r1, r5, #0
@ -196,7 +196,7 @@ sub_080A2AF4: @ 0x080A2AF4
adds r6, r0, #0
cmp r6, #0
beq _080A2B74
bl sub_08000E50
bl Random
adds r7, r0, #0
subs r1, r4, r5
adds r1, #1
@ -262,7 +262,7 @@ sub_080A2B80: @ 0x080A2B80
adds r4, r0, #0
cmp r4, #0
beq _080A2BE0
bl sub_08000E50
bl Random
adds r3, r0, #0
movs r1, #0xf
adds r2, r3, #0
@ -496,7 +496,7 @@ sub_080A2D2C: @ 0x080A2D2C
beq _080A2D6E
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FAB0
@ -541,7 +541,7 @@ _080A2D94: .4byte gUnk_081271D4
sub_080A2D98: @ 0x080A2D98
push {r4, lr}
adds r4, r0, #0
ldr r0, _080A2DD0 @ =gUnk_03003F80
ldr r0, _080A2DD0 @ =gLinkState
str r4, [r0, #0x2c]
movs r2, #0
movs r0, #1
@ -568,7 +568,7 @@ sub_080A2D98: @ 0x080A2D98
str r1, [r4, #0x7c]
b _080A2DDA
.align 2, 0
_080A2DD0: .4byte gUnk_03003F80
_080A2DD0: .4byte gLinkState
_080A2DD4: .4byte gUnk_081271DC
_080A2DD8:
str r2, [r4, #0x70]
@ -626,7 +626,7 @@ _080A2E1A:
strb r2, [r3]
strb r2, [r5]
_080A2E40:
ldr r0, _080A2E94 @ =gUnk_03003F80
ldr r0, _080A2E94 @ =gLinkState
ldrb r3, [r0, #3]
adds r7, r0, #0
cmp r3, #0
@ -667,7 +667,7 @@ _080A2E40:
b _080A2F30
.align 2, 0
_080A2E90: .4byte gLinkEntity
_080A2E94: .4byte gUnk_03003F80
_080A2E94: .4byte gLinkState
_080A2E98: .4byte gUnk_08127240
_080A2E9C:
adds r0, r4, #0
@ -827,7 +827,7 @@ _080A2FA2:
ldr r1, [r4, #0x7c]
adds r2, r1, r0
ldrb r0, [r2]
ldr r7, _080A3020 @ =gUnk_03003F80
ldr r7, _080A3020 @ =gLinkState
cmp r0, #0xff
bne _080A2FEC
ldrb r1, [r7, #3]
@ -868,7 +868,7 @@ _080A2FEC:
b _080A303E
.align 2, 0
_080A301C: .4byte gLinkEntity
_080A3020: .4byte gUnk_03003F80
_080A3020: .4byte gLinkState
_080A3024: .4byte gUnk_081271DC
_080A3028:
ldr r0, _080A3060 @ =gLinkEntity
@ -934,7 +934,7 @@ sub_080A3084: @ 0x080A3084
strb r5, [r4, #0xc]
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldrb r0, [r4, #0xa]
cmp r0, #0
bne _080A30F8

8
asm/code_080A3BD0.s
View File

@ -3101,7 +3101,7 @@ _080A53E0:
blo _080A542E
cmp r3, #8
bhi _080A5414
ldr r0, _080A5410 @ =gUnk_080FD5A0
ldr r0, _080A5410 @ =gBombBagSizes
adds r1, r4, #0
adds r1, #0xae
ldrb r1, [r1]
@ -3117,11 +3117,11 @@ _080A5400: .4byte gUnk_03001010
_080A5404: .4byte gUnk_02002A40
_080A5408: .4byte gUnk_02000080
_080A540C: .4byte gUnk_08128B64
_080A5410: .4byte gUnk_080FD5A0
_080A5410: .4byte gBombBagSizes
_080A5414:
cmp r3, #0xa
bhi _080A542E
ldr r0, _080A552C @ =gUnk_080FD5A4
ldr r0, _080A552C @ =gQuiverSizes
adds r1, r4, #0
adds r1, #0xaf
ldrb r1, [r1]
@ -3261,7 +3261,7 @@ _080A5522:
mov sl, r5
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A552C: .4byte gUnk_080FD5A4
_080A552C: .4byte gQuiverSizes
_080A5530: .4byte gUnk_03001010
_080A5534: .4byte gUnk_080FDFD8
_080A5538: .4byte gUnk_02000080

204
asm/code_080A5574.s
View File

@ -1851,7 +1851,7 @@ _080A6392:
bl __divsi3
adds r0, #0xc
strh r0, [r5, #2]
ldr r0, _080A642C @ =gUnk_03003F80
ldr r0, _080A642C @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #8
ands r0, r1
@ -1891,7 +1891,7 @@ _080A63EA:
_080A6420: .4byte gUnk_02000080
_080A6424: .4byte gUnk_03001010
_080A6428: .4byte gUnk_030010A0
_080A642C: .4byte gUnk_03003F80
_080A642C: .4byte gLinkState
_080A6430: .4byte 0x000001FB
_080A6434: .4byte gUnk_08128DE8
@ -2475,7 +2475,7 @@ _080A68D0: .4byte gUnk_02019EE0
thumb_func_start sub_080A68D4
sub_080A68D4: @ 0x080A68D4
push {r4, r5, r6, lr}
ldr r0, _080A690C @ =gUnk_03003F80
ldr r0, _080A690C @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #8
ands r0, r1
@ -2501,7 +2501,7 @@ _080A68E6:
movs r5, #0
b _080A693A
.align 2, 0
_080A690C: .4byte gUnk_03003F80
_080A690C: .4byte gLinkState
_080A6910: .4byte gUnk_030010A0
_080A6914: .4byte 0x000001FB
_080A6918: .4byte gUnk_02002A40
@ -2807,7 +2807,7 @@ sub_080A6B04: @ 0x080A6B04
movs r2, #0x80
lsls r2, r2, #5
bl sub_0801D5EC
ldr r0, _080A6C0C @ =gUnk_03003F80
ldr r0, _080A6C0C @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #8
ands r0, r1
@ -2874,7 +2874,7 @@ _080A6BFC: .4byte gUnk_02000080
_080A6C00: .4byte 0x0000475F
_080A6C04: .4byte 0x00005001
_080A6C08: .4byte gUnk_02001A40
_080A6C0C: .4byte gUnk_03003F80
_080A6C0C: .4byte gLinkState
_080A6C10: .4byte gUnk_030010A0
_080A6C14: .4byte 0x000001FB
_080A6C18: .4byte gUnk_08128E94
@ -3738,7 +3738,7 @@ sub_080A7250: @ 0x080A7250
adds r0, #0x2f
ldrb r0, [r0]
strb r0, [r1, #0xd]
ldr r0, _080A7318 @ =gUnk_03003F80
ldr r0, _080A7318 @ =gLinkState
adds r0, #0x8b
ldrb r0, [r0]
strb r0, [r1, #0xc]
@ -3768,7 +3768,7 @@ _080A7308: .4byte gRoomControls
_080A730C: .4byte gUnk_03000420
_080A7310: .4byte gUnk_02033280
_080A7314: .4byte gUnk_030010A0
_080A7318: .4byte gUnk_03003F80
_080A7318: .4byte gLinkState
_080A731C: .4byte gUnk_02017654
_080A7320: .4byte gUnk_02025EB0
_080A7324: .4byte gUnk_0200B650
@ -3839,7 +3839,7 @@ _080A73B4:
ldr r5, _080A7470 @ =gUnk_02032EC0
ldr r0, [r5, #0x10]
str r0, [r1]
ldr r0, _080A7474 @ =gUnk_03003F80
ldr r0, _080A7474 @ =gLinkState
ldrb r1, [r5, #0xc]
adds r0, #0x8b
strb r1, [r0]
@ -3912,7 +3912,7 @@ _080A73B4:
_080A7468: .4byte gUnk_03000FD0
_080A746C: .4byte gUnk_02017654
_080A7470: .4byte gUnk_02032EC0
_080A7474: .4byte gUnk_03003F80
_080A7474: .4byte gLinkState
_080A7478: .4byte gUnk_02025EB0
_080A747C: .4byte gUnk_0200B650
_080A7480: .4byte gUnk_02033280
@ -4042,7 +4042,7 @@ sub_080A758C: @ 0x080A758C
ldrb r0, [r5, #0xa]
cmp r0, #0
bne _080A75AC
ldr r1, _080A7654 @ =gUnk_03003F80
ldr r1, _080A7654 @ =gLinkState
ldrb r0, [r1, #4]
cmp r0, #0
bne _080A75AC
@ -4103,7 +4103,7 @@ _080A75BA:
ldrb r0, [r5, #0xa]
cmp r0, #0
bne _080A76BC
ldr r2, _080A7654 @ =gUnk_03003F80
ldr r2, _080A7654 @ =gLinkState
ldrb r1, [r2, #2]
movs r0, #0x20
ands r0, r1
@ -4135,7 +4135,7 @@ _080A75BA:
movs r0, #0x1a
b _080A766A
.align 2, 0
_080A7654: .4byte gUnk_03003F80
_080A7654: .4byte gLinkState
_080A7658: .4byte gLinkEntity
_080A765C:
adds r1, r5, #0
@ -4167,7 +4167,7 @@ _080A767A:
adds r0, r5, #0
bl sub_080A76CC
_080A7692:
ldr r0, _080A76B0 @ =gUnk_03003F80
ldr r0, _080A76B0 @ =gLinkState
str r5, [r0, #0x2c]
adds r0, r5, #0
bl sub_08079BD8
@ -4180,7 +4180,7 @@ _080A7692:
bl PlaySFX
b _080A76C2
.align 2, 0
_080A76B0: .4byte gUnk_03003F80
_080A76B0: .4byte gLinkState
_080A76B4: .4byte gUnk_0812906C
_080A76B8: .4byte gUnk_08129068
_080A76BC:
@ -4201,7 +4201,7 @@ sub_080A76CC: @ 0x080A76CC
beq _080A76D8
b _080A77DC
_080A76D8:
ldr r5, _080A771C @ =gUnk_03003F80
ldr r5, _080A771C @ =gLinkState
ldr r0, [r5, #0x2c]
cmp r0, r4
beq _080A76E4
@ -4235,7 +4235,7 @@ _080A76F2:
movs r0, #0xa
b _080A7726
.align 2, 0
_080A771C: .4byte gUnk_03003F80
_080A771C: .4byte gLinkState
_080A7720:
movs r0, #8
b _080A7726
@ -4280,7 +4280,7 @@ _080A7762:
_080A7768:
strb r0, [r1]
_080A776A:
ldr r0, _080A77D0 @ =gUnk_03003F80
ldr r0, _080A77D0 @ =gLinkState
adds r0, #0x3e
ldrb r0, [r0]
movs r2, #3
@ -4332,11 +4332,11 @@ _080A77C4:
bl sub_080A78B8
b _080A7806
.align 2, 0
_080A77D0: .4byte gUnk_03003F80
_080A77D0: .4byte gLinkState
_080A77D4: .4byte gLinkEntity
_080A77D8: .4byte gUnk_081292E2
_080A77DC:
ldr r1, _080A7810 @ =gUnk_03003F80
ldr r1, _080A7810 @ =gLinkState
ldrb r0, [r1, #4]
cmp r0, #0
beq _080A7814
@ -4361,7 +4361,7 @@ _080A7806:
bl sub_080A7A84
b _080A7820
.align 2, 0
_080A7810: .4byte gUnk_03003F80
_080A7810: .4byte gLinkState
_080A7814:
movs r0, #0xff
strb r0, [r4, #0x1e]
@ -4377,7 +4377,7 @@ _080A7820:
sub_080A7824: @ 0x080A7824
push {r4, r5, r6, lr}
adds r4, r0, #0
ldr r5, _080A7860 @ =gUnk_03003F80
ldr r5, _080A7860 @ =gLinkState
ldr r0, [r5, #0x2c]
cmp r0, r4
beq _080A7834
@ -4405,7 +4405,7 @@ _080A7846:
bl sub_0805E780
b _080A78B4
.align 2, 0
_080A7860: .4byte gUnk_03003F80
_080A7860: .4byte gLinkState
_080A7864: .4byte gLinkEntity
_080A7868:
adds r0, r4, #0
@ -4457,7 +4457,7 @@ sub_080A78B8: @ 0x080A78B8
push {r7}
adds r4, r0, #0
adds r6, r1, #0
ldr r0, _080A78E8 @ =gUnk_03003F80
ldr r0, _080A78E8 @ =gLinkState
ldrb r1, [r0, #0x1b]
movs r0, #0x20
ands r0, r1
@ -4477,7 +4477,7 @@ sub_080A78B8: @ 0x080A78B8
adds r1, #0xb1
b _080A78F2
.align 2, 0
_080A78E8: .4byte gUnk_03003F80
_080A78E8: .4byte gLinkState
_080A78EC: .4byte gUnk_030010A0
_080A78F0:
ldrb r1, [r4, #0x1e]
@ -4498,7 +4498,7 @@ _080A78FC:
adds r0, r4, #0
bl sub_080042D0
_080A7912:
ldr r2, _080A792C @ =gUnk_03003F80
ldr r2, _080A792C @ =gLinkState
ldrb r1, [r2, #0x1b]
movs r0, #0x40
ands r0, r1
@ -4511,7 +4511,7 @@ _080A7912:
ands r0, r1
b _080A7958
.align 2, 0
_080A792C: .4byte gUnk_03003F80
_080A792C: .4byte gLinkState
_080A7930:
ldrb r1, [r6, #0x14]
movs r0, #2
@ -4718,7 +4718,7 @@ sub_080A7A84: @ 0x080A7A84
adds r0, r0, r2
movs r5, #0
ldrsb r5, [r0, r5]
ldr r2, _080A7AE8 @ =gUnk_03003F80
ldr r2, _080A7AE8 @ =gLinkState
ldrb r1, [r2, #0x1b]
movs r0, #0xc0
ands r0, r1
@ -4747,7 +4747,7 @@ _080A7AC4:
.align 2, 0
_080A7AE0: .4byte gLinkEntity
_080A7AE4: .4byte gUnk_08129072
_080A7AE8: .4byte gUnk_03003F80
_080A7AE8: .4byte gLinkState
_080A7AEC:
ldr r0, [r4, #0x34]
cmp r0, #0
@ -4838,7 +4838,7 @@ sub_080A7B98: @ 0x080A7B98
mov r5, r8
push {r5, r6, r7}
adds r6, r0, #0
ldr r0, _080A7BFC @ =gUnk_03003F80
ldr r0, _080A7BFC @ =gLinkState
adds r0, #0xac
ldrh r1, [r0]
movs r0, #8
@ -4884,7 +4884,7 @@ _080A7BCE:
mov sl, r5
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A7BFC: .4byte gUnk_03003F80
_080A7BFC: .4byte gLinkState
thumb_func_start sub_080A7C00
sub_080A7C00: @ 0x080A7C00
@ -6409,7 +6409,7 @@ _080A8700:
ands r0, r1
cmp r0, #3
bne _080A8768
ldr r0, _080A875C @ =gUnk_03003F80
ldr r0, _080A875C @ =gLinkState
ldrb r0, [r0, #0xf]
cmp r0, #0
beq _080A876E
@ -6446,7 +6446,7 @@ _080A8700:
bl sub_0805E780
b _080A876E
.align 2, 0
_080A875C: .4byte gUnk_03003F80
_080A875C: .4byte gLinkState
_080A8760: .4byte gRoomControls
_080A8764: .4byte gLinkEntity
_080A8768:
@ -6496,7 +6496,7 @@ _080A87A4:
_080A87B6:
adds r0, r4, #0
adds r1, r5, #0
bl sub_0806FA24
bl CopyPosition
ldrh r0, [r5, #0x36]
adds r0, #2
strh r0, [r5, #0x36]
@ -6565,7 +6565,7 @@ sub_080A881C: @ 0x080A881C
ldrb r0, [r0]
cmp r0, #0x80
bne _080A884A
ldr r0, _080A8850 @ =gUnk_03003F80
ldr r0, _080A8850 @ =gLinkState
movs r1, #0xf0
strb r1, [r0, #0xf]
movs r0, #2
@ -6575,7 +6575,7 @@ _080A884A:
bl sub_0805E780
b _080A8866
.align 2, 0
_080A8850: .4byte gUnk_03003F80
_080A8850: .4byte gLinkState
_080A8854:
ldrb r0, [r1, #0xc]
cmp r0, #1
@ -6691,7 +6691,7 @@ _080A890E:
bl sub_08078954
ldr r1, [r4, #0x54]
adds r0, r4, #0
bl sub_0806FA24
bl CopyPosition
ldrb r0, [r4, #0xe]
adds r1, r0, #1
strb r1, [r4, #0xe]
@ -6767,7 +6767,7 @@ _080A89A6:
bl sub_08078954
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
_080A89B4:
movs r1, #0xa0
lsls r1, r1, #6
@ -6939,7 +6939,7 @@ _080A8AE6:
bne _080A8B2E
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldrb r0, [r5, #0x15]
adds r2, r0, #4
movs r0, #0x18
@ -7098,7 +7098,7 @@ _080A8C16:
bne _080A8C42
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldrb r0, [r4, #0xe]
cmp r0, #0
beq _080A8C42
@ -7243,7 +7243,7 @@ _080A8D2A:
bne _080A8D56
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldrb r0, [r4, #0xe]
cmp r0, #0
beq _080A8D56
@ -7382,7 +7382,7 @@ sub_080A8E28: @ 0x080A8E28
beq _080A8E6E
ldr r0, [r5, #0x50]
adds r1, r5, #0
bl sub_0806FA24
bl CopyPosition
movs r1, #0x80
lsls r1, r1, #5
ldrb r2, [r5, #0x15]
@ -7430,7 +7430,7 @@ _080A8E8E:
ldrb r6, [r5, #0xa]
cmp r6, #1
bne _080A8ECE
bl sub_08000E50
bl Random
adds r2, r0, #0
ldr r0, _080A8EC4 @ =0x000001FF
ands r2, r0
@ -7478,7 +7478,7 @@ _080A8EF2:
_080A8F02:
ldr r0, _080A8F64 @ =0xFF600000
str r0, [r5, #0x34]
bl sub_08000E50
bl Random
ands r4, r0
lsls r2, r4, #1
ldr r1, _080A8F68 @ =gUnk_08129978
@ -7501,7 +7501,7 @@ _080A8F02:
ands r2, r0
cmp r2, #0
beq _080A8F74
bl sub_08000E50
bl Random
ldr r2, _080A8F6C @ =gUnk_08129988
movs r1, #0xf
ands r1, r0
@ -7511,7 +7511,7 @@ _080A8F02:
ldrh r2, [r5, #0x2e]
adds r0, r0, r2
strh r0, [r5, #0x2e]
bl sub_08000E50
bl Random
ldr r2, _080A8F70 @ =gUnk_08129980
movs r1, #7
ands r1, r0
@ -7527,7 +7527,7 @@ _080A8F68: .4byte gUnk_08129978
_080A8F6C: .4byte gUnk_08129988
_080A8F70: .4byte gUnk_08129980
_080A8F74:
bl sub_08000E50
bl Random
ldr r2, _080A8FB0 @ =gUnk_08129980
movs r1, #7
ands r1, r0
@ -7537,7 +7537,7 @@ _080A8F74:
ldrh r1, [r5, #0x2e]
adds r0, r0, r1
strh r0, [r5, #0x2e]
bl sub_08000E50
bl Random
ldr r2, _080A8FB4 @ =gUnk_08129988
movs r1, #0xf
ands r1, r0
@ -7817,7 +7817,7 @@ _080A91A4:
str r0, [r5, #0x48]
adds r0, r4, #0
adds r1, r5, #0
bl sub_0806FA24
bl CopyPosition
adds r0, r4, #0
adds r0, #0x3d
ldrb r0, [r0]
@ -7851,7 +7851,7 @@ sub_080A91E0: @ 0x080A91E0
bne _080A9204
movs r0, #1
strb r0, [r4, #0xc]
bl sub_08000E50
bl Random
strb r0, [r4, #0xe]
ldrb r1, [r4, #0x18]
movs r0, #4
@ -7874,7 +7874,7 @@ _080A9218:
_080A921C:
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldrb r0, [r4, #0xf]
cmp r0, #0
beq _080A9230
@ -7919,7 +7919,7 @@ _080A9230:
str r0, [r5, #0x50]
adds r0, r4, #0
adds r1, r5, #0
bl sub_0806FA24
bl CopyPosition
b _080A92F6
.align 2, 0
_080A9284: .4byte gUnk_081299C8
@ -8457,7 +8457,7 @@ _080A9660:
movs r1, #6
orrs r0, r1
strb r0, [r2]
bl sub_08000E50
bl Random
ldr r2, _080A96C8 @ =0x000001FF
adds r1, r2, #0
ands r0, r1
@ -8465,14 +8465,14 @@ _080A9660:
adds r1, r2, #0
adds r0, r0, r1
strh r0, [r4, #0x24]
bl sub_08000E50
bl Random
ldr r1, _080A96CC @ =0x00001FFF
ands r1, r0
movs r0, #0xc0
lsls r0, r0, #9
adds r1, r1, r0
str r1, [r4, #0x20]
bl sub_08000E50
bl Random
movs r1, #7
ands r0, r1
subs r0, #4
@ -8495,11 +8495,11 @@ _080A9660:
_080A96C8: .4byte 0x000001FF
_080A96CC: .4byte 0x00001FFF
_080A96D0:
bl sub_08000E50
bl Random
ands r0, r5
cmp r0, #0
beq _080A96EA
bl sub_08000E50
bl Random
movs r1, #7
ands r0, r1
ldrb r1, [r4, #0x15]
@ -8507,7 +8507,7 @@ _080A96D0:
strb r0, [r4, #0x15]
b _080A96F8
_080A96EA:
bl sub_08000E50
bl Random
movs r1, #7
ands r0, r1
ldrb r1, [r4, #0x15]
@ -8531,7 +8531,7 @@ _080A96F8:
_080A9718:
ldr r0, _080A9760 @ =gLinkEntity
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldr r0, _080A9764 @ =0xFF600000
str r0, [r4, #0x34]
ldrh r0, [r4, #0x2e]
@ -8540,13 +8540,13 @@ _080A9718:
ldrh r0, [r4, #0x32]
adds r0, #0x40
strh r0, [r4, #0x32]
bl sub_08000E50
bl Random
movs r1, #0xc0
bl __modsi3
ldrh r1, [r4, #0x2e]
subs r1, r1, r0
strh r1, [r4, #0x2e]
bl sub_08000E50
bl Random
movs r1, #0x7f
ands r1, r0
ldrh r0, [r4, #0x32]
@ -8771,7 +8771,7 @@ _080A98D0:
strb r0, [r1, #0x15]
ldr r1, [r4, #0x54]
adds r0, r4, #0
bl sub_0806FA24
bl CopyPosition
_080A98FC:
adds r5, #1
cmp r5, #2
@ -10071,7 +10071,7 @@ sub_080AA270: @ 0x080AA270
push {r4, r5, r6, lr}
adds r5, r0, #0
ldr r4, [r5, #0x50]
bl sub_08000E50
bl Random
ldr r1, _080AA2A4 @ =gUnk_08129CA4
movs r6, #7
ands r0, r6
@ -10096,7 +10096,7 @@ sub_080AA270: @ 0x080AA270
_080AA2A4: .4byte gUnk_08129CA4
_080AA2A8: .4byte gUnk_08129CF4
_080AA2AC:
bl sub_08000E50
bl Random
ldr r1, _080AA2D8 @ =gUnk_08129CAC
ands r0, r6
adds r0, r0, r1
@ -10346,7 +10346,7 @@ _080AA474:
cmp r1, #0
beq _080AA48A
adds r0, r4, #0
bl sub_0806FA24
bl CopyPosition
_080AA48A:
adds r0, r4, #0
bl sub_0805E7BC
@ -10952,7 +10952,7 @@ _080AA920:
ldrb r2, [r4, #0xa]
cmp r0, r2
bne _080AA99A
ldr r1, _080AA9A4 @ =gUnk_03003F80
ldr r1, _080AA9A4 @ =gLinkState
adds r0, r1, #0
adds r0, #0xa8
ldrb r0, [r0]
@ -11011,7 +11011,7 @@ _080AA99A:
.align 2, 0
_080AA99C: .4byte gLinkEntity
_080AA9A0: .4byte gUnk_0812A064
_080AA9A4: .4byte gUnk_03003F80
_080AA9A4: .4byte gLinkState
_080AA9A8: .4byte gUnk_0812A06C
thumb_func_start sub_080AA9AC
@ -11300,7 +11300,7 @@ sub_080AABB0: @ 0x080AABB0
ldr r5, [r4, #0x50]
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldrb r1, [r5, #0x14]
lsls r1, r1, #1
ldr r0, _080AABEC @ =gUnk_080C9160
@ -11409,7 +11409,7 @@ _080AAC84:
bl sub_0806FAB0
_080AAC8C:
bl sub_08077B2C
ldr r2, _080AACB4 @ =gUnk_03003F80
ldr r2, _080AACB4 @ =gLinkState
ldrb r1, [r2, #0x1a]
movs r0, #0x80
orrs r1, r0
@ -11428,14 +11428,14 @@ _080AACA0:
strb r1, [r0]
b _080AACCA
.align 2, 0
_080AACB4: .4byte gUnk_03003F80
_080AACB4: .4byte gLinkState
_080AACB8: .4byte gLinkEntity
_080AACBC:
ldr r0, _080AACDC @ =0x00000119
bl PlaySFX
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
_080AACCA:
adds r1, r4, #0
adds r1, #0x42
@ -11671,7 +11671,7 @@ _080AAE64:
strb r0, [r5, #0x10]
ldr r0, [r5, #0x50]
adds r1, r5, #0
bl sub_0806FA24
bl CopyPosition
_080AAE7C:
ldrb r1, [r5, #0xa]
adds r0, r5, #0
@ -11735,7 +11735,7 @@ _080AAEE0:
_080AAEEE:
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
_080AAEF6:
adds r0, r4, #0
bl sub_080AB034
@ -11757,7 +11757,7 @@ sub_080AAF10: @ 0x080AAF10
adds r4, r0, #0
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
adds r0, r4, #0
bl sub_080AB034
ldr r3, [r4, #0x50]
@ -11813,7 +11813,7 @@ sub_080AAF74: @ 0x080AAF74
bl sub_0807953C
cmp r0, #0
beq _080AAF94
bl sub_08000E50
bl Random
adds r3, r5, #0
adds r3, #0x80
ldrb r1, [r3]
@ -11869,7 +11869,7 @@ _080AAFE0:
adds r0, #0x3d
movs r1, #0xf0
strb r1, [r0]
ldr r0, _080AB000 @ =gUnk_03003F80
ldr r0, _080AB000 @ =gLinkState
strb r2, [r0, #0x1a]
adds r0, r5, #0
adds r0, #0x45
@ -11877,10 +11877,10 @@ _080AAFE0:
b _080AB028
.align 2, 0
_080AAFFC: .4byte gLinkEntity
_080AB000: .4byte gUnk_03003F80
_080AB000: .4byte gLinkState
_080AB004:
bl sub_08077B2C
ldr r2, _080AB02C @ =gUnk_03003F80
ldr r2, _080AB02C @ =gLinkState
ldrb r1, [r2, #0x1a]
movs r0, #0x80
orrs r1, r0
@ -11891,14 +11891,14 @@ _080AB004:
ldr r4, _080AB030 @ =gLinkEntity
adds r0, r4, #0
adds r1, r5, #0
bl sub_0806FA24
bl CopyPosition
ldrh r0, [r4, #0x36]
subs r0, #4
strh r0, [r5, #0x36]
_080AB028:
pop {r4, r5, pc}
.align 2, 0
_080AB02C: .4byte gUnk_03003F80
_080AB02C: .4byte gLinkState
_080AB030: .4byte gLinkEntity
thumb_func_start sub_080AB034
@ -12325,7 +12325,7 @@ sub_080AB318: @ 0x080AB318
strh r1, [r0]
ldr r0, [r6, #0x50]
adds r1, r6, #0
bl sub_0806FA24
bl CopyPosition
movs r1, #0x80
lsls r1, r1, #5
ldrb r2, [r6, #0x15]
@ -12365,7 +12365,7 @@ sub_080AB318: @ 0x080AB318
adds r2, r7, #0
bl sub_080041DC
adds r4, r0, #0
bl sub_08000E50
bl Random
adds r1, r0, #0
ldr r0, _080AB3E4 @ =0x000001FF
ands r1, r0
@ -13087,7 +13087,7 @@ sub_080AB8E8: @ 0x080AB8E8
ldrb r0, [r4, #0xa]
cmp r0, #0
bne _080AB90E
bl sub_08000E50
bl Random
movs r1, #0x18
ands r0, r1
strb r0, [r4, #0x15]
@ -13109,7 +13109,7 @@ _080AB90E:
str r0, [r1, #0x50]
str r4, [r1, #0x54]
adds r0, r4, #0
bl sub_0806FA24
bl CopyPosition
_080AB936:
adds r1, r4, #0
adds r1, #0x68
@ -13151,7 +13151,7 @@ sub_080AB950: @ 0x080AB950
cmp r0, #0
beq _080AB9D4
_080AB980:
bl sub_08000E50
bl Random
ldr r2, _080AB998 @ =gUnk_0812A6BC
movs r1, #1
ands r1, r0
@ -13605,13 +13605,13 @@ sub_080ABCC4: @ 0x080ABCC4
movs r4, #0
movs r0, #1
strb r0, [r5, #0xc]
bl sub_08000E50
bl Random
movs r1, #0x3f
ands r0, r1
adds r0, #0x30
strb r0, [r5, #0xe]
strb r4, [r5, #0xf]
bl sub_08000E50
bl Random
movs r1, #0x1f
ands r0, r1
strb r0, [r5, #0x15]
@ -13760,7 +13760,7 @@ _080ABE00:
sub_080ABE04: @ 0x080ABE04
push {r4, r5, lr}
adds r4, r0, #0
bl sub_08000E50
bl Random
adds r5, r0, #0
movs r0, #0xff
ands r5, r0
@ -13857,7 +13857,7 @@ sub_080ABEA8: @ 0x080ABEA8
ldrb r0, [r4, #0xb]
cmp r0, #0
bne _080ABEDA
bl sub_08000E50
bl Random
movs r1, #0xf
ands r0, r1
lsls r0, r0, #1
@ -14213,7 +14213,7 @@ sub_080AC168: @ 0x080AC168
movs r0, #4
strb r0, [r4, #0xc]
strb r0, [r4, #0xe]
bl sub_08000E50
bl Random
adds r5, r0, #0
movs r0, #7
ands r5, r0
@ -14298,7 +14298,7 @@ sub_080AC200: @ 0x080AC200
ldr r0, [r4, #0x50]
str r0, [r1, #0x50]
adds r0, r4, #0
bl sub_0806FA24
bl CopyPosition
_080AC23C:
ldrb r0, [r4, #0xf]
subs r0, #1
@ -14459,7 +14459,7 @@ sub_080AC340: @ 0x080AC340
ands r0, r1
orrs r0, r2
strb r0, [r5, #0x18]
bl sub_08000E50
bl Random
ldr r1, _080AC384 @ =gUnk_0812A9B4
ands r0, r4
lsls r0, r0, #1
@ -15072,7 +15072,7 @@ sub_080AC7C4: @ 0x080AC7C4
beq _080AC7E4
ldr r0, [r4, #0x50]
adds r1, r5, #0
bl sub_0806FA24
bl CopyPosition
b _080AC7E6
_080AC7E4:
ldr r5, [r4, #0x50]
@ -15602,7 +15602,7 @@ _080ACBC8: .4byte 0x00000119
sub_080ACBCC: @ 0x080ACBCC
push {r4, lr}
adds r4, r0, #0
ldr r0, _080ACBFC @ =gUnk_03003F80
ldr r0, _080ACBFC @ =gLinkState
ldrb r1, [r0, #0x1c]
movs r0, #0x7f
ands r0, r1
@ -15623,7 +15623,7 @@ _080ACBE0:
strb r0, [r1]
pop {r4, pc}
.align 2, 0
_080ACBFC: .4byte gUnk_03003F80
_080ACBFC: .4byte gLinkState
_080ACC00: .4byte gUnk_0812AA80
thumb_func_start sub_080ACC04
@ -15789,7 +15789,7 @@ _080ACD32:
adds r6, r0, #0
cmp r6, #0
beq _080ACDAE
bl sub_08000E50
bl Random
adds r2, r0, #0
movs r0, #0xf
ands r2, r0
@ -16161,7 +16161,7 @@ _080ACFE8:
bl sub_0805E780
b _080AD03C
_080ACFF8:
ldr r0, _080AD02C @ =gUnk_03003F80
ldr r0, _080AD02C @ =gLinkState
ldrb r0, [r0, #5]
cmp r0, #0
beq _080AD00E
@ -16188,7 +16188,7 @@ _080AD00E:
str r2, [r4, #0x20]
b _080AD03C
.align 2, 0
_080AD02C: .4byte gUnk_03003F80
_080AD02C: .4byte gLinkState
_080AD030: .4byte gLinkEntity
_080AD034:
bl sub_08079184
@ -16361,7 +16361,7 @@ _080AD16A:
ldrb r2, [r4, #0xe]
adds r0, r4, #0
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
b _080AD1DA
_080AD178:
ldrb r0, [r4, #0xe]
@ -16439,7 +16439,7 @@ _080AD202:
bl sub_0806F8DC
adds r0, r4, #0
adds r1, r5, #0
bl sub_0806FA24
bl CopyPosition
ldr r0, [r4, #0x20]
str r0, [r5, #0x20]
ldrb r0, [r4, #0x15]
@ -16462,7 +16462,7 @@ _080AD220:
.align 2, 0
_080AD240: .4byte gLinkEntity
_080AD244:
ldr r0, _080AD270 @ =gUnk_03003F80
ldr r0, _080AD270 @ =gLinkState
ldrb r0, [r0, #5]
cmp r0, #0
beq _080AD25A
@ -16486,7 +16486,7 @@ _080AD25A:
_080AD26E:
pop {r4, r5, pc}
.align 2, 0
_080AD270: .4byte gUnk_03003F80
_080AD270: .4byte gLinkState
thumb_func_start sub_080AD274
sub_080AD274: @ 0x080AD274

16
asm/code_080AD90C.s
View File

@ -160,7 +160,7 @@ _080ADA2C: .4byte gUnk_03001010
sub_080ADA30: @ 0x080ADA30
push {r4, lr}
adds r4, r0, #0
ldr r1, _080ADA60 @ =gUnk_03003F80
ldr r1, _080ADA60 @ =gLinkState
ldr r0, [r1, #0x2c]
cmp r0, r4
bne _080ADA42
@ -182,7 +182,7 @@ _080ADA46:
bl sub_08078E84
pop {r4, pc}
.align 2, 0
_080ADA60: .4byte gUnk_03003F80
_080ADA60: .4byte gLinkState
_080ADA64: .4byte gUnk_08132700
_080ADA68: .4byte gLinkEntity
@ -244,7 +244,7 @@ _080ADAD2:
sub_080ADAD4: @ 0x080ADAD4
push {r4, r5, lr}
adds r4, r0, #0
ldr r3, _080ADAF4 @ =gUnk_03003F80
ldr r3, _080ADAF4 @ =gLinkState
ldrb r1, [r3, #0x1c]
adds r0, r1, #0
cmp r0, #3
@ -258,7 +258,7 @@ sub_080ADAD4: @ 0x080ADAD4
adds r1, #8
b _080ADB0C
.align 2, 0
_080ADAF4: .4byte gUnk_03003F80
_080ADAF4: .4byte gLinkState
_080ADAF8: .4byte gLinkEntity
_080ADAFC:
cmp r0, #6
@ -366,7 +366,7 @@ _080ADBB0:
movs r2, #1
movs r5, #0xe7
_080ADBCA:
ldr r0, _080ADC0C @ =gUnk_03003F80
ldr r0, _080ADC0C @ =gLinkState
ldrb r1, [r0, #0x1c]
movs r0, #0xf
ands r0, r1
@ -403,14 +403,14 @@ _080ADBF6:
_080ADC08:
pop {r4, r5, pc}
.align 2, 0
_080ADC0C: .4byte gUnk_03003F80
_080ADC0C: .4byte gLinkState
_080ADC10: .4byte gLinkEntity
thumb_func_start sub_080ADC14
sub_080ADC14: @ 0x080ADC14
push {r4, lr}
adds r4, r0, #0
ldr r0, _080ADC40 @ =gUnk_03003F80
ldr r0, _080ADC40 @ =gLinkState
ldrb r0, [r0, #0x1c]
movs r1, #0xf
ands r1, r0
@ -429,7 +429,7 @@ sub_080ADC14: @ 0x080ADC14
bl sub_080042AC
b _080ADC5C
.align 2, 0
_080ADC40: .4byte gUnk_03003F80
_080ADC40: .4byte gLinkState
_080ADC44: .4byte gLinkEntity
_080ADC48:
adds r0, r4, #0

4
asm/cowInteract.s
View File

@ -15,7 +15,7 @@ sub_0806924C: @ 0x0806924C
ldrsb r2, [r0, r2]
cmp r2, #0
beq _0806929C
ldr r0, _08069278 @ =gUnk_03003F80
ldr r0, _08069278 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -29,7 +29,7 @@ sub_0806924C: @ 0x0806924C
bl sub_0806F118
b _0806928E
.align 2, 0
_08069278: .4byte gUnk_03003F80
_08069278: .4byte gLinkState
_0806927C:
adds r0, r4, #0
bl sub_080691F8

2
asm/createBobomb.s
View File

@ -23,7 +23,7 @@ sub_0802B204: @ 0x0802B204
beq _0802B22E
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
ldr r0, [r5, #0x50]
str r0, [r4, #0x50]
_0802B22E:

2
asm/createBombPeahat.s
View File

@ -27,7 +27,7 @@ sub_0802ADDC: @ 0x0802ADDC
str r5, [r4, #0x54]
adds r0, r4, #0
adds r1, r5, #0
bl sub_0806FA24
bl CopyPosition
adds r1, r4, #0
adds r1, #0x81
movs r0, #1

6
asm/createBowEntity.s
View File

@ -177,7 +177,7 @@ _080190FC:
ands r0, r2
orrs r0, r1
strb r0, [r4, #0x18]
ldr r0, _0801916C @ =gUnk_03003F80
ldr r0, _0801916C @ =gLinkState
str r4, [r0, #0x2c]
adds r0, r4, #0
movs r1, #1
@ -200,11 +200,11 @@ _080190FC:
cmp r1, #0
beq _08019172
adds r0, r4, #0
bl sub_0806FA24
bl CopyPosition
b _08019172
.align 2, 0
_08019168: .4byte gUnk_080B3E40
_0801916C: .4byte gUnk_03003F80
_0801916C: .4byte gLinkState
_08019170:
str r5, [r4, #0x78]
_08019172:

2
asm/createFx.s
View File

@ -9,5 +9,5 @@ CreateFX: @ 0x080A29AC
adds r3, r2, #0
movs r1, #0xf
adds r2, r4, #0
bl sub_080A2988
bl CreateObjectWithParent
pop {r4, pc}

2
asm/createMadderpillar.s
View File

@ -87,7 +87,7 @@ sub_0802999C: @ 0x0802999C
movs r0, #0x80
orrs r0, r1
strb r0, [r7, #0x10]
bl sub_08000E50
bl Random
movs r1, #0x18
ands r0, r1
strb r0, [r7, #0x15]

4
asm/cuccoInteract.s
View File

@ -15,7 +15,7 @@ sub_0806E65C: @ 0x0806E65C
ldrsb r2, [r0, r2]
cmp r2, #0
beq _0806E6A6
ldr r0, _0806E688 @ =gUnk_03003F80
ldr r0, _0806E688 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -29,7 +29,7 @@ sub_0806E65C: @ 0x0806E65C
bl sub_0806F118
b _0806E698
.align 2, 0
_0806E688: .4byte gUnk_03003F80
_0806E688: .4byte gLinkState
_0806E68C:
adds r0, r4, #0
bl sub_0806E6A8

2
asm/doItemTrade.s
View File

@ -65,7 +65,7 @@ _08028D5C:
cmp r1, #0xff
bne _08028D70
ldr r4, _08028D98 @ =gUnk_080CC9C0
bl sub_08000E50
bl Random
movs r1, #7
ands r1, r0
adds r1, r1, r4

4
asm/dogInteract.s
View File

@ -15,7 +15,7 @@ sub_0806A028: @ 0x0806A028
ldrsb r2, [r0, r2]
cmp r2, #0
beq _0806A07E
ldr r0, _0806A054 @ =gUnk_03003F80
ldr r0, _0806A054 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -29,7 +29,7 @@ sub_0806A028: @ 0x0806A028
bl sub_0806F118
b _0806A076
.align 2, 0
_0806A054: .4byte gUnk_03003F80
_0806A054: .4byte gLinkState
_0806A058:
adds r0, r4, #0
bl sub_0806A080

6
asm/fastTravel.s
View File

@ -141,7 +141,7 @@ _0809D2D6:
beq _0809D3A8
cmp r0, #9
beq _0809D3A8
ldr r7, _0809D438 @ =gUnk_03003F80
ldr r7, _0809D438 @ =gLinkState
adds r0, r7, #0
adds r0, #0xa8
ldrb r0, [r0]
@ -286,7 +286,7 @@ _0809D3DA:
.align 2, 0
_0809D430: .4byte gLinkEntity
_0809D434: .4byte gTextBox
_0809D438: .4byte gUnk_03003F80
_0809D438: .4byte gLinkState
_0809D43C: .4byte gUnk_03003DC0
_0809D440: .4byte gUnk_02034490
_0809D444: .4byte 0xFFF80000
@ -295,7 +295,7 @@ _0809D448:
strb r0, [r5, #0xe]
adds r0, r2, #0
adds r1, r4, #0
bl sub_0806FA24
bl CopyPosition
_0809D454:
adds r0, r5, #0
bl sub_080040A8

4
asm/horseInteract.s
View File

@ -15,7 +15,7 @@ sub_08065AA4: @ 0x08065AA4
ldrsb r2, [r0, r2]
cmp r2, #0
beq _08065B18
ldr r0, _08065AD0 @ =gUnk_03003F80
ldr r0, _08065AD0 @ =gLinkState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@ -29,7 +29,7 @@ sub_08065AA4: @ 0x08065AA4
bl sub_0806F118
b _08065AE6
.align 2, 0
_08065AD0: .4byte gUnk_03003F80
_08065AD0: .4byte gLinkState
_08065AD4:
movs r0, #3
strb r0, [r4, #0xc]

4
asm/mainLoop.s
View File

@ -31,7 +31,7 @@ MainLoop: @ 0x08055E6C
bl sub_0804FF84
bl sub_08056418
bl sub_080ADD30
ldr r1, _08055EFC @ =gUnk_03001150
ldr r1, _08055EFC @ =gRand
ldr r0, _08055F00 @ =0x01234567
str r0, [r1]
ldr r4, _08055F04 @ =gUnk_03001000
@ -61,7 +61,7 @@ _08055EEC: .4byte gUnk_02000010
_08055EF0: .4byte 0x040000D4
_08055EF4: .4byte gUnk_020176A0
_08055EF8: .4byte 0x84000080
_08055EFC: .4byte gUnk_03001150
_08055EFC: .4byte gRand
_08055F00: .4byte 0x01234567
_08055F04: .4byte gUnk_03001000
_08055F08:

40
asm/modArrows.s Normal file
View File

@ -0,0 +1,40 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ModArrows
ModArrows: @ 0x08054330
push {lr}
adds r3, r0, #0
ldr r1, _08054354 @ =gUnk_02002A40
adds r0, r1, #0
adds r0, #0xad
ldrb r0, [r0]
adds r3, r3, r0
ldr r2, _08054358 @ =gQuiverSizes
adds r0, r1, #0
adds r0, #0xaf
ldrb r0, [r0]
adds r0, r0, r2
ldrb r2, [r0]
cmp r3, #0
bge _0805435C
movs r3, #0
b _08054362
.align 2, 0
_08054354: .4byte gUnk_02002A40
_08054358: .4byte gQuiverSizes
_0805435C:
cmp r2, r3
bge _08054362
adds r3, r2, #0
_08054362:
adds r0, r1, #0
adds r0, #0xad
strb r3, [r0]
pop {pc}
.align 2, 0

40
asm/modBombs.s Normal file
View File

@ -0,0 +1,40 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start ModBombs
ModBombs: @ 0x080542F4
push {lr}
adds r3, r0, #0
ldr r1, _08054318 @ =gUnk_02002A40
adds r0, r1, #0
adds r0, #0xac
ldrb r0, [r0]
adds r3, r3, r0
ldr r2, _0805431C @ =gBombBagSizes
adds r0, r1, #0
adds r0, #0xae
ldrb r0, [r0]
adds r0, r0, r2
ldrb r2, [r0]
cmp r3, #0
bge _08054320
movs r3, #0
b _08054326
.align 2, 0
_08054318: .4byte gUnk_02002A40
_0805431C: .4byte gBombBagSizes
_08054320:
cmp r2, r3
bge _08054326
adds r3, r2, #0
_08054326:
adds r0, r1, #0
adds r0, #0xac
strb r3, [r0]
pop {pc}
.align 2, 0

150
asm/ocarina.s Normal file
View File

@ -0,0 +1,150 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start Ocarina
Ocarina: @ 0x08076B78
push {lr}
ldr r3, _08076B94 @ =gOcarinaStates
ldrb r2, [r0, #4]
lsls r2, r2, #2
adds r2, r2, r3
ldr r2, [r2]
bl _call_via_r2
ldr r1, _08076B98 @ =gLinkEntity
adds r1, #0x7a
ldrh r0, [r1]
adds r0, #1
strh r0, [r1]
pop {pc}
.align 2, 0
_08076B94: .4byte gOcarinaStates
_08076B98: .4byte gLinkEntity
thumb_func_start OcarinaUse
OcarinaUse: @ 0x08076B9C
push {r4, r5, lr}
adds r4, r0, #0
adds r5, r1, #0
ldr r3, _08076BB4 @ =gLinkState
ldrb r0, [r3, #0xc]
cmp r0, #0x18
bne _08076BB8
adds r0, r4, #0
bl sub_08077E78
b _08076C1C
.align 2, 0
_08076BB4: .4byte gLinkState
_08076BB8:
ldrb r1, [r4, #9]
movs r0, #0xf
orrs r0, r1
strb r0, [r4, #9]
ldr r1, _08076C20 @ =gLinkEntity
movs r0, #4
strb r0, [r1, #0x14]
ldrb r2, [r1, #0x18]
subs r0, #0x45
ands r0, r2
strb r0, [r1, #0x18]
ldrb r2, [r1, #0x10]
movs r0, #0x7f
ands r0, r2
strb r0, [r1, #0x10]
adds r1, #0x7a
movs r0, #2
strh r0, [r1]
ldr r0, [r3, #0x30]
movs r1, #0x80
lsls r1, r1, #0x15
orrs r0, r1
str r0, [r3, #0x30]
adds r1, r3, #0
adds r1, #0x27
movs r0, #0xff
strb r0, [r1]
ldr r1, _08076C24 @ =gUnk_02034490
movs r0, #1
strb r0, [r1]
movs r1, #8
asrs r1, r5
ldrb r2, [r3, #0xa]
adds r0, r1, #0
orrs r0, r2
strb r0, [r3, #0xa]
ldrb r0, [r3, #0xb]
orrs r1, r0
strb r1, [r3, #0xb]
bl sub_08078F60
adds r0, r4, #0
adds r1, r5, #0
bl sub_08077D38
ldr r0, _08076C28 @ =0x00000216
bl PlaySFX
bl sub_0805E544
_08076C1C:
pop {r4, r5, pc}
.align 2, 0
_08076C20: .4byte gLinkEntity
_08076C24: .4byte gUnk_02034490
_08076C28: .4byte 0x00000216
thumb_func_start OcarinaUpdate
OcarinaUpdate: @ 0x08076C2C
push {r4, r5, r6, lr}
adds r5, r0, #0
adds r6, r1, #0
bl UpdateItemAnim
ldrb r1, [r5, #0xe]
movs r0, #0x80
ands r0, r1
cmp r0, #0
beq _08076C6E
ldr r0, _08076C70 @ =gLinkEntity
ldrb r2, [r0, #0x10]
movs r4, #0
movs r1, #0x80
orrs r1, r2
strb r1, [r0, #0x10]
ldr r2, _08076C74 @ =gLinkState
ldr r1, [r2, #0x30]
ldr r3, _08076C78 @ =0xEFFFFFFF
ands r1, r3
str r1, [r2, #0x30]
adds r2, #0x27
strb r4, [r2]
ldr r1, _08076C7C @ =gUnk_02034490
strb r4, [r1]
bl CreateBird
bl UnfreezeTime
adds r0, r5, #0
adds r1, r6, #0
bl sub_08077E78
_08076C6E:
pop {r4, r5, r6, pc}
.align 2, 0
_08076C70: .4byte gLinkEntity
_08076C74: .4byte gLinkState
_08076C78: .4byte 0xEFFFFFFF
_08076C7C: .4byte gUnk_02034490

46
asm/ocarinaUpdate.s Normal file
View File

@ -0,0 +1,46 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start OcarinaUpdate
OcarinaUpdate: @ 0x08076C2C
push {r4, r5, r6, lr}
adds r5, r0, #0
adds r6, r1, #0
bl UpdateItemAnim
ldrb r1, [r5, #0xe]
movs r0, #0x80
ands r0, r1
cmp r0, #0
beq _08076C6E
ldr r0, _08076C70 @ =gLinkEntity
ldrb r2, [r0, #0x10]
movs r4, #0
movs r1, #0x80
orrs r1, r2
strb r1, [r0, #0x10]
ldr r2, _08076C74 @ =gLinkState
ldr r1, [r2, #0x30]
ldr r3, _08076C78 @ =0xEFFFFFFF
ands r1, r3
str r1, [r2, #0x30]
adds r2, #0x27
strb r4, [r2]
ldr r1, _08076C7C @ =gUnk_02034490
strb r4, [r1]
bl CreateBird
bl UnfreezeTime
adds r0, r5, #0
adds r1, r6, #0
bl sub_08077E78
_08076C6E:
pop {r4, r5, r6, pc}
.align 2, 0
_08076C70: .4byte gLinkEntity
_08076C74: .4byte gLinkState
_08076C78: .4byte 0xEFFFFFFF
_08076C7C: .4byte gUnk_02034490

4
asm/respawnLink.s
View File

@ -19,7 +19,7 @@ _08077B32:
adds r4, #1
cmp r4, #2
bls _08077B32
ldr r2, _08077B8C @ =gUnk_03003F80
ldr r2, _08077B8C @ =gLinkState
adds r0, r2, #0
adds r0, #0x3d
movs r3, #0
@ -58,6 +58,6 @@ _08077B86:
pop {r4, r5, pc}
.align 2, 0
_08077B88: .4byte gUnk_03000B80
_08077B8C: .4byte gUnk_03003F80
_08077B8C: .4byte gLinkState
_08077B90: .4byte 0xF7FBFFFF
_08077B94: .4byte gLinkEntity

10
asm/stairsInteract.s
View File

@ -28,7 +28,7 @@ sub_080731D8: @ 0x080731D8
orrs r0, r7
strh r0, [r4, #0x2e]
strh r2, [r4, #0x2c]
ldr r6, _08073214 @ =gUnk_03003F80
ldr r6, _08073214 @ =gLinkState
adds r0, r6, #0
adds r0, #0x38
ldrb r0, [r0]
@ -38,7 +38,7 @@ sub_080731D8: @ 0x080731D8
strb r0, [r4, #0xd]
b _0807329A
.align 2, 0
_08073214: .4byte gUnk_03003F80
_08073214: .4byte gLinkState
_08073218:
ldrb r0, [r4, #0x18]
movs r1, #3
@ -57,7 +57,7 @@ _08073218:
movs r1, #0x70
movs r2, #1
movs r3, #0
bl sub_080A2988
bl CreateObjectWithParent
str r0, [r4, #0x54]
adds r0, r6, #0
adds r0, #0x39
@ -103,7 +103,7 @@ _08073294:
adds r0, r4, #0
bl sub_08066DE4
_0807329A:
ldr r2, _080732AC @ =gUnk_03003F80
ldr r2, _080732AC @ =gLinkState
ldr r0, [r2, #0x30]
movs r1, #8
ands r0, r1
@ -112,7 +112,7 @@ _0807329A:
ldr r0, _080732B0 @ =0x00000404
b _080732B8
.align 2, 0
_080732AC: .4byte gUnk_03003F80
_080732AC: .4byte gLinkState
_080732B0: .4byte 0x00000404
_080732B4:
movs r0, #0x82

26
asm/sub_080A2988.s
View File

@ -1,26 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080A2988
sub_080A2988: @ 0x080A2988
push {r4, r5, lr}
adds r5, r0, #0
adds r0, r1, #0
adds r1, r2, #0
adds r2, r3, #0
bl CreateObject
adds r4, r0, #0
cmp r4, #0
beq _080A29A6
str r5, [r4, #0x50]
adds r0, r5, #0
adds r1, r4, #0
bl sub_0806FA24
_080A29A6:
adds r0, r4, #0
pop {r4, r5, pc}
.align 2, 0

6
data/data_8.s
View File

@ -21457,10 +21457,10 @@ gUnk_080FD588:: @ 080FD588
gWalletSizes:: @ 080FD590
.incbin "baserom.gba", 0x0FD590, 0x0000010
gUnk_080FD5A0:: @ 080FD5A0
gBombBagSizes:: @ 080FD5A0
.incbin "baserom.gba", 0x0FD5A0, 0x0000004
gUnk_080FD5A4:: @ 080FD5A4
gQuiverSizes:: @ 080FD5A4
.incbin "baserom.gba", 0x0FD5A4, 0x0000004
gUnk_080FD5A8:: @ 080FD5A8
@ -32602,7 +32602,7 @@ gUnk_0811BDB4:: @ 0811BDB4
gUnk_0811BDCC:: @ 0811BDCC
.incbin "baserom.gba", 0x11BDCC, 0x000000C
gUnk_0811BDD8:: @ 0811BDD8
gOcarinaStates:: @ 0811BDD8
.incbin "baserom.gba", 0x11BDD8, 0x0000008
gUnk_0811BDE0:: @ 0811BDE0

20
include/entity.h
View File

@ -4,7 +4,11 @@
#ifndef ENTITY_H
#define ENTITY_H
typedef struct {
void *entity1;
void *entity2;
u8 filler[14];
} UnkStruct;
typedef struct {
u8 type;
@ -18,11 +22,6 @@ union SplitWord {
s16 LO, HI;
};
typedef struct {
u16 LO;
u16 HI;
} Pos;
typedef struct
{
u32 *field_0x0;
@ -73,7 +72,7 @@ typedef struct
u8 field_0x4d;
u8 field_0x4e;
u8 field_0x4f;
u32 * spritePtr;
void * parent;
u32 * attachedEntity;
u8 field_0x58;
u8 field_0x59;
@ -90,8 +89,11 @@ typedef struct
u32 * otherEntity;
u8 filler2[8];
u32 * heldObjectPtr;
u8 filler[12];
u32 * field_0x84;
u8 filler3[2];
u16 itemCooldown;
u32 field_0x7c;
UnkStruct *unkStruct;
u32 *field_0x84;
} Entity;

15
include/item.h
View File

@ -2,6 +2,9 @@
#ifndef ITEM_H
#define ITEM_H
/* On hold until naming conflicts are resolved */
/*
enum
{
Untyped,
@ -123,4 +126,16 @@
FastSplit = 0x74,
LongSpin = 0x75
} ItemType;
*/
typedef struct {
u8 unk;
u8 behaviorID;
u8 unk2;
u8 unk3;
u8 stateID;
u8 filler[4];
u8 unk4;
u8 filler2[4];
u8 unk5;
} ItemBehavior;
#endif

47
include/link.h Normal file
View File

@ -0,0 +1,47 @@
#ifndef LINK_H
#define LINK_H
#include "global.h"
typedef struct {
u8 filler[2];
u8 jumpStatus;
u8 filler2[2];
u8 heldObject;
u8 pushedObject;
u8 unk;
u16 unk2;
u8 unk3;
u8 keepFacing;
u8 linkAction;
u8 filler3[2];
u8 hurtBlinkSpeed;
u8 filler4[4];
u16 filler5[3];
u8 filler6[8];
u16 filler7[2];
u8 swimState;
u8 filler8[5];
u8 *unk4;
union {
u32 all;
u32 filler9:3;
u32 noMinishCap:1;
u32 pullingState:1;
u32 windyState:1;
u32 filler10:4;
u32 slipperyState:1;
u32 filler11:5;
u32 filler11b:16;
} flags;
u8 filler12[6];
u16 unk5;
u8 filler13[2];
u8 swordGoldParticle:1;
u8 swordBlueParticle:1;
u8 filler14:6;
u8 unk6;
} LinkState;
#endif

2
include/mainLoop.h
View File

@ -38,7 +38,7 @@ extern s32 sub_08050154(s32);
extern s32 sub_080A3480(s32);
extern s32 gUnk_02000010;
extern s32 gUnk_03001150;
extern s32 gRand;
extern MainStruct gUnk_03001000;
extern s32 gUnk_08100CBC;
#endif

6
include/stats.h
View File

@ -9,7 +9,11 @@ typedef struct {
u8 heartPieces;
u8 health;
u8 maxHealth;
u8 filler[8];
u8 bombCount;
u8 arrowCount;
u8 bombBagType;
u8 quiverType;
u8 filler[4];
u8 itemOnA;
u8 itemonB;
u8 filler2[10];

13
linker.ld
View File

@ -179,7 +179,7 @@ SECTIONS {
. = 0x000010D8; gUnk_030010D8 = .;
. = 0x000010EC; gUnk_030010EC = .;
. = 0x0000110C; gUnk_0300110C = .;
. = 0x00001150; gUnk_03001150 = .;
. = 0x00001150; gRand = .;
. = 0x00001160; gLinkEntity = .;
. = 0x00001198; gUnk_03001198 = .;
. = 0x000011E8; gUnk_030011E8 = .;
@ -201,7 +201,7 @@ SECTIONS {
. = 0x00003DE4; gUnk_03003DE4 = .;
. = 0x00003DF0; gUnk_03003DF0 = .;
. = 0x00003DF8; gUnk_03003DF8 = .;
. = 0x00003F80; gUnk_03003F80 = .;
. = 0x00003F80; gLinkState = .;
. = 0x00003FC0; gUnk_03003FC0 = .;
. = 0x00004010; gUnk_03004010 = .;
. = 0x00004020; gUnk_03004020 = .;
@ -353,6 +353,9 @@ SECTIONS {
src/modHealth.o(.text);
src/modRupees.o(.text);
asm/code_080526F8.o(.text);
asm/modBombs.o(.text);
asm/modArrows.o(.text);
asm/code_0805436C.o(.text);
src/sub_08055E08.o(.text);
asm/sub_08055E24.o(.text);
asm/mainLoop.o(.text);
@ -382,12 +385,14 @@ SECTIONS {
asm/code_0806ED78.o(.text);
src/sub_0806F9EC.o(.text);
src/sub_0806FA04.o(.text);
src/sub_0806FA24.o(.text);
src/copyPosition.o(.text);
src/sub_0806FA30.o(.text);
src/positionRelative.o(.text);
asm/code_0806FA6C.o(.text);
asm/stairsInteract.o(.text);
asm/code_080732D0.o(.text);
asm/ocarina.o(.text);
asm/code_08076C80.o(.text);
asm/respawnLink.o(.text);
asm/code_08077B98.o(.text);
src/sub_0807B7D8.o(.text);
@ -409,7 +414,7 @@ SECTIONS {
asm/sub_080A2838.o(.text);
asm/sub_080A285C.o(.text);
src/createObject.o(.text);
asm/sub_080A2988.o(.text);
src/createObjectWithParent.o(.text);
asm/createFx.o(.text);
asm/code_080A29BC.o(.text);
asm/playSFX.o(.text);

0
tools/minishmaker-license.txt → minishmaker-license.txt
View File

11
src/copyPosition.c Normal file
View File

@ -0,0 +1,11 @@
#include "global.h"
#include "entity.h"
extern void PositionRelative();
void CopyPosition(Entity *param_1,Entity *param_2)
{
PositionRelative(param_1,param_2,0,0);
return;
}

18
src/createObjectWithParent.c Normal file
View File

@ -0,0 +1,18 @@
#include "global.h"
#include "entity.h"
extern Entity * CreateObject();
extern void CopyPosition();
Entity * CreateObjectWithParent(Entity *parentEnt,u32 subtype,u32 param1, u32 param2)
{
Entity *ent;
ent = CreateObject(subtype, param1, param2);
if (ent != NULL) {
ent->parent = parentEnt;
CopyPosition(parentEnt,ent);
}
return ent;
}

2
src/mainLoop.c
View File

@ -37,7 +37,7 @@ void MainLoop()
v5 = sub_0804FF84(1);
v6 = sub_08056418(v5);
sub_080ADD30(v6);
gUnk_03001150 = 19088743;
gRand = 19088743;
v9 = sub_0801D630(50335744, in_r2, 16);
for ( i = sub_08056010(0); ; i = sub_08016E78(v9) )
{

54
src/ocarina.c Normal file
View File

@ -0,0 +1,54 @@
#include "global.h"
#include "item.h"
#include "entity.h"
#include "link.h"
extern void _call_via_r2();
extern void sub_08077E78(ItemBehavior *, u32);
extern void PlaySFX(u32);
extern void sub_08078F60(void);
extern void sub_08077D38(ItemBehavior *, u32);
extern void sub_0805E544(void);
extern void UpdateItemAnim(ItemBehavior *);
extern void CreateBird(void);
extern void UnfreezeTime(void);
extern Entity gLinkEntity;
extern LinkState gLinkState;
extern void gOcarinaStates;
extern u8 gUnk_02034490;
void Ocarina(ItemBehavior *pItemBeh,u32 inputFlags)
{
u32 *ocarinaStates = &gOcarinaStates;
_call_via_r2(pItemBeh, inputFlags,(ocarinaStates)[pItemBeh->stateID]);
gLinkEntity.itemCooldown = gLinkEntity.itemCooldown + 1;
}
void OcarinaUse(ItemBehavior *itemBeh,s32 inputFlags)
{
u32 bVar1;
if (gLinkState.linkAction == 24) {
sub_08077E78(itemBeh,inputFlags);
}
else {
itemBeh->unk4 = itemBeh->unk4 | 15;
gLinkEntity.animationState = 4;
gLinkEntity.shadowSize = gLinkEntity.animationState & (gLinkEntity.shadowSize - 0x45);
gLinkEntity.flags = gLinkEntity.flags & 127;
gLinkEntity.itemCooldown = 2;
gLinkState.flags.all = (gLinkState.flags.all | 0x10000000);
gLinkState.filler8[0] = 255;
gUnk_02034490 = 1;
bVar1 = (8 >> inputFlags);
gLinkState.unk3 = bVar1 | gLinkState.unk3;
gLinkState.keepFacing = bVar1 | gLinkState.keepFacing;
sub_08078F60();
sub_08077D38(itemBeh,inputFlags);
PlaySFX(534);
sub_0805E544();
}
}

2
src/sub_0806FA24.c
View File

@ -3,7 +3,7 @@
#include "entity.h"
void PositionRelative(Entity *, Entity *, s32, s32);
void sub_0806FA24(Entity *param_1,Entity *param_2)
void CopyPosition(Entity *param_1,Entity *param_2)
{
PositionRelative(param_1, param_2, 0, 0);