Sese's April/May Dump (#37)

* splitting lots of pokemon square and labeling lots of other things

* actually commit this stuff

* more moving data and things

* more screen work

* split out some pokemon dungeon data

* lots of data work

* push more data work

* split kecleon, decomp another kanghaskhan func, and try to doc UpdateBGControl more

* lots of item work

* label more item things

* subtype -> category and doc types/category

1 files changed, 21 insertions, 298 deletions

diff --git a/asm/pokemon.s b/asm/pokemon.s
index bd729f7..1e8d2ed 100644
--- a/asm/pokemon.s
+++ b/asm/pokemon.s
@@ -55,7 +55,7 @@ _0808CE46:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0808CE60: .4byte gUnknown_203B45C
+_0808CE60: .4byte gRecruitedPokemonRef
 _0808CE64: .4byte 0x0000019d
 _0808CE68: .4byte 0x00008df8
 _0808CE6C: .4byte 0x00008f90
@@ -232,7 +232,7 @@ _0808CFB8:
 	bx r0
 	.align 2, 0
 _0808CFC8: .4byte gMonsterParameters
-_0808CFCC: .4byte gUnknown_203B45C
+_0808CFCC: .4byte gRecruitedPokemonRef
 	thumb_func_end sub_808CE74
 
 	thumb_func_start sub_808CFD0
@@ -579,7 +579,7 @@ _0808D26A:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0808D274: .4byte gUnknown_203B45C
+_0808D274: .4byte gRecruitedPokemonRef
 	thumb_func_end sub_808D1DC
 
 	thumb_func_start sub_808D278
@@ -641,7 +641,7 @@ _0808D2DC:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0808D2E4: .4byte gUnknown_203B45C
+_0808D2E4: .4byte gRecruitedPokemonRef
 	thumb_func_end sub_808D278
 
 	thumb_func_start sub_808D2E8
@@ -714,7 +714,7 @@ _0808D344:
 	adds r0, r2, 0
 	b _0808D370
 	.align 2, 0
-_0808D360: .4byte gUnknown_203B45C
+_0808D360: .4byte gRecruitedPokemonRef
 _0808D364:
 	adds r3, 0x1
 	movs r0, 0xCE
@@ -754,7 +754,7 @@ _0808D39A:
 	adds r0, r2, 0
 	b _0808D3B4
 	.align 2, 0
-_0808D3A4: .4byte gUnknown_203B45C
+_0808D3A4: .4byte gRecruitedPokemonRef
 _0808D3A8:
 	adds r3, 0x1
 	movs r0, 0xCE
@@ -790,7 +790,7 @@ _0808D3CC:
 	adds r0, r3, 0
 	b _0808D3F0
 	.align 2, 0
-_0808D3E0: .4byte gUnknown_203B45C
+_0808D3E0: .4byte gRecruitedPokemonRef
 _0808D3E4:
 	adds r2, 0x58
 	adds r3, 0x58
@@ -826,7 +826,7 @@ _0808D408:
 	adds r0, r3, 0
 	b _0808D42C
 	.align 2, 0
-_0808D41C: .4byte gUnknown_203B45C
+_0808D41C: .4byte gRecruitedPokemonRef
 _0808D420:
 	adds r2, 0x58
 	adds r3, 0x58
@@ -869,7 +869,7 @@ _0808D44C:
 	adds r0, r2, 0
 	b _0808D478
 	.align 2, 0
-_0808D468: .4byte gUnknown_203B45C
+_0808D468: .4byte gRecruitedPokemonRef
 _0808D46C:
 	adds r4, 0x1
 _0808D46E:
@@ -909,7 +909,7 @@ _0808D498:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0808D4A8: .4byte gUnknown_203B45C
+_0808D4A8: .4byte gRecruitedPokemonRef
 _0808D4AC: .4byte 0x0000019d
 	thumb_func_end sub_808D480
 
@@ -955,7 +955,7 @@ _0808D4E4:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0808D4F8: .4byte gUnknown_203B45C
+_0808D4F8: .4byte gRecruitedPokemonRef
 _0808D4FC: .4byte 0x0000fffd
 	thumb_func_end sub_808D4B0
 
@@ -993,7 +993,7 @@ _0808D526:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0808D53C: .4byte gUnknown_203B45C
+_0808D53C: .4byte gRecruitedPokemonRef
 _0808D540: .4byte 0x0000fffd
 	thumb_func_end sub_808D500
 
@@ -1031,7 +1031,7 @@ _0808D56C:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0808D57C: .4byte gUnknown_203B45C
+_0808D57C: .4byte gRecruitedPokemonRef
 	thumb_func_end sub_808D544
 
 	thumb_func_start sub_808D580
@@ -1059,7 +1059,7 @@ _0808D590:
 	adds r5, 0x1
 	b _0808D5BC
 	.align 2, 0
-_0808D5AC: .4byte gUnknown_203B45C
+_0808D5AC: .4byte gRecruitedPokemonRef
 _0808D5B0:
 	adds r4, 0x1
 	adds r2, 0x58
@@ -1197,7 +1197,7 @@ _0808D68C:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0808D6A0: .4byte gUnknown_203B45C
+_0808D6A0: .4byte gRecruitedPokemonRef
 	thumb_func_end sub_808D654
 
 	thumb_func_start sub_808D6A4
@@ -1237,7 +1237,7 @@ _0808D6CE:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0808D6E4: .4byte gUnknown_203B45C
+_0808D6E4: .4byte gRecruitedPokemonRef
 	thumb_func_end sub_808D6A4
 
 	thumb_func_start sub_808D6E8
@@ -1287,7 +1287,7 @@ _0808D728:
 	movs r0, 0x1
 	b _0808D746
 	.align 2, 0
-_0808D740: .4byte gUnknown_203B45C
+_0808D740: .4byte gRecruitedPokemonRef
 _0808D744:
 	movs r0, 0
 _0808D746:
@@ -1361,7 +1361,7 @@ _0808D798:
 	movs r0, 0x1
 	b _0808D7CE
 	.align 2, 0
-_0808D7C8: .4byte gUnknown_203B45C
+_0808D7C8: .4byte gRecruitedPokemonRef
 _0808D7CC:
 	movs r0, 0
 _0808D7CE:
@@ -1391,7 +1391,7 @@ sub_808D7DC:
 	strb r0, [r1, 0x1]
 	bx lr
 	.align 2, 0
-_0808D7FC: .4byte gUnknown_203B45C
+_0808D7FC: .4byte gRecruitedPokemonRef
 	thumb_func_end sub_808D7DC
 
 	thumb_func_start sub_808D800
@@ -1412,7 +1412,7 @@ sub_808D800:
 	strb r1, [r0]
 	bx lr
 	.align 2, 0
-_0808D820: .4byte gUnknown_203B45C
+_0808D820: .4byte gRecruitedPokemonRef
 	thumb_func_end sub_808D800
 
 	thumb_func_start sub_808D824
@@ -1484,7 +1484,7 @@ _0808D888:
 	movs r0, 0x1
 	b _0808D8B4
 	.align 2, 0
-_0808D8A0: .4byte gUnknown_203B45C
+_0808D8A0: .4byte gRecruitedPokemonRef
 _0808D8A4:
 	cmp r4, r0
 	blt _0808D8B2
@@ -1501,282 +1501,5 @@ _0808D8B4:
 	bx r1
 	thumb_func_end sub_808D864
 
-	thumb_func_start CopySpeciesNametoBuffer
-CopySpeciesNametoBuffer:
-	push {lr}
-	lsls r1, 16
-	asrs r1, 16
-	ldr r2, _0808D8DC
-	ldr r3, [r2]
-	lsls r2, r1, 3
-	adds r2, r1
-	lsls r2, 3
-	adds r2, r3
-	ldr r1, [r2]
-	movs r2, 0x14
-	bl strncpy
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808D8DC: .4byte gMonsterParameters
-	thumb_func_end CopySpeciesNametoBuffer
-
-	thumb_func_start sub_808D8E0
-sub_808D8E0:
-	push {r4,lr}
-	lsls r3, r1, 16
-	asrs r3, 16
-	ldr r1, _0808D900
-	ldr r2, _0808D904
-	ldr r4, [r2]
-	lsls r2, r3, 3
-	adds r2, r3
-	lsls r2, 3
-	adds r2, r4
-	ldr r2, [r2]
-	bl sub_800D158
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808D900: .4byte gUnknown_8107600
-_0808D904: .4byte gMonsterParameters
-	thumb_func_end sub_808D8E0
-
-	thumb_func_start sub_808D908
-sub_808D908:
-	push {r4,lr}
-	lsls r3, r1, 16
-	asrs r3, 16
-	ldr r1, _0808D928
-	ldr r2, _0808D92C
-	ldr r4, [r2]
-	lsls r2, r3, 3
-	adds r2, r3
-	lsls r2, 3
-	adds r2, r4
-	ldr r2, [r2]
-	bl sub_800D158
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808D928: .4byte gUnknown_8107608
-_0808D92C: .4byte gMonsterParameters
-	thumb_func_end sub_808D908
-
-	thumb_func_start sub_808D930
-sub_808D930:
-	push {r4-r7,lr}
-	adds r7, r0, 0
-	lsls r1, 16
-	asrs r6, r1, 16
-	adds r0, r6, 0
-	bl sub_808E770
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0xC9
-	bne _0808D970
-	ldr r5, _0808D968
-	movs r0, 0xC9
-	bl GetMonSpecies
-	adds r4, r0, 0
-	adds r0, r6, 0
-	bl sub_808E8C8
-	ldr r1, _0808D96C
-	adds r0, r1
-	ldrb r3, [r0]
-	adds r0, r7, 0
-	adds r1, r5, 0
-	adds r2, r4, 0
-	bl sub_800D158
-	b _0808D986
-	.align 2, 0
-_0808D968: .4byte gUnknown_8107630
-_0808D96C: .4byte gUnknown_8107610
-_0808D970:
-	ldr r1, _0808D98C
-	ldr r0, _0808D990
-	ldr r2, [r0]
-	lsls r0, r6, 3
-	adds r0, r6
-	lsls r0, 3
-	adds r0, r2
-	ldr r2, [r0]
-	adds r0, r7, 0
-	bl sub_800D158
-_0808D986:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808D98C: .4byte gUnknown_8107638
-_0808D990: .4byte gMonsterParameters
-	thumb_func_end sub_808D930
-
-	thumb_func_start GetMonSpecies
-GetMonSpecies:
-	lsls r0, 16
-	asrs r0, 16
-	ldr r1, _0808D9A8
-	ldr r2, [r1]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	ldr r0, [r1]
-	bx lr
-	.align 2, 0
-_0808D9A8: .4byte gMonsterParameters
-	thumb_func_end GetMonSpecies
-
-	thumb_func_start sub_808D9AC
-sub_808D9AC:
-	push {r4,r5,lr}
-	sub sp, 0x14
-	adds r5, r0, 0
-	adds r4, r2, 0
-	adds r1, 0x4C
-	mov r0, sp
-	movs r2, 0xA
-	bl sub_80922B4
-	cmp r4, 0
-	bne _0808D9C4
-	movs r4, 0x5
-_0808D9C4:
-	ldr r1, _0808D9D8
-	adds r0, r5, 0
-	adds r2, r4, 0
-	mov r3, sp
-	bl sub_800D158
-	add sp, 0x14
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808D9D8: .4byte gUnknown_810763C
-	thumb_func_end sub_808D9AC
-
-	thumb_func_start sub_808D9DC
-sub_808D9DC:
-	push {r4,r5,lr}
-	sub sp, 0x14
-	adds r5, r0, 0
-	adds r4, r2, 0
-	adds r1, 0x58
-	mov r0, sp
-	movs r2, 0xA
-	bl sub_80922B4
-	cmp r4, 0
-	bne _0808D9F4
-	movs r4, 0x6
-_0808D9F4:
-	ldr r1, _0808DA08
-	adds r0, r5, 0
-	adds r2, r4, 0
-	mov r3, sp
-	bl sub_800D158
-	add sp, 0x14
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808DA08: .4byte gUnknown_810763C
-	thumb_func_end sub_808D9DC
-
-	thumb_func_start sub_808DA0C
-sub_808DA0C:
-	push {r4,lr}
-	sub sp, 0x14
-	adds r4, r0, 0
-	adds r1, 0x58
-	mov r0, sp
-	movs r2, 0xA
-	bl sub_80922B4
-	ldr r1, _0808DA30
-	adds r0, r4, 0
-	mov r2, sp
-	bl sub_800D158
-	add sp, 0x14
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808DA30: .4byte gUnknown_8107638
-	thumb_func_end sub_808DA0C
-
-	thumb_func_start sub_808DA34
-sub_808DA34:
-	push {lr}
-	adds r1, 0x4C
-	movs r2, 0xA
-	bl sub_80922B4
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808DA34
-
-	thumb_func_start sub_808DA44
-sub_808DA44:
-	push {r4-r6,lr}
-	sub sp, 0x30
-	lsls r0, 16
-	asrs r4, r0, 16
-	lsls r1, 24
-	lsrs r2, r1, 24
-	cmp r2, 0xC
-	bls _0808DAA0
-	mov r1, sp
-	ldr r0, _0808DA98
-	ldm r0!, {r3,r5,r6}
-	stm r1!, {r3,r5,r6}
-	ldm r0!, {r3,r5,r6}
-	stm r1!, {r3,r5,r6}
-	ldm r0!, {r3,r5,r6}
-	stm r1!, {r3,r5,r6}
-	ldm r0!, {r3,r5,r6}
-	stm r1!, {r3,r5,r6}
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	beq _0808DA92
-	mov r1, sp
-	add r3, sp, 0x48
-_0808DA76:
-	movs r5, 0
-	ldrsh r0, [r1, r5]
-	cmp r0, r4
-	bne _0808DA84
-	ldr r0, [r1, 0x4]
-	cmp r0, r2
-	beq _0808DA9C
-_0808DA84:
-	adds r1, 0x8
-	cmp r1, r3
-	bgt _0808DA92
-	movs r6, 0
-	ldrsh r0, [r1, r6]
-	cmp r0, 0
-	bne _0808DA76
-_0808DA92:
-	movs r0, 0
-	b _0808DAA6
-	.align 2, 0
-_0808DA98: .4byte gUnknown_8107654
-_0808DA9C:
-	movs r0, 0x1
-	b _0808DAA6
-_0808DAA0:
-	ldr r0, _0808DAB0
-	adds r0, r2, r0
-	ldrb r0, [r0]
-_0808DAA6:
-	add sp, 0x30
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0808DAB0: .4byte gUnknown_8107645
-	thumb_func_end sub_808DA44
 
 .align 2,0