rename pokemon functions

10 files changed, 309 insertions, 308 deletions

diff --git a/asm/rom3.s b/asm/rom3.s
index 62aabe46e..4bff6283d 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -76,7 +76,7 @@ _0800B8A0:
 	ands r0, r1
 	cmp r0, 0
 	beq _0800B90E
-	bl zero_enemy_party_data
+	bl ZeroEnemyPartyMons
 	ldr r4, _0800B944
 	movs r1, 0x8F
 	lsls r1, 1
@@ -87,7 +87,7 @@ _0800B8A0:
 	adds r0, r4, 0
 	movs r2, 0x2
 	movs r3, 0x20
-	bl create_pokemon_set_level
+	bl CreateMon
 	str r5, [sp, 0x10]
 	adds r0, r4, 0
 	movs r1, 0xC
@@ -7612,8 +7612,8 @@ _0800F4C4:
 	subs r4, 0x1
 	cmp r4, 0
 	bge _0800F464
-	bl zero_player_party_data
-	bl zero_enemy_party_data
+	bl ZeroPlayerPartyMons
+	bl ZeroEnemyPartyMons
 	ldr r1, _0800F4FC
 	ldrb r0, [r1]
 	adds r0, 0x1
@@ -8175,7 +8175,7 @@ _0800F90C:
 	beq _0800F920
 	b _0800FCA4
 _0800F920:
-	bl zero_enemy_party_data
+	bl ZeroEnemyPartyMons
 	movs r2, 0
 	str r2, [sp, 0x18]
 	ldr r2, _0800F944
@@ -8333,7 +8333,7 @@ _0800FA18:
 	movs r3, 0
 	str r3, [sp, 0xC]
 	adds r3, r6, 0
-	bl create_pokemon_set_level
+	bl CreateMon
 	b _0800FC74
 	.align 2, 0
 _0800FA58: .4byte gSpeciesNames
@@ -8403,7 +8403,7 @@ _0800FA9E:
 	str r0, [sp, 0xC]
 	adds r0, r5, 0
 	adds r3, r6, 0
-	bl create_pokemon_set_level
+	bl CreateMon
 	movs r6, 0
 	mov r0, r8
 	adds r0, 0x6
@@ -8497,7 +8497,7 @@ _0800FB5E:
 	str r0, [sp, 0xC]
 	adds r0, r4, 0
 	adds r3, r6, 0
-	bl create_pokemon_set_level
+	bl CreateMon
 	adds r5, 0x6
 	adds r0, r4, 0
 	movs r1, 0xC
@@ -8572,7 +8572,7 @@ _0800FBF2:
 	str r0, [sp, 0xC]
 	adds r0, r4, 0
 	adds r3, r6, 0
-	bl create_pokemon_set_level
+	bl CreateMon
 	adds r5, 0x6
 	adds r0, r4, 0
 	movs r1, 0xC
@@ -47482,7 +47482,7 @@ _080239C8:
 	bne _08023A08
 	adds r0, r2, r3
 	adds r1, r5, 0
-	bl sub_803B660
+	bl GiveMoveToBattleMon
 _08023A08:
 	ldr r0, _08023A78
 	ldrh r1, [r0]
@@ -47519,7 +47519,7 @@ _08023A08:
 	bne _08023A54
 	adds r0, r2, r3
 	adds r1, r5, 0
-	bl sub_803B660
+	bl GiveMoveToBattleMon
 _08023A54:
 	ldr r0, _08023A7C
 	str r6, [r0]
@@ -47880,7 +47880,7 @@ _08023D20:
 	ldr r7, _08023E18
 	ldrh r1, [r7]
 	adds r2, r5, 0
-	bl sub_803B6A4
+	bl SetMonMoveSlot
 	ldr r0, _08023E1C
 	ldrh r0, [r0]
 	ldrb r6, [r6]
@@ -47909,7 +47909,7 @@ _08023D20:
 	ldrh r1, [r7]
 	adds r0, r4, 0
 	adds r2, r5, 0
-	bl sub_803B6E4
+	bl SetBattleMonMoveSlot
 _08023DB0:
 	ldr r0, _08023E2C
 	ldrh r1, [r0]
@@ -47954,7 +47954,7 @@ _08023DB0:
 	ldrh r1, [r0]
 	adds r0, r4, 0
 	adds r2, r5, 0
-	bl sub_803B6E4
+	bl SetBattleMonMoveSlot
 	b _08023E5C
 	.align 2, 0
 _08023E10: .4byte 0x02024c10
@@ -67440,7 +67440,7 @@ _0802D96A:
 	mov r2, sp
 	bl SetMonData
 	adds r0, r6, 0
-	bl pokemon_calc_effective_stats
+	bl CalculateMonStats
 	ldr r2, [sp]
 	add r0, sp, 0x4
 	ldrh r0, [r0]
@@ -67733,7 +67733,7 @@ _0802DB9C:
 	mov r2, sp
 	bl SetMonData
 	adds r0, r5, 0
-	bl pokemon_calc_effective_stats
+	bl CalculateMonStats
 	ldr r2, [sp]
 	add r0, sp, 0x4
 	ldrh r0, [r0]
diff --git a/asm/rom4.s b/asm/rom4.s
index 608df2e11..a80d050b2 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -194,8 +194,8 @@ sub_8052E4C: @ 8052E4C
 	movs r0, 0
 	strb r0, [r1]
 	bl sub_808C0A0
-	bl zero_player_party_data
-	bl zero_enemy_party_data
+	bl ZeroPlayerPartyMons
+	bl ZeroEnemyPartyMons
 	bl sub_80A3684
 	pop {r0}
 	bx r0
@@ -218,8 +218,8 @@ _08052E7E:
 	ldr r1, _08052F40
 	movs r0, 0x1
 	strb r0, [r1]
-	bl zero_player_party_data
-	bl zero_enemy_party_data
+	bl ZeroPlayerPartyMons
+	bl ZeroEnemyPartyMons
 	bl sub_808C02C
 	bl sub_8052DE4
 	ldr r4, _08052F44
@@ -253,7 +253,7 @@ _08052E7E:
 	bl sub_80C5BDC
 	ldr r0, _08052F50
 	strb r5, [r0]
-	bl zero_player_party_data
+	bl ZeroPlayerPartyMons
 	bl sub_80961D8
 	bl sub_81341F8
 	bl sub_813420C
diff --git a/asm/rom5.s b/asm/rom5.s
index 6723f23fd..2fbba952c 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -14097,7 +14097,7 @@ sub_8081AFC: @ 8081AFC
 	movs r1, 0xC4
 	lsls r1, 1
 	movs r2, 0x5
-	bl sub_803AC44
+	bl CreateFemaleMon
 	bl script_env_2_enable
 	ldr r1, _08081B30
 	ldr r0, _08081B34
@@ -20915,7 +20915,7 @@ sub_8084E78: @ 8084E78
 	lsrs r4, 16
 	lsls r5, 24
 	lsrs r5, 24
-	bl zero_enemy_party_data
+	bl ZeroEnemyPartyMons
 	bl sub_8084DC4
 	lsls r0, 24
 	lsrs r0, 24
@@ -20925,7 +20925,7 @@ sub_8084E78: @ 8084E78
 	adds r1, r4, 0
 	adds r2, r5, 0
 	movs r3, 0x20
-	bl pokemon_make_with_nature
+	bl CreateMonWithNature
 	add sp, 0x4
 	pop {r4,r5}
 	pop {r0}
@@ -21059,7 +21059,7 @@ _08084F90:
 	lsls r2, r5, 24
 	lsrs r2, 24
 	ldr r0, _08084FC0
-	bl sub_803B6A4
+	bl SetMonMoveSlot
 	adds r0, r5, 0x1
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -54884,7 +54884,7 @@ _08095AF0:
 	adds r0, r1
 	adds r0, r6, r0
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 	cmp r0, 0
 	beq _08095B0C
 	adds r0, r5, 0x1
@@ -54924,7 +54924,7 @@ _08095B36:
 	adds r0, r1
 	adds r0, r5, r0
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 	cmp r0, 0
 	bne _08095B58
 	lsls r0, r4, 16
@@ -55321,7 +55321,7 @@ _08095E10:
 	lsls r0, 4
 	add r0, r8
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 	cmp r0, 0
 	bne _08095E3C
 	asrs r0, r6, 16
@@ -55363,12 +55363,12 @@ _08095E5C:
 	adds r4, r1, r0
 	adds r0, r4, 0
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 	cmp r0, 0
 	beq _08095E80
 	adds r0, r4, 0
 	movs r1, 0x2D
-	bl GetMonBoxData
+	bl GetBoxMonData
 	cmp r0, 0
 	beq _08095E40
 _08095E80:
@@ -55817,7 +55817,7 @@ _080961F0:
 	lsls r0, 4
 	adds r0, r7
 	adds r0, r6, r0
-	bl ZeroPokemonBoxData
+	bl ZeroBoxMonData
 	adds r0, r4, 0x1
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -60974,14 +60974,14 @@ _08098C6A:
 _08098C70:
 	adds r0, r6, 0
 	movs r1, 0x41
-	bl GetMonBoxData
+	bl GetBoxMonData
 	lsls r0, 16
 	lsrs r4, r0, 16
 	cmp r4, 0
 	beq _08098CD8
 	adds r0, r6, 0
 	movs r1, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 	adds r1, r0, 0
 	lsls r2, r5, 1
 	adds r2, r5
@@ -61083,7 +61083,7 @@ sub_8098D20: @ 8098D20
 	adds r7, r2, r0
 	adds r0, r7, 0
 	movs r1, 0x41
-	bl GetMonBoxData
+	bl GetBoxMonData
 	lsls r0, 16
 	lsrs r0, 16
 	mov r8, r0
@@ -61116,7 +61116,7 @@ sub_8098D20: @ 8098D20
 	lsrs r4, 16
 	adds r0, r7, 0
 	movs r1, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 	adds r1, r0, 0
 	movs r0, 0x2
 	str r0, [sp]
@@ -61360,7 +61360,7 @@ _08098F42:
 	adds r4, r1, r2
 	adds r0, r4
 	movs r1, 0x41
-	bl GetMonBoxData
+	bl GetBoxMonData
 	lsls r0, 16
 	lsrs r5, r0, 16
 	cmp r5, 0
@@ -61374,7 +61374,7 @@ _08098F42:
 	lsls r0, 5
 	adds r0, r4
 	movs r1, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 	adds r1, r0, 0
 	ldr r2, [sp, 0x10]
 	lsls r3, r2, 16
@@ -65066,7 +65066,7 @@ _0809ABC0:
 	adds r1, r2
 	adds r0, r1
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 _0809ABEA:
 	lsls r0, 16
 	lsrs r0, 16
@@ -66309,7 +66309,7 @@ sub_809B548: @ 809B548
 	muls r0, r2
 	ldr r1, _0809B564
 	adds r0, r1
-	bl zero_pokemon_struct
+	bl ZeroMonData
 	b _0809B582
 	.align 2, 0
 _0809B564: .4byte 0x03004360
@@ -66325,7 +66325,7 @@ _0809B568:
 	ldr r2, _0809B588
 	adds r1, r2
 	adds r0, r1
-	bl ZeroPokemonBoxData
+	bl ZeroBoxMonData
 _0809B582:
 	pop {r0}
 	bx r0
@@ -66978,7 +66978,7 @@ _0809BA9A:
 	movs r1, 0x50
 	ldr r7, _0809BB7C
 	adds r2, r4, r7
-	bl GetMonBoxData
+	bl GetBoxMonData
 	lsls r0, 16
 	lsrs r3, r0, 16
 	cmp r3, 0
@@ -67345,7 +67345,7 @@ _0809BDAE:
 	adds r0, r5, 0
 	muls r0, r6
 	adds r0, r4
-	bl zero_pokemon_struct
+	bl ZeroMonData
 	adds r0, r5, 0x1
 	lsls r0, 16
 	lsrs r5, r0, 16
@@ -67432,7 +67432,7 @@ _0809BE34:
 	adds r0, r1
 	movs r1, 0x8
 	mov r2, sp
-	bl SetMonBoxData
+	bl SetBoxMonData
 _0809BE68:
 	add sp, 0x4
 	pop {r4}
@@ -67785,7 +67785,7 @@ _0809C120:
 	bne _0809C1D4
 	adds r0, r7, 0
 	movs r1, 0x41
-	bl GetMonBoxData
+	bl GetBoxMonData
 	ldr r2, _0809C1B8
 	adds r5, r6, r2
 	strh r0, [r5]
@@ -67794,11 +67794,11 @@ _0809C120:
 	beq _0809C1EC
 	adds r0, r7, 0
 	movs r1, 0x1
-	bl GetMonBoxData
+	bl GetBoxMonData
 	mov r9, r0
 	adds r0, r7, 0
 	movs r1, 0x2D
-	bl GetMonBoxData
+	bl GetBoxMonData
 	ldr r2, _0809C1BC
 	adds r1, r6, r2
 	strb r0, [r1]
@@ -67807,23 +67807,23 @@ _0809C120:
 	adds r0, r7, 0
 	movs r1, 0x2
 	adds r2, r4, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 	adds r0, r4, 0
 	bl StringGetEnd10
 	adds r0, r7, 0
-	bl sub_803B570
+	bl GetLevelFromBoxMonExp
 	ldr r2, _0809C1C4
 	adds r1, r6, r2
 	strb r0, [r1]
 	adds r0, r7, 0
 	movs r1, 0x8
-	bl GetMonBoxData
+	bl GetBoxMonData
 	ldr r2, _0809C1C8
 	adds r1, r6, r2
 	strb r0, [r1]
 	adds r0, r7, 0
 	movs r1, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 	adds r2, r0, 0
 	ldr r0, _0809C1CC
 	adds r4, r6, r0
@@ -67842,7 +67842,7 @@ _0809C120:
 	str r0, [sp]
 	adds r0, r7, 0
 	movs r1, 0xC
-	bl GetMonBoxData
+	bl GetBoxMonData
 _0809C1B2:
 	mov r1, r8
 	strh r0, [r1]
@@ -72590,7 +72590,7 @@ sub_809E6D8: @ 809E6D8
 	str r0, [sp, 0x8]
 	adds r0, r5, 0
 	ldr r1, [sp, 0x8]
-	bl GetMonBoxData
+	bl GetBoxMonData
 	mov r1, sp
 	adds r1, 0x2
 	str r1, [sp, 0x14]
@@ -72600,7 +72600,7 @@ sub_809E6D8: @ 809E6D8
 	str r2, [sp, 0xC]
 	adds r0, r5, 0
 	adds r1, r2, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 	mov r1, sp
 	strh r0, [r1]
 	mov r3, r8
@@ -72608,7 +72608,7 @@ sub_809E6D8: @ 809E6D8
 	str r3, [sp, 0x10]
 	adds r0, r5, 0
 	adds r1, r3, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 	mov r7, sp
 	adds r7, 0x5
 	str r7, [sp, 0x18]
@@ -72618,13 +72618,13 @@ sub_809E6D8: @ 809E6D8
 	str r0, [sp, 0x1C]
 	adds r0, r5, 0
 	ldr r1, [sp, 0x1C]
-	bl GetMonBoxData
+	bl GetBoxMonData
 	add r1, sp, 0x4
 	mov r10, r1
 	strb r0, [r1]
 	adds r0, r5, 0
 	movs r1, 0x15
-	bl GetMonBoxData
+	bl GetBoxMonData
 	mov r4, sp
 	adds r4, 0x6
 	strb r0, [r4]
@@ -72667,23 +72667,23 @@ sub_809E6D8: @ 809E6D8
 	adds r0, r5, 0
 	ldr r1, [sp, 0x8]
 	mov r2, sp
-	bl SetMonBoxData
+	bl SetBoxMonData
 	adds r0, r5, 0
 	ldr r1, [sp, 0xC]
 	ldr r2, [sp, 0x14]
-	bl SetMonBoxData
+	bl SetBoxMonData
 	adds r0, r5, 0
 	ldr r1, [sp, 0x10]
 	mov r2, r10
-	bl SetMonBoxData
+	bl SetBoxMonData
 	adds r0, r5, 0
 	ldr r1, [sp, 0x1C]
 	ldr r2, [sp, 0x18]
-	bl SetMonBoxData
+	bl SetBoxMonData
 	adds r0, r5, 0
 	movs r1, 0x15
 	adds r2, r4, 0
-	bl SetMonBoxData
+	bl SetBoxMonData
 	add sp, 0x20
 	pop {r3-r5}
 	mov r8, r3
@@ -81511,13 +81511,13 @@ _080A2C88:
 	bls _080A2C88
 	adds r0, r7, 0
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 	adds r4, r0, 0
 	lsls r4, 16
 	lsrs r4, 16
 	adds r0, r7, 0
 	movs r1, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 	adds r1, r0, 0
 	adds r0, r4, 0
 	bl sub_80A2D44
@@ -152204,7 +152204,7 @@ sub_80C5374: @ 80C5374
 	adds r1, r5, 0
 	adds r2, r3, 0
 	movs r3, 0x20
-	bl create_pokemon_set_level
+	bl CreateMon
 	add r0, sp, 0x10
 	mov r1, r8
 	strb r1, [r0]
@@ -152375,7 +152375,7 @@ sub_80C54D0: @ 80C54D0
 	lsrs r5, 24
 	lsls r7, r2, 16
 	lsrs r6, r7, 16
-	bl zero_enemy_party_data
+	bl ZeroEnemyPartyMons
 	ldr r0, _080C552C
 	mov r8, r0
 	movs r0, 0
@@ -152387,7 +152387,7 @@ sub_80C54D0: @ 80C54D0
 	adds r1, r4, 0
 	adds r2, r5, 0
 	movs r3, 0x20
-	bl create_pokemon_set_level
+	bl CreateMon
 	cmp r6, 0
 	beq _080C551E
 	add r0, sp, 0x10
@@ -152432,7 +152432,7 @@ _080C554C:
 	ldr r1, _080C5564
 	adds r0, r1
 	adds r1, r4, 0
-	bl sub_803B6A4
+	bl SetMonMoveSlot
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -249204,7 +249204,7 @@ _080F44FC:
 	adds r0, r1
 	adds r1, r4, 0
 	adds r2, r3, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 	b _080F453C
 	.align 2, 0
 _080F451C: .4byte 0x020300a4
@@ -249221,7 +249221,7 @@ _080F4520:
 	adds r1, r2
 	adds r0, r1
 	adds r1, r4, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 _080F453C:
 	pop {r4}
 	pop {r1}
@@ -249266,7 +249266,7 @@ _080F4574:
 	adds r0, r1
 	movs r1, 0x8
 	mov r2, sp
-	bl SetMonBoxData
+	bl SetBoxMonData
 _080F4592:
 	add sp, 0x4
 	pop {r4}
@@ -250308,7 +250308,7 @@ _080F4DCA:
 	add r1, r8
 	adds r0, r1
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 	cmp r0, 0
 	beq _080F4E60
 	ldrb r0, [r6]
@@ -250324,7 +250324,7 @@ _080F4DCA:
 	add r1, r8
 	adds r0, r1
 	movs r1, 0x2D
-	bl GetMonBoxData
+	bl GetBoxMonData
 	cmp r0, 0
 	bne _080F4E60
 	ldrb r1, [r6]
@@ -250356,7 +250356,7 @@ _080F4DCA:
 	adds r0, r1
 	mov r2, r9
 	ldrb r1, [r2]
-	bl GetMonBoxData
+	bl GetBoxMonData
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, _080F4EB4
@@ -253020,7 +253020,7 @@ _080F629A:
 	add r1, r8
 	adds r0, r1
 	movs r1, 0x51
-	bl GetMonBoxData
+	bl GetBoxMonData
 	cmp r0, 0
 	bne _080F636C
 	ldrb r0, [r5]
@@ -253036,7 +253036,7 @@ _080F629A:
 	add r1, r9
 	adds r0, r1
 	movs r1, 0x51
-	bl GetMonBoxData
+	bl GetBoxMonData
 	adds r1, r0, 0
 	cmp r1, 0
 	bne _080F636C
@@ -253200,7 +253200,7 @@ _080F63FC:
 	adds r1, r2
 	adds r0, r1
 	movs r1, 0x51
-	bl GetMonBoxData
+	bl GetBoxMonData
 	lsls r0, 24
 	lsrs r3, r0, 24
 	cmp r3, 0
@@ -253407,7 +253407,7 @@ _080F65B4:
 	ldr r2, _080F6620
 	adds r1, r2
 	adds r0, r1
-	bl sub_803B570
+	bl GetLevelFromBoxMonExp
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [sp, 0x8]
@@ -261131,7 +261131,7 @@ sub_80FA0DC: @ 80FA0DC
 	ldr r4, _080FA144
 	ldrb r2, [r4]
 	movs r1, 0
-	bl sub_803B6A4
+	bl SetMonMoveSlot
 	mov r1, r8
 	ldrh r0, [r1]
 	muls r0, r6
@@ -305840,7 +305840,7 @@ sub_810F628: @ 810F628
 	adds r0, r5, 0
 	movs r2, 0x7
 	movs r3, 0x20
-	bl create_pokemon_set_level
+	bl CreateMon
 	movs r1, 0x1
 	add r0, sp, 0x10
 	strh r1, [r0]
@@ -305942,7 +305942,7 @@ _0810F6FC:
 	adds r0, r6, r0
 	movs r1, 0xB
 	movs r2, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 	cmp r0, 0
 	bne _0810F71C
 	movs r0, 0x1
@@ -311527,7 +311527,7 @@ _08112354:
 	mov r2, sp
 	bl SetMonData
 	adds r0, r5, 0
-	bl pokemon_calc_effective_stats
+	bl CalculateMonStats
 	bl calc_player_party_count
 	ldr r0, _081123F4
 	adds r4, r6, r7
@@ -312034,7 +312034,7 @@ _081127BE:
 	movs r1, 0xB
 	bl SetMonData
 	mov r0, r9
-	bl pokemon_calc_effective_stats
+	bl CalculateMonStats
 	ldrh r1, [r4, 0xE]
 	ldrh r2, [r4, 0x10]
 	mov r0, r9
@@ -312762,7 +312762,7 @@ _08112E24:
 	ldrh r1, [r0]
 	mov r0, r9
 	adds r2, r4, 0
-	bl sub_803B6A4
+	bl SetMonMoveSlot
 	ldr r0, _08112E88
 	movs r3, 0xCF
 	lsls r3, 2
@@ -313342,7 +313342,7 @@ _08113316:
 	movs r1, 0xB
 	bl SetMonData
 	mov r0, r8
-	bl pokemon_calc_effective_stats
+	bl CalculateMonStats
 	ldrh r1, [r4, 0xE]
 	ldrh r2, [r4, 0x10]
 	mov r0, r8
@@ -314058,7 +314058,7 @@ _08113970:
 	ldrh r1, [r0]
 	mov r0, r8
 	adds r2, r4, 0
-	bl sub_803B6A4
+	bl SetMonMoveSlot
 	ldr r0, _081139D8
 	movs r3, 0xCF
 	lsls r3, 2
@@ -377985,7 +377985,7 @@ _08132AD0:
 	adds r2, 0x20
 	adds r2, r1
 	ldrh r1, [r2]
-	bl pokemon_moveset_pad_
+	bl GiveMoveToMon
 	lsls r0, 16
 	ldr r1, _08132B28
 	cmp r0, r1
@@ -378483,7 +378483,7 @@ _08132EA4:
 	ldr r2, _08132F48
 	adds r3, r2
 	ldrb r2, [r3]
-	bl sub_803B6A4
+	bl SetMonMoveSlot
 	ldr r0, _08132F4C
 	ldr r1, [r7]
 	ldrb r2, [r1, 0x1B]
@@ -380983,7 +380983,7 @@ sub_8134240: @ 8134240
 	adds r1, r6, 0
 	movs r2, 0x28
 	movs r3, 0x20
-	bl create_pokemon_set_level
+	bl CreateMon
 	ldr r4, _08134300
 	movs r0, 0
 	mov r8, r0
@@ -381243,7 +381243,7 @@ sub_8134450: @ 8134450
 	ldr r0, [r5, 0x4]
 	str r0, [sp]
 	adds r0, r4, 0
-	bl sub_803ACAC
+	bl CreateMonWithIVsPersonality
 	adds r2, r5, 0
 	adds r2, 0xD
 	adds r0, r4, 0
@@ -382508,7 +382508,7 @@ sub_8134DD4: @ 8134DD4
 	add r4, sp, 0xC
 	movs r0, 0xFF
 	strb r0, [r4]
-	bl zero_enemy_party_data
+	bl ZeroEnemyPartyMons
 	ldr r1, _08134E04
 	ldr r2, _08134E08
 	adds r0, r1, r2
@@ -382791,7 +382791,7 @@ _08134FEE:
 	str r2, [sp]
 	ldr r2, [sp, 0x10]
 	ldr r3, [sp, 0x14]
-	bl pokemon_make_ev_something
+	bl CreateMonWithEVSpread
 	movs r5, 0
 	adds r0, r6, 0x1
 	mov r9, r0
@@ -382809,7 +382809,7 @@ _0813502E:
 	lsrs r2, 24
 	adds r0, r7, r3
 	str r3, [sp, 0x24]
-	bl sub_803B6A4
+	bl SetMonMoveSlot
 	ldrh r0, [r4]
 	ldr r3, [sp, 0x24]
 	cmp r0, 0xDA
@@ -383527,7 +383527,7 @@ _081355F4: .4byte 0x03004360
 _081355F8: .4byte 0x0202596c
 _081355FC: .4byte sub_8135534
 _08135600:
-	bl zero_enemy_party_data
+	bl ZeroEnemyPartyMons
 	movs r5, 0
 _08135606:
 	movs r0, 0x64
@@ -416400,17 +416400,17 @@ _08145B80:
 	adds r4, r2, r0
 	adds r0, r4, 0
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 	cmp r0, 0
 	beq _08145BD8
 	adds r0, r4, 0
 	movs r1, 0x2D
-	bl GetMonBoxData
+	bl GetBoxMonData
 	cmp r0, 0
 	bne _08145BD8
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl GetMonBoxData
+	bl GetBoxMonData
 	adds r1, r0, 0
 	ldr r0, _08145C2C
 	ldrh r0, [r0]
@@ -416495,7 +416495,7 @@ _08145C44:
 	adds r0, r1
 	ldr r2, _08145C88
 	movs r1, 0x2
-	bl GetMonBoxData
+	bl GetBoxMonData
 _08145C6C:
 	ldr r0, _08145C88
 	bl StringGetEnd10
diff --git a/asm/rom_803BA2C.s b/asm/rom_803BA2C.s
index cf88cbcb3..9b036e388 100644
--- a/asm/rom_803BA2C.s
+++ b/asm/rom_803BA2C.s
@@ -1367,13 +1367,13 @@ pokemon_roll_gender: @ 803C4C8
 	adds r4, r0, 0
 	movs r1, 0xB
 	movs r2, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 	lsls r0, 16
 	lsrs r5, r0, 16
 	adds r0, r4, 0
 	movs r1, 0
 	movs r2, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 	adds r2, r0, 0
 	ldr r1, _0803C518
 	lsls r0, r5, 3
diff --git a/asm/rom_803D1FC.s b/asm/rom_803D1FC.s
index 9bea02dc1..e25cf776f 100644
--- a/asm/rom_803D1FC.s
+++ b/asm/rom_803D1FC.s
@@ -124,14 +124,14 @@ _0803D2D6:
 	b _0803D2E6
 _0803D2E0:
 	adds r0, r3, 0
-	bl SetMonBoxData
+	bl SetBoxMonData
 _0803D2E6:
 	pop {r0}
 	bx r0
 	thumb_func_end SetMonData
 
-	thumb_func_start SetMonBoxData
-SetMonBoxData: @ 803D2EC
+	thumb_func_start SetBoxMonData
+SetBoxMonData: @ 803D2EC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -168,9 +168,9 @@ SetMonBoxData: @ 803D2EC
 	bl GetSubstruct
 	adds r5, r0, 0
 	adds r0, r7, 0
-	bl DecryptMon
+	bl DecryptBoxMon
 	adds r0, r7, 0
-	bl pokemon_calc_checksum
+	bl CalculateBoxMonChecksum
 	lsls r0, 16
 	lsrs r0, 16
 	ldrh r1, [r7, 0x1C]
@@ -187,7 +187,7 @@ SetMonBoxData: @ 803D2EC
 	orrs r0, r1
 	strb r0, [r5, 0x7]
 	adds r0, r7, 0
-	bl EncryptMon
+	bl EncryptBoxMon
 	b _0803D8F6
 _0803D36C:
 	mov r0, r10
@@ -888,10 +888,10 @@ _0803D8E2:
 	cmp r0, 0xA
 	ble _0803D8F6
 	adds r0, r7, 0
-	bl pokemon_calc_checksum
+	bl CalculateBoxMonChecksum
 	strh r0, [r7, 0x1C]
 	adds r0, r7, 0
-	bl EncryptMon
+	bl EncryptBoxMon
 _0803D8F6:
 	pop {r3-r5}
 	mov r8, r3
@@ -904,7 +904,7 @@ _0803D8F6:
 _0803D904: .4byte 0xfffffc1f
 _0803D908: .4byte 0xfff07fff
 _0803D90C: .4byte 0xfffffe0f
-	thumb_func_end SetMonBoxData
+	thumb_func_end SetBoxMonData
 
 	thumb_func_start CopyMon
 CopyMon: @ 803D910
@@ -1003,7 +1003,7 @@ _0803D9B8:
 	movs r1, 0xB
 	movs r2, 0
 	str r3, [sp]
-	bl GetMonBoxData
+	bl GetBoxMonData
 	ldr r3, [sp]
 	cmp r0, 0
 	bne _0803D9F0
@@ -1251,7 +1251,7 @@ create_enemy_party: @ 803DB8C
 	push {r5-r7}
 	sub sp, 0x18
 	adds r4, r0, 0
-	bl zero_enemy_party_data
+	bl ZeroEnemyPartyMons
 	ldr r5, _0803DC8C
 	adds r0, r5, 0
 	adds r1, r4, 0
@@ -1296,7 +1296,7 @@ _0803DBAC:
 	str r0, [sp, 0xC]
 	adds r0, r5, 0
 	movs r3, 0xF
-	bl create_pokemon_set_level
+	bl CreateMon
 	ldr r2, _0803DC94
 	add r2, r9
 	adds r0, r5, 0
@@ -1486,7 +1486,7 @@ _0803DD62:
 	movs r1, 0xB
 	movs r2, 0
 	str r3, [sp]
-	bl GetMonBoxData
+	bl GetBoxMonData
 	ldr r3, [sp]
 	cmp r0, 0
 	bne _0803DD80
@@ -2588,7 +2588,7 @@ _0803E5E4:
 	mov r2, sp
 	bl SetMonData
 	mov r0, r8
-	bl pokemon_calc_effective_stats
+	bl CalculateMonStats
 	movs r0, 0
 	str r0, [sp, 0x1C]
 _0803E646:
@@ -2935,7 +2935,7 @@ _0803E904:
 	mov r2, sp
 	bl SetMonData
 	mov r0, r8
-	bl pokemon_calc_effective_stats
+	bl CalculateMonStats
 	ldr r0, [sp, 0x24]
 	adds r0, 0x1
 	lsls r0, 24
@@ -3641,7 +3641,7 @@ _0803EED4:
 	mov r2, sp
 	bl SetMonData
 	mov r0, r8
-	bl pokemon_calc_effective_stats
+	bl CalculateMonStats
 	movs r5, 0
 	str r5, [sp, 0x1C]
 	b _0803F130
@@ -7423,20 +7423,20 @@ _08040B30:
 	adds r0, r5, 0
 	adds r1, r4, 0
 	movs r2, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 	cmp r0, 0
 	beq _08040B7C
 	adds r0, r5, 0
 	adds r1, r4, 0
 	movs r2, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 	adds r4, r0, 0
 	lsls r4, 16
 	lsrs r4, 16
 	adds r0, r5, 0
 	movs r1, 0x15
 	movs r2, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -7450,7 +7450,7 @@ _08040B30:
 	adds r1, 0x11
 	adds r0, r5, 0
 	mov r2, sp
-	bl SetMonBoxData
+	bl SetBoxMonData
 _08040B7C:
 	adds r6, 0x1
 	cmp r6, 0x3
diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s
index b38c91c96..b956baaa7 100644
--- a/asm/rom_8040EB4.s
+++ b/asm/rom_8040EB4.s
@@ -583,7 +583,7 @@ pokemon_get_nick_: @ 80412D0
 	adds r4, r1, 0
 	movs r1, 0x2
 	mov r2, sp
-	bl GetMonBoxData
+	bl GetBoxMonData
 	adds r0, r4, 0
 	mov r1, sp
 	bl StringCopy10
@@ -605,7 +605,7 @@ _080412F8:
 	lsls r0, 4
 	adds r0, r6, r0
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 	cmp r0, 0
 	beq _08041310
 	adds r0, r5, 0x1
@@ -646,7 +646,7 @@ _0804133E:
 	adds r4, r1, r0
 	adds r0, r4, 0
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 	cmp r0, 0
 	beq _0804136E
 	adds r0, r7, 0x1
@@ -654,7 +654,7 @@ _0804133E:
 	lsrs r7, r0, 24
 	adds r0, r4, 0
 	movs r1, 0xC
-	bl GetMonBoxData
+	bl GetBoxMonData
 	adds r1, r0, 0
 	cmp r1, 0
 	bne _0804136E
@@ -694,7 +694,7 @@ _0804139A:
 	lsls r0, 4
 	adds r0, r5, r0
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 	cmp r0, 0
 	bne _080413B2
 	lsls r0, r4, 24
@@ -795,7 +795,7 @@ _0804144A:
 	movs r1, 0
 	str r1, [r0]
 	adds r0, r7, 0
-	bl zero_pokemon_struct
+	bl ZeroMonData
 	bl party_compaction
 	bl calc_player_party_count
 	pop {r3,r4}
@@ -837,12 +837,12 @@ sub_80414C0: @ 80414C0
 	adds r4, 0x50
 	adds r0, r4, 0
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 	cmp r0, 0
 	beq _08041516
 	adds r0, r5, 0
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 	adds r6, r0, 0
 	cmp r6, 0
 	bne _08041516
@@ -851,7 +851,7 @@ sub_80414C0: @ 80414C0
 	movs r2, 0x50
 	bl memcpy
 	adds r0, r4, 0
-	bl ZeroPokemonBoxData
+	bl ZeroBoxMonData
 	adds r0, r5, 0
 	adds r0, 0xA0
 	adds r4, 0x88
@@ -898,7 +898,7 @@ _0804153C:
 	ldr r0, _0804156C
 	ldrh r1, [r0]
 	adds r0, r4, 0
-	bl sub_803B8D4
+	bl DeleteFirstMoveAndGiveMoveToMon
 _0804154C:
 	adds r0, r4, 0
 	adds r1, r6, 0
@@ -911,7 +911,7 @@ _0804154C:
 	ble _08041524
 _08041560:
 	adds r0, r4, 0
-	bl pokemon_calc_effective_stats
+	bl CalculateMonStats
 	pop {r4-r7}
 	pop {r0}
 	bx r0
@@ -938,7 +938,7 @@ sub_8041570: @ 8041570
 	bl pokemon_get_nick_
 	adds r0, r6, 0
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 	lsls r0, 16
 	lsrs r0, 16
 	mov r9, r0
@@ -995,7 +995,7 @@ _080415D8:
 _08041610:
 	bl party_compaction
 	adds r0, r6, 0
-	bl ZeroPokemonBoxData
+	bl ZeroBoxMonData
 	movs r2, 0x88
 	lsls r2, 1
 	adds r0, r5, r2
@@ -1046,15 +1046,15 @@ sub_8041664: @ 8041664
 	bl memcpy
 	adds r0, r4, 0
 	movs r1, 0x19
-	bl GetMonBoxData
+	bl GetBoxMonData
 	adds r0, r5
 	str r0, [sp, 0x50]
 	add r2, sp, 0x50
 	mov r0, sp
 	movs r1, 0x19
-	bl SetMonBoxData
+	bl SetBoxMonData
 	mov r0, sp
-	bl sub_803B570
+	bl GetLevelFromBoxMonExp
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0x54
@@ -1077,7 +1077,7 @@ sub_80416A0: @ 80416A0
 	lsls r4, 4
 	adds r4, r5, r4
 	adds r0, r4, 0
-	bl sub_803B570
+	bl GetLevelFromBoxMonExp
 	adds r6, r0, 0
 	lsls r6, 24
 	lsrs r6, 24
@@ -1218,7 +1218,7 @@ sub_80417B8: @ 80417B8
 	ldr r4, _080417DC
 	adds r0, r4
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 	cmp r0, 0
 	bne _080417E0
 	movs r0, 0
@@ -1276,7 +1276,7 @@ _0804182A:
 	adds r0, r4, r5
 	lsls r0, 4
 	adds r0, r6, r0
-	bl ZeroPokemonBoxData
+	bl ZeroBoxMonData
 	movs r1, 0x88
 	lsls r1, 1
 	adds r0, r6, r1
@@ -1574,7 +1574,7 @@ _08041A4C:
 	lsls r0, 4
 	add r0, r8
 	movs r1, 0x27
-	bl GetMonBoxData
+	bl GetBoxMonData
 	add r2, sp, 0x10
 	strb r0, [r2]
 	mov r0, r9
@@ -1590,7 +1590,7 @@ _08041A6C:
 	lsls r0, 4
 	add r0, r8
 	movs r1, 0x28
-	bl GetMonBoxData
+	bl GetBoxMonData
 	strb r0, [r4]
 	mov r0, r9
 	movs r1, 0x28
@@ -1604,7 +1604,7 @@ _08041A88:
 	lsls r0, 4
 	add r0, r8
 	movs r1, 0x29
-	bl GetMonBoxData
+	bl GetBoxMonData
 	strb r0, [r4]
 	mov r0, r9
 	movs r1, 0x29
@@ -1618,7 +1618,7 @@ _08041AA4:
 	lsls r0, 4
 	add r0, r8
 	movs r1, 0x2A
-	bl GetMonBoxData
+	bl GetBoxMonData
 	strb r0, [r4]
 	mov r0, r9
 	movs r1, 0x2A
@@ -1632,7 +1632,7 @@ _08041AC0:
 	lsls r0, 4
 	add r0, r8
 	movs r1, 0x2B
-	bl GetMonBoxData
+	bl GetBoxMonData
 	strb r0, [r4]
 	mov r0, r9
 	movs r1, 0x2B
@@ -1649,7 +1649,7 @@ _08041AE2:
 	lsls r0, 4
 	add r0, r8
 	movs r1, 0x2C
-	bl GetMonBoxData
+	bl GetBoxMonData
 	strb r0, [r4]
 	mov r0, r9
 	movs r1, 0x2C
@@ -1831,14 +1831,14 @@ _08041C46:
 	adds r5, 0xD
 	mov r0, r10
 	adds r1, r5, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 	lsls r4, r6, 1
 	mov r2, r8
 	adds r1, r4, r2
 	strh r0, [r1]
 	mov r0, r9
 	adds r1, r5, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 	ldr r1, _08041CC8
 	adds r4, r1
 	strh r0, [r4]
@@ -1878,7 +1878,7 @@ _08041C9A:
 	adds r1, r0, 0
 	adds r0, r7, 0
 	str r2, [sp, 0x8]
-	bl pokemon_moveset_pad_
+	bl GiveMoveToMon
 	lsls r0, 16
 	lsrs r0, 16
 	ldr r2, [sp, 0x8]
@@ -1886,7 +1886,7 @@ _08041C9A:
 	bne _08041CEA
 	ldrh r1, [r4]
 	adds r0, r7, 0
-	bl sub_803B8D4
+	bl DeleteFirstMoveAndGiveMoveToMon
 	b _08041CEA
 	.align 2, 0
 _08041CC8: .4byte 0x03000500
@@ -1945,14 +1945,14 @@ _08041D16:
 	beq _08041D52
 	ldrh r1, [r4]
 	adds r0, r7, 0
-	bl pokemon_moveset_pad_
+	bl GiveMoveToMon
 	lsls r0, 16
 	lsrs r0, 16
 	cmp r0, r6
 	bne _08041D52
 	ldrh r1, [r4]
 	adds r0, r7, 0
-	bl sub_803B8D4
+	bl DeleteFirstMoveAndGiveMoveToMon
 _08041D52:
 	adds r0, r5, 0x1
 	lsls r0, 16
@@ -2046,7 +2046,7 @@ _08041DDE:
 	adds r1, r0, 0
 	adds r0, r7, 0
 	str r2, [sp, 0x8]
-	bl pokemon_moveset_pad_
+	bl GiveMoveToMon
 	lsls r0, 16
 	lsrs r0, 16
 	ldr r2, [sp, 0x8]
@@ -2054,7 +2054,7 @@ _08041DDE:
 	bne _08041E38
 	ldrh r1, [r4]
 	adds r0, r7, 0
-	bl sub_803B8D4
+	bl DeleteFirstMoveAndGiveMoveToMon
 	b _08041E38
 	.align 2, 0
 _08041E14: .4byte 0x030004d8
@@ -2140,13 +2140,13 @@ incense_effects: @ 8041E8C
 _08041EA4:
 	adds r0, r5, 0
 	movs r1, 0xC
-	bl GetMonBoxData
+	bl GetBoxMonData
 	lsls r0, 16
 	lsrs r6, r0, 16
 	adds r0, r5, 0
 	adds r0, 0x50
 	movs r1, 0xC
-	bl GetMonBoxData
+	bl GetBoxMonData
 	lsls r0, 16
 	lsrs r2, r0, 16
 	ldrh r0, [r4]
@@ -2194,7 +2194,7 @@ _08041EFC:
 	adds r5, r1, r0
 	adds r0, r5, 0
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 	lsls r1, r4, 1
 	add r1, sp
 	strh r0, [r1]
@@ -2370,7 +2370,7 @@ sub_8042044: @ 8042044
 	adds r1, r5, 0
 	movs r2, 0x5
 	movs r3, 0x20
-	bl create_pokemon_set_level
+	bl CreateMon
 	movs r0, 0x12
 	add r0, sp
 	mov r8, r0
@@ -2466,7 +2466,7 @@ sub_80420FC: @ 80420FC
 	adds r1, r5, 0
 	movs r2, 0x5
 	movs r3, 0x20
-	bl create_pokemon_set_level
+	bl CreateMon
 	movs r1, 0x12
 	add r1, sp
 	mov r9, r1
@@ -2538,7 +2538,7 @@ _080421BC:
 	adds r0, r5, 0
 	movs r1, 0x5
 	str r2, [sp, 0x4]
-	bl GetMonBoxData
+	bl GetBoxMonData
 	ldr r2, [sp, 0x4]
 	cmp r0, 0
 	beq _080421DE
@@ -2677,7 +2677,7 @@ sub_80422C4: @ 80422C4
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 	cmp r0, 0
 	beq _080422FC
 	ldr r1, _0804231C
@@ -2685,7 +2685,7 @@ sub_80422C4: @ 80422C4
 	bl pokemon_get_nick_
 	adds r0, r6, 0
 	movs r1, 0x3
-	bl GetMonBoxData
+	bl GetBoxMonData
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -2693,7 +2693,7 @@ sub_80422C4: @ 80422C4
 	adds r0, r6, 0
 	movs r1, 0x7
 	adds r2, r5, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 	adds r0, r5, 0
 	adds r1, r4, 0
 	bl ConvertInternationalString
@@ -2702,7 +2702,7 @@ _080422FC:
 	adds r4, 0x50
 	adds r0, r4, 0
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 	cmp r0, 0
 	beq _08042314
 	ldr r1, _08042324
@@ -2733,7 +2733,7 @@ sub_8042328: @ 8042328
 	muls r0, r5
 	adds r0, r4
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 	lsls r0, 16
 	lsrs r0, 16
 	pop {r4-r6}
@@ -2852,17 +2852,17 @@ daycare_relationship_score: @ 80423D8
 _0804240E:
 	adds r0, r4, 0
 	movs r1, 0xB
-	bl GetMonBoxData
+	bl GetBoxMonData
 	strh r0, [r5]
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl GetMonBoxData
+	bl GetBoxMonData
 	ldr r1, [sp, 0x28]
 	stm r1!, {r0}
 	str r1, [sp, 0x28]
 	adds r0, r4, 0
 	movs r1, 0
-	bl GetMonBoxData
+	bl GetBoxMonData
 	adds r1, r0, 0
 	ldrh r0, [r5]
 	bl pokemon_species_get_gender_info
@@ -3540,7 +3540,7 @@ _08042906:
 	mov r1, r10
 	movs r2, 0x5
 	movs r3, 0x20
-	bl create_pokemon_set_level
+	bl CreateMon
 	movs r4, 0
 _0804295E:
 	adds r1, r4, 0
@@ -3678,7 +3678,7 @@ sub_80429EC: @ 80429EC
 	adds r0, r5, 0
 	bl sub_8040B1C
 	adds r0, r5, 0
-	bl pokemon_calc_effective_stats
+	bl CalculateMonStats
 	add sp, 0x14
 	pop {r4-r6}
 	pop {r0}
@@ -14563,7 +14563,7 @@ _08048058:
 	movs r1, 0
 	movs r2, 0
 	movs r3, 0x20
-	bl create_pokemon_set_level
+	bl CreateMon
 	adds r6, 0x1
 	cmp r6, 0x5
 	ble _08048058
@@ -25316,7 +25316,7 @@ sub_804D948: @ 804D948
 	str r0, [sp, 0xC]
 	adds r0, r6, 0
 	movs r3, 0x20
-	bl create_pokemon_set_level
+	bl CreateMon
 	adds r2, r5, 0
 	adds r2, 0xE
 	adds r0, r6, 0
@@ -25445,7 +25445,7 @@ _0804DAB4:
 	bl SetMonData
 _0804DAC0:
 	ldr r0, _0804DAD0
-	bl pokemon_calc_effective_stats
+	bl CalculateMonStats
 	add sp, 0x38
 	pop {r4-r7}
 	pop {r0}
diff --git a/asm/rom_8065394.s b/asm/rom_8065394.s
index ecc7a720e..1bce0f002 100644
--- a/asm/rom_8065394.s
+++ b/asm/rom_8065394.s
@@ -20728,7 +20728,7 @@ _0806F178: .4byte party_menu_link_mon_held_item_object
 _0806F17C:
 	ldr r0, [r5]
 	ldrh r1, [r5, 0x8]
-	bl pokemon_moveset_pad_
+	bl GiveMoveToMon
 	lsls r0, 16
 	ldr r1, _0806F194
 	cmp r0, r1
@@ -21211,7 +21211,7 @@ sub_806F53C: @ 806F53C
 	lsrs r2, 24
 	adds r0, r5, 0
 	adds r1, r4, 0
-	bl sub_803B6A4
+	bl SetMonMoveSlot
 	adds r0, r6, 0
 	bl sub_806F1D0
 _0806F57A:
diff --git a/include/pokemon.h b/include/pokemon.h
index 2a4da2044..28176d8fe 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -330,44 +330,45 @@ struct BattleMove
     u32 flags;
 };
 
-void ZeroPokemonBoxData(struct BoxPokemon *boxMon);
-void zero_pokemon_struct(struct Pokemon *mon);
-void zero_player_party_data(void);
-void zero_enemy_party_data(void);
-void create_pokemon_set_level(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId);
-void create_pokemon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId);
-void pokemon_make_with_nature(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 nature);
-void unref_sub_803AB44(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 gender, u8 nature, u8 unownLetter);
-void sub_803AC44(struct Pokemon *mon, u16 species, u8 level);
-void unref_sub_803ACEC(struct Pokemon *mon, u16 species, u8 level, u8 *ivs, u32 otId);
-void pokemon_make_ev_something(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 evSpread);
+void ZeroBoxMonData(struct BoxPokemon *boxMon);
+void ZeroMonData(struct Pokemon *mon);
+void ZeroPlayerPartyMons(void);
+void ZeroEnemyPartyMons(void);
+void CreateMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId);
+void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId);
+void CreateMonWithNature(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 nature);
+void CreateMonWithGenderNatureLetter(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 gender, u8 nature, u8 unownLetter);
+void CreateFemaleMon(struct Pokemon *mon, u16 species, u8 level);
+void CreateMonWithIVsPersonality(struct Pokemon *mon, u16 species, u8 level, u32 ivs, u32 personality);
+void CreateMonWithIVsOTID(struct Pokemon *mon, u16 species, u8 level, u8 *ivs, u32 otId);
+void CreateMonWithEVSpread(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 evSpread);
 void sub_803ADE8(struct Pokemon *mon, struct UnknownPokemonStruct *src);
 void sub_803AF78(struct Pokemon *mon, struct UnknownPokemonStruct *dest);
-u16 pokemon_calc_checksum(struct BoxPokemon *boxMon);
-void pokemon_calc_effective_stats(struct Pokemon *mon);
+u16 CalculateBoxMonChecksum(struct BoxPokemon *boxMon);
+void CalculateMonStats(struct Pokemon *mon);
 void sub_803B4B4(struct Pokemon *src, struct Pokemon *dest);
-u8 level_by_exp(struct Pokemon *mon);
-u8 sub_803B570(struct BoxPokemon *boxMon);
-u16 pokemon_moveset_pad_(struct Pokemon *mon, u16 value);
-u16 pokemon_moveset_pad(struct BoxPokemon *boxMon, u16 value);
-u16 sub_803B660(struct BattlePokemon *mon, u16 value);
-void sub_803B6A4(struct Pokemon *mon, u16 move, u8 slot);
-void sub_803B6E4(struct BattlePokemon *mon, u16 move, u8 slot);
-void unref_sub_803B714(struct Pokemon *mon);
-void sub_803B720(struct BoxPokemon *boxMon);
+u8 GetLevelFromMonExp(struct Pokemon *mon);
+u8 GetLevelFromBoxMonExp(struct BoxPokemon *boxMon);
+u16 GiveMoveToMon(struct Pokemon *mon, u16 move);
+u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move);
+u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move);
+void SetMonMoveSlot(struct Pokemon *mon, u16 move, u8 slot);
+void SetBattleMonMoveSlot(struct BattlePokemon *mon, u16 move, u8 slot);
+void GiveMonInitialMoveset(struct Pokemon *mon);
+void GiveBoxMonInitialMoveset(struct BoxPokemon *boxMon);
 u16 sub_803B7C8(struct Pokemon *mon, u8 a2);
-void sub_803B8D4(struct Pokemon *mon, u16 move);
-void sub_803B980(struct BoxPokemon *boxMon, u16 move);
+void DeleteFirstMoveAndGiveMoveToMon(struct Pokemon *mon, u16 move);
+void DeleteFirstMoveAndGiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move);
 
 u8 pokemon_species_get_gender_info(u16 species, u32 personality);
 
-void EncryptMon(struct BoxPokemon *boxMon);
-void DecryptMon(struct BoxPokemon *boxMon);
+void EncryptBoxMon(struct BoxPokemon *boxMon);
+void DecryptBoxMon(struct BoxPokemon *boxMon);
 union PokemonSubstruct *GetSubstruct(struct BoxPokemon *boxMon, u32 personality, u8 substructType);
 u32 GetMonData(struct Pokemon *mon, s32 field, u8 *data);
-u32 GetMonBoxData(struct BoxPokemon *boxMon, s32 field, u8 *data);
+u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data);
 void SetMonData(struct Pokemon *mon, s32 field, u8 *data);
-void SetMonBoxData(struct BoxPokemon *boxMon, s32 field, const u8 *data);
+void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const u8 *data);
 
 u8 GetNature(struct Pokemon *mon);
 u8 GetNatureFromPersonality(u32 personality);
diff --git a/src/pokemon_1.c b/src/pokemon_1.c
index e07566860..ccfc2c84d 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -19,7 +19,7 @@ extern struct BaseStats gBaseStats[];
 extern struct BattleMove gBattleMoves[];
 extern const u16 *gLevelUpLearnsets[];
 
-void ZeroPokemonBoxData(struct BoxPokemon *boxMon)
+void ZeroBoxMonData(struct BoxPokemon *boxMon)
 {
     u8 *raw = (u8 *)boxMon;
     u32 i;
@@ -27,10 +27,10 @@ void ZeroPokemonBoxData(struct BoxPokemon *boxMon)
         raw[i] = 0;
 }
 
-void zero_pokemon_struct(struct Pokemon *mon)
+void ZeroMonData(struct Pokemon *mon)
 {
     u32 arg;
-    ZeroPokemonBoxData(&mon->box);
+    ZeroBoxMonData(&mon->box);
     arg = 0;
     SetMonData(mon, MON_DATA_STATUS, (u8 *)&arg);
     SetMonData(mon, MON_DATA_LEVEL, (u8 *)&arg);
@@ -45,39 +45,39 @@ void zero_pokemon_struct(struct Pokemon *mon)
     SetMonData(mon, MON_DATA_64, (u8 *)&arg);
 }
 
-void zero_player_party_data(void)
+void ZeroPlayerPartyMons(void)
 {
     s32 i;
     for (i = 0; i < 6; i++)
-        zero_pokemon_struct(&gPlayerParty[i]);
+        ZeroMonData(&gPlayerParty[i]);
 }
 
-void zero_enemy_party_data(void)
+void ZeroEnemyPartyMons(void)
 {
     s32 i;
     for (i = 0; i < 6; i++)
-        zero_pokemon_struct(&gEnemyParty[i]);
+        ZeroMonData(&gEnemyParty[i]);
 }
 
-void create_pokemon_set_level(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId)
+void CreateMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId)
 {
     u32 arg;
-    zero_pokemon_struct(mon);
-    create_pokemon(&mon->box, species, level, fixedIV, hasFixedPersonality, fixedPersonality, otIdType, fixedOtId);
+    ZeroMonData(mon);
+    CreateBoxMon(&mon->box, species, level, fixedIV, hasFixedPersonality, fixedPersonality, otIdType, fixedOtId);
     SetMonData(mon, MON_DATA_LEVEL, &level);
     arg = 255;
     SetMonData(mon, MON_DATA_64, (u8 *)&arg);
-    pokemon_calc_effective_stats(mon);
+    CalculateMonStats(mon);
 }
 
-void create_pokemon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId)
+void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId)
 {
     u8 speciesName[10];
     u32 personality;
     u32 value;
     u16 checksum;
 
-    ZeroPokemonBoxData(boxMon);
+    ZeroBoxMonData(boxMon);
 
     if (hasFixedPersonality)
     {
@@ -89,7 +89,7 @@ void create_pokemon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV
         personality = (u16)r | (Random() << 16);
     }
 
-    SetMonBoxData(boxMon, MON_DATA_PERSONALITY, (u8 *)&personality);
+    SetBoxMonData(boxMon, MON_DATA_PERSONALITY, (u8 *)&personality);
 
     if (otIdType == 2)
     {
@@ -114,34 +114,34 @@ void create_pokemon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV
               | (gSaveBlock2.playerTrainerId[3] << 24);
     }
 
-    SetMonBoxData(boxMon, MON_DATA_OT_ID, (u8 *)&value);
+    SetBoxMonData(boxMon, MON_DATA_OT_ID, (u8 *)&value);
 
-    checksum = pokemon_calc_checksum(boxMon);
-    SetMonBoxData(boxMon, MON_DATA_CHECKSUM, (u8 *)&checksum);
-    EncryptMon(boxMon);
+    checksum = CalculateBoxMonChecksum(boxMon);
+    SetBoxMonData(boxMon, MON_DATA_CHECKSUM, (u8 *)&checksum);
+    EncryptBoxMon(boxMon);
     GetSpeciesName(speciesName, species);
-    SetMonBoxData(boxMon, MON_DATA_NICKNAME, speciesName);
-    SetMonBoxData(boxMon, MON_DATA_LANGUAGE, &gGameLanguage);
-    SetMonBoxData(boxMon, MON_DATA_OT_NAME, gSaveBlock2.playerName);
-    SetMonBoxData(boxMon, MON_DATA_SPECIES, (u8 *)&species);
-    SetMonBoxData(boxMon, MON_DATA_EXP, (u8 *)&gExperienceTables[gBaseStats[species].growthRate][level]);
-    SetMonBoxData(boxMon, MON_DATA_FRIENDSHIP, &gBaseStats[species].friendship);
+    SetBoxMonData(boxMon, MON_DATA_NICKNAME, speciesName);
+    SetBoxMonData(boxMon, MON_DATA_LANGUAGE, &gGameLanguage);
+    SetBoxMonData(boxMon, MON_DATA_OT_NAME, gSaveBlock2.playerName);
+    SetBoxMonData(boxMon, MON_DATA_SPECIES, (u8 *)&species);
+    SetBoxMonData(boxMon, MON_DATA_EXP, (u8 *)&gExperienceTables[gBaseStats[species].growthRate][level]);
+    SetBoxMonData(boxMon, MON_DATA_FRIENDSHIP, &gBaseStats[species].friendship);
     value = sav1_map_get_name();
-    SetMonBoxData(boxMon, MON_DATA_MET_LOCATION, (u8 *)&value);
-    SetMonBoxData(boxMon, MON_DATA_MET_LEVEL, &level);
-    SetMonBoxData(boxMon, MON_DATA_MET_GAME, &gGameVersion);
+    SetBoxMonData(boxMon, MON_DATA_MET_LOCATION, (u8 *)&value);
+    SetBoxMonData(boxMon, MON_DATA_MET_LEVEL, &level);
+    SetBoxMonData(boxMon, MON_DATA_MET_GAME, &gGameVersion);
     value = 4;
-    SetMonBoxData(boxMon, MON_DATA_POKEBALL, (u8 *)&value);
-    SetMonBoxData(boxMon, MON_DATA_OT_GENDER, &gSaveBlock2.playerGender);
+    SetBoxMonData(boxMon, MON_DATA_POKEBALL, (u8 *)&value);
+    SetBoxMonData(boxMon, MON_DATA_OT_GENDER, &gSaveBlock2.playerGender);
 
     if (fixedIV < 32)
     {
-        SetMonBoxData(boxMon, MON_DATA_HP_IV, &fixedIV);
-        SetMonBoxData(boxMon, MON_DATA_ATK_IV, &fixedIV);
-        SetMonBoxData(boxMon, MON_DATA_DEF_IV, &fixedIV);
-        SetMonBoxData(boxMon, MON_DATA_SPD_IV, &fixedIV);
-        SetMonBoxData(boxMon, MON_DATA_SPATK_IV, &fixedIV);
-        SetMonBoxData(boxMon, MON_DATA_SPDEF_IV, &fixedIV);
+        SetBoxMonData(boxMon, MON_DATA_HP_IV, &fixedIV);
+        SetBoxMonData(boxMon, MON_DATA_ATK_IV, &fixedIV);
+        SetBoxMonData(boxMon, MON_DATA_DEF_IV, &fixedIV);
+        SetBoxMonData(boxMon, MON_DATA_SPD_IV, &fixedIV);
+        SetBoxMonData(boxMon, MON_DATA_SPATK_IV, &fixedIV);
+        SetBoxMonData(boxMon, MON_DATA_SPDEF_IV, &fixedIV);
     }
     else
     {
@@ -149,32 +149,32 @@ void create_pokemon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV
         value = (u16)Random();
 
         iv = value & 0x1F;
-        SetMonBoxData(boxMon, MON_DATA_HP_IV, (u8 *)&iv);
+        SetBoxMonData(boxMon, MON_DATA_HP_IV, (u8 *)&iv);
         iv = (value & 0x3E0) >> 5;
-        SetMonBoxData(boxMon, MON_DATA_ATK_IV, (u8 *)&iv);
+        SetBoxMonData(boxMon, MON_DATA_ATK_IV, (u8 *)&iv);
         iv = (value &0x7C00) >> 10;
-        SetMonBoxData(boxMon, MON_DATA_DEF_IV, (u8 *)&iv);
+        SetBoxMonData(boxMon, MON_DATA_DEF_IV, (u8 *)&iv);
 
         value = (u16)Random();
 
         iv = value & 0x1F;
-        SetMonBoxData(boxMon, MON_DATA_SPD_IV, (u8 *)&iv);
+        SetBoxMonData(boxMon, MON_DATA_SPD_IV, (u8 *)&iv);
         iv = (value & 0x3E0) >> 5;
-        SetMonBoxData(boxMon, MON_DATA_SPATK_IV, (u8 *)&iv);
+        SetBoxMonData(boxMon, MON_DATA_SPATK_IV, (u8 *)&iv);
         iv = (value &0x7C00) >> 10;
-        SetMonBoxData(boxMon, MON_DATA_SPDEF_IV, (u8 *)&iv);
+        SetBoxMonData(boxMon, MON_DATA_SPDEF_IV, (u8 *)&iv);
     }
 
     if (gBaseStats[species].ability2)
     {
         value = personality & 1;
-        SetMonBoxData(boxMon, MON_DATA_ALT_ABILITY, (u8 *)&value);
+        SetBoxMonData(boxMon, MON_DATA_ALT_ABILITY, (u8 *)&value);
     }
 
-    sub_803B720(boxMon);
+    GiveBoxMonInitialMoveset(boxMon);
 }
 
-void pokemon_make_with_nature(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 nature)
+void CreateMonWithNature(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 nature)
 {
     u32 personality;
 
@@ -185,10 +185,10 @@ void pokemon_make_with_nature(struct Pokemon *mon, u16 species, u8 level, u8 fix
     }
     while (nature != GetNatureFromPersonality(personality));
 
-    create_pokemon_set_level(mon, species, level, fixedIV, 1, personality, 0, 0);
+    CreateMon(mon, species, level, fixedIV, 1, personality, 0, 0);
 }
 
-void unref_sub_803AB44(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 gender, u8 nature, u8 unownLetter)
+void CreateMonWithGenderNatureLetter(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 gender, u8 nature, u8 unownLetter)
 {
     u32 personality;
 
@@ -217,10 +217,10 @@ void unref_sub_803AB44(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u
             || gender != pokemon_species_get_gender_info(species, personality));
     }
 
-    create_pokemon_set_level(mon, species, level, fixedIV, 1, personality, 0, 0);
+    CreateMon(mon, species, level, fixedIV, 1, personality, 0, 0);
 }
 
-void sub_803AC44(struct Pokemon *mon, u16 species, u8 level)
+void CreateFemaleMon(struct Pokemon *mon, u16 species, u8 level)
 {
     u32 personality;
     u32 otId;
@@ -234,29 +234,29 @@ void sub_803AC44(struct Pokemon *mon, u16 species, u8 level)
         personality = (u16)r2 | (Random() << 16);
     }
     while (pokemon_species_get_gender_info(species, personality) != MALE);
-    create_pokemon_set_level(mon, species, level, 32, 1, personality, 1, otId);
+    CreateMon(mon, species, level, 32, 1, personality, 1, otId);
 }
 
-void sub_803ACAC(struct Pokemon *mon, u16 species, u8 level, u32 ivs, u32 personality)
+void CreateMonWithIVsPersonality(struct Pokemon *mon, u16 species, u8 level, u32 ivs, u32 personality)
 {
-    create_pokemon_set_level(mon, species, level, 0, 1, personality, 0, 0);
+    CreateMon(mon, species, level, 0, 1, personality, 0, 0);
     SetMonData(mon, MON_DATA_IVS, (u8 *)&ivs);
-    pokemon_calc_effective_stats(mon);
+    CalculateMonStats(mon);
 }
 
-void unref_sub_803ACEC(struct Pokemon *mon, u16 species, u8 level, u8 *ivs, u32 otId)
+void CreateMonWithIVsOTID(struct Pokemon *mon, u16 species, u8 level, u8 *ivs, u32 otId)
 {
-    create_pokemon_set_level(mon, species, level, 0, 0, 0, 1, otId);
+    CreateMon(mon, species, level, 0, 0, 0, 1, otId);
     SetMonData(mon, MON_DATA_HP_IV, &ivs[0]);
     SetMonData(mon, MON_DATA_ATK_IV, &ivs[1]);
     SetMonData(mon, MON_DATA_DEF_IV, &ivs[2]);
     SetMonData(mon, MON_DATA_SPD_IV, &ivs[3]);
     SetMonData(mon, MON_DATA_SPATK_IV, &ivs[4]);
     SetMonData(mon, MON_DATA_SPDEF_IV, &ivs[5]);
-    pokemon_calc_effective_stats(mon);
+    CalculateMonStats(mon);
 }
 
-void pokemon_make_ev_something(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 evSpread)
+void CreateMonWithEVSpread(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 evSpread)
 {
     register s32 i asm("r5");
     register u32 temp asm("r4");
@@ -265,7 +265,7 @@ void pokemon_make_ev_something(struct Pokemon *mon, u16 species, u8 level, u8 fi
     register u32 mask1 asm("r1");
     u8 mask2;
 
-    create_pokemon_set_level(mon, species, level, fixedIV, 0, 0, 0, 0);
+    CreateMon(mon, species, level, fixedIV, 0, 0, 0, 0);
 
     temp = evSpread;
     mask1 = 1;
@@ -290,7 +290,7 @@ void pokemon_make_ev_something(struct Pokemon *mon, u16 species, u8 level, u8 fi
         i++;
     } while (i < 6);
 
-    pokemon_calc_effective_stats(mon);
+    CalculateMonStats(mon);
 }
 
 void sub_803ADE8(struct Pokemon *mon, struct UnknownPokemonStruct *src)
@@ -300,10 +300,10 @@ void sub_803ADE8(struct Pokemon *mon, struct UnknownPokemonStruct *src)
     u8 language;
     u8 value;
 
-    create_pokemon_set_level(mon, src->species, src->level, 0, 1, src->personality, 1, src->otId);
+    CreateMon(mon, src->species, src->level, 0, 1, src->personality, 1, src->otId);
 
     for (i = 0; i < 4; i++)
-        sub_803B6A4(mon, src->moves[i], i);
+        SetMonMoveSlot(mon, src->moves[i], i);
 
     SetMonData(mon, MON_DATA_PP_BONUSES, (u8 *)&src->ppBonuses);
     SetMonData(mon, MON_DATA_HELD_ITEM, (u8 *)&src->heldItem);
@@ -339,7 +339,7 @@ void sub_803ADE8(struct Pokemon *mon, struct UnknownPokemonStruct *src)
     SetMonData(mon, MON_DATA_SPATK_IV, &value);
     value = src->spDefenseIV;
     SetMonData(mon, MON_DATA_SPDEF_IV, &value);
-    pokemon_calc_effective_stats(mon);
+    CalculateMonStats(mon);
 }
 
 void sub_803AF78(struct Pokemon *mon, struct UnknownPokemonStruct *dest)
@@ -379,7 +379,7 @@ void sub_803AF78(struct Pokemon *mon, struct UnknownPokemonStruct *dest)
     GetMonData(mon, MON_DATA_NICKNAME, dest->nickname);
 }
 
-u16 pokemon_calc_checksum(struct BoxPokemon *boxMon)
+u16 CalculateBoxMonChecksum(struct BoxPokemon *boxMon)
 {
     u16 checksum = 0;
     union PokemonSubstruct *substruct0 = GetSubstruct(boxMon, boxMon->personality, 0);
@@ -412,7 +412,7 @@ u16 pokemon_calc_checksum(struct BoxPokemon *boxMon)
     SetMonData(mon, field, (u8 *)&n);                           \
 }
 
-void pokemon_calc_effective_stats(struct Pokemon *mon)
+void CalculateMonStats(struct Pokemon *mon)
 {
     s32 oldMaxHP = GetMonData(mon, MON_DATA_MAX_HP, NULL);
     s32 currentHP = GetMonData(mon, MON_DATA_HP, NULL);
@@ -429,7 +429,7 @@ void pokemon_calc_effective_stats(struct Pokemon *mon)
     s32 spDefenseIV = GetMonData(mon, MON_DATA_SPDEF_IV, NULL);
     s32 spDefenseEV = GetMonData(mon, MON_DATA_SPDEF_EV, NULL);
     u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
-    s32 level = level_by_exp(mon);
+    s32 level = GetLevelFromMonExp(mon);
     s32 newMaxHP;
     u8 nature;
 
@@ -488,10 +488,10 @@ void sub_803B4B4(struct Pokemon *src, struct Pokemon *dest)
     SetMonData(dest, MON_DATA_MAX_HP, (u8 *)&value);
     value = 255;
     SetMonData(dest, MON_DATA_64, (u8 *)&value);
-    pokemon_calc_effective_stats(dest);
+    CalculateMonStats(dest);
 }
 
-u8 level_by_exp(struct Pokemon *mon)
+u8 GetLevelFromMonExp(struct Pokemon *mon)
 {
     u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
     u32 exp = GetMonData(mon, MON_DATA_EXP, NULL);
@@ -503,10 +503,10 @@ u8 level_by_exp(struct Pokemon *mon)
     return level - 1;
 }
 
-u8 sub_803B570(struct BoxPokemon *boxMon)
+u8 GetLevelFromBoxMonExp(struct BoxPokemon *boxMon)
 {
-    u16 species = GetMonBoxData(boxMon, MON_DATA_SPECIES, NULL);
-    u32 exp = GetMonBoxData(boxMon, MON_DATA_EXP, NULL);
+    u16 species = GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL);
+    u32 exp = GetBoxMonData(boxMon, MON_DATA_EXP, NULL);
     s32 level = 1;
 
     while (level <= 100 && gExperienceTables[gBaseStats[species].growthRate][level] <= exp)
@@ -515,30 +515,30 @@ u8 sub_803B570(struct BoxPokemon *boxMon)
     return level - 1;
 }
 
-u16 pokemon_moveset_pad_(struct Pokemon *mon, u16 value)
+u16 GiveMoveToMon(struct Pokemon *mon, u16 move)
 {
-    return pokemon_moveset_pad(&mon->box, value);
+    return GiveMoveToBoxMon(&mon->box, move);
 }
 
-u16 pokemon_moveset_pad(struct BoxPokemon *boxMon, u16 value)
+u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move)
 {
     s32 i;
     for (i = 0; i < 4; i++)
     {
-        u16 move = GetMonBoxData(boxMon, MON_DATA_MOVE1 + i, NULL);
-        if (!move)
+        u16 existingMove = GetBoxMonData(boxMon, MON_DATA_MOVE1 + i, NULL);
+        if (!existingMove)
         {
-            SetMonBoxData(boxMon, MON_DATA_MOVE1 + i, (u8 *)&value);
-            SetMonBoxData(boxMon, MON_DATA_PP1 + i, &gBattleMoves[value].pp);
-            return value;
+            SetBoxMonData(boxMon, MON_DATA_MOVE1 + i, (u8 *)&move);
+            SetBoxMonData(boxMon, MON_DATA_PP1 + i, &gBattleMoves[move].pp);
+            return move;
         }
-        if (move == value)
+        if (existingMove == move)
             return -2;
     }
     return -1;
 }
 
-u16 sub_803B660(struct BattlePokemon *mon, u16 value)
+u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move)
 {
     s32 i;
 
@@ -546,36 +546,36 @@ u16 sub_803B660(struct BattlePokemon *mon, u16 value)
     {
         if (!mon->moves[i])
         {
-            mon->moves[i] = value;
-            mon->pp[i] = gBattleMoves[value].pp;
-            return value;
+            mon->moves[i] = move;
+            mon->pp[i] = gBattleMoves[move].pp;
+            return move;
         }
     }
 
     return -1;
 }
 
-void sub_803B6A4(struct Pokemon *mon, u16 move, u8 slot)
+void SetMonMoveSlot(struct Pokemon *mon, u16 move, u8 slot)
 {
     SetMonData(mon, MON_DATA_MOVE1 + slot, (u8 *)&move);
     SetMonData(mon, MON_DATA_PP1 + slot, &gBattleMoves[move].pp);
 }
 
-void sub_803B6E4(struct BattlePokemon *mon, u16 move, u8 slot)
+void SetBattleMonMoveSlot(struct BattlePokemon *mon, u16 move, u8 slot)
 {
     mon->moves[slot] = move;
     mon->pp[slot] = gBattleMoves[move].pp;
 }
 
-void unref_sub_803B714(struct Pokemon *mon)
+void GiveMonInitialMoveset(struct Pokemon *mon)
 {
-    sub_803B720(&mon->box);
+    GiveBoxMonInitialMoveset(&mon->box);
 }
 
-void sub_803B720(struct BoxPokemon *boxMon)
+void GiveBoxMonInitialMoveset(struct BoxPokemon *boxMon)
 {
-    u16 species = GetMonBoxData(boxMon, MON_DATA_SPECIES, NULL);
-    s32 level = sub_803B570(boxMon);
+    u16 species = GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL);
+    s32 level = GetLevelFromBoxMonExp(boxMon);
     s32 i;
 
     for (i = 0; gLevelUpLearnsets[species][i] != (u16)-1; i++)
@@ -590,8 +590,8 @@ void sub_803B720(struct BoxPokemon *boxMon)
 
         move = (gLevelUpLearnsets[species][i] & 0x1FF);
 
-        if (pokemon_moveset_pad(boxMon, move) == (u16)-1)
-            sub_803B980(boxMon, move);
+        if (GiveMoveToBoxMon(boxMon, move) == (u16)-1)
+            DeleteFirstMoveAndGiveMoveToBoxMon(boxMon, move);
     }
 }
 
@@ -617,13 +617,13 @@ u16 sub_803B7C8(struct Pokemon *mon, u8 a2)
     {
         word_2024E82 = (gLevelUpLearnsets[species][byte_2024E88] & 0x1FF);
         byte_2024E88++;
-        retVal = pokemon_moveset_pad_(mon, word_2024E82);
+        retVal = GiveMoveToMon(mon, word_2024E82);
     }
 
     return retVal;
 }
 
-void sub_803B8D4(struct Pokemon *mon, u16 move)
+void DeleteFirstMoveAndGiveMoveToMon(struct Pokemon *mon, u16 move)
 {
     s32 i;
     u16 moves[4];
@@ -650,7 +650,7 @@ void sub_803B8D4(struct Pokemon *mon, u16 move)
     SetMonData(mon, MON_DATA_PP_BONUSES, &ppBonuses);
 }
 
-void sub_803B980(struct BoxPokemon *boxMon, u16 move)
+void DeleteFirstMoveAndGiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move)
 {
     s32 i;
     u16 moves[4];
@@ -659,20 +659,20 @@ void sub_803B980(struct BoxPokemon *boxMon, u16 move)
 
     for (i = 0; i < 3; i++)
     {
-        moves[i] = GetMonBoxData(boxMon, MON_DATA_MOVE2 + i, NULL);
-        pp[i]= GetMonBoxData(boxMon, MON_DATA_PP2 + i, NULL);
+        moves[i] = GetBoxMonData(boxMon, MON_DATA_MOVE2 + i, NULL);
+        pp[i]= GetBoxMonData(boxMon, MON_DATA_PP2 + i, NULL);
     }
 
-    ppBonuses = GetMonBoxData(boxMon, MON_DATA_PP_BONUSES, NULL);
+    ppBonuses = GetBoxMonData(boxMon, MON_DATA_PP_BONUSES, NULL);
     ppBonuses >>= 2;
     moves[3] = move;
     pp[3] = gBattleMoves[move].pp;
 
     for (i = 0; i < 4; i++)
     {
-        SetMonBoxData(boxMon, MON_DATA_MOVE1 + i, (u8 *)&moves[i]);
-        SetMonBoxData(boxMon, MON_DATA_PP1 + i, &pp[i]);
+        SetBoxMonData(boxMon, MON_DATA_MOVE1 + i, (u8 *)&moves[i]);
+        SetBoxMonData(boxMon, MON_DATA_PP1 + i, &pp[i]);
     }
 
-    SetMonBoxData(boxMon, MON_DATA_PP_BONUSES, &ppBonuses);
+    SetBoxMonData(boxMon, MON_DATA_PP_BONUSES, &ppBonuses);
 }
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index e3f93645a..9f9fc3911 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -9,7 +9,7 @@ extern u8 gBadEggNickname[];
 extern u8 gEggNickname[];
 extern u32 gBitTable[];
 
-void EncryptMon(struct BoxPokemon *boxMon)
+void EncryptBoxMon(struct BoxPokemon *boxMon)
 {
     u32 i;
     for (i = 0; i < 12; i++)
@@ -19,7 +19,7 @@ void EncryptMon(struct BoxPokemon *boxMon)
     }
 }
 
-void DecryptMon(struct BoxPokemon *boxMon)
+void DecryptBoxMon(struct BoxPokemon *boxMon)
 {
     u32 i;
     for (i = 0; i < 12; i++)
@@ -133,11 +133,11 @@ u32 GetMonData(struct Pokemon *mon, s32 field, u8 *data)
     case MON_DATA_64:
         return mon->pokerus;
     default:
-        return GetMonBoxData(&mon->box, field, data);
+        return GetBoxMonData(&mon->box, field, data);
     }
 }
 
-u32 GetMonBoxData(struct BoxPokemon *boxMon, s32 field, u8 *data)
+u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data)
 {
     u32 retVal = 0;
     struct PokemonSubstruct0 *substruct0 = NULL;
@@ -152,9 +152,9 @@ u32 GetMonBoxData(struct BoxPokemon *boxMon, s32 field, u8 *data)
         substruct2 = &(GetSubstruct(boxMon, boxMon->personality, 2)->type2);
         substruct3 = &(GetSubstruct(boxMon, boxMon->personality, 3)->type3);
 
-        DecryptMon(boxMon);
+        DecryptBoxMon(boxMon);
 
-        if (pokemon_calc_checksum(boxMon) != boxMon->checksum)
+        if (CalculateBoxMonChecksum(boxMon) != boxMon->checksum)
         {
             boxMon->isBadEgg = 1;
             boxMon->sanity3 = 1;
@@ -468,7 +468,7 @@ u32 GetMonBoxData(struct BoxPokemon *boxMon, s32 field, u8 *data)
     }
 
     if (field > MON_DATA_10)
-        EncryptMon(boxMon);
+        EncryptBoxMon(boxMon);
 
     return retVal;
 }