Split playerItems and extract pointers

asm/code_080A29BC.s

@@ -397,590 +397,10 @@ _080A2D6E:
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
 
-	thumb_func_start PlayerItemShield
-PlayerItemShield: @ 0x080A2D74
-	push {lr}
-	adds r2, r0, #0
-	ldr r0, [r2, #0x6c]
-	cmp r0, #0
-	beq _080A2D82
-	subs r0, #1
-	str r0, [r2, #0x6c]
-_080A2D82:
-	ldr r0, _080A2D94 @ =gUnk_081271D4
-	ldrb r1, [r2, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r0
-	ldr r1, [r1]
-	adds r0, r2, #0
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_080A2D94: .4byte gUnk_081271D4
+	@ TODO convert .inc files into .s files and include them in linker.ld
+	.include "asm/playerItem/playerItemShield.inc"
 
-	thumb_func_start sub_080A2D98
-sub_080A2D98: @ 0x080A2D98
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r0, _080A2DD0 @ =gPlayerState
-	str r4, [r0, #0x2c]
-	movs r2, #0
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0x11]
-	subs r0, #0x11
-	ands r0, r1
-	movs r1, #6
-	orrs r0, r1
-	strb r0, [r4, #0x11]
-	movs r0, #0xff
-	strb r0, [r4, #0x1e]
-	adds r0, r4, #0
-	adds r0, #0x68
-	ldrb r0, [r0]
-	cmp r0, #0xe
-	bne _080A2DD8
-	movs r0, #0x27
-	str r0, [r4, #0x70]
-	ldr r1, _080A2DD4 @ =gUnk_081271DC
-	ldrb r0, [r1, #1]
-	str r0, [r4, #0x78]
-	str r2, [r4, #0x74]
-	str r1, [r4, #0x7c]
-	b _080A2DDA
-	.align 2, 0
-_080A2DD0: .4byte gPlayerState
-_080A2DD4: .4byte gUnk_081271DC
-_080A2DD8:
-	str r2, [r4, #0x70]
-_080A2DDA:
-	ldr r0, _080A2DFC @ =gPlayerEntity
-	ldrb r1, [r0, #0x14]
-	movs r0, #0xe
-	ands r0, r1
-	strb r0, [r4, #0x14]
-	adds r0, r4, #0
-	bl sub_08079BD8
-	adds r0, r4, #0
-	movs r1, #1
-	movs r2, #3
-	bl sub_080AE008
-	adds r0, r4, #0
-	bl sub_080A2E00
-	pop {r4, pc}
-	.align 2, 0
-_080A2DFC: .4byte gPlayerEntity
-
-	thumb_func_start sub_080A2E00
-sub_080A2E00: @ 0x080A2E00
-	push {r4, r5, r6, r7, lr}
-	adds r4, r0, #0
-	ldr r0, _080A2E90 @ =gPlayerEntity
-	mov ip, r0
-	mov r1, ip
-	adds r1, #0x3d
-	ldrb r0, [r1]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	beq _080A2E1A
-	lsrs r0, r0, #0x18
-	cmp r0, #0x81
-	bne _080A2E40
-_080A2E1A:
-	adds r5, r4, #0
-	adds r5, #0x3d
-	ldrb r0, [r5]
-	movs r2, #0
-	strb r0, [r1]
-	adds r0, r4, #0
-	adds r0, #0x3e
-	ldrb r0, [r0]
-	mov r1, ip
-	adds r1, #0x3e
-	strb r0, [r1]
-	adds r3, r4, #0
-	adds r3, #0x42
-	ldrb r1, [r3]
-	mov r0, ip
-	adds r0, #0x42
-	strb r1, [r0]
-	strb r2, [r3]
-	strb r2, [r5]
-_080A2E40:
-	ldr r0, _080A2E94 @ =gPlayerState
-	ldrb r3, [r0, #3]
-	adds r7, r0, #0
-	cmp r3, #0
-	beq _080A2F20
-	ldr r0, [r7, #0x2c]
-	cmp r4, r0
-	bne _080A2F20
-	movs r2, #0x80
-	adds r0, r2, #0
-	ands r0, r3
-	cmp r0, #0
-	beq _080A2E9C
-	ldr r1, _080A2E98 @ =gUnk_08127240
-	ldrb r0, [r4, #0x14]
-	lsrs r0, r0, #1
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r0, [r0]
-	str r0, [r4, #0x48]
-	ldr r0, _080A2E90 @ =gPlayerEntity
-	adds r0, #0x3c
-	ldrb r0, [r0]
-	adds r0, #1
-	movs r1, #0x20
-	adds r2, r4, #0
-	adds r2, #0x3c
-	orrs r0, r1
-	strb r0, [r2]
-	ldrb r1, [r4, #0x10]
-	movs r0, #0x80
-	orrs r0, r1
-	strb r0, [r4, #0x10]
-	movs r0, #0x7f
-	ands r0, r3
-	strb r0, [r7, #3]
-	adds r0, r4, #0
-	bl sub_080176E4
-	b _080A2F30
-	.align 2, 0
-_080A2E90: .4byte gPlayerEntity
-_080A2E94: .4byte gPlayerState
-_080A2E98: .4byte gUnk_08127240
-_080A2E9C:
-	adds r0, r4, #0
-	adds r0, #0x41
-	ldrb r1, [r0]
-	adds r0, r2, #0
-	ands r0, r1
-	cmp r0, #0
-	beq _080A2F30
-	movs r0, #0x7f
-	ands r0, r1
-	cmp r0, #0x42
-	bne _080A2F06
-	adds r0, r4, #0
-	adds r0, #0x68
-	ldrb r1, [r0]
-	adds r5, r0, #0
-	cmp r1, #0xe
-	bne _080A2F06
-	movs r0, #0x40
-	ands r0, r3
-	lsls r0, r0, #0x18
-	lsrs r6, r0, #0x18
-	cmp r6, #0
-	bne _080A2F06
-	ldrb r3, [r5]
-	movs r0, #0x15
-	movs r1, #0
-	movs r2, #0
-	bl CreatePlayerItem
-	adds r1, r0, #0
-	str r1, [r4, #0x54]
-	cmp r1, #0
-	beq _080A2EF4
-	movs r0, #1
-	strb r0, [r1, #0xf]
-	ldr r2, [r4, #0x54]
-	adds r0, r4, #0
-	adds r0, #0x3e
-	ldrb r0, [r0]
-	movs r1, #0x10
-	eors r0, r1
-	strb r0, [r2, #0x15]
-	ldr r0, [r4, #0x54]
-	str r4, [r0, #0x50]
-_080A2EF4:
-	ldr r1, _080A2F1C @ =gUnk_08127220
-	ldrb r0, [r1, #1]
-	str r0, [r4, #0x78]
-	str r6, [r4, #0x74]
-	str r1, [r4, #0x7c]
-	ldrb r0, [r7, #3]
-	movs r1, #0x40
-	orrs r0, r1
-	strb r0, [r7, #3]
-_080A2F06:
-	ldr r0, [r4, #0x6c]
-	cmp r0, #0
-	bne _080A2F30
-	movs r0, #0x8c
-	lsls r0, r0, #1
-	bl SoundReq
-	movs r0, #8
-	str r0, [r4, #0x6c]
-	b _080A2F30
-	.align 2, 0
-_080A2F1C: .4byte gUnk_08127220
-_080A2F20:
-	movs r1, #0
-	strb r1, [r7, #3]
-	ldr r0, [r7, #0x2c]
-	cmp r0, r4
-	bne _080A2F2C
-	str r1, [r7, #0x2c]
-_080A2F2C:
-	bl DeleteThisEntity
-_080A2F30:
-	ldr r6, _080A301C @ =gPlayerEntity
-	ldrh r0, [r6, #0x12]
-	cmp r0, #1
-	beq _080A2F3E
-	cmp r0, #4
-	beq _080A2F3E
-	b _080A3064
-_080A2F3E:
-	ldrb r0, [r6, #0x1e]
-	subs r0, #0x25
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	cmp r0, #0x3e
-	bls _080A2F4C
-	b _080A3064
-_080A2F4C:
-	ldrb r2, [r6, #0x18]
-	movs r1, #0x40
-	ands r1, r2
-	ldrb r3, [r4, #0x18]
-	movs r0, #0x41
-	rsbs r0, r0, #0
-	ands r0, r3
-	orrs r0, r1
-	lsrs r2, r2, #7
-	lsls r2, r2, #7
-	movs r3, #0x7f
-	ands r0, r3
-	orrs r0, r2
-	strb r0, [r4, #0x18]
-	ldrb r2, [r6, #0x1e]
-	ldr r1, [r4, #0x70]
-	adds r0, r1, #0
-	subs r0, #0x25
-	adds r0, r2, r0
-	adds r5, r4, #0
-	adds r5, #0x68
-	ldrb r7, [r4, #0x1e]
-	cmp r0, r7
-	beq _080A2FA2
-	adds r0, r1, #0
-	adds r0, #0xdb
-	adds r0, r2, r0
-	strb r0, [r4, #0x1e]
-	ldrb r0, [r5]
-	cmp r0, #0xe
-	bne _080A2F98
-	adds r0, r6, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	adds r0, r3, #0
-	ands r0, r1
-	cmp r0, #0
-	bne _080A2FA2
-_080A2F98:
-	ldrb r1, [r4, #0x1e]
-	ldrh r2, [r4, #0x12]
-	adds r0, r4, #0
-	bl sub_080042D0
-_080A2FA2:
-	ldrb r0, [r5]
-	cmp r0, #0xe
-	bne _080A303E
-	ldr r0, _080A301C @ =gPlayerEntity
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x7f
-	ands r0, r1
-	cmp r0, #0
-	beq _080A303E
-	ldr r0, [r4, #0x78]
-	subs r3, r0, #1
-	str r3, [r4, #0x78]
-	cmp r3, #0
-	bne _080A303E
-	ldr r0, [r4, #0x74]
-	adds r0, #1
-	str r0, [r4, #0x74]
-	lsls r0, r0, #2
-	ldr r1, [r4, #0x7c]
-	adds r2, r1, r0
-	ldrb r0, [r2]
-	ldr r7, _080A3020 @ =gPlayerState
-	cmp r0, #0xff
-	bne _080A2FEC
-	ldrb r1, [r7, #3]
-	movs r0, #0x40
-	ands r0, r1
-	cmp r0, #0
-	beq _080A2FE8
-	ldr r0, _080A3024 @ =gUnk_081271DC
-	str r0, [r4, #0x7c]
-	movs r0, #0xbf
-	ands r0, r1
-	strb r0, [r7, #3]
-_080A2FE8:
-	str r3, [r4, #0x74]
-	ldr r1, [r4, #0x7c]
-_080A2FEC:
-	ldr r0, [r4, #0x74]
-	lsls r0, r0, #2
-	adds r2, r1, r0
-	ldrb r0, [r2, #1]
-	str r0, [r4, #0x78]
-	ldrb r1, [r7, #3]
-	movs r0, #0x40
-	ands r0, r1
-	cmp r0, #0
-	beq _080A3028
-	ldr r0, _080A301C @ =gPlayerEntity
-	adds r0, #0x5a
-	ldrb r0, [r0]
-	movs r1, #0x7f
-	ands r1, r0
-	adds r1, #8
-	ldrb r2, [r2]
-	adds r1, r1, r2
-	ldrh r2, [r4, #0x12]
-	adds r0, r4, #0
-	bl sub_080042D0
-	b _080A303E
-	.align 2, 0
-_080A301C: .4byte gPlayerEntity
-_080A3020: .4byte gPlayerState
-_080A3024: .4byte gUnk_081271DC
-_080A3028:
-	ldr r0, _080A3060 @ =gPlayerEntity
-	adds r0, #0x5a
-	ldrb r0, [r0]
-	movs r1, #0x7f
-	ands r1, r0
-	ldrb r2, [r2]
-	adds r1, r1, r2
-	ldrh r2, [r4, #0x12]
-	adds r0, r4, #0
-	bl sub_080042D0
-_080A303E:
-	ldr r1, _080A3060 @ =gPlayerEntity
-	adds r0, r1, #0
-	adds r0, #0x5a
-	ldrb r0, [r0]
-	adds r2, r4, #0
-	adds r2, #0x5a
-	strb r0, [r2]
-	adds r0, r1, #0
-	adds r0, #0x5b
-	ldrb r0, [r0]
-	adds r2, #1
-	strb r0, [r2]
-	adds r0, r4, #0
-	bl sub_08078E84
-	b _080A3068
-	.align 2, 0
-_080A3060: .4byte gPlayerEntity
-_080A3064:
-	movs r0, #0xff
-	strb r0, [r4, #0x1e]
-_080A3068:
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-
-	thumb_func_start PlayerItem15
-PlayerItem15: @ 0x080A306C
-	push {lr}
-	ldr r2, _080A3080 @ =gUnk_08127270
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_080A3080: .4byte gUnk_08127270
-
-	thumb_func_start sub_080A3084
-sub_080A3084: @ 0x080A3084
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldrb r1, [r4, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #1
-	orrs r0, r1
-	strb r0, [r4, #0x18]
-	movs r5, #1
-	strb r5, [r4, #0xc]
-	ldr r0, [r4, #0x50]
-	adds r1, r4, #0
-	bl CopyPosition
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	bne _080A30F8
-	ldr r0, _080A30EC @ =gPlayerEntity
-	adds r0, #0x3c
-	ldrb r0, [r0]
-	adds r0, #1
-	adds r1, r4, #0
-	adds r1, #0x3c
-	strb r0, [r1]
-	ldr r0, _080A30F0 @ =gUnk_08127278
-	str r0, [r4, #0x48]
-	movs r0, #0x80
-	lsls r0, r0, #3
-	strh r0, [r4, #0x24]
-	adds r0, r4, #0
-	adds r0, #0x38
-	ldrb r0, [r0]
-	cmp r0, #2
-	bne _080A30CC
-	strb r5, [r4, #0xb]
-_080A30CC:
-	ldrb r0, [r4, #0x14]
-	lsls r0, r0, #2
-	strb r0, [r4, #0x15]
-	movs r0, #0x3c
-	str r0, [r4, #0x6c]
-	adds r0, r4, #0
-	bl sub_0801766C
-	adds r0, r4, #0
-	bl sub_0806F69C
-	ldr r0, _080A30F4 @ =0x0000013F
-	bl SoundReq
-	b _080A30FC
-	.align 2, 0
-_080A30EC: .4byte gPlayerEntity
-_080A30F0: .4byte gUnk_08127278
-_080A30F4: .4byte 0x0000013F
-_080A30F8:
-	movs r0, #6
-	strb r0, [r4, #0xe]
-_080A30FC:
-	adds r0, r4, #0
-	movs r1, #0x18
-	bl InitializeAnimation
-	adds r0, r4, #0
-	bl sub_080A310C
-	pop {r4, r5, pc}
-
-	thumb_func_start sub_080A310C
-sub_080A310C: @ 0x080A310C
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	beq _080A312A
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	cmp r0, #0xff
-	bne _080A3200
-	bl DeleteThisEntity
-	b _080A3200
-_080A312A:
-	adds r0, r4, #0
-	bl GetNextFrame
-	ldr r0, [r4, #0x6c]
-	subs r0, #1
-	str r0, [r4, #0x6c]
-	movs r1, #1
-	rsbs r1, r1, #0
-	cmp r0, r1
-	beq _080A31FC
-	adds r0, r4, #0
-	bl GetNextFrame
-	adds r0, r4, #0
-	bl sub_0806F69C
-	ldrb r0, [r4, #0xe]
-	adds r0, #1
-	strb r0, [r4, #0xe]
-	ldrb r0, [r4, #0xb]
-	cmp r0, #0
-	bne _080A315C
-	adds r0, r4, #0
-	bl sub_0800451C
-_080A315C:
-	movs r1, #0x2e
-	ldrsh r0, [r4, r1]
-	ldr r2, _080A31F0 @ =gRoomControls
-	ldrh r1, [r2, #6]
-	subs r0, r0, r1
-	asrs r0, r0, #4
-	movs r3, #0x3f
-	ands r0, r3
-	movs r5, #0x32
-	ldrsh r1, [r4, r5]
-	ldrh r2, [r2, #8]
-	subs r1, r1, r2
-	asrs r1, r1, #4
-	ands r1, r3
-	lsls r1, r1, #6
-	orrs r0, r1
-	ldr r1, _080A31F4 @ =gPlayerEntity
-	adds r1, #0x38
-	ldrb r1, [r1]
-	movs r2, #0x80
-	bl sub_080002F0
-	cmp r0, #0
-	bne _080A31AE
-	ldr r1, _080A31F8 @ =gUnk_08003E44
-	movs r0, #0x2e
-	ldrsh r2, [r4, r0]
-	movs r5, #0x32
-	ldrsh r3, [r4, r5]
-	adds r0, r4, #0
-	bl sub_080040D8
-	cmp r0, #0
-	beq _080A31AE
-	adds r0, r4, #0
-	movs r1, #0x19
-	movs r2, #0
-	bl CreateFx
-	bl DeleteThisEntity
-_080A31AE:
-	adds r0, r4, #0
-	adds r0, #0x41
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _080A31C6
-	adds r0, r4, #0
-	movs r1, #0x19
-	movs r2, #0
-	bl CreateFx
-	bl DeleteThisEntity
-_080A31C6:
-	adds r0, r4, #0
-	movs r1, #0xc
-	bl sub_08008790
-	cmp r0, #0
-	beq _080A31D6
-	bl DeleteThisEntity
-_080A31D6:
-	adds r0, r4, #0
-	adds r0, #0x68
-	ldrb r3, [r0]
-	movs r0, #0x15
-	movs r1, #1
-	movs r2, #0
-	bl CreatePlayerItem
-	str r0, [r4, #0x54]
-	cmp r0, #0
-	beq _080A3200
-	str r4, [r0, #0x50]
-	b _080A3200
-	.align 2, 0
-_080A31F0: .4byte gRoomControls
-_080A31F4: .4byte gPlayerEntity
-_080A31F8: .4byte gUnk_08003E44
-_080A31FC:
-	bl DeleteThisEntity
-_080A3200:
-	pop {r4, r5, pc}
-	.align 2, 0
+	.include "asm/playerItem/playerItem15.inc"
 
 	thumb_func_start InitSound
 InitSound: @ 0xInitSound