remaining lilycove lady functions

2017-09-20 20:48:32 -04:00
parent faf844f332
commit d263750f19
4 changed files with 61 additions and 116 deletions
@@ -5,121 +5,5 @@

 	.text

-	thumb_func_start sub_818E8B4
-sub_818E8B4: @ 818E8B4
-	push {lr}
-	ldr r1, =gUnknown_0203CD6C
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r2, =0x00003b58
-	adds r0, r2
-	str r0, [r1]
-	ldrb r0, [r0, 0x1]
-	cmp r0, 0x1
-	beq _0818E8D8
-	movs r0, 0
-	b _0818E8DA
-	.pool
-_0818E8D8:
-	movs r0, 0x1
-_0818E8DA:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_818E8B4
-
-	thumb_func_start sub_818E8E0
-sub_818E8E0: @ 818E8E0
-	push {r4,lr}
-	movs r3, 0
-	ldr r1, =gUnknown_0203CD6C
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r4, =0x00003b58
-	adds r2, r0, r4
-	str r2, [r1]
-	ldrb r0, [r2, 0x2]
-	cmp r0, 0x4
-	bhi _0818E8FC
-	ldrb r0, [r2, 0x3]
-	cmp r0, 0x4
-	bls _0818E8FE
-_0818E8FC:
-	movs r3, 0x1
-_0818E8FE:
-	adds r0, r3, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_818E8E0
-
-	thumb_func_start sub_818E914
-sub_818E914: @ 818E914
-	push {lr}
-	ldr r0, =gStringVar2
-	ldr r1, =gStringVar1
-	bl sub_818E794
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_818E914
-
-	thumb_func_start sub_818E92C
-sub_818E92C: @ 818E92C
-	push {lr}
-	ldr r1, =c2_exit_to_overworld_2_switch
-	movs r0, 0x3
-	bl sub_81357FC
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_818E92C
-
-	thumb_func_start sub_818E940
-sub_818E940: @ 818E940
-	ldr r1, =gUnknown_0203CD6C
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r2, =0x00003b58
-	adds r0, r2
-	str r0, [r1]
-	movs r1, 0x1
-	strb r1, [r0, 0x1]
-	bx lr
-	.pool
-	thumb_func_end sub_818E940
-
-	thumb_func_start sub_818E960
-sub_818E960: @ 818E960
-	ldr r1, =gUnknown_0203CD6C
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r2, =0x00003b58
-	adds r0, r2
-	str r0, [r1]
-	ldr r2, =gSpecialVar_0x8005
-	ldr r1, =gUnknown_0860B34C
-	ldrb r0, [r0, 0xD]
-	lsls r0, 1
-	adds r0, r1
-	ldrh r0, [r0]
-	strh r0, [r2]
-	bx lr
-	.pool
-	thumb_func_end sub_818E960
-
-	thumb_func_start sub_818E990
-sub_818E990: @ 818E990
-	ldr r1, =gUnknown_0203CD6C
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r2, =0x00003b58
-	adds r0, r2
-	str r0, [r1]
-	ldrb r0, [r0, 0xD]
-	bx lr
-	.pool
-	thumb_func_end sub_818E990
-

 .align 2, 0 @ Don't pad with nop.