label pokemon2 and some box stuff

asm/battle_3.s

@@ -8532,7 +8532,7 @@ _08044836:
 	lsls r2, r5, 24
 	lsrs r2, 24
 	adds r0, r6, 0
-	bl CalcPPWithPPUps
+	bl CalculatePPWithBonus
 	lsls r0, 24
 	lsrs r2, r0, 24
 	add r0, sp, 0x4

asm/battle_4.s

@@ -12196,7 +12196,7 @@ _0804C93E:
 	ldrh r0, [r1]
 	ldrb r1, [r1, 0x17]
 	lsrs r1, 7
-	bl sub_806B694
+	bl GetAbilityBySpecies
 	ldrb r1, [r6]
 	muls r1, r7
 	adds r1, r4
@@ -15016,7 +15016,7 @@ _0804E274:
 	adds r0, r1, 0
 	adds r0, r7
 	adds r1, r5, 0
-	bl sub_806B9A8
+	bl RemoveMonPPBonus
 	ldr r0, [r6]
 	ldrb r0, [r0, 0x10]
 	mov r1, r8
@@ -15052,7 +15052,7 @@ _0804E274:
 	bne _0804E30A
 	adds r0, r4, 0
 	adds r1, r5, 0
-	bl sub_806B9E4
+	bl RemoveBattleMonPPBonus
 	ldrh r1, [r7]
 	adds r0, r4, 0
 	adds r2, r5, 0
@@ -15095,7 +15095,7 @@ _0804E30A:
 	adds r4, 0xB0
 	adds r0, r4, 0
 	adds r1, r5, 0
-	bl sub_806B9E4
+	bl RemoveBattleMonPPBonus
 	ldr r0, =gMoveToLearn
 	ldrh r1, [r0]
 	adds r0, r4, 0
@@ -16800,7 +16800,7 @@ sub_804F220: @ 804F220
 	ldrb r0, [r0, 0x10]
 	muls r0, r5
 	adds r0, r4
-	bl pokemon_get_gender
+	bl GetMonGender
 	lsls r0, 24
 	lsrs r7, r0, 24
 	ldr r0, [r6]
@@ -24630,7 +24630,7 @@ _08053600:
 _08053618:
 	adds r0, r5, 0
 	adds r1, r4, 0
-	bl sub_806B694
+	bl GetAbilityBySpecies
 	lsls r0, 24
 	lsrs r0, 24
 _08053624:
@@ -30099,7 +30099,7 @@ _08056564:
 	ldr r2, =gLastUsedItem
 	movs r1, 0x26
 	bl SetMonData
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x6
@@ -30167,7 +30167,7 @@ _08056614:
 	movs r1, 0x26
 	adds r2, r5, 0
 	bl SetMonData
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x6
@@ -30219,7 +30219,7 @@ atkF0_copy_caught_poke: @ 80566A8
 	ldr r1, =gEnemyParty
 	mov r8, r1
 	add r0, r8
-	bl pokemon_catch
+	bl GiveMonToPlayer
 	lsls r0, 24
 	cmp r0, 0
 	beq _08056792
@@ -30970,7 +30970,7 @@ _08056D0A:
 	muls r1, r0
 	adds r0, r1, 0
 	add r0, r8
-	bl pokemon_get_gender
+	bl GetMonGender
 	adds r5, r0, 0
 	lsls r5, 24
 	lsrs r5, 24
@@ -31035,7 +31035,7 @@ _08056DD4:
 	b _08056E48
 	.pool
 _08056E2C:
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x6

asm/battle_5.s

@@ -96,7 +96,7 @@ _08056F3E:
 	adds r1, r0
 	ldr r0, [r2]
 	adds r0, r1
-	bl create_enemy_party
+	bl CreateSecretBaseEnemyParty
 _08056FFA:
 	pop {r4-r6}
 	pop {r0}

asm/battle_controller_opponent.s

@@ -4201,7 +4201,7 @@ sub_8061690: @ 8061690
 	ands r0, r2
 	cmp r0, 0
 	beq _080616B0
-	bl sub_806B830
+	bl GetSecretBaseTrainerPicIndex
 	b _0806175A
 	.pool
 _080616B0:
@@ -4448,7 +4448,7 @@ sub_80618D8: @ 80618D8
 	ands r0, r2
 	cmp r0, 0
 	beq _080618F8
-	bl sub_806B830
+	bl GetSecretBaseTrainerPicIndex
 	b _080619A2
 	.pool
 _080618F8:

asm/battle_message.s

@@ -1716,7 +1716,7 @@ _0814F0D8:
 	ands r0, r1
 	cmp r0, 0
 	beq _0814F0F0
-	bl sub_806B870
+	bl GetSecretBaseTrainerNameIndex
 	b _0814F59C
 	.pool
 _0814F0F0:

asm/braille_puzzles.s

@@ -91,7 +91,7 @@ sub_81796AC: @ 81796AC
 	lsls r1, 1
 	cmp r0, r1
 	bne _081796F4
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	ldr r0, =gPlayerPartyCount
 	ldrb r1, [r0]
 	movs r0, 0x64

asm/daycare.s

@@ -226,7 +226,7 @@ _0806FBBC:
 	movs r2, 0x50
 	bl memcpy
 	adds r0, r5, 0
-	bl pokemon_restore_pp
+	bl RestoreBoxMonMovesPP
 	adds r1, r5, 0
 	adds r1, 0x88
 	movs r0, 0
@@ -234,7 +234,7 @@ _0806FBBC:
 	adds r0, r6, 0
 	bl ZeroMonData
 	bl party_compaction
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	pop {r4-r6}
 	pop {r0}
 	bx r0
@@ -433,7 +433,7 @@ _0806FD74:
 	movs r0, 0
 	str r0, [r1]
 	bl party_compaction
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	adds r0, r7, 0
 	add sp, 0x68
 	pop {r4-r7}
@@ -829,7 +829,7 @@ _08070090:
 	movs r0, 0x8C
 	muls r0, r4
 	adds r0, r6, r0
-	bl pokemon_roll_gender
+	bl GetBoxMonGender
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0xFE
@@ -1795,7 +1795,7 @@ _080707FE:
 	b _0807083E
 _08070826:
 	adds r0, r5, 0
-	bl pokemon_roll_gender
+	bl GetBoxMonGender
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0xFE
@@ -1856,7 +1856,7 @@ _0807088C:
 	movs r0, 0x8C
 	muls r0, r1
 	adds r0, r7, r0
-	bl pokemon_roll_gender
+	bl GetBoxMonGender
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0xFE
@@ -1928,7 +1928,7 @@ _08070918:
 	movs r2, 0x64
 	bl memcpy
 	bl party_compaction
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	adds r0, r6, 0
 	bl sub_8070710
 	add sp, 0x6C
@@ -2751,7 +2751,7 @@ sub_8070F98: @ 8070F98
 	push {r4,lr}
 	adds r4, r0, 0
 	adds r0, r1, 0
-	bl pokemon_roll_gender
+	bl GetBoxMonGender
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24

asm/egg_hatch.s

@@ -1104,7 +1104,7 @@ _08071D3C:
 	ldrb r0, [r0, 0x4]
 	muls r0, r6
 	adds r0, r5
-	bl pokemon_get_gender
+	bl GetMonGender
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -1735,7 +1735,7 @@ sub_8072214: @ 8072214
 	thumb_func_start sub_807228C
 sub_807228C: @ 807228C
 	push {r4-r6,lr}
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r6, r0, 24
 	movs r5, 0

asm/evolution_scene.s

@@ -1044,7 +1044,7 @@ _0813E416:
 	mov r9, r0
 	ldr r1, [sp, 0x4]
 	movs r2, 0x64
-	bl memcpy_pokemon
+	bl CopyMon
 	ldrb r0, [r6]
 	muls r0, r5
 	adds r0, r4
@@ -1131,7 +1131,7 @@ _0813E4A0:
 	muls r0, r6
 	adds r0, r5
 	bl CalculateMonStats
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	ldr r0, =gEvolutionTable
 	mov r4, r8
 	add r4, r10
@@ -2317,7 +2317,7 @@ _0813F014:
 	lsrs r4, 24
 	mov r0, r9
 	adds r1, r4, 0
-	bl sub_806B9A8
+	bl RemoveMonPPBonus
 	ldr r0, =gMoveToLearn
 	ldrh r1, [r0]
 	mov r0, r9
@@ -3470,7 +3470,7 @@ _0813FB3C:
 	lsrs r4, 24
 	mov r0, r9
 	adds r1, r4, 0
-	bl sub_806B9A8
+	bl RemoveMonPPBonus
 	ldr r0, =gMoveToLearn
 	ldrh r1, [r0]
 	mov r0, r9

asm/field_effect.s

@@ -897,7 +897,7 @@ sub_80B6128: @ 80B6128
 	thumb_func_start sub_80B61A0
 sub_80B61A0: @ 80B61A0
 	push {r4,lr}
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -1071,7 +1071,7 @@ _080B62E6:
 	thumb_func_start sub_80B62F4
 sub_80B62F4: @ 80B62F4
 	push {r4,lr}
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24

asm/item_use.s

@@ -2357,7 +2357,7 @@ ItemUseInBattle_PokeBall: @ 80FE394
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r5, r4, 0
-	bl sub_806B8B0
+	bl PlayerPartyAndPokemonStorageFull
 	lsls r0, 24
 	cmp r0, 0
 	bne _080FE3D0

asm/link.s

@@ -33411,7 +33411,7 @@ _0801AB1E:
 	ble _0801AB1E
 	movs r0, 0x32
 	bl IncrementGameStat
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	ldr r0, =gTrainerBattleOpponent_A
 	movs r2, 0xC0
 	lsls r2, 4

asm/mystery_event_script.s

@@ -730,7 +730,7 @@ _08153D86:
 	bl sub_80D460C
 _08153DA4:
 	bl party_compaction
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	ldr r0, =gStringVar4
 	ldr r1, =gUnknown_08674BF0
 	bl StringExpandPlaceholders

asm/naming_screen.s

@@ -730,7 +730,7 @@ pokemon_store: @ 80E33D8
 	ldrb r0, [r0]
 	cmp r0, 0x2
 	bne _080E342C
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x5

asm/player_pc.s

@@ -1484,7 +1484,7 @@ sub_816BABC: @ 816BABC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	cmp r0, 0
 	bne _0816BAD4

asm/pokemon_2.s

@@ -228,18 +228,18 @@ _08069FA6:
 	bx r1
 	thumb_func_end sub_8069F34
 
-	thumb_func_start pokemon_get_gender
+	thumb_func_start GetMonGender
-pokemon_get_gender: @ 8069FB4
+GetMonGender: @ 8069FB4
 	push {lr}
-	bl pokemon_roll_gender
+	bl GetBoxMonGender
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r1}
 	bx r1
-	thumb_func_end pokemon_get_gender
+	thumb_func_end GetMonGender
 
-	thumb_func_start pokemon_roll_gender
+	thumb_func_start GetBoxMonGender
-pokemon_roll_gender: @ 8069FC4
+GetBoxMonGender: @ 8069FC4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0xB
@@ -286,7 +286,7 @@ _0806A01A:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end pokemon_roll_gender
+	thumb_func_end GetBoxMonGender
 
 	thumb_func_start GetGenderFromSpeciesAndPersonality
 GetGenderFromSpeciesAndPersonality: @ 806A020
@@ -568,9 +568,9 @@ _0806A232:
 	bx r0
 	thumb_func_end EncryptBoxMon
 
-	thumb_func_start pokemon_decrypt
+	thumb_func_start DecryptBoxMon
-@ void pokemon_decrypt(pokemon *mon)
+@ void DecryptBoxMon(pokemon *mon)
-pokemon_decrypt: @ 806A24C
+DecryptBoxMon: @ 806A24C
 	push {r4,lr}
 	adds r3, r0, 0
 	movs r4, 0
@@ -590,7 +590,7 @@ _0806A256:
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end pokemon_decrypt
+	thumb_func_end DecryptBoxMon
 
 	thumb_func_start GetSubstruct
 @ int GetSubstruct(pokemon *mon, int a2, u8 a3)
@@ -1179,7 +1179,7 @@ GetBoxMonData: @ 806A674
 	bl GetSubstruct
 	adds r5, r0, 0
 	mov r0, r8
-	bl pokemon_decrypt
+	bl DecryptBoxMon
 	mov r0, r8
 	bl CalculateBoxMonChecksum
 	lsls r0, 16
@@ -2101,7 +2101,7 @@ SetBoxMonData: @ 806AD9C
 	bl GetSubstruct
 	adds r5, r0, 0
 	adds r0, r7, 0
-	bl pokemon_decrypt
+	bl DecryptBoxMon
 	adds r0, r7, 0
 	bl CalculateBoxMonChecksum
 	lsls r0, 16
@@ -2865,18 +2865,18 @@ _0806B3EC:
 	.pool
 	thumb_func_end SetBoxMonData
 
-	thumb_func_start memcpy_pokemon
+	thumb_func_start CopyMon
-@ void *memcpy_pokemon(void *dest, void *src, unsigned int size)
+@ void *CopyMon(void *dest, void *src, unsigned int size)
-memcpy_pokemon: @ 806B408
+CopyMon: @ 806B408
 	push {lr}
 	bl memcpy
 	pop {r0}
 	bx r0
-	thumb_func_end memcpy_pokemon
+	thumb_func_end CopyMon
 
-	thumb_func_start pokemon_catch
+	thumb_func_start GiveMonToPlayer
-@ int pokemon_catch(pokemon *mon)
+@ int GiveMonToPlayer(pokemon *mon)
-pokemon_catch: @ 806B414
+GiveMonToPlayer: @ 806B414
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldr r4, =gSaveBlock2Ptr
@@ -2915,7 +2915,7 @@ _0806B446:
 	adds r0, r4, 0
 	adds r1, r6, 0
 	movs r2, 0x64
-	bl memcpy_pokemon
+	bl CopyMon
 	ldr r1, =gPlayerPartyCount
 	adds r0, r5, 0x1
 	strb r0, [r1]
@@ -2924,18 +2924,18 @@ _0806B446:
 	.pool
 _0806B480:
 	adds r0, r6, 0
-	bl pokemon_add_to_pc
+	bl SendMonToPC
 	lsls r0, 24
 	lsrs r0, 24
 _0806B48A:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end pokemon_catch
+	thumb_func_end GiveMonToPlayer
 
-	thumb_func_start pokemon_add_to_pc
+	thumb_func_start SendMonToPC
-@ int pokemon_add_to_pc(pokemon *mon)
+@ int SendMonToPC(pokemon *mon)
-pokemon_add_to_pc: @ 806B490
+SendMonToPC: @ 806B490
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -2967,7 +2967,7 @@ _0806B4B2:
 	adds r0, r4, 0
 	mov r1, r8
 	movs r2, 0x50
-	bl memcpy_pokemon
+	bl CopyMon
 	ldr r0, =gSpecialVar_0x8012
 	strh r5, [r0]
 	ldr r0, =gSpecialVar_0x8013
@@ -3008,11 +3008,11 @@ _0806B530:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end pokemon_add_to_pc
+	thumb_func_end SendMonToPC
 
-	thumb_func_start calc_player_party_count
+	thumb_func_start CalculatePlayerPartyCount
-@ u8 calc_player_party_count()
+@ u8 CalculatePlayerPartyCount()
-calc_player_party_count: @ 806B53C
+CalculatePlayerPartyCount: @ 806B53C
 	push {r4,lr}
 	ldr r0, =gPlayerPartyCount
 	movs r1, 0
@@ -3045,11 +3045,11 @@ _0806B572:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end calc_player_party_count
+	thumb_func_end CalculatePlayerPartyCount
 
-	thumb_func_start calc_enemy_party_count
+	thumb_func_start CalculateEnemyPartyCount
-@ u8 calc_enemy_party_count()
+@ u8 CalculateEnemyPartyCount()
-calc_enemy_party_count: @ 806B580
+CalculateEnemyPartyCount: @ 806B580
 	push {r4,lr}
 	ldr r0, =gUnknown_020244EA
 	movs r1, 0
@@ -3082,13 +3082,13 @@ _0806B5B6:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end calc_enemy_party_count
+	thumb_func_end CalculateEnemyPartyCount
 
-	thumb_func_start sub_806B5C4
+	thumb_func_start GetMonsStateToDoubles
-sub_806B5C4: @ 806B5C4
+GetMonsStateToDoubles: @ 806B5C4
 	push {r4-r6,lr}
 	movs r6, 0
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	ldr r1, =gPlayerPartyCount
 	ldrb r0, [r1]
 	cmp r0, 0x1
@@ -3140,11 +3140,11 @@ _0806B628:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end sub_806B5C4
+	thumb_func_end GetMonsStateToDoubles
 
-	thumb_func_start CheckPlayerPartySize
+	thumb_func_start GetMonsStateToDoubles_2
-@ u8 CheckPlayerPartySize()
+@ u8 GetMonsStateToDoubles_2()
-CheckPlayerPartySize: @ 806B638
+GetMonsStateToDoubles_2: @ 806B638
 	push {r4-r6,lr}
 	movs r6, 0
 	movs r5, 0
@@ -3190,11 +3190,11 @@ _0806B68C:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end CheckPlayerPartySize
+	thumb_func_end GetMonsStateToDoubles_2
 
-	thumb_func_start sub_806B694
+	thumb_func_start GetAbilityBySpecies
-@ int sub_806B694(u16 a1, int a2)
+@ int GetAbilityBySpecies(u16 a1, int a2)
-sub_806B694: @ 806B694
+GetAbilityBySpecies: @ 806B694
 	push {lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
@@ -3224,7 +3224,7 @@ _0806B6C6:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end sub_806B694
+	thumb_func_end GetAbilityBySpecies
 
 	thumb_func_start GetMonAbility
 @ u8 GetMonAbility(pokemon *mon)
@@ -3245,7 +3245,7 @@ GetMonAbility: @ 806B6D8
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_806B694
+	bl GetAbilityBySpecies
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r4,r5}
@@ -3253,8 +3253,8 @@ GetMonAbility: @ 806B6D8
 	bx r1
 	thumb_func_end GetMonAbility
 
-	thumb_func_start create_enemy_party
+	thumb_func_start CreateSecretBaseEnemyParty
-create_enemy_party: @ 806B70C
+CreateSecretBaseEnemyParty: @ 806B70C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -3392,12 +3392,12 @@ _0806B80A:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end create_enemy_party
+	thumb_func_end CreateSecretBaseEnemyParty
 
-	thumb_func_start sub_806B830
+	thumb_func_start GetSecretBaseTrainerPicIndex
-sub_806B830: @ 806B830
+GetSecretBaseTrainerPicIndex: @ 806B830
 	push {r4,r5,lr}
-	ldr r5, =gUnknown_08329EB8
+	ldr r5, =gSecretBaseTrainerClasses
 	ldr r0, =gBattleResources
 	ldr r0, [r0]
 	ldr r4, [r0]
@@ -3421,12 +3421,12 @@ sub_806B830: @ 806B830
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end sub_806B830
+	thumb_func_end GetSecretBaseTrainerPicIndex
 
-	thumb_func_start sub_806B870
+	thumb_func_start GetSecretBaseTrainerNameIndex
-sub_806B870: @ 806B870
+GetSecretBaseTrainerNameIndex: @ 806B870
 	push {r4,r5,lr}
-	ldr r5, =gUnknown_08329EB8
+	ldr r5, =gSecretBaseTrainerClasses
 	ldr r0, =gBattleResources
 	ldr r0, [r0]
 	ldr r4, [r0]
@@ -3450,10 +3450,10 @@ sub_806B870: @ 806B870
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end sub_806B870
+	thumb_func_end GetSecretBaseTrainerNameIndex
 
-	thumb_func_start sub_806B8B0
+	thumb_func_start PlayerPartyAndPokemonStorageFull
-sub_806B8B0: @ 806B8B0
+PlayerPartyAndPokemonStorageFull: @ 806B8B0
 	push {r4,lr}
 	movs r4, 0
 _0806B8B4:
@@ -3473,17 +3473,17 @@ _0806B8D0:
 	adds r4, 0x1
 	cmp r4, 0x5
 	ble _0806B8B4
-	bl sub_806B8E4
+	bl PokemonStorageFull
 	lsls r0, 24
 	lsrs r0, 24
 _0806B8DE:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_806B8B0
+	thumb_func_end PlayerPartyAndPokemonStorageFull
 
-	thumb_func_start sub_806B8E4
+	thumb_func_start PokemonStorageFull
-sub_806B8E4: @ 806B8E4
+PokemonStorageFull: @ 806B8E4
 	push {r4-r6,lr}
 	movs r6, 0
 _0806B8E8:
@@ -3494,7 +3494,7 @@ _0806B8EC:
 	lsrs r1, 24
 	lsrs r0, r5, 24
 	movs r2, 0xB
-	bl get_pokemon_data_from_any_box
+	bl GetBoxMonDataFromAnyBox
 	cmp r0, 0
 	bne _0806B900
 	movs r0, 0
@@ -3511,7 +3511,7 @@ _0806B90E:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_806B8E4
+	thumb_func_end PokemonStorageFull
 
 	thumb_func_start GetSpeciesName
 @ void GetSpeciesName(u8 *dest, u16 speciesId)
@@ -3559,9 +3559,9 @@ _0806B954:
 	bx r0
 	thumb_func_end GetSpeciesName
 
-	thumb_func_start CalcPPWithPPUps
+	thumb_func_start CalculatePPWithBonus
-@ u16 CalcPPWithPPUps(u16 moveId, s32 ppUpCounts, u8 monMoveIndex)
+@ u16 CalculatePPWithBonus(u16 moveId, s32 ppUpCounts, u8 monMoveIndex)
-CalcPPWithPPUps: @ 806B960
+CalculatePPWithBonus: @ 806B960
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -3593,10 +3593,10 @@ CalcPPWithPPUps: @ 806B960
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end CalcPPWithPPUps
+	thumb_func_end CalculatePPWithBonus
 
-	thumb_func_start sub_806B9A8
+	thumb_func_start RemoveMonPPBonus
-sub_806B9A8: @ 806B9A8
+RemoveMonPPBonus: @ 806B9A8
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -3624,10 +3624,10 @@ sub_806B9A8: @ 806B9A8
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_806B9A8
+	thumb_func_end RemoveMonPPBonus
 
-	thumb_func_start sub_806B9E4
+	thumb_func_start RemoveBattleMonPPBonus
-sub_806B9E4: @ 806B9E4
+RemoveBattleMonPPBonus: @ 806B9E4
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, 0x3B
@@ -3639,10 +3639,10 @@ sub_806B9E4: @ 806B9E4
 	strb r1, [r0]
 	bx lr
 	.pool
-	thumb_func_end sub_806B9E4
+	thumb_func_end RemoveBattleMonPPBonus
 
-	thumb_func_start battle_data_fill
+	thumb_func_start CopyPlayerPartyMonToBattleData
-battle_data_fill: @ 806B9FC
+CopyPlayerPartyMonToBattleData: @ 806B9FC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -3925,7 +3925,7 @@ _0806BA4E:
 	ldrh r0, [r7]
 	ldrb r1, [r7, 0x17]
 	lsrs r1, 7
-	bl sub_806B694
+	bl GetAbilityBySpecies
 	adds r1, r7, 0
 	adds r1, 0x20
 	strb r0, [r1]
@@ -3987,6 +3987,6 @@ _0806BCB2:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end battle_data_fill
+	thumb_func_end CopyPlayerPartyMonToBattleData
 
 	.align 2, 0 @ Don't pad with nop.

asm/pokemon_3.s

@@ -757,7 +757,7 @@ _0806C300:
 	lsrs r1, 24
 	adds r0, r4, 0
 	ldr r2, [sp, 0x14]
-	bl CalcPPWithPPUps
+	bl CalculatePPWithBonus
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [sp, 0x2C]
@@ -791,7 +791,7 @@ _0806C300:
 	lsls r1, 24
 	lsrs r1, 24
 	ldr r2, [sp, 0x14]
-	bl CalcPPWithPPUps
+	bl CalculatePPWithBonus
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r3, [sp, 0x2C]
@@ -981,7 +981,7 @@ _0806C4FC:
 	lsls r1, 24
 	lsrs r1, 24
 	ldr r0, [sp, 0x38]
-	bl battle_data_fill
+	bl CopyPlayerPartyMonToBattleData
 	ldr r0, =gActiveBank
 	ldrb r0, [r0]
 	b _0806C574
@@ -1216,7 +1216,7 @@ _0806C714:
 	lsrs r6, r0, 24
 	adds r0, r4, 0
 	adds r2, r6, 0
-	bl CalcPPWithPPUps
+	bl CalculatePPWithBonus
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, [sp]
@@ -1244,7 +1244,7 @@ _0806C714:
 	lsrs r1, 24
 	adds r0, r4, 0
 	adds r2, r6, 0
-	bl CalcPPWithPPUps
+	bl CalculatePPWithBonus
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, [sp]
@@ -1266,7 +1266,7 @@ _0806C714:
 	lsrs r1, 24
 	adds r0, r4, 0
 	adds r2, r6, 0
-	bl CalcPPWithPPUps
+	bl CalculatePPWithBonus
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [sp]
@@ -1361,7 +1361,7 @@ _0806C858:
 	lsrs r1, 24
 	adds r0, r4, 0
 	ldr r2, [sp, 0x14]
-	bl CalcPPWithPPUps
+	bl CalculatePPWithBonus
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, [sp]
@@ -1395,7 +1395,7 @@ _0806C8A0:
 	lsrs r1, 24
 	adds r0, r4, 0
 	ldr r2, [sp, 0x14]
-	bl CalcPPWithPPUps
+	bl CalculatePPWithBonus
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, [sp]
@@ -1417,7 +1417,7 @@ _0806C8A0:
 	lsrs r1, 24
 	adds r0, r4, 0
 	ldr r2, [sp, 0x14]
-	bl CalcPPWithPPUps
+	bl CalculatePPWithBonus
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [sp]
@@ -1651,7 +1651,7 @@ _0806CAB8:
 	lsrs r1, 24
 	adds r0, r4, 0
 	ldr r2, [sp, 0x14]
-	bl CalcPPWithPPUps
+	bl CalculatePPWithBonus
 	lsls r0, 24
 	lsrs r5, r0, 24
 	ldr r0, [sp]
@@ -1696,7 +1696,7 @@ _0806CB10:
 	lsls r1, 24
 	lsrs r1, 24
 	ldr r2, [sp, 0x14]
-	bl CalcPPWithPPUps
+	bl CalculatePPWithBonus
 	lsls r0, 24
 	lsrs r0, 24
 	subs r0, r5
@@ -5536,13 +5536,13 @@ _0806E91E:
 	thumb_func_start RestoreMonMovesPP
 RestoreMonMovesPP: @ 806E924
 	push {lr}
-	bl pokemon_restore_pp
+	bl RestoreBoxMonMovesPP
 	pop {r0}
 	bx r0
 	thumb_func_end RestoreMonMovesPP
 
-	thumb_func_start pokemon_restore_pp
+	thumb_func_start RestoreBoxMonMovesPP
-pokemon_restore_pp: @ 806E930
+RestoreBoxMonMovesPP: @ 806E930
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r5, r0, 0
@@ -5573,7 +5573,7 @@ _0806E938:
 	lsls r2, r6, 24
 	lsrs r2, 24
 	adds r0, r4, 0
-	bl CalcPPWithPPUps
+	bl CalculatePPWithBonus
 	mov r1, sp
 	strb r0, [r1]
 	adds r1, r6, 0
@@ -5589,7 +5589,7 @@ _0806E984:
 	pop {r4-r6}
 	pop {r0}
 	bx r0
-	thumb_func_end pokemon_restore_pp
+	thumb_func_end RestoreBoxMonMovesPP
 
 	thumb_func_start sub_806E994
 sub_806E994: @ 806E994

asm/rom4.s

@@ -2592,7 +2592,7 @@ _08085A88:
 _08085AA4:
 	movs r0, 0x1
 	mov r9, r0
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r0, 24
 	mov r8, r0

asm/rom6.s

@@ -7676,7 +7676,7 @@ sub_81394D8: @ 81394D8
 	bl sub_8133EDC
 	lsls r0, 16
 	lsrs r6, r0, 16
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r5, r0, 24
 	movs r4, 0
@@ -7885,7 +7885,7 @@ _08139684:
 	thumb_func_start sub_8139688
 sub_8139688: @ 8139688
 	push {r4-r6,lr}
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r6, r0, 24
 	movs r5, 0
@@ -8204,7 +8204,7 @@ _081398FC:
 	thumb_func_start sub_813990C
 sub_813990C: @ 813990C
 	push {r4,r5,lr}
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r5, r0, 24
 	movs r4, 0

asm/rom_8034C54.s

@@ -5139,7 +5139,7 @@ _08037A12:
 	bl GetMonData
 	str r0, [r6, 0x18]
 	adds r0, r4, 0
-	bl pokemon_get_gender
+	bl GetMonGender
 	strb r0, [r6, 0x1C]
 	adds r0, r7, 0
 	bl StripExtCtrlCodes
@@ -11038,7 +11038,7 @@ _0803AD0E:
 	ldrh r0, [r1]
 	ldrb r1, [r1, 0x17]
 	lsrs r1, 7
-	bl sub_806B694
+	bl GetAbilityBySpecies
 	mov r2, r9
 	ldrb r1, [r2]
 	muls r1, r7
@@ -13364,7 +13364,7 @@ _0803C1CA:
 	ldrb r1, [r1]
 	lsls r2, r4, 24
 	lsrs r2, 24
-	bl CalcPPWithPPUps
+	bl CalculatePPWithBonus
 	mov r2, r10
 	adds r1, r2, r4
 	strb r0, [r1]
@@ -13612,7 +13612,7 @@ _0803C42E:
 	b _0803C6C4
 	.pool
 _0803C440:
-	bl sub_806B8B0
+	bl PlayerPartyAndPokemonStorageFull
 	lsls r0, 24
 	cmp r0, 0
 	bne _0803C44C

asm/rom_8072304.s

@@ -3774,7 +3774,7 @@ sub_80741E8: @ 80741E8
 	bl StringAppend
 	adds r5, r0, 0
 	adds r0, r4, 0
-	bl pokemon_get_gender
+	bl GetMonGender
 	lsls r0, 24
 	lsrs r6, r0, 24
 	adds r0, r4, 0

asm/rom_80C6FA0.s

@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_80C6FA0
+	thumb_func_start CountMonsInBox
-sub_80C6FA0: @ 80C6FA0
+CountMonsInBox: @ 80C6FA0
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -17,7 +17,7 @@ _080C6FAA:
 	lsrs r1, 24
 	adds r0, r6, 0
 	movs r2, 0xB
-	bl get_pokemon_data_from_any_box
+	bl GetBoxMonDataFromAnyBox
 	cmp r0, 0
 	beq _080C6FC0
 	adds r0, r5, 0x1
@@ -34,7 +34,7 @@ _080C6FC0:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80C6FA0
+	thumb_func_end CountMonsInBox
 
 	thumb_func_start sub_80C6FD4
 sub_80C6FD4: @ 80C6FD4
@@ -47,7 +47,7 @@ _080C6FDC:
 	lsrs r1, 24
 	adds r0, r5, 0
 	movs r2, 0xB
-	bl get_pokemon_data_from_any_box
+	bl GetBoxMonDataFromAnyBox
 	cmp r0, 0
 	bne _080C6FF2
 	lsls r0, r4, 16
@@ -1572,7 +1572,7 @@ sub_80C7BE4: @ 80C7BE4
 	ldr r0, [r1]
 	adds r0, r4
 	ldrb r0, [r0]
-	bl sub_80C6FA0
+	bl CountMonsInBox
 	adds r5, r0, 0
 	lsls r5, 24
 	lsrs r5, 24
@@ -3381,7 +3381,7 @@ _080C8CB0:
 	.4byte _080C8D48
 	.4byte _080C8D68
 _080C8CC8:
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x6
@@ -5189,7 +5189,7 @@ _080C9CE4:
 	cmp r4, 0
 	bne _080C9D08
 	bl sub_80CABE0
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	ldr r1, =gPlayerPartyCount
 	strb r0, [r1]
 	ldr r0, =gUnknown_02039D08
@@ -5321,7 +5321,7 @@ _080C9E18:
 	cmp r4, 0
 	bne _080C9E3C
 	bl sub_80CABE0
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	ldr r1, =gPlayerPartyCount
 	strb r0, [r1]
 	ldr r0, =gUnknown_02039D08
@@ -5484,7 +5484,7 @@ _080C9FAC:
 	adds r0, r1, 0
 	movs r1, 0xC
 	mov r2, sp
-	bl set_pokemon_data_from_selected_box
+	bl SetBoxMonDataFromSelectedBox
 _080C9FB6:
 	mov r0, sp
 	ldrh r0, [r0]
@@ -7407,7 +7407,7 @@ _080CB048:
 	mov r0, r9
 	adds r1, r6, 0
 	movs r2, 0x41
-	bl get_pokemon_data_from_any_box
+	bl GetBoxMonDataFromAnyBox
 	lsls r0, 16
 	lsrs r4, r0, 16
 	cmp r4, 0
@@ -7415,7 +7415,7 @@ _080CB048:
 	mov r0, r9
 	adds r1, r6, 0
 	movs r2, 0
-	bl get_pokemon_data_from_any_box
+	bl GetBoxMonDataFromAnyBox
 	adds r1, r0, 0
 	lsls r2, r5, 1
 	adds r2, r5
@@ -7491,7 +7491,7 @@ _080CB0F6:
 	mov r0, r9
 	adds r1, r6, 0
 	movs r2, 0xC
-	bl get_pokemon_data_from_any_box
+	bl GetBoxMonDataFromAnyBox
 	cmp r0, 0
 	bne _080CB11C
 	ldr r0, =gUnknown_02039D08
@@ -7534,7 +7534,7 @@ sub_80CB140: @ 80CB140
 	lsrs r7, r0, 24
 	adds r0, r7, 0
 	movs r1, 0x41
-	bl get_pokemon_data_from_selected_box
+	bl GetBoxMonDataFromSelectedBox
 	lsls r0, 16
 	lsrs r0, 16
 	mov r8, r0
@@ -7567,7 +7567,7 @@ sub_80CB140: @ 80CB140
 	lsrs r4, 16
 	adds r0, r7, 0
 	movs r1, 0
-	bl get_pokemon_data_from_selected_box
+	bl GetBoxMonDataFromSelectedBox
 	adds r1, r0, 0
 	movs r0, 0x2
 	str r0, [sp]
@@ -7923,7 +7923,7 @@ _080CB3F8:
 	ldrb r0, [r0]
 	adds r1, r5, 0
 	movs r2, 0xC
-	bl get_pokemon_data_from_any_box
+	bl GetBoxMonDataFromAnyBox
 	cmp r0, 0
 	bne _080CB486
 	mov r2, r10
@@ -8235,7 +8235,7 @@ _080CB70A:
 	adds r0, r6, 0
 	adds r1, r4, 0
 	movs r2, 0x41
-	bl get_pokemon_data_from_any_box
+	bl GetBoxMonDataFromAnyBox
 	mov r2, r9
 	ldr r1, [r2]
 	lsls r2, r5, 1
@@ -8249,7 +8249,7 @@ _080CB70A:
 	adds r0, r6, 0
 	adds r1, r4, 0
 	movs r2, 0
-	bl get_pokemon_data_from_any_box
+	bl GetBoxMonDataFromAnyBox
 	mov r2, r9
 	ldr r1, [r2]
 	lsls r2, r5, 2
@@ -11920,7 +11920,7 @@ _080CD538:
 	ldr r0, =gUnknown_02039D79
 	ldrb r0, [r0]
 	movs r1, 0xB
-	bl get_pokemon_data_from_selected_box
+	bl GetBoxMonDataFromSelectedBox
 _080CD542:
 	lsls r0, 16
 	lsrs r0, 16
@@ -12662,7 +12662,7 @@ sub_80CDBA0: @ 80CDBA0
 	b _080CDBC2
 	.pool
 _080CDBB4:
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r3, r0, 24
 	cmp r3, 0x5
@@ -13284,12 +13284,12 @@ _080CE0C0:
 	ldr r0, [r5]
 	ldr r4, =0x000020a4
 	adds r0, r4
-	bl pokemon_restore_pp
+	bl RestoreBoxMonMovesPP
 	ldr r2, [r5]
 	adds r2, r4
 	adds r0, r6, 0
 	adds r1, r7, 0
-	bl sub_80D1F18
+	bl CopyBoxMonFromAnyBox
 _080CE0D8:
 	pop {r4-r7}
 	pop {r0}
@@ -13947,7 +13947,7 @@ _080CE696:
 	adds r2, 0x7
 	adds r3, r2
 	movs r2, 0x51
-	bl sub_80D1ED0
+	bl GetAndCopyBoxMonDataFromAnyBox
 	lsls r0, 16
 	lsrs r4, r0, 16
 	cmp r4, 0
@@ -14323,7 +14323,7 @@ _080CEA08:
 	ldrb r0, [r0]
 	movs r1, 0x8
 	mov r2, sp
-	bl set_pokemon_data_from_selected_box
+	bl SetBoxMonDataFromSelectedBox
 _080CEA1C:
 	add sp, 0x4
 	pop {r4}
@@ -14662,7 +14662,7 @@ _080CEC86:
 	adds r1, r2
 	str r0, [r1]
 	adds r0, r6, 0
-	bl pokemon_get_gender
+	bl GetMonGender
 	lsls r0, 24
 	lsrs r0, 24
 	mov r9, r0
@@ -17899,12 +17899,12 @@ sub_80D07B0: @ 80D07B0
 	lsrs r4, 24
 	adds r0, r4, 0
 	movs r1, 0x41
-	bl get_pokemon_data_from_selected_box
+	bl GetBoxMonDataFromSelectedBox
 	lsls r0, 16
 	lsrs r5, r0, 16
 	adds r0, r4, 0
 	movs r1, 0
-	bl get_pokemon_data_from_selected_box
+	bl GetBoxMonDataFromSelectedBox
 	adds r1, r0, 0
 	cmp r5, 0
 	beq _080D0828
@@ -17963,7 +17963,7 @@ sub_80D0834: @ 80D0834
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x41
-	bl get_pokemon_data_from_selected_box
+	bl GetBoxMonDataFromSelectedBox
 	lsls r0, 16
 	cmp r0, 0
 	beq _080D0878
@@ -18351,7 +18351,7 @@ _080D0B04:
 	adds r2, r4
 	ldr r0, [sp, 0x4]
 	adds r1, r6, 0
-	bl sub_80D1F18
+	bl CopyBoxMonFromAnyBox
 _080D0B2C:
 	adds r0, r6, 0x1
 	lsls r0, 24
@@ -18480,7 +18480,7 @@ _080D0C04:
 	beq _080D0C30
 	adds r0, r5, 0
 	movs r1, 0x5
-	bl get_pokemon_data_from_selected_box
+	bl GetBoxMonDataFromSelectedBox
 	cmp r0, 0
 	beq _080D0C30
 	movs r0, 0
@@ -18674,12 +18674,12 @@ sub_80D0D8C: @ 80D0D8C
 _080D0DC4:
 	adds r0, r7, 0
 	movs r1, 0x5
-	bl get_pokemon_data_from_selected_box
+	bl GetBoxMonDataFromSelectedBox
 	cmp r0, 0
 	beq _080D0E42
 	adds r0, r7, 0
 	movs r1, 0xC
-	bl get_pokemon_data_from_selected_box
+	bl GetBoxMonDataFromSelectedBox
 	b _080D0DFC
 _080D0DDA:
 	cmp r7, 0x5
@@ -18808,7 +18808,7 @@ sub_80D0E90: @ 80D0E90
 	adds r0, r5, 0
 	movs r1, 0xC
 	mov r2, sp
-	bl set_pokemon_data_from_selected_box
+	bl SetBoxMonDataFromSelectedBox
 	adds r0, r5, 0
 	movs r1, 0x1
 	bl sub_80CB7AC
@@ -18927,7 +18927,7 @@ sub_80D0FAC: @ 80D0FAC
 	bne _080D101C
 	adds r0, r7, 0
 	movs r1, 0xC
-	bl get_pokemon_data_from_selected_box
+	bl GetBoxMonDataFromSelectedBox
 	lsls r0, 16
 	lsrs r6, r0, 16
 	mov r0, r8
@@ -18936,7 +18936,7 @@ sub_80D0FAC: @ 80D0FAC
 	adds r2, r4
 	adds r0, r7, 0
 	movs r1, 0xC
-	bl set_pokemon_data_from_selected_box
+	bl SetBoxMonDataFromSelectedBox
 	mov r1, r8
 	ldr r0, [r1]
 	adds r0, r4
@@ -19024,7 +19024,7 @@ sub_80D1080: @ 80D1080
 	adds r2, r0
 	adds r0, r5, 0
 	movs r1, 0xC
-	bl set_pokemon_data_from_selected_box
+	bl SetBoxMonDataFromSelectedBox
 	adds r0, r5, 0
 	movs r1, 0
 	bl sub_80CB7AC
@@ -19090,7 +19090,7 @@ sub_80D1114: @ 80D1114
 	adds r0, r5, 0
 	movs r1, 0xC
 	mov r2, sp
-	bl set_pokemon_data_from_selected_box
+	bl SetBoxMonDataFromSelectedBox
 	adds r0, r5, 0
 	movs r1, 0x1
 	bl sub_80CB7AC
@@ -20585,8 +20585,8 @@ _080D1D28:
 	.pool
 	thumb_func_end sub_80D1D18
 
-	thumb_func_start get_pokemon_data_from_any_box
+	thumb_func_start GetBoxMonDataFromAnyBox
-get_pokemon_data_from_any_box: @ 80D1D30
+GetBoxMonDataFromAnyBox: @ 80D1D30
 	push {r4,r5,lr}
 	adds r5, r2, 0
 	lsls r0, 24
@@ -20620,10 +20620,10 @@ _080D1D6E:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end get_pokemon_data_from_any_box
+	thumb_func_end GetBoxMonDataFromAnyBox
 
-	thumb_func_start set_pokemon_data_from_any_box
+	thumb_func_start SetBoxMonDataFromAnyBox
-set_pokemon_data_from_any_box: @ 80D1D74
+SetBoxMonDataFromAnyBox: @ 80D1D74
 	push {r4-r6,lr}
 	adds r5, r2, 0
 	adds r6, r3, 0
@@ -20656,10 +20656,10 @@ _080D1DAC:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end set_pokemon_data_from_any_box
+	thumb_func_end SetBoxMonDataFromAnyBox
 
-	thumb_func_start get_pokemon_data_from_selected_box
+	thumb_func_start GetBoxMonDataFromSelectedBox
-get_pokemon_data_from_selected_box: @ 80D1DB8
+GetBoxMonDataFromSelectedBox: @ 80D1DB8
 	push {lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -20669,14 +20669,14 @@ get_pokemon_data_from_selected_box: @ 80D1DB8
 	ldr r0, [r0]
 	ldrb r0, [r0]
 	adds r1, r3, 0
-	bl get_pokemon_data_from_any_box
+	bl GetBoxMonDataFromAnyBox
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end get_pokemon_data_from_selected_box
+	thumb_func_end GetBoxMonDataFromSelectedBox
 
-	thumb_func_start set_pokemon_data_from_selected_box
+	thumb_func_start SetBoxMonDataFromSelectedBox
-set_pokemon_data_from_selected_box: @ 80D1DD8
+SetBoxMonDataFromSelectedBox: @ 80D1DD8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -20688,15 +20688,15 @@ set_pokemon_data_from_selected_box: @ 80D1DD8
 	ldrb r0, [r0]
 	adds r1, r4, 0
 	adds r2, r5, 0
-	bl set_pokemon_data_from_any_box
+	bl SetBoxMonDataFromAnyBox
 	pop {r4,r5}
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end set_pokemon_data_from_selected_box
+	thumb_func_end SetBoxMonDataFromSelectedBox
 
-	thumb_func_start sub_80D1DFC
+	thumb_func_start GetBoxMonNickFromAnyBox
-sub_80D1DFC: @ 80D1DFC
+GetBoxMonNickFromAnyBox: @ 80D1DFC
 	push {r4,r5,lr}
 	adds r5, r2, 0
 	lsls r0, 24
@@ -20732,7 +20732,7 @@ _080D1E3C:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80D1DFC
+	thumb_func_end GetBoxMonNickFromAnyBox
 
 	thumb_func_start sub_80D1E44
 sub_80D1E44: @ 80D1E44
@@ -20774,8 +20774,8 @@ _080D1E84:
 	.pool
 	thumb_func_end sub_80D1E44
 
-	thumb_func_start sub_80D1E90
+	thumb_func_start SetBoxMonNickFromAnyBox
-sub_80D1E90: @ 80D1E90
+SetBoxMonNickFromAnyBox: @ 80D1E90
 	push {r4,r5,lr}
 	adds r5, r2, 0
 	lsls r0, 24
@@ -20807,10 +20807,10 @@ _080D1EC6:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80D1E90
+	thumb_func_end SetBoxMonNickFromAnyBox
 
-	thumb_func_start sub_80D1ED0
+	thumb_func_start GetAndCopyBoxMonDataFromAnyBox
-sub_80D1ED0: @ 80D1ED0
+GetAndCopyBoxMonDataFromAnyBox: @ 80D1ED0
 	push {r4-r6,lr}
 	adds r5, r2, 0
 	adds r6, r3, 0
@@ -20846,10 +20846,10 @@ _080D1F12:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80D1ED0
+	thumb_func_end GetAndCopyBoxMonDataFromAnyBox
 
-	thumb_func_start sub_80D1F18
+	thumb_func_start CopyBoxMonFromAnyBox
-sub_80D1F18: @ 80D1F18
+CopyBoxMonFromAnyBox: @ 80D1F18
 	push {r4,r5,lr}
 	adds r5, r2, 0
 	lsls r0, 24
@@ -20881,7 +20881,7 @@ _080D1F4E:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80D1F18
+	thumb_func_end CopyBoxMonFromAnyBox
 
 	thumb_func_start sub_80D1F58
 sub_80D1F58: @ 80D1F58

asm/rom_815A0D4.s

@@ -13277,7 +13277,7 @@ _08160D6C:
 	adds r0, r5
 	adds r1, 0x45
 	ldrb r1, [r1]
-	bl sub_806B9A8
+	bl RemoveMonPPBonus
 	ldr r0, [r7]
 	adds r0, 0x44
 	ldrb r0, [r0]

asm/rom_8161F74.s

@@ -9872,7 +9872,7 @@ _0816746C:
 	lsls r0, 16
 	lsrs r4, r0, 16
 _08167472:
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, r0

asm/rom_818CFC8.s

@@ -5055,7 +5055,7 @@ sub_818FA20: @ 818FA20
 	ldr r1, [r5]
 	adds r1, r0
 	str r1, [r5]
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	ldr r0, =gTrainerBattleOpponent_A
 	ldrh r0, [r0]
 	bl sub_8195358
@@ -28067,7 +28067,7 @@ _0819B826:
 	lsrs r7, r0, 24
 	cmp r7, 0x2
 	bls _0819B778
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	pop {r3-r5}
 	mov r8, r3
 	mov r9, r4
@@ -50558,7 +50558,7 @@ _081A75DA:
 	lsrs r0, 16
 	adds r1, r6, 0
 	adds r2, r4, 0
-	bl CalcPPWithPPUps
+	bl CalculatePPWithBonus
 	mov r1, sp
 	strb r0, [r1]
 	adds r1, r4, 0
@@ -51878,7 +51878,7 @@ _081A8014:
 	lsrs r0, 16
 	mov r1, r9
 	adds r2, r4, 0
-	bl CalcPPWithPPUps
+	bl CalculatePPWithBonus
 	lsls r0, 24
 	lsrs r6, r0, 24
 	adds r1, r4, 0
@@ -52744,7 +52744,7 @@ _081A8732:
 	lsrs r0, 16
 	mov r1, r8
 	adds r2, r6, 0
-	bl CalcPPWithPPUps
+	bl CalculatePPWithBonus
 	lsls r0, 24
 	lsrs r5, r0, 24
 	adds r1, r6, 0
@@ -61186,7 +61186,7 @@ ItemMenu_UseOutOfBattle: @ 81ACE7C
 	cmp r0, 0
 	beq _081ACEEE
 	bl bag_menu_remove_some_window
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	cmp r0, 0
 	bne _081ACEB8
@@ -61626,7 +61626,7 @@ _081AD2AC:
 	lsls r0, 24
 	cmp r0, 0
 	bne _081AD2E4
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	cmp r0, 0
 	bne _081AD2CA
@@ -67446,7 +67446,7 @@ _081B017E:
 	negs r0, r0
 	ands r0, r1
 	strb r0, [r2]
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	ldr r0, =c2_811EBD0
 	bl SetMainCallback2
 _081B0194:
@@ -72557,7 +72557,7 @@ _081B2BBE:
 	add r1, sp, 0x8
 	bl GetMonNickname
 	adds r0, r6, 0
-	bl pokemon_get_gender
+	bl GetMonGender
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -80636,7 +80636,7 @@ sub_81B71D4: @ 81B71D4
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_806B9A8
+	bl RemoveMonPPBonus
 	ldrh r5, [r5, 0xE]
 	bl sub_81C1B94
 	adds r2, r0, 0
@@ -85032,7 +85032,7 @@ sub_81B9770: @ 81B9770
 	muls r0, r6
 	adds r0, r5
 	ldrb r1, [r4]
-	bl sub_806B9A8
+	bl RemoveMonPPBonus
 	ldrh r4, [r4]
 	cmp r4, 0x2
 	bhi _081B97C4
@@ -85260,7 +85260,7 @@ _081B996A:
 _081B997E:
 	adds r6, 0x1
 _081B9980:
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r6, r0

asm/rom_81BE66C.s

@@ -7508,7 +7508,7 @@ sub_81C27DC: @ 81C27DC
 	beq _081C282C
 	cmp r1, 0x1D
 	beq _081C282C
-	bl pokemon_get_gender
+	bl GetMonGender
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0
@@ -8403,7 +8403,7 @@ sub_81C2FD8: @ 81C2FD8
 	ldrh r0, [r0]
 	adds r1, 0x78
 	ldrb r1, [r1]
-	bl sub_806B694
+	bl GetAbilityBySpecies
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -8441,7 +8441,7 @@ sub_81C302C: @ 81C302C
 	ldrh r0, [r0]
 	adds r1, 0x78
 	ldrb r1, [r1]
-	bl sub_806B694
+	bl GetAbilityBySpecies
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -9683,7 +9683,7 @@ sub_81C3B08: @ 81C3B08
 	ldrb r1, [r0]
 	adds r0, r5, 0
 	adds r2, r7, 0
-	bl CalcPPWithPPUps
+	bl CalculatePPWithBonus
 	adds r6, r0, 0
 	lsls r6, 24
 	lsrs r6, 24
@@ -16242,7 +16242,7 @@ _081C73C6:
 	lsrs r1, 24
 	lsrs r0, r6, 24
 	movs r2, 0x52
-	bl get_pokemon_data_from_any_box
+	bl GetBoxMonDataFromAnyBox
 	cmp r0, 0
 	beq _081C73EC
 _081C73E2:
@@ -28270,7 +28270,7 @@ _081CD174:
 	adds r1, r3, 0
 	movs r2, 0x8
 	mov r3, sp
-	bl set_pokemon_data_from_any_box
+	bl SetBoxMonDataFromAnyBox
 _081CD180:
 	ldr r0, =0x00006304
 	adds r1, r6, r0
@@ -28938,7 +28938,7 @@ _081CD690:
 	lsrs r0, 16
 	mov r8, r0
 	adds r0, r4, 0
-	bl pokemon_get_gender
+	bl GetMonGender
 	lsls r0, 24
 	lsrs r6, r0, 24
 	b _081CD6FE
@@ -28948,7 +28948,7 @@ _081CD6E0:
 	mov r1, r9
 	bl get_pokemon_by_box_and_pos
 	adds r4, r0, 0
-	bl pokemon_roll_gender
+	bl GetBoxMonGender
 	lsls r0, 24
 	lsrs r6, r0, 24
 	adds r0, r4, 0
@@ -29304,7 +29304,7 @@ _081CD9BE:
 	lsls r0, 16
 	lsrs r4, r0, 16
 _081CD9C4:
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, r0
@@ -32218,7 +32218,7 @@ _081CF1FC:
 	str r0, [sp]
 	ldr r2, [r6, 0x14]
 	adds r0, r7, 0
-	bl get_pokemon_data_from_any_box
+	bl GetBoxMonDataFromAnyBox
 	lsls r0, 16
 	ldr r2, =0x0000ffff
 	ldr r1, [sp]
@@ -33112,7 +33112,7 @@ sub_81CF8E4: @ 81CF8E4
 	ldr r0, =gPlayerParty
 	adds r4, r0
 	adds r0, r4, 0
-	bl pokemon_get_gender
+	bl GetMonGender
 	lsls r0, 24
 	lsrs r5, r0, 24
 	adds r0, r4, 0
@@ -33130,7 +33130,7 @@ _081CF924:
 	ldrb r1, [r2, 0x1]
 	bl get_pokemon_by_box_and_pos
 	adds r4, r0, 0
-	bl pokemon_roll_gender
+	bl GetBoxMonGender
 	lsls r0, 24
 	lsrs r5, r0, 24
 	adds r0, r4, 0
@@ -33571,7 +33571,7 @@ _081CFC60:
 	adds r0, r5, 0
 	adds r1, r4, 0
 	movs r2, 0x52
-	bl get_pokemon_data_from_any_box
+	bl GetBoxMonDataFromAnyBox
 	adds r3, r0, 0
 	cmp r3, 0
 	beq _081CFCA6
@@ -33733,7 +33733,7 @@ _081CFD96:
 	lsrs r1, 24
 	lsrs r0, r6, 24
 	movs r2, 0x53
-	bl get_pokemon_data_from_any_box
+	bl GetBoxMonDataFromAnyBox
 	cmp r0, 0
 	beq _081CFDBC
 _081CFDB2:
@@ -34488,7 +34488,7 @@ sub_81D035C: @ 81D035C
 	ldr r0, =gPlayerParty
 	adds r4, r0
 	adds r0, r4, 0
-	bl pokemon_get_gender
+	bl GetMonGender
 	lsls r0, 24
 	lsrs r5, r0, 24
 	adds r0, r4, 0
@@ -34507,7 +34507,7 @@ _081D03A4:
 	ldrb r1, [r7, 0x1]
 	bl get_pokemon_by_box_and_pos
 	adds r4, r0, 0
-	bl pokemon_roll_gender
+	bl GetBoxMonGender
 	lsls r0, 24
 	lsrs r5, r0, 24
 	adds r0, r4, 0
@@ -34985,7 +34985,7 @@ sub_81D06E4: @ 81D06E4
 	bl GetLevelFromMonExp
 	strb r0, [r7]
 	adds r0, r4, 0
-	bl pokemon_get_gender
+	bl GetMonGender
 	strb r0, [r6]
 	b _081D0752
 	.pool
@@ -34994,7 +34994,7 @@ _081D0730:
 	ldrb r1, [r1, 0x1]
 	bl get_pokemon_by_box_and_pos
 	adds r4, r0, 0
-	bl pokemon_roll_gender
+	bl GetBoxMonGender
 	strb r0, [r6]
 	adds r0, r4, 0
 	bl GetLevelFromBoxMonExp
@@ -35083,7 +35083,7 @@ sub_81D07D8: @ 81D07D8
 	beq _081D07FA
 	ldrb r1, [r1, 0x1]
 	movs r2, 0x52
-	bl get_pokemon_data_from_any_box
+	bl GetBoxMonDataFromAnyBox
 	b _081D080A
 _081D07FA:
 	ldrb r1, [r1, 0x1]
@@ -35128,7 +35128,7 @@ _081D0848:
 	ldrb r0, [r1]
 	ldrb r1, [r1, 0x1]
 	movs r2, 0x53
-	bl get_pokemon_data_from_any_box
+	bl GetBoxMonDataFromAnyBox
 _081D0852:
 	mov r12, r0
 	movs r0, 0
@@ -39899,14 +39899,14 @@ _081D2CB0:
 	lsrs r0, 24
 	lsls r1, 24
 	lsrs r1, 24
-	bl sub_80D1ED0
+	bl GetAndCopyBoxMonDataFromAnyBox
 	b _081D2CCA
 _081D2CBE:
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, 24
 	lsrs r1, 24
-	bl get_pokemon_data_from_any_box
+	bl GetBoxMonDataFromAnyBox
 _081D2CCA:
 	pop {r1}
 	bx r1
@@ -39980,7 +39980,7 @@ _081D2D20:
 	lsrs r0, 16
 	mov r8, r0
 	adds r0, r4, 0
-	bl pokemon_get_gender
+	bl GetMonGender
 	lsls r0, 24
 	lsrs r6, r0, 24
 	b _081D2D92
@@ -39992,7 +39992,7 @@ _081D2D70:
 	lsrs r1, 24
 	bl get_pokemon_by_box_and_pos
 	adds r4, r0, 0
-	bl pokemon_roll_gender
+	bl GetBoxMonGender
 	lsls r0, 24
 	lsrs r6, r0, 24
 	adds r0, r4, 0

asm/scrcmd.s

@@ -2342,7 +2342,7 @@ s42_get_map_camera_pos: @ 809A45C
 s43_get_player_party_count: @ 809A498
 	push {r4,lr}
 	ldr r4, =gScriptResult
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r4]

asm/script_pokemon_util_80F87D8.s

@@ -1225,7 +1225,7 @@ _080F91D4:
 	lsrs r0, 16
 	adds r1, r7, 0
 	adds r2, r5, 0
-	bl CalcPPWithPPUps
+	bl CalculatePPWithBonus
 	strb r0, [r6]
 	adds r1, r5, 0
 	adds r1, 0x11
@@ -1307,7 +1307,7 @@ sub_80F9244: @ 80F9244
 	add r2, sp, 0x10
 	bl SetMonData
 	adds r0, r6, 0
-	bl pokemon_catch
+	bl GiveMonToPlayer
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r0, r5, 0
@@ -1351,7 +1351,7 @@ sub_80F92C8: @ 80F92C8
 	movs r1, 0x2D
 	bl SetMonData
 	mov r0, sp
-	bl pokemon_catch
+	bl GiveMonToPlayer
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x68
@@ -1362,7 +1362,7 @@ sub_80F92C8: @ 80F92C8
 	thumb_func_start sub_80F92F8
 sub_80F92F8: @ 80F92F8
 	push {lr}
-	bl sub_806B5C4
+	bl GetMonsStateToDoubles
 	lsls r0, 24
 	lsrs r1, r0, 24
 	cmp r1, 0x1
@@ -1656,7 +1656,7 @@ _080F9538:
 	adds r4, 0x64
 	cmp r5, r6
 	ble _080F9538
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	add sp, 0x198
 	pop {r4-r7}
 	pop {r0}

asm/trade.s

@@ -518,7 +518,7 @@ _080775F2:
 	b _08077B46
 _08077600:
 	bl sub_8011BD0
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	ldr r1, =gMain
 	movs r7, 0x87
 	lsls r7, 3
@@ -586,7 +586,7 @@ _08077694:
 	b _08077B22
 	.pool
 _080776A8:
-	bl calc_enemy_party_count
+	bl CalculateEnemyPartyCount
 	movs r0, 0
 	movs r1, 0
 	bl SetGpuReg
@@ -1174,7 +1174,7 @@ _08077C20:
 	adds r1, r2, r0
 	b _080780D8
 _08077C28:
-	bl calc_player_party_count
+	bl CalculatePlayerPartyCount
 	ldr r1, =gMain
 	movs r2, 0x87
 	lsls r2, 3
@@ -1203,7 +1203,7 @@ _08077C64:
 	adds r1, r2, r5
 	b _080780D8
 _08077C6C:
-	bl calc_enemy_party_count
+	bl CalculateEnemyPartyCount
 	ldr r4, =gUnknown_0203229C
 	ldr r0, [r4]
 	ldr r1, =gPlayerPartyCount
@@ -5078,7 +5078,7 @@ _08079D94:
 	ldr r0, =gPlayerParty
 	adds r4, r0
 	adds r0, r4, 0
-	bl pokemon_get_gender
+	bl GetMonGender
 	lsls r0, 24
 	lsrs r5, r0, 24
 	adds r0, r4, 0
@@ -5094,7 +5094,7 @@ _08079DC0:
 	ldr r0, =gEnemyParty
 	adds r4, r0
 	adds r0, r4, 0
-	bl pokemon_get_gender
+	bl GetMonGender
 	lsls r0, 24
 	lsrs r5, r0, 24
 	adds r0, r4, 0

asm/trainer_see.s

@@ -44,7 +44,7 @@ _080B3C12:
 	adds r5, r0, 0
 	cmp r1, 0x1
 	bhi _080B3C88
-	bl CheckPlayerPartySize
+	bl GetMonsStateToDoubles_2
 	lsls r0, 24
 	cmp r0, 0
 	bne _080B3C42
@@ -196,7 +196,7 @@ _080B3D56:
 	cmp r0, 0x6
 	bne _080B3D8A
 _080B3D7C:
-	bl CheckPlayerPartySize
+	bl GetMonsStateToDoubles_2
 	lsls r0, 24
 	cmp r0, 0
 	bne _080B3DE0

asm/tv.s

@@ -7510,7 +7510,7 @@ sub_80EFDDC: @ 80EFDDC
 	muls r1, r0
 	adds r0, r1, 0
 	adds r0, r6
-	bl pokemon_get_gender
+	bl GetMonGender
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -7589,7 +7589,7 @@ sub_80EFEC4: @ 80EFEC4
 	lsls r5, 16
 	lsrs r5, 16
 	adds r0, r6, 0
-	bl pokemon_roll_gender
+	bl GetBoxMonGender
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -7622,7 +7622,7 @@ sub_80EFF48: @ 80EFF48
 	ldr r1, =gSpecialVar_0x8013
 	ldrb r1, [r1]
 	ldr r2, =gStringVar2
-	bl sub_80D1E90
+	bl SetBoxMonNickFromAnyBox
 	bl c2_exit_to_overworld_1_continue_scripts_restart_music
 	pop {r0}
 	bx r0

data/data2c.s

@@ -86,7 +86,7 @@ gUnknown_08329D98:: @ 8329D98
 gUnknown_08329DF8:: @ 8329DF8
 	.incbin "baserom.gba", 0x329df8, 0xc0
 
-gUnknown_08329EB8:: @ 8329EB8
+gSecretBaseTrainerClasses:: @ 8329EB8
 	.incbin "baserom.gba", 0x329eb8, 0xa
 
 gUnknown_08329EC2:: @ 8329EC2

ld_script.txt

@@ -69,6 +69,7 @@ SECTIONS {
         src/pokemon_1.o(.text);
         asm/pokemon_1.o(.text);
         src/calculate_base_damage.o(.text);
+        src/pokemon_2.o(.text);
         asm/pokemon_2.o(.text);
         asm/pokemon_3.o(.text);
         src/trig.o(.text);

src/pokemon_2.c

@@ -0,0 +1,4 @@
+#include "global.h"
+#include "pokemon.h"
+
+