through SetMauvilleOldMan

2018-05-02 11:31:58 -04:00
parent 867b496f2e
commit 21c3e7e8e5
7 changed files with 144 additions and 159 deletions
--- a/asm/mauville_old_man.s
+++ b/asm/mauville_old_man.s
@@ -5,144 +5,6 @@

 	.text

-	thumb_func_start sub_81200A0
-sub_81200A0: @ 81200A0
-	push {r4,lr}
-	ldr r0, =gSaveBlock1Ptr
-	ldr r2, [r0]
-	ldr r1, =0x00002e28
-	adds r0, r2, r1
-	movs r1, 0
-	strb r1, [r0]
-	ldr r3, =0x00002e51
-	adds r0, r2, r3
-	strb r1, [r0]
-	ldr r0, =gGameLanguage
-	ldrb r1, [r0]
-	adds r3, 0x1
-	adds r0, r2, r3
-	strb r1, [r0]
-	movs r3, 0
-	ldr r0, =0x00002e2a
-	adds r2, r0
-	ldr r4, =gUnknown_0859EFE4
-_081200C6:
-	lsls r0, r3, 1
-	adds r1, r2, r0
-	adds r0, r4
-	ldrh r0, [r0]
-	strh r0, [r1]
-	adds r0, r3, 0x1
-	lsls r0, 16
-	lsrs r3, r0, 16
-	cmp r3, 0x5
-	bls _081200C6
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81200A0
-
-	thumb_func_start sub_81200F8
-sub_81200F8: @ 81200F8
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r0, =0x00002e28
-	adds r1, r0
-	movs r2, 0
-	movs r0, 0x1
-	strb r0, [r1]
-	strb r2, [r1, 0x1]
-	ldr r0, =gGameLanguage
-	ldrb r0, [r0]
-	strb r0, [r1, 0x2]
-	bx lr
-	.pool
-	thumb_func_end sub_81200F8
-
-	thumb_func_start sub_812011C
-sub_812011C: @ 812011C
-	push {lr}
-	bl sub_8120E08
-	pop {r0}
-	bx r0
-	thumb_func_end sub_812011C
-
-	thumb_func_start sub_8120128
-sub_8120128: @ 8120128
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r0, =0x00002e28
-	adds r2, r1, r0
-	movs r3, 0
-	movs r0, 0x4
-	strb r0, [r2]
-	strb r3, [r2, 0x1]
-	ldr r0, =gGameLanguage
-	ldrb r0, [r0]
-	ldr r2, =0x00002e48
-	adds r1, r2
-	strb r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end sub_8120128
-
-	thumb_func_start sub_8120154
-sub_8120154: @ 8120154
-	push {lr}
-	bl sub_81339F8
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8120154
-
-	thumb_func_start SetMauvilleOldMan
-SetMauvilleOldMan: @ 8120160
-	push {lr}
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldrb r1, [r0, 0xB]
-	lsls r1, 8
-	ldrb r0, [r0, 0xA]
-	orrs r0, r1
-	movs r1, 0xA
-	bl __umodsi3
-	lsls r0, 16
-	lsrs r0, 17
-	cmp r0, 0x4
-	bhi _081201C0
-	lsls r0, 2
-	ldr r1, =_08120190
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_08120190:
-	.4byte _081201A4
-	.4byte _081201AA
-	.4byte _081201B0
-	.4byte _081201B6
-	.4byte _081201BC
-_081201A4:
-	bl sub_81200A0
-	b _081201C0
-_081201AA:
-	bl sub_81200F8
-	b _081201C0
-_081201B0:
-	bl sub_8120154
-	b _081201C0
-_081201B6:
-	bl sub_812011C
-	b _081201C0
-_081201BC:
-	bl sub_8120128
-_081201C0:
-	bl sub_8120B5C
-	pop {r0}
-	bx r0
-	thumb_func_end SetMauvilleOldMan
-
 	thumb_func_start sub_81201C8
 sub_81201C8: @ 81201C8
 	ldr r0, =gSaveBlock1Ptr