through sub_80181DC

2019-03-29 22:22:26 -04:00
parent 6b6c98e7d0
commit 2e588fd4d7
4 changed files with 95 additions and 153 deletions
--- a/asm/union_room.s
+++ b/asm/union_room.s
@@ -5,142 +5,6 @@

 	.text

-	thumb_func_start sub_8018120
-sub_8018120: @ 8018120
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r1, 24
-	movs r2, 0
-	mov r8, r2
-	cmp r1, 0
-	bne _0801813E
-	ldrh r7, [r0, 0xA]
-	ldr r6, [r0, 0x4]
-	b _08018142
-_08018136:
-	lsls r0, r5, 16
-	lsrs r0, 16
-	mov r8, r0
-	b _08018176
-_0801813E:
-	ldrh r7, [r0, 0xE]
-	ldr r6, [r0, 0x14]
-_08018142:
-	movs r5, 0
-	b _0801816E
-_08018146:
-	movs r0, 0x64
-	adds r1, r5, 0
-	muls r1, r0
-	ldr r0, =gPlayerParty
-	adds r4, r1, r0
-	adds r0, r4, 0
-	movs r1, 0
-	bl GetMonData
-	cmp r0, r6
-	bne _0801816C
-	adds r0, r4, 0
-	movs r1, 0x41
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, r7
-	beq _08018136
-_0801816C:
-	adds r5, 0x1
-_0801816E:
-	ldr r0, =gPlayerPartyCount
-	ldrb r0, [r0]
-	cmp r5, r0
-	blt _08018146
-_08018176:
-	mov r0, r8
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8018120
-
-	thumb_func_start sub_801818C
-sub_801818C: @ 801818C
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_80173B0
-	bl ScriptContext2_Disable
-	bl sub_8098524
-	ldr r1, =gUnknown_02022C2C
-	movs r0, 0
-	strb r0, [r1]
-	cmp r4, 0
-	beq _080181BC
-	ldr r2, =gUnknown_02022C40
-	ldrh r0, [r2, 0x2]
-	ldrh r1, [r2, 0xA]
-	ldrh r2, [r2, 0xC]
-	bl sub_8010FCC
-	movs r0, 0x40
-	movs r1, 0
-	movs r2, 0
-	bl sub_8011090
-_080181BC:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_801818C
-
-	thumb_func_start sub_80181CC
-sub_80181CC: @ 80181CC
-	push {lr}
-	bl ScriptContext2_Enable
-	bl ScriptFreezeEventObjects
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80181CC
-
-	thumb_func_start sub_80181DC
-sub_80181DC: @ 80181DC
-	push {r4,lr}
-	movs r3, 0x80
-	movs r2, 0
-	ldr r4, [r0, 0xC]
-_080181E4:
-	lsls r0, r2, 3
-	subs r0, r2
-	lsls r0, 2
-	adds r1, r4, r0
-	ldrb r0, [r1, 0x18]
-	lsls r0, 31
-	cmp r0, 0
-	beq _0801820C
-	ldrb r0, [r1, 0xB]
-	lsls r0, 31
-	lsrs r0, 31
-	lsls r0, 3
-	orrs r3, r0
-	ldrb r1, [r1, 0x2]
-	movs r0, 0x7
-	ands r0, r1
-	orrs r3, r0
-	lsls r0, r3, 24
-	lsrs r3, r0, 24
-	b _08018216
-_0801820C:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0x3
-	bls _080181E4
-_08018216:
-	adds r0, r3, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80181DC
-
 	thumb_func_start sub_8018220
 sub_8018220: @ 8018220
 	push {r4-r7,lr}