Merge pull request #353 from hatal175/picolyteBottle

asm/non_matching/picolyteBottles/sub_0806DF74.inc

@@ -1,34 +0,0 @@
-	.syntax unified
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r1, #0
-	bl sub_0807DD94
-	ldrb r0, [r4, #0xe]
-	cmp r0, #0xff
-	beq _0806DFB0
-	adds r0, r4, #0
-	adds r0, #0x44
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _0806DF96
-	ldr r1, [r4, #0x70]
-	ldrb r0, [r1, #0xe]
-	adds r0, #1
-	strb r0, [r1, #0xe]
-_0806DF96:
-	ldr r1, [r4, #0x68]
-	ldrb r0, [r1, #0xe]
-	adds r0, #1
-	strb r0, [r1, #0xe]
-	ldr r1, [r4, #0x6c]
-	ldrb r0, [r1, #0xe]
-	adds r0, #1
-	strb r0, [r1, #0xe]
-	movs r0, #0xff
-	strb r0, [r4, #0xe]
-	movs r0, #0
-	bl SetRoomFlag
-_0806DFB0:
-	pop {r4, pc}
-	.align 2, 0
-	.syntax divided

asm/non_matching/picolyteBottles/sub_0806E014.inc

@@ -1,95 +0,0 @@
-	.syntax unified
-	push {r4, r5, r6, r7, lr}
-	adds r5, r0, #0
-	bl Random
-	movs r1, #0x70
-	ands r1, r0
-	lsrs r4, r1, #4
-	movs r0, #0xff
-	strb r0, [r5, #0xb]
-	movs r0, #1
-	rsbs r0, r0, #0
-	adds r7, r0, #0
-	strb r0, [r5, #0xe]
-	movs r0, #0x93
-	bl CheckLocalFlag
-	adds r1, r0, #0
-	cmp r1, #0
-	bne _0806E088
-	adds r0, r5, #0
-	adds r0, #0x44
-	strb r1, [r0]
-	lsls r1, r4, #1
-	ldr r0, _0806E084 @ =gUnk_081142CC
-	adds r6, r1, r0
-	ldr r1, [r5, #0x68]
-	ldrb r0, [r6]
-	strb r0, [r1, #0xf]
-	ldr r1, [r5, #0x68]
-	movs r4, #0x90
-	lsls r4, r4, #0xf
-	adds r0, r5, #0
-	adds r2, r4, #0
-	adds r3, r4, #0
-	bl PositionRelative
-	ldr r1, [r5, #0x6c]
-	ldrb r0, [r6, #1]
-	strb r0, [r1, #0xf]
-	ldr r1, [r5, #0x6c]
-	movs r2, #0xd0
-	lsls r2, r2, #0xf
-	adds r0, r5, #0
-	adds r3, r4, #0
-	bl PositionRelative
-	ldr r1, [r5, #0x70]
-	ldrb r0, [r1, #0xf]
-	orrs r0, r7
-	strb r0, [r1, #0xf]
-	ldr r1, [r5, #0x70]
-	adds r0, r5, #0
-	bl CopyPosition
-	b _0806E0D6
-	.align 2, 0
-_0806E084: .4byte gUnk_081142CC
-_0806E088:
-	adds r1, r5, #0
-	adds r1, #0x44
-	movs r0, #1
-	strb r0, [r1]
-	lsls r1, r4, #2
-	ldr r0, _0806E0D8 @ =gUnk_081142DC
-	adds r6, r1, r0
-	ldr r1, [r5, #0x68]
-	ldrb r0, [r6]
-	strb r0, [r1, #0xf]
-	ldr r1, [r5, #0x68]
-	movs r2, #0xe0
-	lsls r2, r2, #0xe
-	movs r4, #0x90
-	lsls r4, r4, #0xf
-	adds r0, r5, #0
-	adds r3, r4, #0
-	bl PositionRelative
-	ldr r1, [r5, #0x6c]
-	ldrb r0, [r6, #1]
-	strb r0, [r1, #0xf]
-	ldr r1, [r5, #0x6c]
-	movs r2, #0xb0
-	lsls r2, r2, #0xf
-	adds r0, r5, #0
-	adds r3, r4, #0
-	bl PositionRelative
-	ldr r1, [r5, #0x70]
-	ldrb r0, [r6, #2]
-	strb r0, [r1, #0xf]
-	ldr r1, [r5, #0x70]
-	movs r2, #0xf0
-	lsls r2, r2, #0xf
-	adds r0, r5, #0
-	adds r3, r4, #0
-	bl PositionRelative
-_0806E0D6:
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_0806E0D8: .4byte gUnk_081142DC
-	.syntax divided

asm/non_matching/picolyteBottles/sub_0806E140.inc

@@ -1,78 +0,0 @@
-	.syntax unified
-	push {r4, r5, lr}
-	adds r3, r0, #0
-	adds r5, r1, #0
-	ldrb r1, [r3, #0xb]
-	cmp r1, #0
-	beq _0806E1AC
-	movs r0, #1
-	str r0, [r5, #0x14]
-	adds r1, r3, #0
-	adds r1, #0x74
-	ldrh r0, [r1]
-	adds r0, #1
-	strh r0, [r1]
-	adds r1, #2
-	ldrh r2, [r1]
-	adds r0, r3, #0
-	adds r0, #0x44
-	ldrb r0, [r0]
-	adds r4, r1, #0
-	cmp r0, #0
-	bne _0806E16E
-	lsls r0, r2, #1
-	b _0806E172
-_0806E16E:
-	lsls r0, r2, #1
-	adds r0, r0, r2
-_0806E172:
-	strh r0, [r4]
-	lsls r0, r0, #0x10
-	lsrs r0, r0, #0x10
-	ldr r1, _0806E18C @ =0x000003E7
-	cmp r0, r1
-	bls _0806E194
-	strh r1, [r4]
-	movs r0, #0
-	str r0, [r5, #0x14]
-	ldr r0, _0806E190 @ =0x0000421B
-	bl MessageFromTarget
-	b _0806E1C0
-	.align 2, 0
-_0806E18C: .4byte 0x000003E7
-_0806E190: .4byte 0x0000421B
-_0806E194:
-	ldr r0, _0806E1A4 @ =0x00004218
-	bl MessageFromTarget
-	ldr r1, _0806E1A8 @ =gMessage
-	ldrh r0, [r4]
-	str r0, [r1, #0x10]
-	b _0806E1C0
-	.align 2, 0
-_0806E1A4: .4byte 0x00004218
-_0806E1A8: .4byte gMessage
-_0806E1AC:
-	str r1, [r5, #0x14]
-	adds r0, r3, #0
-	adds r0, #0x74
-	strh r1, [r0]
-	adds r4, r3, #0
-	adds r4, #0x76
-	strh r1, [r4]
-	ldr r0, _0806E1D4 @ =0x0000421C
-	bl MessageFromTarget
-_0806E1C0:
-	ldr r1, _0806E1D8 @ =gRoomTransition
-	ldrh r0, [r4]
-	strh r0, [r1, #6]
-	ldr r2, _0806E1DC @ =gActiveScriptInfo
-	ldrb r1, [r2, #7]
-	movs r0, #1
-	orrs r0, r1
-	strb r0, [r2, #7]
-	pop {r4, r5, pc}
-	.align 2, 0
-_0806E1D4: .4byte 0x0000421C
-_0806E1D8: .4byte gRoomTransition
-_0806E1DC: .4byte gActiveScriptInfo
-	.syntax divided