mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-05-24 15:21:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

renamed all occurences of "link" to "player"

Browse Source
This commit is contained in:
theo3
2020-08-08 14:59:11 -07:00
parent 0cb4a64f67
commit ac67812a25
287 changed files with 3534 additions and 3534 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/armos.s
+6 -6
View File
@@ -46,7 +46,7 @@ sub_080301D4: @ 0x080301D4
cmp r0, #1
bne _080301EE
ldr r1, [r4, #0x4c]
ldr r0, _08030238 @ =gLinkEntity
ldr r0, _08030238 @ =gPlayerEntity
cmp r1, r0
bne _080301EE
adds r1, r4, #0
@@ -89,7 +89,7 @@ _08030228:
bl sub_0804AA30
pop {r4, r5, r6, pc}
.align 2, 0
_08030238: .4byte gLinkEntity
_08030238: .4byte gPlayerEntity
_0803023C: .4byte gUnk_080CE124
thumb_func_start sub_08030240
@@ -942,7 +942,7 @@ sub_0803086C: @ 0x0803086C
bne _08030880
b _0803099C
_08030880:
ldr r0, _08030928 @ =gLinkState
ldr r0, _08030928 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@@ -1003,7 +1003,7 @@ _0803088E:
bl CheckPlayerInRegion
cmp r0, #0
beq _0803098A
ldr r2, _08030934 @ =gLinkEntity
ldr r2, _08030934 @ =gPlayerEntity
adds r2, #0x29
ldrb r1, [r2]
movs r0, #8
@@ -1023,10 +1023,10 @@ _0803088E:
movs r0, #1
b _0803099E
.align 2, 0
_08030928: .4byte gLinkState
_08030928: .4byte gPlayerState
_0803092C: .4byte gRoomControls
_08030930: .4byte 0x00004049
_08030934: .4byte gLinkEntity
_08030934: .4byte gPlayerEntity
_08030938: .4byte gScreenTransition
_0803093C:
ldr r0, _0803094C @ =0x00004022
asm/bakerOven.s
+2 -2
View File
@@ -142,7 +142,7 @@ _0809CD56:
ldrb r0, [r4, #0xf]
cmp r0, #0
bne _0809CDAC
ldr r5, _0809CDB0 @ =gLinkEntity
ldr r5, _0809CDB0 @ =gPlayerEntity
adds r6, r5, #0
adds r6, #0x3d
movs r0, #0
@@ -182,7 +182,7 @@ _0809CD56:
_0809CDAC:
pop {r4, r5, r6, pc}
.align 2, 0
_0809CDB0: .4byte gLinkEntity
_0809CDB0: .4byte gPlayerEntity
thumb_func_start sub_0809CDB4
sub_0809CDB4: @ 0x0809CDB4
asm/beanstalk.s
+8 -8
View File
@@ -552,11 +552,11 @@ _0808A0F6:
ble _0808A0FC
b _0808A202
_0808A0FC:
ldr r0, _0808A118 @ =gLinkState
ldr r0, _0808A118 @ =gPlayerState
ldrb r0, [r0, #0x12]
cmp r0, #0x1e
bne _0808A1DA
ldr r1, _0808A11C @ =gLinkEntity
ldr r1, _0808A11C @ =gPlayerEntity
adds r0, r5, #0
movs r2, #0
movs r3, #8
@@ -565,8 +565,8 @@ _0808A0FC:
beq _0808A1DC
b _0808A1B0
.align 2, 0
_0808A118: .4byte gLinkState
_0808A11C: .4byte gLinkEntity
_0808A118: .4byte gPlayerState
_0808A11C: .4byte gPlayerEntity
_0808A120:
ldrb r0, [r5, #0xe]
cmp r0, #0
@@ -826,7 +826,7 @@ sub_0808A2F0: @ 0x0808A2F0
adds r1, #0x72
strh r0, [r1]
_0808A316:
ldr r3, _0808A38C @ =gLinkEntity
ldr r3, _0808A38C @ =gPlayerEntity
ldrb r1, [r3, #0x1b]
lsrs r1, r1, #6
lsls r1, r1, #6
@@ -844,7 +844,7 @@ _0808A316:
ands r0, r2
orrs r0, r1
strb r0, [r5, #0x19]
ldr r0, _0808A390 @ =gLinkState
ldr r0, _0808A390 @ =gPlayerState
ldrb r0, [r0, #0x12]
cmp r0, #0x1e
bne _0808A39C
@@ -884,8 +884,8 @@ _0808A316:
bl SetTile
b _0808A3EC
.align 2, 0
_0808A38C: .4byte gLinkEntity
_0808A390: .4byte gLinkState
_0808A38C: .4byte gPlayerEntity
_0808A390: .4byte gPlayerState
_0808A394: .4byte 0x00004014
_0808A398: .4byte gRoomControls
_0808A39C:
asm/beetle.s
+12 -12
View File
@@ -41,7 +41,7 @@ sub_08021780: @ 0x08021780
beq _080217F4
b _080217FA
_08021792:
ldr r0, _080217A4 @ =gLinkState
ldr r0, _080217A4 @ =gPlayerState
adds r0, #0xa8
ldrb r0, [r0]
cmp r0, #0x18
@@ -50,7 +50,7 @@ _08021792:
bl sub_08021768
b _080217FA
.align 2, 0
_080217A4: .4byte gLinkState
_080217A4: .4byte gPlayerState
_080217A8:
movs r1, #0
movs r0, #5
@@ -71,7 +71,7 @@ _080217A8:
movs r1, #3
orrs r0, r1
strb r0, [r2]
ldr r0, _080217EC @ =gLinkEntity
ldr r0, _080217EC @ =gPlayerEntity
adds r1, r4, #0
bl CopyPositionAndSpriteOffset
ldr r0, _080217F0 @ =0x0000FFFF
@@ -85,7 +85,7 @@ _080217A8:
bl InitializeAnimation
b _080217FA
.align 2, 0
_080217EC: .4byte gLinkEntity
_080217EC: .4byte gPlayerEntity
_080217F0: .4byte 0x0000FFFF
_080217F4:
adds r0, r4, #0
@@ -376,7 +376,7 @@ sub_08021A10: @ 0x08021A10
push {r4, lr}
adds r4, r0, #0
bl GetNextFrame
ldr r1, _08021A60 @ =gLinkEntity
ldr r1, _08021A60 @ =gPlayerEntity
adds r0, r4, #0
movs r2, #0x78
movs r3, #0x50
@@ -409,7 +409,7 @@ sub_08021A10: @ 0x08021A10
_08021A5E:
pop {r4, pc}
.align 2, 0
_08021A60: .4byte gLinkEntity
_08021A60: .4byte gPlayerEntity
thumb_func_start sub_08021A64
sub_08021A64: @ 0x08021A64
@@ -542,7 +542,7 @@ _08021B60:
sub_08021B64: @ 0x08021B64
push {r4, r5, r6, lr}
adds r4, r0, #0
ldr r0, _08021B88 @ =gLinkState
ldr r0, _08021B88 @ =gPlayerState
ldr r1, [r0, #0x30]
movs r2, #4
ands r1, r2
@@ -558,7 +558,7 @@ sub_08021B64: @ 0x08021B64
bl InitializeAnimation
b _08021C4E
.align 2, 0
_08021B88: .4byte gLinkState
_08021B88: .4byte gPlayerState
_08021B8C:
movs r5, #1
adds r0, r6, #0
@@ -603,7 +603,7 @@ _08021BC8:
adds r0, r4, #0
adds r0, #0x87
strb r5, [r0]
ldr r2, _08021BEC @ =gLinkEntity
ldr r2, _08021BEC @ =gPlayerEntity
ldrb r1, [r2, #0x15]
adds r0, r1, #0
cmp r0, #0xff
@@ -611,7 +611,7 @@ _08021BC8:
movs r0, #0x10
b _08021BF6
.align 2, 0
_08021BEC: .4byte gLinkEntity
_08021BEC: .4byte gPlayerEntity
_08021BF0:
ldrb r0, [r2, #0x14]
lsls r0, r0, #2
@@ -637,7 +637,7 @@ _08021C04:
ldrb r0, [r1]
adds r0, #1
strb r0, [r1]
ldr r0, _08021C50 @ =gLinkEntity
ldr r0, _08021C50 @ =gPlayerEntity
adds r1, r4, #0
bl CopyPositionAndSpriteOffset
ldr r2, _08021C54 @ =gUnk_080CB5E4
@@ -662,7 +662,7 @@ _08021C04:
_08021C4E:
pop {r4, r5, r6, pc}
.align 2, 0
_08021C50: .4byte gLinkEntity
_08021C50: .4byte gPlayerEntity
_08021C54: .4byte gUnk_080CB5E4
thumb_func_start sub_08021C58
asm/bigGoron.s
+4 -4
View File
@@ -1058,7 +1058,7 @@ sub_0806D7C4: @ 0x0806D7C4
sub sp, #4
adds r4, r0, #0
adds r5, r1, #0
ldr r1, _0806D800 @ =gLinkEntity
ldr r1, _0806D800 @ =gPlayerEntity
ldrh r0, [r1, #0x2e]
movs r2, #0
strh r0, [r4, #0x2e]
@@ -1084,7 +1084,7 @@ _0806D7FC:
add sp, #4
pop {r4, r5, pc}
.align 2, 0
_0806D800: .4byte gLinkEntity
_0806D800: .4byte gPlayerEntity
thumb_func_start sub_0806D804
sub_0806D804: @ 0x0806D804
@@ -1115,7 +1115,7 @@ sub_0806D804: @ 0x0806D804
ands r0, r1
strb r0, [r2]
_0806D83A:
ldr r0, _0806D854 @ =gLinkEntity
ldr r0, _0806D854 @ =gPlayerEntity
movs r1, #0x2e
ldrsh r2, [r0, r1]
movs r1, #0x32
@@ -1127,7 +1127,7 @@ _0806D83A:
add sp, #4
pop {r4, r5, pc}
.align 2, 0
_0806D854: .4byte gLinkEntity
_0806D854: .4byte gPlayerEntity
thumb_func_start sub_0806D858
sub_0806D858: @ 0x0806D858
asm/bigPushableLever.s
+4 -4
View File
@@ -73,7 +73,7 @@ sub_08098F14: @ 0x08098F14
bl sub_08079F8C
cmp r0, #0
beq _08098F84
ldr r2, _08098F88 @ =gLinkState
ldr r2, _08098F88 @ =gPlayerState
movs r0, #0x98
strb r0, [r2, #6]
movs r0, #5
@@ -82,7 +82,7 @@ sub_08098F14: @ 0x08098F14
movs r1, #1
orrs r0, r1
str r0, [r2, #0x30]
ldr r1, _08098F8C @ =gLinkEntity
ldr r1, _08098F8C @ =gPlayerEntity
strh r6, [r1, #0x2c]
strh r6, [r1, #0x30]
ldrb r0, [r1, #0x14]
@@ -91,8 +91,8 @@ sub_08098F14: @ 0x08098F14
_08098F84:
pop {r4, r5, r6, pc}
.align 2, 0
_08098F88: .4byte gLinkState
_08098F8C: .4byte gLinkEntity
_08098F88: .4byte gPlayerState
_08098F8C: .4byte gPlayerEntity
thumb_func_start sub_08098F90
sub_08098F90: @ 0x08098F90
asm/bigVortex.s
+4 -4
View File
@@ -123,7 +123,7 @@ _08098DC2:
sub_08098DC4: @ 0x08098DC4
push {r4, r5, r6, lr}
adds r5, r0, #0
ldr r6, _08098E2C @ =gLinkEntity
ldr r6, _08098E2C @ =gPlayerEntity
adds r1, r6, #0
movs r2, #8
movs r3, #8
@@ -144,7 +144,7 @@ sub_08098DC4: @ 0x08098DC4
adds r0, r5, #0
adds r1, r6, #0
bl ResolveEntityOnTop
ldr r1, _08098E30 @ =gLinkState
ldr r1, _08098E30 @ =gPlayerState
movs r0, #0x1f
strb r0, [r1, #0xc]
adds r0, r1, #0
@@ -168,8 +168,8 @@ _08098E24:
bl UpdateAnimationSingleFrame
pop {r4, r5, r6, pc}
.align 2, 0
_08098E2C: .4byte gLinkEntity
_08098E30: .4byte gLinkState
_08098E2C: .4byte gPlayerEntity
_08098E30: .4byte gPlayerState
thumb_func_start sub_08098E34
sub_08098E34: @ 0x08098E34
asm/bird.s
+17 -17
View File
@@ -277,7 +277,7 @@ sub_0809D10C: @ 0x0809D10C
sub_0809D130: @ 0x0809D130
push {lr}
adds r2, r0, #0
ldr r0, _0809D148 @ =gLinkState
ldr r0, _0809D148 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@@ -287,7 +287,7 @@ sub_0809D130: @ 0x0809D130
bl sub_0800445C
b _0809D170
.align 2, 0
_0809D148: .4byte gLinkState
_0809D148: .4byte gPlayerState
_0809D14C:
adds r0, r2, #0
bl sub_08017850
@@ -384,7 +384,7 @@ sub_0809D1F0: @ 0x0809D1F0
cmp r0, #1
beq _0809D2B0
bl sub_08078B48
ldr r2, _0809D220 @ =gLinkEntity
ldr r2, _0809D220 @ =gPlayerEntity
ldrb r1, [r2, #0x18]
movs r0, #4
rsbs r0, r0, #0
@@ -395,7 +395,7 @@ sub_0809D1F0: @ 0x0809D1F0
mov r8, r1
b _0809D3A8
.align 2, 0
_0809D220: .4byte gLinkEntity
_0809D220: .4byte gPlayerEntity
_0809D224:
ldrb r1, [r5, #0xe]
cmp r1, #0
@@ -440,7 +440,7 @@ _0809D234:
ldr r0, _0809D2A4 @ =gRoomControls
ldrh r0, [r0, #0xa]
strh r0, [r5, #0x2e]
ldr r0, _0809D2A8 @ =gLinkEntity
ldr r0, _0809D2A8 @ =gPlayerEntity
ldrh r0, [r0, #0x32]
strh r0, [r5, #0x32]
mov r3, sb
@@ -460,10 +460,10 @@ _0809D234:
.align 2, 0
_0809D2A0: .4byte 0xFFEC0000
_0809D2A4: .4byte gRoomControls
_0809D2A8: .4byte gLinkEntity
_0809D2A8: .4byte gPlayerEntity
_0809D2AC: .4byte 0x00000123
_0809D2B0:
ldr r6, _0809D430 @ =gLinkEntity
ldr r6, _0809D430 @ =gPlayerEntity
adds r0, r6, #0
adds r0, #0x38
ldrb r1, [r0]
@@ -504,7 +504,7 @@ _0809D2D6:
beq _0809D3A8
cmp r0, #9
beq _0809D3A8
ldr r7, _0809D438 @ =gLinkState
ldr r7, _0809D438 @ =gPlayerState
adds r0, r7, #0
adds r0, #0xa8
ldrb r0, [r0]
@@ -594,7 +594,7 @@ _0809D3A8:
ldr r4, [r5, #0x54]
cmp r4, #0
beq _0809D454
ldr r2, _0809D430 @ =gLinkEntity
ldr r2, _0809D430 @ =gPlayerEntity
movs r3, #0x2e
ldrsh r1, [r2, r3]
movs r3, #0x2e
@@ -647,9 +647,9 @@ _0809D3DA:
strb r1, [r4, #0x1b]
b _0809D454
.align 2, 0
_0809D430: .4byte gLinkEntity
_0809D430: .4byte gPlayerEntity
_0809D434: .4byte gTextBox
_0809D438: .4byte gLinkState
_0809D438: .4byte gPlayerState
_0809D43C: .4byte gUnk_03003DC0
_0809D440: .4byte gUnk_02034490
_0809D444: .4byte 0xFFF80000
@@ -751,7 +751,7 @@ sub_0809D498: @ 0x0809D498
ldr r0, _0809D53C @ =gRoomControls
ldrh r0, [r0, #0xa]
strh r0, [r5, #0x2e]
ldr r0, _0809D540 @ =gLinkEntity
ldr r0, _0809D540 @ =gPlayerEntity
ldrh r0, [r0, #0x32]
strh r0, [r5, #0x32]
ldr r0, _0809D544 @ =0x00000123
@@ -773,14 +773,14 @@ sub_0809D498: @ 0x0809D498
_0809D534: .4byte 0xFFFD8000
_0809D538: .4byte 0xFFB4C000
_0809D53C: .4byte gRoomControls
_0809D540: .4byte gLinkEntity
_0809D540: .4byte gPlayerEntity
_0809D544: .4byte 0x00000123
_0809D548:
adds r7, r5, #0
adds r7, #0x68
cmp r0, #1
bne _0809D62E
ldr r6, _0809D658 @ =gLinkEntity
ldr r6, _0809D658 @ =gPlayerEntity
ldrb r1, [r6, #0x18]
movs r0, #4
rsbs r0, r0, #0
@@ -904,7 +904,7 @@ _0809D652:
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0809D658: .4byte gLinkEntity
_0809D658: .4byte gPlayerEntity
_0809D65C: .4byte 0xFFF80000
_0809D660: .4byte gRoomControls
_0809D664: .4byte gUnk_02034490
@@ -914,7 +914,7 @@ _0809D668: .4byte gUnk_0800B0AC
sub_0809D66C: @ 0x0809D66C
push {r4, lr}
adds r4, r0, #0
ldr r0, _0809D694 @ =gLinkEntity
ldr r0, _0809D694 @ =gPlayerEntity
ldrb r1, [r0, #0x1a]
lsls r1, r1, #0x1c
lsrs r1, r1, #0x1c
@@ -933,7 +933,7 @@ sub_0809D66C: @ 0x0809D66C
beq _0809D6A2
b _0809D6FE
.align 2, 0
_0809D694: .4byte gLinkEntity
_0809D694: .4byte gPlayerEntity
_0809D698:
cmp r0, #2
beq _0809D6F4
asm/bobomb.s
+10 -10
View File
@@ -86,13 +86,13 @@ _0802C70C:
adds r1, #0x42
movs r0, #0
strb r0, [r1]
ldr r0, _0802C728 @ =gLinkEntity
ldr r0, _0802C728 @ =gPlayerEntity
adds r0, #0x42
movs r1, #4
strb r1, [r0]
b _0802C7A6
.align 2, 0
_0802C728: .4byte gLinkEntity
_0802C728: .4byte gPlayerEntity
_0802C72C:
movs r1, #0
movs r0, #3
@@ -258,7 +258,7 @@ sub_0802C83C: @ 0x0802C83C
bne _0802C884
movs r0, #3
strb r0, [r4, #0xc]
ldr r0, _0802C86C @ =gLinkEntity
ldr r0, _0802C86C @ =gPlayerEntity
ldrb r0, [r0, #0x14]
movs r1, #6
ands r1, r0
@@ -268,7 +268,7 @@ sub_0802C83C: @ 0x0802C83C
beq _0802C876
b _0802C87C
.align 2, 0
_0802C86C: .4byte gLinkEntity
_0802C86C: .4byte gPlayerEntity
_0802C870:
ldrh r0, [r4, #0x2e]
subs r0, #6
@@ -495,7 +495,7 @@ sub_0802C9D0: @ 0x0802C9D0
sub_0802CA10: @ 0x0802CA10
push {r4, lr}
adds r4, r0, #0
ldr r0, _0802CA30 @ =gLinkState
ldr r0, _0802CA30 @ =gPlayerState
ldrb r0, [r0, #5]
cmp r0, #5
beq _0802CA42
@@ -509,7 +509,7 @@ sub_0802CA10: @ 0x0802CA10
bl sub_0802CBC4
b _0802CA66
.align 2, 0
_0802CA30: .4byte gLinkState
_0802CA30: .4byte gPlayerState
_0802CA34:
adds r0, r4, #0
bl sub_0802CC18
@@ -521,7 +521,7 @@ _0802CA42:
adds r1, #0x83
movs r0, #2
strb r0, [r1]
ldr r0, _0802CA68 @ =gLinkEntity
ldr r0, _0802CA68 @ =gPlayerEntity
ldrb r0, [r0, #0x14]
lsls r0, r0, #2
movs r1, #4
@@ -536,7 +536,7 @@ _0802CA42:
_0802CA66:
pop {r4, pc}
.align 2, 0
_0802CA68: .4byte gLinkEntity
_0802CA68: .4byte gPlayerEntity
thumb_func_start sub_0802CA6C
sub_0802CA6C: @ 0x0802CA6C
@@ -594,7 +594,7 @@ sub_0802CA94: @ 0x0802CA94
strb r0, [r1]
subs r1, #2
strb r0, [r1]
ldr r0, _0802CAF4 @ =gLinkEntity
ldr r0, _0802CAF4 @ =gPlayerEntity
ldrb r1, [r0, #0x14]
lsls r1, r1, #2
movs r0, #4
@@ -609,7 +609,7 @@ sub_0802CA94: @ 0x0802CA94
bl InitializeAnimation
pop {pc}
.align 2, 0
_0802CAF4: .4byte gLinkEntity
_0802CAF4: .4byte gPlayerEntity
thumb_func_start sub_0802CAF8
sub_0802CAF8: @ 0x0802CAF8
asm/bombPeahat.s
+2 -2
View File
@@ -1110,7 +1110,7 @@ _0802B10E:
ldrb r0, [r4, #0xd]
cmp r0, #1
bne _0802B12E
ldr r0, _0802B188 @ =gLinkState
ldr r0, _0802B188 @ =gPlayerState
strb r1, [r0, #5]
_0802B12E:
adds r0, r4, #0
@@ -1157,7 +1157,7 @@ _0802B16C:
strb r0, [r1]
b _0802B19E
.align 2, 0
_0802B188: .4byte gLinkState
_0802B188: .4byte gPlayerState
_0802B18C: .4byte gUnk_080CD17C
_0802B190:
adds r0, r4, #0
asm/book.s
+10 -10
View File
@@ -174,7 +174,7 @@ _0809B4C0:
strh r0, [r4, #0x24]
movs r0, #0x10
strb r0, [r4, #0x15]
ldr r2, _0809B510 @ =gLinkState
ldr r2, _0809B510 @ =gPlayerState
movs r0, #0x9e
strb r0, [r2, #6]
movs r0, #5
@@ -183,7 +183,7 @@ _0809B4C0:
movs r1, #1
orrs r0, r1
str r0, [r2, #0x30]
ldr r1, _0809B514 @ =gLinkEntity
ldr r1, _0809B514 @ =gPlayerEntity
strh r3, [r1, #0x2c]
strh r3, [r1, #0x30]
ldrb r0, [r1, #0x14]
@@ -193,8 +193,8 @@ _0809B4C0:
bl sub_08004488
b _0809B520
.align 2, 0
_0809B510: .4byte gLinkState
_0809B514: .4byte gLinkEntity
_0809B510: .4byte gPlayerState
_0809B514: .4byte gPlayerEntity
_0809B518: .4byte 0x0000010F
_0809B51C:
movs r0, #0x16
@@ -283,7 +283,7 @@ _0809B5B0:
sub_0809B5B4: @ 0x0809B5B4
push {r4, lr}
adds r4, r0, #0
ldr r0, _0809B5CC @ =gLinkState
ldr r0, _0809B5CC @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@@ -293,7 +293,7 @@ sub_0809B5B4: @ 0x0809B5B4
bl sub_0800445C
b _0809B5EA
.align 2, 0
_0809B5CC: .4byte gLinkState
_0809B5CC: .4byte gPlayerState
_0809B5D0:
adds r0, r4, #0
bl sub_08017850
@@ -396,14 +396,14 @@ _0809B684: .4byte gTextBox
thumb_func_start sub_0809B688
sub_0809B688: @ 0x0809B688
push {lr}
ldr r1, _0809B6A8 @ =gLinkEntity
ldr r1, _0809B6A8 @ =gPlayerEntity
movs r2, #6
movs r3, #0xc
bl sub_080041A0
adds r1, r0, #0
cmp r1, #1
bne _0809B6A4
ldr r0, _0809B6AC @ =gLinkState
ldr r0, _0809B6AC @ =gPlayerState
ldrb r0, [r0, #0xd]
cmp r0, #0x10
beq _0809B6A4
@@ -412,8 +412,8 @@ _0809B6A4:
adds r0, r1, #0
pop {pc}
.align 2, 0
_0809B6A8: .4byte gLinkEntity
_0809B6AC: .4byte gLinkState
_0809B6A8: .4byte gPlayerEntity
_0809B6AC: .4byte gPlayerState
thumb_func_start sub_0809B6B0
sub_0809B6B0: @ 0x0809B6B0
asm/bossDoor.s
+2 -2
View File
@@ -235,7 +235,7 @@ sub_0808C384: @ 0x0808C384
movs r1, #0
movs r2, #1
bl sub_08078AC0
ldr r1, _0808C3B8 @ =gLinkEntity
ldr r1, _0808C3B8 @ =gPlayerEntity
ldrb r0, [r4, #0xa]
lsls r0, r0, #3
strb r0, [r1, #0x15]
@@ -244,7 +244,7 @@ _0808C3B0:
_0808C3B4:
pop {r4, pc}
.align 2, 0
_0808C3B8: .4byte gLinkEntity
_0808C3B8: .4byte gPlayerEntity
thumb_func_start sub_0808C3BC
sub_0808C3BC: @ 0x0808C3BC
asm/bowUse.s
+11 -11
View File
@@ -104,7 +104,7 @@ _0801921A:
ands r1, r3
lsls r1, r1, #6
orrs r0, r1
ldr r1, _0801928C @ =gLinkEntity
ldr r1, _0801928C @ =gPlayerEntity
adds r1, #0x38
ldrb r1, [r1]
movs r2, #0x80
@@ -141,7 +141,7 @@ _0801921A:
b _080192A2
.align 2, 0
_08019288: .4byte gRoomControls
_0801928C: .4byte gLinkEntity
_0801928C: .4byte gPlayerEntity
_08019290: .4byte gUnk_08003E44
_08019294:
adds r0, r4, #0
@@ -238,7 +238,7 @@ _08019336:
strb r0, [r4, #0x18]
b _08019402
_0801934A:
ldr r1, _0801938C @ =gLinkState
ldr r1, _0801938C @ =gPlayerState
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 @ =gLinkState
ldr r0, _0801938C @ =gPlayerState
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 gLinkState
_0801938C: .4byte gPlayerState
_08019390:
adds r1, r4, #0
adds r1, #0x40
@@ -285,7 +285,7 @@ _08019398:
ldrb r1, [r4, #0x1e]
ldr r2, [r4, #0x78]
subs r1, r1, r2
ldr r0, _08019408 @ =gLinkEntity
ldr r0, _08019408 @ =gPlayerEntity
ldrb r0, [r0, #0x1e]
cmp r1, r0
beq _080193C2
@@ -301,7 +301,7 @@ _080193B8:
adds r0, r4, #0
bl sub_080042D0
_080193C2:
ldr r0, _08019408 @ =gLinkEntity
ldr r0, _08019408 @ =gPlayerEntity
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #1
@@ -319,7 +319,7 @@ _080193C2:
bl CreatePlayerItem
cmp r0, #0
beq _080193FA
ldr r2, _0801940C @ =gLinkState
ldr r2, _0801940C @ =gPlayerState
ldrb r1, [r2, #4]
movs r0, #0x80
orrs r0, r1
@@ -328,12 +328,12 @@ _080193C2:
rsbs r0, r0, #0
bl ModArrows
_080193FA:
ldr r1, _08019408 @ =gLinkEntity
ldr r1, _08019408 @ =gPlayerEntity
adds r0, r4, #0
bl sub_08078E84
_08019402:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08019404: .4byte gUnk_02002A40
_08019408: .4byte gLinkEntity
_0801940C: .4byte gLinkState
_08019408: .4byte gPlayerEntity
_0801940C: .4byte gPlayerState
asm/brocco.s
+2 -2
View File
@@ -192,7 +192,7 @@ _08063662:
adds r1, r4, #0
adds r1, #0x69
strb r0, [r1]
ldr r1, _080636A0 @ =gLinkEntity
ldr r1, _080636A0 @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
bl sub_0806F5A4
@@ -204,7 +204,7 @@ _08063662:
bl sub_0806F118
b _080636D4
.align 2, 0
_080636A0: .4byte gLinkEntity
_080636A0: .4byte gPlayerEntity
_080636A4:
adds r0, r4, #0
movs r1, #0
asm/businessScrub.s
+2 -2
View File
@@ -631,7 +631,7 @@ _08028DE4: .4byte 0x00002903
sub_08028DE8: @ 0x08028DE8
push {r4, lr}
adds r4, r0, #0
ldr r0, _08028E08 @ =gLinkEntity
ldr r0, _08028E08 @ =gPlayerEntity
ldrb r0, [r0, #0xc]
cmp r0, #8
bne _08028E0C
@@ -645,7 +645,7 @@ sub_08028DE8: @ 0x08028DE8
strb r0, [r4]
b _08028E3A
.align 2, 0
_08028E08: .4byte gLinkEntity
_08028E08: .4byte gPlayerEntity
_08028E0C:
ldr r0, _08028E3C @ =0x00002902
bl TextboxNoOverlapFollow
asm/businessScrubPrologue.s
+6 -6
View File
@@ -80,7 +80,7 @@ sub_08045BC8: @ 0x08045BC8
subs r0, #8
strh r0, [r1, #0x36]
_08045C16:
ldr r0, _08045C30 @ =gLinkState
ldr r0, _08045C30 @ =gPlayerState
adds r0, #0x27
movs r1, #0xff
strb r1, [r0]
@@ -92,7 +92,7 @@ _08045C16:
_08045C2C:
pop {r4, pc}
.align 2, 0
_08045C30: .4byte gLinkState
_08045C30: .4byte gPlayerState
_08045C34: .4byte 0x000001BB
thumb_func_start nullsub_174
@@ -341,7 +341,7 @@ _08045E12:
sub_08045E14: @ 0x08045E14
push {r4, lr}
adds r4, r0, #0
ldr r0, _08045E2C @ =gLinkState
ldr r0, _08045E2C @ =gPlayerState
adds r0, #0x27
movs r1, #0xff
strb r1, [r0]
@@ -352,7 +352,7 @@ sub_08045E14: @ 0x08045E14
beq _08045E70
b _08045EBA
.align 2, 0
_08045E2C: .4byte gLinkState
_08045E2C: .4byte gPlayerState
_08045E30:
ldrb r0, [r4, #0xe]
cmp r0, #0
@@ -667,7 +667,7 @@ _08046074: .4byte gUnk_080D1A3E
sub_08046078: @ 0x08046078
push {r4, r5, r6, r7, lr}
adds r7, r0, #0
ldr r0, _08046114 @ =gLinkState
ldr r0, _08046114 @ =gPlayerState
adds r0, #0x27
movs r1, #0
strb r1, [r0]
@@ -737,7 +737,7 @@ _0804610C:
bl sub_0804AA1C
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08046114: .4byte gLinkState
_08046114: .4byte gPlayerState
_08046118: .4byte gUnk_080D1A4E
_0804611C: .4byte gRoomControls
_08046120: .4byte 0x000007A2
asm/button.s
+12 -12
View File
@@ -172,7 +172,7 @@ sub_08081BE0: @ 0x08081BE0
strb r0, [r4, #0xc]
movs r0, #1
strb r0, [r4, #0xf]
ldr r1, _08081C1C @ =gLinkState
ldr r1, _08081C1C @ =gPlayerState
ldrb r0, [r1, #5]
cmp r0, #2
beq _08081C16
@@ -188,7 +188,7 @@ _08081C16:
strb r0, [r4, #0xe]
b _08081C2C
.align 2, 0
_08081C1C: .4byte gLinkState
_08081C1C: .4byte gPlayerState
_08081C20:
movs r0, #8
strb r0, [r4, #0xe]
@@ -389,19 +389,19 @@ _08081D8E:
bl sub_08081E0C
cmp r0, #0
beq _08081DB4
ldr r0, _08081DAC @ =gLinkState
ldr r0, _08081DAC @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x90
ands r0, r1
cmp r0, #0
bne _08081E06
ldr r6, _08081DB0 @ =gLinkEntity
ldr r6, _08081DB0 @ =gPlayerEntity
b _08081E06
.align 2, 0
_08081DAC: .4byte gLinkState
_08081DB0: .4byte gLinkEntity
_08081DAC: .4byte gPlayerState
_08081DB0: .4byte gPlayerEntity
_08081DB4:
ldr r0, _08081DD8 @ =gLinkState
ldr r0, _08081DD8 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
lsls r1, r1, #0xf
@@ -419,7 +419,7 @@ _08081DB4:
ldr r6, [r5]
b _08081E06
.align 2, 0
_08081DD8: .4byte gLinkState
_08081DD8: .4byte gPlayerState
_08081DDC: .4byte gUnk_03004040
_08081DE0:
ldr r1, [r5, #4]
@@ -450,7 +450,7 @@ _08081E0A:
sub_08081E0C: @ 0x08081E0C
push {r4, r5, lr}
adds r4, r0, #0
ldr r5, _08081E28 @ =gLinkEntity
ldr r5, _08081E28 @ =gPlayerEntity
movs r1, #0x36
ldrsh r0, [r5, r1]
cmp r0, #0
@@ -462,7 +462,7 @@ _08081E22:
movs r0, #0
b _08081E38
.align 2, 0
_08081E28: .4byte gLinkEntity
_08081E28: .4byte gPlayerEntity
_08081E2C:
adds r0, r4, #0
adds r1, r5, #0
@@ -711,7 +711,7 @@ sub_08081FF8: @ 0x08081FF8
push {r4, r5, r6, lr}
adds r4, r0, #0
ldr r1, [r4, #0x54]
ldr r0, _08082038 @ =gLinkEntity
ldr r0, _08082038 @ =gPlayerEntity
cmp r1, r0
bne _08082036
adds r0, r1, #0
@@ -741,5 +741,5 @@ _0808202E:
_08082036:
pop {r4, r5, r6, pc}
.align 2, 0
_08082038: .4byte gLinkEntity
_08082038: .4byte gPlayerEntity
_0808203C: .4byte gUnk_03004040
asm/castleMaid.s
+2 -2
View File
@@ -142,7 +142,7 @@ _080645EA:
movs r1, #0
strb r0, [r4, #0xc]
strb r1, [r2]
ldr r1, _08064628 @ =gLinkEntity
ldr r1, _08064628 @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
bl sub_0806F5A4
@@ -155,7 +155,7 @@ _080645EA:
bl _call_via_r0
b _0806463C
.align 2, 0
_08064628: .4byte gLinkEntity
_08064628: .4byte gPlayerEntity
_0806462C:
ldr r0, _08064640 @ =gTextBox
ldrb r1, [r0]
asm/cat.s
+12 -12
View File
@@ -37,7 +37,7 @@ sub_080677EC: @ 0x080677EC
adds r1, #0x2e
movs r0, #0xff
strb r0, [r1]
ldr r0, _0806783C @ =gLinkEntity
ldr r0, _0806783C @ =gPlayerEntity
movs r2, #0x2e
ldrsh r1, [r4, r2]
movs r2, #0x2e
@@ -49,7 +49,7 @@ sub_080677EC: @ 0x080677EC
orrs r0, r1
b _08067848
.align 2, 0
_0806783C: .4byte gLinkEntity
_0806783C: .4byte gPlayerEntity
_08067840:
ldrb r1, [r4, #0x18]
movs r0, #0x41
@@ -500,7 +500,7 @@ sub_08067B80: @ 0x08067B80
bl InitAnimationForceUpdate
adds r0, r5, #0
bl sub_08067DDC
ldr r0, _08067BC4 @ =gLinkEntity
ldr r0, _08067BC4 @ =gPlayerEntity
movs r2, #0x2e
ldrsh r1, [r5, r2]
movs r2, #0x2e
@@ -512,7 +512,7 @@ sub_08067B80: @ 0x08067B80
orrs r0, r1
b _08067BD0
.align 2, 0
_08067BC4: .4byte gLinkEntity
_08067BC4: .4byte gPlayerEntity
_08067BC8:
ldrb r1, [r5, #0x18]
movs r0, #0x41
@@ -533,7 +533,7 @@ sub_08067BD4: @ 0x08067BD4
movs r1, #0x2e
ldrsh r0, [r2, r1]
subs r0, #4
ldr r1, _08067BF8 @ =gLinkEntity
ldr r1, _08067BF8 @ =gPlayerEntity
movs r4, #0x2e
ldrsh r1, [r1, r4]
cmp r0, r1
@@ -543,12 +543,12 @@ sub_08067BD4: @ 0x08067BD4
ands r0, r3
b _08067C10
.align 2, 0
_08067BF8: .4byte gLinkEntity
_08067BF8: .4byte gPlayerEntity
_08067BFC:
movs r1, #0x2e
ldrsh r0, [r2, r1]
adds r0, #4
ldr r1, _08067C14 @ =gLinkEntity
ldr r1, _08067C14 @ =gPlayerEntity
movs r4, #0x2e
ldrsh r1, [r1, r4]
cmp r0, r1
@@ -560,7 +560,7 @@ _08067C10:
_08067C12:
pop {r4, pc}
.align 2, 0
_08067C14: .4byte gLinkEntity
_08067C14: .4byte gPlayerEntity
thumb_func_start sub_08067C18
sub_08067C18: @ 0x08067C18
@@ -591,7 +591,7 @@ sub_08067C24: @ 0x08067C24
sub_08067C44: @ 0x08067C44
push {r4, r5, lr}
adds r4, r0, #0
ldr r0, _08067C6C @ =gLinkState
ldr r0, _08067C6C @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@@ -608,7 +608,7 @@ sub_08067C44: @ 0x08067C44
bl sub_08078778
b _08067C7C
.align 2, 0
_08067C6C: .4byte gLinkState
_08067C6C: .4byte gPlayerState
_08067C70:
adds r0, r4, #0
adds r0, #0x68
@@ -625,7 +625,7 @@ _08067C7C:
adds r5, r0, #0
cmp r1, #0
beq _08067D1C
ldr r1, _08067CB4 @ =gLinkEntity
ldr r1, _08067CB4 @ =gPlayerEntity
adds r0, r4, #0
bl sub_0806FCA0
adds r2, r0, #0
@@ -644,7 +644,7 @@ _08067CA6:
bl InitAnimationForceUpdate
b _08067CEC
.align 2, 0
_08067CB4: .4byte gLinkEntity
_08067CB4: .4byte gPlayerEntity
_08067CB8:
cmp r2, #1
bne _08067CC4
asm/cellOverwriteSet.s
+4 -4
View File
@@ -14,7 +14,7 @@ CellOverwriteSet: @ 0x0801BEF8
mov r5, r8
push {r5, r6, r7}
mov r8, r0
ldr r7, _0801BFF0 @ =gLinkEntity
ldr r7, _0801BFF0 @ =gPlayerEntity
ldrb r0, [r0, #0xc]
cmp r0, #0
bne _0801BF62
@@ -61,7 +61,7 @@ CellOverwriteSet: @ 0x0801BEF8
adds r0, #1
strb r0, [r1, #0xc]
_0801BF62:
ldr r2, _0801BFFC @ =gLinkState
ldr r2, _0801BFFC @ =gPlayerState
mov sb, r2
ldrb r1, [r2, #0x1a]
movs r0, #0x80
@@ -133,10 +133,10 @@ _0801BFDA:
strb r0, [r1]
b _0801C0D4
.align 2, 0
_0801BFF0: .4byte gLinkEntity
_0801BFF0: .4byte gPlayerEntity
_0801BFF4: .4byte gUnk_080B7B6C
_0801BFF8: .4byte gRoomControls
_0801BFFC: .4byte gLinkState
_0801BFFC: .4byte gPlayerState
_0801C000: .4byte gUnk_03000FF0
_0801C004:
ldrh r2, [r6, #2]
asm/chestSpawner.s
+4 -4
View File
@@ -158,7 +158,7 @@ sub_08083F14: @ 0x08083F14
.align 2, 0
_08083F74: .4byte gScreen
_08083F78:
ldr r5, _08083FA0 @ =gLinkEntity
ldr r5, _08083FA0 @ =gPlayerEntity
adds r0, r4, #0
adds r1, r5, #0
movs r2, #0x10
@@ -177,12 +177,12 @@ _08083F98:
strb r0, [r4, #0xd]
b _08083FE6
.align 2, 0
_08083FA0: .4byte gLinkEntity
_08083FA0: .4byte gPlayerEntity
_08083FA4:
ldrb r0, [r4, #0xa]
cmp r0, #5
beq _08083FB2
ldr r0, _08083FC8 @ =gLinkEntity
ldr r0, _08083FC8 @ =gPlayerEntity
ldrb r0, [r0, #0xc]
cmp r0, #1
bne _08083FE6
@@ -198,7 +198,7 @@ _08083FB2:
bl PlaySFX
b _08083FE6
.align 2, 0
_08083FC8: .4byte gLinkEntity
_08083FC8: .4byte gPlayerEntity
_08083FCC:
ldr r1, _08083FE8 @ =gUnk_02034490
movs r0, #0
asm/chuchuBoss.s
+26 -26
View File
@@ -584,14 +584,14 @@ _080260EA:
cmp r0, #0xff
bne _08026106
ldr r1, _08026108 @ =gRoomControls
ldr r0, _0802610C @ =gLinkEntity
ldr r0, _0802610C @ =gPlayerEntity
str r0, [r1, #0x30]
bl DeleteThisEntity
_08026106:
pop {r4, pc}
.align 2, 0
_08026108: .4byte gRoomControls
_0802610C: .4byte gLinkEntity
_0802610C: .4byte gPlayerEntity
thumb_func_start sub_08026110
sub_08026110: @ 0x08026110
@@ -791,7 +791,7 @@ sub_0802626C: @ 0x0802626C
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
ldr r0, _080262A4 @ =gLinkEntity
ldr r0, _080262A4 @ =gPlayerEntity
ldrb r0, [r0, #0xc]
cmp r0, #0x17
beq _08026298
@@ -803,7 +803,7 @@ _08026298:
.align 2, 0
_0802629C: .4byte gUnk_02034490
_080262A0: .4byte gUnk_080CC20C
_080262A4: .4byte gLinkEntity
_080262A4: .4byte gPlayerEntity
thumb_func_start sub_080262A8
sub_080262A8: @ 0x080262A8
@@ -829,7 +829,7 @@ sub_080262A8: @ 0x080262A8
ldrb r0, [r4, #0xb]
cmp r0, #0
bne _080262EC
ldr r1, _080262E8 @ =gLinkState
ldr r1, _080262E8 @ =gPlayerState
movs r0, #0x82
lsls r0, r0, #1
strh r0, [r1, #8]
@@ -839,7 +839,7 @@ sub_080262A8: @ 0x080262A8
strb r5, [r0, #3]
b _0802631A
.align 2, 0
_080262E8: .4byte gLinkState
_080262E8: .4byte gPlayerState
_080262EC:
adds r0, r4, #0
adds r0, #0x7c
@@ -853,7 +853,7 @@ _080262EC:
ldr r1, [r0]
movs r0, #3
strb r0, [r1, #3]
ldr r0, _0802631C @ =gLinkEntity
ldr r0, _0802631C @ =gPlayerEntity
strb r6, [r0, #0x14]
ldr r0, _08026320 @ =gRoomControls
str r4, [r0, #0x30]
@@ -866,7 +866,7 @@ _080262EC:
_0802631A:
pop {r4, r5, r6, pc}
.align 2, 0
_0802631C: .4byte gLinkEntity
_0802631C: .4byte gPlayerEntity
_08026320: .4byte gRoomControls
_08026324: .4byte 0x00004022
@@ -874,7 +874,7 @@ _08026324: .4byte 0x00004022
sub_08026328: @ 0x08026328
push {lr}
adds r2, r0, #0
ldr r0, _08026354 @ =gLinkEntity
ldr r0, _08026354 @ =gPlayerEntity
ldrb r0, [r0, #0xc]
cmp r0, #0x17
beq _08026352
@@ -895,13 +895,13 @@ sub_08026328: @ 0x08026328
_08026352:
pop {pc}
.align 2, 0
_08026354: .4byte gLinkEntity
_08026354: .4byte gPlayerEntity
thumb_func_start sub_08026358
sub_08026358: @ 0x08026358
push {r4, lr}
adds r3, r0, #0
ldr r4, _08026398 @ =gLinkEntity
ldr r4, _08026398 @ =gPlayerEntity
ldrb r0, [r4, #0xc]
cmp r0, #0xf
beq _080263B0
@@ -932,7 +932,7 @@ sub_08026358: @ 0x08026358
strb r0, [r1, #0xe]
b _080263B0
.align 2, 0
_08026398: .4byte gLinkEntity
_08026398: .4byte gPlayerEntity
_0802639C: .4byte gRoomControls
_080263A0:
cmp r2, #0x60
@@ -1145,7 +1145,7 @@ sub_0802650C: @ 0x0802650C
adds r0, #1
strb r0, [r1, #3]
ldr r1, _08026534 @ =gRoomControls
ldr r0, _08026538 @ =gLinkEntity
ldr r0, _08026538 @ =gPlayerEntity
str r0, [r1, #0x30]
_0802652C:
adds r0, r2, #0
@@ -1153,7 +1153,7 @@ _0802652C:
pop {pc}
.align 2, 0
_08026534: .4byte gRoomControls
_08026538: .4byte gLinkEntity
_08026538: .4byte gPlayerEntity
thumb_func_start sub_0802653C
sub_0802653C: @ 0x0802653C
@@ -1221,7 +1221,7 @@ _0802659C:
adds r4, #0x7c
movs r0, #0x3c
strb r0, [r4]
ldr r1, _080265E4 @ =gLinkEntity
ldr r1, _080265E4 @ =gPlayerEntity
adds r0, r5, #0
bl GetFacingDirection
strb r0, [r5, #0x15]
@@ -1239,7 +1239,7 @@ _0802659C:
adds r0, #0x10
b _080265EE
.align 2, 0
_080265E4: .4byte gLinkEntity
_080265E4: .4byte gPlayerEntity
_080265E8:
adds r1, r5, #0
adds r1, #0x80
@@ -1372,7 +1372,7 @@ _080266D6:
ands r0, r1
cmp r0, #0
bne _080266EC
ldr r1, _08026704 @ =gLinkEntity
ldr r1, _08026704 @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
strb r0, [r4, #0x15]
@@ -1388,7 +1388,7 @@ _080266EC:
b _0802670A
.align 2, 0
_08026700: .4byte gScreenTransition
_08026704: .4byte gLinkEntity
_08026704: .4byte gPlayerEntity
_08026708:
movs r0, #0xc0
_0802670A:
@@ -1549,7 +1549,7 @@ _08026820:
strh r0, [r5]
b _08026860
_08026830:
ldr r1, _08026868 @ =gLinkEntity
ldr r1, _08026868 @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
strb r0, [r4, #0x15]
@@ -1575,7 +1575,7 @@ _08026860:
bl sub_080277F8
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08026868: .4byte gLinkEntity
_08026868: .4byte gPlayerEntity
thumb_func_start sub_0802686C
sub_0802686C: @ 0x0802686C
@@ -2659,7 +2659,7 @@ _08027098:
adds r7, r0, #0
cmp r1, #0
beq _080270E0
ldr r0, _080270CC @ =gLinkEntity
ldr r0, _080270CC @ =gPlayerEntity
movs r2, #0x32
ldrsh r4, [r5, r2]
movs r1, #0x32
@@ -2678,7 +2678,7 @@ _08027098:
b _080270D4
.align 2, 0
_080270C8: .4byte gScreenTransition
_080270CC: .4byte gLinkEntity
_080270CC: .4byte gPlayerEntity
_080270D0:
movs r0, #0x10
strb r0, [r3, #0xc]
@@ -2789,7 +2789,7 @@ _08027152:
ldrb r0, [r0, #3]
cmp r0, #1
bls _080271B2
ldr r0, _080271DC @ =gLinkEntity
ldr r0, _080271DC @ =gPlayerEntity
movs r2, #0x2e
ldrsh r1, [r5, r2]
movs r2, #0x2e
@@ -2821,7 +2821,7 @@ _080271C0:
movs r0, #0xf
b _080271FC
.align 2, 0
_080271DC: .4byte gLinkEntity
_080271DC: .4byte gPlayerEntity
_080271E0:
adds r0, r1, #1
strb r0, [r2, #3]
@@ -4186,7 +4186,7 @@ _08027C22:
ldrb r0, [r6, #0x15]
lsrs r0, r0, #2
strb r0, [r6, #0x14]
ldr r0, _08027C44 @ =gLinkEntity
ldr r0, _08027C44 @ =gPlayerEntity
movs r2, #0x32
ldrsh r1, [r6, r2]
movs r2, #0x32
@@ -4201,7 +4201,7 @@ _08027C22:
movs r0, #0
b _08027C50
.align 2, 0
_08027C44: .4byte gLinkEntity
_08027C44: .4byte gPlayerEntity
_08027C48:
adds r0, r6, #0
adds r0, #0x84
asm/code_080011C4.s
+2 -2
View File
@@ -1404,7 +1404,7 @@ _0800293A:
CheckPlayerInRegion: @ 0x0800293E
push {r4, r5, r6, r7, lr}
ldr r4, _080029AC @ =gRoomControls
ldr r7, _080029B0 @ =gLinkEntity
ldr r7, _080029B0 @ =gPlayerEntity
ldrh r6, [r4, #6]
ldrh r5, [r7, #0x2e]
subs r5, r5, r6
@@ -1444,4 +1444,4 @@ _080029A0: .4byte 0x0000E040
_080029A4: .4byte 0x00000E20
_080029A8: .4byte gRoomControls
_080029AC: .4byte gRoomControls
_080029B0: .4byte gLinkEntity
_080029B0: .4byte gPlayerEntity
asm/code_080043E8.s
+4 -4
View File
@@ -64,7 +64,7 @@ sub_0800445C: @ 0x0800445C
bl sub_08079F8C
cmp r0, #0
beq _08004482
ldr r5, _080044D8 @ =gLinkEntity
ldr r5, _080044D8 @ =gPlayerEntity
adds r0, r4, #0
adds r1, r5, #0
bl sub_08004484
@@ -113,7 +113,7 @@ _080044AC:
non_word_aligned_thumb_func_start sub_080044AE
sub_080044AE: @ 0x080044AE
push {lr}
ldr r3, _080044E8 @ =gLinkEntity
ldr r3, _080044E8 @ =gPlayerEntity
cmp r0, r3
beq _080044CC
push {r0, r1, r2}
@@ -132,11 +132,11 @@ _080044CC:
bl sub_08079E58
b _080044C8
.align 2, 0
_080044D8: .4byte gLinkEntity
_080044D8: .4byte gPlayerEntity
_080044DC: .4byte gUnk_03005FF0
_080044E0: .4byte gUnk_02024048
_080044E4: .4byte gUnk_02021F20
_080044E8: .4byte gLinkEntity
_080044E8: .4byte gPlayerEntity
thumb_func_start sub_080044EC
sub_080044EC: @ 0x080044EC
asm/code_0800857C.s
+26 -26
View File
@@ -16,7 +16,7 @@ sub_0800857C: @ 0x0800857C
ldrb r1, [r0, #0xb]
lsrs r1, r1, #8
bhs _0800859C
ldr r1, _08008888 @ =gLinkState
ldr r1, _08008888 @ =gPlayerState
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 @ =gLinkState
ldr r2, _0800888C @ =gPlayerState
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 @ =gLinkState
ldr r3, _080088A8 @ =gPlayerState
ldrb r2, [r3, #0x1c]
orrs r2, r2
bne _0800861A
@@ -179,7 +179,7 @@ sub_080086B4: @ 0x080086B4
mov r7, fp
push {r4, r5, r6, r7}
mov fp, r2
ldr r2, _080088BC @ =gLinkEntity
ldr r2, _080088BC @ =gPlayerEntity
mov r8, r2
bl sub_080086D8
pop {r4, r5, r6, r7}
@@ -208,7 +208,7 @@ sub_080086D8: @ 0x080086D8
ldrb r2, [r0, r1]
push {r2}
mov r0, r8
ldr r1, _080088C8 @ =gLinkState
ldr r1, _080088C8 @ =gPlayerState
movs r2, #0x26
ldrb r2, [r1, r2]
cmp r2, #0
@@ -428,23 +428,23 @@ _0800887E:
adds r0, r5, #0
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08008888: .4byte gLinkState
_0800888C: .4byte gLinkState
_08008888: .4byte gPlayerState
_0800888C: .4byte gPlayerState
_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 gLinkState
_080088A8: .4byte gPlayerState
_080088AC: .4byte gUnk_0800851C
_080088B0: .4byte gUnk_080082DC
_080088B4: .4byte gUnk_03000BF6
_080088B8: .4byte gUnk_03000BF8
_080088BC: .4byte gLinkEntity
_080088BC: .4byte gPlayerEntity
_080088C0: .4byte 0x000003F0
_080088C4: .4byte gUnk_08000248
_080088C8: .4byte gLinkState
_080088C8: .4byte gPlayerState
_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 @ =gLinkState
ldr r1, _08008A68 @ =gPlayerState
b _08008960
non_word_aligned_thumb_func_start sub_08008942
sub_08008942: @ 0x08008942
push {lr}
ldr r1, _08008A6C @ =gLinkState
ldr r1, _08008A6C @ =gPlayerState
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 @ =gLinkState
ldr r1, _08008A70 @ =gPlayerState
_08008956:
movs r3, #0x15
strb r2, [r0, r3]
@@ -559,7 +559,7 @@ _080089A8:
ldrsb r3, [r4, r3]
bl sub_08008A46
_080089C0:
ldr r1, _08008A80 @ =gLinkState
ldr r1, _08008A80 @ =gPlayerState
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 @ =gLinkState
ldr r1, _08008A84 @ =gPlayerState
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 gLinkState
_08008A6C: .4byte gLinkState
_08008A70: .4byte gLinkState
_08008A68: .4byte gPlayerState
_08008A6C: .4byte gPlayerState
_08008A70: .4byte gPlayerState
_08008A74: .4byte _080088FC
_08008A78: .4byte _080088EC
_08008A7C: .4byte _0800890C
_08008A80: .4byte gLinkState
_08008A84: .4byte gLinkState
_08008A80: .4byte gPlayerState
_08008A84: .4byte gPlayerState
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 @ =gLinkState
ldr r1, _08008B40 @ =gPlayerState
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 @ =gLinkState
ldr r1, _08008B48 @ =gPlayerState
movs r3, #0x26
ldrb r2, [r1, r3]
movs r3, #0xf
@@ -760,7 +760,7 @@ _08008B20:
non_word_aligned_thumb_func_start sub_08008B22
sub_08008B22: @ 0x08008B22
push {lr}
ldr r0, _08008B58 @ =gLinkEntity
ldr r0, _08008B58 @ =gPlayerEntity
bl sub_08008B02
adds r0, r2, #0
pop {pc}
@@ -774,13 +774,13 @@ sub_08008B2E: @ 0x08008B2E
.align 2, 0
_08008B38: .4byte 0x00000180
_08008B3C: .4byte 0xFFFFFE80
_08008B40: .4byte gLinkState
_08008B40: .4byte gPlayerState
_08008B44: .4byte gSineTable
_08008B48: .4byte gLinkState
_08008B48: .4byte gPlayerState
_08008B4C: .4byte gUnk_02000020
_08008B50: .4byte 0x00004000
_08008B54: .4byte gUnk_08007CAC
_08008B58: .4byte gLinkEntity
_08008B58: .4byte gPlayerEntity
gUnk_08008B5C:: @ 08008B5C
.incbin "baserom.gba", 0x008B5C, 0x0000034
asm/code_08016DF8.s
+73 -73
View File
@@ -166,7 +166,7 @@ sub_08016F28: @ 0x08016F28
ldrb r0, [r0]
cmp r0, #0
beq _08016F4C
ldr r0, _08016F48 @ =gLinkState
ldr r0, _08016F48 @ =gPlayerState
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 gLinkState
_08016F48: .4byte gPlayerState
_08016F4C:
ldr r0, _08016F98 @ =gLinkState
ldr r0, _08016F98 @ =gPlayerState
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 @ =gLinkState
ldr r5, _08016F98 @ =gPlayerState
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 gLinkState
_08016F98: .4byte gPlayerState
_08016F9C: .4byte 0xFFFFBFFF
_08016FA0: .4byte 0xFFF7FFFF
_08016FA4:
@@ -268,7 +268,7 @@ sub_08016FF4: @ 0x08016FF4
strb r1, [r2]
adds r0, #0x2e
strb r1, [r0]
ldr r2, _080170A4 @ =gLinkEntity
ldr r2, _080170A4 @ =gPlayerEntity
adds r0, r2, #0
adds r0, #0x41
ldrb r1, [r0]
@@ -286,7 +286,7 @@ sub_08016FF4: @ 0x08016FF4
movs r0, #0x86
bl PlaySFX
_0801702E:
ldr r4, _080170A8 @ =gLinkState
ldr r4, _080170A8 @ =gPlayerState
ldr r0, [r4, #0x30]
ldr r1, _080170AC @ =0xFDFFFDFF
ands r0, r1
@@ -296,7 +296,7 @@ _0801702E:
ands r0, r1
cmp r0, #0
beq _08017046
bl ResetLink
bl ResetPlayer
_08017046:
ldr r0, [r4, #0x30]
movs r1, #0x80
@@ -320,7 +320,7 @@ _0801706E:
ldr r0, _080170B0 @ =gUnk_03003DF0
movs r4, #0
strb r4, [r0]
ldr r2, _080170A8 @ =gLinkState
ldr r2, _080170A8 @ =gPlayerState
adds r1, r2, #0
adds r1, #0x27
ldrb r0, [r1]
@@ -345,8 +345,8 @@ _08017084:
b _080171EA
.align 2, 0
_080170A0: .4byte gUnk_0200AF00
_080170A4: .4byte gLinkEntity
_080170A8: .4byte gLinkState
_080170A4: .4byte gPlayerEntity
_080170A8: .4byte gPlayerState
_080170AC: .4byte 0xFDFFFDFF
_080170B0: .4byte gUnk_03003DF0
_080170B4:
@@ -517,11 +517,11 @@ sub_080171F0: @ 0x080171F0
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
ldr r4, _080172DC @ =gLinkState
ldr r4, _080172DC @ =gPlayerState
ldrb r0, [r4, #0x1a]
cmp r0, #0
beq _08017202
bl ResetLink
bl ResetPlayer
_08017202:
ldrb r0, [r4, #0x14]
cmp r0, #0
@@ -529,7 +529,7 @@ _08017202:
subs r0, #1
strb r0, [r4, #0x14]
_0801720C:
ldr r6, _080172E0 @ =gLinkEntity
ldr r6, _080172E0 @ =gPlayerEntity
adds r1, r6, #0
adds r1, #0x7a
ldrh r0, [r1]
@@ -634,8 +634,8 @@ _080172CC:
orrs r0, r1
b _080172FA
.align 2, 0
_080172DC: .4byte gLinkState
_080172E0: .4byte gLinkEntity
_080172DC: .4byte gPlayerState
_080172E0: .4byte gPlayerEntity
_080172E4: .4byte 0xFFFEFFFF
_080172E8: .4byte gUnk_0200AF00
_080172EC: .4byte gUnk_03003BE0
@@ -646,10 +646,10 @@ _080172F4:
ands r0, r1
_080172FA:
str r0, [r4, #0x30]
ldr r4, _08017330 @ =gLinkEntity
ldr r4, _08017330 @ =gPlayerEntity
adds r0, r4, #0
bl sub_0807A8D8
ldr r0, _08017334 @ =gLinkState
ldr r0, _08017334 @ =gPlayerState
ldrb r1, [r0, #2]
movs r0, #0xc0
ands r0, r1
@@ -672,8 +672,8 @@ _08017322:
bx r0
.align 2, 0
_0801732C: .4byte 0xDFFFFFFF
_08017330: .4byte gLinkEntity
_08017334: .4byte gLinkState
_08017330: .4byte gPlayerEntity
_08017334: .4byte gPlayerState
thumb_func_start sub_08017338
sub_08017338: @ 0x08017338
@@ -779,7 +779,7 @@ _080173CE:
ldrh r1, [r3, #6]
cmp r1, #0
bne _0801741C
ldr r2, _08017418 @ =gLinkEntity
ldr r2, _08017418 @ =gPlayerEntity
adds r0, r2, #0
adds r0, #0x60
ldrh r1, [r0]
@@ -791,14 +791,14 @@ _080173CE:
.align 2, 0
_08017410: .4byte gUnk_08126DA8
_08017414: .4byte gUnk_08126ED8
_08017418: .4byte gLinkEntity
_08017418: .4byte gPlayerEntity
_0801741C:
ldr r0, _0801749C @ =0x000003FF
ands r0, r1
mov r1, ip
adds r1, #0x60
strh r0, [r1]
ldr r5, _080174A0 @ =gLinkEntity
ldr r5, _080174A0 @ =gPlayerEntity
_08017428:
mov r3, ip
ldrb r0, [r3, #0x14]
@@ -860,7 +860,7 @@ _08017438:
bx r0
.align 2, 0
_0801749C: .4byte 0x000003FF
_080174A0: .4byte gLinkEntity
_080174A0: .4byte gPlayerEntity
thumb_func_start sub_080174A4
sub_080174A4: @ 0x080174A4
@@ -1047,12 +1047,12 @@ _08017602:
cmp r0, #0
bne _08017638
ldr r1, _08017628 @ =gUnk_030059F0
ldr r0, _0801762C @ =gLinkState
ldr r0, _0801762C @ =gPlayerState
adds r0, #0x8b
ldrb r0, [r0]
cmp r0, #0
beq _08017634
ldr r4, _08017630 @ =gLinkEntity
ldr r4, _08017630 @ =gPlayerEntity
ldrb r5, [r4, #0x10]
movs r0, #0x7f
ands r0, r5
@@ -1063,8 +1063,8 @@ _08017602:
.align 2, 0
_08017624: .4byte gUnk_03003DC0
_08017628: .4byte gUnk_030059F0
_0801762C: .4byte gLinkState
_08017630: .4byte gLinkEntity
_0801762C: .4byte gPlayerState
_08017630: .4byte gPlayerEntity
_08017634:
bl _call_via_r1
_08017638:
@@ -1085,7 +1085,7 @@ sub_08017640: @ 0x08017640
str r4, [r0]
str r4, [r4]
str r4, [r4, #4]
ldr r0, _08017668 @ =gLinkEntity
ldr r0, _08017668 @ =gPlayerEntity
str r0, [r4, #8]
pop {r4}
pop {r0}
@@ -1093,7 +1093,7 @@ sub_08017640: @ 0x08017640
.align 2, 0
_08017660: .4byte gUnk_03003C70
_08017664: .4byte gUnk_02018EA0
_08017668: .4byte gLinkEntity
_08017668: .4byte gPlayerEntity
thumb_func_start sub_0801766C
sub_0801766C: @ 0x0801766C
@@ -1376,7 +1376,7 @@ sub_08017850: @ 0x08017850
movs r0, #0
b _08017868
_08017860:
ldr r1, _08017870 @ =gLinkEntity
ldr r1, _08017870 @ =gPlayerEntity
adds r0, r4, #0
bl sub_080177A0
_08017868:
@@ -1384,7 +1384,7 @@ _08017868:
pop {r1}
bx r1
.align 2, 0
_08017870: .4byte gLinkEntity
_08017870: .4byte gPlayerEntity
thumb_func_start sub_08017874
sub_08017874: @ 0x08017874
@@ -1570,7 +1570,7 @@ sub_08017940: @ 0x08017940
bl UpdateSpriteForCollisionLayer
_080179CC:
movs r1, #0
ldr r0, _080179E8 @ =gLinkEntity
ldr r0, _080179E8 @ =gPlayerEntity
cmp r5, r0
beq _080179DA
cmp r4, r0
@@ -1585,7 +1585,7 @@ _080179E0:
pop {r0}
bx r0
.align 2, 0
_080179E8: .4byte gLinkEntity
_080179E8: .4byte gPlayerEntity
thumb_func_start sub_080179EC
sub_080179EC: @ 0x080179EC
@@ -1754,7 +1754,7 @@ sub_08017B1C: @ 0x08017B1C
push {lr}
adds r2, r0, #0
adds r3, r1, #0
ldr r0, _08017B38 @ =gLinkState
ldr r0, _08017B38 @ =gPlayerState
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 gLinkState
_08017B38: .4byte gPlayerState
_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 @ =gLinkState
ldr r0, _08017B94 @ =gPlayerState
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 gLinkState
_08017B94: .4byte gPlayerState
_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 @ =gLinkState
ldr r5, _08017C38 @ =gPlayerState
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 gLinkState
_08017C38: .4byte gPlayerState
_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 @ =gLinkState
ldr r6, _08017CB4 @ =gPlayerState
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 gLinkState
_08017CB4: .4byte gPlayerState
_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 @ =gLinkState
ldr r2, _08017D68 @ =gPlayerState
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 gLinkState
_08017D68: .4byte gPlayerState
thumb_func_start sub_08017D6C
sub_08017D6C: @ 0x08017D6C
@@ -2147,7 +2147,7 @@ _08017DFC:
movs r0, #4
_08017DFE:
strb r0, [r1]
ldr r4, _08017E34 @ =gLinkEntity
ldr r4, _08017E34 @ =gPlayerEntity
adds r0, r4, #0
adds r1, r5, #0
bl sub_08017874
@@ -2158,7 +2158,7 @@ _08017DFE:
adds r2, #0x3d
movs r0, #0xf4
strb r0, [r2]
ldr r0, _08017E38 @ =gLinkState
ldr r0, _08017E38 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@@ -2172,8 +2172,8 @@ _08017DFE:
strb r0, [r1]
b _08017E6E
.align 2, 0
_08017E34: .4byte gLinkEntity
_08017E38: .4byte gLinkState
_08017E34: .4byte gPlayerEntity
_08017E38: .4byte gPlayerState
_08017E3C:
adds r0, r5, #0
adds r0, #0x40
@@ -2253,7 +2253,7 @@ sub_08017EB0: @ 0x08017EB0
movs r0, #0
b _08017F36
_08017EC4:
ldr r6, _08017EF8 @ =gLinkEntity
ldr r6, _08017EF8 @ =gPlayerEntity
cmp r2, r6
bne _08017EFC
ldrb r4, [r5]
@@ -2278,7 +2278,7 @@ _08017EC4:
strh r0, [r1]
b _08017F22
.align 2, 0
_08017EF8: .4byte gLinkEntity
_08017EF8: .4byte gPlayerEntity
_08017EFC:
ldrh r1, [r2, #8]
movs r0, #0xa1
@@ -2331,13 +2331,13 @@ sub_08017F40: @ 0x08017F40
ldrb r6, [r0]
cmp r6, #0
bne _0801800A
ldr r0, _08017FAC @ =gLinkEntity
ldr r0, _08017FAC @ =gPlayerEntity
cmp r4, r0
bne _08018002
bl sub_08079F8C
cmp r0, #0
beq _0801801E
ldr r2, _08017FB0 @ =gLinkState
ldr r2, _08017FB0 @ =gPlayerState
ldr r3, [r2, #0x30]
movs r0, #0x80
ands r0, r3
@@ -2377,8 +2377,8 @@ _08017F9A:
bl PositionRelative
b _08017FC2
.align 2, 0
_08017FAC: .4byte gLinkEntity
_08017FB0: .4byte gLinkState
_08017FAC: .4byte gPlayerEntity
_08017FB0: .4byte gPlayerState
_08017FB4:
movs r3, #0x80
lsls r3, r3, #9
@@ -2415,7 +2415,7 @@ _08017FC2:
adds r1, #0x3d
movs r0, #0xf8
strb r0, [r1]
bl ResetLink
bl ResetPlayer
movs r0, #1
b _08018020
_08018002:
@@ -2427,7 +2427,7 @@ _0801800A:
ldrb r0, [r5, #8]
cmp r0, #3
bne _0801801E
ldr r0, _08018028 @ =gLinkEntity
ldr r0, _08018028 @ =gPlayerEntity
cmp r4, r0
bne _0801801E
adds r0, r5, #0
@@ -2440,7 +2440,7 @@ _08018020:
pop {r1}
bx r1
.align 2, 0
_08018028: .4byte gLinkEntity
_08018028: .4byte gPlayerEntity
thumb_func_start sub_0801802C
sub_0801802C: @ 0x0801802C
@@ -2620,13 +2620,13 @@ sub_08018168: @ 0x08018168
ldrb r5, [r0]
cmp r5, #0
bne _08018208
ldr r0, _080181F4 @ =gLinkEntity
ldr r0, _080181F4 @ =gPlayerEntity
cmp r4, r0
bne _08018200
bl sub_08079F8C
cmp r0, #0
beq _0801821C
ldr r2, _080181F8 @ =gLinkState
ldr r2, _080181F8 @ =gPlayerState
ldr r3, [r2, #0x30]
ldr r0, _080181FC @ =0x00040080
ands r0, r3
@@ -2681,8 +2681,8 @@ sub_08018168: @ 0x08018168
movs r0, #1
b _0801821E
.align 2, 0
_080181F4: .4byte gLinkEntity
_080181F8: .4byte gLinkState
_080181F4: .4byte gPlayerEntity
_080181F8: .4byte gPlayerState
_080181FC: .4byte 0x00040080
_08018200:
adds r0, r4, #0
@@ -2693,7 +2693,7 @@ _08018208:
ldrb r0, [r6, #8]
cmp r0, #3
bne _0801821C
ldr r0, _08018224 @ =gLinkEntity
ldr r0, _08018224 @ =gPlayerEntity
cmp r4, r0
bne _0801821C
adds r0, r6, #0
@@ -2706,14 +2706,14 @@ _0801821E:
pop {r1}
bx r1
.align 2, 0
_08018224: .4byte gLinkEntity
_08018224: .4byte gPlayerEntity
thumb_func_start sub_08018228
sub_08018228: @ 0x08018228
push {r4, r5, lr}
adds r4, r0, #0
adds r5, r1, #0
ldr r0, _0801824C @ =gLinkEntity
ldr r0, _0801824C @ =gPlayerEntity
cmp r4, r0
bne _08018244
bl sub_08079F8C
@@ -2728,7 +2728,7 @@ _08018244:
pop {r1}
bx r1
.align 2, 0
_0801824C: .4byte gLinkEntity
_0801824C: .4byte gPlayerEntity
thumb_func_start sub_08018250
sub_08018250: @ 0x08018250
@@ -2766,13 +2766,13 @@ _08018280:
sub_08018288: @ 0x08018288
push {lr}
adds r1, r0, #0
ldr r0, _08018298 @ =gLinkEntity
ldr r0, _08018298 @ =gPlayerEntity
cmp r1, r0
bne _0801829C
bl sub_0807AFE8
b _080182A2
.align 2, 0
_08018298: .4byte gLinkEntity
_08018298: .4byte gPlayerEntity
_0801829C:
adds r1, #0x45
movs r0, #0
@@ -2852,7 +2852,7 @@ sub_08018308: @ 0x08018308
ldrb r0, [r4, #8]
cmp r0, #3
bne _08018338
ldr r0, _0801835C @ =gLinkEntity
ldr r0, _0801835C @ =gPlayerEntity
cmp r6, r0
bne _08018338
adds r0, r4, #0
@@ -2865,7 +2865,7 @@ _08018338:
lsls r0, r0, #3
cmp r1, r0
bne _08018360
ldr r0, _0801835C @ =gLinkEntity
ldr r0, _0801835C @ =gPlayerEntity
ldrb r2, [r0, #0x14]
mov r0, r8
adds r0, #4
@@ -2879,7 +2879,7 @@ _08018338:
movs r0, #0
b _080184F0
.align 2, 0
_0801835C: .4byte gLinkEntity
_0801835C: .4byte gPlayerEntity
_08018360:
cmp r3, #0
bne _08018408
@@ -3074,7 +3074,7 @@ _080184BA:
_080184CE:
cmp r0, #5
bne _080184DA
ldr r0, _080184FC @ =gLinkEntity
ldr r0, _080184FC @ =gPlayerEntity
adds r0, #0x3d
movs r1, #0x80
strb r1, [r0]
@@ -3085,7 +3085,7 @@ _080184DA:
ldrb r0, [r6, #9]
cmp r0, #5
bne _080184EE
ldr r0, _080184FC @ =gLinkEntity
ldr r0, _080184FC @ =gPlayerEntity
adds r0, #0x3d
movs r1, #0x80
strb r1, [r0]
@@ -3098,4 +3098,4 @@ _080184F0:
pop {r1}
bx r1
.align 2, 0
_080184FC: .4byte gLinkEntity
_080184FC: .4byte gPlayerEntity
asm/code_08018500.s
+2 -2
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 @ =gLinkState
ldr r1, _0801864C @ =gPlayerState
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 gLinkState
_0801864C: .4byte gPlayerState
_08018650: .4byte gScreenTransition
_08018654: .4byte gUnk_02033AB8
_08018658:
asm/code_08019444.s
+146 -146
View File
File diff suppressed because it is too large Load Diff
asm/code_0801C85C.s
+5 -5
View File
@@ -16,7 +16,7 @@ sub_0801C85C: @ 0x0801C85C
ands r0, r1
cmp r0, #0
bne _0801C878
ldr r0, _0801C888 @ =gLinkState
ldr r0, _0801C888 @ =gPlayerState
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 gLinkState
_0801C888: .4byte gPlayerState
_0801C88C:
ldrb r0, [r5, #4]
ldr r4, _0801C92C @ =gUnk_02034D30
@@ -37,7 +37,7 @@ _0801C88C:
bls _0801C896
adds r4, #0x40
_0801C896:
ldr r0, _0801C930 @ =gLinkState
ldr r0, _0801C930 @ =gPlayerState
adds r0, #0xa4
movs r1, #0
ldrsh r0, [r0, r1]
@@ -100,7 +100,7 @@ _0801C90C:
ldr r0, _0801C94C @ =gScreen
strh r6, [r0, #0xe]
_0801C910:
ldr r0, _0801C930 @ =gLinkState
ldr r0, _0801C930 @ =gPlayerState
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 gLinkState
_0801C930: .4byte gPlayerState
_0801C934: .4byte 0x0000F016
_0801C938: .4byte 0x0000F416
_0801C93C: .4byte 0x040000D4
asm/code_08049CD4.s
+16 -16
View File
@@ -183,7 +183,7 @@ _08049E14: .4byte gUnk_080D3BE8
thumb_func_start sub_08049E18
sub_08049E18: @ 0x08049E18
push {lr}
ldr r1, _08049E38 @ =gLinkState
ldr r1, _08049E38 @ =gPlayerState
adds r0, r1, #0
adds r0, #0x3c
ldrb r0, [r0]
@@ -195,14 +195,14 @@ sub_08049E18: @ 0x08049E18
cmp r0, #0
bne _08049E48
ldr r1, _08049E40 @ =gUnk_020000B0
ldr r0, _08049E44 @ =gLinkEntity
ldr r0, _08049E44 @ =gPlayerEntity
str r0, [r1]
b _08049E4A
.align 2, 0
_08049E38: .4byte gLinkState
_08049E38: .4byte gPlayerState
_08049E3C: .4byte 0x22189B75
_08049E40: .4byte gUnk_020000B0
_08049E44: .4byte gLinkEntity
_08049E44: .4byte gPlayerEntity
_08049E48:
movs r0, #0
_08049E4A:
@@ -211,7 +211,7 @@ _08049E4A:
thumb_func_start sub_08049E4C
sub_08049E4C: @ 0x08049E4C
push {lr}
ldr r1, _08049E6C @ =gLinkState
ldr r1, _08049E6C @ =gPlayerState
adds r0, r1, #0
adds r0, #0x3c
ldrb r0, [r0]
@@ -223,14 +223,14 @@ sub_08049E4C: @ 0x08049E4C
cmp r0, #0
bne _08049E7C
ldr r1, _08049E74 @ =gUnk_020000B0
ldr r0, _08049E78 @ =gLinkEntity
ldr r0, _08049E78 @ =gPlayerEntity
str r0, [r1]
b _08049E7E
.align 2, 0
_08049E6C: .4byte gLinkState
_08049E6C: .4byte gPlayerState
_08049E70: .4byte 0x22189BF5
_08049E74: .4byte gUnk_020000B0
_08049E78: .4byte gLinkEntity
_08049E78: .4byte gPlayerEntity
_08049E7C:
movs r0, #0
_08049E7E:
@@ -239,7 +239,7 @@ _08049E7E:
thumb_func_start sub_08049E80
sub_08049E80: @ 0x08049E80
push {lr}
ldr r1, _08049E9C @ =gLinkState
ldr r1, _08049E9C @ =gPlayerState
adds r0, r1, #0
adds r0, #0x3c
ldrb r0, [r0]
@@ -254,21 +254,21 @@ _08049E98:
movs r0, #0
b _08049EA6
.align 2, 0
_08049E9C: .4byte gLinkState
_08049E9C: .4byte gPlayerState
_08049EA0:
ldr r1, _08049EA8 @ =gUnk_020000B0
ldr r0, _08049EAC @ =gLinkEntity
ldr r0, _08049EAC @ =gPlayerEntity
str r0, [r1]
_08049EA6:
pop {pc}
.align 2, 0
_08049EA8: .4byte gUnk_020000B0
_08049EAC: .4byte gLinkEntity
_08049EAC: .4byte gPlayerEntity
thumb_func_start sub_08049EB0
sub_08049EB0: @ 0x08049EB0
push {lr}
ldr r1, _08049ED0 @ =gLinkState
ldr r1, _08049ED0 @ =gPlayerState
adds r0, r1, #0
adds r0, #0x3c
ldrb r0, [r0]
@@ -280,14 +280,14 @@ sub_08049EB0: @ 0x08049EB0
cmp r0, #0
bne _08049EE0
ldr r1, _08049ED8 @ =gUnk_020000B0
ldr r0, _08049EDC @ =gLinkEntity
ldr r0, _08049EDC @ =gPlayerEntity
str r0, [r1]
b _08049EE2
.align 2, 0
_08049ED0: .4byte gLinkState
_08049ED0: .4byte gPlayerState
_08049ED4: .4byte 0x00080190
_08049ED8: .4byte gUnk_020000B0
_08049EDC: .4byte gLinkEntity
_08049EDC: .4byte gPlayerEntity
_08049EE0:
movs r0, #0
_08049EE2:
asm/code_08050038.s
+7 -7
View File
@@ -3399,7 +3399,7 @@ _08051C60: .4byte gTextBox
_08051C64: .4byte gUnk_03003DC0
_08051C68: .4byte gRoomControls
_08051C6C:
ldr r0, _08051C80 @ =gLinkState
ldr r0, _08051C80 @ =gPlayerState
movs r1, #0x17
strb r1, [r0, #0xc]
ldr r0, _08051C84 @ =gUnk_03001000
@@ -3408,10 +3408,10 @@ _08051C6C:
bl sub_08051D98
b _08051C9C
.align 2, 0
_08051C80: .4byte gLinkState
_08051C80: .4byte gPlayerState
_08051C84: .4byte gUnk_03001000
_08051C88:
ldr r1, _08051CA0 @ =gLinkState
ldr r1, _08051CA0 @ =gPlayerState
movs r0, #0x17
strb r0, [r1, #0xc]
ldr r1, _08051CA4 @ =gUnk_03001000
@@ -3422,7 +3422,7 @@ _08051C88:
_08051C9C:
pop {pc}
.align 2, 0
_08051CA0: .4byte gLinkState
_08051CA0: .4byte gPlayerState
_08051CA4: .4byte gUnk_03001000
thumb_func_start sub_08051CA8
@@ -3496,7 +3496,7 @@ InitializeEntities: @ 0x08051D40
bl sub_08052EA0
bl sub_0804AF90
bl sub_0804AFDC
bl InitializeLink
bl InitializePlayer
ldr r1, _08051D90 @ =gUnk_03004030
movs r0, #0
str r0, [r1]
@@ -3571,7 +3571,7 @@ sub_08051E04: @ 0x08051E04
bl sub_08052620
cmp r0, #0
beq _08051E60
ldr r1, _08051E2C @ =gLinkEntity
ldr r1, _08051E2C @ =gPlayerEntity
movs r2, #0x2e
ldrsh r0, [r1, r2]
cmp r0, #0
@@ -3589,7 +3589,7 @@ _08051E26:
ldr r3, _08051E30 @ =gUnk_08127F94
b _08051E36
.align 2, 0
_08051E2C: .4byte gLinkEntity
_08051E2C: .4byte gPlayerEntity
_08051E30: .4byte gUnk_08127F94
_08051E34:
adds r3, #8
asm/code_080526F8.s
+22 -22
View File
@@ -298,7 +298,7 @@ sub_0805291C: @ 0x0805291C
ldrb r0, [r0]
cmp r0, #0
beq _080529F4
ldr r0, _08052950 @ =gLinkState
ldr r0, _08052950 @ =gPlayerState
adds r0, #0xa8
ldrb r0, [r0]
cmp r0, #0x12
@@ -312,7 +312,7 @@ sub_0805291C: @ 0x0805291C
.align 2, 0
_08052948: .4byte gScreenTransition
_0805294C: .4byte gUnk_02002A40
_08052950: .4byte gLinkState
_08052950: .4byte gPlayerState
_08052954:
ldrb r0, [r4, #9]
subs r0, #1
@@ -400,7 +400,7 @@ sub_080529F8: @ 0x080529F8
ldrh r0, [r2]
cmp r0, #0
beq _08052A48
ldr r3, _08052A3C @ =gLinkState
ldr r3, _08052A3C @ =gPlayerState
movs r6, #0
movs r0, #0x39
adds r0, r0, r3
@@ -428,7 +428,7 @@ _08052A30:
.align 2, 0
_08052A34: .4byte gScreenTransition
_08052A38: .4byte gUnk_080FCAD6
_08052A3C: .4byte gLinkState
_08052A3C: .4byte gPlayerState
_08052A40:
adds r2, #4
ldrh r0, [r2]
@@ -445,7 +445,7 @@ sub_08052A4C: @ 0x08052A4C
ldr r2, _08052A88 @ =gScreenTransition
movs r0, #1
strb r0, [r2, #8]
ldr r5, _08052A8C @ =gLinkEntity
ldr r5, _08052A8C @ =gPlayerEntity
ldr r3, _08052A90 @ =gRoomControls
ldrh r0, [r5, #0x2e]
ldrh r1, [r3, #6]
@@ -472,7 +472,7 @@ sub_08052A4C: @ 0x08052A4C
pop {r4, r5, pc}
.align 2, 0
_08052A88: .4byte gScreenTransition
_08052A8C: .4byte gLinkEntity
_08052A8C: .4byte gPlayerEntity
_08052A90: .4byte gRoomControls
thumb_func_start sub_08052A94
@@ -552,7 +552,7 @@ sub_08052B24: @ 0x08052B24
ands r0, r1
cmp r0, #0
beq _08052B8A
ldr r2, _08052B94 @ =gLinkState
ldr r2, _08052B94 @ =gPlayerState
adds r0, r2, #0
adds r0, #0x8b
ldrb r0, [r0]
@@ -580,7 +580,7 @@ sub_08052B24: @ 0x08052B24
ldr r0, [r2, #0x2c]
cmp r0, #0
bne _08052B8A
ldr r1, _08052BA0 @ =gLinkEntity
ldr r1, _08052BA0 @ =gPlayerEntity
adds r0, r1, #0
adds r0, #0x7a
ldrh r0, [r0]
@@ -601,10 +601,10 @@ _08052B8A:
b _08052BB4
.align 2, 0
_08052B90: .4byte gUnk_03000FF0
_08052B94: .4byte gLinkState
_08052B94: .4byte gPlayerState
_08052B98: .4byte gUnk_02034490
_08052B9C: .4byte gUnk_0200AF00
_08052BA0: .4byte gLinkEntity
_08052BA0: .4byte gPlayerEntity
_08052BA4:
bl sub_0801862C
movs r0, #0x13
@@ -625,7 +625,7 @@ sub_08052BB8: @ 0x08052BB8
adds r3, r0, #0
cmp r1, #0
bne _08052BEC
ldr r0, _08052BE4 @ =gLinkEntity
ldr r0, _08052BE4 @ =gPlayerEntity
movs r2, #0x32
ldrsh r1, [r0, r2]
ldr r0, _08052BE8 @ =gRoomControls
@@ -639,7 +639,7 @@ sub_08052BB8: @ 0x08052BB8
b _08052BEE
.align 2, 0
_08052BE0: .4byte gScreenTransition
_08052BE4: .4byte gLinkEntity
_08052BE4: .4byte gPlayerEntity
_08052BE8: .4byte gRoomControls
_08052BEC:
ldrb r2, [r2]
@@ -714,7 +714,7 @@ sub_08052C5C: @ 0x08052C5C
cmp r0, #0
beq _08052C84
ldr r2, _08052C7C @ =gScreenTransition
ldr r1, _08052C80 @ =gLinkEntity
ldr r1, _08052C80 @ =gPlayerEntity
ldrh r0, [r1, #0x2e]
strh r0, [r2, #0x20]
ldrh r0, [r1, #0x32]
@@ -722,13 +722,13 @@ sub_08052C5C: @ 0x08052C5C
b _08052C98
.align 2, 0
_08052C7C: .4byte gScreenTransition
_08052C80: .4byte gLinkEntity
_08052C80: .4byte gPlayerEntity
_08052C84:
bl CheckIsDungeon
cmp r0, #0
beq _08052C98
ldr r2, _08052C9C @ =gScreenTransition
ldr r1, _08052CA0 @ =gLinkEntity
ldr r1, _08052CA0 @ =gPlayerEntity
ldrh r0, [r1, #0x2e]
strh r0, [r2, #0x1c]
ldrh r0, [r1, #0x32]
@@ -737,7 +737,7 @@ _08052C98:
pop {pc}
.align 2, 0
_08052C9C: .4byte gScreenTransition
_08052CA0: .4byte gLinkEntity
_08052CA0: .4byte gPlayerEntity
thumb_func_start sub_08052CA4
sub_08052CA4: @ 0x08052CA4
@@ -1418,8 +1418,8 @@ _080531F4: .4byte gUnk_02002AA0
thumb_func_start sub_080531F8
sub_080531F8: @ 0x080531F8
push {r4, r5, lr}
ldr r1, _0805323C @ =gLinkState
ldr r4, _08053240 @ =gLinkEntity
ldr r1, _0805323C @ =gPlayerState
ldr r4, _08053240 @ =gPlayerEntity
ldrh r0, [r4, #0x2e]
strh r0, [r1, #0x16]
ldrh r0, [r4, #0x32]
@@ -1449,8 +1449,8 @@ sub_080531F8: @ 0x080531F8
_08053238:
pop {r4, r5, pc}
.align 2, 0
_0805323C: .4byte gLinkState
_08053240: .4byte gLinkEntity
_0805323C: .4byte gPlayerState
_08053240: .4byte gPlayerEntity
_08053244: .4byte gUnk_030010AC
_08053248: .4byte gUnk_02002AC8
_0805324C: .4byte gRoomControls
@@ -1461,7 +1461,7 @@ sub_08053250: @ 0x08053250
ldr r0, _0805328C @ =gScreenTransition
movs r1, #0
strb r1, [r0, #0xf]
ldr r3, _08053290 @ =gLinkEntity
ldr r3, _08053290 @ =gPlayerEntity
ldr r4, _08053294 @ =gRoomControls
ldrh r1, [r3, #0x2e]
ldrh r2, [r4, #6]
@@ -1487,7 +1487,7 @@ sub_08053250: @ 0x08053250
pop {r4, pc}
.align 2, 0
_0805328C: .4byte gScreenTransition
_08053290: .4byte gLinkEntity
_08053290: .4byte gPlayerEntity
_08053294: .4byte gRoomControls
_08053298: .4byte gUnk_02002AC8
asm/code_0805436C.s
+7 -7
View File
@@ -252,7 +252,7 @@ sub_08054A60: @ 0x08054A60
subs r1, #1
movs r0, #0x80
strb r0, [r1]
ldr r0, _08054AC4 @ =gLinkEntity
ldr r0, _08054AC4 @ =gPlayerEntity
ldrb r1, [r0, #0x14]
movs r0, #0xe
ands r0, r1
@@ -273,13 +273,13 @@ _08054AAC:
bl sub_08054AC8
pop {r4, pc}
.align 2, 0
_08054AC4: .4byte gLinkEntity
_08054AC4: .4byte gPlayerEntity
thumb_func_start sub_08054AC8
sub_08054AC8: @ 0x08054AC8
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
ldr r5, _08054B14 @ =gLinkEntity
ldr r5, _08054B14 @ =gPlayerEntity
ldrb r1, [r5, #0x14]
movs r0, #0xe
ands r0, r1
@@ -317,7 +317,7 @@ _08054B06:
strb r0, [r4, #0x10]
b _08054B68
.align 2, 0
_08054B14: .4byte gLinkEntity
_08054B14: .4byte gPlayerEntity
_08054B18: .4byte gUnk_080FEEB0
_08054B1C:
ldrb r0, [r4, #0x10]
@@ -366,7 +366,7 @@ _08054B68:
ldrb r0, [r4, #0x1e]
cmp r0, #0xff
beq _08054BE8
ldr r0, _08054BF4 @ =gLinkEntity
ldr r0, _08054BF4 @ =gPlayerEntity
ldrb r0, [r0, #0x18]
lsls r0, r0, #0x1e
cmp r0, #0
@@ -421,12 +421,12 @@ _08054B68:
adds r0, #0x63
strb r1, [r0]
_08054BE8:
ldr r1, _08054BF4 @ =gLinkEntity
ldr r1, _08054BF4 @ =gPlayerEntity
adds r0, r4, #0
bl sub_08078E84
b _08054C00
.align 2, 0
_08054BF4: .4byte gLinkEntity
_08054BF4: .4byte gPlayerEntity
_08054BF8: .4byte gUnk_080FEEB0
_08054BFC:
bl DeleteThisEntity
asm/code_0805E3B0.s
+6 -6
View File
@@ -252,7 +252,7 @@ sub_0805E544: @ 0x0805E544
movs r3, #6
movs r0, #6
strb r0, [r1]
ldr r2, _0805E560 @ =gLinkEntity
ldr r2, _0805E560 @ =gPlayerEntity
ldrb r1, [r2, #0x11]
subs r0, #0x16
ands r0, r1
@@ -261,14 +261,14 @@ sub_0805E544: @ 0x0805E544
bx lr
.align 2, 0
_0805E55C: .4byte gUnk_03003DC0
_0805E560: .4byte gLinkEntity
_0805E560: .4byte gPlayerEntity
thumb_func_start UnfreezeTime
UnfreezeTime: @ 0x0805E564
ldr r1, _0805E57C @ =gUnk_03003DC0
movs r0, #0
strb r0, [r1]
ldr r2, _0805E580 @ =gLinkEntity
ldr r2, _0805E580 @ =gPlayerEntity
ldrb r1, [r2, #0x11]
subs r0, #0x10
ands r0, r1
@@ -278,7 +278,7 @@ UnfreezeTime: @ 0x0805E564
bx lr
.align 2, 0
_0805E57C: .4byte gUnk_03003DC0
_0805E580: .4byte gLinkEntity
_0805E580: .4byte gPlayerEntity
thumb_func_start sub_0805E584
sub_0805E584: @ 0x0805E584
@@ -361,7 +361,7 @@ EraseAllEntities: @ 0x0805E60C
ldr r0, _0805E654 @ =gUnk_03003DC0
movs r1, #0xc
bl _DmaZero
ldr r0, _0805E658 @ =gLinkEntity
ldr r0, _0805E658 @ =gPlayerEntity
movs r1, #0xaa
lsls r1, r1, #6
bl _DmaZero
@@ -389,7 +389,7 @@ EraseAllEntities: @ 0x0805E60C
pop {pc}
.align 2, 0
_0805E654: .4byte gUnk_03003DC0
_0805E658: .4byte gLinkEntity
_0805E658: .4byte gPlayerEntity
_0805E65C: .4byte gUnk_02033290
_0805E660: .4byte gUnk_03003DBC
_0805E664: .4byte gUnk_020354B4
asm/code_0805EC04.s
+10 -10
View File
@@ -152,7 +152,7 @@ _0805ED10: .4byte 0x00000427
thumb_func_start sub_0805ED14
sub_0805ED14: @ 0x0805ED14
ldr r2, _0805ED2C @ =gLinkState
ldr r2, _0805ED2C @ =gPlayerState
adds r1, r2, #0
adds r1, #0x9c
str r0, [r1]
@@ -164,12 +164,12 @@ sub_0805ED14: @ 0x0805ED14
strh r1, [r0]
bx lr
.align 2, 0
_0805ED2C: .4byte gLinkState
_0805ED2C: .4byte gPlayerState
thumb_func_start sub_0805ED30
sub_0805ED30: @ 0x0805ED30
push {r4, lr}
ldr r2, _0805ED50 @ =gLinkState
ldr r2, _0805ED50 @ =gPlayerState
adds r0, r2, #0
adds r0, #0x9c
ldr r0, [r0]
@@ -185,7 +185,7 @@ sub_0805ED30: @ 0x0805ED30
movs r4, #0
b _0805ED62
.align 2, 0
_0805ED50: .4byte gLinkState
_0805ED50: .4byte gPlayerState
_0805ED54:
cmp r0, #2
beq _0805ED5E
@@ -258,7 +258,7 @@ _0805EDC6:
_0805EDCA:
adds r0, r1, #0
bl sub_0805EE04
ldr r3, _0805EDFC @ =gLinkState
ldr r3, _0805EDFC @ =gPlayerState
adds r1, r3, #0
adds r1, #0x90
ldrh r2, [r1]
@@ -279,7 +279,7 @@ _0805EDCA:
pop {r4, pc}
.align 2, 0
_0805EDF8: .4byte gUnk_03000FF0
_0805EDFC: .4byte gLinkState
_0805EDFC: .4byte gPlayerState
_0805EE00: .4byte gUnk_08109202
thumb_func_start sub_0805EE04
@@ -2110,7 +2110,7 @@ _0805FBE4: .4byte gUnk_08109AC8
sub_0805FBE8: @ 0x0805FBE8
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _0805FC68 @ =gLinkEntity
ldr r4, _0805FC68 @ =gPlayerEntity
adds r0, r4, #0
adds r1, r5, #0
bl CopyPosition
@@ -2167,7 +2167,7 @@ _0805FC36:
bl PlaySFX
pop {r4, r5, pc}
.align 2, 0
_0805FC68: .4byte gLinkEntity
_0805FC68: .4byte gPlayerEntity
_0805FC6C: .4byte gUnk_08109AD0
_0805FC70: .4byte 0x0000013F
@@ -2211,7 +2211,7 @@ _0805FCA4:
ands r1, r3
lsls r1, r1, #6
orrs r0, r1
ldr r1, _0805FD14 @ =gLinkEntity
ldr r1, _0805FD14 @ =gPlayerEntity
adds r1, #0x38
ldrb r1, [r1]
movs r2, #0x80
@@ -2246,7 +2246,7 @@ _0805FCF6:
b _0805FD20
.align 2, 0
_0805FD10: .4byte gRoomControls
_0805FD14: .4byte gLinkEntity
_0805FD14: .4byte gPlayerEntity
_0805FD18: .4byte gUnk_08003E44
_0805FD1C:
bl DeleteThisEntity
asm/code_0806ED78.s
+29 -29
View File
@@ -13,7 +13,7 @@ sub_0806ED78: @ 0x0806ED78
adds r4, r0, #0
cmp r4, #0
beq _0806ED94
ldr r0, _0806ED98 @ =gLinkState
ldr r0, _0806ED98 @ =gPlayerState
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 gLinkState
_0806ED98: .4byte gPlayerState
thumb_func_start sub_0806ED9C
sub_0806ED9C: @ 0x0806ED9C
@@ -34,7 +34,7 @@ sub_0806ED9C: @ 0x0806ED9C
adds r3, r2, #0
movs r6, #1
rsbs r6, r6, #0
ldr r1, _0806EDC0 @ =gLinkEntity
ldr r1, _0806EDC0 @ =gPlayerEntity
adds r2, r4, #0
bl sub_080041A0
cmp r0, #0
@@ -46,17 +46,17 @@ _0806EDBC:
adds r0, r6, #0
pop {r4, r5, r6, pc}
.align 2, 0
_0806EDC0: .4byte gLinkEntity
_0806EDC0: .4byte gPlayerEntity
thumb_func_start GetAnimationState
GetAnimationState: @ 0x0806EDC4
push {lr}
ldr r1, _0806EDD4 @ =gLinkEntity
ldr r1, _0806EDD4 @ =gPlayerEntity
bl GetFacingDirection
bl sub_0806F5A4
pop {pc}
.align 2, 0
_0806EDD4: .4byte gLinkEntity
_0806EDD4: .4byte gPlayerEntity
thumb_func_start sub_0806EDD8
sub_0806EDD8: @ 0x0806EDD8
@@ -66,7 +66,7 @@ sub_0806EDD8: @ 0x0806EDD8
adds r3, r2, #0
movs r7, #1
rsbs r7, r7, #0
ldr r6, _0806EE00 @ =gLinkEntity
ldr r6, _0806EE00 @ =gPlayerEntity
adds r1, r6, #0
adds r2, r4, #0
bl sub_080041A0
@@ -80,7 +80,7 @@ _0806EDFC:
adds r0, r7, #0
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0806EE00: .4byte gLinkEntity
_0806EE00: .4byte gPlayerEntity
thumb_func_start sub_0806EE04
sub_0806EE04: @ 0x0806EE04
@@ -127,7 +127,7 @@ _0806EE4C:
adds r1, #0x46
movs r0, #8
strh r0, [r1]
ldr r1, _0806EE6C @ =gLinkEntity
ldr r1, _0806EE6C @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
bl sub_0806F5A4
@@ -139,7 +139,7 @@ _0806EE66:
_0806EE68:
pop {r4, pc}
.align 2, 0
_0806EE6C: .4byte gLinkEntity
_0806EE6C: .4byte gPlayerEntity
thumb_func_start sub_0806EE70
sub_0806EE70: @ 0x0806EE70
@@ -548,14 +548,14 @@ sub_0806F118: @ 0x0806F118
ldrh r3, [r0, #4]
adds r0, r4, #0
bl sub_0801DFB4
ldr r0, _0806F144 @ =gLinkState
ldr r0, _0806F144 @ =gPlayerState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
pop {r4, pc}
.align 2, 0
_0806F140: .4byte gUnk_08001A7C
_0806F144: .4byte gLinkState
_0806F144: .4byte gPlayerState
thumb_func_start UpdateFuseInteraction
UpdateFuseInteraction: @ 0x0806F148
@@ -574,14 +574,14 @@ UpdateFuseInteraction: @ 0x0806F148
.align 2, 0
_0806F164: .4byte gUnk_02022740
_0806F168:
ldr r0, _0806F184 @ =gLinkState
ldr r0, _0806F184 @ =gPlayerState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
movs r4, #1
_0806F172:
bl sub_0807919C
ldr r0, _0806F184 @ =gLinkState
ldr r0, _0806F184 @ =gPlayerState
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 gLinkState
_0806F184: .4byte gPlayerState
thumb_func_start sub_0806F188
sub_0806F188: @ 0x0806F188
@@ -801,7 +801,7 @@ _0806F332:
movs r0, #0
b _0806F34E
_0806F336:
ldr r0, _0806F348 @ =gLinkState
ldr r0, _0806F348 @ =gPlayerState
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 gLinkState
_0806F348: .4byte gPlayerState
_0806F34C:
ldrh r0, [r6, #4]
_0806F34E:
@@ -863,7 +863,7 @@ _0806F398: .4byte gArea
sub_0806F39C: @ 0x0806F39C
push {r4, lr}
adds r3, r0, #0
ldr r2, _0806F3B8 @ =gLinkEntity
ldr r2, _0806F3B8 @ =gPlayerEntity
ldrb r1, [r2, #0x14]
movs r0, #2
ands r0, r1
@@ -876,7 +876,7 @@ sub_0806F39C: @ 0x0806F39C
ldrsh r0, [r4, r2]
b _0806F3C4
.align 2, 0
_0806F3B8: .4byte gLinkEntity
_0806F3B8: .4byte gPlayerEntity
_0806F3BC:
movs r0, #0x32
ldrsh r1, [r3, r0]
@@ -907,7 +907,7 @@ sub_0806F3E4: @ 0x0806F3E4
push {r4, r5, r6, lr}
sub sp, #0x88
adds r5, r0, #0
ldr r2, _0806F408 @ =gLinkState
ldr r2, _0806F408 @ =gPlayerState
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 gLinkState
_0806F408: .4byte gPlayerState
_0806F40C:
cmp r0, #3
beq _0806F42A
@@ -959,7 +959,7 @@ _0806F436:
bls _0806F444
strh r1, [r2]
_0806F444:
ldr r6, _0806F4BC @ =gLinkEntity
ldr r6, _0806F4BC @ =gPlayerEntity
ldrb r0, [r6, #0x14]
movs r1, #0xe
ands r1, r0
@@ -999,7 +999,7 @@ _0806F444:
movs r0, #3
strb r0, [r5, #0xd]
str r5, [r6, #0x70]
ldr r1, _0806F4C4 @ =gLinkState
ldr r1, _0806F4C4 @ =gPlayerState
movs r0, #7
strb r0, [r1, #0x1c]
movs r0, #0x11
@@ -1016,13 +1016,13 @@ _0806F4B4:
bl PlaySFX
b _0806F4D8
.align 2, 0
_0806F4BC: .4byte gLinkEntity
_0806F4BC: .4byte gPlayerEntity
_0806F4C0: .4byte gUnk_08126EE4
_0806F4C4: .4byte gLinkState
_0806F4C4: .4byte gPlayerState
_0806F4C8:
cmp r1, #1
bne _0806F4D8
ldr r0, _0806F4DC @ =gLinkState
ldr r0, _0806F4DC @ =gPlayerState
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 gLinkState
_0806F4DC: .4byte gPlayerState
_0806F4E0:
movs r0, #0
_0806F4E2:
@@ -1657,7 +1657,7 @@ _0806F944:
sub_0806F948: @ 0x0806F948
push {r4, lr}
adds r4, r0, #0
ldr r1, _0806F974 @ =gLinkState
ldr r1, _0806F974 @ =gPlayerState
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 gLinkState
_0806F974: .4byte gPlayerState
_0806F978:
movs r2, #0
cmp r3, #4
asm/code_0806FA6C.s
+20 -20
View File
@@ -110,7 +110,7 @@ sub_0806FBB4: @ 0x0806FBB4
ldrb r0, [r0, #5]
cmp r0, #0
bne _0806FBC8
ldr r0, _0806FBD4 @ =gLinkState
ldr r0, _0806FBD4 @ =gPlayerState
ldrb r0, [r0, #5]
cmp r0, #0
bne _0806FBCC
@@ -121,7 +121,7 @@ _0806FBCC:
pop {pc}
.align 2, 0
_0806FBD0: .4byte gScreenTransition
_0806FBD4: .4byte gLinkState
_0806FBD4: .4byte gPlayerState
thumb_func_start sub_0806FBD8
sub_0806FBD8: @ 0x0806FBD8
@@ -148,7 +148,7 @@ sub_0806FBEC: @ 0x0806FBEC
sub_0806FBFC: @ 0x0806FBFC
push {r4, r5, r6, lr}
adds r5, r3, #0
ldr r4, _0806FC20 @ =gLinkEntity
ldr r4, _0806FC20 @ =gPlayerEntity
movs r6, #0x2e
ldrsh r3, [r4, r6]
subs r3, r3, r0
@@ -165,7 +165,7 @@ _0806FC1A:
adds r0, r1, #0
pop {r4, r5, r6, pc}
.align 2, 0
_0806FC20: .4byte gLinkEntity
_0806FC20: .4byte gPlayerEntity
thumb_func_start sub_0806FC24
sub_0806FC24: @ 0x0806FC24
@@ -353,7 +353,7 @@ sub_0806FD3C: @ 0x0806FD3C
sub_0806FD54: @ 0x0806FD54
push {r4, lr}
adds r3, r0, #0
ldr r0, _0806FD6C @ =gLinkState
ldr r0, _0806FD6C @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
lsls r1, r1, #0x10
@@ -363,9 +363,9 @@ sub_0806FD54: @ 0x0806FD54
movs r0, #0
b _0806FD84
.align 2, 0
_0806FD6C: .4byte gLinkState
_0806FD6C: .4byte gPlayerState
_0806FD70:
ldr r0, _0806FD88 @ =gLinkEntity
ldr r0, _0806FD88 @ =gPlayerEntity
movs r2, #0x2e
ldrsh r1, [r0, r2]
movs r4, #0x32
@@ -377,7 +377,7 @@ _0806FD70:
_0806FD84:
pop {r4, pc}
.align 2, 0
_0806FD88: .4byte gLinkEntity
_0806FD88: .4byte gPlayerEntity
thumb_func_start sub_0806FD8C
sub_0806FD8C: @ 0x0806FD8C
@@ -885,7 +885,7 @@ sub_08070100: @ 0x08070100
movs r0, #0xf0
lsls r0, r0, #1
str r0, [r5, #0x78]
ldr r2, _0807017C @ =gLinkEntity
ldr r2, _0807017C @ =gPlayerEntity
ldr r1, _08070180 @ =gUnk_0811B9A0
ldrb r0, [r5, #0x14]
adds r0, r0, r1
@@ -921,7 +921,7 @@ sub_08070100: @ 0x08070100
strb r3, [r5, #0xa]
b _0807018C
.align 2, 0
_0807017C: .4byte gLinkEntity
_0807017C: .4byte gPlayerEntity
_08070180: .4byte gUnk_0811B9A0
_08070184: .4byte gUnk_0811B9D0
_08070188:
@@ -1062,7 +1062,7 @@ _08070280:
ands r1, r6
lsls r1, r1, #6
orrs r0, r1
ldr r1, _08070358 @ =gLinkEntity
ldr r1, _08070358 @ =gPlayerEntity
adds r1, #0x38
ldrb r1, [r1]
movs r2, #0x80
@@ -1148,7 +1148,7 @@ _08070280:
b _0807037A
.align 2, 0
_08070354: .4byte gRoomControls
_08070358: .4byte gLinkEntity
_08070358: .4byte gPlayerEntity
_0807035C: .4byte gUnk_08003E44
_08070360: .4byte 0x00004020
_08070364:
@@ -1368,13 +1368,13 @@ sub_080704D4: @ 0x080704D4
sub_080704FC: @ 0x080704FC
push {r4, r5, lr}
adds r4, r0, #0
ldr r5, _0807052C @ =gLinkEntity
ldr r5, _0807052C @ =gPlayerEntity
adds r0, r5, #0
adds r0, #0x5a
ldrb r2, [r0]
movs r0, #0x80
ands r0, r2
ldr r1, _08070530 @ =gLinkState
ldr r1, _08070530 @ =gPlayerState
cmp r0, #0
bne _08070518
ldr r0, [r1, #0x2c]
@@ -1391,8 +1391,8 @@ _08070522:
bl DeleteEntity
b _08070566
.align 2, 0
_0807052C: .4byte gLinkEntity
_08070530: .4byte gLinkState
_0807052C: .4byte gPlayerEntity
_08070530: .4byte gPlayerState
_08070534:
movs r0, #0xf
ands r0, r2
@@ -1420,7 +1420,7 @@ _08070562:
movs r0, #0xff
strb r0, [r4, #0x1e]
_08070566:
ldr r2, _08070580 @ =gLinkEntity
ldr r2, _08070580 @ =gPlayerEntity
ldrb r1, [r2, #0x14]
movs r0, #2
ands r0, r1
@@ -1433,7 +1433,7 @@ _08070566:
eors r2, r0
b _0807058A
.align 2, 0
_08070580: .4byte gLinkEntity
_08070580: .4byte gPlayerEntity
_08070584:
ldrb r0, [r2, #0x18]
lsls r0, r0, #0x19
@@ -1493,7 +1493,7 @@ sub_080705AC: @ 0x080705AC
ldrb r0, [r0]
cmp r0, #0
beq _08070674
ldr r1, _08070628 @ =gLinkState
ldr r1, _08070628 @ =gPlayerState
adds r0, r1, #0
adds r0, #0x8b
ldrb r0, [r0]
@@ -1518,7 +1518,7 @@ _08070618: .4byte gUnk_03000FD0
_0807061C: .4byte gUnk_02034490
_08070620: .4byte gTextBox
_08070624: .4byte gUnk_02002A40
_08070628: .4byte gLinkState
_08070628: .4byte gPlayerState
_0807062C: .4byte gUnk_03003DC0
_08070630:
ldrb r0, [r2]
asm/code_08070698.s
+262 -262
View File
File diff suppressed because it is too large Load Diff
asm/code_080732D0.s
+376 -376
View File
File diff suppressed because it is too large Load Diff
asm/code_08076C80.s
+97 -97
View File
@@ -13,12 +13,12 @@ sub_08076DF4: @ 0x08076DF4
push {r7}
adds r4, r0, #0
adds r7, r1, #0
ldr r0, _08076E48 @ =gLinkEntity
ldr r0, _08076E48 @ =gPlayerEntity
mov r8, r0
bl sub_0807A894
cmp r0, #0x29
beq _08076E50
ldr r6, _08076E4C @ =gLinkState
ldr r6, _08076E4C @ =gPlayerState
ldrb r0, [r6, #0x12]
cmp r0, #0x12
beq _08076E50
@@ -48,8 +48,8 @@ sub_08076DF4: @ 0x08076DF4
bl sub_08077BB8
b _08076E58
.align 2, 0
_08076E48: .4byte gLinkEntity
_08076E4C: .4byte gLinkState
_08076E48: .4byte gPlayerEntity
_08076E4C: .4byte gPlayerState
_08076E50:
adds r0, r4, #0
adds r1, r7, #0
@@ -65,7 +65,7 @@ sub_08076E60: @ 0x08076E60
push {r4, r5, r6, lr}
adds r4, r0, #0
adds r6, r1, #0
ldr r5, _08076EB4 @ =gLinkState
ldr r5, _08076EB4 @ =gPlayerState
ldrb r1, [r5, #0x1c]
movs r0, #0xf
ands r0, r1
@@ -98,13 +98,13 @@ _08076E7A:
adds r1, r0, #0
cmp r1, #0
beq _08076EC6
ldr r0, _08076EBC @ =gLinkEntity
ldr r0, _08076EBC @ =gPlayerEntity
str r0, [r1, #0x50]
b _08076EC6
.align 2, 0
_08076EB4: .4byte gLinkState
_08076EB4: .4byte gPlayerState
_08076EB8: .4byte 0x00000504
_08076EBC: .4byte gLinkEntity
_08076EBC: .4byte gPlayerEntity
_08076EC0:
adds r0, r4, #0
bl UpdateItemAnim
@@ -116,7 +116,7 @@ sub_08076EC8: @ 0x08076EC8
push {r4, r5, r6, lr}
adds r4, r0, #0
adds r6, r1, #0
ldr r5, _08076EE4 @ =gLinkState
ldr r5, _08076EE4 @ =gPlayerState
ldrb r1, [r5, #0x1c]
movs r0, #0xf
ands r0, r1
@@ -127,7 +127,7 @@ sub_08076EC8: @ 0x08076EC8
bl sub_08077E78
b _08076F60
.align 2, 0
_08076EE4: .4byte gLinkState
_08076EE4: .4byte gPlayerState
_08076EE8:
adds r0, r4, #0
bl sub_08077EFC
@@ -151,17 +151,17 @@ _08076F0C:
movs r0, #1
_08076F0E:
strb r0, [r5, #0x1d]
ldr r0, _08076F1C @ =gLinkEntity
ldr r0, _08076F1C @ =gPlayerEntity
ldrb r0, [r0, #0xd]
cmp r0, #0x1b
bne _08076F24
ldr r1, _08076F20 @ =0x00000524
b _08076F36
.align 2, 0
_08076F1C: .4byte gLinkEntity
_08076F1C: .4byte gPlayerEntity
_08076F20: .4byte 0x00000524
_08076F24:
ldr r0, _08076F44 @ =gLinkState
ldr r0, _08076F44 @ =gPlayerState
ldrb r1, [r0, #0xd]
movs r0, #0x80
ands r0, r1
@@ -178,7 +178,7 @@ _08076F36:
bl sub_08077DF4
b _08076F60
.align 2, 0
_08076F44: .4byte gLinkState
_08076F44: .4byte gPlayerState
_08076F48:
adds r0, r4, #0
bl UpdateItemAnim
@@ -201,7 +201,7 @@ sub_08076F64: @ 0x08076F64
push {r4, r5, r6, lr}
adds r4, r0, #0
adds r6, r1, #0
ldr r1, _08076F84 @ =gLinkState
ldr r1, _08076F84 @ =gPlayerState
ldrb r0, [r1, #0x1c]
movs r2, #0xf
ands r2, r0
@@ -216,7 +216,7 @@ _08076F7A:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08076F84: .4byte gLinkState
_08076F84: .4byte gPlayerState
_08076F88: .4byte _08076F8C
_08076F8C: @ jump table
.4byte _08077100 @ case 0
@@ -242,7 +242,7 @@ _08076FAC:
strb r0, [r4, #7]
movs r1, #1
strb r1, [r3, #0x1d]
ldr r5, _08076FFC @ =gLinkEntity
ldr r5, _08076FFC @ =gPlayerEntity
str r0, [r5, #0x74]
strb r1, [r3, #0x1c]
movs r1, #8
@@ -267,7 +267,7 @@ _08076FF6:
str r5, [r0, #0x50]
b _08077110
.align 2, 0
_08076FFC: .4byte gLinkEntity
_08076FFC: .4byte gPlayerEntity
_08077000: .4byte 0x00000504
_08077004:
movs r0, #6
@@ -285,13 +285,13 @@ _0807700E:
_0807701C:
adds r0, r4, #0
bl UpdateItemAnim
ldr r0, _08077044 @ =gLinkState
ldr r0, _08077044 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #2
ands r0, r1
cmp r0, #0
bne _08077110
ldr r0, _08077048 @ =gLinkEntity
ldr r0, _08077048 @ =gPlayerEntity
ldrb r1, [r0, #0x14]
lsls r1, r1, #2
movs r2, #0x10
@@ -301,10 +301,10 @@ _0807701C:
bl sub_08079E08
b _08077110
.align 2, 0
_08077044: .4byte gLinkState
_08077048: .4byte gLinkEntity
_08077044: .4byte gPlayerState
_08077048: .4byte gPlayerEntity
_0807704C:
ldr r1, _080770B0 @ =gLinkState
ldr r1, _080770B0 @ =gPlayerState
movs r0, #4
strb r0, [r1, #0x1c]
_08077052:
@@ -322,11 +322,11 @@ _08077060:
ands r0, r1
cmp r0, #0
beq _0807708C
ldr r1, _080770B0 @ =gLinkState
ldr r1, _080770B0 @ =gPlayerState
movs r2, #0
movs r0, #5
strb r0, [r1, #0x1c]
ldr r0, _080770B4 @ =gLinkEntity
ldr r0, _080770B4 @ =gPlayerEntity
str r2, [r0, #0x70]
ldrb r0, [r1, #0x1d]
cmp r0, #0
@@ -336,13 +336,13 @@ _08077060:
movs r3, #0
bl CreatePlayerItem
_0807708C:
ldr r0, _080770B0 @ =gLinkState
ldr r0, _080770B0 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #2
ands r0, r1
cmp r0, #0
bne _08077110
ldr r2, _080770B4 @ =gLinkEntity
ldr r2, _080770B4 @ =gPlayerEntity
ldrb r0, [r2, #0x14]
lsls r0, r0, #2
movs r1, #0x10
@@ -353,8 +353,8 @@ _0807708C:
bl sub_08079E08
b _08077110
.align 2, 0
_080770B0: .4byte gLinkState
_080770B4: .4byte gLinkEntity
_080770B0: .4byte gPlayerState
_080770B4: .4byte gPlayerEntity
_080770B8:
adds r0, r4, #0
bl UpdateItemAnim
@@ -363,15 +363,15 @@ _080770B8:
ands r0, r1
cmp r0, #0
beq _08077110
ldr r3, _080770CC @ =gLinkState
ldr r3, _080770CC @ =gPlayerState
b _08077100
.align 2, 0
_080770CC: .4byte gLinkState
_080770CC: .4byte gPlayerState
_080770D0:
ldr r1, _080770E4 @ =0x00000514
adds r0, r4, #0
bl sub_08077DF4
ldr r1, _080770E8 @ =gLinkState
ldr r1, _080770E8 @ =gPlayerState
movs r2, #0
movs r0, #3
strb r0, [r1, #0x1c]
@@ -379,7 +379,7 @@ _080770D0:
b _08077110
.align 2, 0
_080770E4: .4byte 0x00000514
_080770E8: .4byte gLinkState
_080770E8: .4byte gPlayerState
_080770EC:
movs r0, #3
strb r0, [r3, #0x1c]
@@ -393,7 +393,7 @@ _080770FC: .4byte 0x00000514
_08077100:
movs r1, #0
strb r1, [r3, #0x1c]
ldr r0, _08077114 @ =gLinkEntity
ldr r0, _08077114 @ =gPlayerEntity
str r1, [r0, #0x70]
adds r0, r4, #0
adds r1, r6, #0
@@ -401,7 +401,7 @@ _08077100:
_08077110:
pop {r4, r5, r6, pc}
.align 2, 0
_08077114: .4byte gLinkEntity
_08077114: .4byte gPlayerEntity
thumb_func_start MoleMitts
MoleMitts: @ 0x08077118
@@ -420,7 +420,7 @@ _0807712C: .4byte gUnk_0811BE04
sub_08077130: @ 0x08077130
push {r4, r5, r6, lr}
adds r4, r0, #0
ldr r5, _0807718C @ =gLinkState
ldr r5, _0807718C @ =gPlayerState
ldrb r0, [r5, #2]
cmp r0, #0
bne _080771B6
@@ -448,7 +448,7 @@ sub_08077130: @ 0x08077130
strb r0, [r4, #4]
cmp r5, #0x56
bne _080771C4
ldr r2, _08077194 @ =gLinkEntity
ldr r2, _08077194 @ =gPlayerEntity
ldrb r1, [r2, #0x14]
ands r0, r1
cmp r0, #0
@@ -462,9 +462,9 @@ sub_08077130: @ 0x08077130
strh r1, [r2, #0x32]
b _080771C4
.align 2, 0
_0807718C: .4byte gLinkState
_0807718C: .4byte gPlayerState
_08077190: .4byte 0x0000050C
_08077194: .4byte gLinkEntity
_08077194: .4byte gPlayerEntity
_08077198:
ldrh r0, [r2, #0x2e]
movs r1, #0x10
@@ -506,13 +506,13 @@ sub_080771C8: @ 0x080771C8
adds r0, r4, #0
adds r1, r5, #0
bl sub_08077E78
ldr r0, _080771F0 @ =gLinkState
ldr r0, _080771F0 @ =gPlayerState
adds r0, #0x3d
movs r1, #0
strb r1, [r0]
b _080772A4
.align 2, 0
_080771F0: .4byte gLinkState
_080771F0: .4byte gPlayerState
_080771F4:
movs r0, #0x20
ands r0, r1
@@ -521,7 +521,7 @@ _080771F4:
ldrb r0, [r4, #8]
cmp r0, #0xff
bne _0807720E
ldr r0, _08077240 @ =gLinkEntity
ldr r0, _08077240 @ =gPlayerEntity
ldrb r2, [r4, #0xe]
movs r1, #0x1e
movs r3, #1
@@ -532,7 +532,7 @@ _0807720E:
ands r0, r1
cmp r0, #0
beq _080772A4
ldr r5, _08077240 @ =gLinkEntity
ldr r5, _08077240 @ =gPlayerEntity
adds r0, r5, #0
movs r1, #0xd
adds r2, r4, #0
@@ -549,7 +549,7 @@ _0807720E:
bl PlaySFX
b _080772A4
.align 2, 0
_08077240: .4byte gLinkEntity
_08077240: .4byte gPlayerEntity
_08077244: .4byte 0x00000107
_08077248:
ldrb r0, [r4, #8]
@@ -632,7 +632,7 @@ _080772C6:
adds r0, r4, #0
movs r1, #2
bl sub_08077E3C
ldr r3, _080772F8 @ =gLinkEntity
ldr r3, _080772F8 @ =gPlayerEntity
ldr r2, _080772FC @ =gUnk_0811BE16
ldrb r1, [r4, #0xe]
adds r0, r5, #0
@@ -643,23 +643,23 @@ _080772C6:
lsls r0, r0, #1
b _0807732E
.align 2, 0
_080772F8: .4byte gLinkEntity
_080772F8: .4byte gPlayerEntity
_080772FC: .4byte gUnk_0811BE16
_08077300:
adds r0, r4, #0
bl UpdateItemAnim
ldr r3, _08077310 @ =gLinkEntity
ldr r3, _08077310 @ =gPlayerEntity
ldr r2, _08077314 @ =gUnk_0811BE16
ldrb r1, [r4, #0xe]
adds r0, r5, #0
b _08077326
.align 2, 0
_08077310: .4byte gLinkEntity
_08077310: .4byte gPlayerEntity
_08077314: .4byte gUnk_0811BE16
_08077318:
adds r0, r4, #0
bl UpdateItemAnim
ldr r3, _0807736C @ =gLinkEntity
ldr r3, _0807736C @ =gPlayerEntity
ldr r2, _08077370 @ =gUnk_0811BE16
ldrb r1, [r4, #0xe]
movs r0, #7
@@ -670,7 +670,7 @@ _08077326:
ldrh r0, [r0]
_0807732E:
strh r0, [r3, #0x24]
ldr r5, _0807736C @ =gLinkEntity
ldr r5, _0807736C @ =gPlayerEntity
ldrb r0, [r5, #0x14]
lsls r0, r0, #2
strb r0, [r5, #0x15]
@@ -699,19 +699,19 @@ _08077344:
strb r0, [r4, #7]
b _0807743E
.align 2, 0
_0807736C: .4byte gLinkEntity
_0807736C: .4byte gPlayerEntity
_08077370: .4byte gUnk_0811BE16
_08077374:
adds r0, r4, #0
adds r1, r6, #0
bl sub_08077E78
ldr r0, _08077388 @ =gLinkState
ldr r0, _08077388 @ =gPlayerState
adds r0, #0x3d
movs r1, #0
strb r1, [r0]
b _0807743E
.align 2, 0
_08077388: .4byte gLinkState
_08077388: .4byte gPlayerState
_0807738C:
movs r0, #0x60
ands r0, r1
@@ -809,7 +809,7 @@ sub_08077448: @ 0x08077448
push {r4, r5, lr}
adds r4, r0, #0
adds r5, r1, #0
ldr r2, _08077498 @ =gLinkEntity
ldr r2, _08077498 @ =gPlayerEntity
ldrb r0, [r2, #0x14]
lsls r0, r0, #2
movs r1, #0x10
@@ -835,7 +835,7 @@ _08077474:
ands r0, r1
cmp r0, #0
beq _08077494
ldr r0, _0807749C @ =gLinkState
ldr r0, _0807749C @ =gPlayerState
adds r0, #0x3d
movs r1, #0
strb r1, [r0]
@@ -845,13 +845,13 @@ _08077474:
_08077494:
pop {r4, r5, pc}
.align 2, 0
_08077498: .4byte gLinkEntity
_0807749C: .4byte gLinkState
_08077498: .4byte gPlayerEntity
_0807749C: .4byte gPlayerState
thumb_func_start sub_080774A0
sub_080774A0: @ 0x080774A0
push {r4, r5, r6, r7, lr}
ldr r3, _080774FC @ =gLinkEntity
ldr r3, _080774FC @ =gPlayerEntity
movs r0, #0x2e
ldrsh r2, [r3, r0]
ldr r5, _08077500 @ =gUnk_0811BE1E
@@ -896,7 +896,7 @@ _080774F6:
movs r0, #0
b _0807751A
.align 2, 0
_080774FC: .4byte gLinkEntity
_080774FC: .4byte gPlayerEntity
_08077500: .4byte gUnk_0811BE1E
_08077504: .4byte gRoomControls
_08077508:
@@ -930,7 +930,7 @@ sub_08077534: @ 0x08077534
push {r4, lr}
adds r4, r0, #0
bl sub_08077D38
ldr r0, _08077570 @ =gLinkEntity
ldr r0, _08077570 @ =gPlayerEntity
bl sub_0806F948
adds r0, r4, #0
bl sub_08077BB8
@@ -954,7 +954,7 @@ sub_08077534: @ 0x08077534
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08077570: .4byte gLinkEntity
_08077570: .4byte gPlayerEntity
_08077574: .4byte gUnk_02002A40
_08077578: .4byte _0807757C
_0807757C: @ jump table
@@ -986,7 +986,7 @@ _080775D0: .4byte 0x00000614
_080775D4:
movs r0, #3
strb r0, [r4, #4]
ldr r1, _080775F0 @ =gLinkEntity
ldr r1, _080775F0 @ =gPlayerEntity
movs r0, #4
strb r0, [r1, #0x14]
ldrb r2, [r1, #0x18]
@@ -998,7 +998,7 @@ _080775D4:
bl sub_08077DF4
b _08077606
.align 2, 0
_080775F0: .4byte gLinkEntity
_080775F0: .4byte gPlayerEntity
_080775F4: .4byte 0x000002DF
_080775F8:
movs r0, #3
@@ -1008,7 +1008,7 @@ _080775F8:
adds r0, r4, #0
bl sub_08077DF4
_08077606:
ldr r2, _08077614 @ =gLinkEntity
ldr r2, _08077614 @ =gPlayerEntity
ldrb r1, [r2, #0x10]
movs r0, #0x7f
ands r0, r1
@@ -1016,7 +1016,7 @@ _08077606:
_08077610:
pop {r4, pc}
.align 2, 0
_08077614: .4byte gLinkEntity
_08077614: .4byte gPlayerEntity
thumb_func_start sub_08077618
sub_08077618: @ 0x08077618
@@ -1052,7 +1052,7 @@ sub_08077640: @ 0x08077640
ands r0, r1
cmp r0, #0
beq _08077666
ldr r2, _08077668 @ =gLinkEntity
ldr r2, _08077668 @ =gPlayerEntity
ldrb r1, [r2, #0x10]
movs r0, #0x80
orrs r0, r1
@@ -1063,7 +1063,7 @@ sub_08077640: @ 0x08077640
_08077666:
pop {r4, r5, pc}
.align 2, 0
_08077668: .4byte gLinkEntity
_08077668: .4byte gPlayerEntity
thumb_func_start sub_0807766C
sub_0807766C: @ 0x0807766C
@@ -1076,7 +1076,7 @@ sub_0807766C: @ 0x0807766C
ands r0, r1
cmp r0, #0
beq _08077692
ldr r2, _08077694 @ =gLinkEntity
ldr r2, _08077694 @ =gPlayerEntity
ldrb r1, [r2, #0x10]
movs r0, #0x80
orrs r0, r1
@@ -1087,13 +1087,13 @@ sub_0807766C: @ 0x0807766C
_08077692:
pop {r4, r5, pc}
.align 2, 0
_08077694: .4byte gLinkEntity
_08077694: .4byte gPlayerEntity
thumb_func_start sub_08077698
sub_08077698: @ 0x08077698
push {r4, r5, lr}
adds r4, r0, #0
ldr r2, _0807771C @ =gLinkState
ldr r2, _0807771C @ =gPlayerState
ldrb r1, [r2, #3]
movs r0, #0xfe
ands r0, r1
@@ -1155,7 +1155,7 @@ _08077712:
bls _08077704
pop {r4, r5, pc}
.align 2, 0
_0807771C: .4byte gLinkState
_0807771C: .4byte gPlayerState
_08077720: .4byte gUnk_02002A40
_08077724: .4byte gUnk_03000B80
@@ -1189,7 +1189,7 @@ _08077754: .4byte gUnk_02002A40
sub_08077758: @ 0x08077758
push {lr}
adds r3, r0, #0
ldr r2, _08077794 @ =gLinkState
ldr r2, _08077794 @ =gPlayerState
ldr r1, [r2, #0x30]
movs r0, #0x80
lsls r0, r0, #7
@@ -1218,7 +1218,7 @@ sub_08077758: @ 0x08077758
movs r0, #1
b _0807779E
.align 2, 0
_08077794: .4byte gLinkState
_08077794: .4byte gPlayerState
_08077798:
bl sub_0807A108
_0807779C:
@@ -1229,7 +1229,7 @@ _0807779E:
thumb_func_start sub_080777A0
sub_080777A0: @ 0x080777A0
push {r4, lr}
ldr r3, _080777D0 @ =gLinkState
ldr r3, _080777D0 @ =gPlayerState
adds r0, r3, #0
adds r0, #0x92
ldrh r1, [r0]
@@ -1253,7 +1253,7 @@ _080777CC:
movs r0, #1
b _0807787C
.align 2, 0
_080777D0: .4byte gLinkState
_080777D0: .4byte gPlayerState
_080777D4:
ldr r2, _080777F4 @ =gArea
ldrb r0, [r2, #0x18]
@@ -1278,13 +1278,13 @@ _080777FC:
ldrb r0, [r2, #0x1a]
cmp r0, #0
bne _080777CC
ldr r1, _0807780C @ =gLinkEntity
ldr r1, _0807780C @ =gPlayerEntity
ldrb r0, [r1, #0xd]
adds r0, #1
strb r0, [r1, #0xd]
b _080777CC
.align 2, 0
_0807780C: .4byte gLinkEntity
_0807780C: .4byte gPlayerEntity
_08077810:
ldrb r0, [r2, #0x1a]
cmp r0, #0
@@ -1292,7 +1292,7 @@ _08077810:
ands r1, r4
cmp r1, #0
beq _0807787A
ldr r0, _08077834 @ =gLinkEntity
ldr r0, _08077834 @ =gPlayerEntity
ldrb r1, [r0, #0xd]
adds r1, #1
strb r1, [r0, #0xd]
@@ -1304,7 +1304,7 @@ _08077810:
bl sub_0805E4E0
b _080777CC
.align 2, 0
_08077834: .4byte gLinkEntity
_08077834: .4byte gPlayerEntity
_08077838:
ldrb r0, [r2, #0x12]
cmp r0, #0x11
@@ -1389,13 +1389,13 @@ _080778C8: .4byte gUnk_03004010
thumb_func_start sub_080778CC
sub_080778CC: @ 0x080778CC
push {lr}
ldr r2, _08077920 @ =gLinkState
ldr r2, _08077920 @ =gPlayerState
ldr r0, [r2, #0x30]
ldr r1, _08077924 @ =0x000400A0
ands r0, r1
cmp r0, #0
bne _0807791C
ldr r0, _08077928 @ =gLinkEntity
ldr r0, _08077928 @ =gPlayerEntity
adds r0, #0x79
ldrb r0, [r0]
cmp r0, #0
@@ -1415,7 +1415,7 @@ _080778FA:
bl sub_080789A8
cmp r0, #0
bne _08077910
ldr r0, _08077920 @ =gLinkState
ldr r0, _08077920 @ =gPlayerState
adds r0, #0x90
ldrh r1, [r0]
ldr r0, _0807792C @ =0x00000F03
@@ -1432,9 +1432,9 @@ _0807791C:
movs r0, #0
b _08077940
.align 2, 0
_08077920: .4byte gLinkState
_08077920: .4byte gPlayerState
_08077924: .4byte 0x000400A0
_08077928: .4byte gLinkEntity
_08077928: .4byte gPlayerEntity
_0807792C: .4byte 0x00000F03
_08077930:
movs r0, #0x1b
@@ -1455,7 +1455,7 @@ _08077948: .4byte 0x00000145
sub_0807794C: @ 0x0807794C
push {lr}
adds r2, r0, #0
ldr r0, _080779B8 @ =gLinkState
ldr r0, _080779B8 @ =gPlayerState
ldrb r1, [r0, #0xc]
adds r3, r0, #0
cmp r1, #0x18
@@ -1475,7 +1475,7 @@ _0807796E:
ldrb r0, [r3, #2]
cmp r0, #0
bne _0807797C
ldr r0, _080779BC @ =gLinkEntity
ldr r0, _080779BC @ =gPlayerEntity
ldr r0, [r0, #0x34]
cmp r0, #0
beq _08077980
@@ -1513,8 +1513,8 @@ _080779B2:
movs r0, #0
b _080779DE
.align 2, 0
_080779B8: .4byte gLinkState
_080779BC: .4byte gLinkEntity
_080779B8: .4byte gPlayerState
_080779BC: .4byte gPlayerEntity
_080779C0: .4byte gUnk_0811BE48
_080779C4:
ldr r1, _080779E0 @ =gUnk_0811BE48
@@ -1572,7 +1572,7 @@ _08077A16:
sub_08077A18: @ 0x08077A18
push {lr}
adds r1, r0, #0
ldr r0, _08077A3C @ =gLinkState
ldr r0, _08077A3C @ =gPlayerState
ldrb r0, [r0, #5]
cmp r0, #0
bne _08077A44
@@ -1588,7 +1588,7 @@ sub_08077A18: @ 0x08077A18
bl sub_080779EC
b _08077A46
.align 2, 0
_08077A3C: .4byte gLinkState
_08077A3C: .4byte gPlayerState
_08077A40: .4byte gUnk_03000B80
_08077A44:
movs r0, #0
@@ -1599,7 +1599,7 @@ _08077A46:
sub_08077A48: @ 0x08077A48
push {r4, r5, r6, lr}
adds r2, r0, #0
ldr r6, _08077A88 @ =gLinkState
ldr r6, _08077A88 @ =gPlayerState
ldrb r0, [r6, #5]
cmp r0, #0
bne _08077A94
@@ -1629,7 +1629,7 @@ sub_08077A48: @ 0x08077A48
adds r0, r5, #0
b _08077A96
.align 2, 0
_08077A88: .4byte gLinkState
_08077A88: .4byte gPlayerState
_08077A8C: .4byte gUnk_0811BE48
_08077A90: .4byte gUnk_03000B80
_08077A94:
@@ -1645,7 +1645,7 @@ sub_08077A98: @ 0x08077A98
ldrb r0, [r0]
cmp r0, #0
beq _08077AC4
ldr r0, _08077ABC @ =gLinkState
ldr r0, _08077ABC @ =gPlayerState
ldrb r0, [r0, #5]
cmp r0, #0
bne _08077AC4
@@ -1657,7 +1657,7 @@ sub_08077A98: @ 0x08077A98
b _08077AC6
.align 2, 0
_08077AB8: .4byte gUnk_02002A40
_08077ABC: .4byte gLinkState
_08077ABC: .4byte gPlayerState
_08077AC0: .4byte gUnk_03000B80
_08077AC4:
movs r0, #0
@@ -1694,7 +1694,7 @@ sub_08077AEC: @ 0x08077AEC
ldr r0, _08077B14 @ =gUnk_03000BD4
movs r1, #3
bl sub_08077E78
ldr r2, _08077B18 @ =gLinkState
ldr r2, _08077B18 @ =gPlayerState
ldr r0, [r2, #0x30]
ldr r1, _08077B1C @ =0xFF7FFFFF
ands r0, r1
@@ -1710,12 +1710,12 @@ _08077B12:
pop {pc}
.align 2, 0
_08077B14: .4byte gUnk_03000BD4
_08077B18: .4byte gLinkState
_08077B18: .4byte gPlayerState
_08077B1C: .4byte 0xFF7FFFFF
thumb_func_start sub_08077B20
sub_08077B20: @ 0x08077B20
push {lr}
bl ResetLink
bl ResetPlayer
bl sub_08077AEC
pop {pc}
asm/code_08077B98.s
+28 -28
View File
@@ -49,7 +49,7 @@ _0807802E:
_08078036:
cmp r2, #0
beq _08078068
ldr r0, _08078064 @ =gLinkState
ldr r0, _08078064 @ =gPlayerState
ldrb r1, [r0, #0x1b]
movs r0, #0x20
ands r0, r1
@@ -70,7 +70,7 @@ _08078036:
b _0807806C
.align 2, 0
_08078060: .4byte gUnk_02002A40
_08078064: .4byte gLinkState
_08078064: .4byte gPlayerState
_08078068:
movs r0, #0
strb r0, [r4, #1]
@@ -82,7 +82,7 @@ _0807806C:
sub_08078070: @ 0x08078070
push {lr}
adds r2, r0, #0
ldr r3, _08078098 @ =gLinkState
ldr r3, _08078098 @ =gPlayerState
ldrb r1, [r3, #0x1b]
movs r0, #0x20
ands r0, r1
@@ -100,7 +100,7 @@ sub_08078070: @ 0x08078070
adds r0, #0xc
b _080780A0
.align 2, 0
_08078098: .4byte gLinkState
_08078098: .4byte gPlayerState
_0807809C:
ldrh r0, [r2, #4]
adds r0, #6
@@ -142,7 +142,7 @@ _080780DA:
sub_080780E0: @ 0x080780E0
push {lr}
adds r2, r0, #0
ldr r0, _080780F4 @ =gLinkState
ldr r0, _080780F4 @ =gPlayerState
ldrb r1, [r0, #0x1b]
movs r0, #0x40
ands r0, r1
@@ -151,7 +151,7 @@ sub_080780E0: @ 0x080780E0
movs r0, #5
b _08078102
.align 2, 0
_080780F4: .4byte gLinkState
_080780F4: .4byte gPlayerState
_080780F8:
movs r0, #0x20
ands r0, r1
@@ -224,10 +224,10 @@ _0807815C:
thumb_func_start sub_08078160
sub_08078160: @ 0x08078160
push {lr}
ldr r1, _08078178 @ =gLinkState
ldr r1, _08078178 @ =gPlayerState
adds r1, #0xa8
strb r0, [r1]
ldr r2, _0807817C @ =gLinkEntity
ldr r2, _0807817C @ =gPlayerEntity
ldrb r1, [r2, #0x10]
movs r0, #0x7f
ands r0, r1
@@ -235,8 +235,8 @@ sub_08078160: @ 0x08078160
bl sub_08078B48
pop {pc}
.align 2, 0
_08078178: .4byte gLinkState
_0807817C: .4byte gLinkEntity
_08078178: .4byte gPlayerState
_0807817C: .4byte gPlayerEntity
thumb_func_start sub_08078180
sub_08078180: @ 0x08078180
@@ -251,7 +251,7 @@ sub_08078180: @ 0x08078180
b _080782BC
_08078192:
movs r4, #0
ldr r5, _080781CC @ =gLinkState
ldr r5, _080781CC @ =gPlayerState
ldrb r0, [r5, #2]
cmp r0, #0
beq _0807819E
@@ -282,7 +282,7 @@ _080781C4:
b _080782B6
.align 2, 0
_080781C8: .4byte gUnk_0200AF00
_080781CC: .4byte gLinkState
_080781CC: .4byte gPlayerState
_080781D0: .4byte 0x00104D00
_080781D4:
adds r1, r6, #0
@@ -399,7 +399,7 @@ _080782BC:
thumb_func_start sub_080782C0
sub_080782C0: @ 0x080782C0
push {r4, r5, r6, lr}
ldr r1, _080782D8 @ =gLinkState
ldr r1, _080782D8 @ =gPlayerState
adds r2, r1, #0
adds r2, #0xa8
ldrb r0, [r2]
@@ -411,7 +411,7 @@ sub_080782C0: @ 0x080782C0
ldrb r0, [r0]
b _080782DE
.align 2, 0
_080782D8: .4byte gLinkState
_080782D8: .4byte gPlayerState
_080782DC:
ldrb r0, [r2]
_080782DE:
@@ -500,7 +500,7 @@ _0807839A:
beq _080783A6
b _080784AC
_080783A6:
ldr r0, _08078400 @ =gLinkEntity
ldr r0, _08078400 @ =gPlayerEntity
ldr r0, [r0, #0x74]
ldr r0, [r0, #0x54]
ldrh r1, [r0, #8]
@@ -509,7 +509,7 @@ _080783A6:
beq _080783B6
b _080784AC
_080783B6:
ldr r2, _08078408 @ =gLinkState
ldr r2, _08078408 @ =gPlayerState
adds r0, r2, #0
adds r0, #0x92
ldrh r1, [r0]
@@ -546,9 +546,9 @@ _080783B6:
strb r0, [r4, #0xc]
b _08078420
.align 2, 0
_08078400: .4byte gLinkEntity
_08078400: .4byte gPlayerEntity
_08078404: .4byte 0x00000206
_08078408: .4byte gLinkState
_08078408: .4byte gPlayerState
_0807840C: .4byte gUnk_03003DF0
_08078410: .4byte gUnk_02002A40
_08078414: .4byte 0x0000012B
@@ -667,7 +667,7 @@ sub_080784E4: @ 0x080784E4
.align 2, 0
_080784FC: .4byte gUnk_03003DF0
_08078500:
ldr r2, _08078528 @ =gLinkState
ldr r2, _08078528 @ =gPlayerState
adds r0, r2, #0
adds r0, #0x27
adds r3, r2, #0
@@ -687,7 +687,7 @@ _08078500:
ldrb r0, [r0]
b _0807852E
.align 2, 0
_08078528: .4byte gLinkState
_08078528: .4byte gPlayerState
_0807852C:
ldrb r0, [r1]
_0807852E:
@@ -753,7 +753,7 @@ _080785C4:
movs r0, #2
orrs r7, r0
_080785D2:
ldr r3, _080785E4 @ =gLinkEntity
ldr r3, _080785E4 @ =gPlayerEntity
ldrb r0, [r3, #0x14]
movs r1, #6
ands r1, r0
@@ -763,11 +763,11 @@ _080785D2:
mov r8, r5
b _080785FE
.align 2, 0
_080785E4: .4byte gLinkEntity
_080785E4: .4byte gPlayerEntity
_080785E8: .4byte gUnk_0811C00C
_080785EC: .4byte gUnk_03003DF0
_080785F0:
ldr r3, _08078624 @ =gLinkEntity
ldr r3, _08078624 @ =gPlayerEntity
ldrb r0, [r3, #0x14]
movs r1, #6
ands r1, r0
@@ -794,7 +794,7 @@ _080785FE:
ldr r5, _0807862C @ =gUnk_03003DF8
b _08078724
.align 2, 0
_08078624: .4byte gLinkEntity
_08078624: .4byte gPlayerEntity
_08078628: .4byte gUnk_0811C014
_0807862C: .4byte gUnk_03003DF8
_08078630:
@@ -845,7 +845,7 @@ _08078674: @ jump table
.4byte _080786A0 @ case 9
.4byte _080786D4 @ case 10
_080786A0:
ldr r0, _080786B0 @ =gLinkState
ldr r0, _080786B0 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@@ -853,15 +853,15 @@ _080786A0:
bne _08078714
b _080786D4
.align 2, 0
_080786B0: .4byte gLinkState
_080786B0: .4byte gPlayerState
_080786B4:
ldr r0, _080786C0 @ =gLinkState
ldr r0, _080786C0 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
b _080786D0
.align 2, 0
_080786C0: .4byte gLinkState
_080786C0: .4byte gPlayerState
_080786C4:
ldrb r0, [r5, #3]
b _080786D0
asm/code_08078778.s
+283 -283
View File
File diff suppressed because it is too large Load Diff
asm/code_0807B9B8.s
+4 -4
View File
@@ -503,7 +503,7 @@ _0807BD90:
_0807BD96:
strh r0, [r2, #4]
_0807BD98:
ldr r2, _0807BDB0 @ =gLinkEntity
ldr r2, _0807BDB0 @ =gPlayerEntity
ldrb r1, [r2, #0x11]
movs r0, #0x10
rsbs r0, r0, #0
@@ -515,7 +515,7 @@ _0807BD98:
movs r0, #1
b _0807BDB6
.align 2, 0
_0807BDB0: .4byte gLinkEntity
_0807BDB0: .4byte gPlayerEntity
_0807BDB4:
movs r0, #0
_0807BDB6:
@@ -1823,7 +1823,7 @@ sub_0807C810: @ 0x0807C810
push {r4, r5, r6, lr}
bl sub_0807BFD0
ldr r2, _0807C850 @ =gUnk_03004030
ldr r6, _0807C854 @ =gLinkEntity
ldr r6, _0807C854 @ =gPlayerEntity
ldr r4, _0807C858 @ =gRoomControls
ldr r3, [r2]
ldrh r1, [r3, #6]
@@ -1852,7 +1852,7 @@ sub_0807C810: @ 0x0807C810
pop {r4, r5, r6, pc}
.align 2, 0
_0807C850: .4byte gUnk_03004030
_0807C854: .4byte gLinkEntity
_0807C854: .4byte gPlayerEntity
_0807C858: .4byte gRoomControls
_0807C85C: .4byte gUnk_02000070
asm/code_0807CC3C.s
+112 -112
View File
@@ -1619,10 +1619,10 @@ StartPlayerScript: @ 0x0807DB2C
movs r1, #0x24
bl _DmaZero
str r5, [r4]
ldr r0, _0807DB60 @ =gLinkEntity
ldr r0, _0807DB60 @ =gPlayerEntity
adds r0, #0x84
str r4, [r0]
ldr r2, _0807DB64 @ =gLinkState
ldr r2, _0807DB64 @ =gPlayerState
movs r1, #0
movs r0, #0x1c
strb r0, [r2, #0xc]
@@ -1636,8 +1636,8 @@ StartPlayerScript: @ 0x0807DB2C
pop {r4, r5, pc}
.align 2, 0
_0807DB5C: .4byte gUnk_02022750
_0807DB60: .4byte gLinkEntity
_0807DB64: .4byte gLinkState
_0807DB60: .4byte gPlayerEntity
_0807DB64: .4byte gPlayerState
thumb_func_start sub_0807DB68
sub_0807DB68: @ 0x0807DB68
@@ -2734,13 +2734,13 @@ sub_0807E30C: @ 0x0807E30C
ands r0, r1
cmp r0, #0
bne _0807E348
ldr r0, _0807E374 @ =gLinkState
ldr r0, _0807E374 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
cmp r0, #0
bne _0807E348
ldr r6, _0807E378 @ =gLinkEntity
ldr r6, _0807E378 @ =gPlayerEntity
adds r0, r5, #0
adds r1, r6, #0
movs r2, #0x28
@@ -2767,15 +2767,15 @@ _0807E348:
strb r0, [r1]
movs r0, #1
str r0, [r4, #0x14]
ldr r1, _0807E378 @ =gLinkEntity
ldr r1, _0807E378 @ =gPlayerEntity
adds r0, r5, #0
bl GetFacingDirection
bl sub_0806F5B0
strb r0, [r5, #0x14]
b _0807E37E
.align 2, 0
_0807E374: .4byte gLinkState
_0807E378: .4byte gLinkEntity
_0807E374: .4byte gPlayerState
_0807E378: .4byte gPlayerEntity
_0807E37C:
str r0, [r4, #0x14]
_0807E37E:
@@ -3030,7 +3030,7 @@ sub_0807E538: @ 0x0807E538
adds r4, r1, #0
ldr r0, [r4]
bl GetNextScriptCommandWordAfterCommandMetadata
ldr r1, _0807E55C @ =gLinkState
ldr r1, _0807E55C @ =gPlayerState
ldr r1, [r1, #0x30]
ands r0, r1
rsbs r1, r0, #0
@@ -3044,12 +3044,12 @@ sub_0807E538: @ 0x0807E538
strb r0, [r2, #7]
pop {r4, pc}
.align 2, 0
_0807E55C: .4byte gLinkState
_0807E55C: .4byte gPlayerState
_0807E560: .4byte gUnk_02033280
thumb_func_start sub_0807E564
sub_0807E564: @ 0x0807E564
ldr r0, _0807E57C @ =gLinkState
ldr r0, _0807E57C @ =gPlayerState
ldr r0, [r0, #0x30]
lsrs r0, r0, #7
movs r2, #1
@@ -3062,7 +3062,7 @@ sub_0807E564: @ 0x0807E564
strb r0, [r2, #7]
bx lr
.align 2, 0
_0807E57C: .4byte gLinkState
_0807E57C: .4byte gPlayerState
_0807E580: .4byte gUnk_02033280
thumb_func_start sub_0807E584
@@ -3087,7 +3087,7 @@ sub_0807E5A0: @ 0x0807E5A0
adds r2, r1, #0
movs r3, #0
ldr r0, [r2]
ldr r1, _0807E5C4 @ =gLinkEntity
ldr r1, _0807E5C4 @ =gPlayerEntity
ldrh r0, [r0, #2]
ldrb r1, [r1, #0xc]
cmp r0, r1
@@ -3102,7 +3102,7 @@ _0807E5B4:
strb r0, [r2, #7]
pop {pc}
.align 2, 0
_0807E5C4: .4byte gLinkEntity
_0807E5C4: .4byte gPlayerEntity
_0807E5C8: .4byte gUnk_02033280
thumb_func_start sub_0807E5CC
@@ -3111,7 +3111,7 @@ sub_0807E5CC: @ 0x0807E5CC
adds r2, r1, #0
movs r3, #0
ldr r0, [r2]
ldr r1, _0807E5F0 @ =gLinkEntity
ldr r1, _0807E5F0 @ =gPlayerEntity
ldrh r0, [r0, #2]
ldrb r1, [r1, #0x14]
cmp r0, r1
@@ -3126,7 +3126,7 @@ _0807E5E0:
strb r0, [r2, #7]
pop {pc}
.align 2, 0
_0807E5F0: .4byte gLinkEntity
_0807E5F0: .4byte gPlayerEntity
_0807E5F4: .4byte gUnk_02033280
thumb_func_start sub_0807E5F8
@@ -3270,7 +3270,7 @@ _0807E6D8:
thumb_func_start sub_0807E6DC
sub_0807E6DC: @ 0x0807E6DC
push {lr}
ldr r0, _0807E6F0 @ =gLinkEntity
ldr r0, _0807E6F0 @ =gPlayerEntity
ldrb r0, [r0, #0xc]
cmp r0, #8
bne _0807E6F8
@@ -3279,7 +3279,7 @@ sub_0807E6DC: @ 0x0807E6DC
strb r0, [r1, #6]
b _0807E6FC
.align 2, 0
_0807E6F0: .4byte gLinkEntity
_0807E6F0: .4byte gPlayerEntity
_0807E6F4: .4byte gUnk_02033280
_0807E6F8:
movs r0, #0x2d
@@ -3291,7 +3291,7 @@ _0807E6FC:
thumb_func_start sub_0807E700
sub_0807E700: @ 0x0807E700
push {lr}
ldr r0, _0807E718 @ =gLinkEntity
ldr r0, _0807E718 @ =gPlayerEntity
ldrb r0, [r0, #0xc]
cmp r0, #0x17
beq _0807E720
@@ -3302,7 +3302,7 @@ sub_0807E700: @ 0x0807E700
strb r0, [r2, #7]
b _0807E726
.align 2, 0
_0807E718: .4byte gLinkEntity
_0807E718: .4byte gPlayerEntity
_0807E71C: .4byte gUnk_02033280
_0807E720:
ldr r1, _0807E728 @ =gUnk_02033280
@@ -3497,41 +3497,41 @@ sub_0807E858: @ 0x0807E858
thumb_func_start sub_0807E864
sub_0807E864: @ 0x0807E864
push {lr}
ldr r0, _0807E874 @ =gLinkState
ldr r0, _0807E874 @ =gPlayerState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
bl sub_08078B48
pop {pc}
.align 2, 0
_0807E874: .4byte gLinkState
_0807E874: .4byte gPlayerState
thumb_func_start sub_0807E878
sub_0807E878: @ 0x0807E878
ldr r0, _0807E884 @ =gLinkState
ldr r0, _0807E884 @ =gPlayerState
adds r0, #0x8b
movs r1, #1
strb r1, [r0]
bx lr
.align 2, 0
_0807E884: .4byte gLinkState
_0807E884: .4byte gPlayerState
thumb_func_start sub_0807E888
sub_0807E888: @ 0x0807E888
ldr r0, _0807E894 @ =gLinkState
ldr r0, _0807E894 @ =gPlayerState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
bx lr
.align 2, 0
_0807E894: .4byte gLinkState
_0807E894: .4byte gPlayerState
thumb_func_start sub_0807E898
sub_0807E898: @ 0x0807E898
push {lr}
ldr r0, [r1]
bl GetNextScriptCommandWordAfterCommandMetadata
ldr r3, _0807E8C0 @ =gLinkState
ldr r3, _0807E8C0 @ =gPlayerState
strb r0, [r3, #0xc]
lsrs r2, r0, #8
adds r1, r3, #0
@@ -3547,7 +3547,7 @@ sub_0807E898: @ 0x0807E898
strb r0, [r1]
pop {pc}
.align 2, 0
_0807E8C0: .4byte gLinkState
_0807E8C0: .4byte gPlayerState
thumb_func_start sub_0807E8C4
sub_0807E8C4: @ 0x0807E8C4
@@ -3560,13 +3560,13 @@ sub_0807E8C4: @ 0x0807E8C4
thumb_func_start sub_0807E8D4
sub_0807E8D4: @ 0x0807E8D4
ldr r2, _0807E8E0 @ =gLinkState
ldr r2, _0807E8E0 @ =gPlayerState
ldr r0, [r1]
ldrh r0, [r0, #2]
strh r0, [r2, #8]
bx lr
.align 2, 0
_0807E8E0: .4byte gLinkState
_0807E8E0: .4byte gPlayerState
thumb_func_start sub_0807E8E4
sub_0807E8E4: @ 0x0807E8E4
@@ -3574,7 +3574,7 @@ sub_0807E8E4: @ 0x0807E8E4
ldrh r0, [r0]
ldr r2, _0807E900 @ =0x000003FF
ands r2, r0
ldr r3, _0807E904 @ =gLinkEntity
ldr r3, _0807E904 @ =gPlayerEntity
ldr r0, [r1]
ldrh r0, [r0]
subs r0, r0, r2
@@ -3584,7 +3584,7 @@ sub_0807E8E4: @ 0x0807E8E4
.align 2, 0
_0807E8FC: .4byte gUnk_08016984
_0807E900: .4byte 0x000003FF
_0807E904: .4byte gLinkEntity
_0807E904: .4byte gPlayerEntity
thumb_func_start sub_0807E908
sub_0807E908: @ 0x0807E908
@@ -3737,7 +3737,7 @@ sub_0807E9F0: @ 0x0807E9F0
beq _0807EA24
cmp r0, #2
bne _0807EA40
ldr r0, _0807EA1C @ =gLinkState
ldr r0, _0807EA1C @ =gPlayerState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
@@ -3747,7 +3747,7 @@ sub_0807E9F0: @ 0x0807E9F0
b _0807EA28
.align 2, 0
_0807EA18: .4byte gUnk_02022740
_0807EA1C: .4byte gLinkState
_0807EA1C: .4byte gPlayerState
_0807EA20: .4byte gUnk_02034490
_0807EA24:
movs r0, #0
@@ -3756,13 +3756,13 @@ _0807EA28:
cmp r2, #0
beq _0807EA40
bl sub_0807919C
ldr r0, _0807EA3C @ =gLinkState
ldr r0, _0807EA3C @ =gPlayerState
adds r0, #0x8b
movs r1, #1
strb r1, [r0]
b _0807EA46
.align 2, 0
_0807EA3C: .4byte gLinkState
_0807EA3C: .4byte gPlayerState
_0807EA40:
ldr r1, _0807EA48 @ =gUnk_02033280
movs r0, #0
@@ -3949,19 +3949,19 @@ _0807EB70: .4byte gRoomControls
sub_0807EB74: @ 0x0807EB74
push {r4, lr}
adds r4, r0, #0
ldr r1, _0807EB88 @ =gLinkEntity
ldr r1, _0807EB88 @ =gPlayerEntity
bl GetFacingDirection
bl sub_0806F5B0
strb r0, [r4, #0x14]
pop {r4, pc}
.align 2, 0
_0807EB88: .4byte gLinkEntity
_0807EB88: .4byte gPlayerEntity
thumb_func_start sub_0807EB8C
sub_0807EB8C: @ 0x0807EB8C
push {r4, lr}
adds r1, r0, #0
ldr r4, _0807EBA4 @ =gLinkEntity
ldr r4, _0807EBA4 @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
bl sub_0806F5B0
@@ -3970,7 +3970,7 @@ sub_0807EB8C: @ 0x0807EB8C
strb r0, [r4, #0x14]
pop {r4, pc}
.align 2, 0
_0807EBA4: .4byte gLinkEntity
_0807EBA4: .4byte gPlayerEntity
thumb_func_start sub_0807EBA8
sub_0807EBA8: @ 0x0807EBA8
@@ -4041,11 +4041,11 @@ sub_0807EBF4: @ 0x0807EBF4
sub_0807EC08: @ 0x0807EC08
push {lr}
adds r1, r0, #0
ldr r0, _0807EC14 @ =gLinkEntity
ldr r0, _0807EC14 @ =gPlayerEntity
bl CopyPosition
pop {pc}
.align 2, 0
_0807EC14: .4byte gLinkEntity
_0807EC14: .4byte gPlayerEntity
thumb_func_start nullsub_509
nullsub_509: @ 0x0807EC18
@@ -4419,7 +4419,7 @@ sub_0807EEB4: @ 0x0807EEB4
bne _0807EED6
movs r0, #1
strb r0, [r4, #0x18]
ldr r0, _0807EEEC @ =gLinkEntity
ldr r0, _0807EEEC @ =gPlayerEntity
movs r1, #0x2e
ldrsh r2, [r0, r1]
movs r1, #0x32
@@ -4439,7 +4439,7 @@ _0807EED6:
_0807EEE8:
pop {r4, r5, pc}
.align 2, 0
_0807EEEC: .4byte gLinkEntity
_0807EEEC: .4byte gPlayerEntity
_0807EEF0: .4byte gUnk_02033280
thumb_func_start sub_0807EEF4
@@ -4698,12 +4698,12 @@ _0807F0A0: .4byte gRoomControls
thumb_func_start sub_0807F0A4
sub_0807F0A4: @ 0x0807F0A4
ldr r1, _0807F0AC @ =gRoomControls
ldr r0, _0807F0B0 @ =gLinkEntity
ldr r0, _0807F0B0 @ =gPlayerEntity
str r0, [r1, #0x30]
bx lr
.align 2, 0
_0807F0AC: .4byte gRoomControls
_0807F0B0: .4byte gLinkEntity
_0807F0B0: .4byte gPlayerEntity
thumb_func_start sub_0807F0B4
sub_0807F0B4: @ 0x0807F0B4
@@ -4808,7 +4808,7 @@ sub_0807F158: @ 0x0807F158
thumb_func_start sub_0807F168
sub_0807F168: @ 0x0807F168
push {lr}
ldr r0, _0807F17C @ =gLinkEntity
ldr r0, _0807F17C @ =gPlayerEntity
adds r2, r0, #0
adds r2, #0x38
movs r1, #1
@@ -4816,7 +4816,7 @@ sub_0807F168: @ 0x0807F168
bl UpdateSpriteForCollisionLayer
pop {pc}
.align 2, 0
_0807F17C: .4byte gLinkEntity
_0807F17C: .4byte gPlayerEntity
thumb_func_start sub_0807F180
sub_0807F180: @ 0x0807F180
@@ -4841,7 +4841,7 @@ sub_0807F190: @ 0x0807F190
thumb_func_start sub_0807F1A0
sub_0807F1A0: @ 0x0807F1A0
push {r4, lr}
ldr r3, _0807F1BC @ =gLinkEntity
ldr r3, _0807F1BC @ =gPlayerEntity
movs r4, #0x2e
ldrsh r2, [r3, r4]
movs r4, #0x32
@@ -4854,13 +4854,13 @@ sub_0807F1A0: @ 0x0807F1A0
strb r0, [r2, #7]
pop {r4, pc}
.align 2, 0
_0807F1BC: .4byte gLinkEntity
_0807F1BC: .4byte gPlayerEntity
_0807F1C0: .4byte gUnk_02033280
thumb_func_start sub_0807F1C4
sub_0807F1C4: @ 0x0807F1C4
push {lr}
ldr r2, _0807F1D8 @ =gLinkState
ldr r2, _0807F1D8 @ =gPlayerState
ldr r0, [r2, #0x30]
movs r1, #8
ands r0, r1
@@ -4869,7 +4869,7 @@ sub_0807F1C4: @ 0x0807F1C4
ldr r0, _0807F1DC @ =0x00000459
b _0807F1E4
.align 2, 0
_0807F1D8: .4byte gLinkState
_0807F1D8: .4byte gPlayerState
_0807F1DC: .4byte 0x00000459
_0807F1E0:
movs r0, #0xde
@@ -4881,7 +4881,7 @@ _0807F1E4:
thumb_func_start sub_0807F1E8
sub_0807F1E8: @ 0x0807F1E8
push {lr}
ldr r2, _0807F1FC @ =gLinkState
ldr r2, _0807F1FC @ =gPlayerState
ldr r0, [r2, #0x30]
movs r1, #8
ands r0, r1
@@ -4890,7 +4890,7 @@ sub_0807F1E8: @ 0x0807F1E8
ldr r0, _0807F200 @ =0x0000045A
b _0807F206
.align 2, 0
_0807F1FC: .4byte gLinkState
_0807F1FC: .4byte gPlayerState
_0807F200: .4byte 0x0000045A
_0807F204:
ldr r0, _0807F20C @ =0x000002BD
@@ -4903,7 +4903,7 @@ _0807F20C: .4byte 0x000002BD
thumb_func_start sub_0807F210
sub_0807F210: @ 0x0807F210
push {lr}
ldr r2, _0807F224 @ =gLinkState
ldr r2, _0807F224 @ =gPlayerState
ldr r0, [r2, #0x30]
movs r1, #8
ands r0, r1
@@ -4912,7 +4912,7 @@ sub_0807F210: @ 0x0807F210
ldr r0, _0807F228 @ =0x0000041C
b _0807F22E
.align 2, 0
_0807F224: .4byte gLinkState
_0807F224: .4byte gPlayerState
_0807F228: .4byte 0x0000041C
_0807F22C:
ldr r0, _0807F234 @ =0x0000080C
@@ -4924,12 +4924,12 @@ _0807F234: .4byte 0x0000080C
thumb_func_start sub_0807F238
sub_0807F238: @ 0x0807F238
ldr r2, _0807F240 @ =gLinkState
ldr r2, _0807F240 @ =gPlayerState
ldr r0, [r1, #4]
strh r0, [r2, #8]
bx lr
.align 2, 0
_0807F240: .4byte gLinkState
_0807F240: .4byte gPlayerState
thumb_func_start sub_0807F244
sub_0807F244: @ 0x0807F244
@@ -4988,7 +4988,7 @@ sub_0807F29C: @ 0x0807F29C
thumb_func_start sub_0807F2A8
sub_0807F2A8: @ 0x0807F2A8
push {lr}
ldr r0, _0807F2C0 @ =gLinkState
ldr r0, _0807F2C0 @ =gPlayerState
adds r0, #0x9c
ldr r0, [r0]
cmp r0, #0
@@ -5000,7 +5000,7 @@ sub_0807F2A8: @ 0x0807F2A8
strb r0, [r2, #7]
b _0807F2CE
.align 2, 0
_0807F2C0: .4byte gLinkState
_0807F2C0: .4byte gPlayerState
_0807F2C4: .4byte gUnk_02033280
_0807F2C8:
ldr r1, _0807F2D0 @ =gUnk_02033280
@@ -5041,7 +5041,7 @@ _0807F300: .4byte gUnk_02033280
thumb_func_start sub_0807F304
sub_0807F304: @ 0x0807F304
push {lr}
ldr r0, _0807F324 @ =gLinkEntity
ldr r0, _0807F324 @ =gPlayerEntity
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #0x80
@@ -5057,7 +5057,7 @@ sub_0807F304: @ 0x0807F304
strb r0, [r2, #7]
b _0807F330
.align 2, 0
_0807F324: .4byte gLinkEntity
_0807F324: .4byte gPlayerEntity
_0807F328: .4byte gUnk_02033280
_0807F32C:
ldr r0, _0807F334 @ =gUnk_02033280
@@ -5179,26 +5179,26 @@ sub_0807F3D8: @ 0x0807F3D8
thumb_func_start sub_0807F3F8
sub_0807F3F8: @ 0x0807F3F8
push {lr}
ldr r0, _0807F408 @ =gLinkEntity
ldr r0, _0807F408 @ =gPlayerEntity
movs r2, #0x18
rsbs r2, r2, #0
movs r1, #8
bl sub_080A2CFC
pop {pc}
.align 2, 0
_0807F408: .4byte gLinkEntity
_0807F408: .4byte gPlayerEntity
thumb_func_start sub_0807F40C
sub_0807F40C: @ 0x0807F40C
push {lr}
ldr r0, _0807F41C @ =gLinkEntity
ldr r0, _0807F41C @ =gPlayerEntity
movs r2, #0x18
rsbs r2, r2, #0
movs r1, #8
bl sub_080A2D0C
pop {pc}
.align 2, 0
_0807F41C: .4byte gLinkEntity
_0807F41C: .4byte gPlayerEntity
thumb_func_start sub_0807F420
sub_0807F420: @ 0x0807F420
@@ -5397,18 +5397,18 @@ _0807F580: .4byte gUnk_02033280
thumb_func_start sub_0807F584
sub_0807F584: @ 0x0807F584
ldr r0, _0807F590 @ =gLinkEntity
ldr r0, _0807F590 @ =gPlayerEntity
ldrb r0, [r0, #0x14]
lsrs r0, r0, #1
str r0, [r1, #4]
bx lr
.align 2, 0
_0807F590: .4byte gLinkEntity
_0807F590: .4byte gPlayerEntity
thumb_func_start sub_0807F594
sub_0807F594: @ 0x0807F594
push {lr}
ldr r0, _0807F5A8 @ =gLinkState
ldr r0, _0807F5A8 @ =gPlayerState
adds r0, #0xa8
ldrb r0, [r0]
cmp r0, #0
@@ -5419,18 +5419,18 @@ sub_0807F594: @ 0x0807F594
_0807F5A6:
pop {pc}
.align 2, 0
_0807F5A8: .4byte gLinkState
_0807F5A8: .4byte gPlayerState
_0807F5AC: .4byte gUnk_02033280
thumb_func_start sub_0807F5B0
sub_0807F5B0: @ 0x0807F5B0
ldr r0, _0807F5BC @ =gLinkState
ldr r0, _0807F5BC @ =gPlayerState
ldr r1, [r1, #4]
adds r0, #0x27
strb r1, [r0]
bx lr
.align 2, 0
_0807F5BC: .4byte gLinkState
_0807F5BC: .4byte gPlayerState
thumb_func_start sub_0807F5C0
sub_0807F5C0: @ 0x0807F5C0
@@ -5505,13 +5505,13 @@ sub_0807F634: @ 0x0807F634
ldrh r2, [r3, #2]
ldrh r3, [r3, #4]
bl sub_0801DFB4
ldr r0, _0807F64C @ =gLinkState
ldr r0, _0807F64C @ =gPlayerState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
pop {pc}
.align 2, 0
_0807F64C: .4byte gLinkState
_0807F64C: .4byte gPlayerState
thumb_func_start sub_0807F650
sub_0807F650: @ 0x0807F650
@@ -5527,21 +5527,21 @@ sub_0807F650: @ 0x0807F650
ldrh r3, [r0, #4]
adds r0, r4, #0
bl sub_0801DFB4
ldr r0, _0807F67C @ =gLinkState
ldr r0, _0807F67C @ =gPlayerState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
pop {r4, pc}
.align 2, 0
_0807F678: .4byte gUnk_08001A7C
_0807F67C: .4byte gLinkState
_0807F67C: .4byte gPlayerState
thumb_func_start sub_0807F680
sub_0807F680: @ 0x0807F680
push {lr}
adds r2, r1, #0
movs r3, #0
ldr r0, _0807F6A8 @ =gLinkEntity
ldr r0, _0807F6A8 @ =gPlayerEntity
movs r1, #0x2e
ldrsh r0, [r0, r1]
ldr r1, _0807F6AC @ =gRoomControls
@@ -5560,7 +5560,7 @@ _0807F69A:
strb r0, [r2, #7]
pop {pc}
.align 2, 0
_0807F6A8: .4byte gLinkEntity
_0807F6A8: .4byte gPlayerEntity
_0807F6AC: .4byte gRoomControls
_0807F6B0: .4byte gUnk_02033280
@@ -5569,7 +5569,7 @@ sub_0807F6B4: @ 0x0807F6B4
push {lr}
adds r2, r1, #0
movs r3, #0
ldr r0, _0807F6DC @ =gLinkEntity
ldr r0, _0807F6DC @ =gPlayerEntity
movs r1, #0x32
ldrsh r0, [r0, r1]
ldr r1, _0807F6E0 @ =gRoomControls
@@ -5588,31 +5588,31 @@ _0807F6CE:
strb r0, [r2, #7]
pop {pc}
.align 2, 0
_0807F6DC: .4byte gLinkEntity
_0807F6DC: .4byte gPlayerEntity
_0807F6E0: .4byte gRoomControls
_0807F6E4: .4byte gUnk_02033280
thumb_func_start sub_0807F6E8
sub_0807F6E8: @ 0x0807F6E8
ldr r2, _0807F6F4 @ =gLinkState
ldr r2, _0807F6F4 @ =gPlayerState
ldr r0, [r2, #0x30]
ldr r1, [r1, #4]
orrs r0, r1
str r0, [r2, #0x30]
bx lr
.align 2, 0
_0807F6F4: .4byte gLinkState
_0807F6F4: .4byte gPlayerState
thumb_func_start sub_0807F6F8
sub_0807F6F8: @ 0x0807F6F8
ldr r2, _0807F704 @ =gLinkState
ldr r2, _0807F704 @ =gPlayerState
ldr r1, [r1, #4]
ldr r0, [r2, #0x30]
bics r0, r1
str r0, [r2, #0x30]
bx lr
.align 2, 0
_0807F704: .4byte gLinkState
_0807F704: .4byte gPlayerState
thumb_func_start sub_0807F708
sub_0807F708: @ 0x0807F708
@@ -5666,7 +5666,7 @@ _0807F758: .4byte gUnk_08114F34
sub_0807F75C: @ 0x0807F75C
push {r4, lr}
ldr r2, [r1, #4]
ldr r3, _0807F774 @ =gLinkEntity
ldr r3, _0807F774 @ =gPlayerEntity
ldr r1, _0807F778 @ =gRoomControls
asrs r0, r2, #0x10
ldrh r4, [r1, #6]
@@ -5677,7 +5677,7 @@ sub_0807F75C: @ 0x0807F75C
strh r0, [r3, #0x32]
pop {r4, pc}
.align 2, 0
_0807F774: .4byte gLinkEntity
_0807F774: .4byte gPlayerEntity
_0807F778: .4byte gRoomControls
thumb_func_start sub_0807F77C
@@ -5996,7 +5996,7 @@ sub_0807F994: @ 0x0807F994
thumb_func_start sub_0807F9A4
sub_0807F9A4: @ 0x0807F9A4
push {lr}
ldr r0, _0807F9BC @ =gLinkState
ldr r0, _0807F9BC @ =gPlayerState
adds r0, #0xa8
ldrb r0, [r0]
subs r0, #5
@@ -6008,7 +6008,7 @@ sub_0807F9A4: @ 0x0807F9A4
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0807F9BC: .4byte gLinkState
_0807F9BC: .4byte gPlayerState
_0807F9C0: .4byte _0807F9C4
_0807F9C4: @ jump table
.4byte _0807FA24 @ case 0
@@ -6056,7 +6056,7 @@ _0807FA3C: .4byte gUnk_02033280
thumb_func_start sub_0807FA40
sub_0807FA40: @ 0x0807FA40
push {lr}
ldr r0, _0807FA58 @ =gLinkState
ldr r0, _0807FA58 @ =gPlayerState
adds r0, #0xa8
ldrb r0, [r0]
subs r0, #5
@@ -6068,7 +6068,7 @@ sub_0807FA40: @ 0x0807FA40
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0807FA58: .4byte gLinkState
_0807FA58: .4byte gPlayerState
_0807FA5C: .4byte _0807FA60
_0807FA60: @ jump table
.4byte _0807FAC0 @ case 0
@@ -6192,21 +6192,21 @@ _0807FB60: .4byte gUnk_02033280
thumb_func_start sub_0807FB64
sub_0807FB64: @ 0x0807FB64
ldr r0, _0807FB70 @ =gLinkEntity
ldr r0, _0807FB70 @ =gPlayerEntity
ldr r1, [r1, #4]
adds r0, #0x3d
strb r1, [r0]
bx lr
.align 2, 0
_0807FB70: .4byte gLinkEntity
_0807FB70: .4byte gPlayerEntity
thumb_func_start sub_0807FB74
sub_0807FB74: @ 0x0807FB74
ldr r0, _0807FB8C @ =gLinkState
ldr r0, _0807FB8C @ =gPlayerState
adds r0, #0x26
movs r1, #0
strb r1, [r0]
ldr r1, _0807FB90 @ =gLinkEntity
ldr r1, _0807FB90 @ =gPlayerEntity
adds r1, #0x3c
ldrb r2, [r1]
movs r0, #0xfb
@@ -6214,8 +6214,8 @@ sub_0807FB74: @ 0x0807FB74
strb r0, [r1]
bx lr
.align 2, 0
_0807FB8C: .4byte gLinkState
_0807FB90: .4byte gLinkEntity
_0807FB8C: .4byte gPlayerState
_0807FB90: .4byte gPlayerEntity
thumb_func_start sub_0807FB94
sub_0807FB94: @ 0x0807FB94
@@ -6240,14 +6240,14 @@ _0807FBB0: .4byte gRoomControls
thumb_func_start sub_0807FBB4
sub_0807FBB4: @ 0x0807FBB4
ldr r2, _0807FBC0 @ =gLinkState
ldr r2, _0807FBC0 @ =gPlayerState
ldrb r1, [r2, #0x1a]
movs r0, #0x80
orrs r0, r1
strb r0, [r2, #0x1a]
bx lr
.align 2, 0
_0807FBC0: .4byte gLinkState
_0807FBC0: .4byte gPlayerState
thumb_func_start sub_0807FBC4
sub_0807FBC4: @ 0x0807FBC4
@@ -6595,21 +6595,21 @@ _0807FE26:
subs r0, #4
strh r0, [r4, #0xc]
ldr r1, [r4, #0x30]
ldr r0, _0807FE3C @ =gLinkEntity
ldr r0, _0807FE3C @ =gPlayerEntity
cmp r1, r0
bne _0807FE80
ldr r0, [r1, #0x30]
ldr r2, _0807FE40 @ =0xFFFFA000
b _0807FE7C
.align 2, 0
_0807FE3C: .4byte gLinkEntity
_0807FE3C: .4byte gPlayerEntity
_0807FE40: .4byte 0xFFFFA000
_0807FE44:
ldrh r0, [r4, #0xa]
adds r0, #4
strh r0, [r4, #0xa]
ldr r1, [r4, #0x30]
ldr r0, _0807FE64 @ =gLinkEntity
ldr r0, _0807FE64 @ =gPlayerEntity
cmp r1, r0
bne _0807FE5C
ldr r0, [r1, #0x2c]
@@ -6623,13 +6623,13 @@ _0807FE5C:
bne _0807FEB6
b _0807FE86
.align 2, 0
_0807FE64: .4byte gLinkEntity
_0807FE64: .4byte gPlayerEntity
_0807FE68:
ldrh r0, [r4, #0xc]
adds r0, #4
strh r0, [r4, #0xc]
ldr r1, [r4, #0x30]
ldr r0, _0807FE90 @ =gLinkEntity
ldr r0, _0807FE90 @ =gPlayerEntity
cmp r1, r0
bne _0807FE80
ldr r0, [r1, #0x30]
@@ -6647,13 +6647,13 @@ _0807FE86:
bl sub_0807FEC8
b _0807FEB6
.align 2, 0
_0807FE90: .4byte gLinkEntity
_0807FE90: .4byte gPlayerEntity
_0807FE94:
ldrh r0, [r4, #0xa]
subs r0, #4
strh r0, [r4, #0xa]
ldr r1, [r4, #0x30]
ldr r0, _0807FEC0 @ =gLinkEntity
ldr r0, _0807FEC0 @ =gPlayerEntity
cmp r1, r0
bne _0807FEAA
ldr r0, [r1, #0x2c]
@@ -6672,7 +6672,7 @@ _0807FEB6:
bl sub_08080BC4
pop {r4, pc}
.align 2, 0
_0807FEC0: .4byte gLinkEntity
_0807FEC0: .4byte gPlayerEntity
_0807FEC4: .4byte 0xFFFFC000
thumb_func_start sub_0807FEC8
@@ -6799,28 +6799,28 @@ sub_0807FF6C: @ 0x0807FF6C
strh r1, [r0]
adds r0, #4
strh r1, [r0]
bl ResetLink
bl ResetPlayer
bl sub_080791D0
ldr r0, _0807FFCC @ =gUnk_03004030
ldrb r0, [r0, #8]
cmp r0, #0
beq _0807FFD4
ldr r1, _0807FFD0 @ =gLinkEntity
ldr r1, _0807FFD0 @ =gPlayerEntity
movs r0, #4
strb r0, [r1, #0x14]
b _0807FFD8
.align 2, 0
_0807FFC8: .4byte gScreen
_0807FFCC: .4byte gUnk_03004030
_0807FFD0: .4byte gLinkEntity
_0807FFD0: .4byte gPlayerEntity
_0807FFD4:
ldr r0, _0807FFE0 @ =gLinkEntity
ldr r0, _0807FFE0 @ =gPlayerEntity
strb r4, [r0, #0x14]
_0807FFD8:
bl sub_080809D4
pop {r4, pc}
.align 2, 0
_0807FFE0: .4byte gLinkEntity
_0807FFE0: .4byte gPlayerEntity
thumb_func_start sub_0807FFE4
sub_0807FFE4: @ 0x0807FFE4
asm/code_080A29BC.s
+30 -30
View File
@@ -222,13 +222,13 @@ _080A2C0E:
beq _080A2CBA
cmp r6, #0
beq _080A2CBA
ldr r0, _080A2C38 @ =gLinkEntity
ldr r0, _080A2C38 @ =gPlayerEntity
lsls r1, r1, #8
movs r2, #0
bl sub_080044AE
b _080A2CBA
.align 2, 0
_080A2C38: .4byte gLinkEntity
_080A2C38: .4byte gPlayerEntity
_080A2C3C:
ldrh r5, [r4, #0x2e]
adds r0, r4, #0
@@ -243,13 +243,13 @@ _080A2C3C:
beq _080A2CBA
cmp r6, #0
beq _080A2CBA
ldr r0, _080A2C64 @ =gLinkEntity
ldr r0, _080A2C64 @ =gPlayerEntity
lsls r1, r1, #8
movs r2, #8
bl sub_080044AE
b _080A2CBA
.align 2, 0
_080A2C64: .4byte gLinkEntity
_080A2C64: .4byte gPlayerEntity
_080A2C68:
ldrh r5, [r4, #0x32]
adds r0, r4, #0
@@ -264,13 +264,13 @@ _080A2C68:
beq _080A2CBA
cmp r6, #0
beq _080A2CBA
ldr r0, _080A2C90 @ =gLinkEntity
ldr r0, _080A2C90 @ =gPlayerEntity
lsls r1, r1, #8
movs r2, #0x10
bl sub_080044AE
b _080A2CBA
.align 2, 0
_080A2C90: .4byte gLinkEntity
_080A2C90: .4byte gPlayerEntity
_080A2C94:
ldrh r5, [r4, #0x2e]
adds r0, r4, #0
@@ -285,14 +285,14 @@ _080A2C94:
beq _080A2CBA
cmp r6, #0
beq _080A2CBA
ldr r0, _080A2CBC @ =gLinkEntity
ldr r0, _080A2CBC @ =gPlayerEntity
lsls r1, r1, #8
movs r2, #0x18
bl sub_080044AE
_080A2CBA:
pop {r4, r5, r6, pc}
.align 2, 0
_080A2CBC: .4byte gLinkEntity
_080A2CBC: .4byte gPlayerEntity
thumb_func_start sub_080A2CC0
sub_080A2CC0: @ 0x080A2CC0
@@ -422,7 +422,7 @@ _080A2D94: .4byte gUnk_081271D4
sub_080A2D98: @ 0x080A2D98
push {r4, lr}
adds r4, r0, #0
ldr r0, _080A2DD0 @ =gLinkState
ldr r0, _080A2DD0 @ =gPlayerState
str r4, [r0, #0x2c]
movs r2, #0
movs r0, #1
@@ -449,12 +449,12 @@ sub_080A2D98: @ 0x080A2D98
str r1, [r4, #0x7c]
b _080A2DDA
.align 2, 0
_080A2DD0: .4byte gLinkState
_080A2DD0: .4byte gPlayerState
_080A2DD4: .4byte gUnk_081271DC
_080A2DD8:
str r2, [r4, #0x70]
_080A2DDA:
ldr r0, _080A2DFC @ =gLinkEntity
ldr r0, _080A2DFC @ =gPlayerEntity
ldrb r1, [r0, #0x14]
movs r0, #0xe
ands r0, r1
@@ -469,13 +469,13 @@ _080A2DDA:
bl sub_080A2E00
pop {r4, pc}
.align 2, 0
_080A2DFC: .4byte gLinkEntity
_080A2DFC: .4byte gPlayerEntity
thumb_func_start sub_080A2E00
sub_080A2E00: @ 0x080A2E00
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
ldr r0, _080A2E90 @ =gLinkEntity
ldr r0, _080A2E90 @ =gPlayerEntity
mov ip, r0
mov r1, ip
adds r1, #0x3d
@@ -507,7 +507,7 @@ _080A2E1A:
strb r2, [r3]
strb r2, [r5]
_080A2E40:
ldr r0, _080A2E94 @ =gLinkState
ldr r0, _080A2E94 @ =gPlayerState
ldrb r3, [r0, #3]
adds r7, r0, #0
cmp r3, #0
@@ -527,7 +527,7 @@ _080A2E40:
adds r0, r0, r1
ldr r0, [r0]
str r0, [r4, #0x48]
ldr r0, _080A2E90 @ =gLinkEntity
ldr r0, _080A2E90 @ =gPlayerEntity
adds r0, #0x3c
ldrb r0, [r0]
adds r0, #1
@@ -547,8 +547,8 @@ _080A2E40:
bl sub_080176E4
b _080A2F30
.align 2, 0
_080A2E90: .4byte gLinkEntity
_080A2E94: .4byte gLinkState
_080A2E90: .4byte gPlayerEntity
_080A2E94: .4byte gPlayerState
_080A2E98: .4byte gUnk_08127240
_080A2E9C:
adds r0, r4, #0
@@ -626,7 +626,7 @@ _080A2F20:
_080A2F2C:
bl DeleteThisEntity
_080A2F30:
ldr r6, _080A301C @ =gLinkEntity
ldr r6, _080A301C @ =gPlayerEntity
ldrh r0, [r6, #0x12]
cmp r0, #1
beq _080A2F3E
@@ -689,7 +689,7 @@ _080A2FA2:
ldrb r0, [r5]
cmp r0, #0xe
bne _080A303E
ldr r0, _080A301C @ =gLinkEntity
ldr r0, _080A301C @ =gPlayerEntity
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #0x7f
@@ -708,7 +708,7 @@ _080A2FA2:
ldr r1, [r4, #0x7c]
adds r2, r1, r0
ldrb r0, [r2]
ldr r7, _080A3020 @ =gLinkState
ldr r7, _080A3020 @ =gPlayerState
cmp r0, #0xff
bne _080A2FEC
ldrb r1, [r7, #3]
@@ -735,7 +735,7 @@ _080A2FEC:
ands r0, r1
cmp r0, #0
beq _080A3028
ldr r0, _080A301C @ =gLinkEntity
ldr r0, _080A301C @ =gPlayerEntity
adds r0, #0x5a
ldrb r0, [r0]
movs r1, #0x7f
@@ -748,11 +748,11 @@ _080A2FEC:
bl sub_080042D0
b _080A303E
.align 2, 0
_080A301C: .4byte gLinkEntity
_080A3020: .4byte gLinkState
_080A301C: .4byte gPlayerEntity
_080A3020: .4byte gPlayerState
_080A3024: .4byte gUnk_081271DC
_080A3028:
ldr r0, _080A3060 @ =gLinkEntity
ldr r0, _080A3060 @ =gPlayerEntity
adds r0, #0x5a
ldrb r0, [r0]
movs r1, #0x7f
@@ -763,7 +763,7 @@ _080A3028:
adds r0, r4, #0
bl sub_080042D0
_080A303E:
ldr r1, _080A3060 @ =gLinkEntity
ldr r1, _080A3060 @ =gPlayerEntity
adds r0, r1, #0
adds r0, #0x5a
ldrb r0, [r0]
@@ -779,7 +779,7 @@ _080A303E:
bl sub_08078E84
b _080A3068
.align 2, 0
_080A3060: .4byte gLinkEntity
_080A3060: .4byte gPlayerEntity
_080A3064:
movs r0, #0xff
strb r0, [r4, #0x1e]
@@ -819,7 +819,7 @@ sub_080A3084: @ 0x080A3084
ldrb r0, [r4, #0xa]
cmp r0, #0
bne _080A30F8
ldr r0, _080A30EC @ =gLinkEntity
ldr r0, _080A30EC @ =gPlayerEntity
adds r0, #0x3c
ldrb r0, [r0]
adds r0, #1
@@ -851,7 +851,7 @@ _080A30CC:
bl PlaySFX
b _080A30FC
.align 2, 0
_080A30EC: .4byte gLinkEntity
_080A30EC: .4byte gPlayerEntity
_080A30F0: .4byte gUnk_08127278
_080A30F4: .4byte 0x0000013F
_080A30F8:
@@ -920,7 +920,7 @@ _080A315C:
ands r1, r3
lsls r1, r1, #6
orrs r0, r1
ldr r1, _080A31F4 @ =gLinkEntity
ldr r1, _080A31F4 @ =gPlayerEntity
adds r1, #0x38
ldrb r1, [r1]
movs r2, #0x80
@@ -974,7 +974,7 @@ _080A31D6:
b _080A3200
.align 2, 0
_080A31F0: .4byte gRoomControls
_080A31F4: .4byte gLinkEntity
_080A31F4: .4byte gPlayerEntity
_080A31F8: .4byte gUnk_08003E44
_080A31FC:
bl DeleteThisEntity
asm/code_080A5574.s
+136 -136
View File
@@ -1835,7 +1835,7 @@ _080A6392:
bl __divsi3
adds r0, #0xc
strh r0, [r5, #2]
ldr r0, _080A642C @ =gLinkState
ldr r0, _080A642C @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #8
ands r0, r1
@@ -1875,7 +1875,7 @@ _080A63EA:
_080A6420: .4byte gMenu
_080A6424: .4byte gUnk_03001010
_080A6428: .4byte gScreenTransition
_080A642C: .4byte gLinkState
_080A642C: .4byte gPlayerState
_080A6430: .4byte 0x000001FB
_080A6434: .4byte gUnk_08128DE8
@@ -2459,7 +2459,7 @@ _080A68D0: .4byte gUnk_02019EE0
thumb_func_start sub_080A68D4
sub_080A68D4: @ 0x080A68D4
push {r4, r5, r6, lr}
ldr r0, _080A690C @ =gLinkState
ldr r0, _080A690C @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #8
ands r0, r1
@@ -2485,7 +2485,7 @@ _080A68E6:
movs r5, #0
b _080A693A
.align 2, 0
_080A690C: .4byte gLinkState
_080A690C: .4byte gPlayerState
_080A6910: .4byte gScreenTransition
_080A6914: .4byte 0x000001FB
_080A6918: .4byte gUnk_02002A40
@@ -2791,7 +2791,7 @@ sub_080A6B04: @ 0x080A6B04
movs r2, #0x80
lsls r2, r2, #5
bl _DmaFill16
ldr r0, _080A6C0C @ =gLinkState
ldr r0, _080A6C0C @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #8
ands r0, r1
@@ -2858,7 +2858,7 @@ _080A6BFC: .4byte gMenu
_080A6C00: .4byte 0x0000475F
_080A6C04: .4byte 0x00005001
_080A6C08: .4byte gUnk_02001A40
_080A6C0C: .4byte gLinkState
_080A6C0C: .4byte gPlayerState
_080A6C10: .4byte gScreenTransition
_080A6C14: .4byte 0x000001FB
_080A6C18: .4byte gUnk_08128E94
@@ -3128,7 +3128,7 @@ sub_080A6DF8: @ 0x080A6DF8
_080A6E14: .4byte gMenu
_080A6E18:
bl sub_080791D0
ldr r0, _080A6E3C @ =gLinkEntity
ldr r0, _080A6E3C @ =gPlayerEntity
adds r1, r0, #0
adds r1, #0x58
ldrb r1, [r1]
@@ -3143,7 +3143,7 @@ _080A6E18:
_080A6E3A:
pop {pc}
.align 2, 0
_080A6E3C: .4byte gLinkEntity
_080A6E3C: .4byte gPlayerEntity
_080A6E40: .4byte gUnk_02034490
thumb_func_start sub_080A6E44
@@ -3722,7 +3722,7 @@ sub_080A7250: @ 0x080A7250
adds r0, #0x2f
ldrb r0, [r0]
strb r0, [r1, #0xd]
ldr r0, _080A7318 @ =gLinkState
ldr r0, _080A7318 @ =gPlayerState
adds r0, #0x8b
ldrb r0, [r0]
strb r0, [r1, #0xc]
@@ -3752,7 +3752,7 @@ _080A7308: .4byte gRoomControls
_080A730C: .4byte gUnk_03000420
_080A7310: .4byte gUnk_02033280
_080A7314: .4byte gScreenTransition
_080A7318: .4byte gLinkState
_080A7318: .4byte gPlayerState
_080A731C: .4byte gUnk_02017654
_080A7320: .4byte gUnk_02025EB0
_080A7324: .4byte gUnk_0200B650
@@ -3823,7 +3823,7 @@ _080A73B4:
ldr r5, _080A7470 @ =gUnk_02032EC0
ldr r0, [r5, #0x10]
str r0, [r1]
ldr r0, _080A7474 @ =gLinkState
ldr r0, _080A7474 @ =gPlayerState
ldrb r1, [r5, #0xc]
adds r0, #0x8b
strb r1, [r0]
@@ -3896,7 +3896,7 @@ _080A73B4:
_080A7468: .4byte gUnk_03000FD0
_080A746C: .4byte gUnk_02017654
_080A7470: .4byte gUnk_02032EC0
_080A7474: .4byte gLinkState
_080A7474: .4byte gPlayerState
_080A7478: .4byte gUnk_02025EB0
_080A747C: .4byte gUnk_0200B650
_080A7480: .4byte gUnk_02033280
@@ -3996,7 +3996,7 @@ sub_080A7544: @ 0x080A7544
ldrb r0, [r4, #0xa]
cmp r0, #0
bne _080A7582
ldr r1, _080A7588 @ =gLinkEntity
ldr r1, _080A7588 @ =gPlayerEntity
adds r0, r4, #0
bl sub_08078E84
ldr r1, [r4, #0x48]
@@ -4017,7 +4017,7 @@ _080A7582:
pop {r4, pc}
.align 2, 0
_080A7584: .4byte gUnk_0812905C
_080A7588: .4byte gLinkEntity
_080A7588: .4byte gPlayerEntity
thumb_func_start sub_080A758C
sub_080A758C: @ 0x080A758C
@@ -4026,7 +4026,7 @@ sub_080A758C: @ 0x080A758C
ldrb r0, [r5, #0xa]
cmp r0, #0
bne _080A75AC
ldr r1, _080A7654 @ =gLinkState
ldr r1, _080A7654 @ =gPlayerState
ldrb r0, [r1, #4]
cmp r0, #0
bne _080A75AC
@@ -4047,7 +4047,7 @@ _080A75BA:
movs r1, #1
movs r2, #3
bl sub_080AE008
ldr r1, _080A7658 @ =gLinkEntity
ldr r1, _080A7658 @ =gPlayerEntity
adds r0, r1, #0
adds r0, #0x3c
ldrb r0, [r0]
@@ -4087,7 +4087,7 @@ _080A75BA:
ldrb r0, [r5, #0xa]
cmp r0, #0
bne _080A76BC
ldr r2, _080A7654 @ =gLinkState
ldr r2, _080A7654 @ =gPlayerState
ldrb r1, [r2, #2]
movs r0, #0x20
ands r0, r1
@@ -4119,8 +4119,8 @@ _080A75BA:
movs r0, #0x1a
b _080A766A
.align 2, 0
_080A7654: .4byte gLinkState
_080A7658: .4byte gLinkEntity
_080A7654: .4byte gPlayerState
_080A7658: .4byte gPlayerEntity
_080A765C:
adds r1, r5, #0
adds r1, #0x40
@@ -4151,7 +4151,7 @@ _080A767A:
adds r0, r5, #0
bl sub_080A76CC
_080A7692:
ldr r0, _080A76B0 @ =gLinkState
ldr r0, _080A76B0 @ =gPlayerState
str r5, [r0, #0x2c]
adds r0, r5, #0
bl sub_08079BD8
@@ -4164,7 +4164,7 @@ _080A7692:
bl PlaySFX
b _080A76C2
.align 2, 0
_080A76B0: .4byte gLinkState
_080A76B0: .4byte gPlayerState
_080A76B4: .4byte gUnk_0812906C
_080A76B8: .4byte gUnk_08129068
_080A76BC:
@@ -4185,7 +4185,7 @@ sub_080A76CC: @ 0x080A76CC
beq _080A76D8
b _080A77DC
_080A76D8:
ldr r5, _080A771C @ =gLinkState
ldr r5, _080A771C @ =gPlayerState
ldr r0, [r5, #0x2c]
cmp r0, r4
beq _080A76E4
@@ -4219,7 +4219,7 @@ _080A76F2:
movs r0, #0xa
b _080A7726
.align 2, 0
_080A771C: .4byte gLinkState
_080A771C: .4byte gPlayerState
_080A7720:
movs r0, #8
b _080A7726
@@ -4228,7 +4228,7 @@ _080A7724:
_080A7726:
strb r0, [r1]
_080A7728:
ldr r0, _080A7740 @ =gLinkEntity
ldr r0, _080A7740 @ =gPlayerEntity
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #0x20
@@ -4240,7 +4240,7 @@ _080A7728:
bl PlaySFX
b _080A77C4
.align 2, 0
_080A7740: .4byte gLinkEntity
_080A7740: .4byte gPlayerEntity
_080A7744:
ldr r0, [r5, #0x30]
movs r1, #0x80
@@ -4264,14 +4264,14 @@ _080A7762:
_080A7768:
strb r0, [r1]
_080A776A:
ldr r0, _080A77D0 @ =gLinkState
ldr r0, _080A77D0 @ =gPlayerState
adds r0, #0x3e
ldrb r0, [r0]
movs r2, #3
ands r2, r0
cmp r2, #0
beq _080A77C4
ldr r0, _080A77D4 @ =gLinkEntity
ldr r0, _080A77D4 @ =gPlayerEntity
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #0x40
@@ -4311,16 +4311,16 @@ _080A77BE:
adds r0, r0, r1
strh r0, [r2, #0x2e]
_080A77C4:
ldr r1, _080A77D4 @ =gLinkEntity
ldr r1, _080A77D4 @ =gPlayerEntity
adds r0, r4, #0
bl sub_080A78B8
b _080A7806
.align 2, 0
_080A77D0: .4byte gLinkState
_080A77D4: .4byte gLinkEntity
_080A77D0: .4byte gPlayerState
_080A77D4: .4byte gPlayerEntity
_080A77D8: .4byte gUnk_081292E2
_080A77DC:
ldr r1, _080A7810 @ =gLinkState
ldr r1, _080A7810 @ =gPlayerState
ldrb r0, [r1, #4]
cmp r0, #0
beq _080A7814
@@ -4345,7 +4345,7 @@ _080A7806:
bl sub_080A7A84
b _080A7820
.align 2, 0
_080A7810: .4byte gLinkState
_080A7810: .4byte gPlayerState
_080A7814:
movs r0, #0xff
strb r0, [r4, #0x1e]
@@ -4361,7 +4361,7 @@ _080A7820:
sub_080A7824: @ 0x080A7824
push {r4, r5, r6, lr}
adds r4, r0, #0
ldr r5, _080A7860 @ =gLinkState
ldr r5, _080A7860 @ =gPlayerState
ldr r0, [r5, #0x2c]
cmp r0, r4
beq _080A7834
@@ -4376,7 +4376,7 @@ _080A7834:
str r0, [r5, #0x2c]
bl DeleteThisEntity
_080A7846:
ldr r2, _080A7864 @ =gLinkEntity
ldr r2, _080A7864 @ =gPlayerEntity
adds r6, r2, #0
adds r6, #0x5a
ldrb r1, [r6]
@@ -4389,8 +4389,8 @@ _080A7846:
bl DeleteThisEntity
b _080A78B4
.align 2, 0
_080A7860: .4byte gLinkState
_080A7864: .4byte gLinkEntity
_080A7860: .4byte gPlayerState
_080A7864: .4byte gPlayerEntity
_080A7868:
adds r0, r4, #0
adds r1, r2, #0
@@ -4441,7 +4441,7 @@ sub_080A78B8: @ 0x080A78B8
push {r7}
adds r4, r0, #0
adds r6, r1, #0
ldr r0, _080A78E8 @ =gLinkState
ldr r0, _080A78E8 @ =gPlayerState
ldrb r1, [r0, #0x1b]
movs r0, #0x20
ands r0, r1
@@ -4461,7 +4461,7 @@ sub_080A78B8: @ 0x080A78B8
adds r1, #0xb1
b _080A78F2
.align 2, 0
_080A78E8: .4byte gLinkState
_080A78E8: .4byte gPlayerState
_080A78EC: .4byte gScreenTransition
_080A78F0:
ldrb r1, [r4, #0x1e]
@@ -4482,7 +4482,7 @@ _080A78FC:
adds r0, r4, #0
bl sub_080042D0
_080A7912:
ldr r2, _080A792C @ =gLinkState
ldr r2, _080A792C @ =gPlayerState
ldrb r1, [r2, #0x1b]
movs r0, #0x40
ands r0, r1
@@ -4495,7 +4495,7 @@ _080A7912:
ands r0, r1
b _080A7958
.align 2, 0
_080A792C: .4byte gLinkState
_080A792C: .4byte gPlayerState
_080A7930:
ldrb r1, [r6, #0x14]
movs r0, #2
@@ -4657,7 +4657,7 @@ _080A7A4C:
thumb_func_start sub_080A7A54
sub_080A7A54: @ 0x080A7A54
ldr r1, _080A7A7C @ =gLinkEntity
ldr r1, _080A7A7C @ =gPlayerEntity
ldrb r1, [r1, #0x1e]
subs r1, #0x6a
lsls r1, r1, #2
@@ -4677,14 +4677,14 @@ sub_080A7A54: @ 0x080A7A54
strb r0, [r2, #7]
bx lr
.align 2, 0
_080A7A7C: .4byte gLinkEntity
_080A7A7C: .4byte gPlayerEntity
_080A7A80: .4byte gUnk_08129096
thumb_func_start sub_080A7A84
sub_080A7A84: @ 0x080A7A84
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
ldr r6, _080A7AE0 @ =gLinkEntity
ldr r6, _080A7AE0 @ =gPlayerEntity
adds r0, r6, #0
adds r0, #0x5a
ldrb r0, [r0]
@@ -4702,7 +4702,7 @@ sub_080A7A84: @ 0x080A7A84
adds r0, r0, r2
movs r5, #0
ldrsb r5, [r0, r5]
ldr r2, _080A7AE8 @ =gLinkState
ldr r2, _080A7AE8 @ =gPlayerState
ldrb r1, [r2, #0x1b]
movs r0, #0xc0
ands r0, r1
@@ -4729,9 +4729,9 @@ _080A7AC4:
bl sub_08008796
b _080A7B8C
.align 2, 0
_080A7AE0: .4byte gLinkEntity
_080A7AE0: .4byte gPlayerEntity
_080A7AE4: .4byte gUnk_08129072
_080A7AE8: .4byte gLinkState
_080A7AE8: .4byte gPlayerState
_080A7AEC:
ldr r0, [r4, #0x34]
cmp r0, #0
@@ -4769,15 +4769,15 @@ _080A7AEC:
bl sub_080002B4
cmp r0, #0x2e
bne _080A7B4C
ldr r0, _080A7B44 @ =gLinkEntity
ldr r0, _080A7B44 @ =gPlayerEntity
ldr r1, _080A7B48 @ =0x00000119
bl sub_0800449C
b _080A7B54
.align 2, 0
_080A7B44: .4byte gLinkEntity
_080A7B44: .4byte gPlayerEntity
_080A7B48: .4byte 0x00000119
_080A7B4C:
ldr r0, _080A7B90 @ =gLinkEntity
ldr r0, _080A7B90 @ =gPlayerEntity
movs r1, #0x74
bl sub_0800449C
_080A7B54:
@@ -4811,7 +4811,7 @@ _080A7B54:
_080A7B8C:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A7B90: .4byte gLinkEntity
_080A7B90: .4byte gPlayerEntity
_080A7B94: .4byte gUnk_0812908E
thumb_func_start sub_080A7B98
@@ -4822,7 +4822,7 @@ sub_080A7B98: @ 0x080A7B98
mov r5, r8
push {r5, r6, r7}
adds r6, r0, #0
ldr r0, _080A7BFC @ =gLinkState
ldr r0, _080A7BFC @ =gPlayerState
adds r0, #0xac
ldrh r1, [r0]
movs r0, #8
@@ -4868,7 +4868,7 @@ _080A7BCE:
mov sl, r5
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A7BFC: .4byte gLinkState
_080A7BFC: .4byte gPlayerState
thumb_func_start CreateItemEntity
CreateItemEntity: @ 0x080A7C00
@@ -4891,7 +4891,7 @@ sub_080A7C18: @ 0x080A7C18
adds r2, r0, #0
cmp r2, #0
beq _080A7C32
ldr r0, _080A7C34 @ =gLinkEntity
ldr r0, _080A7C34 @ =gPlayerEntity
str r0, [r2, #0x50]
ldrb r1, [r2, #0xa]
adds r0, r2, #0
@@ -4900,7 +4900,7 @@ sub_080A7C18: @ 0x080A7C18
_080A7C32:
pop {pc}
.align 2, 0
_080A7C34: .4byte gLinkEntity
_080A7C34: .4byte gPlayerEntity
thumb_func_start GiveItemWithCutscene
GiveItemWithCutscene: @ 0x080A7C38
@@ -5331,7 +5331,7 @@ _080A7F38:
cmp r0, #0
beq _080A7F56
ldr r1, [r4, #0x4c]
ldr r0, _080A7F7C @ =gLinkEntity
ldr r0, _080A7F7C @ =gPlayerEntity
cmp r1, r0
bne _080A7F56
adds r1, r4, #0
@@ -5357,7 +5357,7 @@ _080A7F56:
_080A7F7A:
pop {r4, pc}
.align 2, 0
_080A7F7C: .4byte gLinkEntity
_080A7F7C: .4byte gPlayerEntity
thumb_func_start sub_080A7F80
sub_080A7F80: @ 0x080A7F80
@@ -6393,7 +6393,7 @@ _080A8700:
ands r0, r1
cmp r0, #3
bne _080A8768
ldr r0, _080A875C @ =gLinkState
ldr r0, _080A875C @ =gPlayerState
ldrb r0, [r0, #0xf]
cmp r0, #0
beq _080A876E
@@ -6412,7 +6412,7 @@ _080A8700:
ands r1, r3
lsls r1, r1, #6
orrs r0, r1
ldr r1, _080A8764 @ =gLinkEntity
ldr r1, _080A8764 @ =gPlayerEntity
adds r1, #0x38
ldrb r1, [r1]
bl sub_080002E0
@@ -6430,9 +6430,9 @@ _080A8700:
bl DeleteThisEntity
b _080A876E
.align 2, 0
_080A875C: .4byte gLinkState
_080A875C: .4byte gPlayerState
_080A8760: .4byte gRoomControls
_080A8764: .4byte gLinkEntity
_080A8764: .4byte gPlayerEntity
_080A8768:
adds r0, r4, #0
bl DeleteEntity
@@ -6549,7 +6549,7 @@ sub_080A881C: @ 0x080A881C
ldrb r0, [r0]
cmp r0, #0x80
bne _080A884A
ldr r0, _080A8850 @ =gLinkState
ldr r0, _080A8850 @ =gPlayerState
movs r1, #0xf0
strb r1, [r0, #0xf]
movs r0, #2
@@ -6559,7 +6559,7 @@ _080A884A:
bl DeleteThisEntity
b _080A8866
.align 2, 0
_080A8850: .4byte gLinkState
_080A8850: .4byte gPlayerState
_080A8854:
ldrb r0, [r1, #0xc]
cmp r0, #1
@@ -6713,7 +6713,7 @@ _080A8962:
ldrh r0, [r4, #0x36]
adds r0, #0xe
strh r0, [r4, #0x36]
ldr r1, _080A8984 @ =gLinkEntity
ldr r1, _080A8984 @ =gPlayerEntity
adds r0, r4, #0
movs r2, #0xe
movs r3, #0xe
@@ -6728,7 +6728,7 @@ _080A8962:
_080A8982:
pop {r4, r5, r6, pc}
.align 2, 0
_080A8984: .4byte gLinkEntity
_080A8984: .4byte gPlayerEntity
thumb_func_start sub_080A8988
sub_080A8988: @ 0x080A8988
@@ -7403,7 +7403,7 @@ _080A8E88:
bge _080A8E8E
b _080A8FAE
_080A8E8E:
ldr r0, _080A8EC0 @ =gLinkEntity
ldr r0, _080A8EC0 @ =gPlayerEntity
movs r2, #0x2e
ldrsh r1, [r0, r2]
movs r3, #0x32
@@ -7426,7 +7426,7 @@ _080A8E8E:
adds r4, r4, r2
b _080A8ECE
.align 2, 0
_080A8EC0: .4byte gLinkEntity
_080A8EC0: .4byte gPlayerEntity
_080A8EC4: .4byte 0x000001FF
_080A8EC8: .4byte gScreenTransition
_080A8ECC:
@@ -7582,7 +7582,7 @@ _080A8FE8:
bne _080A901C
movs r0, #0x1e
strb r0, [r4, #0xf]
ldr r1, _080A9048 @ =gLinkEntity
ldr r1, _080A9048 @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
adds r1, r0, #0
@@ -7608,7 +7608,7 @@ _080A901C:
bl InitializeAnimation
b _080A9054
.align 2, 0
_080A9048: .4byte gLinkEntity
_080A9048: .4byte gPlayerEntity
_080A904C:
adds r0, r4, #0
movs r1, #0x52
@@ -7781,7 +7781,7 @@ _080A917C:
cmp r0, #0
beq _080A9198
ldr r1, [r5, #0x4c]
ldr r0, _080A91A0 @ =gLinkEntity
ldr r0, _080A91A0 @ =gPlayerEntity
cmp r1, r0
bne _080A9198
adds r0, r5, #0
@@ -7791,7 +7791,7 @@ _080A9198:
bl DeleteEntity
b _080A91D8
.align 2, 0
_080A91A0: .4byte gLinkEntity
_080A91A0: .4byte gPlayerEntity
_080A91A4:
ldr r1, _080A91DC @ =gUnk_08129998
ldrb r0, [r4, #0x14]
@@ -8513,7 +8513,7 @@ _080A96F8:
bl InitializeAnimation
b _080A9756
_080A9718:
ldr r0, _080A9760 @ =gLinkEntity
ldr r0, _080A9760 @ =gPlayerEntity
adds r1, r4, #0
bl CopyPosition
ldr r0, _080A9764 @ =0xFF600000
@@ -8544,7 +8544,7 @@ _080A9756:
bl PlaySFX
pop {r4, r5, pc}
.align 2, 0
_080A9760: .4byte gLinkEntity
_080A9760: .4byte gPlayerEntity
_080A9764: .4byte 0xFF600000
_080A9768: .4byte 0x000001B5
@@ -9374,7 +9374,7 @@ sub_080A9D2C: @ 0x080A9D2C
movs r0, #2
rsbs r0, r0, #0
bl ModHealth
ldr r0, _080A9D68 @ =gLinkEntity
ldr r0, _080A9D68 @ =gPlayerEntity
movs r1, #0x7a
bl sub_0800449C
bl sub_08079D84
@@ -9387,7 +9387,7 @@ _080A9D56:
_080A9D64:
pop {r4, pc}
.align 2, 0
_080A9D68: .4byte gLinkEntity
_080A9D68: .4byte gPlayerEntity
thumb_func_start sub_080A9D6C
sub_080A9D6C: @ 0x080A9D6C
@@ -10728,7 +10728,7 @@ sub_080AA78C: @ 0x080AA78C
ldrb r0, [r4, #0xd]
cmp r0, #0
bne _080AA7DA
ldr r0, _080AA7C8 @ =gLinkEntity
ldr r0, _080AA7C8 @ =gPlayerEntity
ldrb r0, [r0, #0x14]
lsrs r2, r0, #1
ldrb r0, [r4, #0xa]
@@ -10753,7 +10753,7 @@ sub_080AA78C: @ 0x080AA78C
bl sub_080AA6C0
b _080AA832
.align 2, 0
_080AA7C8: .4byte gLinkEntity
_080AA7C8: .4byte gPlayerEntity
_080AA7CC:
movs r0, #1
strb r0, [r4, #0xd]
@@ -10881,7 +10881,7 @@ _080AA8B4: .4byte gUnk_0812A05C
sub_080AA8B8: @ 0x080AA8B8
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
ldr r7, _080AA99C @ =gLinkEntity
ldr r7, _080AA99C @ =gPlayerEntity
adds r0, #0x84
ldrb r0, [r0]
cmp r0, #0
@@ -10936,7 +10936,7 @@ _080AA920:
ldrb r2, [r4, #0xa]
cmp r0, r2
bne _080AA99A
ldr r1, _080AA9A4 @ =gLinkState
ldr r1, _080AA9A4 @ =gPlayerState
adds r0, r1, #0
adds r0, #0xa8
ldrb r0, [r0]
@@ -10948,7 +10948,7 @@ _080AA920:
ands r0, r1
cmp r0, #0
beq _080AA99A
ldr r0, _080AA99C @ =gLinkEntity
ldr r0, _080AA99C @ =gPlayerEntity
adds r0, #0x5a
ldrb r1, [r0]
adds r0, r2, #0
@@ -10993,9 +10993,9 @@ _080AA920:
_080AA99A:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080AA99C: .4byte gLinkEntity
_080AA99C: .4byte gPlayerEntity
_080AA9A0: .4byte gUnk_0812A064
_080AA9A4: .4byte gLinkState
_080AA9A4: .4byte gPlayerState
_080AA9A8: .4byte gUnk_0812A06C
thumb_func_start sub_080AA9AC
@@ -11037,16 +11037,16 @@ sub_080AA9E0: @ 0x080AA9E0
ands r0, r1
cmp r0, #0
beq _080AAA00
ldr r0, _080AA9FC @ =gLinkEntity
ldr r0, _080AA9FC @ =gPlayerEntity
movs r2, #0x2e
ldrsh r1, [r0, r2]
movs r2, #0x2e
ldrsh r0, [r5, r2]
b _080AAA0A
.align 2, 0
_080AA9FC: .4byte gLinkEntity
_080AA9FC: .4byte gPlayerEntity
_080AAA00:
ldr r0, _080AAA24 @ =gLinkEntity
ldr r0, _080AAA24 @ =gPlayerEntity
movs r2, #0x32
ldrsh r1, [r0, r2]
movs r2, #0x32
@@ -11065,7 +11065,7 @@ _080AAA0A:
beq _080AAA30
b _080AAA40
.align 2, 0
_080AAA24: .4byte gLinkEntity
_080AAA24: .4byte gPlayerEntity
_080AAA28: .4byte gUnk_0812A074
_080AAA2C:
cmp r2, #3
@@ -11381,19 +11381,19 @@ sub_080AAC44: @ 0x080AAC44
ldrb r0, [r4, #0xa]
cmp r0, #0
bne _080AAC84
ldr r0, _080AAC80 @ =gLinkEntity
ldr r0, _080AAC80 @ =gPlayerEntity
adds r1, r4, #0
bl ResolveEntityOnTop
b _080AAC8C
.align 2, 0
_080AAC80: .4byte gLinkEntity
_080AAC80: .4byte gPlayerEntity
_080AAC84:
ldr r0, [r4, #0x50]
adds r1, r4, #0
bl ResolveEntityOnTop
_080AAC8C:
bl ResetLink
ldr r2, _080AACB4 @ =gLinkState
bl ResetPlayer
ldr r2, _080AACB4 @ =gPlayerState
ldrb r1, [r2, #0x1a]
movs r0, #0x80
orrs r1, r0
@@ -11402,7 +11402,7 @@ _080AAC8C:
orrs r0, r1
strb r0, [r2, #0xa]
_080AACA0:
ldr r0, _080AACB8 @ =gLinkEntity
ldr r0, _080AACB8 @ =gPlayerEntity
adds r0, #0x45
ldrb r1, [r0]
cmp r1, #0
@@ -11412,8 +11412,8 @@ _080AACA0:
strb r1, [r0]
b _080AACCA
.align 2, 0
_080AACB4: .4byte gLinkState
_080AACB8: .4byte gLinkEntity
_080AACB4: .4byte gPlayerState
_080AACB8: .4byte gPlayerEntity
_080AACBC:
ldr r0, _080AACDC @ =0x00000119
bl PlaySFX
@@ -11620,7 +11620,7 @@ _080AADE0:
ands r0, r1
orrs r0, r3
strb r0, [r2]
ldr r1, _080AAE60 @ =gLinkEntity
ldr r1, _080AAE60 @ =gPlayerEntity
adds r0, r5, #0
bl GetFacingDirection
strb r0, [r5, #0x15]
@@ -11644,7 +11644,7 @@ _080AADE0:
str r5, [r1, #0x50]
b _080AAE7C
.align 2, 0
_080AAE60: .4byte gLinkEntity
_080AAE60: .4byte gPlayerEntity
_080AAE64:
ldr r0, [r5, #0x50]
adds r1, r5, #0
@@ -11688,7 +11688,7 @@ _080AAEA2:
bne _080AAEC2
movs r0, #4
strb r0, [r4, #0xf]
ldr r1, _080AAECC @ =gLinkEntity
ldr r1, _080AAECC @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
adds r1, r0, #0
@@ -11699,7 +11699,7 @@ _080AAEC2:
bl sub_0806F69C
b _080AAEF6
.align 2, 0
_080AAECC: .4byte gLinkEntity
_080AAECC: .4byte gPlayerEntity
_080AAED0:
ldr r0, [r4, #0x50]
cmp r0, #0
@@ -11816,7 +11816,7 @@ _080AAF94:
bne _080AAFCC
movs r0, #0x1e
strb r0, [r5, #0xe]
ldr r4, _080AAFFC @ =gLinkEntity
ldr r4, _080AAFFC @ =gPlayerEntity
adds r1, r4, #0
adds r1, #0x3d
movs r0, #8
@@ -11849,22 +11849,22 @@ _080AAFE0:
movs r0, #1
strb r0, [r5, #0xc]
strb r2, [r1]
ldr r0, _080AAFFC @ =gLinkEntity
ldr r0, _080AAFFC @ =gPlayerEntity
adds r0, #0x3d
movs r1, #0xf0
strb r1, [r0]
ldr r0, _080AB000 @ =gLinkState
ldr r0, _080AB000 @ =gPlayerState
strb r2, [r0, #0x1a]
adds r0, r5, #0
adds r0, #0x45
strb r2, [r0]
b _080AB028
.align 2, 0
_080AAFFC: .4byte gLinkEntity
_080AB000: .4byte gLinkState
_080AAFFC: .4byte gPlayerEntity
_080AB000: .4byte gPlayerState
_080AB004:
bl ResetLink
ldr r2, _080AB02C @ =gLinkState
bl ResetPlayer
ldr r2, _080AB02C @ =gPlayerState
ldrb r1, [r2, #0x1a]
movs r0, #0x80
orrs r1, r0
@@ -11872,7 +11872,7 @@ _080AB004:
ldrb r1, [r2, #0xa]
orrs r0, r1
strb r0, [r2, #0xa]
ldr r4, _080AB030 @ =gLinkEntity
ldr r4, _080AB030 @ =gPlayerEntity
adds r0, r4, #0
adds r1, r5, #0
bl CopyPosition
@@ -11882,8 +11882,8 @@ _080AB004:
_080AB028:
pop {r4, r5, pc}
.align 2, 0
_080AB02C: .4byte gLinkState
_080AB030: .4byte gLinkEntity
_080AB02C: .4byte gPlayerState
_080AB030: .4byte gPlayerEntity
thumb_func_start sub_080AB034
sub_080AB034: @ 0x080AB034
@@ -13568,7 +13568,7 @@ sub_080ABC90: @ 0x080ABC90
movs r0, #2
rsbs r0, r0, #0
bl ModHealth
ldr r0, _080ABCC0 @ =gLinkEntity
ldr r0, _080ABCC0 @ =gPlayerEntity
movs r1, #0x7a
bl sub_0800449C
bl sub_08079D84
@@ -13580,7 +13580,7 @@ sub_080ABC90: @ 0x080ABC90
_080ABCBE:
pop {r4, pc}
.align 2, 0
_080ABCC0: .4byte gLinkEntity
_080ABCC0: .4byte gPlayerEntity
thumb_func_start sub_080ABCC4
sub_080ABCC4: @ 0x080ABCC4
@@ -13906,7 +13906,7 @@ sub_080ABF40: @ 0x080ABF40
bne _080ABF66
movs r0, #1
strb r0, [r4, #0xc]
ldr r1, _080ABFA0 @ =gLinkEntity
ldr r1, _080ABFA0 @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
strb r0, [r4, #0x15]
@@ -13943,7 +13943,7 @@ _080ABF88:
_080ABF9C:
pop {r4, pc}
.align 2, 0
_080ABFA0: .4byte gLinkEntity
_080ABFA0: .4byte gPlayerEntity
_080ABFA4: .4byte 0x00000199
thumb_func_start sub_080ABFA8
@@ -14102,7 +14102,7 @@ _080AC0B2:
bne _080AC0F0
movs r0, #2
strb r0, [r4, #0xc]
ldr r1, _080AC0EC @ =gLinkEntity
ldr r1, _080AC0EC @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
strb r0, [r4, #0x15]
@@ -14114,7 +14114,7 @@ _080AC0B2:
b _080AC0F8
.align 2, 0
_080AC0E8: .4byte 0x00000149
_080AC0EC: .4byte gLinkEntity
_080AC0EC: .4byte gPlayerEntity
_080AC0F0:
movs r0, #3
strb r0, [r4, #0xc]
@@ -14167,7 +14167,7 @@ _080AC13A:
ands r0, r1
cmp r0, #0
bne _080AC160
ldr r1, _080AC164 @ =gLinkEntity
ldr r1, _080AC164 @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
adds r1, r0, #0
@@ -14176,7 +14176,7 @@ _080AC13A:
_080AC160:
pop {r4, pc}
.align 2, 0
_080AC164: .4byte gLinkEntity
_080AC164: .4byte gPlayerEntity
thumb_func_start sub_080AC168
sub_080AC168: @ 0x080AC168
@@ -14205,7 +14205,7 @@ sub_080AC168: @ 0x080AC168
adds r0, r5, r0
ldrb r0, [r0]
strb r0, [r4, #0xf]
ldr r1, _080AC1C8 @ =gLinkEntity
ldr r1, _080AC1C8 @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
adds r1, r0, #0
@@ -14223,7 +14223,7 @@ sub_080AC168: @ 0x080AC168
.align 2, 0
_080AC1C0: .4byte 0xFFFF8000
_080AC1C4: .4byte gUnk_0812A982
_080AC1C8: .4byte gLinkEntity
_080AC1C8: .4byte gPlayerEntity
_080AC1CC: .4byte gUnk_0812A98A
_080AC1D0:
cmp r0, #2
@@ -15295,7 +15295,7 @@ _080AC964:
movs r1, #0x80
orrs r0, r1
strb r0, [r5, #0x10]
ldr r1, _080AC9C8 @ =gLinkEntity
ldr r1, _080AC9C8 @ =gPlayerEntity
adds r0, r5, #0
bl GetFacingDirection
strb r0, [r5, #0x15]
@@ -15306,7 +15306,7 @@ _080AC9C0:
pop {r4, r5, pc}
.align 2, 0
_080AC9C4: .4byte gSineTable
_080AC9C8: .4byte gLinkEntity
_080AC9C8: .4byte gPlayerEntity
thumb_func_start sub_080AC9CC
sub_080AC9CC: @ 0x080AC9CC
@@ -15586,7 +15586,7 @@ _080ACBC8: .4byte 0x00000119
sub_080ACBCC: @ 0x080ACBCC
push {r4, lr}
adds r4, r0, #0
ldr r0, _080ACBFC @ =gLinkState
ldr r0, _080ACBFC @ =gPlayerState
ldrb r1, [r0, #0x1c]
movs r0, #0x7f
ands r0, r1
@@ -15607,7 +15607,7 @@ _080ACBE0:
strb r0, [r1]
pop {r4, pc}
.align 2, 0
_080ACBFC: .4byte gLinkState
_080ACBFC: .4byte gPlayerState
_080ACC00: .4byte gUnk_0812AA80
thumb_func_start sub_080ACC04
@@ -15616,7 +15616,7 @@ sub_080ACC04: @ 0x080ACC04
adds r4, r0, #0
movs r0, #1
strb r0, [r4, #0xc]
ldr r0, _080ACC54 @ =gLinkEntity
ldr r0, _080ACC54 @ =gPlayerEntity
adds r0, #0x3b
ldrb r0, [r0]
adds r1, r4, #0
@@ -15650,7 +15650,7 @@ sub_080ACC04: @ 0x080ACC04
bl sub_0801766C
pop {r4, pc}
.align 2, 0
_080ACC54: .4byte gLinkEntity
_080ACC54: .4byte gPlayerEntity
_080ACC58: .4byte gUnk_0812AAD8
thumb_func_start sub_080ACC5C
@@ -15844,7 +15844,7 @@ sub_080ACDB0: @ 0x080ACDB0
ldrb r0, [r4, #0xa]
cmp r0, #0
bne _080ACDE8
ldr r2, _080ACDE0 @ =gLinkEntity
ldr r2, _080ACDE0 @ =gPlayerEntity
ldr r1, _080ACDE4 @ =gUnk_08126EE4
ldrb r0, [r4, #0x14]
adds r0, r0, r1
@@ -15864,7 +15864,7 @@ sub_080ACDB0: @ 0x080ACDB0
adds r0, r0, r2
b _080ACEB4
.align 2, 0
_080ACDE0: .4byte gLinkEntity
_080ACDE0: .4byte gPlayerEntity
_080ACDE4: .4byte gUnk_08126EE4
_080ACDE8:
ldrb r2, [r4, #0x14]
@@ -15977,7 +15977,7 @@ _080ACEB0:
_080ACEB4:
strh r0, [r4, #0x32]
_080ACEB6:
ldr r0, _080ACEC8 @ =gLinkEntity
ldr r0, _080ACEC8 @ =gPlayerEntity
adds r0, #0x38
ldrb r1, [r0]
adds r0, r4, #0
@@ -15986,7 +15986,7 @@ _080ACEB6:
movs r0, #0
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080ACEC8: .4byte gLinkEntity
_080ACEC8: .4byte gPlayerEntity
thumb_func_start sub_080ACECC
sub_080ACECC: @ 0x080ACECC
@@ -16145,11 +16145,11 @@ _080ACFE8:
bl DeleteThisEntity
b _080AD03C
_080ACFF8:
ldr r0, _080AD02C @ =gLinkState
ldr r0, _080AD02C @ =gPlayerState
ldrb r0, [r0, #5]
cmp r0, #0
beq _080AD00E
ldr r0, _080AD030 @ =gLinkEntity
ldr r0, _080AD030 @ =gPlayerEntity
adds r0, #0x79
ldrb r1, [r0]
movs r0, #0x7f
@@ -16172,8 +16172,8 @@ _080AD00E:
str r2, [r4, #0x20]
b _080AD03C
.align 2, 0
_080AD02C: .4byte gLinkState
_080AD030: .4byte gLinkEntity
_080AD02C: .4byte gPlayerState
_080AD030: .4byte gPlayerEntity
_080AD034:
bl sub_08079184
bl DeleteThisEntity
@@ -16430,7 +16430,7 @@ _080AD202:
strb r0, [r5, #0x15]
b _080AD26E
_080AD220:
ldr r1, _080AD240 @ =gLinkEntity
ldr r1, _080AD240 @ =gPlayerEntity
adds r0, r1, #0
adds r0, #0x5a
ldrb r0, [r0]
@@ -16444,9 +16444,9 @@ _080AD220:
bl sub_080AD27C
b _080AD26E
.align 2, 0
_080AD240: .4byte gLinkEntity
_080AD240: .4byte gPlayerEntity
_080AD244:
ldr r0, _080AD270 @ =gLinkState
ldr r0, _080AD270 @ =gPlayerState
ldrb r0, [r0, #5]
cmp r0, #0
beq _080AD25A
@@ -16470,7 +16470,7 @@ _080AD25A:
_080AD26E:
pop {r4, r5, pc}
.align 2, 0
_080AD270: .4byte gLinkState
_080AD270: .4byte gPlayerState
thumb_func_start sub_080AD274
sub_080AD274: @ 0x080AD274
@@ -16483,7 +16483,7 @@ sub_080AD27C: @ 0x080AD27C
push {r4, r5, lr}
adds r3, r0, #0
ldr r4, [r3, #0x54]
ldr r1, _080AD2AC @ =gLinkEntity
ldr r1, _080AD2AC @ =gPlayerEntity
movs r0, #0
str r0, [r1, #0x74]
adds r0, r3, #0
@@ -16505,7 +16505,7 @@ sub_080AD27C: @ 0x080AD27C
strb r0, [r4, #0xd]
b _080AD2C2
.align 2, 0
_080AD2AC: .4byte gLinkEntity
_080AD2AC: .4byte gPlayerEntity
_080AD2B0:
adds r2, r3, #0
adds r2, #0x29
asm/code_080AD90C.s
+24 -24
View File
@@ -160,7 +160,7 @@ _080ADA2C: .4byte gUnk_03001010
sub_080ADA30: @ 0x080ADA30
push {r4, lr}
adds r4, r0, #0
ldr r1, _080ADA60 @ =gLinkState
ldr r1, _080ADA60 @ =gPlayerState
ldr r0, [r1, #0x2c]
cmp r0, r4
bne _080ADA42
@@ -177,14 +177,14 @@ _080ADA46:
ldr r1, [r0]
adds r0, r4, #0
bl _call_via_r1
ldr r1, _080ADA68 @ =gLinkEntity
ldr r1, _080ADA68 @ =gPlayerEntity
adds r0, r4, #0
bl sub_08078E84
pop {r4, pc}
.align 2, 0
_080ADA60: .4byte gLinkState
_080ADA60: .4byte gPlayerState
_080ADA64: .4byte gUnk_08132700
_080ADA68: .4byte gLinkEntity
_080ADA68: .4byte gPlayerEntity
thumb_func_start sub_080ADA6C
sub_080ADA6C: @ 0x080ADA6C
@@ -244,7 +244,7 @@ _080ADAD2:
sub_080ADAD4: @ 0x080ADAD4
push {r4, r5, lr}
adds r4, r0, #0
ldr r3, _080ADAF4 @ =gLinkState
ldr r3, _080ADAF4 @ =gPlayerState
ldrb r1, [r3, #0x1c]
adds r0, r1, #0
cmp r0, #3
@@ -252,20 +252,20 @@ sub_080ADAD4: @ 0x080ADAD4
ldrb r0, [r4, #0xc]
adds r0, #1
strb r0, [r4, #0xc]
ldr r0, _080ADAF8 @ =gLinkEntity
ldr r0, _080ADAF8 @ =gPlayerEntity
ldrb r1, [r0, #0x14]
lsrs r1, r1, #1
adds r1, #8
b _080ADB0C
.align 2, 0
_080ADAF4: .4byte gLinkState
_080ADAF8: .4byte gLinkEntity
_080ADAF4: .4byte gPlayerState
_080ADAF8: .4byte gPlayerEntity
_080ADAFC:
cmp r0, #6
bne _080ADB18
movs r0, #4
strb r0, [r4, #0xc]
ldr r0, _080ADB14 @ =gLinkEntity
ldr r0, _080ADB14 @ =gPlayerEntity
ldrb r1, [r0, #0x14]
lsrs r1, r1, #1
adds r1, #4
@@ -274,7 +274,7 @@ _080ADB0C:
bl InitAnimationForceUpdate
b _080ADC08
.align 2, 0
_080ADB14: .4byte gLinkEntity
_080ADB14: .4byte gPlayerEntity
_080ADB18:
movs r5, #0
ldrb r0, [r4, #0xa]
@@ -366,7 +366,7 @@ _080ADBB0:
movs r2, #1
movs r5, #0xe7
_080ADBCA:
ldr r0, _080ADC0C @ =gLinkState
ldr r0, _080ADC0C @ =gPlayerState
ldrb r1, [r0, #0x1c]
movs r0, #0xf
ands r0, r1
@@ -391,7 +391,7 @@ _080ADBF2:
movs r0, #0xf
strb r0, [r4, #0xf]
_080ADBF6:
ldr r2, _080ADC10 @ =gLinkEntity
ldr r2, _080ADC10 @ =gPlayerEntity
adds r0, r2, #0
adds r0, #0x5a
ldrb r0, [r0]
@@ -403,14 +403,14 @@ _080ADBF6:
_080ADC08:
pop {r4, r5, pc}
.align 2, 0
_080ADC0C: .4byte gLinkState
_080ADC10: .4byte gLinkEntity
_080ADC0C: .4byte gPlayerState
_080ADC10: .4byte gPlayerEntity
thumb_func_start sub_080ADC14
sub_080ADC14: @ 0x080ADC14
push {r4, lr}
adds r4, r0, #0
ldr r0, _080ADC40 @ =gLinkState
ldr r0, _080ADC40 @ =gPlayerState
ldrb r0, [r0, #0x1c]
movs r1, #0xf
ands r1, r0
@@ -421,7 +421,7 @@ sub_080ADC14: @ 0x080ADC14
ldrb r0, [r4, #0xc]
adds r0, #1
strb r0, [r4, #0xc]
ldr r0, _080ADC44 @ =gLinkEntity
ldr r0, _080ADC44 @ =gPlayerEntity
ldrb r1, [r0, #0x14]
lsrs r1, r1, #1
adds r1, #4
@@ -429,8 +429,8 @@ sub_080ADC14: @ 0x080ADC14
bl InitAnimationForceUpdate
b _080ADC5C
.align 2, 0
_080ADC40: .4byte gLinkState
_080ADC44: .4byte gLinkEntity
_080ADC40: .4byte gPlayerState
_080ADC44: .4byte gPlayerEntity
_080ADC48:
adds r0, r4, #0
movs r1, #0
@@ -469,7 +469,7 @@ _080ADC82:
thumb_func_start sub_080ADC84
sub_080ADC84: @ 0x080ADC84
ldr r1, _080ADC9C @ =gLinkEntity
ldr r1, _080ADC9C @ =gPlayerEntity
ldrb r1, [r1, #0x18]
movs r2, #0x40
ands r2, r1
@@ -481,13 +481,13 @@ sub_080ADC84: @ 0x080ADC84
strb r1, [r0, #0x18]
bx lr
.align 2, 0
_080ADC9C: .4byte gLinkEntity
_080ADC9C: .4byte gPlayerEntity
thumb_func_start sub_080ADCA0
sub_080ADCA0: @ 0x080ADCA0
push {r4, lr}
ldr r3, _080ADCD4 @ =gUnk_08132714
ldr r2, _080ADCD8 @ =gLinkEntity
ldr r2, _080ADCD8 @ =gPlayerEntity
ldrb r2, [r2, #0x14]
lsrs r2, r2, #1
adds r1, r1, r2
@@ -512,7 +512,7 @@ sub_080ADCA0: @ 0x080ADCA0
pop {r4, pc}
.align 2, 0
_080ADCD4: .4byte gUnk_08132714
_080ADCD8: .4byte gLinkEntity
_080ADCD8: .4byte gPlayerEntity
thumb_func_start sub_080ADCDC
sub_080ADCDC: @ 0x080ADCDC
@@ -1253,7 +1253,7 @@ sub_080AE218: @ 0x080AE218
movs r4, #0
ldr r6, _080AE310 @ =gUnk_020000C0
mov sb, r6
ldr r0, _080AE314 @ =gLinkEntity
ldr r0, _080AE314 @ =gPlayerEntity
adds r2, r0, #0
adds r2, #0x26
adds r5, r0, #0
@@ -1359,7 +1359,7 @@ _080AE2F8:
.align 2, 0
_080AE30C: .4byte gUnk_02024490
_080AE310: .4byte gUnk_020000C0
_080AE314: .4byte gLinkEntity
_080AE314: .4byte gPlayerEntity
_080AE318: .4byte 0xFFFFFC00
_080AE31C: .4byte gUnk_03000000
_080AE320: .4byte 0x000003FF
asm/createBowEntity.s
+4 -4
View File
@@ -63,7 +63,7 @@ _0801902A:
ldrb r0, [r4, #0x14]
lsls r0, r0, #2
strb r0, [r4, #0x15]
ldr r2, _0801905C @ =gLinkEntity
ldr r2, _0801905C @ =gPlayerEntity
adds r0, r2, #0
adds r0, #0x3c
ldrb r0, [r0]
@@ -85,7 +85,7 @@ _0801902A:
movs r0, #1
b _08019062
.align 2, 0
_0801905C: .4byte gLinkEntity
_0801905C: .4byte gPlayerEntity
_08019060:
movs r0, #0
_08019062:
@@ -190,7 +190,7 @@ _080190FC:
ands r0, r2
orrs r0, r1
strb r0, [r4, #0x18]
ldr r0, _0801916C @ =gLinkState
ldr r0, _0801916C @ =gPlayerState
str r4, [r0, #0x2c]
adds r0, r4, #0
movs r1, #1
@@ -217,7 +217,7 @@ _080190FC:
b _08019172
.align 2, 0
_08019168: .4byte gUnk_080B3E40
_0801916C: .4byte gLinkState
_0801916C: .4byte gPlayerState
_08019170:
str r5, [r4, #0x78]
_08019172:
asm/crenalBeanSprout.s
+18 -18
View File
@@ -60,7 +60,7 @@ _08096368:
bl CheckGlobalFlag
cmp r0, #0
bne _080963A4
ldr r0, _0809639C @ =gLinkEntity
ldr r0, _0809639C @ =gPlayerEntity
movs r3, #0x80
lsls r3, r3, #9
adds r1, r5, #0
@@ -74,7 +74,7 @@ _08096368:
bl SetTile
b _0809650A
.align 2, 0
_0809639C: .4byte gLinkEntity
_0809639C: .4byte gPlayerEntity
_080963A0: .4byte 0x00004022
_080963A4:
ldrb r0, [r5, #0xb]
@@ -127,7 +127,7 @@ _080963FC:
bl CheckGlobalFlag
cmp r0, #0
bne _0809644C
ldr r0, _08096444 @ =gLinkEntity
ldr r0, _08096444 @ =gPlayerEntity
adds r1, r0, #0
adds r1, #0x29
ldrb r2, [r1]
@@ -153,7 +153,7 @@ _080963FC:
bl PositionRelative
b _08096450
.align 2, 0
_08096444: .4byte gLinkEntity
_08096444: .4byte gPlayerEntity
_08096448: .4byte 0xFFE80000
_0809644C:
bl DeleteThisEntity
@@ -289,7 +289,7 @@ _0809653C:
_0809655C: .4byte 0xFFE40000
_08096560: .4byte 0xFFD80000
_08096564:
ldr r0, _0809657C @ =gLinkState
ldr r0, _0809657C @ =gPlayerState
ldrb r1, [r0, #0xd]
movs r0, #0x80
ands r0, r1
@@ -301,7 +301,7 @@ _08096570:
bl InitializeAnimation
b _08096586
.align 2, 0
_0809657C: .4byte gLinkState
_0809657C: .4byte gPlayerState
_08096580:
adds r0, r6, #0
bl GetNextFrame
@@ -347,7 +347,7 @@ _080965C8:
bl sub_0805EC9C
b _080966F6
_080965D6:
ldr r1, _080965FC @ =gLinkState
ldr r1, _080965FC @ =gPlayerState
ldrb r2, [r1, #0x1a]
movs r0, #0x80
orrs r0, r2
@@ -366,12 +366,12 @@ _080965D6:
bl InitializeAnimation
b _08096606
.align 2, 0
_080965FC: .4byte gLinkState
_080965FC: .4byte gPlayerState
_08096600:
adds r0, r6, #0
bl GetNextFrame
_08096606:
ldr r0, _08096664 @ =gLinkEntity
ldr r0, _08096664 @ =gPlayerEntity
ldrb r0, [r0, #0x14]
movs r1, #6
ands r1, r0
@@ -417,7 +417,7 @@ _08096606:
strb r1, [r0]
b _08096676
.align 2, 0
_08096664: .4byte gLinkEntity
_08096664: .4byte gPlayerEntity
_08096668: .4byte gUnk_08123184
_0809666C: .4byte gUnk_0200AF00
_08096670:
@@ -425,7 +425,7 @@ _08096670:
adds r0, #0x2f
strb r7, [r0]
_08096676:
ldr r0, _080966FC @ =gLinkEntity
ldr r0, _080966FC @ =gPlayerEntity
movs r3, #0x80
lsls r3, r3, #9
adds r1, r6, #0
@@ -441,7 +441,7 @@ _08096676:
adds r0, r6, #0
bl sub_08096A78
_0809669C:
ldr r2, _08096700 @ =gLinkState
ldr r2, _08096700 @ =gPlayerState
adds r0, r2, #0
adds r0, #0x92
ldrh r1, [r0]
@@ -488,8 +488,8 @@ _080966F6:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080966F8: .4byte gUnk_0200AF00
_080966FC: .4byte gLinkEntity
_08096700: .4byte gLinkState
_080966FC: .4byte gPlayerEntity
_08096700: .4byte gPlayerState
thumb_func_start sub_08096704
sub_08096704: @ 0x08096704
@@ -581,7 +581,7 @@ sub_08096780: @ 0x08096780
bne _080967DC
adds r0, r5, #0
bl GetNextFrame
ldr r2, _080967D8 @ =gLinkState
ldr r2, _080967D8 @ =gPlayerState
ldrb r0, [r2, #0xb]
movs r1, #0x80
orrs r0, r1
@@ -607,7 +607,7 @@ sub_08096780: @ 0x08096780
b _080967E0
.align 2, 0
_080967D4: .4byte gUnk_0812319C
_080967D8: .4byte gLinkState
_080967D8: .4byte gPlayerState
_080967DC:
movs r0, #0xc0
strb r0, [r5, #0xe]
@@ -807,7 +807,7 @@ sub_08096904: @ 0x08096904
ldrb r1, [r5, #0xf]
cmp r0, r1
bne _08096980
ldr r2, _0809697C @ =gLinkState
ldr r2, _0809697C @ =gPlayerState
ldrb r1, [r2, #0xb]
movs r0, #0x7f
ands r0, r1
@@ -820,7 +820,7 @@ sub_08096904: @ 0x08096904
.align 2, 0
_08096974: .4byte gUnk_081231AE
_08096978: .4byte gRoomControls
_0809697C: .4byte gLinkState
_0809697C: .4byte gPlayerState
_08096980:
movs r0, #0xf
_08096982:
asm/cucco.s
+2 -2
View File
@@ -241,7 +241,7 @@ sub_0806E65C: @ 0x0806E65C
ldrsb r2, [r0, r2]
cmp r2, #0
beq _0806E6A6
ldr r0, _0806E688 @ =gLinkState
ldr r0, _0806E688 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@@ -255,7 +255,7 @@ sub_0806E65C: @ 0x0806E65C
bl sub_0806F118
b _0806E698
.align 2, 0
_0806E688: .4byte gLinkState
_0806E688: .4byte gPlayerState
_0806E68C:
adds r0, r4, #0
bl sub_0806E6A8
asm/cuccoAggr.s
+6 -6
View File
@@ -355,7 +355,7 @@ _08038F42:
sub_08038F44: @ 0x08038F44
push {r4, lr}
adds r4, r0, #0
ldr r0, _08038F8C @ =gLinkEntity
ldr r0, _08038F8C @ =gPlayerEntity
adds r1, r4, #0
bl GetFacingDirection
strb r0, [r4, #0x15]
@@ -383,7 +383,7 @@ sub_08038F44: @ 0x08038F44
bl sub_08039120
b _08038F9E
.align 2, 0
_08038F8C: .4byte gLinkEntity
_08038F8C: .4byte gPlayerEntity
_08038F90:
movs r0, #0x1f
ands r2, r0
@@ -420,7 +420,7 @@ _08038FB8:
ands r0, r1
cmp r0, #0
bne _08038FE0
ldr r1, _08038FF8 @ =gLinkEntity
ldr r1, _08038FF8 @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
adds r1, r0, #0
@@ -436,7 +436,7 @@ _08038FE0:
b _08039018
.align 2, 0
_08038FF4: .4byte 0x0000FFFF
_08038FF8: .4byte gLinkEntity
_08038FF8: .4byte gPlayerEntity
_08038FFC:
adds r0, r4, #0
bl sub_0806F69C
@@ -612,7 +612,7 @@ sub_08039140: @ 0x08039140
strb r0, [r4, #0xc]
bl Random
strb r0, [r4, #0xe]
ldr r1, _08039174 @ =gLinkEntity
ldr r1, _08039174 @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
strb r0, [r4, #0x15]
@@ -629,7 +629,7 @@ sub_08039140: @ 0x08039140
bl InitializeAnimation
pop {r4, pc}
.align 2, 0
_08039174: .4byte gLinkEntity
_08039174: .4byte gPlayerEntity
_08039178: .4byte 0x0000FFFC
thumb_func_start sub_0803917C
asm/cuccoChick.s
+2 -2
View File
@@ -170,7 +170,7 @@ sub_0806E838: @ 0x0806E838
ldrsb r2, [r0, r2]
cmp r2, #0
beq _0806E882
ldr r0, _0806E864 @ =gLinkState
ldr r0, _0806E864 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@@ -184,7 +184,7 @@ sub_0806E838: @ 0x0806E838
bl sub_0806F118
b _0806E874
.align 2, 0
_0806E864: .4byte gLinkState
_0806E864: .4byte gPlayerState
_0806E868:
adds r0, r4, #0
bl sub_0806E884
asm/cuccoChickAggr.s
+4 -4
View File
@@ -297,14 +297,14 @@ sub_08022B20: @ 0x08022B20
bl sub_08049DF4
cmp r0, #0
beq _08022B40
ldr r1, _08022B3C @ =gLinkEntity
ldr r1, _08022B3C @ =gPlayerEntity
adds r0, r4, #0
movs r2, #0x24
movs r3, #0x24
bl sub_080041A0
b _08022B42
.align 2, 0
_08022B3C: .4byte gLinkEntity
_08022B3C: .4byte gPlayerEntity
_08022B40:
movs r0, #0
_08022B42:
@@ -317,7 +317,7 @@ sub_08022B44: @ 0x08022B44
movs r0, #0xc0
lsls r0, r0, #8
str r0, [r4, #0x20]
ldr r1, _08022B84 @ =gLinkEntity
ldr r1, _08022B84 @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
adds r1, r0, #0
@@ -343,4 +343,4 @@ _08022B7A:
bl sub_08004488
pop {r4, pc}
.align 2, 0
_08022B84: .4byte gLinkEntity
_08022B84: .4byte gPlayerEntity
asm/din.s
+2 -2
View File
@@ -52,7 +52,7 @@ _080647C2:
ldrb r1, [r0]
adds r0, #0x10
strb r1, [r0]
ldr r1, _080647FC @ =gLinkEntity
ldr r1, _080647FC @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
bl sub_0806F5A4
@@ -61,7 +61,7 @@ _080647C2:
bl InitAnimationForceUpdate
b _08064824
.align 2, 0
_080647FC: .4byte gLinkEntity
_080647FC: .4byte gPlayerEntity
_08064800:
adds r0, r4, #0
movs r1, #0
asm/dog.s
+18 -18
View File
@@ -100,7 +100,7 @@ _08069BD2:
ldrb r0, [r5, #0xa]
cmp r0, #0
bne _08069BF2
ldr r0, _08069C34 @ =gLinkState
ldr r0, _08069C34 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@@ -145,7 +145,7 @@ _08069BF2:
_08069C30:
pop {r4, r5, r6, pc}
.align 2, 0
_08069C34: .4byte gLinkState
_08069C34: .4byte gPlayerState
_08069C38: .4byte 0x00004072
_08069C3C: .4byte gRoomControls
@@ -158,7 +158,7 @@ sub_08069C40: @ 0x08069C40
bl sub_08069F90
cmp r0, #0
beq _08069C80
ldr r0, _08069C68 @ =gLinkState
ldr r0, _08069C68 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@@ -168,7 +168,7 @@ sub_08069C40: @ 0x08069C40
bl sub_08069CB8
b _08069C7A
.align 2, 0
_08069C68: .4byte gLinkState
_08069C68: .4byte gPlayerState
_08069C6C:
adds r0, r4, #0
bl GetAnimationState
@@ -211,7 +211,7 @@ _08069CB4: .4byte gUnk_08111DA8
sub_08069CB8: @ 0x08069CB8
push {r4, r5, lr}
adds r4, r0, #0
ldr r1, _08069CF8 @ =gLinkEntity
ldr r1, _08069CF8 @ =gPlayerEntity
bl GetFacingDirection
ldr r2, _08069CFC @ =gUnk_08111DB0
ldrb r1, [r4, #0x14]
@@ -240,7 +240,7 @@ sub_08069CB8: @ 0x08069CB8
_08069CF6:
pop {r4, r5, pc}
.align 2, 0
_08069CF8: .4byte gLinkEntity
_08069CF8: .4byte gPlayerEntity
_08069CFC: .4byte gUnk_08111DB0
thumb_func_start sub_08069D00
@@ -605,7 +605,7 @@ sub_08069F90: @ 0x08069F90
movs r0, #1
b _08069FB4
_08069FA8:
ldr r1, _08069FB8 @ =gLinkEntity
ldr r1, _08069FB8 @ =gPlayerEntity
adds r0, r4, #0
movs r2, #0x14
movs r3, #0x14
@@ -613,13 +613,13 @@ _08069FA8:
_08069FB4:
pop {r4, pc}
.align 2, 0
_08069FB8: .4byte gLinkEntity
_08069FB8: .4byte gPlayerEntity
thumb_func_start sub_08069FBC
sub_08069FBC: @ 0x08069FBC
push {lr}
adds r2, r0, #0
ldr r0, _08069FE4 @ =gLinkState
ldr r0, _08069FE4 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@@ -640,13 +640,13 @@ _08069FDA:
_08069FE0:
pop {pc}
.align 2, 0
_08069FE4: .4byte gLinkState
_08069FE4: .4byte gPlayerState
thumb_func_start sub_08069FE8
sub_08069FE8: @ 0x08069FE8
push {r4, r5, lr}
adds r4, r0, #0
ldr r0, _0806A010 @ =gLinkState
ldr r0, _0806A010 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@@ -663,7 +663,7 @@ sub_08069FE8: @ 0x08069FE8
bl sub_08078778
b _0806A020
.align 2, 0
_0806A010: .4byte gLinkState
_0806A010: .4byte gPlayerState
_0806A014:
adds r0, r4, #0
adds r0, #0x74
@@ -685,7 +685,7 @@ sub_0806A028: @ 0x0806A028
ldrsb r2, [r0, r2]
cmp r2, #0
beq _0806A07E
ldr r0, _0806A054 @ =gLinkState
ldr r0, _0806A054 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@@ -699,7 +699,7 @@ sub_0806A028: @ 0x0806A028
bl sub_0806F118
b _0806A076
.align 2, 0
_0806A054: .4byte gLinkState
_0806A054: .4byte gPlayerState
_0806A058:
adds r0, r4, #0
bl sub_0806A080
@@ -743,7 +743,7 @@ _0806A0A0: .4byte gUnk_08111E34
sub_0806A0A4: @ 0x0806A0A4
push {r4, r5, r6, lr}
adds r4, r0, #0
ldr r0, _0806A0F8 @ =gLinkState
ldr r0, _0806A0F8 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@@ -780,7 +780,7 @@ sub_0806A0A4: @ 0x0806A0A4
bl sub_0807BA8C
b _0806A120
.align 2, 0
_0806A0F8: .4byte gLinkState
_0806A0F8: .4byte gPlayerState
_0806A0FC: .4byte gRoomControls
_0806A100:
movs r5, #2
@@ -818,7 +818,7 @@ sub_0806A144: @ 0x0806A144
push {r4, r5, lr}
adds r5, r0, #0
movs r4, #4
ldr r0, _0806A18C @ =gLinkState
ldr r0, _0806A18C @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
@@ -848,7 +848,7 @@ _0806A17A:
bl TextboxNoOverlap
pop {r4, r5, pc}
.align 2, 0
_0806A18C: .4byte gLinkState
_0806A18C: .4byte gPlayerState
_0806A190: .4byte gUnk_08111FD8
thumb_func_start Dog_Fusion
asm/dust.s
+11 -11
View File
@@ -282,7 +282,7 @@ sub_08044310: @ 0x08044310
adds r5, r0, #0
movs r4, #0xff
movs r6, #0xff
ldr r0, _08044334 @ =gLinkEntity
ldr r0, _08044334 @ =gPlayerEntity
ldrb r0, [r0, #0x14]
lsrs r1, r0, #1
movs r0, #3
@@ -295,7 +295,7 @@ sub_08044310: @ 0x08044310
beq _08044342
b _080443EA
.align 2, 0
_08044334: .4byte gLinkEntity
_08044334: .4byte gPlayerEntity
_08044338:
cmp r1, #2
beq _08044392
@@ -492,7 +492,7 @@ _08044492:
sub_08044498: @ 0x08044498
push {r4, r5, r6, lr}
mov ip, r0
ldr r6, _08044538 @ =gLinkEntity
ldr r6, _08044538 @ =gPlayerEntity
movs r1, #0x2e
ldrsh r0, [r6, r1]
ldr r3, _0804453C @ =gRoomControls
@@ -509,7 +509,7 @@ sub_08044498: @ 0x08044498
ands r0, r2
lsls r0, r0, #6
orrs r4, r0
ldr r0, _08044540 @ =gLinkState
ldr r0, _08044540 @ =gPlayerState
adds r0, #0x92
ldrh r0, [r0]
movs r1, #0xf0
@@ -567,13 +567,13 @@ _0804450C:
adds r1, r0, #0
cmp r1, #0
beq _0804454C
ldr r0, _08044538 @ =gLinkEntity
ldr r0, _08044538 @ =gPlayerEntity
bl CopyPosition
b _0804454C
.align 2, 0
_08044538: .4byte gLinkEntity
_08044538: .4byte gPlayerEntity
_0804453C: .4byte gRoomControls
_08044540: .4byte gLinkState
_08044540: .4byte gPlayerState
_08044544:
adds r2, #5
adds r3, #1
@@ -587,7 +587,7 @@ _0804454C:
sub_08044550: @ 0x08044550
push {r4, r5, r6, r7, lr}
adds r6, r0, #0
ldr r0, _080445A8 @ =gLinkState
ldr r0, _080445A8 @ =gPlayerState
ldrb r1, [r0, #0x1c]
movs r0, #0xf
ands r0, r1
@@ -602,7 +602,7 @@ sub_08044550: @ 0x08044550
adds r0, #0x10
strh r0, [r6, #0x24]
_08044570:
ldr r5, _080445AC @ =gLinkEntity
ldr r5, _080445AC @ =gPlayerEntity
ldrb r0, [r5, #0x14]
movs r4, #0xe
ands r4, r0
@@ -629,8 +629,8 @@ _08044570:
bl sub_0806F69C
b _080445BE
.align 2, 0
_080445A8: .4byte gLinkState
_080445AC: .4byte gLinkEntity
_080445A8: .4byte gPlayerState
_080445AC: .4byte gPlayerEntity
_080445B0: .4byte gUnk_08126EE4
_080445B4:
adds r0, r6, #0
asm/enemy50.s
+6 -6
View File
@@ -352,14 +352,14 @@ sub_08040DC8: @ 0x08040DC8
strb r1, [r0, #0xd]
movs r1, #0x3c
strb r1, [r0, #0x1d]
ldr r1, _08040DE0 @ =gLinkEntity
ldr r1, _08040DE0 @ =gPlayerEntity
ldrb r1, [r1, #0x14]
lsrs r1, r1, #2
adds r1, #5
bl InitializeAnimation
pop {pc}
.align 2, 0
_08040DE0: .4byte gLinkEntity
_08040DE0: .4byte gPlayerEntity
thumb_func_start sub_08040DE4
sub_08040DE4: @ 0x08040DE4
@@ -723,7 +723,7 @@ _08041094:
adds r0, #8
strh r0, [r1]
_080410A6:
ldr r2, _08041100 @ =gLinkEntity
ldr r2, _08041100 @ =gPlayerEntity
adds r0, r2, #0
adds r0, #0x45
ldrb r0, [r0]
@@ -768,7 +768,7 @@ _080410B6:
bl sub_0803F6EC
b _0804110A
.align 2, 0
_08041100: .4byte gLinkEntity
_08041100: .4byte gPlayerEntity
_08041104:
adds r0, r4, #0
bl sub_0803F738
@@ -912,7 +912,7 @@ _08041200:
movs r0, #1
b _08041224
_08041204:
ldr r0, _08041214 @ =gLinkState
ldr r0, _08041214 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
lsls r1, r1, #0x10
@@ -921,7 +921,7 @@ _08041204:
beq _08041222
b _08041200
.align 2, 0
_08041214: .4byte gLinkState
_08041214: .4byte gPlayerState
_08041218:
ldr r0, _08041228 @ =gArea
movs r1, #0xa
asm/enemy64.s
+16 -16
View File
@@ -881,7 +881,7 @@ sub_080496EC: @ 0x080496EC
bl sub_08079F8C
cmp r0, #0
beq _08049720
ldr r0, _0804971C @ =gLinkEntity
ldr r0, _0804971C @ =gPlayerEntity
movs r1, #0x36
ldrsh r0, [r0, r1]
cmp r0, #0
@@ -894,7 +894,7 @@ sub_080496EC: @ 0x080496EC
strb r0, [r4, #0xe]
b _08049724
.align 2, 0
_0804971C: .4byte gLinkEntity
_0804971C: .4byte gPlayerEntity
_08049720:
movs r0, #1
strb r0, [r4, #0xd]
@@ -910,7 +910,7 @@ sub_0804972C: @ 0x0804972C
bl sub_08079F8C
cmp r0, #0
beq _08049750
ldr r0, _08049758 @ =gLinkEntity
ldr r0, _08049758 @ =gPlayerEntity
movs r1, #0x36
ldrsh r0, [r0, r1]
cmp r0, #0
@@ -926,7 +926,7 @@ _08049750:
bl sub_08049944
pop {r4, pc}
.align 2, 0
_08049758: .4byte gLinkEntity
_08049758: .4byte gPlayerEntity
thumb_func_start sub_0804975C
sub_0804975C: @ 0x0804975C
@@ -1060,7 +1060,7 @@ sub_08049804: @ 0x08049804
ldrb r0, [r4, #0x18]
ands r3, r0
strb r3, [r4, #0x18]
ldr r4, _08049880 @ =gLinkEntity
ldr r4, _08049880 @ =gPlayerEntity
ldr r1, _08049884 @ =gRoomControls
ldrh r0, [r1, #6]
adds r0, #0xa8
@@ -1078,7 +1078,7 @@ _08049878:
pop {r4, pc}
.align 2, 0
_0804987C: .4byte gUnk_03000FD0
_08049880: .4byte gLinkEntity
_08049880: .4byte gPlayerEntity
_08049884: .4byte gRoomControls
thumb_func_start sub_08049888
@@ -1189,7 +1189,7 @@ sub_08049944: @ 0x08049944
ands r1, r3
orrs r2, r1
strb r2, [r4]
ldr r5, _08049990 @ =gLinkEntity
ldr r5, _08049990 @ =gPlayerEntity
movs r2, #0x2e
ldrsh r1, [r5, r2]
movs r3, #0x32
@@ -1198,7 +1198,7 @@ sub_08049944: @ 0x08049944
bl sub_0806FCB8
cmp r0, #0
beq _0804998C
ldr r2, _08049994 @ =gLinkState
ldr r2, _08049994 @ =gPlayerState
movs r0, #1
strb r0, [r2, #0x14]
movs r1, #0x36
@@ -1216,8 +1216,8 @@ sub_08049944: @ 0x08049944
_0804998C:
pop {r4, r5, pc}
.align 2, 0
_08049990: .4byte gLinkEntity
_08049994: .4byte gLinkState
_08049990: .4byte gPlayerEntity
_08049994: .4byte gPlayerState
thumb_func_start sub_08049998
sub_08049998: @ 0x08049998
@@ -1247,7 +1247,7 @@ sub_08049998: @ 0x08049998
bl sub_08079F8C
cmp r0, #0
beq _080499EA
ldr r0, _080499EC @ =gLinkEntity
ldr r0, _080499EC @ =gPlayerEntity
ldrh r1, [r5, #0x2e]
subs r1, r1, r4
ldrh r2, [r0, #0x2e]
@@ -1261,7 +1261,7 @@ sub_08049998: @ 0x08049998
_080499EA:
pop {r4, r5, r6, pc}
.align 2, 0
_080499EC: .4byte gLinkEntity
_080499EC: .4byte gPlayerEntity
thumb_func_start sub_080499F0
sub_080499F0: @ 0x080499F0
@@ -1270,7 +1270,7 @@ sub_080499F0: @ 0x080499F0
ldrb r0, [r4, #0xc]
cmp r0, #0
beq _08049A82
ldr r5, _08049A84 @ =gLinkEntity
ldr r5, _08049A84 @ =gPlayerEntity
movs r1, #0x36
ldrsh r0, [r5, r1]
cmp r0, #0
@@ -1339,7 +1339,7 @@ _08049A7E:
_08049A82:
pop {r4, r5, r6, pc}
.align 2, 0
_08049A84: .4byte gLinkEntity
_08049A84: .4byte gPlayerEntity
_08049A88: .4byte gSineTable
thumb_func_start sub_08049A8C
@@ -1444,7 +1444,7 @@ sub_08049B20: @ 0x08049B20
bl sub_08079F8C
cmp r0, #0
beq _08049B68
ldr r0, _08049B6C @ =gLinkEntity
ldr r0, _08049B6C @ =gPlayerEntity
ldrh r1, [r4, #0x2e]
subs r1, r1, r5
ldrh r2, [r0, #0x2e]
@@ -1458,4 +1458,4 @@ sub_08049B20: @ 0x08049B20
_08049B68:
pop {r4, r5, r6, pc}
.align 2, 0
_08049B6C: .4byte gLinkEntity
_08049B6C: .4byte gPlayerEntity
asm/evilSpirit.s
+8 -8
View File
@@ -168,7 +168,7 @@ _080863B6:
movs r0, #0xc0
lsls r0, r0, #3
strh r0, [r6, #0x24]
ldr r2, _080863E8 @ =gLinkEntity
ldr r2, _080863E8 @ =gPlayerEntity
ldr r0, [r2, #0x2c]
ldr r1, [r6, #0x2c]
subs r0, r0, r1
@@ -190,13 +190,13 @@ _080863B6:
adds r0, r2, #3
b _080863EE
.align 2, 0
_080863E8: .4byte gLinkEntity
_080863E8: .4byte gPlayerEntity
_080863EC:
subs r0, r2, #3
_080863EE:
strb r0, [r6, #0x15]
_080863F0:
ldr r0, _0808640C @ =gLinkEntity
ldr r0, _0808640C @ =gPlayerEntity
ldrb r1, [r0, #0x14]
movs r0, #2
ands r0, r1
@@ -210,7 +210,7 @@ _080863F0:
adds r1, #0x76
b _08086426
.align 2, 0
_0808640C: .4byte gLinkEntity
_0808640C: .4byte gPlayerEntity
_08086410:
adds r0, r6, #0
adds r0, #0x7c
@@ -255,7 +255,7 @@ _08086440:
adds r2, #0x7f
movs r0, #1
strb r0, [r2]
ldr r0, _08086480 @ =gLinkEntity
ldr r0, _08086480 @ =gPlayerEntity
ldrb r1, [r0, #0x14]
movs r0, #2
ands r0, r1
@@ -271,7 +271,7 @@ _08086440:
strh r0, [r1]
b _080864BC
.align 2, 0
_08086480: .4byte gLinkEntity
_08086480: .4byte gPlayerEntity
_08086484:
adds r1, r6, #0
adds r1, #0x7c
@@ -447,7 +447,7 @@ sub_08086594: @ 0x08086594
adds r2, #0x7f
movs r0, #1
strb r0, [r2]
ldr r0, _080865EC @ =gLinkEntity
ldr r0, _080865EC @ =gPlayerEntity
ldrb r1, [r0, #0x14]
movs r0, #2
ands r0, r1
@@ -461,7 +461,7 @@ sub_08086594: @ 0x08086594
adds r1, #0x76
b _0808662A
.align 2, 0
_080865EC: .4byte gLinkEntity
_080865EC: .4byte gPlayerEntity
_080865F0:
adds r0, r7, #0
adds r0, #0x7c
asm/ezloCap.s
+8 -8
View File
@@ -52,7 +52,7 @@ sub_0806D8A0: @ 0x0806D8A0
bge _0806D8C2
rsbs r2, r2, #0
_0806D8C2:
ldr r1, _0806D900 @ =gLinkEntity
ldr r1, _0806D900 @ =gPlayerEntity
movs r5, #0x2e
ldrsh r0, [r1, r5]
adds r2, r2, r0
@@ -82,7 +82,7 @@ _0806D8C2:
strb r1, [r4, #0x14]
pop {r4, r5, pc}
.align 2, 0
_0806D900: .4byte gLinkEntity
_0806D900: .4byte gPlayerEntity
_0806D904: .4byte gUnk_08114134
thumb_func_start sub_0806D908
@@ -93,7 +93,7 @@ sub_0806D908: @ 0x0806D908
ldrsh r0, [r4, r1]
movs r2, #0x32
ldrsh r1, [r4, r2]
ldr r3, _0806D93C @ =gLinkEntity
ldr r3, _0806D93C @ =gPlayerEntity
movs r5, #0x2e
ldrsh r2, [r3, r5]
movs r5, #0x32
@@ -112,7 +112,7 @@ sub_0806D908: @ 0x0806D908
strb r1, [r4, #0x14]
pop {r4, r5, pc}
.align 2, 0
_0806D93C: .4byte gLinkEntity
_0806D93C: .4byte gPlayerEntity
_0806D940: .4byte gUnk_08114144
thumb_func_start sub_0806D944
@@ -124,7 +124,7 @@ sub_0806D944: @ 0x0806D944
rsbs r3, r3, #0
ands r3, r0
strb r3, [r2, #0x18]
ldr r0, _0806D968 @ =gLinkEntity
ldr r0, _0806D968 @ =gPlayerEntity
ldr r1, [r2, #0x2c]
ldr r0, [r0, #0x2c]
cmp r1, r0
@@ -136,7 +136,7 @@ sub_0806D944: @ 0x0806D944
_0806D964:
pop {pc}
.align 2, 0
_0806D968: .4byte gLinkEntity
_0806D968: .4byte gPlayerEntity
thumb_func_start sub_0806D96C
sub_0806D96C: @ 0x0806D96C
@@ -170,7 +170,7 @@ _0806D9A0: .4byte 0xFFE80000
thumb_func_start sub_0806D9A4
sub_0806D9A4: @ 0x0806D9A4
push {lr}
ldr r1, _0806D9BC @ =gLinkEntity
ldr r1, _0806D9BC @ =gPlayerEntity
ldr r2, [r0, #0x2c]
ldr r0, [r1, #0x2c]
adds r3, r1, #0
@@ -182,7 +182,7 @@ sub_0806D9A4: @ 0x0806D9A4
ands r0, r1
b _0806D9C6
.align 2, 0
_0806D9BC: .4byte gLinkEntity
_0806D9BC: .4byte gPlayerEntity
_0806D9C0:
ldrb r0, [r3, #0x18]
movs r1, #0x40
asm/fairy.s
+6 -6
View File
@@ -390,7 +390,7 @@ _0808D972:
ldrh r0, [r4, #0x36]
subs r0, #1
strh r0, [r4, #0x36]
ldr r1, _0808D994 @ =gLinkEntity
ldr r1, _0808D994 @ =gPlayerEntity
adds r0, r4, #0
bl sub_080177A0
cmp r0, #0
@@ -400,7 +400,7 @@ _0808D972:
_0808D992:
pop {r4, pc}
.align 2, 0
_0808D994: .4byte gLinkEntity
_0808D994: .4byte gPlayerEntity
thumb_func_start sub_0808D998
sub_0808D998: @ 0x0808D998
@@ -611,13 +611,13 @@ _0808DAE0:
adds r1, #0x63
movs r0, #0xfb
strb r0, [r1]
ldr r0, _0808DB28 @ =gLinkEntity
ldr r0, _0808DB28 @ =gPlayerEntity
str r0, [r4, #0x54]
adds r1, r4, #0
bl CopyPosition
pop {r4, pc}
.align 2, 0
_0808DB28: .4byte gLinkEntity
_0808DB28: .4byte gPlayerEntity
thumb_func_start sub_0808DB2C
sub_0808DB2C: @ 0x0808DB2C
@@ -635,8 +635,8 @@ sub_0808DB2C: @ 0x0808DB2C
adds r2, #0x3b
movs r0, #1
strb r0, [r2]
ldr r0, _0808DB50 @ =gLinkEntity
ldr r0, _0808DB50 @ =gPlayerEntity
bl CopyPosition
pop {pc}
.align 2, 0
_0808DB50: .4byte gLinkEntity
_0808DB50: .4byte gPlayerEntity
asm/fallingBoulder.s
+2 -2
View File
@@ -166,7 +166,7 @@ sub_0802C334: @ 0x0802C334
bne _0802C36A
ldr r0, _0802C3C4 @ =gRoomControls
ldrh r1, [r0, #8]
ldr r2, _0802C3C8 @ =gLinkEntity
ldr r2, _0802C3C8 @ =gPlayerEntity
cmp r2, #0
bne _0802C34E
b _0802C4AA
@@ -230,7 +230,7 @@ _0802C36A:
b _0802C48C
.align 2, 0
_0802C3C4: .4byte gRoomControls
_0802C3C8: .4byte gLinkEntity
_0802C3C8: .4byte gPlayerEntity
_0802C3CC:
adds r0, r4, #0
adds r0, #0x7a
asm/fan.s
+4 -4
View File
@@ -23,7 +23,7 @@ sub_0809EE44: @ 0x0809EE44
bne _0809EE60
b _0809EF74
_0809EE60:
ldr r4, _0809EEA4 @ =gLinkEntity
ldr r4, _0809EEA4 @ =gPlayerEntity
adds r0, r5, #0
adds r1, r4, #0
bl sub_0809EF78
@@ -56,7 +56,7 @@ _0809EE88:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0809EEA4: .4byte gLinkEntity
_0809EEA4: .4byte gPlayerEntity
_0809EEA8: .4byte gUnk_03003D80
_0809EEAC: .4byte _0809EEB0
_0809EEB0: @ jump table
@@ -98,7 +98,7 @@ _0809EF1E:
beq _0809EF52
b _0809EF56
_0809EF26:
ldr r2, _0809EF44 @ =gLinkEntity
ldr r2, _0809EF44 @ =gPlayerEntity
movs r7, #0x2e
ldrsh r1, [r4, r7]
movs r7, #0x2e
@@ -113,7 +113,7 @@ _0809EF26:
beq _0809EF52
b _0809EF56
.align 2, 0
_0809EF44: .4byte gLinkEntity
_0809EF44: .4byte gPlayerEntity
_0809EF48:
ldrb r0, [r5, #0xf]
cmp r0, #0
asm/farore.s
+2 -2
View File
@@ -52,7 +52,7 @@ _080649C2:
ldrb r1, [r0]
adds r0, #0x10
strb r1, [r0]
ldr r1, _080649FC @ =gLinkEntity
ldr r1, _080649FC @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
bl sub_0806F5A4
@@ -61,7 +61,7 @@ _080649C2:
bl InitAnimationForceUpdate
b _08064A24
.align 2, 0
_080649FC: .4byte gLinkEntity
_080649FC: .4byte gPlayerEntity
_08064A00:
adds r0, r4, #0
movs r1, #0
asm/figurineDevice.s
+6 -6
View File
@@ -1216,7 +1216,7 @@ _080884D2:
movs r0, #5
str r0, [r1, #0x10]
_080884EA:
ldr r1, _08088500 @ =gLinkEntity
ldr r1, _08088500 @ =gPlayerEntity
movs r0, #6
strb r0, [r1, #0x14]
pop {r4, pc}
@@ -1224,7 +1224,7 @@ _080884EA:
_080884F4: .4byte 0x00004328
_080884F8: .4byte 0x00004327
_080884FC: .4byte gTextBox
_08088500: .4byte gLinkEntity
_08088500: .4byte gPlayerEntity
thumb_func_start sub_08088504
sub_08088504: @ 0x08088504
@@ -1374,7 +1374,7 @@ sub_0808861C: @ 0x0808861C
movs r3, #8
bl CheckPlayerInRegion
str r0, [r4, #0x14]
ldr r1, _08088650 @ =gLinkEntity
ldr r1, _08088650 @ =gPlayerEntity
ldrb r0, [r1, #0x14]
cmp r0, #0
bne _0808863E
@@ -1393,7 +1393,7 @@ _08088642:
strb r0, [r2, #7]
pop {r4, pc}
.align 2, 0
_08088650: .4byte gLinkEntity
_08088650: .4byte gPlayerEntity
_08088654: .4byte gUnk_02033280
thumb_func_start sub_08088658
@@ -1406,7 +1406,7 @@ sub_08088658: @ 0x08088658
movs r3, #8
bl CheckPlayerInRegion
str r0, [r4, #0x14]
ldr r0, _08088684 @ =gLinkEntity
ldr r0, _08088684 @ =gPlayerEntity
movs r1, #0x36
ldrsh r0, [r0, r1]
cmp r0, #0
@@ -1421,5 +1421,5 @@ _08088678:
strb r0, [r2, #7]
pop {r4, pc}
.align 2, 0
_08088684: .4byte gLinkEntity
_08088684: .4byte gPlayerEntity
_08088688: .4byte gUnk_02033280
asm/floatingPlatform.s
+4 -4
View File
@@ -103,7 +103,7 @@ sub_08086168: @ 0x08086168
lsls r1, r1, #1
ldr r2, _0808619C @ =gUnk_08120658
adds r1, r1, r2
ldr r4, _080861A0 @ =gLinkEntity
ldr r4, _080861A0 @ =gPlayerEntity
ldrb r2, [r1]
ldrb r3, [r1, #1]
adds r1, r4, #0
@@ -113,7 +113,7 @@ sub_08086168: @ 0x08086168
bl sub_08079F8C
cmp r0, #0
beq _080861A8
ldr r0, _080861A4 @ =gLinkState
ldr r0, _080861A4 @ =gPlayerState
movs r1, #1
strb r1, [r0, #0x14]
movs r1, #0x36
@@ -124,8 +124,8 @@ sub_08086168: @ 0x08086168
b _080861AA
.align 2, 0
_0808619C: .4byte gUnk_08120658
_080861A0: .4byte gLinkEntity
_080861A4: .4byte gLinkState
_080861A0: .4byte gPlayerEntity
_080861A4: .4byte gPlayerState
_080861A8:
movs r0, #0
_080861AA:
asm/flyingPot.s
+4 -4
View File
@@ -231,7 +231,7 @@ _080371F6:
sub_080371F8: @ 0x080371F8
push {lr}
adds r2, r0, #0
ldr r0, _08037210 @ =gLinkState
ldr r0, _08037210 @ =gPlayerState
ldrb r1, [r0, #0x1c]
movs r0, #0xf
ands r0, r1
@@ -242,7 +242,7 @@ sub_080371F8: @ 0x080371F8
_0803720E:
pop {pc}
.align 2, 0
_08037210: .4byte gLinkState
_08037210: .4byte gPlayerState
thumb_func_start nullsub_161
nullsub_161: @ 0x08037214
@@ -446,7 +446,7 @@ sub_0803737C: @ 0x0803737C
strb r0, [r4, #0xc]
movs r0, #0xa
strb r0, [r4, #0xe]
ldr r1, _080373AC @ =gLinkEntity
ldr r1, _080373AC @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
strb r0, [r4, #0x15]
@@ -454,7 +454,7 @@ _080373A6:
pop {r4, pc}
.align 2, 0
_080373A8: .4byte 0xFFFF0000
_080373AC: .4byte gLinkEntity
_080373AC: .4byte gPlayerEntity
thumb_func_start sub_080373B0
sub_080373B0: @ 0x080373B0
asm/flyingSkull.s
+12 -12
View File
@@ -230,7 +230,7 @@ _08039D4A:
sub_08039D4C: @ 0x08039D4C
push {lr}
adds r2, r0, #0
ldr r0, _08039D64 @ =gLinkState
ldr r0, _08039D64 @ =gPlayerState
ldrb r1, [r0, #0x1c]
movs r0, #0xf
ands r0, r1
@@ -241,7 +241,7 @@ sub_08039D4C: @ 0x08039D4C
_08039D62:
pop {pc}
.align 2, 0
_08039D64: .4byte gLinkState
_08039D64: .4byte gPlayerState
thumb_func_start nullsub_166
nullsub_166: @ 0x08039D68
@@ -349,13 +349,13 @@ _08039E28:
_08039E30: .4byte 0x00004073
_08039E34: .4byte gRoomControls
_08039E38:
ldr r0, _08039E6C @ =gLinkState
ldr r0, _08039E6C @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
cmp r0, #0
bne _08039EC6
ldr r2, _08039E70 @ =gLinkEntity
ldr r2, _08039E70 @ =gPlayerEntity
movs r0, #0x2e
ldrsh r1, [r2, r0]
movs r6, #0x32
@@ -374,8 +374,8 @@ _08039E38:
strb r0, [r5, #0xe]
b _08039EC6
.align 2, 0
_08039E6C: .4byte gLinkState
_08039E70: .4byte gLinkEntity
_08039E6C: .4byte gPlayerState
_08039E70: .4byte gPlayerEntity
_08039E74:
ldrb r1, [r5, #0xa]
subs r1, #2
@@ -448,7 +448,7 @@ sub_08039EE4: @ 0x08039EE4
strh r2, [r3, #0x2a]
ldr r0, _08039F40 @ =gUnk_080FD340
str r0, [r3, #0x48]
ldr r0, _08039F44 @ =gLinkEntity
ldr r0, _08039F44 @ =gPlayerEntity
ldrb r0, [r0, #0x14]
mov r1, ip
adds r1, #0x76
@@ -480,14 +480,14 @@ sub_08039EE4: @ 0x08039EE4
pop {r4, r5, r6, pc}
.align 2, 0
_08039F40: .4byte gUnk_080FD340
_08039F44: .4byte gLinkEntity
_08039F44: .4byte gPlayerEntity
_08039F48: .4byte gRoomControls
thumb_func_start sub_08039F4C
sub_08039F4C: @ 0x08039F4C
push {lr}
adds r3, r0, #0
ldr r0, _08039F74 @ =gLinkEntity
ldr r0, _08039F74 @ =gPlayerEntity
movs r1, #0x76
adds r1, r1, r3
mov ip, r1
@@ -506,7 +506,7 @@ sub_08039F4C: @ 0x08039F4C
_08039F70:
pop {pc}
.align 2, 0
_08039F74: .4byte gLinkEntity
_08039F74: .4byte gPlayerEntity
thumb_func_start sub_08039F78
sub_08039F78: @ 0x08039F78
@@ -637,7 +637,7 @@ sub_0803A048: @ 0x0803A048
strb r0, [r4, #0xc]
movs r0, #0xa
strb r0, [r4, #0xe]
ldr r1, _0803A07C @ =gLinkEntity
ldr r1, _0803A07C @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
strb r0, [r4, #0x15]
@@ -645,7 +645,7 @@ _0803A076:
pop {r4, pc}
.align 2, 0
_0803A078: .4byte 0xFFFF0000
_0803A07C: .4byte gLinkEntity
_0803A07C: .4byte gPlayerEntity
thumb_func_start sub_0803A080
sub_0803A080: @ 0x0803A080
asm/fourElements.s
+4 -4
View File
@@ -214,12 +214,12 @@ sub_080A034C: @ 0x080A034C
lsls r0, r0, #0x18
cmp r0, #0
bne _080A038C
ldr r0, _080A0374 @ =gLinkEntity
ldr r0, _080A0374 @ =gPlayerEntity
movs r1, #0
bl sub_0805E3A0
b _080A038C
.align 2, 0
_080A0374: .4byte gLinkEntity
_080A0374: .4byte gPlayerEntity
_080A0378:
movs r0, #0
movs r1, #0x3c
@@ -295,7 +295,7 @@ sub_080A03E8: @ 0x080A03E8
bne _080A041A
movs r0, #0x5a
bl sub_0805E510
ldr r0, _080A0420 @ =gLinkState
ldr r0, _080A0420 @ =gPlayerState
adds r0, #0x8b
movs r1, #1
strb r1, [r0]
@@ -307,7 +307,7 @@ _080A041A:
pop {pc}
.align 2, 0
_080A041C: .4byte gTextBox
_080A0420: .4byte gLinkState
_080A0420: .4byte gPlayerState
thumb_func_start sub_080A0424
sub_080A0424: @ 0x080A0424
asm/furniture.s
+6 -6
View File
@@ -520,7 +520,7 @@ _08090A08:
beq _08090AB0
b _08090B60
_08090A12:
ldr r2, _08090A34 @ =gLinkEntity
ldr r2, _08090A34 @ =gPlayerEntity
movs r0, #0x32
ldrsh r1, [r2, r0]
movs r3, #0x32
@@ -539,7 +539,7 @@ _08090A26:
strb r1, [r5, #0x19]
b _08090B60
.align 2, 0
_08090A34: .4byte gLinkEntity
_08090A34: .4byte gPlayerEntity
_08090A38:
ldrb r0, [r5, #0x19]
movs r1, #0xc0
@@ -604,7 +604,7 @@ _08090A8C:
strb r0, [r5, #0x1e]
b _08090B60
_08090AB0:
ldr r2, _08090B00 @ =gLinkEntity
ldr r2, _08090B00 @ =gPlayerEntity
movs r3, #0x32
ldrsh r1, [r2, r3]
movs r3, #0x32
@@ -612,7 +612,7 @@ _08090AB0:
adds r0, #8
cmp r1, r0
bge _08090B14
ldr r0, _08090B04 @ =gLinkState
ldr r0, _08090B04 @ =gPlayerState
ldrb r0, [r0, #0x12]
cmp r0, #0x1e
beq _08090B60
@@ -641,8 +641,8 @@ _08090AB0:
bl SetTile
b _08090B60
.align 2, 0
_08090B00: .4byte gLinkEntity
_08090B04: .4byte gLinkState
_08090B00: .4byte gPlayerEntity
_08090B04: .4byte gPlayerState
_08090B08: .4byte 0x00004017
_08090B0C: .4byte 0x00004026
_08090B10: .4byte 0x0000403D
asm/getEmptyEntity.s
+2 -2
View File
@@ -32,7 +32,7 @@ _0805E6A0:
cmp r4, r1
blo _0805E68E
_0805E6A6:
ldr r4, _0805E6CC @ =gLinkEntity
ldr r4, _0805E6CC @ =gPlayerEntity
_0805E6A8:
ldr r0, [r4]
cmp r0, #0
@@ -51,7 +51,7 @@ _0805E6A8:
adds r0, r4, #0
b _0805E730
.align 2, 0
_0805E6CC: .4byte gLinkEntity
_0805E6CC: .4byte gPlayerEntity
_0805E6D0: .4byte gUnk_03003DD0
_0805E6D4:
adds r4, #0x88
asm/ghini.s
+15 -15
View File
@@ -273,14 +273,14 @@ sub_0803F1E0: @ 0x0803F1E0
strb r1, [r0, #0xd]
movs r1, #0x3c
strb r1, [r0, #0x1d]
ldr r1, _0803F1F8 @ =gLinkEntity
ldr r1, _0803F1F8 @ =gPlayerEntity
ldrb r1, [r1, #0x14]
lsrs r1, r1, #2
adds r1, #5
bl InitializeAnimation
pop {pc}
.align 2, 0
_0803F1F8: .4byte gLinkEntity
_0803F1F8: .4byte gPlayerEntity
thumb_func_start sub_0803F1FC
sub_0803F1FC: @ 0x0803F1FC
@@ -631,7 +631,7 @@ _0803F494:
adds r0, #0xc
strh r0, [r1]
_0803F4A6:
ldr r2, _0803F500 @ =gLinkEntity
ldr r2, _0803F500 @ =gPlayerEntity
adds r0, r2, #0
adds r0, #0x45
ldrb r0, [r0]
@@ -676,7 +676,7 @@ _0803F4B6:
bl sub_0803F6EC
b _0803F50A
.align 2, 0
_0803F500: .4byte gLinkEntity
_0803F500: .4byte gPlayerEntity
_0803F504:
adds r0, r4, #0
bl sub_0803F738
@@ -928,7 +928,7 @@ sub_0803F6C0: @ 0x0803F6C0
movs r1, #0xfe
ands r1, r2
strb r1, [r0]
ldr r4, _0803F6E8 @ =gLinkEntity
ldr r4, _0803F6E8 @ =gPlayerEntity
adds r1, r4, #0
adds r1, #0x3d
movs r0, #0xc
@@ -940,16 +940,16 @@ sub_0803F6C0: @ 0x0803F6C0
bl sub_0800449C
pop {r4, pc}
.align 2, 0
_0803F6E8: .4byte gLinkEntity
_0803F6E8: .4byte gPlayerEntity
thumb_func_start sub_0803F6EC
sub_0803F6EC: @ 0x0803F6EC
push {lr}
ldr r2, _0803F72C @ =gLinkEntity
ldr r2, _0803F72C @ =gPlayerEntity
adds r0, r2, #0
adds r0, #0x45
ldrb r0, [r0]
ldr r3, _0803F730 @ =gLinkState
ldr r3, _0803F730 @ =gPlayerState
cmp r0, #0
beq _0803F720
ldrb r1, [r2, #0x10]
@@ -978,16 +978,16 @@ _0803F720:
str r0, [r3, #0x30]
pop {pc}
.align 2, 0
_0803F72C: .4byte gLinkEntity
_0803F730: .4byte gLinkState
_0803F72C: .4byte gPlayerEntity
_0803F730: .4byte gPlayerState
_0803F734: .4byte 0x0000FFFE
thumb_func_start sub_0803F738
sub_0803F738: @ 0x0803F738
push {r4, lr}
adds r4, r0, #0
bl ResetLink
ldr r2, _0803F768 @ =gLinkState
bl ResetPlayer
ldr r2, _0803F768 @ =gPlayerState
ldrb r1, [r2, #0x1a]
movs r0, #0x80
orrs r1, r0
@@ -995,7 +995,7 @@ sub_0803F738: @ 0x0803F738
ldrb r1, [r2, #0xa]
orrs r0, r1
strb r0, [r2, #0xa]
ldr r0, _0803F76C @ =gLinkEntity
ldr r0, _0803F76C @ =gPlayerEntity
adds r1, r4, #0
movs r2, #0
movs r3, #1
@@ -1006,5 +1006,5 @@ sub_0803F738: @ 0x0803F738
strb r0, [r4]
pop {r4, pc}
.align 2, 0
_0803F768: .4byte gLinkState
_0803F76C: .4byte gLinkEntity
_0803F768: .4byte gPlayerState
_0803F76C: .4byte gPlayerEntity
asm/ghostBrothers.s
+2 -2
View File
@@ -102,7 +102,7 @@ _08065C42:
movs r0, #0
strb r1, [r4, #0xc]
strb r0, [r2]
ldr r1, _08065C70 @ =gLinkEntity
ldr r1, _08065C70 @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
bl sub_0806F5A4
@@ -113,7 +113,7 @@ _08065C42:
bl sub_0806F118
b _08065CCA
.align 2, 0
_08065C70: .4byte gLinkEntity
_08065C70: .4byte gPlayerEntity
_08065C74:
adds r0, r4, #0
movs r1, #0
asm/giantTwig.s
+6 -6
View File
@@ -170,7 +170,7 @@ sub_08093884: @ 0x08093884
ldrb r0, [r2, #0xa]
cmp r0, #0
bne _080938B8
ldr r0, _080938A8 @ =gLinkEntity
ldr r0, _080938A8 @ =gPlayerEntity
movs r3, #0x32
ldrsh r1, [r0, r3]
movs r3, #0x32
@@ -184,7 +184,7 @@ sub_08093884: @ 0x08093884
movs r0, #0x40
b _080938B4
.align 2, 0
_080938A8: .4byte gLinkEntity
_080938A8: .4byte gPlayerEntity
_080938AC:
ldrb r0, [r2, #0x19]
movs r1, #0x3f
@@ -655,7 +655,7 @@ sub_08093C70: @ 0x08093C70
ldrh r0, [r3]
cmp r0, #0
beq _08093CE8
ldr r0, _08093CE0 @ =gLinkState
ldr r0, _08093CE0 @ =gPlayerState
ldrb r0, [r0, #5]
cmp r0, #0
beq _08093D5C
@@ -699,10 +699,10 @@ sub_08093C70: @ 0x08093C70
bl SetTile
b _08093D5C
.align 2, 0
_08093CE0: .4byte gLinkState
_08093CE0: .4byte gPlayerState
_08093CE4: .4byte 0x00004022
_08093CE8:
ldr r0, _08093D60 @ =gLinkState
ldr r0, _08093D60 @ =gPlayerState
ldrb r0, [r0, #5]
cmp r0, #0
bne _08093D5C
@@ -757,7 +757,7 @@ _08093CE8:
_08093D5C:
pop {r4, r5, r6, pc}
.align 2, 0
_08093D60: .4byte gLinkState
_08093D60: .4byte gPlayerState
_08093D64: .4byte 0x0000403D
_08093D68: .4byte 0x00004027
_08093D6C: .4byte 0x00004029
asm/gibdo.s
+11 -11
View File
@@ -328,8 +328,8 @@ sub_080376D0: @ 0x080376D0
bl sub_080379EC
cmp r0, #0
bne _0803773A
bl ResetLink
ldr r2, _08037724 @ =gLinkState
bl ResetPlayer
ldr r2, _08037724 @ =gPlayerState
ldrb r1, [r2, #0x1a]
movs r0, #0x80
orrs r1, r0
@@ -337,7 +337,7 @@ sub_080376D0: @ 0x080376D0
ldrb r1, [r2, #0xa]
orrs r0, r1
strb r0, [r2, #0xa]
ldr r0, _08037728 @ =gLinkEntity
ldr r0, _08037728 @ =gPlayerEntity
adds r1, r4, #0
bl CopyPositionAndSpriteOffset
adds r0, r4, #0
@@ -361,8 +361,8 @@ sub_080376D0: @ 0x080376D0
bl sub_08037A58
b _0803773A
.align 2, 0
_08037724: .4byte gLinkState
_08037728: .4byte gLinkEntity
_08037724: .4byte gPlayerState
_08037728: .4byte gPlayerEntity
_0803772C:
ldrb r0, [r2]
movs r1, #1
@@ -849,12 +849,12 @@ _08037A84:
thumb_func_start sub_08037ACC
sub_08037ACC: @ 0x08037ACC
ldr r3, _08037B04 @ =gLinkState
ldr r3, _08037B04 @ =gPlayerState
ldr r1, [r3, #0x30]
ldr r2, _08037B08 @ =0xFFFFFEFF
ands r1, r2
str r1, [r3, #0x30]
ldr r3, _08037B0C @ =gLinkEntity
ldr r3, _08037B0C @ =gPlayerEntity
ldrb r2, [r3, #0x10]
movs r1, #0x80
orrs r1, r2
@@ -877,15 +877,15 @@ sub_08037ACC: @ 0x08037ACC
strh r0, [r1]
bx lr
.align 2, 0
_08037B04: .4byte gLinkState
_08037B04: .4byte gPlayerState
_08037B08: .4byte 0xFFFFFEFF
_08037B0C: .4byte gLinkEntity
_08037B0C: .4byte gPlayerEntity
thumb_func_start sub_08037B10
sub_08037B10: @ 0x08037B10
push {r4, r5, r6, lr}
adds r6, r0, #0
ldr r5, _08037B44 @ =gLinkEntity
ldr r5, _08037B44 @ =gPlayerEntity
adds r1, r5, #0
adds r1, #0x3d
movs r0, #0xc
@@ -907,7 +907,7 @@ sub_08037B10: @ 0x08037B10
_08037B40:
pop {r4, r5, r6, pc}
.align 2, 0
_08037B44: .4byte gLinkEntity
_08037B44: .4byte gPlayerEntity
thumb_func_start sub_08037B48
sub_08037B48: @ 0x08037B48
asm/gina.s
+2 -2
View File
@@ -53,7 +53,7 @@ _0806C182:
movs r0, #0
strb r1, [r4, #0xc]
strb r0, [r2]
ldr r1, _0806C1B0 @ =gLinkEntity
ldr r1, _0806C1B0 @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
bl sub_0806F5A4
@@ -64,7 +64,7 @@ _0806C182:
bl sub_0806F118
b _0806C1D2
.align 2, 0
_0806C1B0: .4byte gLinkEntity
_0806C1B0: .4byte gPlayerEntity
_0806C1B4:
adds r0, r4, #0
movs r1, #0
asm/gleerok.s
+40 -40
View File
@@ -96,7 +96,7 @@ _0802D090:
lsls r0, r0, #5
cmp r1, r0
bne _0802D0D2
ldr r0, _0802D0F0 @ =gLinkEntity
ldr r0, _0802D0F0 @ =gPlayerEntity
bl sub_0807AABC
bl DeleteThisEntity
_0802D0D2:
@@ -113,7 +113,7 @@ _0802D0D2:
b _0802D148
.align 2, 0
_0802D0EC: .4byte gScreen
_0802D0F0: .4byte gLinkEntity
_0802D0F0: .4byte gPlayerEntity
_0802D0F4:
movs r0, #0x94
lsls r0, r0, #1
@@ -122,10 +122,10 @@ _0802D0F4:
bl sub_0804A7D4
b _0802D148
_0802D104:
ldr r5, _0802D14C @ =gLinkState
ldr r5, _0802D14C @ =gPlayerState
movs r0, #1
strb r0, [r5, #0x14]
ldr r1, _0802D150 @ =gLinkEntity
ldr r1, _0802D150 @ =gPlayerEntity
adds r0, r4, #0
adds r0, #0x5a
ldrb r0, [r0]
@@ -156,8 +156,8 @@ _0802D128:
_0802D148:
pop {r4, r5, pc}
.align 2, 0
_0802D14C: .4byte gLinkState
_0802D150: .4byte gLinkEntity
_0802D14C: .4byte gPlayerState
_0802D150: .4byte gPlayerEntity
_0802D154: .4byte gUnk_080CD75C
thumb_func_start sub_0802D158
@@ -204,7 +204,7 @@ sub_0802D170: @ 0x0802D170
bne _0802D216
movs r0, #2
strb r0, [r5, #0xc]
ldr r2, _0802D1F4 @ =gLinkEntity
ldr r2, _0802D1F4 @ =gPlayerEntity
ldr r4, _0802D1F8 @ =gRoomControls
ldrh r0, [r4, #6]
adds r0, #0x98
@@ -238,7 +238,7 @@ sub_0802D170: @ 0x0802D170
b _0802D216
.align 2, 0
_0802D1F0: .4byte gUnk_03000FD0
_0802D1F4: .4byte gLinkEntity
_0802D1F4: .4byte gPlayerEntity
_0802D1F8: .4byte gRoomControls
_0802D1FC:
movs r0, #3
@@ -487,7 +487,7 @@ sub_0802D3B8: @ 0x0802D3B8
ldr r0, _0802D3F8 @ =0x0000FDFF
ands r0, r1
strh r0, [r2]
ldr r0, _0802D3FC @ =gLinkEntity
ldr r0, _0802D3FC @ =gPlayerEntity
bl sub_0807AABC
bl DeleteThisEntity
_0802D3DE:
@@ -506,7 +506,7 @@ _0802D3EA:
.align 2, 0
_0802D3F4: .4byte gScreen
_0802D3F8: .4byte 0x0000FDFF
_0802D3FC: .4byte gLinkEntity
_0802D3FC: .4byte gPlayerEntity
_0802D400: .4byte _0802D404
_0802D404: @ jump table
.4byte _0802D420 @ case 0
@@ -650,7 +650,7 @@ _0802D4D6:
adds r0, #8
strb r3, [r0]
_0802D52E:
ldr r0, _0802D540 @ =gLinkState
ldr r0, _0802D540 @ =gPlayerState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
@@ -659,7 +659,7 @@ _0802D52E:
bl InitializeAnimation
b _0802D63C
.align 2, 0
_0802D540: .4byte gLinkState
_0802D540: .4byte gPlayerState
_0802D544:
ldrb r0, [r4, #0xb]
cmp r0, #1
@@ -818,7 +818,7 @@ sub_0802D674: @ 0x0802D674
ldr r0, _0802D6B4 @ =gUnk_02034490
movs r7, #1
strb r7, [r0]
ldr r5, _0802D6B8 @ =gLinkEntity
ldr r5, _0802D6B8 @ =gPlayerEntity
ldr r6, [r5, #0x34]
cmp r6, #0
bne _0802D6EC
@@ -845,7 +845,7 @@ _0802D692:
b _0802D6EC
.align 2, 0
_0802D6B4: .4byte gUnk_02034490
_0802D6B8: .4byte gLinkEntity
_0802D6B8: .4byte gPlayerEntity
_0802D6BC: .4byte 0x00000127
_0802D6C0: .4byte gRoomControls
_0802D6C4:
@@ -1010,9 +1010,9 @@ sub_0802D7B4: @ 0x0802D7B4
movs r0, #0x18
strb r0, [r1, #0xe]
ldr r1, _0802D800 @ =gRoomControls
ldr r0, _0802D804 @ =gLinkEntity
ldr r0, _0802D804 @ =gPlayerEntity
str r0, [r1, #0x30]
ldr r0, _0802D808 @ =gLinkState
ldr r0, _0802D808 @ =gPlayerState
adds r0, #0x8b
strb r2, [r0]
ldr r0, _0802D80C @ =gUnk_02034490
@@ -1023,8 +1023,8 @@ sub_0802D7B4: @ 0x0802D7B4
.align 2, 0
_0802D7FC: .4byte gUnk_080CD7F8
_0802D800: .4byte gRoomControls
_0802D804: .4byte gLinkEntity
_0802D808: .4byte gLinkState
_0802D804: .4byte gPlayerEntity
_0802D808: .4byte gPlayerState
_0802D80C: .4byte gUnk_02034490
_0802D810:
strb r1, [r5, #0xe]
@@ -1167,7 +1167,7 @@ _0802D918:
bne _0802D924
b _0802DB7E
_0802D924:
ldr r1, _0802D944 @ =gLinkEntity
ldr r1, _0802D944 @ =gPlayerEntity
adds r0, r4, #0
movs r2, #8
movs r3, #8
@@ -1176,7 +1176,7 @@ _0802D924:
bne _0802D936
b _0802DB7E
_0802D936:
ldr r0, _0802D948 @ =gLinkState
ldr r0, _0802D948 @ =gPlayerState
movs r1, #1
strb r1, [r0, #0x14]
adds r0, #0x3f
@@ -1184,8 +1184,8 @@ _0802D936:
strb r1, [r0]
b _0802DB7E
.align 2, 0
_0802D944: .4byte gLinkEntity
_0802D948: .4byte gLinkState
_0802D944: .4byte gPlayerEntity
_0802D948: .4byte gPlayerState
_0802D94C:
adds r0, r4, #0
adds r0, #0x5a
@@ -1477,7 +1477,7 @@ _0802DB80: .4byte gUnk_080CD810
sub_0802DB84: @ 0x0802DB84
push {r4, r5, lr}
adds r5, r0, #0
ldr r1, _0802DBB0 @ =gLinkEntity
ldr r1, _0802DBB0 @ =gPlayerEntity
bl GetFacingDirection
strb r0, [r5, #0x15]
adds r1, r5, #0
@@ -1496,7 +1496,7 @@ sub_0802DB84: @ 0x0802DB84
strb r0, [r1]
b _0802DC1A
.align 2, 0
_0802DBB0: .4byte gLinkEntity
_0802DBB0: .4byte gPlayerEntity
_0802DBB4:
ldrb r0, [r2, #1]
ldrb r1, [r5, #0x15]
@@ -1560,7 +1560,7 @@ _0802DC1A:
sub_0802DC1C: @ 0x0802DC1C
push {r4, r5, r6, lr}
adds r5, r0, #0
ldr r1, _0802DC40 @ =gLinkEntity
ldr r1, _0802DC40 @ =gPlayerEntity
bl GetFacingDirection
adds r3, r0, #0
adds r1, r5, #0
@@ -1576,7 +1576,7 @@ sub_0802DC1C: @ 0x0802DC1C
bhi _0802DC54
b _0802DC48
.align 2, 0
_0802DC40: .4byte gLinkEntity
_0802DC40: .4byte gPlayerEntity
_0802DC44:
cmp r3, #2
bls _0802DC54
@@ -1670,7 +1670,7 @@ sub_0802DCE0: @ 0x0802DCE0
ldrb r0, [r1, #0xe]
cmp r0, #0xc
beq _0802DD44
ldr r1, _0802DD1C @ =gLinkEntity
ldr r1, _0802DD1C @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
strb r0, [r4, #0x15]
@@ -1691,7 +1691,7 @@ sub_0802DCE0: @ 0x0802DCE0
strb r0, [r4, #0xf]
b _0802DDD0
.align 2, 0
_0802DD1C: .4byte gLinkEntity
_0802DD1C: .4byte gPlayerEntity
_0802DD20:
ldrb r0, [r2, #0x15]
ldrb r1, [r4, #0x15]
@@ -2194,12 +2194,12 @@ sub_0802E0B8: @ 0x0802E0B8
ands r2, r0
cmp r2, #0
beq _0802E0F4
ldr r1, _0802E128 @ =gLinkEntity
ldr r1, _0802E128 @ =gPlayerEntity
adds r0, r4, #0
bl sub_0806FC80
cmp r0, #0
beq _0802E0F4
ldr r0, _0802E12C @ =gLinkState
ldr r0, _0802E12C @ =gPlayerState
movs r1, #1
strb r1, [r0, #0x14]
adds r0, #0x3f
@@ -2231,8 +2231,8 @@ _0802E0F4:
bl PlaySFX
b _0802E1CA
.align 2, 0
_0802E128: .4byte gLinkEntity
_0802E12C: .4byte gLinkState
_0802E128: .4byte gPlayerEntity
_0802E12C: .4byte gPlayerState
_0802E130: .4byte gUnk_080CD844
_0802E134:
ldrb r1, [r4, #0x10]
@@ -2341,12 +2341,12 @@ _0802E1F6:
ands r2, r0
cmp r2, #0
beq _0802E218
ldr r1, _0802E280 @ =gLinkEntity
ldr r1, _0802E280 @ =gPlayerEntity
adds r0, r5, #0
bl sub_0806FC80
cmp r0, #0
beq _0802E218
ldr r0, _0802E284 @ =gLinkState
ldr r0, _0802E284 @ =gPlayerState
movs r1, #1
strb r1, [r0, #0x14]
adds r0, #0x3f
@@ -2404,8 +2404,8 @@ _0802E23A:
bl sub_08080964
b _0802E2E4
.align 2, 0
_0802E280: .4byte gLinkEntity
_0802E284: .4byte gLinkState
_0802E280: .4byte gPlayerEntity
_0802E284: .4byte gPlayerState
_0802E288: .4byte gScreen
_0802E28C:
adds r4, r7, #0
@@ -2563,7 +2563,7 @@ _0802E3A4:
adds r0, r4, #0
adds r0, #0x84
ldr r5, [r0]
ldr r1, _0802E408 @ =gLinkEntity
ldr r1, _0802E408 @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
bl sub_0806F5A4
@@ -2605,7 +2605,7 @@ _0802E400:
strb r0, [r1, #0xe]
b _0802E422
.align 2, 0
_0802E408: .4byte gLinkEntity
_0802E408: .4byte gPlayerEntity
_0802E40C:
ldr r0, _0802E42C @ =gScreenTransition
ldr r0, [r0]
@@ -3369,7 +3369,7 @@ _0802E9A4:
sub_0802E9B0: @ 0x0802E9B0
push {r4, lr}
adds r4, r0, #0
ldr r0, _0802E9D0 @ =gLinkEntity
ldr r0, _0802E9D0 @ =gPlayerEntity
movs r2, #0x2e
ldrsh r1, [r0, r2]
movs r3, #0x32
@@ -3382,7 +3382,7 @@ sub_0802E9B0: @ 0x0802E9B0
movs r2, #0xa
b _0802E9EA
.align 2, 0
_0802E9D0: .4byte gLinkEntity
_0802E9D0: .4byte gPlayerEntity
_0802E9D4:
adds r1, r2, #0
subs r1, #0x60
asm/greatFairy.s
+2 -2
View File
@@ -175,7 +175,7 @@ sub_08087424: @ 0x08087424
adds r4, r0, #0
cmp r4, #0
beq _0808744E
ldr r0, _0808745C @ =gLinkEntity
ldr r0, _0808745C @ =gPlayerEntity
str r0, [r4, #0x50]
adds r1, r4, #0
bl CopyPosition
@@ -190,7 +190,7 @@ _0808744E:
beq _0808746C
b _08087474
.align 2, 0
_0808745C: .4byte gLinkEntity
_0808745C: .4byte gPlayerEntity
_08087460:
ldr r0, _08087468 @ =gUnk_02002A40
adds r0, #0xad
asm/gregal.s
+2 -2
View File
@@ -203,7 +203,7 @@ _0806CC40:
adds r1, r4, #0
adds r1, #0x69
strb r0, [r1]
ldr r1, _0806CC7C @ =gLinkEntity
ldr r1, _0806CC7C @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
bl sub_0806F5A4
@@ -215,7 +215,7 @@ _0806CC40:
bl sub_0806F118
b _0806CCB0
.align 2, 0
_0806CC7C: .4byte gLinkEntity
_0806CC7C: .4byte gPlayerEntity
_0806CC80:
adds r0, r4, #0
movs r1, #0
asm/guardWithSpear.s
+18 -18
View File
@@ -175,7 +175,7 @@ sub_08064198: @ 0x08064198
subs r0, r1, #1
strb r0, [r4]
_080641AE:
ldr r0, _080641D8 @ =gLinkEntity
ldr r0, _080641D8 @ =gPlayerEntity
movs r2, #0x32
ldrsh r1, [r0, r2]
movs r2, #0x32
@@ -199,7 +199,7 @@ _080641CA:
movs r0, #0x10
b _080641DE
.align 2, 0
_080641D8: .4byte gLinkEntity
_080641D8: .4byte gPlayerEntity
_080641DC:
movs r0, #0
_080641DE:
@@ -220,7 +220,7 @@ _080641E6:
adds r6, #0x71
cmp r4, r0
beq _08064256
ldr r0, _080642B0 @ =gLinkEntity
ldr r0, _080642B0 @ =gPlayerEntity
movs r2, #0x24
ldrsh r1, [r0, r2]
movs r0, #0xa0
@@ -265,7 +265,7 @@ _08064256:
ldrsb r0, [r6, r0]
cmp r0, #0
bne _0806428C
ldr r1, _080642B0 @ =gLinkEntity
ldr r1, _080642B0 @ =gPlayerEntity
adds r0, r5, #0
bl GetFacingDirection
bl sub_0806F5B0
@@ -290,7 +290,7 @@ _0806428C:
bl sub_0806ED78
movs r0, #0x36
ldrsh r4, [r5, r0]
ldr r0, _080642B0 @ =gLinkEntity
ldr r0, _080642B0 @ =gPlayerEntity
ldrh r0, [r0, #0x36]
strh r0, [r5, #0x36]
cmp r4, #0
@@ -303,7 +303,7 @@ _0806428C:
_080642AC:
pop {r4, r5, r6, pc}
.align 2, 0
_080642B0: .4byte gLinkEntity
_080642B0: .4byte gPlayerEntity
_080642B4: .4byte gScreenTransition
thumb_func_start sub_080642B8
@@ -320,7 +320,7 @@ sub_080642B8: @ 0x080642B8
subs r0, r1, #1
strb r0, [r4]
_080642CE:
ldr r0, _080642F8 @ =gLinkEntity
ldr r0, _080642F8 @ =gPlayerEntity
movs r2, #0x2e
ldrsh r1, [r0, r2]
movs r2, #0x2e
@@ -344,7 +344,7 @@ _080642EA:
movs r0, #8
b _080642FE
.align 2, 0
_080642F8: .4byte gLinkEntity
_080642F8: .4byte gPlayerEntity
_080642FC:
movs r0, #0x18
_080642FE:
@@ -365,7 +365,7 @@ _08064306:
adds r6, #0x71
cmp r4, r0
beq _08064376
ldr r0, _080643D0 @ =gLinkEntity
ldr r0, _080643D0 @ =gPlayerEntity
movs r2, #0x24
ldrsh r1, [r0, r2]
movs r0, #0xa0
@@ -410,7 +410,7 @@ _08064376:
ldrsb r0, [r6, r0]
cmp r0, #0
bne _080643AC
ldr r1, _080643D0 @ =gLinkEntity
ldr r1, _080643D0 @ =gPlayerEntity
adds r0, r5, #0
bl GetFacingDirection
bl sub_0806F5B0
@@ -435,7 +435,7 @@ _080643AC:
bl sub_0806ED78
movs r0, #0x36
ldrsh r4, [r5, r0]
ldr r0, _080643D0 @ =gLinkEntity
ldr r0, _080643D0 @ =gPlayerEntity
ldrh r0, [r0, #0x36]
strh r0, [r5, #0x36]
cmp r4, #0
@@ -448,7 +448,7 @@ _080643AC:
_080643CC:
pop {r4, r5, r6, pc}
.align 2, 0
_080643D0: .4byte gLinkEntity
_080643D0: .4byte gPlayerEntity
_080643D4: .4byte gScreenTransition
thumb_func_start sub_080643D8
@@ -533,7 +533,7 @@ _0806446C: .4byte gUnk_0810D0A4
thumb_func_start sub_08064470
sub_08064470: @ 0x08064470
push {lr}
ldr r0, _08064484 @ =gLinkState
ldr r0, _08064484 @ =gPlayerState
adds r0, #0xab
ldrb r0, [r0]
cmp r0, #1
@@ -543,12 +543,12 @@ _0806447E:
str r0, [r1, #0x14]
pop {pc}
.align 2, 0
_08064484: .4byte gLinkState
_08064484: .4byte gPlayerState
thumb_func_start sub_08064488
sub_08064488: @ 0x08064488
push {lr}
ldr r1, _080644A0 @ =gLinkState
ldr r1, _080644A0 @ =gPlayerState
adds r0, r1, #0
adds r0, #0xa8
ldrb r0, [r0]
@@ -560,17 +560,17 @@ sub_08064488: @ 0x08064488
_0806449C:
pop {pc}
.align 2, 0
_080644A0: .4byte gLinkState
_080644A0: .4byte gPlayerState
thumb_func_start sub_080644A4
sub_080644A4: @ 0x080644A4
ldr r0, _080644B0 @ =gLinkState
ldr r0, _080644B0 @ =gPlayerState
adds r0, #0xab
movs r1, #0
strb r1, [r0]
bx lr
.align 2, 0
_080644B0: .4byte gLinkState
_080644B0: .4byte gPlayerState
thumb_func_start sub_080644B4
sub_080644B4: @ 0x080644B4
asm/gyorgChild.s
+4 -4
View File
@@ -339,7 +339,7 @@ _080488AA:
cmp r0, #2
bne _080488D0
_080488AE:
ldr r1, _080488C8 @ =gLinkEntity
ldr r1, _080488C8 @ =gPlayerEntity
adds r0, r4, #0
adds r0, #0x74
ldrh r0, [r0]
@@ -353,7 +353,7 @@ _080488AE:
ldrh r1, [r1, #0xc]
b _080488E8
.align 2, 0
_080488C8: .4byte gLinkEntity
_080488C8: .4byte gPlayerEntity
_080488CC: .4byte gRoomControls
_080488D0:
ldr r1, _080488FC @ =gRoomControls
@@ -363,7 +363,7 @@ _080488D0:
ldrh r1, [r1, #0xa]
adds r0, r0, r1
strh r0, [r4, #0x2e]
ldr r1, _08048900 @ =gLinkEntity
ldr r1, _08048900 @ =gPlayerEntity
adds r0, r4, #0
adds r0, #0x76
ldrh r0, [r0]
@@ -381,7 +381,7 @@ _080488FA:
pop {r4, pc}
.align 2, 0
_080488FC: .4byte gRoomControls
_08048900: .4byte gLinkEntity
_08048900: .4byte gPlayerEntity
thumb_func_start sub_08048904
sub_08048904: @ 0x08048904
asm/gyorgFemale.s
+8 -8
View File
@@ -121,7 +121,7 @@ sub_0804614C: @ 0x0804614C
bl sub_0804660C
adds r0, r6, #0
bl sub_080464C0
ldr r0, _08046254 @ =gLinkEntity
ldr r0, _08046254 @ =gPlayerEntity
adds r1, r0, #0
adds r1, #0x38
strb r5, [r1]
@@ -136,7 +136,7 @@ _08046244:
_08046248: .4byte gUnk_03003DBC
_0804624C: .4byte gUnk_02019EE0
_08046250: .4byte gUnk_02002F00
_08046254: .4byte gLinkEntity
_08046254: .4byte gPlayerEntity
_08046258: .4byte sub_08046498
thumb_func_start sub_0804625C
@@ -586,7 +586,7 @@ _080465C4: .4byte gUnk_080B3E80
thumb_func_start sub_080465C8
sub_080465C8: @ 0x080465C8
push {r4, lr}
ldr r3, _080465FC @ =gLinkEntity
ldr r3, _080465FC @ =gPlayerEntity
movs r0, #0x2e
ldrsh r2, [r3, r0]
ldr r1, _08046600 @ =gRoomControls
@@ -606,16 +606,16 @@ sub_080465C8: @ 0x080465C8
ldrh r0, [r0]
cmp r0, #0
beq _080465F8
ldr r1, _08046608 @ =gLinkState
ldr r1, _08046608 @ =gPlayerState
movs r0, #1
strb r0, [r1, #0x14]
_080465F8:
pop {r4, pc}
.align 2, 0
_080465FC: .4byte gLinkEntity
_080465FC: .4byte gPlayerEntity
_08046600: .4byte gRoomControls
_08046604: .4byte gUnk_02019EE0
_08046608: .4byte gLinkState
_08046608: .4byte gPlayerState
thumb_func_start sub_0804660C
sub_0804660C: @ 0x0804660C
@@ -817,7 +817,7 @@ _0804674C:
adds r0, r1, #0
cmp r0, #0xff
beq _080467CC
ldr r2, _080467D8 @ =gLinkEntity
ldr r2, _080467D8 @ =gPlayerEntity
adds r0, r2, #0
adds r0, #0x3e
strb r1, [r0]
@@ -854,7 +854,7 @@ _080467CC:
strb r0, [r1]
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080467D8: .4byte gLinkEntity
_080467D8: .4byte gPlayerEntity
thumb_func_start sub_080467DC
sub_080467DC: @ 0x080467DC
asm/gyorgFemaleEye.s
+2 -2
View File
@@ -120,7 +120,7 @@ _08048A7C:
adds r1, r1, r0
ldr r0, [r5, #0x4c]
str r0, [r1]
ldr r2, _08048ACC @ =gLinkEntity
ldr r2, _08048ACC @ =gPlayerEntity
movs r6, #0x2e
ldrsh r0, [r2, r6]
movs r6, #0x2e
@@ -151,7 +151,7 @@ _08048A7C:
strb r0, [r2]
b _08048AD8
.align 2, 0
_08048ACC: .4byte gLinkEntity
_08048ACC: .4byte gPlayerEntity
_08048AD0:
ldr r0, [r4, #0x64]
adds r0, #0x3c
asm/gyorgFemaleMouth.s
+4 -4
View File
@@ -85,16 +85,16 @@ _0804901E:
ands r0, r5
cmp r0, #0
beq _08049038
ldr r0, _08049034 @ =gLinkEntity
ldr r0, _08049034 @ =gPlayerEntity
movs r2, #0x32
ldrsh r1, [r4, r2]
movs r2, #0x32
ldrsh r0, [r0, r2]
b _08049042
.align 2, 0
_08049034: .4byte gLinkEntity
_08049034: .4byte gPlayerEntity
_08049038:
ldr r0, _08049054 @ =gLinkEntity
ldr r0, _08049054 @ =gPlayerEntity
movs r2, #0x2e
ldrsh r1, [r4, r2]
movs r2, #0x2e
@@ -111,5 +111,5 @@ _08049048:
str r0, [r4, #0x48]
pop {r4, r5, r6, pc}
.align 2, 0
_08049054: .4byte gLinkEntity
_08049054: .4byte gPlayerEntity
_08049058: .4byte gUnk_080D28AC
asm/gyorgMale.s
+21 -21
View File
@@ -77,7 +77,7 @@ _08046836:
ands r0, r2
strb r0, [r4, #0x18]
_08046878:
ldr r2, _08046894 @ =gLinkEntity
ldr r2, _08046894 @ =gPlayerEntity
ldrh r1, [r2, #0x2e]
adds r0, r4, #0
adds r0, #0x84
@@ -89,7 +89,7 @@ _08046878:
.align 2, 0
_0804688C: .4byte gUnk_080D1AFC
_08046890: .4byte gRoomControls
_08046894: .4byte gLinkEntity
_08046894: .4byte gPlayerEntity
thumb_func_start sub_08046898
sub_08046898: @ 0x08046898
@@ -2193,7 +2193,7 @@ _0804780A:
strb r0, [r4, #0x15]
adds r0, r4, #0
bl sub_08047E48
ldr r0, _0804786C @ =gLinkEntity
ldr r0, _0804786C @ =gPlayerEntity
movs r2, #0x2e
ldrsh r1, [r0, r2]
movs r3, #0x32
@@ -2223,7 +2223,7 @@ _0804780A:
b _0804790C
.align 2, 0
_08047868: .4byte 0x000002FF
_0804786C: .4byte gLinkEntity
_0804786C: .4byte gPlayerEntity
_08047870:
ldr r5, _080478FC @ =gRoomControls
ldrh r1, [r5, #6]
@@ -2425,7 +2425,7 @@ _080479CC:
beq _080479F4
str r4, [r0, #0x50]
_080479F4:
ldr r0, _08047A78 @ =gLinkEntity
ldr r0, _08047A78 @ =gPlayerEntity
movs r2, #0x2e
ldrsh r1, [r0, r2]
movs r3, #0x32
@@ -2491,7 +2491,7 @@ _08047A2C:
adds r1, #0x82
b _08047B04
.align 2, 0
_08047A78: .4byte gLinkEntity
_08047A78: .4byte gPlayerEntity
_08047A7C: .4byte gRoomControls
_08047A80:
ldr r2, _08047AA0 @ =gRoomControls
@@ -2911,7 +2911,7 @@ sub_08047D88: @ 0x08047D88
lsrs r0, r0, #6
cmp r0, #3
bne _08047DB0
ldr r0, _08047DE8 @ =gLinkState
ldr r0, _08047DE8 @ =gPlayerState
ldrb r0, [r0, #0x14]
cmp r0, #0
bne _08047DE6
@@ -2921,7 +2921,7 @@ _08047DB0:
ldrb r0, [r0]
cmp r0, #1
beq _08047DE6
ldr r4, _08047DEC @ =gLinkEntity
ldr r4, _08047DEC @ =gPlayerEntity
movs r0, #0x2e
ldrsh r1, [r4, r0]
movs r0, #0x32
@@ -2931,7 +2931,7 @@ _08047DB0:
bl sub_0806FCB8
cmp r0, #0
beq _08047DE6
ldr r0, _08047DE8 @ =gLinkState
ldr r0, _08047DE8 @ =gPlayerState
movs r1, #1
strb r1, [r0, #0x14]
movs r1, #0x36
@@ -2945,8 +2945,8 @@ _08047DB0:
_08047DE6:
pop {r4, r5, pc}
.align 2, 0
_08047DE8: .4byte gLinkState
_08047DEC: .4byte gLinkEntity
_08047DE8: .4byte gPlayerState
_08047DEC: .4byte gPlayerEntity
thumb_func_start sub_08047DF0
sub_08047DF0: @ 0x08047DF0
@@ -2976,7 +2976,7 @@ sub_08047DF0: @ 0x08047DF0
bl sub_08079F8C
cmp r0, #0
beq _08047E42
ldr r0, _08047E44 @ =gLinkEntity
ldr r0, _08047E44 @ =gPlayerEntity
ldrh r1, [r5, #0x2e]
subs r1, r1, r4
ldrh r2, [r0, #0x2e]
@@ -2990,7 +2990,7 @@ sub_08047DF0: @ 0x08047DF0
_08047E42:
pop {r4, r5, r6, pc}
.align 2, 0
_08047E44: .4byte gLinkEntity
_08047E44: .4byte gPlayerEntity
thumb_func_start sub_08047E48
sub_08047E48: @ 0x08047E48
@@ -3024,7 +3024,7 @@ sub_08047E58: @ 0x08047E58
bl sub_08079F8C
cmp r0, #0
beq _08047E9C
ldr r0, _08047EA0 @ =gLinkEntity
ldr r0, _08047EA0 @ =gPlayerEntity
ldrh r1, [r4, #0x2e]
subs r1, r1, r5
ldrh r2, [r0, #0x2e]
@@ -3038,7 +3038,7 @@ sub_08047E58: @ 0x08047E58
_08047E9C:
pop {r4, r5, r6, pc}
.align 2, 0
_08047EA0: .4byte gLinkEntity
_08047EA0: .4byte gPlayerEntity
thumb_func_start sub_08047EA4
sub_08047EA4: @ 0x08047EA4
@@ -3069,7 +3069,7 @@ sub_08047EA4: @ 0x08047EA4
bl sub_08047F68
lsls r0, r0, #8
mov r8, r0
ldr r6, _08047F60 @ =gLinkEntity
ldr r6, _08047F60 @ =gPlayerEntity
movs r1, #0x2e
ldrsh r0, [r6, r1]
movs r2, #0x2e
@@ -3137,13 +3137,13 @@ _08047F58:
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08047F60: .4byte gLinkEntity
_08047F60: .4byte gPlayerEntity
_08047F64: .4byte gSineTable
thumb_func_start sub_08047F68
sub_08047F68: @ 0x08047F68
push {r4, r5, lr}
ldr r3, _08047F98 @ =gLinkEntity
ldr r3, _08047F98 @ =gPlayerEntity
movs r1, #0x2e
ldrsh r2, [r3, r1]
movs r4, #0x2e
@@ -3167,7 +3167,7 @@ sub_08047F68: @ 0x08047F68
movs r0, #0x20
b _08048002
.align 2, 0
_08047F98: .4byte gLinkEntity
_08047F98: .4byte gPlayerEntity
_08047F9C:
ldr r0, _08047FB8 @ =gUnk_080D1C04
movs r3, #0x18
@@ -3251,7 +3251,7 @@ _0804801C:
movs r1, #0x7f
ands r1, r0
strb r1, [r4, #0x10]
ldr r6, _080480A4 @ =gLinkEntity
ldr r6, _080480A4 @ =gPlayerEntity
movs r1, #0x36
ldrsh r0, [r6, r1]
cmp r0, #0
@@ -3317,7 +3317,7 @@ _08048086:
strh r0, [r6, #0x32]
b _08048138
.align 2, 0
_080480A4: .4byte gLinkEntity
_080480A4: .4byte gPlayerEntity
_080480A8: .4byte gRoomControls
_080480AC: .4byte gUnk_02019EE0
_080480B0:
asm/helmasaur.s
+2 -2
View File
@@ -152,7 +152,7 @@ sub_0802BC74: @ 0x0802BC74
strb r0, [r4, #0xd]
movs r0, #0x3c
strb r0, [r4, #0x1d]
ldr r0, _0802BC9C @ =gLinkEntity
ldr r0, _0802BC9C @ =gPlayerEntity
ldrb r0, [r0, #0x14]
lsrs r0, r0, #1
movs r1, #2
@@ -163,7 +163,7 @@ sub_0802BC74: @ 0x0802BC74
bl InitializeAnimation
pop {r4, pc}
.align 2, 0
_0802BC9C: .4byte gLinkEntity
_0802BC9C: .4byte gPlayerEntity
thumb_func_start sub_0802BCA0
sub_0802BCA0: @ 0x0802BCA0
asm/houseDoorInterior.s
+4 -4
View File
@@ -116,12 +116,12 @@ _08092C20:
bl sub_0806ED9C
cmp r0, #0
blt _08092C78
ldr r1, _08092C6C @ =gLinkEntity
ldr r1, _08092C6C @ =gPlayerEntity
ldrh r0, [r5]
ldrb r1, [r1, #0x14]
cmp r0, r1
bne _08092C78
ldr r0, _08092C70 @ =gLinkState
ldr r0, _08092C70 @ =gPlayerState
adds r0, #0x90
ldrh r1, [r0]
ldrh r0, [r5, #2]
@@ -133,8 +133,8 @@ _08092C20:
b _08092C76
.align 2, 0
_08092C68: .4byte gUnk_081227CC
_08092C6C: .4byte gLinkEntity
_08092C70: .4byte gLinkState
_08092C6C: .4byte gPlayerEntity
_08092C70: .4byte gPlayerState
_08092C74:
movs r0, #8
_08092C76:
asm/hurdyGurdyMan.s
+4 -4
View File
@@ -57,7 +57,7 @@ _0806E34C:
adds r1, r4, #0
adds r1, #0x69
strb r0, [r1]
ldr r1, _0806E3B0 @ =gLinkEntity
ldr r1, _0806E3B0 @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
bl sub_0806F5A4
@@ -82,15 +82,15 @@ _0806E398:
ldrh r3, [r3, #4]
adds r0, r4, #0
bl sub_0801DFB4
ldr r0, _0806E3B8 @ =gLinkState
ldr r0, _0806E3B8 @ =gPlayerState
adds r0, #0x8b
movs r1, #3
strb r1, [r0]
b _0806E3E0
.align 2, 0
_0806E3B0: .4byte gLinkEntity
_0806E3B0: .4byte gPlayerEntity
_0806E3B4: .4byte gUnk_08001A7C
_0806E3B8: .4byte gLinkState
_0806E3B8: .4byte gPlayerState
_0806E3BC:
adds r0, r4, #0
movs r1, #0
asm/item11.s
+2 -2
View File
@@ -173,7 +173,7 @@ _08018F9E:
sub_08018FA0: @ 0x08018FA0
push {lr}
adds r2, r0, #0
ldr r0, _08018FC8 @ =gLinkEntity
ldr r0, _08018FC8 @ =gPlayerEntity
adds r0, #0x38
ldrb r0, [r0]
adds r1, r2, #0
@@ -191,4 +191,4 @@ _08018FBC:
bl PlaySFX
pop {pc}
.align 2, 0
_08018FC8: .4byte gLinkEntity
_08018FC8: .4byte gPlayerEntity
asm/itemForSale.s
+17 -17
View File
@@ -115,13 +115,13 @@ _080818C0:
ldr r1, _080818E8 @ =gRoomVars
movs r0, #1
str r0, [r1, #0x68]
ldr r1, _080818EC @ =gLinkState
ldr r1, _080818EC @ =gPlayerState
movs r0, #7
strb r0, [r1, #0xc]
b _08081920
.align 2, 0
_080818E8: .4byte gRoomVars
_080818EC: .4byte gLinkState
_080818EC: .4byte gPlayerState
_080818F0:
adds r1, r4, #0
adds r1, #0x39
@@ -133,11 +133,11 @@ _080818F0:
movs r0, #1
strb r0, [r4, #0xd]
bl sub_08078B48
bl ResetLink
ldr r1, _08081924 @ =gLinkState
bl ResetPlayer
ldr r1, _08081924 @ =gPlayerState
movs r0, #4
strb r0, [r1, #5]
ldr r0, _08081928 @ =gLinkEntity
ldr r0, _08081928 @ =gPlayerEntity
str r4, [r0, #0x74]
ldr r0, _0808192C @ =gUnk_0200AF00
adds r0, #0x2f
@@ -147,8 +147,8 @@ _080818F0:
_08081920:
pop {r4, pc}
.align 2, 0
_08081924: .4byte gLinkState
_08081928: .4byte gLinkEntity
_08081924: .4byte gPlayerState
_08081928: .4byte gPlayerEntity
_0808192C: .4byte gUnk_0200AF00
thumb_func_start sub_08081930
@@ -160,7 +160,7 @@ sub_08081930: @ 0x08081930
adds r6, #0x2f
movs r0, #2
strb r0, [r6]
ldr r3, _0808196C @ =gLinkEntity
ldr r3, _0808196C @ =gPlayerEntity
ldrb r1, [r3, #0x18]
lsls r1, r1, #0x1e
lsrs r1, r1, #0x1e
@@ -169,7 +169,7 @@ sub_08081930: @ 0x08081930
ands r0, r2
orrs r0, r1
strb r0, [r4, #0x18]
ldr r5, _08081970 @ =gLinkState
ldr r5, _08081970 @ =gPlayerState
ldrb r0, [r5, #5]
cmp r0, #0
beq _0808195E
@@ -182,8 +182,8 @@ _0808195E:
b _080819AC
.align 2, 0
_08081968: .4byte gUnk_0200AF00
_0808196C: .4byte gLinkEntity
_08081970: .4byte gLinkState
_0808196C: .4byte gPlayerEntity
_08081970: .4byte gPlayerState
_08081974:
bl sub_080784E4
adds r1, r0, #0
@@ -203,7 +203,7 @@ _08081974:
cmp r0, #0
bne _080819AC
_08081998:
ldr r0, _080819B0 @ =gLinkState
ldr r0, _080819B0 @ =gPlayerState
adds r0, #0x92
ldrh r1, [r0]
movs r0, #0x98
@@ -215,7 +215,7 @@ _08081998:
_080819AC:
pop {r4, r5, r6, pc}
.align 2, 0
_080819B0: .4byte gLinkState
_080819B0: .4byte gPlayerState
thumb_func_start sub_080819B4
sub_080819B4: @ 0x080819B4
@@ -236,10 +236,10 @@ sub_080819B4: @ 0x080819B4
_080819D0:
bl DeleteThisEntity
_080819D4:
ldr r0, _08081A4C @ =gLinkState
ldr r0, _08081A4C @ =gPlayerState
movs r2, #0
strb r2, [r0, #5]
ldr r4, _08081A50 @ =gLinkEntity
ldr r4, _08081A50 @ =gPlayerEntity
str r2, [r4, #0x74]
ldr r1, _08081A54 @ =gUnk_0200AF00
ldr r3, _08081A48 @ =gRoomVars
@@ -294,8 +294,8 @@ _080819D4:
pop {r4, r5, r6, pc}
.align 2, 0
_08081A48: .4byte gRoomVars
_08081A4C: .4byte gLinkState
_08081A50: .4byte gLinkEntity
_08081A4C: .4byte gPlayerState
_08081A50: .4byte gPlayerEntity
_08081A54: .4byte gUnk_0200AF00
_08081A58: .4byte gRoomControls
asm/itemOnGround.s
+14 -14
View File
@@ -127,13 +127,13 @@ sub_08080A40: @ 0x08080A40
push {r4, r5, r6, r7, lr}
ldr r7, _08080A70 @ =gRoomControls
ldr r1, [r7, #0x30]
ldr r0, _08080A74 @ =gLinkEntity
ldr r0, _08080A74 @ =gPlayerEntity
adds r2, r7, #0
cmp r1, r0
beq _08080A50
b _08080B5C
_08080A50:
ldr r0, _08080A78 @ =gLinkState
ldr r0, _08080A78 @ =gPlayerState
ldrb r0, [r0, #2]
cmp r0, #0
beq _08080A5A
@@ -152,8 +152,8 @@ _08080A64:
mov pc, r0
.align 2, 0
_08080A70: .4byte gRoomControls
_08080A74: .4byte gLinkEntity
_08080A78: .4byte gLinkState
_08080A74: .4byte gPlayerEntity
_08080A78: .4byte gPlayerState
_08080A7C: .4byte _08080A80
_08080A80: @ jump table
.4byte _08080AFA @ case 0
@@ -897,13 +897,13 @@ _0808110E:
adds r1, #0x3b
movs r0, #0x11
strb r0, [r1]
ldr r0, _08081130 @ =gLinkEntity
ldr r0, _08081130 @ =gPlayerEntity
adds r1, r2, #0
bl CopyPosition
_0808112E:
pop {pc}
.align 2, 0
_08081130: .4byte gLinkEntity
_08081130: .4byte gPlayerEntity
thumb_func_start sub_08081134
sub_08081134: @ 0x08081134
@@ -1150,7 +1150,7 @@ _080812E4:
sub_080812E8: @ 0x080812E8
push {r4, lr}
adds r4, r0, #0
ldr r3, _0808131C @ =gLinkState
ldr r3, _0808131C @ =gPlayerState
adds r0, r3, #0
adds r0, #0x26
ldrb r1, [r0]
@@ -1163,7 +1163,7 @@ sub_080812E8: @ 0x080812E8
ands r0, r2
cmp r0, #0
bne _08081318
ldr r1, _08081320 @ =gLinkEntity
ldr r1, _08081320 @ =gPlayerEntity
adds r0, r4, #0
bl sub_080177A0
cmp r0, #0
@@ -1173,8 +1173,8 @@ sub_080812E8: @ 0x080812E8
_08081318:
pop {r4, pc}
.align 2, 0
_0808131C: .4byte gLinkState
_08081320: .4byte gLinkEntity
_0808131C: .4byte gPlayerState
_08081320: .4byte gPlayerEntity
thumb_func_start nullsub_510
nullsub_510: @ 0x08081324
@@ -1202,7 +1202,7 @@ _08081342:
ldrh r0, [r4, #0x36]
subs r0, #1
strh r0, [r4, #0x36]
ldr r2, _08081368 @ =gLinkEntity
ldr r2, _08081368 @ =gPlayerEntity
adds r0, r4, #0
adds r1, r2, #0
bl sub_080177A0
@@ -1213,7 +1213,7 @@ _08081342:
_08081364:
pop {r4, pc}
.align 2, 0
_08081368: .4byte gLinkEntity
_08081368: .4byte gPlayerEntity
thumb_func_start sub_0808136C
sub_0808136C: @ 0x0808136C
@@ -1570,7 +1570,7 @@ _080815AC:
movs r1, #3
orrs r0, r1
strb r0, [r2]
ldr r0, _08081618 @ =gLinkEntity
ldr r0, _08081618 @ =gPlayerEntity
str r0, [r4, #0x54]
adds r1, r4, #0
bl CopyPosition
@@ -1590,4 +1590,4 @@ _080815AC:
_08081614:
pop {r4, pc}
.align 2, 0
_08081618: .4byte gLinkEntity
_08081618: .4byte gPlayerEntity
asm/jarPortal.s
+2 -2
View File
@@ -248,7 +248,7 @@ _0808C050:
strb r0, [r2, #0x17]
cmp r5, #1
bne _0808C0A6
ldr r3, _0808C070 @ =gLinkState
ldr r3, _0808C070 @ =gPlayerState
ldr r0, [r3, #0x30]
movs r1, #0x20
ands r0, r1
@@ -261,7 +261,7 @@ _0808C050:
b _0808C082
.align 2, 0
_0808C06C: .4byte gArea
_0808C070: .4byte gLinkState
_0808C070: .4byte gPlayerState
_0808C074:
bl sub_08057810
cmp r0, #0
asm/kid.s
+12 -12
View File
@@ -263,7 +263,7 @@ _0806229A:
ldrb r0, [r5]
cmp r0, #7
bhi _080622F2
ldr r1, _080622C8 @ =gLinkEntity
ldr r1, _080622C8 @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
bl sub_0806F5A4
@@ -276,7 +276,7 @@ _0806229A:
bl InitializeAnimation
b _080622F2
.align 2, 0
_080622C8: .4byte gLinkEntity
_080622C8: .4byte gPlayerEntity
_080622CC:
adds r0, r4, #0
bl GetNextFrame
@@ -307,7 +307,7 @@ sub_080622F4: @ 0x080622F4
mov r6, r8
push {r6, r7}
adds r7, r0, #0
ldr r0, _0806239C @ =gLinkEntity
ldr r0, _0806239C @ =gPlayerEntity
mov r8, r0
ldrh r1, [r0, #0x2e]
ldr r3, _080623A0 @ =0xFFFF0000
@@ -325,7 +325,7 @@ sub_080622F4: @ 0x080622F4
ldrh r0, [r1, #0x36]
ands r3, r6
orrs r3, r0
ldr r0, _080623A8 @ =gLinkState
ldr r0, _080623A8 @ =gPlayerState
adds r0, #0xa8
ldrb r0, [r0]
lsls r0, r0, #0x10
@@ -389,10 +389,10 @@ _08062390:
strb r0, [r1]
b _080624F8
.align 2, 0
_0806239C: .4byte gLinkEntity
_0806239C: .4byte gPlayerEntity
_080623A0: .4byte 0xFFFF0000
_080623A4: .4byte 0x0000FFFF
_080623A8: .4byte gLinkState
_080623A8: .4byte gPlayerState
_080623AC: .4byte 0xFF00FFFF
_080623B0: .4byte 0xC0FFFFFF
_080623B4: .4byte 0x3FFFFFFF
@@ -471,7 +471,7 @@ _08062430:
bge _08062430
b _08062480
_08062442:
ldr r1, _080624E8 @ =gLinkEntity
ldr r1, _080624E8 @ =gPlayerEntity
movs r3, #0x2e
ldrsh r0, [r1, r3]
movs r2, #0x32
@@ -559,7 +559,7 @@ _080624D8:
strb r0, [r1]
b _080624F2
.align 2, 0
_080624E8: .4byte gLinkEntity
_080624E8: .4byte gPlayerEntity
_080624EC:
adds r0, r7, #0
bl UpdateAnimationSingleFrame
@@ -603,7 +603,7 @@ sub_0806252C: @ 0x0806252C
mov r5, r8
push {r5, r6, r7}
adds r7, r0, #0
ldr r4, _08062618 @ =gLinkEntity
ldr r4, _08062618 @ =gPlayerEntity
ldrh r1, [r4, #0x2e]
ldr r3, _0806261C @ =0xFFFF0000
adds r0, r3, #0
@@ -618,7 +618,7 @@ sub_0806252C: @ 0x0806252C
ldrh r0, [r4, #0x36]
ands r3, r6
orrs r3, r0
ldr r0, _08062624 @ =gLinkState
ldr r0, _08062624 @ =gPlayerState
adds r0, #0xa8
ldrb r0, [r0]
lsls r0, r0, #0x10
@@ -715,10 +715,10 @@ _080625C8:
mov sl, r5
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08062618: .4byte gLinkEntity
_08062618: .4byte gPlayerEntity
_0806261C: .4byte 0xFFFF0000
_08062620: .4byte 0x0000FFFF
_08062624: .4byte gLinkState
_08062624: .4byte gPlayerState
_08062628: .4byte 0xFF00FFFF
_0806262C: .4byte 0xC0FFFFFF
_08062630: .4byte 0x3FFFFFFF
asm/kingDaltus.s
+2 -2
View File
@@ -24,7 +24,7 @@ KingDaltus: @ 0x080665E4
movs r0, #0
strb r0, [r2]
strb r1, [r4, #0xc]
ldr r1, _08066630 @ =gLinkEntity
ldr r1, _08066630 @ =gPlayerEntity
adds r0, r4, #0
bl GetFacingDirection
bl sub_0806F5A4
@@ -43,7 +43,7 @@ _0806661E:
bl _call_via_r1
b _0806664E
.align 2, 0
_08066630: .4byte gLinkEntity
_08066630: .4byte gPlayerEntity
_08066634: .4byte gUnk_081104EC
_08066638:
ldr r0, _08066650 @ =gUnk_081104E0
asm/ladderHoleInBookshelf.s
+6 -6
View File
@@ -44,7 +44,7 @@ sub_08093FE0: @ 0x08093FE0
ldrb r0, [r3]
cmp r0, #2
bne _08094024
ldr r0, _08094020 @ =gLinkEntity
ldr r0, _08094020 @ =gPlayerEntity
ldrb r0, [r0, #0xc]
cmp r0, #0x1e
bgt _08094002
@@ -65,9 +65,9 @@ _08094002:
orrs r0, r1
b _08094060
.align 2, 0
_08094020: .4byte gLinkEntity
_08094020: .4byte gPlayerEntity
_08094024:
ldr r0, _0809404C @ =gLinkEntity
ldr r0, _0809404C @ =gPlayerEntity
ldrb r2, [r0, #0xc]
cmp r2, #0x1e
bgt _08094050
@@ -87,7 +87,7 @@ _08094024:
orrs r0, r1
b _08094060
.align 2, 0
_0809404C: .4byte gLinkEntity
_0809404C: .4byte gPlayerEntity
_08094050:
adds r2, r0, #0
adds r2, #0x38
@@ -106,7 +106,7 @@ _08094062:
sub_08094064: @ 0x08094064
push {lr}
movs r2, #1
ldr r1, _08094080 @ =gLinkEntity
ldr r1, _08094080 @ =gPlayerEntity
movs r3, #0x2e
ldrsh r1, [r1, r3]
movs r3, #0x2e
@@ -120,4 +120,4 @@ _0809407C:
adds r0, r2, #0
pop {pc}
.align 2, 0
_08094080: .4byte gLinkEntity
_08094080: .4byte gPlayerEntity
asm/ladderUp.s
+4 -4
View File
@@ -136,14 +136,14 @@ _0808DC46:
beq _0808DC4E
b _0808DD72
_0808DC4E:
ldr r0, _0808DCC8 @ =gLinkEntity
ldr r0, _0808DCC8 @ =gPlayerEntity
movs r2, #0x32
ldrsh r1, [r0, r2]
movs r3, #0x32
ldrsh r0, [r7, r3]
cmp r1, r0
bge _0808DCDC
ldr r0, _0808DCCC @ =gLinkState
ldr r0, _0808DCCC @ =gPlayerState
ldrb r0, [r0, #0x12]
cmp r0, #0x1e
bne _0808DC66
@@ -196,8 +196,8 @@ _0808DC74:
bl sub_0807BA8C
b _0808DD72
.align 2, 0
_0808DCC8: .4byte gLinkEntity
_0808DCCC: .4byte gLinkState
_0808DCC8: .4byte gPlayerEntity
_0808DCCC: .4byte gPlayerState
_0808DCD0: .4byte 0x00004017
_0808DCD4: .4byte 0x00004023
_0808DCD8: .4byte gRoomControls
asm/lavaPlatform.s
+10 -10
View File
@@ -240,14 +240,14 @@ _080923F8:
strb r0, [r4, #0x10]
movs r0, #0x14
strb r0, [r4, #0xe]
ldr r0, _0809241C @ =gLinkState
ldr r0, _0809241C @ =gPlayerState
adds r0, #0x3f
movs r1, #0xfd
strb r1, [r0]
_0809241A:
pop {r4, pc}
.align 2, 0
_0809241C: .4byte gLinkState
_0809241C: .4byte gPlayerState
thumb_func_start sub_08092420
sub_08092420: @ 0x08092420
@@ -256,7 +256,7 @@ sub_08092420: @ 0x08092420
bl sub_0809269C
cmp r0, #0
beq _08092434
ldr r0, _08092464 @ =gLinkState
ldr r0, _08092464 @ =gPlayerState
adds r0, #0x3f
movs r1, #0xfd
strb r1, [r0]
@@ -285,7 +285,7 @@ _08092434:
_08092462:
pop {r4, pc}
.align 2, 0
_08092464: .4byte gLinkState
_08092464: .4byte gPlayerState
_08092468: .4byte 0x0000017B
thumb_func_start sub_0809246C
@@ -433,14 +433,14 @@ _08092570:
bl sub_0809264C
cmp r5, #0
beq _0809258A
ldr r0, _0809258C @ =gLinkState
ldr r0, _0809258C @ =gPlayerState
adds r0, #0x3f
movs r1, #0xfd
strb r1, [r0]
_0809258A:
pop {r4, r5, pc}
.align 2, 0
_0809258C: .4byte gLinkState
_0809258C: .4byte gPlayerState
thumb_func_start sub_08092590
sub_08092590: @ 0x08092590
@@ -592,13 +592,13 @@ _08092674:
sub_0809269C: @ 0x0809269C
push {r4, r5, r6, lr}
adds r4, r0, #0
ldr r6, _080926D8 @ =gLinkState
ldr r6, _080926D8 @ =gPlayerState
ldr r0, [r6, #0x30]
movs r1, #0x80
ands r0, r1
cmp r0, #0
bne _080926E0
ldr r5, _080926DC @ =gLinkEntity
ldr r5, _080926DC @ =gPlayerEntity
adds r0, r4, #0
adds r1, r5, #0
movs r2, #0x10
@@ -619,8 +619,8 @@ sub_0809269C: @ 0x0809269C
movs r0, #1
b _080926E2
.align 2, 0
_080926D8: .4byte gLinkState
_080926DC: .4byte gLinkEntity
_080926D8: .4byte gPlayerState
_080926DC: .4byte gPlayerEntity
_080926E0:
movs r0, #0
_080926E2:
asm/likeLike.s
+11 -11
View File
@@ -84,7 +84,7 @@ _08027DD2:
movs r0, #0xfc
ands r0, r1
strb r0, [r2]
ldr r0, _08027E38 @ =gLinkEntity
ldr r0, _08027E38 @ =gPlayerEntity
adds r0, #0x29
ldrb r0, [r0]
lsls r0, r0, #0x1a
@@ -115,7 +115,7 @@ _08027E2E:
bl sub_0804AA30
pop {r4, pc}
.align 2, 0
_08027E38: .4byte gLinkEntity
_08027E38: .4byte gPlayerEntity
_08027E3C: .4byte gUnk_080CC6FC
thumb_func_start sub_08027E40
@@ -439,13 +439,13 @@ _0802808E:
.align 2, 0
_08028098: .4byte gUnk_02002A40
_0802809C:
bl ResetLink
ldr r2, _08028104 @ =gLinkState
bl ResetPlayer
ldr r2, _08028104 @ =gPlayerState
ldrb r1, [r2, #0x1a]
movs r0, #0x80
orrs r0, r1
strb r0, [r2, #0x1a]
ldr r4, _08028108 @ =gLinkEntity
ldr r4, _08028108 @ =gPlayerEntity
movs r3, #0x80
lsls r3, r3, #9
adds r0, r5, #0
@@ -489,14 +489,14 @@ _080280F0:
_08028102:
pop {r4, r5, pc}
.align 2, 0
_08028104: .4byte gLinkState
_08028108: .4byte gLinkEntity
_08028104: .4byte gPlayerState
_08028108: .4byte gPlayerEntity
thumb_func_start sub_0802810C
sub_0802810C: @ 0x0802810C
push {r4, r5, lr}
adds r4, r0, #0
ldr r2, _08028198 @ =gLinkState
ldr r2, _08028198 @ =gPlayerState
movs r1, #0
movs r0, #0x41
strb r0, [r2, #2]
@@ -505,7 +505,7 @@ sub_0802810C: @ 0x0802810C
subs r1, #0x11
ands r0, r1
str r0, [r2, #0x30]
ldr r0, _0802819C @ =gLinkEntity
ldr r0, _0802819C @ =gPlayerEntity
mov ip, r0
ldrb r0, [r0, #0x10]
movs r1, #0x80
@@ -566,8 +566,8 @@ sub_0802810C: @ 0x0802810C
_08028196:
pop {r4, r5, pc}
.align 2, 0
_08028198: .4byte gLinkState
_0802819C: .4byte gLinkEntity
_08028198: .4byte gPlayerState
_0802819C: .4byte gPlayerEntity
thumb_func_start sub_080281A0
sub_080281A0: @ 0x080281A0
asm/lilypadLarge.s
+46 -46
View File
@@ -143,7 +143,7 @@ sub_080855E8: @ 0x080855E8
movs r0, #0x20
orrs r0, r1
strb r0, [r7, #0x10]
ldr r6, _0808564C @ =gLinkEntity
ldr r6, _0808564C @ =gPlayerEntity
adds r0, r7, #0
adds r1, r6, #0
movs r2, #0x18
@@ -151,7 +151,7 @@ sub_080855E8: @ 0x080855E8
adds r1, r0, #0
cmp r1, #0
beq _080856EE
ldr r3, _08085650 @ =gLinkState
ldr r3, _08085650 @ =gPlayerState
ldr r0, [r3, #0x30]
movs r1, #2
orrs r0, r1
@@ -186,8 +186,8 @@ _08085634:
bl sub_0800455E
b _0808565A
.align 2, 0
_0808564C: .4byte gLinkEntity
_08085650: .4byte gLinkState
_0808564C: .4byte gPlayerEntity
_08085650: .4byte gPlayerState
_08085654:
adds r0, r6, #0
bl sub_08004542
@@ -218,7 +218,7 @@ _08085664:
str r2, [r7, #0x70]
str r2, [r7, #0x6c]
_0808568C:
ldr r2, _080856B8 @ =gLinkState
ldr r2, _080856B8 @ =gPlayerState
ldrb r0, [r2, #0x1c]
cmp r0, #3
beq _08085696
@@ -230,7 +230,7 @@ _08085696:
lsls r0, r0, #2
adds r0, r0, r1
ldr r4, [r0]
ldr r0, _080856C0 @ =gLinkEntity
ldr r0, _080856C0 @ =gPlayerEntity
ldrb r0, [r0, #0x14]
movs r1, #6
ands r1, r0
@@ -242,9 +242,9 @@ _08085696:
beq _080856D6
b _080857CE
.align 2, 0
_080856B8: .4byte gLinkState
_080856B8: .4byte gPlayerState
_080856BC: .4byte gUnk_08120620
_080856C0: .4byte gLinkEntity
_080856C0: .4byte gPlayerEntity
_080856C4:
cmp r1, #4
beq _080856CE
@@ -314,7 +314,7 @@ _080856FC:
adds r2, r5, #0
bl sub_080045D4
strb r0, [r7, #0x15]
ldr r0, _0808575C @ =gLinkState
ldr r0, _0808575C @ =gPlayerState
ldrb r0, [r0, #0x1d]
cmp r0, #2
beq _0808576A
@@ -325,7 +325,7 @@ _080856FC:
b _08085774
.align 2, 0
_08085758: .4byte gUnk_08126EE4
_0808575C: .4byte gLinkState
_0808575C: .4byte gPlayerState
_08085760:
cmp r0, #3
bne _08085774
@@ -568,7 +568,7 @@ _0808592E:
_08085930:
strb r0, [r2]
_08085932:
ldr r0, _0808595C @ =gLinkState
ldr r0, _0808595C @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #2
ands r0, r1
@@ -589,7 +589,7 @@ _08085944:
movs r0, #0
b _08085964
.align 2, 0
_0808595C: .4byte gLinkState
_0808595C: .4byte gPlayerState
_08085960:
adds r0, r1, #0
adds r0, #0x80
@@ -707,7 +707,7 @@ sub_08085A1C: @ 0x08085A1C
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
ldr r2, _08085A40 @ =gLinkState
ldr r2, _08085A40 @ =gPlayerState
ldr r0, [r2, #0x30]
movs r1, #2
orrs r0, r1
@@ -716,7 +716,7 @@ sub_08085A1C: @ 0x08085A1C
pop {pc}
.align 2, 0
_08085A3C: .4byte gUnk_0812062C
_08085A40: .4byte gLinkState
_08085A40: .4byte gPlayerState
thumb_func_start sub_08085A44
sub_08085A44: @ 0x08085A44
@@ -870,7 +870,7 @@ sub_08085B40: @ 0x08085B40
adds r1, r2, #0
bl sub_0805EC9C
_08085B7A:
ldr r4, _08085BA0 @ =gLinkEntity
ldr r4, _08085BA0 @ =gPlayerEntity
ldrh r3, [r5, #0x32]
ldrh r0, [r5, #0x36]
adds r0, r3, r0
@@ -889,7 +889,7 @@ _08085B7A:
b _08085BAE
.align 2, 0
_08085B9C: .4byte 0x011FFFFF
_08085BA0: .4byte gLinkEntity
_08085BA0: .4byte gPlayerEntity
_08085BA4: .4byte gArea
_08085BA8:
subs r0, r3, r1
@@ -906,7 +906,7 @@ _08085BB4:
bl sub_080002B8
cmp r0, #0xd
bne _08085BE8
ldr r4, _08085C50 @ =gLinkEntity
ldr r4, _08085C50 @ =gPlayerEntity
adds r0, r4, #0
bl sub_0800455E
adds r0, r5, #0
@@ -926,7 +926,7 @@ _08085BE8:
ldrh r0, [r1]
cmp r0, #0
bne _08085C54
ldr r4, _08085C50 @ =gLinkEntity
ldr r4, _08085C50 @ =gPlayerEntity
movs r1, #0x80
lsls r1, r1, #6
adds r0, r4, #0
@@ -969,7 +969,7 @@ _08085C16:
strb r0, [r5, #0xc]
b _08085C58
.align 2, 0
_08085C50: .4byte gLinkEntity
_08085C50: .4byte gPlayerEntity
_08085C54:
subs r0, #1
strh r0, [r1]
@@ -981,7 +981,7 @@ _08085C58:
sub_08085C5C: @ 0x08085C5C
push {r4, r5, lr}
adds r4, r0, #0
ldr r5, _08085CA0 @ =gLinkEntity
ldr r5, _08085CA0 @ =gPlayerEntity
adds r1, r5, #0
movs r2, #0x18
bl sub_0806FC80
@@ -995,7 +995,7 @@ sub_08085C5C: @ 0x08085C5C
strb r0, [r5, #0x15]
adds r0, r5, #0
bl sub_0806F69C
ldr r2, _08085CA4 @ =gLinkState
ldr r2, _08085CA4 @ =gPlayerState
ldr r0, [r2, #0x30]
movs r1, #2
orrs r0, r1
@@ -1009,8 +1009,8 @@ sub_08085C5C: @ 0x08085C5C
bl sub_0800455E
b _08085CAE
.align 2, 0
_08085CA0: .4byte gLinkEntity
_08085CA4: .4byte gLinkState
_08085CA0: .4byte gPlayerEntity
_08085CA4: .4byte gPlayerState
_08085CA8:
adds r0, r5, #0
bl sub_08004542
@@ -1031,13 +1031,13 @@ _08085CAE:
ands r0, r1
orrs r0, r2
strb r0, [r4, #0x11]
ldr r0, _08085CD8 @ =gLinkEntity
ldr r0, _08085CD8 @ =gPlayerEntity
str r0, [r3, #0x30]
_08085CD2:
pop {r4, r5, pc}
.align 2, 0
_08085CD4: .4byte gRoomControls
_08085CD8: .4byte gLinkEntity
_08085CD8: .4byte gPlayerEntity
thumb_func_start sub_08085CDC
sub_08085CDC: @ 0x08085CDC
@@ -1085,7 +1085,7 @@ _08085D26:
sub_08085D28: @ 0x08085D28
push {r4, r5, lr}
adds r4, r0, #0
ldr r1, _08085D5C @ =gLinkState
ldr r1, _08085D5C @ =gPlayerState
adds r0, r1, #0
adds r0, #0xa8
ldrb r0, [r0]
@@ -1109,7 +1109,7 @@ sub_08085D28: @ 0x08085D28
_08085D5A:
pop {r4, r5, pc}
.align 2, 0
_08085D5C: .4byte gLinkState
_08085D5C: .4byte gPlayerState
thumb_func_start sub_08085D60
sub_08085D60: @ 0x08085D60
@@ -1117,7 +1117,7 @@ sub_08085D60: @ 0x08085D60
mov r7, r8
push {r7}
adds r5, r0, #0
ldr r2, _08085D94 @ =gLinkState
ldr r2, _08085D94 @ =gPlayerState
ldr r0, [r2, #0x30]
movs r1, #2
ands r0, r1
@@ -1140,7 +1140,7 @@ sub_08085D60: @ 0x08085D60
adds r4, r6, #0
b _08085DB0
.align 2, 0
_08085D94: .4byte gLinkState
_08085D94: .4byte gPlayerState
_08085D98:
movs r0, #0x10
ands r0, r1
@@ -1194,7 +1194,7 @@ _08085DB8:
bl sub_080806BC
cmp r0, #0
bne _08085E1C
ldr r0, _08085E18 @ =gLinkEntity
ldr r0, _08085E18 @ =gPlayerEntity
lsrs r1, r4, #3
bl sub_0807BD14
cmp r0, #0
@@ -1204,7 +1204,7 @@ _08085DB8:
.align 2, 0
_08085E10: .4byte gUnk_08120638
_08085E14: .4byte gRoomControls
_08085E18: .4byte gLinkEntity
_08085E18: .4byte gPlayerEntity
_08085E1C:
strb r4, [r5, #0x15]
b _08085E6C
@@ -1227,7 +1227,7 @@ _08085E28:
bl sub_080002CC
cmp r0, #0xff
bne _08085E6C
ldr r0, _08085E60 @ =gLinkEntity
ldr r0, _08085E60 @ =gPlayerEntity
lsrs r1, r6, #3
bl sub_0807BD14
cmp r0, #0
@@ -1239,7 +1239,7 @@ _08085E52:
b _08085E6C
.align 2, 0
_08085E5C: .4byte gUnk_08120638
_08085E60: .4byte gLinkEntity
_08085E60: .4byte gPlayerEntity
_08085E64:
ldrb r1, [r5, #0x10]
movs r0, #0xdf
@@ -1301,12 +1301,12 @@ _08085EBE:
str r0, [r2, #0x6c]
strh r0, [r2, #0x2c]
strh r0, [r2, #0x30]
ldr r1, _08085EF0 @ =gLinkEntity
ldr r1, _08085EF0 @ =gPlayerEntity
strh r0, [r1, #0x2c]
strh r0, [r1, #0x30]
ldrb r0, [r2, #0x15]
strb r0, [r1, #0x15]
ldr r1, _08085EF4 @ =gLinkState
ldr r1, _08085EF4 @ =gPlayerState
movs r0, #0x80
lsls r0, r0, #1
strh r0, [r1, #8]
@@ -1317,16 +1317,16 @@ _08085EBE:
beq _08085EE8
bl DeleteEntity
_08085EE8:
bl ResetLink
bl ResetPlayer
pop {pc}
.align 2, 0
_08085EF0: .4byte gLinkEntity
_08085EF4: .4byte gLinkState
_08085EF0: .4byte gPlayerEntity
_08085EF4: .4byte gPlayerState
_08085EF8: .4byte gRoomControls
thumb_func_start sub_08085EFC
sub_08085EFC: @ 0x08085EFC
ldr r3, _08085F18 @ =gLinkEntity
ldr r3, _08085F18 @ =gPlayerEntity
ldrh r1, [r0, #0x2e]
ldrh r2, [r3, #0x2e]
subs r1, r1, r2
@@ -1340,13 +1340,13 @@ sub_08085EFC: @ 0x08085EFC
strh r1, [r0]
bx lr
.align 2, 0
_08085F18: .4byte gLinkEntity
_08085F18: .4byte gPlayerEntity
thumb_func_start sub_08085F1C
sub_08085F1C: @ 0x08085F1C
push {lr}
adds r3, r0, #0
ldr r2, _08085F44 @ =gLinkEntity
ldr r2, _08085F44 @ =gPlayerEntity
adds r1, r3, #0
adds r1, #0x76
ldrh r0, [r3, #0x2e]
@@ -1363,7 +1363,7 @@ sub_08085F1C: @ 0x08085F1C
bl sub_0807A5B8
pop {pc}
.align 2, 0
_08085F44: .4byte gLinkEntity
_08085F44: .4byte gPlayerEntity
thumb_func_start sub_08085F48
sub_08085F48: @ 0x08085F48
@@ -1376,7 +1376,7 @@ sub_08085F48: @ 0x08085F48
lsrs r3, r0, #0x18
cmp r3, #0
beq _08085F8C
ldr r5, _08085F80 @ =gLinkState
ldr r5, _08085F80 @ =gPlayerState
ldrb r0, [r5, #0x12]
cmp r0, #0x17
bne _08085F6A
@@ -1394,13 +1394,13 @@ _08085F6A:
lsls r2, r2, #0xc
b _08085FF8
.align 2, 0
_08085F80: .4byte gLinkState
_08085F80: .4byte gPlayerState
_08085F84: .4byte 0x0127FFFF
_08085F88:
movs r0, #0
b _08086006
_08085F8C:
ldr r0, _08085FAC @ =gLinkState
ldr r0, _08085FAC @ =gPlayerState
ldr r1, [r0, #0x30]
movs r0, #2
ands r1, r0
@@ -1417,7 +1417,7 @@ _08085F8C:
lsls r2, r2, #8
b _08085FF8
.align 2, 0
_08085FAC: .4byte gLinkState
_08085FAC: .4byte gPlayerState
_08085FB0: .4byte 0x011FFFFF
_08085FB4:
strb r3, [r4, #0xe]
asm/lilypadSmall.s
+4 -4
View File
@@ -73,13 +73,13 @@ _08097ADA:
sub_08097ADC: @ 0x08097ADC
push {r4, r5, lr}
adds r2, r0, #0
ldr r5, _08097B18 @ =gLinkState
ldr r5, _08097B18 @ =gPlayerState
ldr r0, [r5, #0x30]
movs r1, #0x80
ands r0, r1
cmp r0, #0
beq _08097B20
ldr r4, _08097B1C @ =gLinkEntity
ldr r4, _08097B1C @ =gPlayerEntity
adds r0, r2, #0
adds r1, r4, #0
movs r2, #8
@@ -99,8 +99,8 @@ sub_08097ADC: @ 0x08097ADC
movs r0, #1
b _08097B22
.align 2, 0
_08097B18: .4byte gLinkState
_08097B1C: .4byte gLinkEntity
_08097B18: .4byte gPlayerState
_08097B1C: .4byte gPlayerEntity
_08097B20:
movs r0, #0
_08097B22:

Some files were not shown because too many files have changed in this diff Show More