Skip to content

Commit 91257db

Browse files
committed
Move Task_D8_8076050 into non-matching
1 parent fe2feab commit 91257db

3 files changed

Lines changed: 297 additions & 288 deletions

File tree

asm/boss_7.s

Lines changed: 0 additions & 234 deletions
Original file line numberDiff line numberDiff line change
@@ -7,240 +7,6 @@
77

88
.if 0
99
.else
10-
thumb_func_start Task_D8_8076050
11-
Task_D8_8076050: @ 0x08076050
12-
push {r4, r5, r6, r7, lr}
13-
mov r7, sl
14-
mov r6, sb
15-
mov r5, r8
16-
push {r5, r6, r7}
17-
sub sp, #0x18
18-
ldr r4, _0807607C @ =gCurTask
19-
ldr r0, [r4]
20-
ldrh r3, [r0, #6]
21-
movs r0, #0xc0
22-
lsls r0, r0, #0x12
23-
adds r6, r3, r0
24-
adds r0, #0x2b
25-
adds r2, r3, r0
26-
ldrb r1, [r2]
27-
cmp r1, #0xa
28-
beq _08076096
29-
cmp r1, #0xa
30-
bgt _08076080
31-
cmp r1, #0
32-
beq _08076088
33-
b _080761FA
34-
.align 2, 0
35-
_0807607C: .4byte gCurTask
36-
_08076080:
37-
cmp r1, #0xc8
38-
bne _08076086
39-
b _080761E4
40-
_08076086:
41-
b _080761FA
42-
_08076088:
43-
movs r0, #0xfa
44-
lsls r0, r0, #8
45-
strh r0, [r6, #0x32]
46-
strh r1, [r6, #0x2c]
47-
movs r0, #0xa
48-
strb r0, [r2]
49-
b _080761FA
50-
_08076096:
51-
ldrh r0, [r6, #0x32]
52-
adds r0, #0x40
53-
strh r0, [r6, #0x32]
54-
movs r1, #0x32
55-
ldrsh r0, [r6, r1]
56-
ldr r2, [r6, #0x44]
57-
adds r2, r2, r0
58-
str r2, [r6, #0x44]
59-
ldrh r0, [r6, #0x2c]
60-
adds r0, #1
61-
strh r0, [r6, #0x2c]
62-
ldr r0, [r6]
63-
ldr r1, [r6, #0x14]
64-
adds r0, r0, r1
65-
lsls r0, r0, #8
66-
lsrs r0, r0, #0x10
67-
str r0, [sp, #0x10]
68-
ldr r0, [r6, #4]
69-
adds r0, r0, r2
70-
lsls r0, r0, #8
71-
lsrs r0, r0, #0x10
72-
str r0, [sp, #0x14]
73-
movs r4, #0
74-
mov r8, r4
75-
ldr r0, _080760E8 @ =0x03000034
76-
adds r0, r0, r3
77-
mov sl, r0
78-
_080760CC:
79-
mov r3, r8
80-
lsls r1, r3, #1
81-
mov r4, sl
82-
adds r3, r4, r1
83-
ldrh r2, [r3]
84-
movs r0, #1
85-
mov r4, r8
86-
ands r0, r4
87-
adds r4, r1, #0
88-
cmp r0, #0
89-
beq _080760EC
90-
adds r1, r2, #0
91-
subs r1, #0x40
92-
b _080760F0
93-
.align 2, 0
94-
_080760E8: .4byte 0x03000034
95-
_080760EC:
96-
adds r1, r2, #0
97-
adds r1, #0x40
98-
_080760F0:
99-
ldr r0, _08076178 @ =0x000003FF
100-
ands r1, r0
101-
strh r1, [r3]
102-
mov r1, sl
103-
adds r0, r1, r4
104-
ldrh r4, [r0]
105-
mov sb, r4
106-
lsls r0, r4, #1
107-
ldr r3, _0807617C @ =gSineTable
108-
adds r0, r0, r3
109-
movs r1, #0
110-
ldrsh r0, [r0, r1]
111-
lsls r2, r0, #2
112-
adds r2, r2, r0
113-
asrs r2, r2, #0xc
114-
movs r3, #0x80
115-
lsls r3, r3, #1
116-
adds r0, r4, r3
117-
lsls r0, r0, #1
118-
ldr r1, _0807617C @ =gSineTable
119-
adds r0, r0, r1
120-
movs r3, #0
121-
ldrsh r0, [r0, r3]
122-
lsls r1, r0, #2
123-
adds r1, r1, r0
124-
asrs r1, r1, #0xc
125-
ldr r3, [sp, #0x10]
126-
lsls r0, r3, #0x10
127-
asrs r0, r0, #0x10
128-
adds r0, r0, r1
129-
lsls r0, r0, #0x10
130-
lsrs r5, r0, #0x10
131-
mov ip, r5
132-
ldr r1, [sp, #0x14]
133-
lsls r0, r1, #0x10
134-
asrs r0, r0, #0x10
135-
adds r0, r0, r2
136-
lsls r0, r0, #0x10
137-
lsrs r3, r0, #0x10
138-
adds r7, r3, #0
139-
ldrh r1, [r6, #0x2c]
140-
movs r2, #1
141-
adds r0, r2, #0
142-
ands r0, r1
143-
cmp r0, #0
144-
beq _08076180
145-
mov r0, r8
146-
ands r0, r2
147-
cmp r0, #0
148-
beq _080761AA
149-
lsls r1, r5, #0x10
150-
asrs r1, r1, #0x10
151-
lsls r2, r3, #0x10
152-
asrs r2, r2, #0x10
153-
str r4, [sp]
154-
movs r0, #0x14
155-
str r0, [sp, #4]
156-
movs r3, #0
157-
str r3, [sp, #8]
158-
ldr r0, [r6, #0x48]
159-
str r0, [sp, #0xc]
160-
movs r0, #7
161-
movs r3, #0x80
162-
lsls r3, r3, #2
163-
bl sub_8079758
164-
b _080761AA
165-
.align 2, 0
166-
_08076178: .4byte 0x000003FF
167-
_0807617C: .4byte gSineTable
168-
_08076180:
169-
mov r3, r8
170-
ands r3, r2
171-
cmp r3, #0
172-
bne _080761AA
173-
mov r4, ip
174-
lsls r1, r4, #0x10
175-
asrs r1, r1, #0x10
176-
lsls r2, r7, #0x10
177-
asrs r2, r2, #0x10
178-
mov r0, sb
179-
str r0, [sp]
180-
movs r0, #0x14
181-
str r0, [sp, #4]
182-
str r3, [sp, #8]
183-
ldr r0, [r6, #0x48]
184-
str r0, [sp, #0xc]
185-
movs r0, #7
186-
movs r3, #0x80
187-
lsls r3, r3, #2
188-
bl sub_8079758
189-
_080761AA:
190-
mov r0, r8
191-
adds r0, #1
192-
lsls r0, r0, #0x18
193-
lsrs r0, r0, #0x18
194-
mov r8, r0
195-
cmp r0, #3
196-
bls _080760CC
197-
ldrh r1, [r6, #0x2c]
198-
movs r0, #0x3f
199-
ands r0, r1
200-
cmp r0, #0
201-
bne _080761C8
202-
ldr r0, _080761E0 @ =0x00000221
203-
bl m4aSongNumStart
204-
_080761C8:
205-
ldr r0, [r6, #0x44]
206-
asrs r0, r0, #8
207-
movs r1, #0x96
208-
lsls r1, r1, #1
209-
cmp r0, r1
210-
ble _080761FA
211-
adds r1, r6, #0
212-
adds r1, #0x2b
213-
movs r0, #0xc8
214-
strb r0, [r1]
215-
b _080761FA
216-
.align 2, 0
217-
_080761E0: .4byte 0x00000221
218-
_080761E4:
219-
movs r0, #0
220-
strb r0, [r2]
221-
strh r0, [r6, #0x2c]
222-
movs r0, #0x78
223-
strh r0, [r6, #0x30]
224-
ldr r0, _08076210 @ =0x00000221
225-
bl m4aSongNumStart
226-
ldr r1, [r4]
227-
ldr r0, _08076214 @ =Task_D8_8076218
228-
str r0, [r1, #8]
229-
_080761FA:
230-
adds r0, r6, #0
231-
bl sub_8076328
232-
add sp, #0x18
233-
pop {r3, r4, r5}
234-
mov r8, r3
235-
mov sb, r4
236-
mov sl, r5
237-
pop {r4, r5, r6, r7}
238-
pop {r0}
239-
bx r0
240-
.align 2, 0
241-
_08076210: .4byte 0x00000221
242-
_08076214: .4byte Task_D8_8076218
243-
24410
thumb_func_start Task_D8_8076218
24511
Task_D8_8076218: @ 0x08076218
24612
push {r4, r5, r6, lr}

0 commit comments

Comments
 (0)