Label all entities in Boss Fight Cutscenes (#78)

* label all entities in cutscenes

* remove commented func.. wasn't matching anyway

* Skarmony -> Skarmory

1 files changed, 0 insertions, 643 deletions

diff --git a/asm/code_801B3C0.s b/asm/code_801B3C0.s
index 278f49f..173e4d6 100644
--- a/asm/code_801B3C0.s
+++ b/asm/code_801B3C0.s
@@ -5,649 +5,6 @@
 
 	.text
 
-
-	thumb_func_start sub_801B60C
-sub_801B60C:
-	push {r4-r7,lr}
-	adds r5, r0, 0
-	adds r4, r1, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r2, 24
-	lsrs r7, r2, 24
-	ldr r6, _0801B650
-	movs r0, 0xAA
-	lsls r0, 1
-	movs r1, 0x8
-	bl MemoryAlloc
-	str r0, [r6]
-	adds r2, r0, 0
-	adds r2, 0xC8
-	movs r1, 0
-	str r1, [r2]
-	str r5, [r0]
-	strb r4, [r0, 0x12]
-	ldr r0, [r6]
-	ldrb r0, [r0, 0x12]
-	bl IsThrowableItem
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	beq _0801B654
-	ldr r0, [r6]
-	strb r7, [r0, 0x11]
-	ldr r0, [r6]
-	strb r7, [r0, 0xC]
-	b _0801B65E
-	.align 2, 0
-_0801B650: .4byte gUnknown_203B234
-_0801B654:
-	ldr r0, [r6]
-	strb r1, [r0, 0x11]
-	ldr r1, [r6]
-	movs r0, 0x1
-	strb r0, [r1, 0xC]
-_0801B65E:
-	ldr r5, _0801B6A0
-	ldr r0, [r5]
-	movs r1, 0
-	movs r2, 0x1
-	strb r2, [r0, 0x10]
-	ldr r0, [r5]
-	str r1, [r0, 0x14]
-	strb r1, [r0, 0x18]
-	ldr r0, [r5]
-	strb r2, [r0, 0x1C]
-	ldr r4, _0801B6A4
-	bl GetPlayerPokemonStruct
-	adds r1, r0, 0
-	adds r0, r4, 0
-	movs r2, 0x6
-	bl sub_808D9AC
-	ldr r0, _0801B6A8
-	ldr r2, [r5]
-	adds r1, r2, 0
-	adds r1, 0x10
-	adds r2, 0x14
-	bl sub_8090E14
-	movs r0, 0
-	bl sub_801B748
-	movs r0, 0x1
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0801B6A0: .4byte gUnknown_203B234
-_0801B6A4: .4byte gAvailablePokemonNames
-_0801B6A8: .4byte gUnknown_202DE58
-	thumb_func_end sub_801B60C
-
-	thumb_func_start sub_801B6AC
-sub_801B6AC:
-	push {lr}
-	ldr r0, _0801B6C4
-	ldr r0, [r0]
-	ldr r0, [r0, 0x4]
-	subs r0, 0x6
-	cmp r0, 0xA
-	bhi _0801B720
-	lsls r0, 2
-	ldr r1, _0801B6C8
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0801B6C4: .4byte gUnknown_203B234
-_0801B6C8: .4byte _0801B6CC
-	.align 2, 0
-_0801B6CC:
-	.4byte _0801B6FC
-	.4byte _0801B702
-	.4byte _0801B708
-	.4byte _0801B708
-	.4byte _0801B70E
-	.4byte _0801B714
-	.4byte _0801B71A
-	.4byte _0801B720
-	.4byte _0801B720
-	.4byte _0801B720
-	.4byte _0801B6F8
-_0801B6F8:
-	movs r0, 0x3
-	b _0801B726
-_0801B6FC:
-	bl sub_801BC64
-	b _0801B724
-_0801B702:
-	bl sub_801BC94
-	b _0801B724
-_0801B708:
-	bl sub_801BCCC
-	b _0801B724
-_0801B70E:
-	bl sub_801BD80
-	b _0801B724
-_0801B714:
-	bl sub_801BEAC
-	b _0801B724
-_0801B71A:
-	bl sub_801BE30
-	b _0801B724
-_0801B720:
-	bl sub_801BEC8
-_0801B724:
-	movs r0, 0
-_0801B726:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_801B6AC
-
-	thumb_func_start sub_801B72C
-sub_801B72C:
-	push {r4,lr}
-	ldr r4, _0801B744
-	ldr r0, [r4]
-	cmp r0, 0
-	beq _0801B73E
-	bl MemoryFree
-	movs r0, 0
-	str r0, [r4]
-_0801B73E:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0801B744: .4byte gUnknown_203B234
-	thumb_func_end sub_801B72C
-
-	thumb_func_start sub_801B748
-sub_801B748:
-	push {lr}
-	ldr r1, _0801B75C
-	ldr r1, [r1]
-	str r0, [r1, 0x4]
-	bl sub_801B760
-	bl sub_801B874
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0801B75C: .4byte gUnknown_203B234
-	thumb_func_end sub_801B748
-
-	thumb_func_start sub_801B760
-sub_801B760:
-	push {r4-r7,lr}
-	ldr r0, _0801B77C
-	ldr r1, [r0]
-	ldr r1, [r1, 0x4]
-	subs r1, 0x1
-	adds r4, r0, 0
-	cmp r1, 0xE
-	bls _0801B772
-	b _0801B86A
-_0801B772:
-	lsls r0, r1, 2
-	ldr r1, _0801B780
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0801B77C: .4byte gUnknown_203B234
-_0801B780: .4byte _0801B784
-	.align 2, 0
-_0801B784:
-	.4byte _0801B7C0
-	.4byte _0801B86A
-	.4byte _0801B86A
-	.4byte _0801B86A
-	.4byte _0801B86A
-	.4byte _0801B7C0
-	.4byte _0801B7C0
-	.4byte _0801B7C0
-	.4byte _0801B7C0
-	.4byte _0801B800
-	.4byte _0801B7C0
-	.4byte _0801B840
-	.4byte _0801B7C0
-	.4byte _0801B7C0
-	.4byte _0801B7C0
-_0801B7C0:
-	ldr r4, _0801B7F8
-	ldr r0, [r4]
-	adds r0, 0xF4
-	bl sub_8006518
-	mov r12, r4
-	ldr r4, _0801B7FC
-	movs r3, 0
-	movs r2, 0x3
-_0801B7D2:
-	mov r0, r12
-	ldr r1, [r0]
-	adds r1, r3
-	adds r1, 0xF4
-	adds r0, r4, 0
-	ldm r0!, {r5-r7}
-	stm r1!, {r5-r7}
-	ldm r0!, {r5-r7}
-	stm r1!, {r5-r7}
-	adds r3, 0x18
-	subs r2, 0x1
-	cmp r2, 0
-	bge _0801B7D2
-	bl ResetUnusedInputStruct
-	ldr r0, _0801B7F8
-	ldr r0, [r0]
-	b _0801B82E
-	.align 2, 0
-_0801B7F8: .4byte gUnknown_203B234
-_0801B7FC: .4byte gUnknown_80DBA58
-_0801B800:
-	ldr r0, [r4]
-	adds r0, 0xF4
-	bl sub_8006518
-	bl sub_801BB5C
-	ldr r2, [r4]
-	movs r0, 0x92
-	lsls r0, 1
-	adds r2, r0
-	ldr r1, _0801B83C
-	ldm r1!, {r3,r5,r6}
-	stm r2!, {r3,r5,r6}
-	ldm r1!, {r3,r5,r7}
-	stm r2!, {r3,r5,r7}
-	ldr r1, [r4]
-	adds r0, r1, r0
-	adds r1, 0xCC
-	bl sub_8012CAC
-	bl ResetUnusedInputStruct
-	ldr r0, [r4]
-_0801B82E:
-	adds r0, 0xF4
-	movs r1, 0x1
-	movs r2, 0x1
-	bl sub_800641C
-	b _0801B86A
-	.align 2, 0
-_0801B83C: .4byte gUnknown_80DBA70
-_0801B840:
-	ldr r0, [r4]
-	adds r0, 0xF4
-	bl sub_8006518
-	ldr r1, [r4]
-	movs r6, 0x86
-	lsls r6, 1
-	adds r1, r6
-	ldr r0, _0801B870
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	ldm r0!, {r5-r7}
-	stm r1!, {r5-r7}
-	bl ResetUnusedInputStruct
-	ldr r0, [r4]
-	adds r0, 0xF4
-	movs r1, 0x1
-	movs r2, 0x1
-	bl sub_800641C
-_0801B86A:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0801B870: .4byte gUnknown_80DBA88
-	thumb_func_end sub_801B760
-
-	thumb_func_start sub_801B874
-sub_801B874:
-	push {r4,lr}
-	sub sp, 0x14
-	ldr r1, _0801B890
-	ldr r0, [r1]
-	ldr r0, [r0, 0x4]
-	adds r4, r1, 0
-	cmp r0, 0x10
-	bls _0801B886
-	b _0801BB0E
-_0801B886:
-	lsls r0, 2
-	ldr r1, _0801B894
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0801B890: .4byte gUnknown_203B234
-_0801B894: .4byte _0801B898
-	.align 2, 0
-_0801B898:
-	.4byte _0801B8DC
-	.4byte _0801B9BC
-	.4byte _0801B9D8
-	.4byte _0801B9E0
-	.4byte _0801B9F0
-	.4byte _0801B9F8
-	.4byte _0801BA08
-	.4byte _0801BA34
-	.4byte _0801BA60
-	.4byte _0801BA6E
-	.4byte _0801BA76
-	.4byte _0801BA94
-	.4byte _0801BA9E
-	.4byte _0801BAD0
-	.4byte _0801BAE0
-	.4byte _0801BAFC
-	.4byte _0801BB0E
-_0801B8DC:
-	ldr r1, [r4]
-	ldrb r0, [r1, 0x12]
-	cmp r0, 0xEA
-	bne _0801B8FE
-	movs r0, 0x10
-	str r0, [r1, 0x8]
-	movs r0, 0
-	movs r1, 0x47
-	movs r2, 0x1
-	bl sub_8001784
-	cmp r0, 0
-	bne _0801B914
-	movs r0, 0
-	movs r1, 0x47
-	movs r2, 0x1
-	b _0801B92A
-_0801B8FE:
-	cmp r0, 0xEB
-	bne _0801B938
-	movs r0, 0x10
-	str r0, [r1, 0x8]
-	movs r0, 0
-	movs r1, 0x47
-	movs r2, 0
-	bl sub_8001784
-	cmp r0, 0
-	beq _0801B924
-_0801B914:
-	movs r0, 0xFA
-	lsls r0, 2
-	bl AddToTeamMoney
-	movs r0, 0x4
-	bl sub_801B748
-	b _0801BB0E
-_0801B924:
-	movs r0, 0
-	movs r1, 0x47
-	movs r2, 0
-_0801B92A:
-	movs r3, 0x1
-	bl sub_800199C
-	movs r0, 0x3
-	bl sub_801B748
-	b _0801BB0E
-_0801B938:
-	bl GetNumberOfFilledInventorySlots
-	cmp r0, 0x13
-	ble _0801B986
-	ldr r0, [r4]
-	ldrb r0, [r0, 0x12]
-	bl IsNotMoneyOrUsedTMItem
-	lsls r0, 24
-	cmp r0, 0
-	beq _0801B968
-	ldr r0, _0801B970
-	ldr r1, [r0]
-	ldr r2, [r4]
-	ldrb r0, [r2, 0x12]
-	lsls r0, 1
-	adds r1, 0x50
-	adds r3, r1, r0
-	ldrh r1, [r3]
-	ldrb r0, [r2, 0xC]
-	adds r1, r0
-	ldr r0, _0801B974
-	cmp r1, r0
-	ble _0801B978
-_0801B968:
-	ldr r1, [r4]
-	movs r0, 0x6
-	b _0801B99C
-	.align 2, 0
-_0801B970: .4byte gTeamInventory_203B460
-_0801B974: .4byte 0x000003e7
-_0801B978:
-	strh r1, [r3]
-	movs r0, 0xCB
-	bl PlaySound
-	ldr r1, [r4]
-	movs r0, 0x5
-	b _0801B99C
-_0801B986:
-	ldr r0, [r4]
-	adds r0, 0x10
-	bl AddItemToInventory
-	bl FillInventoryGaps
-	movs r0, 0xCB
-	bl PlaySound
-	ldr r1, [r4]
-	movs r0, 0x10
-_0801B99C:
-	str r0, [r1, 0x8]
-	ldr r0, _0801B9B0
-	ldr r0, [r0]
-	ldr r0, [r0]
-	cmp r0, 0x1
-	bne _0801B9B4
-	movs r0, 0x2
-	bl sub_801B748
-	b _0801BB0E
-	.align 2, 0
-_0801B9B0: .4byte gUnknown_203B234
-_0801B9B4:
-	movs r0, 0x1
-	bl sub_801B748
-	b _0801BB0E
-_0801B9BC:
-	movs r0, 0
-	bl sub_808D544
-	cmp r0, 0x1
-	bgt _0801B9D0
-	ldr r0, _0801B9CC
-	b _0801BAE8
-	.align 2, 0
-_0801B9CC: .4byte gUnknown_80DBAA0
-_0801B9D0:
-	ldr r0, _0801B9D4
-	b _0801BAE8
-	.align 2, 0
-_0801B9D4: .4byte gUnknown_80DBAD0
-_0801B9D8:
-	ldr r0, _0801B9DC
-	b _0801BAE8
-	.align 2, 0
-_0801B9DC: .4byte gUnknown_80DBB08
-_0801B9E0:
-	movs r0, 0xD4
-	bl PlaySound
-	ldr r0, _0801B9EC
-	b _0801BAE8
-	.align 2, 0
-_0801B9EC: .4byte gUnknown_80DBB38
-_0801B9F0:
-	ldr r0, _0801B9F4
-	b _0801BAE8
-	.align 2, 0
-_0801B9F4: .4byte gUnknown_80DBB9C
-_0801B9F8:
-	ldr r1, [r4]
-	movs r0, 0x10
-	str r0, [r1, 0x8]
-	ldr r0, _0801BA04
-	b _0801BAE8
-	.align 2, 0
-_0801BA04: .4byte gUnknown_80DBC28
-_0801BA08:
-	bl sub_801BB20
-	ldr r0, _0801BA2C
-	ldr r1, _0801BA30
-	ldr r3, [r1]
-	adds r3, 0xCC
-	movs r2, 0
-	str r2, [sp]
-	movs r1, 0x4
-	str r1, [sp, 0x4]
-	str r2, [sp, 0x8]
-	str r2, [sp, 0xC]
-	str r2, [sp, 0x10]
-	movs r1, 0
-	movs r2, 0x4
-	bl sub_8014248
-	b _0801BB0E
-	.align 2, 0
-_0801BA2C: .4byte gUnknown_80DBC60
-_0801BA30: .4byte gUnknown_203B234
-_0801BA34:
-	bl sub_801BC24
-	ldr r0, _0801BA58
-	ldr r1, _0801BA5C
-	ldr r3, [r1]
-	adds r3, 0xCC
-	movs r2, 0
-	str r2, [sp]
-	movs r1, 0x4
-	str r1, [sp, 0x4]
-	str r2, [sp, 0x8]
-	str r2, [sp, 0xC]
-	str r2, [sp, 0x10]
-	movs r1, 0
-	movs r2, 0x3
-	bl sub_8014248
-	b _0801BB0E
-	.align 2, 0
-_0801BA58: .4byte gUnknown_80DBC98
-_0801BA5C: .4byte gUnknown_203B234
-_0801BA60:
-	movs r0, 0x1
-	movs r1, 0x3
-	movs r2, 0
-	movs r3, 0xA
-	bl sub_801A5D8
-	b _0801BB0E
-_0801BA6E:
-	movs r0, 0x1
-	bl sub_801A8D0
-	b _0801BB0E
-_0801BA76:
-	bl sub_801A9E0
-	ldr r0, _0801BA90
-	ldr r2, [r0]
-	adds r0, r2, 0
-	adds r0, 0x28
-	adds r1, r2, 0
-	adds r1, 0xCC
-	adds r2, 0xC8
-	ldr r2, [r2]
-	str r2, [sp]
-	movs r2, 0x2
-	b _0801BAC0
-	.align 2, 0
-_0801BA90: .4byte gUnknown_203B234
-_0801BA94:
-	ldr r0, [r4]
-	adds r0, 0x20
-	bl sub_801B3C0
-	b _0801BB0E
-_0801BA9E:
-	bl sub_801A9E0
-	ldr r4, _0801BACC
-	ldr r0, [r4]
-	adds r0, 0x28
-	movs r1, 0
-	bl sub_8012EA4
-	bl sub_801BC24
-	ldr r1, [r4]
-	adds r0, r1, 0
-	adds r0, 0x78
-	adds r1, 0xCC
-	movs r2, 0x3
-	str r2, [sp]
-	movs r2, 0x1
-_0801BAC0:
-	str r2, [sp, 0x4]
-	movs r2, 0
-	movs r3, 0
-	bl sub_8012D60
-	b _0801BB0E
-	.align 2, 0
-_0801BACC: .4byte gUnknown_203B234
-_0801BAD0:
-	ldr r1, [r4]
-	movs r0, 0x10
-	str r0, [r1, 0x8]
-	ldr r0, _0801BADC
-	b _0801BAE8
-	.align 2, 0
-_0801BADC: .4byte gUnknown_80DBCC4
-_0801BAE0:
-	ldr r1, [r4]
-	movs r0, 0x10
-	str r0, [r1, 0x8]
-	ldr r0, _0801BAF4
-_0801BAE8:
-	ldr r3, _0801BAF8
-	movs r1, 0
-	movs r2, 0
-	bl sub_80141B4
-	b _0801BB0E
-	.align 2, 0
-_0801BAF4: .4byte gUnknown_80DBCE8
-_0801BAF8: .4byte 0x00000101
-_0801BAFC:
-	ldr r1, [r4]
-	movs r0, 0x10
-	str r0, [r1, 0x8]
-	ldr r0, _0801BB18
-	ldr r3, _0801BB1C
-	movs r1, 0
-	movs r2, 0
-	bl sub_80141B4
-_0801BB0E:
-	add sp, 0x14
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0801BB18: .4byte gUnknown_80DBD24
-_0801BB1C: .4byte 0x00000101
-	thumb_func_end sub_801B874
-
-	thumb_func_start sub_801BB20
-sub_801BB20:
-	ldr r0, _0801BB50
-	ldr r3, [r0]
-	movs r2, 0
-	adds r1, r3, 0
-	adds r1, 0xCC
-	ldr r0, _0801BB54
-	str r0, [r1]
-	adds r1, 0x4
-	movs r0, 0x4
-	str r0, [r1]
-	adds r1, 0x4
-	ldr r0, _0801BB58
-	str r0, [r1]
-	adds r1, 0x4
-	movs r0, 0x5
-	str r0, [r1]
-	adds r0, r3, 0
-	adds r0, 0xDC
-	str r2, [r0]
-	adds r1, 0x8
-	movs r0, 0x1
-	negs r0, r0
-	str r0, [r1]
-	bx lr
-	.align 2, 0
-_0801BB50: .4byte gUnknown_203B234
-_0801BB54: .4byte gKangaskhanTrashToolboxItem
-_0801BB58: .4byte gKangaskhanTrashReceivedItem
-	thumb_func_end sub_801BB20
-
 	thumb_func_start sub_801BB5C
 sub_801BB5C:
 	push {r4-r7,lr}