sub_818E1F4

2017-09-20 10:45:00 -04:00
parent c05f2d4473
commit 0b81c2920a
3 changed files with 146 additions and 140 deletions
--- a/asm/lilycove_lady.s
+++ b/asm/lilycove_lady.s
@@ -5,132 +5,6 @@

 	.text

-	thumb_func_start sub_818E13C
-sub_818E13C: @ 818E13C
-	push {r4-r7,lr}
-	movs r7, 0x1
-	ldr r5, =gUnknown_0203CD68
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r2, =0x00003b58
-	adds r0, r1, r2
-	str r0, [r5]
-	ldrb r0, [r0, 0x18]
-	cmp r0, 0xFF
-	bne _0818E174
-	ldr r0, =gStringVar1
-	ldr r1, =gUnknown_085EEB7E
-	bl StringCopy7
-	movs r7, 0
-	b _0818E1DC
-	.pool
-_0818E174:
-	ldr r4, =gStringVar1
-	ldr r0, =0x00003b70
-	adds r1, r0
-	adds r0, r4, 0
-	bl StringCopy7
-	ldr r0, [r5]
-	adds r0, 0x2D
-	ldrb r1, [r0]
-	adds r0, r4, 0
-	bl ConvertInternationalString
-	ldr r0, [r5]
-	adds r0, 0x18
-	bl sub_818E258
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r6, =gSaveBlock2Ptr
-	ldr r0, [r6]
-	bl sub_818E258
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r4, r0
-	bne _0818E1DC
-	ldr r0, [r5]
-	movs r2, 0
-	cmp r2, r4
-	bcs _0818E1DC
-	ldr r1, [r6]
-	ldrb r0, [r0, 0x18]
-	ldrb r1, [r1]
-	cmp r0, r1
-	bne _0818E1DA
-_0818E1BA:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, r4
-	bcs _0818E1DC
-	ldr r0, =gUnknown_0203CD68
-	ldr r1, [r0]
-	adds r1, 0x18
-	adds r1, r2
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	adds r0, r2
-	ldrb r1, [r1]
-	ldrb r0, [r0]
-	cmp r1, r0
-	beq _0818E1BA
-_0818E1DA:
-	movs r7, 0x2
-_0818E1DC:
-	adds r0, r7, 0
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_818E13C
-
-	thumb_func_start sub_818E1F4
-sub_818E1F4: @ 818E1F4
-	push {r4-r6,lr}
-	ldr r3, =gUnknown_0203CD68
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r2, =0x00003b58
-	adds r0, r1, r2
-	str r0, [r3]
-	movs r5, 0
-	movs r4, 0
-	ldr r0, =0x00003b78
-	adds r1, r0
-	ldr r0, =gSaveBlock2Ptr
-	ldr r2, [r0]
-	ldrh r1, [r1]
-	adds r6, r3, 0
-	adds r3, r0, 0
-	ldrb r2, [r2, 0xA]
-	cmp r1, r2
-	bne _0818E23A
-_0818E21A:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x3
-	bhi _0818E23C
-	ldr r1, [r6]
-	lsls r0, r4, 1
-	adds r1, 0x20
-	adds r1, r0
-	ldr r0, [r3]
-	adds r0, 0xA
-	adds r0, r4
-	ldrh r1, [r1]
-	ldrb r0, [r0]
-	cmp r1, r0
-	beq _0818E21A
-_0818E23A:
-	movs r5, 0x1
-_0818E23C:
-	adds r0, r5, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_818E1F4
-
 	thumb_func_start sub_818E258
 sub_818E258: @ 818E258
 	push {lr}