mirror of
https://github.com/zeldaret/tmc
synced 2026-09-06 02:58:07 -04:00
Merge branch 'master' into master
This commit is contained in:
notyouraveragehooman
+1
-1
@@ -316,7 +316,7 @@ _080193C2:
|
||||
movs r0, #4
|
||||
movs r1, #1
|
||||
movs r3, #9
|
||||
bl sub_08077CB8
|
||||
bl CreatePlayerItem
|
||||
cmp r0, #0
|
||||
beq _080193FA
|
||||
ldr r2, _0801940C @ =gLinkState
|
||||
|
||||
+1
-1
@@ -1006,7 +1006,7 @@ _0806F444:
|
||||
movs r1, #0
|
||||
movs r2, #0
|
||||
movs r3, #0
|
||||
bl sub_08077CB8
|
||||
bl CreatePlayerItem
|
||||
cmp r0, #0
|
||||
beq _0806F4B4
|
||||
str r5, [r0, #0x54]
|
||||
|
||||
+1
-1
@@ -3130,7 +3130,7 @@ sub_08071EB0: @ 0x08071EB0
|
||||
bl sub_08077B2C
|
||||
adds r0, r4, #0
|
||||
movs r1, #0xe
|
||||
bl sub_08077C3C
|
||||
bl CreatePlayerBomb
|
||||
cmp r0, #0
|
||||
beq _08071F12
|
||||
ldr r3, _08071EE4 @ =gLinkState
|
||||
|
||||
+5
-5
@@ -4597,7 +4597,7 @@ _080754F2:
|
||||
bne _08075538
|
||||
adds r0, r4, #0
|
||||
movs r1, #0xf
|
||||
bl sub_08077C3C
|
||||
bl CreatePlayerBomb
|
||||
cmp r5, #0xf
|
||||
bne _08075530
|
||||
adds r1, r7, #0
|
||||
@@ -4976,7 +4976,7 @@ _080757D4:
|
||||
beq _08075816
|
||||
adds r0, r4, #0
|
||||
movs r1, #0x14
|
||||
bl sub_08077C3C
|
||||
bl CreatePlayerBomb
|
||||
adds r2, r0, #0
|
||||
cmp r2, #0
|
||||
beq _08075816
|
||||
@@ -6040,7 +6040,7 @@ _08076036:
|
||||
bls _08076076
|
||||
adds r0, r6, #0
|
||||
movs r1, #2
|
||||
bl sub_08077C3C
|
||||
bl CreatePlayerBomb
|
||||
adds r4, r0, #0
|
||||
cmp r4, #0
|
||||
beq _08076076
|
||||
@@ -6174,7 +6174,7 @@ _08076138:
|
||||
_0807614A:
|
||||
adds r0, r4, #0
|
||||
movs r1, #0x13
|
||||
bl sub_08077C3C
|
||||
bl CreatePlayerBomb
|
||||
adds r3, r0, #0
|
||||
cmp r3, #0
|
||||
bne _08076162
|
||||
@@ -7319,7 +7319,7 @@ _080769CC:
|
||||
bl sub_08077DF4
|
||||
adds r0, r4, #0
|
||||
movs r1, #0xc
|
||||
bl sub_08077C3C
|
||||
bl CreatePlayerBomb
|
||||
adds r5, r0, #0
|
||||
cmp r5, #0
|
||||
beq _08076A70
|
||||
|
||||
+4
-4
@@ -56,7 +56,7 @@ _08076CD2:
|
||||
beq _08076CE2
|
||||
adds r0, r4, #0
|
||||
movs r1, #0x12
|
||||
bl sub_08077C3C
|
||||
bl CreatePlayerBomb
|
||||
_08076CE2:
|
||||
adds r0, r4, #0
|
||||
bl UpdateItemAnim
|
||||
@@ -281,7 +281,7 @@ _08076E7A:
|
||||
movs r1, #0
|
||||
movs r2, #0
|
||||
movs r3, #0
|
||||
bl sub_08077CB8
|
||||
bl CreatePlayerItem
|
||||
adds r1, r0, #0
|
||||
cmp r1, #0
|
||||
beq _08076EC6
|
||||
@@ -446,7 +446,7 @@ _08076FAC:
|
||||
movs r1, #0
|
||||
movs r2, #0
|
||||
movs r3, #0
|
||||
bl sub_08077CB8
|
||||
bl CreatePlayerItem
|
||||
cmp r0, #0
|
||||
bne _08076FF6
|
||||
b _08077110
|
||||
@@ -521,7 +521,7 @@ _08077060:
|
||||
movs r0, #0x11
|
||||
movs r1, #0
|
||||
movs r3, #0
|
||||
bl sub_08077CB8
|
||||
bl CreatePlayerItem
|
||||
_0807708C:
|
||||
ldr r0, _080770B0 @ =gLinkState
|
||||
ldr r0, [r0, #0x30]
|
||||
|
||||
-7033
File diff suppressed because it is too large
Load Diff
+6282
File diff suppressed because it is too large
Load Diff
+2
-2
@@ -578,7 +578,7 @@ _080A2E9C:
|
||||
movs r0, #0x15
|
||||
movs r1, #0
|
||||
movs r2, #0
|
||||
bl sub_08077CB8
|
||||
bl CreatePlayerItem
|
||||
adds r1, r0, #0
|
||||
str r1, [r4, #0x54]
|
||||
cmp r1, #0
|
||||
@@ -966,7 +966,7 @@ _080A31D6:
|
||||
movs r0, #0x15
|
||||
movs r1, #1
|
||||
movs r2, #0
|
||||
bl sub_08077CB8
|
||||
bl CreatePlayerItem
|
||||
str r0, [r4, #0x54]
|
||||
cmp r0, #0
|
||||
beq _080A3200
|
||||
|
||||
+1
-1
@@ -16027,7 +16027,7 @@ sub_080ACECC: @ 0x080ACECC
|
||||
movs r0, #0x10
|
||||
movs r2, #0
|
||||
movs r3, #0
|
||||
bl sub_08077CB8
|
||||
bl CreatePlayerItem
|
||||
adds r1, r0, #0
|
||||
cmp r1, #0
|
||||
beq _080ACF0C
|
||||
|
||||
-139
@@ -1,139 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
|
||||
thumb_func_start JailBars
|
||||
JailBars: @ 0x080A08AC
|
||||
push {lr}
|
||||
ldr r2, _080A08C0 @ =gUnk_08124950
|
||||
ldrb r1, [r0, #0xc]
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r2
|
||||
ldr r1, [r1]
|
||||
bl _call_via_r1
|
||||
pop {pc}
|
||||
.align 2, 0
|
||||
_080A08C0: .4byte gUnk_08124950
|
||||
|
||||
thumb_func_start sub_080A08C4
|
||||
sub_080A08C4: @ 0x080A08C4
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
adds r0, #0x86
|
||||
ldrh r0, [r0]
|
||||
bl CheckFlags
|
||||
cmp r0, #0
|
||||
bne _080A08E2
|
||||
movs r0, #1
|
||||
strb r0, [r4, #0xc]
|
||||
adds r0, r4, #0
|
||||
movs r1, #0
|
||||
bl sub_080A0960
|
||||
b _080A08F6
|
||||
_080A08E2:
|
||||
movs r0, #3
|
||||
strb r0, [r4, #0xc]
|
||||
adds r0, r4, #0
|
||||
movs r1, #1
|
||||
bl InitializeAnimation
|
||||
adds r0, r4, #0
|
||||
movs r1, #1
|
||||
bl sub_080A0960
|
||||
_080A08F6:
|
||||
ldrb r0, [r4, #0x18]
|
||||
movs r1, #3
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #0x18]
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x38
|
||||
movs r0, #1
|
||||
strb r0, [r1]
|
||||
adds r0, r4, #0
|
||||
bl UpdateSpriteForCollisionLayer
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
|
||||
thumb_func_start sub_080A0910
|
||||
sub_080A0910: @ 0x080A0910
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
adds r0, #0x86
|
||||
ldrh r0, [r0]
|
||||
bl CheckFlags
|
||||
cmp r0, #0
|
||||
beq _080A0932
|
||||
movs r0, #2
|
||||
strb r0, [r4, #0xc]
|
||||
adds r0, r4, #0
|
||||
movs r1, #1
|
||||
bl sub_080A0960
|
||||
ldr r0, _080A0934 @ =0x0000010B
|
||||
bl PlaySFX
|
||||
_080A0932:
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
_080A0934: .4byte 0x0000010B
|
||||
|
||||
thumb_func_start sub_080A0938
|
||||
sub_080A0938: @ 0x080A0938
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
bl GetNextFrame
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x5a
|
||||
ldrb r1, [r0]
|
||||
movs r0, #0x80
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _080A095A
|
||||
movs r0, #3
|
||||
strb r0, [r4, #0xc]
|
||||
adds r0, r4, #0
|
||||
movs r1, #1
|
||||
bl InitializeAnimation
|
||||
_080A095A:
|
||||
pop {r4, pc}
|
||||
|
||||
thumb_func_start nullsub_127
|
||||
nullsub_127: @ 0x080A095C
|
||||
bx lr
|
||||
.align 2, 0
|
||||
|
||||
thumb_func_start sub_080A0960
|
||||
sub_080A0960: @ 0x080A0960
|
||||
push {r4, r5, r6, lr}
|
||||
adds r4, r0, #0
|
||||
ldr r5, _080A0998 @ =gUnk_08124960
|
||||
cmp r1, #1
|
||||
bne _080A096C
|
||||
ldr r5, _080A099C @ =gUnk_0812497A
|
||||
_080A096C:
|
||||
movs r0, #0x2e
|
||||
ldrsh r1, [r4, r0]
|
||||
ldr r2, _080A09A0 @ =gRoomControls
|
||||
ldrh r0, [r2, #6]
|
||||
subs r1, r1, r0
|
||||
asrs r1, r1, #4
|
||||
movs r3, #0x3f
|
||||
ands r1, r3
|
||||
movs r6, #0x32
|
||||
ldrsh r0, [r4, r6]
|
||||
ldrh r2, [r2, #8]
|
||||
subs r0, r0, r2
|
||||
asrs r0, r0, #4
|
||||
ands r0, r3
|
||||
lsls r0, r0, #6
|
||||
orrs r1, r0
|
||||
adds r0, r5, #0
|
||||
movs r2, #1
|
||||
bl sub_0801AF18
|
||||
pop {r4, r5, r6, pc}
|
||||
.align 2, 0
|
||||
_080A0998: .4byte gUnk_08124960
|
||||
_080A099C: .4byte gUnk_0812497A
|
||||
_080A09A0: .4byte gRoomControls
|
||||
-453
@@ -1,453 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
|
||||
thumb_func_start Leever
|
||||
Leever: @ 0x0801FC08
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
ldr r1, _0801FC24 @ =gUnk_080CA49C
|
||||
bl EnemyFunctionHandler
|
||||
movs r3, #0x10
|
||||
rsbs r3, r3, #0
|
||||
adds r0, r4, #0
|
||||
movs r1, #0
|
||||
movs r2, #1
|
||||
bl SetChildOffset
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
_0801FC24: .4byte gUnk_080CA49C
|
||||
|
||||
thumb_func_start sub_0801FC28
|
||||
sub_0801FC28: @ 0x0801FC28
|
||||
push {lr}
|
||||
ldr r2, _0801FC3C @ =gUnk_080CA4B4
|
||||
ldrb r1, [r0, #0xc]
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r2
|
||||
ldr r1, [r1]
|
||||
bl _call_via_r1
|
||||
pop {pc}
|
||||
.align 2, 0
|
||||
_0801FC3C: .4byte gUnk_080CA4B4
|
||||
|
||||
thumb_func_start sub_0801FC40
|
||||
sub_0801FC40: @ 0x0801FC40
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
adds r0, #0x41
|
||||
ldrb r0, [r0]
|
||||
cmp r0, #0x80
|
||||
bne _0801FC5C
|
||||
ldrb r0, [r4, #0xc]
|
||||
cmp r0, #3
|
||||
bne _0801FC6E
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x74
|
||||
movs r0, #1
|
||||
strh r0, [r1]
|
||||
b _0801FC6E
|
||||
_0801FC5C:
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x43
|
||||
ldrb r0, [r0]
|
||||
cmp r0, #0
|
||||
beq _0801FC6E
|
||||
adds r0, r4, #0
|
||||
movs r1, #0x1c
|
||||
bl sub_0804A9FC
|
||||
_0801FC6E:
|
||||
ldr r1, _0801FC78 @ =gUnk_080CA49C
|
||||
adds r0, r4, #0
|
||||
bl sub_0804AA30
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
_0801FC78: .4byte gUnk_080CA49C
|
||||
|
||||
thumb_func_start sub_0801FC7C
|
||||
sub_0801FC7C: @ 0x0801FC7C
|
||||
push {lr}
|
||||
adds r1, r0, #0
|
||||
ldrb r0, [r1, #0xa]
|
||||
cmp r0, #0
|
||||
bne _0801FC8E
|
||||
adds r0, r1, #0
|
||||
bl sub_0804A7D4
|
||||
b _0801FC98
|
||||
_0801FC8E:
|
||||
adds r0, r1, #0
|
||||
movs r1, #0xf1
|
||||
movs r2, #0
|
||||
bl CreateDeathFx
|
||||
_0801FC98:
|
||||
pop {pc}
|
||||
.align 2, 0
|
||||
|
||||
thumb_func_start sub_0801FC9C
|
||||
sub_0801FC9C: @ 0x0801FC9C
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
bl sub_0804A720
|
||||
movs r0, #1
|
||||
strb r0, [r4, #0xc]
|
||||
bl Random
|
||||
strb r0, [r4, #0xe]
|
||||
pop {r4, pc}
|
||||
|
||||
thumb_func_start sub_0801FCB0
|
||||
sub_0801FCB0: @ 0x0801FCB0
|
||||
push {r4, r5, lr}
|
||||
adds r5, r0, #0
|
||||
ldrb r0, [r5, #0xe]
|
||||
subs r0, #1
|
||||
strb r0, [r5, #0xe]
|
||||
lsls r0, r0, #0x18
|
||||
cmp r0, #0
|
||||
bne _0801FD28
|
||||
bl Random
|
||||
movs r1, #0x1f
|
||||
ands r1, r0
|
||||
adds r0, r5, #0
|
||||
bl sub_0801FE68
|
||||
cmp r0, #0
|
||||
beq _0801FD1C
|
||||
movs r0, #2
|
||||
strb r0, [r5, #0xc]
|
||||
ldrb r1, [r5, #0x18]
|
||||
subs r0, #6
|
||||
ands r0, r1
|
||||
movs r1, #1
|
||||
orrs r0, r1
|
||||
strb r0, [r5, #0x18]
|
||||
ldr r0, _0801FD14 @ =gUnk_020000B0
|
||||
ldr r1, [r0]
|
||||
adds r0, r5, #0
|
||||
bl GetFacingDirection
|
||||
adds r4, r0, #0
|
||||
bl Random
|
||||
ldr r2, _0801FD18 @ =gUnk_080CA4C8
|
||||
movs r1, #1
|
||||
ands r1, r0
|
||||
adds r1, r1, r2
|
||||
ldrb r0, [r1]
|
||||
adds r0, r0, r4
|
||||
movs r1, #0x1f
|
||||
ands r0, r1
|
||||
strb r0, [r5, #0x15]
|
||||
adds r0, r5, #0
|
||||
movs r1, #0
|
||||
bl InitializeAnimation
|
||||
adds r0, r5, #0
|
||||
bl UpdateSpriteForCollisionLayer
|
||||
b _0801FD28
|
||||
.align 2, 0
|
||||
_0801FD14: .4byte gUnk_020000B0
|
||||
_0801FD18: .4byte gUnk_080CA4C8
|
||||
_0801FD1C:
|
||||
bl Random
|
||||
movs r1, #0x18
|
||||
ands r0, r1
|
||||
adds r0, #8
|
||||
strb r0, [r5, #0xe]
|
||||
_0801FD28:
|
||||
pop {r4, r5, pc}
|
||||
.align 2, 0
|
||||
|
||||
thumb_func_start sub_0801FD2C
|
||||
sub_0801FD2C: @ 0x0801FD2C
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
bl GetNextFrame
|
||||
adds r2, r4, #0
|
||||
adds r2, #0x5a
|
||||
ldrb r1, [r2]
|
||||
movs r0, #0x80
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _0801FD66
|
||||
movs r0, #3
|
||||
strb r0, [r4, #0xc]
|
||||
ldrb r0, [r4, #0xa]
|
||||
cmp r0, #0
|
||||
bne _0801FD54
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x74
|
||||
movs r0, #0xb4
|
||||
b _0801FD5A
|
||||
_0801FD54:
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x74
|
||||
movs r0, #0x6e
|
||||
_0801FD5A:
|
||||
strh r0, [r1]
|
||||
adds r0, r4, #0
|
||||
movs r1, #2
|
||||
bl InitializeAnimation
|
||||
b _0801FD7C
|
||||
_0801FD66:
|
||||
movs r0, #1
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _0801FD7C
|
||||
movs r0, #0xfe
|
||||
ands r0, r1
|
||||
strb r0, [r2]
|
||||
ldrb r0, [r4, #0x10]
|
||||
movs r1, #0x80
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #0x10]
|
||||
_0801FD7C:
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
|
||||
thumb_func_start sub_0801FD80
|
||||
sub_0801FD80: @ 0x0801FD80
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
bl sub_0801FED4
|
||||
adds r0, r4, #0
|
||||
bl GetNextFrame
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x74
|
||||
ldrh r0, [r1]
|
||||
subs r0, #1
|
||||
strh r0, [r1]
|
||||
lsls r0, r0, #0x10
|
||||
cmp r0, #0
|
||||
bne _0801FDB2
|
||||
movs r0, #4
|
||||
strb r0, [r4, #0xc]
|
||||
ldrb r1, [r4, #0x10]
|
||||
movs r0, #0x7f
|
||||
ands r0, r1
|
||||
strb r0, [r4, #0x10]
|
||||
adds r0, r4, #0
|
||||
movs r1, #1
|
||||
bl InitializeAnimation
|
||||
_0801FDB2:
|
||||
pop {r4, pc}
|
||||
|
||||
thumb_func_start sub_0801FDB4
|
||||
sub_0801FDB4: @ 0x0801FDB4
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
bl sub_0801FED4
|
||||
adds r0, r4, #0
|
||||
bl GetNextFrame
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x5a
|
||||
ldrb r1, [r0]
|
||||
movs r0, #0x80
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _0801FDE0
|
||||
movs r0, #1
|
||||
strb r0, [r4, #0xc]
|
||||
movs r0, #0xf0
|
||||
strb r0, [r4, #0xe]
|
||||
ldrb r1, [r4, #0x18]
|
||||
subs r0, #0xf4
|
||||
ands r0, r1
|
||||
strb r0, [r4, #0x18]
|
||||
_0801FDE0:
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
|
||||
thumb_func_start sub_0801FDE4
|
||||
sub_0801FDE4: @ 0x0801FDE4
|
||||
push {r4, r5, r6, r7, lr}
|
||||
adds r6, r0, #0
|
||||
adds r4, r1, #0
|
||||
adds r5, r2, #0
|
||||
ldr r7, _0801FE04 @ =gUnk_020000B0
|
||||
ldr r0, [r7]
|
||||
adds r0, #0x38
|
||||
ldrb r2, [r0]
|
||||
adds r0, r4, #0
|
||||
adds r1, r5, #0
|
||||
bl sub_080002D4
|
||||
cmp r0, #0
|
||||
beq _0801FE34
|
||||
b _0801FE5C
|
||||
.align 2, 0
|
||||
_0801FE04: .4byte gUnk_020000B0
|
||||
_0801FE08:
|
||||
movs r0, #0x10
|
||||
rsbs r0, r0, #0
|
||||
adds r1, r0, #0
|
||||
ands r4, r1
|
||||
adds r0, r4, #0
|
||||
adds r0, #8
|
||||
strh r0, [r6, #0x2e]
|
||||
ands r5, r1
|
||||
adds r0, r5, #0
|
||||
adds r0, #8
|
||||
strh r0, [r6, #0x32]
|
||||
ldr r0, _0801FE30 @ =gUnk_020000B0
|
||||
ldr r0, [r0]
|
||||
adds r0, #0x38
|
||||
ldrb r1, [r0]
|
||||
adds r0, r6, #0
|
||||
adds r0, #0x38
|
||||
strb r1, [r0]
|
||||
movs r0, #1
|
||||
b _0801FE5E
|
||||
.align 2, 0
|
||||
_0801FE30: .4byte gUnk_020000B0
|
||||
_0801FE34:
|
||||
ldr r0, [r7]
|
||||
adds r0, #0x38
|
||||
ldrb r2, [r0]
|
||||
adds r0, r4, #0
|
||||
adds r1, r5, #0
|
||||
bl sub_080002BC
|
||||
adds r3, r0, #0
|
||||
ldr r1, _0801FE60 @ =gUnk_080CA4CA
|
||||
ldrh r0, [r1]
|
||||
ldr r2, _0801FE64 @ =0x0000FFFF
|
||||
cmp r0, r2
|
||||
beq _0801FE5C
|
||||
_0801FE4E:
|
||||
ldrh r0, [r1]
|
||||
adds r1, #2
|
||||
cmp r0, r3
|
||||
beq _0801FE08
|
||||
ldrh r0, [r1]
|
||||
cmp r0, r2
|
||||
bne _0801FE4E
|
||||
_0801FE5C:
|
||||
movs r0, #0
|
||||
_0801FE5E:
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.align 2, 0
|
||||
_0801FE60: .4byte gUnk_080CA4CA
|
||||
_0801FE64: .4byte 0x0000FFFF
|
||||
|
||||
thumb_func_start sub_0801FE68
|
||||
sub_0801FE68: @ 0x0801FE68
|
||||
push {r4, r5, r6, r7, lr}
|
||||
mov r7, sb
|
||||
mov r6, r8
|
||||
push {r6, r7}
|
||||
adds r7, r0, #0
|
||||
adds r6, r1, #0
|
||||
movs r1, #1
|
||||
bl sub_08049FDC
|
||||
cmp r0, #0
|
||||
bne _0801FE82
|
||||
_0801FE7E:
|
||||
movs r0, #0
|
||||
b _0801FEC4
|
||||
_0801FE82:
|
||||
ldr r0, _0801FECC @ =gUnk_020000B0
|
||||
ldr r0, [r0]
|
||||
ldr r5, [r0, #0x2c]
|
||||
ldr r4, [r0, #0x30]
|
||||
ldr r1, _0801FED0 @ =gSineTable
|
||||
lsls r0, r6, #4
|
||||
adds r0, r0, r1
|
||||
movs r2, #0
|
||||
ldrsh r0, [r0, r2]
|
||||
lsls r0, r0, #0xb
|
||||
mov sb, r0
|
||||
lsls r0, r6, #4
|
||||
adds r0, #0x80
|
||||
adds r0, r0, r1
|
||||
movs r1, #0
|
||||
ldrsh r0, [r0, r1]
|
||||
lsls r0, r0, #0xb
|
||||
mov r8, r0
|
||||
movs r6, #0
|
||||
_0801FEA8:
|
||||
add r5, sb
|
||||
mov r2, r8
|
||||
subs r4, r4, r2
|
||||
asrs r1, r5, #0x10
|
||||
asrs r2, r4, #0x10
|
||||
adds r0, r7, #0
|
||||
bl sub_0801FDE4
|
||||
cmp r0, #0
|
||||
beq _0801FE7E
|
||||
adds r6, #1
|
||||
cmp r6, #7
|
||||
bls _0801FEA8
|
||||
movs r0, #1
|
||||
_0801FEC4:
|
||||
pop {r3, r4}
|
||||
mov r8, r3
|
||||
mov sb, r4
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.align 2, 0
|
||||
_0801FECC: .4byte gUnk_020000B0
|
||||
_0801FED0: .4byte gSineTable
|
||||
|
||||
thumb_func_start sub_0801FED4
|
||||
sub_0801FED4: @ 0x0801FED4
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
movs r1, #1
|
||||
bl sub_08049FDC
|
||||
cmp r0, #0
|
||||
bne _0801FEEA
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x74
|
||||
movs r0, #1
|
||||
strh r0, [r1]
|
||||
_0801FEEA:
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x5a
|
||||
ldrb r0, [r0]
|
||||
movs r2, #0xf
|
||||
adds r1, r2, #0
|
||||
ands r1, r0
|
||||
lsls r1, r1, #5
|
||||
strh r1, [r4, #0x24]
|
||||
ldrb r0, [r4, #0xa]
|
||||
cmp r0, #0
|
||||
bne _0801FF28
|
||||
ldrb r1, [r4, #0xf]
|
||||
adds r0, r1, #1
|
||||
strb r0, [r4, #0xf]
|
||||
adds r0, r2, #0
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
bne _0801FF4E
|
||||
ldr r0, _0801FF24 @ =gUnk_020000B0
|
||||
ldr r1, [r0]
|
||||
adds r0, r4, #0
|
||||
bl sub_0800132C
|
||||
adds r1, r0, #0
|
||||
adds r0, r4, #0
|
||||
bl sub_08004596
|
||||
b _0801FF4E
|
||||
.align 2, 0
|
||||
_0801FF24: .4byte gUnk_020000B0
|
||||
_0801FF28:
|
||||
adds r0, r1, #0
|
||||
adds r0, #0x40
|
||||
strh r0, [r4, #0x24]
|
||||
ldrb r1, [r4, #0xf]
|
||||
adds r0, r1, #1
|
||||
strb r0, [r4, #0xf]
|
||||
movs r0, #7
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
bne _0801FF4E
|
||||
ldr r0, _0801FF58 @ =gUnk_020000B0
|
||||
ldr r1, [r0]
|
||||
adds r0, r4, #0
|
||||
bl sub_0800132C
|
||||
adds r1, r0, #0
|
||||
adds r0, r4, #0
|
||||
bl sub_08004596
|
||||
_0801FF4E:
|
||||
adds r0, r4, #0
|
||||
bl sub_080AEF88
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
_0801FF58: .4byte gUnk_020000B0
|
||||
-386
@@ -1,386 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
|
||||
thumb_func_start Melari
|
||||
Melari: @ 0x080686D4
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
ldrb r1, [r4, #0x10]
|
||||
movs r0, #2
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
bne _08068700
|
||||
ldr r0, _080686FC @ =gUnk_08111530
|
||||
ldrb r1, [r4, #0xc]
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r0
|
||||
ldr r1, [r1]
|
||||
adds r0, r4, #0
|
||||
bl _call_via_r1
|
||||
adds r0, r4, #0
|
||||
bl sub_0806ED78
|
||||
b _08068706
|
||||
.align 2, 0
|
||||
_080686FC: .4byte gUnk_08111530
|
||||
_08068700:
|
||||
adds r0, r4, #0
|
||||
bl sub_08068780
|
||||
_08068706:
|
||||
pop {r4, pc}
|
||||
|
||||
thumb_func_start sub_08068708
|
||||
sub_08068708: @ 0x08068708
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
ldr r1, _0806872C @ =gUnk_08111520
|
||||
bl LoadExtraSpriteData
|
||||
cmp r0, #0
|
||||
beq _08068728
|
||||
movs r0, #1
|
||||
strb r0, [r4, #0xc]
|
||||
adds r0, r4, #0
|
||||
movs r1, #0
|
||||
bl InitializeAnimation
|
||||
adds r0, r4, #0
|
||||
bl sub_08078778
|
||||
_08068728:
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
_0806872C: .4byte gUnk_08111520
|
||||
|
||||
thumb_func_start sub_08068730
|
||||
sub_08068730: @ 0x08068730
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
movs r1, #0x20
|
||||
movs r2, #0x20
|
||||
bl sub_0806ED9C
|
||||
adds r1, r0, #0
|
||||
cmp r1, #0
|
||||
blt _08068762
|
||||
ldrb r0, [r4, #0xf]
|
||||
cmp r0, #0
|
||||
bne _0806875E
|
||||
movs r0, #0x10
|
||||
strb r0, [r4, #0xf]
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x58
|
||||
ldrb r0, [r0]
|
||||
cmp r0, r1
|
||||
beq _08068762
|
||||
adds r0, r4, #0
|
||||
bl InitializeAnimation
|
||||
b _08068762
|
||||
_0806875E:
|
||||
subs r0, #1
|
||||
strb r0, [r4, #0xf]
|
||||
_08068762:
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x39
|
||||
movs r0, #0
|
||||
ldrsb r0, [r1, r0]
|
||||
cmp r0, #0
|
||||
beq _0806877E
|
||||
movs r0, #0
|
||||
strb r0, [r1]
|
||||
ldrb r0, [r4, #0xe]
|
||||
movs r1, #0x90
|
||||
lsls r1, r1, #5
|
||||
adds r0, r0, r1
|
||||
bl TextboxNoOverlapFollow
|
||||
_0806877E:
|
||||
pop {r4, pc}
|
||||
|
||||
thumb_func_start sub_08068780
|
||||
sub_08068780: @ 0x08068780
|
||||
push {r4, r5, lr}
|
||||
adds r5, r0, #0
|
||||
ldrb r0, [r5, #0xc]
|
||||
cmp r0, #1
|
||||
beq _080687D0
|
||||
cmp r0, #1
|
||||
bgt _08068794
|
||||
cmp r0, #0
|
||||
beq _0806879A
|
||||
b _0806880E
|
||||
_08068794:
|
||||
cmp r0, #2
|
||||
beq _08068800
|
||||
b _0806880E
|
||||
_0806879A:
|
||||
ldr r1, _080687CC @ =gUnk_08111520
|
||||
adds r0, r5, #0
|
||||
bl LoadExtraSpriteData
|
||||
cmp r0, #0
|
||||
beq _0806887A
|
||||
movs r2, #1
|
||||
movs r0, #1
|
||||
strb r0, [r5, #0xc]
|
||||
ldrb r1, [r5, #0x18]
|
||||
subs r0, #5
|
||||
ands r0, r1
|
||||
orrs r0, r2
|
||||
strb r0, [r5, #0x18]
|
||||
ldrb r0, [r5, #0xa]
|
||||
strb r0, [r5, #0x14]
|
||||
adds r0, r5, #0
|
||||
movs r1, #2
|
||||
bl sub_0805E3A0
|
||||
adds r0, r5, #0
|
||||
bl sub_0807DD50
|
||||
b _0806880E
|
||||
.align 2, 0
|
||||
_080687CC: .4byte gUnk_08111520
|
||||
_080687D0:
|
||||
adds r2, r5, #0
|
||||
adds r2, #0x39
|
||||
movs r1, #0
|
||||
ldrsb r1, [r2, r1]
|
||||
cmp r1, #2
|
||||
bne _080687EA
|
||||
movs r0, #0
|
||||
strb r1, [r5, #0xc]
|
||||
strb r0, [r2]
|
||||
adds r0, r5, #0
|
||||
bl sub_0806F118
|
||||
b _0806880E
|
||||
_080687EA:
|
||||
adds r0, r5, #0
|
||||
movs r1, #0
|
||||
bl sub_0807DDAC
|
||||
adds r0, r5, #0
|
||||
bl sub_0807DDE4
|
||||
adds r0, r5, #0
|
||||
bl GetNextFrame
|
||||
b _0806880E
|
||||
_08068800:
|
||||
adds r0, r5, #0
|
||||
bl UpdateFuseInteraction
|
||||
cmp r0, #0
|
||||
beq _0806880E
|
||||
movs r0, #1
|
||||
strb r0, [r5, #0xc]
|
||||
_0806880E:
|
||||
adds r2, r5, #0
|
||||
adds r2, #0x5a
|
||||
ldrb r1, [r2]
|
||||
movs r0, #0x40
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _0806887A
|
||||
movs r0, #0xbf
|
||||
ands r0, r1
|
||||
strb r0, [r2]
|
||||
adds r0, r5, #0
|
||||
bl sub_080040A8
|
||||
cmp r0, #0
|
||||
bne _08068848
|
||||
ldr r4, _08068844 @ =gUnk_0811153E
|
||||
bl Random
|
||||
movs r1, #3
|
||||
bl __modsi3
|
||||
lsls r0, r0, #1
|
||||
adds r0, r0, r4
|
||||
ldrh r0, [r0]
|
||||
bl PlaySFX
|
||||
b _0806885E
|
||||
.align 2, 0
|
||||
_08068844: .4byte gUnk_0811153E
|
||||
_08068848:
|
||||
ldr r4, _0806887C @ =gUnk_08111538
|
||||
bl Random
|
||||
movs r1, #3
|
||||
bl __modsi3
|
||||
lsls r0, r0, #1
|
||||
adds r0, r0, r4
|
||||
ldrh r0, [r0]
|
||||
bl sub_08004488
|
||||
_0806885E:
|
||||
adds r0, r5, #0
|
||||
movs r1, #0x3d
|
||||
movs r2, #0x20
|
||||
bl CreateFx
|
||||
adds r1, r0, #0
|
||||
cmp r1, #0
|
||||
beq _0806887A
|
||||
movs r2, #0xc0
|
||||
lsls r2, r2, #0xd
|
||||
ldr r3, _08068880 @ =0xFFF60000
|
||||
adds r0, r5, #0
|
||||
bl PositionRelative
|
||||
_0806887A:
|
||||
pop {r4, r5, pc}
|
||||
.align 2, 0
|
||||
_0806887C: .4byte gUnk_08111538
|
||||
_08068880: .4byte 0xFFF60000
|
||||
|
||||
thumb_func_start sub_08068884
|
||||
sub_08068884: @ 0x08068884
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
bl sub_0801E99C
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x68
|
||||
strb r0, [r1]
|
||||
ldrb r1, [r1]
|
||||
adds r0, r4, #0
|
||||
bl sub_08078784
|
||||
pop {r4, pc}
|
||||
|
||||
thumb_func_start Melari_Head
|
||||
Melari_Head: @ 0x0806889C
|
||||
push {r4, r5, lr}
|
||||
adds r5, r0, #0
|
||||
adds r0, #0x5a
|
||||
ldrb r4, [r0]
|
||||
movs r0, #0xc1
|
||||
rsbs r0, r0, #0
|
||||
ands r4, r0
|
||||
ldrb r2, [r5, #0x1e]
|
||||
adds r0, r5, #0
|
||||
movs r1, #1
|
||||
bl SetExtraSpriteFrame
|
||||
movs r0, #0x20
|
||||
ands r0, r4
|
||||
cmp r0, #0
|
||||
beq _080688E2
|
||||
movs r0, #0xe1
|
||||
rsbs r0, r0, #0
|
||||
ands r4, r0
|
||||
adds r0, r5, #0
|
||||
movs r1, #0
|
||||
adds r2, r4, #0
|
||||
bl SetExtraSpriteFrame
|
||||
adds r0, r5, #0
|
||||
movs r1, #2
|
||||
movs r2, #0xff
|
||||
bl SetExtraSpriteFrame
|
||||
adds r0, r5, #0
|
||||
movs r1, #1
|
||||
movs r2, #0
|
||||
bl SetSpriteSubEntryOffsetData1
|
||||
b _08068906
|
||||
_080688E2:
|
||||
adds r0, r5, #0
|
||||
movs r1, #0
|
||||
movs r2, #0xff
|
||||
bl SetExtraSpriteFrame
|
||||
movs r0, #0xe1
|
||||
rsbs r0, r0, #0
|
||||
ands r4, r0
|
||||
adds r0, r5, #0
|
||||
movs r1, #2
|
||||
adds r2, r4, #0
|
||||
bl SetExtraSpriteFrame
|
||||
adds r0, r5, #0
|
||||
movs r1, #1
|
||||
movs r2, #2
|
||||
bl SetSpriteSubEntryOffsetData2
|
||||
_08068906:
|
||||
adds r0, r5, #0
|
||||
bl sub_0807000C
|
||||
pop {r4, r5, pc}
|
||||
.align 2, 0
|
||||
|
||||
thumb_func_start sub_08068910
|
||||
sub_08068910: @ 0x08068910
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
ldrb r0, [r4, #0xe]
|
||||
cmp r0, #0
|
||||
beq _08068920
|
||||
subs r0, #1
|
||||
strb r0, [r4, #0xe]
|
||||
b _08068960
|
||||
_08068920:
|
||||
movs r0, #0x10
|
||||
strb r0, [r4, #0xe]
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x5a
|
||||
ldrb r1, [r0]
|
||||
movs r0, #0x20
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _08068960
|
||||
adds r0, r4, #0
|
||||
movs r1, #0x30
|
||||
movs r2, #0x30
|
||||
bl sub_0806EDD8
|
||||
adds r2, r0, #0
|
||||
cmp r2, #0
|
||||
bge _08068944
|
||||
movs r2, #0x10
|
||||
_08068944:
|
||||
adds r0, r2, #0
|
||||
bl sub_0806F5A4
|
||||
adds r2, r0, #0
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x58
|
||||
ldrb r1, [r0]
|
||||
movs r0, #4
|
||||
rsbs r0, r0, #0
|
||||
ands r1, r0
|
||||
adds r1, r1, r2
|
||||
adds r0, r4, #0
|
||||
bl InitializeAnimation
|
||||
_08068960:
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
|
||||
thumb_func_start sub_08068964
|
||||
sub_08068964: @ 0x08068964
|
||||
push {lr}
|
||||
movs r0, #0x35
|
||||
movs r1, #0
|
||||
movs r2, #3
|
||||
bl sub_080A7C18
|
||||
movs r0, #0x35
|
||||
movs r1, #2
|
||||
bl sub_0807CAA0
|
||||
pop {pc}
|
||||
.align 2, 0
|
||||
|
||||
thumb_func_start Melari_Fusion
|
||||
Melari_Fusion: @ 0x0806897C
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
ldrb r0, [r4, #0xc]
|
||||
cmp r0, #0
|
||||
bne _080689B4
|
||||
ldr r1, _080689B0 @ =gUnk_08111520
|
||||
adds r0, r4, #0
|
||||
bl LoadExtraSpriteData
|
||||
cmp r0, #0
|
||||
beq _080689BA
|
||||
ldrb r0, [r4, #0xc]
|
||||
adds r0, #1
|
||||
strb r0, [r4, #0xc]
|
||||
ldrb r1, [r4, #0x18]
|
||||
movs r0, #4
|
||||
rsbs r0, r0, #0
|
||||
ands r0, r1
|
||||
movs r1, #1
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #0x18]
|
||||
adds r0, r4, #0
|
||||
movs r1, #6
|
||||
bl InitializeAnimation
|
||||
b _080689BA
|
||||
.align 2, 0
|
||||
_080689B0: .4byte gUnk_08111520
|
||||
_080689B4:
|
||||
adds r0, r4, #0
|
||||
bl GetNextFrame
|
||||
_080689BA:
|
||||
pop {r4, pc}
|
||||
|
||||
thumb_func_start nullsub_502
|
||||
nullsub_502: @ 0x080689BC
|
||||
bx lr
|
||||
.align 2, 0
|
||||
@@ -0,0 +1,72 @@
|
||||
.include "asm/macros.inc"
|
||||
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
movs r1, #1
|
||||
bl sub_08049FDC
|
||||
cmp r0, #0
|
||||
bne _0801FEEA
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x74
|
||||
movs r0, #1
|
||||
strh r0, [r1]
|
||||
_0801FEEA:
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x5a
|
||||
ldrb r0, [r0]
|
||||
movs r2, #0xf
|
||||
adds r1, r2, #0
|
||||
ands r1, r0
|
||||
lsls r1, r1, #5
|
||||
strh r1, [r4, #0x24]
|
||||
ldrb r0, [r4, #0xa]
|
||||
cmp r0, #0
|
||||
bne _0801FF28
|
||||
ldrb r1, [r4, #0xf]
|
||||
adds r0, r1, #1
|
||||
strb r0, [r4, #0xf]
|
||||
adds r0, r2, #0
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
bne _0801FF4E
|
||||
ldr r0, _0801FF24 @ =gUnk_020000B0
|
||||
ldr r1, [r0]
|
||||
adds r0, r4, #0
|
||||
bl sub_0800132C
|
||||
adds r1, r0, #0
|
||||
adds r0, r4, #0
|
||||
bl sub_08004596
|
||||
b _0801FF4E
|
||||
.align 2, 0
|
||||
_0801FF24: .4byte gUnk_020000B0
|
||||
_0801FF28:
|
||||
adds r0, r1, #0
|
||||
adds r0, #0x40
|
||||
strh r0, [r4, #0x24]
|
||||
ldrb r1, [r4, #0xf]
|
||||
adds r0, r1, #1
|
||||
strb r0, [r4, #0xf]
|
||||
movs r0, #7
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
bne _0801FF4E
|
||||
ldr r0, _0801FF58 @ =gUnk_020000B0
|
||||
ldr r1, [r0]
|
||||
adds r0, r4, #0
|
||||
bl sub_0800132C
|
||||
adds r1, r0, #0
|
||||
adds r0, r4, #0
|
||||
bl sub_08004596
|
||||
_0801FF4E:
|
||||
adds r0, r4, #0
|
||||
bl sub_080AEF88
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
_0801FF58: .4byte gUnk_020000B0
|
||||
.syntax divided
|
||||
@@ -0,0 +1,104 @@
|
||||
.include "asm/macros.inc"
|
||||
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
push {r4, r5, r6, r7, lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
adds r4, r0, #0
|
||||
mov r8, r1
|
||||
ldr r3, _08077D94 @ =gLinkState
|
||||
movs r7, #8
|
||||
adds r1, r7, #0
|
||||
mov r0, r8
|
||||
asrs r1, r0
|
||||
ldrb r2, [r3, #0xa]
|
||||
adds r0, r1, #0
|
||||
orrs r0, r2
|
||||
strb r0, [r3, #0xa]
|
||||
ldrb r0, [r3, #0xb]
|
||||
orrs r1, r0
|
||||
strb r1, [r3, #0xb]
|
||||
ldr r0, _08077D98 @ =gLinkEntity
|
||||
ldrb r0, [r0, #0x14]
|
||||
strb r0, [r4, #0xa]
|
||||
ldrb r0, [r4, #4]
|
||||
cmp r0, #0
|
||||
bne _08077D6A
|
||||
adds r0, #1
|
||||
strb r0, [r4, #4]
|
||||
_08077D6A:
|
||||
ldrb r2, [r4, #1]
|
||||
lsls r0, r2, #1
|
||||
adds r0, r0, r2
|
||||
lsls r0, r0, #2
|
||||
ldr r1, _08077D9C @ =gUnk_0811BE48
|
||||
adds r5, r0, r1
|
||||
ldrh r0, [r5, #4]
|
||||
cmp r0, #0
|
||||
beq _08077DCC
|
||||
ldr r0, [r3, #0x30]
|
||||
ands r0, r7
|
||||
cmp r0, #0
|
||||
beq _08077DC4
|
||||
cmp r2, #0xd
|
||||
beq _08077DB2
|
||||
cmp r2, #0xd
|
||||
bgt _08077DA0
|
||||
cmp r2, #1
|
||||
beq _08077DAC
|
||||
b _08077DB4
|
||||
.align 2, 0
|
||||
_08077D94: .4byte gLinkState
|
||||
_08077D98: .4byte gLinkEntity
|
||||
_08077D9C: .4byte gUnk_0811BE48
|
||||
_08077DA0:
|
||||
cmp r2, #0x1b
|
||||
bne _08077DB4
|
||||
ldr r6, _08077DA8 @ =0x00000948
|
||||
b _08077DB4
|
||||
.align 2, 0
|
||||
_08077DA8: .4byte 0x00000948
|
||||
_08077DAC:
|
||||
movs r6, #0x81
|
||||
lsls r6, r6, #3
|
||||
b _08077DB4
|
||||
_08077DB2:
|
||||
ldr r6, _08077DC0 @ =0x0000040C
|
||||
_08077DB4:
|
||||
adds r0, r4, #0
|
||||
adds r1, r6, #0
|
||||
bl sub_08077DF4
|
||||
b _08077DCC
|
||||
.align 2, 0
|
||||
_08077DC0: .4byte 0x0000040C
|
||||
_08077DC4:
|
||||
ldrh r1, [r5, #4]
|
||||
adds r0, r4, #0
|
||||
bl sub_08077DF4
|
||||
_08077DCC:
|
||||
ldrb r0, [r5, #6]
|
||||
strb r0, [r4, #0xf]
|
||||
ldrb r0, [r5, #7]
|
||||
cmp r0, #0
|
||||
beq _08077DE8
|
||||
ldr r2, _08077DF0 @ =gLinkState
|
||||
movs r0, #8
|
||||
mov r1, r8
|
||||
asrs r0, r1
|
||||
lsls r1, r0, #4
|
||||
orrs r0, r1
|
||||
ldrb r1, [r2, #4]
|
||||
orrs r0, r1
|
||||
strb r0, [r2, #4]
|
||||
_08077DE8:
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.align 2, 0
|
||||
_08077DF0: .4byte gLinkState
|
||||
.syntax divided
|
||||
@@ -0,0 +1,34 @@
|
||||
.include "asm/macros.inc"
|
||||
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
push {lr}
|
||||
ldr r2, _08077F34 @ =gStats
|
||||
ldrb r3, [r0, #1]
|
||||
ldrb r0, [r2, #0xc]
|
||||
cmp r0, r3
|
||||
bne _08077F38
|
||||
movs r2, #1
|
||||
b _08077F42
|
||||
.align 2, 0
|
||||
_08077F34: .4byte gStats
|
||||
_08077F38:
|
||||
ldrb r0, [r2, #0xd]
|
||||
movs r2, #0
|
||||
cmp r0, r3
|
||||
bne _08077F42
|
||||
movs r2, #2
|
||||
_08077F42:
|
||||
adds r0, r2, #0
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _08077F4C
|
||||
movs r0, #1
|
||||
_08077F4C:
|
||||
pop {pc}
|
||||
.align 2, 0
|
||||
.syntax divided
|
||||
-130
@@ -1,130 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
|
||||
thumb_func_start ObjectAF
|
||||
ObjectAF: @ 0x080A058C
|
||||
push {lr}
|
||||
ldr r2, _080A05A0 @ =gUnk_081248C4
|
||||
ldrb r1, [r0, #0xc]
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r2
|
||||
ldr r1, [r1]
|
||||
bl _call_via_r1
|
||||
pop {pc}
|
||||
.align 2, 0
|
||||
_080A05A0: .4byte gUnk_081248C4
|
||||
|
||||
thumb_func_start sub_080A05A4
|
||||
sub_080A05A4: @ 0x080A05A4
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
ldrb r1, [r4, #0xa]
|
||||
cmp r1, #2
|
||||
beq _080A05D2
|
||||
movs r0, #1
|
||||
strb r0, [r4, #0xc]
|
||||
adds r2, r4, #0
|
||||
adds r2, #0x29
|
||||
ldrb r1, [r2]
|
||||
subs r0, #9
|
||||
ands r0, r1
|
||||
movs r1, #6
|
||||
orrs r0, r1
|
||||
strb r0, [r2]
|
||||
adds r0, r4, #0
|
||||
bl sub_080A0640
|
||||
adds r0, r4, #0
|
||||
movs r1, #1
|
||||
bl InitializeAnimation
|
||||
b _080A05F0
|
||||
_080A05D2:
|
||||
movs r0, #0
|
||||
strb r1, [r4, #0xc]
|
||||
ldrh r1, [r4, #0x32]
|
||||
adds r1, #1
|
||||
strh r1, [r4, #0x32]
|
||||
strh r0, [r4, #0x36]
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x63
|
||||
ldrb r0, [r1]
|
||||
subs r0, #1
|
||||
strb r0, [r1]
|
||||
adds r0, r4, #0
|
||||
movs r1, #3
|
||||
bl InitializeAnimation
|
||||
_080A05F0:
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
|
||||
thumb_func_start sub_080A05F4
|
||||
sub_080A05F4: @ 0x080A05F4
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
ldr r0, [r4, #0x50]
|
||||
cmp r0, #0
|
||||
bne _080A060C
|
||||
movs r0, #2
|
||||
strb r0, [r4, #0xc]
|
||||
adds r0, r4, #0
|
||||
movs r1, #2
|
||||
bl InitializeAnimation
|
||||
b _080A0622
|
||||
_080A060C:
|
||||
ldr r0, [r0, #4]
|
||||
cmp r0, #0
|
||||
bne _080A0616
|
||||
bl DeleteThisEntity
|
||||
_080A0616:
|
||||
adds r0, r4, #0
|
||||
bl sub_080A0640
|
||||
adds r0, r4, #0
|
||||
bl GetNextFrame
|
||||
_080A0622:
|
||||
pop {r4, pc}
|
||||
|
||||
thumb_func_start sub_080A0624
|
||||
sub_080A0624: @ 0x080A0624
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
bl GetNextFrame
|
||||
adds r4, #0x5a
|
||||
ldrb r1, [r4]
|
||||
movs r0, #0x80
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _080A063C
|
||||
bl DeleteThisEntity
|
||||
_080A063C:
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
|
||||
thumb_func_start sub_080A0640
|
||||
sub_080A0640: @ 0x080A0640
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
ldrb r0, [r4, #0xa]
|
||||
cmp r0, #0
|
||||
bne _080A065E
|
||||
ldr r0, [r4, #0x50]
|
||||
ldr r0, [r0, #0x64]
|
||||
ldr r0, [r0, #0x10]
|
||||
movs r3, #0x80
|
||||
lsls r3, r3, #0xc
|
||||
adds r1, r4, #0
|
||||
movs r2, #0
|
||||
bl PositionRelative
|
||||
b _080A0666
|
||||
_080A065E:
|
||||
ldr r0, [r4, #0x50]
|
||||
adds r1, r4, #0
|
||||
bl CopyPosition
|
||||
_080A0666:
|
||||
movs r0, #0
|
||||
strh r0, [r4, #0x36]
|
||||
pop {r4, pc}
|
||||
Reference in New Issue
Block a user