decomp a few and combine few files

asm/code_8071518.s

@@ -1,54 +0,0 @@
-	#include "asm/constants/gba_constants.inc"
-	#include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start CheckRunAwayVisualFlag
-CheckRunAwayVisualFlag:
-	push {r4-r7,lr}
-	adds r5, r0, 0
-	lsls r1, 24
-	lsrs r7, r1, 24
-	ldr r4, [r5, 0x70]
-	adds r6, r4, 0
-	ldrb r0, [r4, 0x7]
-	cmp r0, 0
-	bne _08071590
-	adds r0, r5, 0
-	movs r1, 0x2B
-	bl HasAbility
-	lsls r0, 24
-	cmp r0, 0
-	beq _08071590
-	movs r2, 0
-	movs r1, 0x10
-	ldrsh r0, [r4, r1]
-	lsrs r1, r0, 31
-	adds r0, r1
-	movs r3, 0xE
-	ldrsh r1, [r4, r3]
-	asrs r0, 1
-	cmp r1, r0
-	bgt _08071576
-	movs r2, 0x1
-_08071576:
-	adds r0, r6, 0
-	movs r1, 0x4
-	bl SetVisualFlags
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r7, 0
-	beq _08071590
-	cmp r0, 0
-	beq _08071590
-	adds r0, r5, 0
-	bl ShowVisualFlags
-_08071590:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end CheckRunAwayVisualFlag
-
-	.align 2, 0

asm/code_807167C.s

@@ -5,72 +5,5 @@
 
   	.text
   
-	thumb_func_start sub_807167C
-sub_807167C:
-	push {lr}
-	ldr r2, [r0, 0x70]
-	ldr r1, [r1, 0x70]
-	adds r0, r2, 0
-	adds r0, 0xA4
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _080716D2
-	adds r0, r2, 0
-	adds r0, 0x40
-	ldrb r0, [r0]
-	cmp r0, 0x4A
-	beq _0807169A
-	cmp r0, 0x47
-	bne _0807169E
-_0807169A:
-	movs r0, 0x1
-	b _080716A0
-_0807169E:
-	movs r0, 0
-_080716A0:
-	cmp r0, 0
-	bne _080716D2
-	ldrb r0, [r2, 0x8]
-	cmp r0, 0
-	bne _080716D2
-	adds r0, r1, 0
-	adds r0, 0xA4
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _080716D2
-	adds r0, r1, 0
-	adds r0, 0x40
-	ldrb r0, [r0]
-	cmp r0, 0x4A
-	beq _080716C2
-	cmp r0, 0x47
-	bne _080716C6
-_080716C2:
-	movs r0, 0x1
-	b _080716C8
-_080716C6:
-	movs r0, 0
-_080716C8:
-	cmp r0, 0
-	bne _080716D2
-	ldrb r0, [r1, 0x8]
-	cmp r0, 0
-	beq _080716D6
-_080716D2:
-	movs r0, 0x2
-	b _080716E4
-_080716D6:
-	ldrb r0, [r2, 0x6]
-	ldrb r1, [r1, 0x6]
-	cmp r0, r1
-	bne _080716E2
-	movs r0, 0
-	b _080716E4
-_080716E2:
-	movs r0, 0x1
-_080716E4:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_807167C
 
 	.align 2, 0