through sub_80180E8

2019-03-29 19:41:32 -04:00
parent 8d75dc1982
commit 6b6c98e7d0
2 changed files with 90 additions and 182 deletions
@@ -5,186 +5,6 @@

 	.text

-	thumb_func_start sub_8017FD8
-sub_8017FD8: @ 8017FD8
-	push {lr}
-	adds r2, r0, 0
-	ldr r0, =gRecvCmds
-	ldrh r1, [r0, 0x2]
-	cmp r1, 0
-	beq _08017FFC
-	cmp r1, 0x51
-	beq _08017FEC
-	cmp r1, 0x52
-	bne _08017FFC
-_08017FEC:
-	adds r0, r2, 0
-	adds r0, 0x98
-	strh r1, [r0]
-	movs r0, 0x1
-	b _08017FFE
-	.pool
-_08017FFC:
-	movs r0, 0
-_08017FFE:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8017FD8
-
-	thumb_func_start InUnionRoom
-InUnionRoom: @ 8018004
-	push {lr}
-	movs r2, 0
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldrh r1, [r0, 0x4]
-	ldr r0, =0x00003c19
-	cmp r1, r0
-	bne _08018016
-	movs r2, 0x1
-_08018016:
-	adds r0, r2, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end InUnionRoom
-
-	thumb_func_start sub_8018024
-sub_8018024: @ 8018024
-	push {r4-r6,lr}
-	movs r6, 0
-	movs r5, 0
-	ldr r0, =gPlayerPartyCount
-	ldrb r0, [r0]
-	cmp r6, r0
-	bge _08018064
-_08018032:
-	movs r0, 0x64
-	adds r1, r5, 0
-	muls r1, r0
-	ldr r0, =gPlayerParty
-	adds r4, r1, r0
-	adds r0, r4, 0
-	movs r1, 0x38
-	bl GetMonData
-	cmp r0, 0x1E
-	bhi _0801805A
-	adds r0, r4, 0
-	movs r1, 0x41
-	bl GetMonData
-	movs r1, 0xCE
-	lsls r1, 1
-	cmp r0, r1
-	beq _0801805A
-	adds r6, 0x1
-_0801805A:
-	adds r5, 0x1
-	ldr r0, =gPlayerPartyCount
-	ldrb r0, [r0]
-	cmp r5, r0
-	blt _08018032
-_08018064:
-	cmp r6, 0x1
-	bgt _08018074
-	movs r0, 0
-	b _08018076
-	.pool
-_08018074:
-	movs r0, 0x1
-_08018076:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8018024
-
-	thumb_func_start sub_801807C
-sub_801807C: @ 801807C
-	movs r1, 0
-	strh r1, [r0]
-	strh r1, [r0, 0x2]
-	str r1, [r0, 0x4]
-	strh r1, [r0, 0xA]
-	strh r1, [r0, 0xC]
-	strh r1, [r0, 0xE]
-	strh r1, [r0, 0x10]
-	str r1, [r0, 0x14]
-	bx lr
-	thumb_func_end sub_801807C
-
-	thumb_func_start sub_8018090
-sub_8018090: @ 8018090
-	push {lr}
-	ldr r0, =gUnknown_02022C40
-	bl sub_801807C
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8018090
-
-	thumb_func_start sub_80180A0
-sub_80180A0: @ 80180A0
-	push {r4,r5,lr}
-	adds r5, r1, 0
-	movs r1, 0x64
-	adds r4, r0, 0
-	muls r4, r1
-	ldr r0, =gPlayerParty
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0x41
-	bl GetMonData
-	strh r0, [r5, 0xA]
-	adds r0, r4, 0
-	movs r1, 0x38
-	bl GetMonData
-	strh r0, [r5, 0xC]
-	adds r0, r4, 0
-	movs r1, 0
-	bl GetMonData
-	str r0, [r5, 0x4]
-	ldrh r1, [r5, 0xA]
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r1, r0
-	beq _080180E0
-	movs r0, 0
-	b _080180E2
-	.pool
-_080180E0:
-	movs r0, 0x1
-_080180E2:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80180A0
-
-	thumb_func_start sub_80180E8
-sub_80180E8: @ 80180E8
-	push {r4,r5,lr}
-	adds r5, r1, 0
-	movs r1, 0x64
-	adds r4, r0, 0
-	muls r4, r1
-	ldr r0, =gPlayerParty
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0x41
-	bl GetMonData
-	strh r0, [r5, 0xE]
-	adds r0, r4, 0
-	movs r1, 0x38
-	bl GetMonData
-	strh r0, [r5, 0x10]
-	adds r0, r4, 0
-	movs r1, 0
-	bl GetMonData
-	str r0, [r5, 0x14]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80180E8
-
 	thumb_func_start sub_8018120
 sub_8018120: @ 8018120
 	push {r4-r7,lr}