Skip to content

Commit d760102

Browse files
committed
Match sub_80179BC
1 parent 7456c93 commit d760102

File tree

2 files changed

+1
-78
lines changed

2 files changed

+1
-78
lines changed

asm/player.s

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -8,83 +8,6 @@
88
.if 0
99
.endif
1010

11-
thumb_func_start sub_80179BC
12-
sub_80179BC: @ 0x080179BC
13-
push {r4, r5, r6, lr}
14-
sub sp, #4
15-
adds r6, r0, #0
16-
adds r0, #0x2b
17-
ldrb r0, [r0]
18-
movs r1, #0x1c
19-
ands r1, r0
20-
cmp r1, #0
21-
beq _08017A3E
22-
cmp r1, #0x14
23-
beq _08017A3E
24-
adds r4, r6, #0
25-
adds r4, #0xdc
26-
ldr r5, [r4]
27-
cmp r5, #0
28-
bne _08017A3E
29-
ldr r0, _08017A48 @ =sub_80191C8
30-
movs r2, #0xc4
31-
lsls r2, r2, #6
32-
ldr r1, _08017A4C @ =sub_8019390
33-
str r1, [sp]
34-
movs r1, #0x30
35-
movs r3, #0
36-
bl TaskCreate
37-
str r0, [r4]
38-
ldrh r1, [r0, #6]
39-
movs r0, #0xc0
40-
lsls r0, r0, #0x12
41-
adds r4, r1, r0
42-
str r6, [r4, #0x28]
43-
movs r0, #8
44-
bl VramMalloc
45-
str r0, [r4]
46-
movs r2, #0x80
47-
lsls r2, r2, #5
48-
str r2, [r4, #8]
49-
ldr r0, [r6, #4]
50-
movs r1, #0x80
51-
lsls r1, r1, #9
52-
ands r0, r1
53-
cmp r0, #0
54-
beq _08017A1C
55-
movs r0, #0x80
56-
lsls r0, r0, #4
57-
orrs r0, r2
58-
str r0, [r4, #8]
59-
_08017A1C:
60-
movs r1, #0
61-
ldr r0, _08017A50 @ =0x000005E3
62-
strh r0, [r4, #0xc]
63-
strh r5, [r4, #0x10]
64-
strh r5, [r4, #0x12]
65-
strh r5, [r4, #0x14]
66-
strh r5, [r4, #0x16]
67-
ldr r0, _08017A54 @ =0x0000FFFF
68-
strh r0, [r4, #0x18]
69-
strb r1, [r4, #0x1a]
70-
movs r0, #0xff
71-
strb r0, [r4, #0x1b]
72-
movs r0, #0x10
73-
strb r0, [r4, #0x1c]
74-
strb r1, [r4, #0x1f]
75-
subs r0, #0x11
76-
str r0, [r4, #0x20]
77-
_08017A3E:
78-
add sp, #4
79-
pop {r4, r5, r6}
80-
pop {r0}
81-
bx r0
82-
.align 2, 0
83-
_08017A48: .4byte sub_80191C8
84-
_08017A4C: .4byte sub_8019390
85-
_08017A50: .4byte 0x000005E3
86-
_08017A54: .4byte 0x0000FFFF
87-
8811
thumb_func_start sub_8017A58
8912
sub_8017A58: @ 0x08017A58
9013
push {r4, lr}

include/game/player.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ struct Player {
272272
struct Task *taskTagAction;
273273
struct Task *unkD4;
274274
struct Task *unkD8; // taskEffect?
275-
u32 unkDC;
275+
struct Task *unkDC;
276276

277277
PlayerSpriteInfo *spriteInfoBody;
278278
PlayerSpriteInfo *spriteInfoLimbs;

0 commit comments

Comments
 (0)