Merge pull request #210 from PikalaxALT/pikalax_work

misc naming and cleanup

13 files changed, 146 insertions, 140 deletions

diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 11800b6f..aa0610f2 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -44401,7 +44401,7 @@ MOD05_021ECF14: ; 0x021ECF14
 	add r6, r1, #0
 	add r5, r0, #0
 	add r0, r6, #0
-	mov r1, #0x13
+	mov r1, #0x13 ; BASE_EGG_CYCLES
 	add r4, r3, #0
 	bl GetMonBaseStat
 	add r1, sp, #0x10
@@ -44511,7 +44511,7 @@ MOD05_021ED00C: ; 0x021ED00C
 	str r1, [sp, #0x10]
 	add r7, r0, #0
 	ldr r0, [sp, #0x10]
-	mov r1, #0x13
+	mov r1, #0x13 ; BASE_EGG_CYCLES
 	add r5, r2, #0
 	add r6, r3, #0
 	bl GetMonBaseStat
@@ -44782,11 +44782,11 @@ _021ED228:
 	bl GetGenderBySpeciesAndPersonality
 	stmia r7!, {r0}
 	ldrh r0, [r4]
-	mov r1, #0x16
+	mov r1, #0x16 ; BASE_EGG_GROUP_1
 	bl GetMonBaseStat
 	strh r0, [r6]
 	ldrh r0, [r4]
-	mov r1, #0x17
+	mov r1, #0x17 ; GASE_EGG_GROUP_2
 	bl GetMonBaseStat
 	strh r0, [r6, #2]
 	ldr r0, [sp]
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 81c8d551..b8101755 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -6631,7 +6631,7 @@ MOD06_0223C854: ; 0x0223C854
 	cmp r0, #0x38
 	bne _0223C8BE
 	ldr r0, [sp, #0x10]
-	mov r1, #0x12
+	mov r1, #0x12 ; BASE_GENDER_RATIO
 	bl GetMonBaseStat
 	cmp r0, #0
 	beq _0223C8E0
@@ -6753,7 +6753,7 @@ MOD06_0223C968: ; 0x0223C968
 	add r4, r0, #0
 	bl ZeroMonData
 	add r0, r7, #0
-	mov r1, #0x12
+	mov r1, #0x12 ; BASE_GENDER_RATIO
 	mov r6, #1
 	bl GetMonBaseStat
 	cmp r0, #0
@@ -7384,13 +7384,13 @@ _0223CE6A:
 	lsl r0, r5, #3
 	str r0, [sp, #0xc]
 	ldr r0, [r6, r0]
-	mov r1, #6
+	mov r1, #6 ; BASE_TYPE1
 	bl GetMonBaseStat
 	lsl r0, r0, #0x18
 	lsr r0, r0, #0x18
 	str r0, [sp, #8]
 	ldr r0, [sp, #0xc]
-	mov r1, #7
+	mov r1, #7 ; BASE_TYPE2
 	ldr r0, [r6, r0]
 	bl GetMonBaseStat
 	lsl r0, r0, #0x18
@@ -22731,7 +22731,7 @@ _0224499C:
 	mov r0, #0
 	strb r0, [r5, #0x1e]
 	ldr r0, _02244A30 ; =gGameLanguage
-	mov r1, #0x19
+	mov r1, #0x19 ; BASE_ABILITY_2
 	ldrb r0, [r0]
 	strb r0, [r5, #0x1f]
 	ldrh r0, [r5]
@@ -22750,7 +22750,7 @@ _0224499C:
 	b _022449F2
 _022449CC:
 	ldrh r0, [r5]
-	mov r1, #0x18
+	mov r1, #0x18 ; BASE_ABILITY_1
 	lsl r0, r0, #0x15
 	lsr r0, r0, #0x15
 	bl GetMonBaseStat
@@ -22760,7 +22760,7 @@ _022449CC:
 	b _022449F2
 _022449E0:
 	ldrh r0, [r5]
-	mov r1, #0x18
+	mov r1, #0x18 ; BASE_ABILITY_1
 	lsl r0, r0, #0x15
 	lsr r0, r0, #0x15
 	bl GetMonBaseStat
@@ -23297,7 +23297,7 @@ MOD06_02244DC4: ; 0x02244DC4
 	lsl r0, r0, #2
 	str r1, [r7, r0]
 	add r0, r4, #0
-	mov r1, #0x12
+	mov r1, #0x12 ; BASE_GENDER_RATIO
 	bl GetMonBaseStat
 	lsl r0, r0, #0x18
 	lsr r0, r0, #0x18
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s
index 33ba2c25..7a18d017 100644
--- a/arm9/modules/11/asm/module_11.s
+++ b/arm9/modules/11/asm/module_11.s
@@ -12541,8 +12541,8 @@ _022338F0:
 _022338F4: .word 0x00002150
 _022338F8: .word 0x0000214C
 
-	thumb_func_start MOD11_022338FC
-MOD11_022338FC: ; 0x022338FC
+	thumb_func_start CalcExperienceGain
+CalcExperienceGain: ; 0x022338FC
 	push {r3, r4, r5, r6, r7, lr}
 	sub sp, #8
 	add r5, r1, #0
@@ -12643,7 +12643,7 @@ _022339C6:
 	mov r0, #0xb5
 	lsl r0, r0, #6
 	ldrh r0, [r1, r0]
-	mov r1, #9
+	mov r1, #9 ; BASE_EXP_YIELD
 	bl GetMonBaseStat
 	lsl r0, r0, #0x10
 	lsr r1, r0, #0x10
@@ -20686,7 +20686,7 @@ _02237900:
 	add r4, r0, #0
 	ldr r0, [sp, #4]
 	add r1, r6, #0
-	mov r2, #1
+	mov r2, #1 ; BASE_ATK
 	bl GetMonBaseStat_HandleFormeConversion
 	ldr r1, _02237AB0 ; =0x00002144
 	ldr r2, _02237AB4 ; =0x00003044
@@ -20716,7 +20716,7 @@ _02237900:
 	ldrh r0, [r2, r1]
 	add r1, #0x26
 	ldrb r1, [r2, r1]
-	mov r2, #2
+	mov r2, #2 ; BASE_DEF
 	lsl r1, r1, #0x1b
 	lsr r1, r1, #0x1b
 	bl GetMonBaseStat_HandleFormeConversion
@@ -28407,7 +28407,7 @@ _0223B634:
 	bl MOD11_02254EA8
 	ldr r0, [r4]
 	ldr r1, [r4, #4]
-	bl MOD11_0223BFD8
+	bl CalcBallShakesOnMonCatch
 	str r0, [r4, #0x38]
 	cmp r0, #4
 	bge _0223B656
@@ -29507,8 +29507,8 @@ _0223BFD0:
 	.align 2, 0
 _0223BFD4: .word 0x0000241C
 
-	thumb_func_start MOD11_0223BFD8
-MOD11_0223BFD8: ; 0x0223BFD8
+	thumb_func_start CalcBallShakesOnMonCatch
+CalcBallShakesOnMonCatch: ; 0x0223BFD8
 	push {r3, r4, r5, r6, r7, lr}
 	add r6, r0, #0
 	add r4, r1, #0
@@ -29532,7 +29532,7 @@ _0223BFEE:
 	mov r0, #0xb5
 	lsl r0, r0, #6
 	ldrh r0, [r1, r0]
-	mov r1, #8
+	mov r1, #8 ; BASE_CATCH_RATE
 	bl GetMonBaseStat
 	ldr r1, _0223C200 ; =0x0000311C
 	ldr r2, _0223C204 ; =MOD11_0225DCF0
@@ -29541,7 +29541,7 @@ _0223BFEE:
 	ldrb r2, [r2, r1]
 	mul r2, r0
 	add r0, r2, #0
-	ldr r2, _0223C208 ; =MOD11_0225DCF1
+	ldr r2, _0223C208 ; =MOD11_0225DCF0 + 1
 	ldrb r1, [r2, r1]
 	bl _u32_div_f
 	str r0, [sp]
@@ -29553,7 +29553,7 @@ _0223C026:
 	mov r0, #0xb5
 	lsl r0, r0, #6
 	ldrh r0, [r1, r0]
-	mov r1, #8
+	mov r1, #8 ; BASE_CATCH_RATE
 	bl GetMonBaseStat
 	str r0, [sp]
 _0223C03A:
@@ -29795,7 +29795,7 @@ _0223C1FA:
 	nop
 _0223C200: .word 0x0000311C
 _0223C204: .word MOD11_0225DCF0
-_0223C208: .word MOD11_0225DCF1
+_0223C208: .word MOD11_0225DCF0 + 1
 _0223C20C: .word 0x00002D74
 _0223C210: .word MOD11_0225DC28
 _0223C214: .word 0x00002D90
@@ -72922,7 +72922,7 @@ MOD11_02250F94: ; 0x02250F94
 	bl MOD11_02243420
 	lsl r0, r0, #0x10
 	lsr r0, r0, #0x10
-	mov r1, #0x1a
+	mov r1, #0x1a ; BASE_GREAT_MARSH_RATE
 	bl GetMonBaseStat
 	ldr r2, _0225100C ; =MOD11_0225E830
 	lsl r1, r5, #1
@@ -98802,13 +98802,19 @@ MOD11_0225DCD8: ; 0x0225DCD8
 
 	.global MOD11_0225DCF0
 MOD11_0225DCF0: ; 0x0225DCF0
-	.byte 0x0A
-
-	.global MOD11_0225DCF1
-MOD11_0225DCF1: ; 0x0225DCF1
-	.byte 0x28, 0x0A, 0x23, 0x0A, 0x1E, 0x0A, 0x19
-	.byte 0x0A, 0x14, 0x0A, 0x0F, 0x0A, 0x0A, 0x0F, 0x0A, 0x14, 0x0A, 0x19, 0x0A, 0x1E, 0x0A, 0x23, 0x0A
-	.byte 0x28, 0x0A
+	.byte 10, 40
+	.byte 10, 35
+	.byte 10, 30
+	.byte 10, 25
+	.byte 10, 20
+	.byte 10, 15
+	.byte 10, 10
+	.byte 15, 10
+	.byte 20, 10
+	.byte 25, 10
+	.byte 30, 10
+	.byte 35, 10
+	.byte 40, 10
 
 	.global MOD11_0225DD0A
 MOD11_0225DD0A: ; 0x0225DD0A
@@ -98854,7 +98860,7 @@ MOD11_0225DDE4: ; 0x0225DDE4
 	.word MOD11_022333D4, MOD11_02233408, MOD11_022334A8, MOD11_022334D4
 	.word MOD11_02233538, MOD11_02233598, MOD11_02233604, MOD11_0223363C
 	.word MOD11_022336EC, MOD11_022337A4, MOD11_022337C0, MOD11_022337E0
-	.word MOD11_0223380C, MOD11_022338A0, MOD11_022338FC, MOD11_02233A78
+	.word MOD11_0223380C, MOD11_022338A0, CalcExperienceGain, MOD11_02233A78
 	.word MOD11_02233AB8, MOD11_02233AD0, MOD11_02233AE8, MOD11_02233BC0
 	.word MOD11_02233C94, MOD11_02233D34, MOD11_02233D7C, MOD11_02233DCC
 	.word MOD11_02233DE4, MOD11_02233E54, MOD11_02233F48, MOD11_02234558
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index 2f0cd49b..5cf8939b 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -21842,7 +21842,7 @@ _021E204A:
 	lsl r0, r0, #0x10
 	lsr r1, r0, #0x10
 	add r0, r7, #0
-	mov r2, #0x1b
+	mov r2, #0x1b ; BASE_COLOR
 	bl GetMonBaseStat_HandleFormeConversion
 	lsl r0, r0, #0x18
 	lsr r1, r0, #0x18
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s
index dc26f8cb..d4e8ee86 100644
--- a/arm9/modules/16/asm/module_16.s
+++ b/arm9/modules/16/asm/module_16.s
@@ -30398,12 +30398,12 @@ MOD16_021E5554: ; 0x021E5554
 	str r0, [sp, #0x30]
 	ldr r1, [sp, #0x30]
 	add r0, r7, #0
-	mov r2, #6
+	mov r2, #6 ; BASE_TYPE1
 	bl GetMonBaseStat_HandleFormeConversion
 	add r6, r0, #0
 	ldr r1, [sp, #0x30]
 	add r0, r7, #0
-	mov r2, #7
+	mov r2, #7 ; BASE_TYPE2
 	bl GetMonBaseStat_HandleFormeConversion
 	add r7, r0, #0
 	add r0, r6, #0
@@ -32777,7 +32777,7 @@ _021E66EC:
 MOD16_021E66F4: ; 0x021E66F4
 	push {r3, r4, r5, lr}
 	add r4, r1, #0
-	mov r1, #0x12
+	mov r1, #0x12 ; BASE_GENDER_RATIO
 	add r5, r0, #0
 	bl GetMonBaseStat
 	cmp r0, #0
@@ -51966,13 +51966,13 @@ MOD16_021EF6E0: ; 0x021EF6E0
 	add r5, r0, #0
 	add r7, r1, #0
 	ldr r0, [sp, #0x60]
-	mov r1, #6
+	mov r1, #6 ; BASE_TYPE1
 	str r2, [sp]
 	str r3, [sp, #4]
 	bl GetMonBaseStat
 	add r4, r0, #0
 	ldr r0, [sp, #0x60]
-	mov r1, #7
+	mov r1, #7 ; BASE_TYPE2
 	bl GetMonBaseStat
 	add r6, r0, #0
 	add r0, r4, #0
@@ -55189,11 +55189,11 @@ _021F0F88:
 	sub r3, #0x80
 	add r7, r5, r3
 	ldrh r0, [r7, r6]
-	mov r1, #0x18
+	mov r1, #0x18 ; BASE_ABILITY_1
 	bl GetMonBaseStat
 	add r4, r0, #0
 	ldrh r0, [r7, r6]
-	mov r1, #0x19
+	mov r1, #0x19 ; BASE_ABILITY_2
 	bl GetMonBaseStat
 	add r6, r0, #0
 	cmp r4, #0
@@ -55300,11 +55300,11 @@ _021F1046:
 	mul r1, r0
 	ldrh r0, [r6, r1]
 	str r1, [sp]
-	mov r1, #0x18
+	mov r1, #0x18 ; BASE_ABILITY_1
 	bl GetMonBaseStat
 	add r4, r0, #0
 	ldr r0, [sp]
-	mov r1, #0x19
+	mov r1, #0x19 ; BASE_ABILITY_2
 	ldrh r0, [r6, r0]
 	bl GetMonBaseStat
 	cmp r4, #0
diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s
index beb0e25c..290e264f 100644
--- a/arm9/modules/28/asm/module_28.s
+++ b/arm9/modules/28/asm/module_28.s
@@ -759,7 +759,7 @@ _02254DDC:
 	bl ErrorHandling
 _02254DE0:
 	ldrh r0, [r4, #8]
-	mov r1, #0x1c
+	mov r1, #0x1c ; BASE_FLIP
 	bl GetMonBaseStat
 	mov r1, #0x59
 	lsl r1, r1, #2
diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s
index a07a6426..707bc4d9 100644
--- a/arm9/modules/35/asm/module_35.s
+++ b/arm9/modules/35/asm/module_35.s
@@ -924,7 +924,7 @@ _02254F00:
 	cmp r0, #0
 	beq _02254F36
 	ldrh r0, [r6, #0x1c]
-	mov r1, #0x1c
+	mov r1, #0x1c ; BASE_FLIP
 	bl GetMonBaseStat
 	cmp r0, #0
 	ldr r0, [r7, #0x24]
diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s
index ec2bff78..97390152 100644
--- a/arm9/modules/39/asm/module_39.s
+++ b/arm9/modules/39/asm/module_39.s
@@ -1007,7 +1007,7 @@ MOD39_02254FA4: ; 0x02254FA4
 	b _02254FCC
 _02254FBA:
 	add r0, r7, #0
-	mov r1, #0x1c
+	mov r1, #0x1c ; BASE_FLIP
 	bl GetMonBaseStat
 	cmp r0, #0
 	beq _02254FCA
diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s
index f6d62b38..2c54f2b5 100644
--- a/arm9/modules/65/asm/module_65.s
+++ b/arm9/modules/65/asm/module_65.s
@@ -3387,7 +3387,7 @@ MOD65_021D8F34: ; 0x021D8F34
 	add r1, #0x36
 	strb r0, [r1]
 	ldrh r0, [r4, #0x34]
-	mov r1, #0x1c
+	mov r1, #0x1c ; BASE_FLIP
 	bl GetMonBaseStat
 	mov r1, #1
 	eor r1, r0
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s
index 81137308..4c994929 100644
--- a/arm9/modules/71/asm/module_71.s
+++ b/arm9/modules/71/asm/module_71.s
@@ -1386,7 +1386,7 @@ MOD71_0222E118: ; 0x0222E118
 	ldrh r0, [r4]
 	cmp r0, #0
 	beq _0222E18E
-	mov r1, #0x1c
+	mov r1, #0x1c ; BASE_FLIP
 	bl GetMonBaseStat
 	strh r0, [r4, #0xa]
 _0222E18E:
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index 257ac70a..d99385a4 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -6810,7 +6810,7 @@ _02230BD4:
 	ldrsh r0, [r4, r0]
 	cmp r0, #0
 	beq _02230C04
-	mov r1, #0x12
+	mov r1, #0x12 ; BASE_GENDER_RATIO
 	bl GetMonBaseStat
 	mov r1, #0xfe
 	lsl r1, r1, #4
@@ -7820,7 +7820,7 @@ _0223138C:
 	mov r3, #2
 	bl MOD80_02233EA4
 	add r0, r5, #0
-	mov r1, #0x12
+	mov r1, #0x12 ; BASE_GENDER_RATIO
 	bl GetMonBaseStat
 	mov r1, #0xfe
 	lsl r1, r1, #4
@@ -12477,7 +12477,7 @@ _0223398C:
 	ldr r0, _02233A5C ; =0x000005DC
 	bl FUN_020054C8
 	add r0, r5, #0
-	mov r1, #0x12
+	mov r1, #0x12 ; BASE_GENDER_RATIO
 	bl GetMonBaseStat
 	mov r1, #0xfe
 	lsl r1, r1, #4
diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s
index 4f7d4453..6ee359f9 100644
--- a/arm9/modules/81/asm/module_81.s
+++ b/arm9/modules/81/asm/module_81.s
@@ -198,7 +198,7 @@ MOD81_02237FE8: ; 0x02237FE8
 	mov r1, #5
 	mov r2, #0
 	bl GetBoxMonData
-	mov r1, #0x1c
+	mov r1, #0x1c ; BASE_FLIP
 	bl GetMonBaseStat
 	cmp r0, #0
 	bne _02238000
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index d490ad35..bbde3e98 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -15391,7 +15391,7 @@ _02234E86:
 	mul r1, r2
 	add r0, r0, r1
 	add r1, r6, #0
-	bl MOD83_02237F6C
+	bl MigrateBoxMon
 	ldr r0, [sp]
 	add r1, r6, #0
 	add r2, r4, #0
@@ -15880,13 +15880,13 @@ MOD83_0223526C: ; 0x0223526C
 	mov r0, #0x50
 	mul r0, r2
 	add r0, r1, r0
-	ldr r3, _0223528C ; =MOD83_02237A10
+	ldr r3, _0223528C ; =AGB_GetBoxMonData
 	mov r1, #0xb
 	mov r2, #0
 	bx r3
 	.align 2, 0
 _02235288: .word 0x0000E880
-_0223528C: .word MOD83_02237A10
+_0223528C: .word AGB_GetBoxMonData
 	thumb_func_end MOD83_0223526C
 
 	thumb_func_start MOD83_02235290
@@ -15901,13 +15901,13 @@ MOD83_02235290: ; 0x02235290
 	mov r0, #0x50
 	mul r0, r2
 	add r0, r1, r0
-	ldr r3, _022352B0 ; =MOD83_02237A10
+	ldr r3, _022352B0 ; =AGB_GetBoxMonData
 	mov r1, #0x2d
 	mov r2, #0
 	bx r3
 	.align 2, 0
 _022352AC: .word 0x0000E880
-_022352B0: .word MOD83_02237A10
+_022352B0: .word AGB_GetBoxMonData
 	thumb_func_end MOD83_02235290
 
 	thumb_func_start MOD83_022352B4
@@ -15923,12 +15923,12 @@ MOD83_022352B4: ; 0x022352B4
 	mul r0, r2
 	add r0, r1, r0
 	mov r1, #0
-	ldr r3, _022352D4 ; =MOD83_02237A10
+	ldr r3, _022352D4 ; =AGB_GetBoxMonData
 	add r2, r1, #0
 	bx r3
 	.align 2, 0
 _022352D0: .word 0x0000E880
-_022352D4: .word MOD83_02237A10
+_022352D4: .word AGB_GetBoxMonData
 	thumb_func_end MOD83_022352B4
 
 	thumb_func_start MOD83_022352D8
@@ -16244,7 +16244,7 @@ _02235512:
 	add r0, r0, r7
 	mov r1, #5
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	cmp r0, #0
 	beq _022355D2
 	ldr r1, _02235638 ; =0x0000E884
@@ -16302,7 +16302,7 @@ _02235512:
 	add r0, r0, r7
 	mov r1, #0xc
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	cmp r0, #0
 	beq _022355C4
 	mov r0, #0x6b
@@ -16667,7 +16667,7 @@ MOD83_0223588C: ; 0x0223588C
 	add r0, r2, r0
 	mov r1, #0x41
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	mov r1, #0x67
 	lsl r1, r1, #2
 	cmp r0, r1
@@ -16703,7 +16703,7 @@ _022358E2:
 	add r0, r4, r6
 	add r1, #0xd
 	add r2, r7, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	ldr r3, _02235914 ; =0x0223B2B8
 	add r2, r0, #0
 	mov r1, #0
@@ -16745,7 +16745,7 @@ MOD83_02235918: ; 0x02235918
 	add r0, r2, r0
 	mov r1, #0xc
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	ldr r1, _02235960 ; =0x0223B2C8
 	ldrh r1, [r1, #0x30]
 	cmp r1, #0
@@ -16788,7 +16788,7 @@ MOD83_02235968: ; 0x02235968
 	add r0, r2, r0
 	mov r1, #0xb
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	bl MOD83_02234C74
 	pop {r3, pc}
 	.align 2, 0
@@ -17123,7 +17123,7 @@ MOD83_02235BF4: ; 0x02235BF4
 	add r0, r6, #0
 	mov r1, #8
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	lsl r0, r0, #0x18
 	lsr r1, r0, #0x18
 	b _02235C1A
@@ -17226,11 +17226,11 @@ _02235CCA:
 	add r0, r4, #0
 	mov r1, #2
 	add r2, #2
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	add r0, r4, #0
 	mov r1, #3
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	add r3, r0, #0
 	add r0, sp, #0x1c
 	add r0, #2
@@ -17263,7 +17263,7 @@ _02235CCA:
 	add r0, r4, #0
 	mov r1, #0xb
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	bl MOD83_02237EBC
 	str r0, [sp, #4]
 	ldr r1, [sp, #4]
@@ -17288,7 +17288,7 @@ _02235CCA:
 	add r0, r4, #0
 	mov r1, #0xc
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	cmp r0, #0
 	beq _02235DAC
 	lsl r0, r0, #0x10
@@ -18289,7 +18289,7 @@ _022365A6:
 	add r0, r0, #4
 	add r0, r0, r7
 	add r0, r0, r5
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	cmp r0, #0
 	beq _022365C0
 	add r6, r6, #1
@@ -21094,8 +21094,8 @@ _022379FA:
 	.align 2, 0
 	thumb_func_end MOD83_02237988
 
-	thumb_func_start MOD83_02237A10
-MOD83_02237A10: ; 0x02237A10
+	thumb_func_start AGB_GetBoxMonData
+AGB_GetBoxMonData: ; 0x02237A10
 	push {r3, r4, r5, r6, r7, lr}
 	sub sp, #0x10
 	mov r4, #0
@@ -21613,7 +21613,7 @@ _02237D88:
 	add sp, #0x10
 	pop {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-	thumb_func_end MOD83_02237A10
+	thumb_func_end AGB_GetBoxMonData
 
 	thumb_func_start MOD83_02237D90
 MOD83_02237D90: ; 0x02237D90
@@ -21800,13 +21800,13 @@ MOD83_02237EDC: ; 0x02237EDC
 	add r5, r0, #0
 	mov r1, #0xb
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	bl MOD83_02237EBC
 	add r4, r0, #0
 	add r0, r5, #0
 	mov r1, #0x19
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	add r1, r0, #0
 	lsl r0, r4, #0x10
 	lsr r0, r0, #0x10
@@ -21827,10 +21827,10 @@ MOD83_02237F04: ; 0x02237F04
 	add r0, r4, #0
 	mov r1, #0x2e
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	add r6, r0, #0
 	add r0, r5, #0
-	mov r1, #0x19
+	mov r1, #0x19 ; BASE_ABILITY_2
 	bl GetMonBaseStat
 	cmp r0, #0
 	beq _02237F5E
@@ -21841,7 +21841,7 @@ _02237F32:
 	cmp r5, r1
 	bne _02237F42
 	add r0, r5, #0
-	mov r1, #0x18
+	mov r1, #0x18 ; BASE_ABILITY_1
 	bl GetMonBaseStat
 	b _02237F4A
 _02237F42:
@@ -21856,12 +21856,12 @@ _02237F4A:
 	tst r1, r6
 	bne _02237F66
 	add r0, r5, #0
-	mov r1, #0x18
+	mov r1, #0x18 ; BASE_ABILITY_1
 	bl GetMonBaseStat
 	pop {r4, r5, r6, pc}
 _02237F5E:
 	add r0, r5, #0
-	mov r1, #0x18
+	mov r1, #0x18 ; BASE_ABILITY_1
 	bl GetMonBaseStat
 _02237F66:
 	pop {r4, r5, r6, pc}
@@ -21869,8 +21869,8 @@ _02237F66:
 _02237F68: .word MOD83_0223B4C0
 	thumb_func_end MOD83_02237F04
 
-	thumb_func_start MOD83_02237F6C
-MOD83_02237F6C: ; 0x02237F6C
+	thumb_func_start MigrateBoxMon
+MigrateBoxMon: ; 0x02237F6C
 	push {r3, r4, r5, r6, r7, lr}
 	sub sp, #0x30
 	add r4, r1, #0
@@ -21883,7 +21883,7 @@ MOD83_02237F6C: ; 0x02237F6C
 	str r0, [sp]
 	add r0, r6, #0
 	add r2, r1, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0
@@ -21892,7 +21892,7 @@ MOD83_02237F6C: ; 0x02237F6C
 	add r0, r6, #0
 	mov r1, #0xb
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	bl MOD83_02237EBC
 	str r0, [sp, #8]
@@ -21903,7 +21903,7 @@ MOD83_02237F6C: ; 0x02237F6C
 	add r0, r6, #0
 	mov r1, #0xc
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	cmp r0, #0
 	beq _02237FCE
@@ -21919,7 +21919,7 @@ _02237FCE:
 	add r0, r6, #0
 	mov r1, #1
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #7
@@ -21928,7 +21928,7 @@ _02237FCE:
 	add r0, r6, #0
 	mov r1, #0x19
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #8
@@ -21951,7 +21951,7 @@ _02237FCE:
 	add r0, r6, #0
 	mov r1, #8
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0xb
@@ -21960,7 +21960,7 @@ _02237FCE:
 	add r0, r6, #0
 	mov r1, #3
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #4]
 	add r0, r4, #0
 	mov r1, #0xc
@@ -21969,7 +21969,7 @@ _02237FCE:
 	add r0, r6, #0
 	mov r1, #0x1a
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0xd
@@ -21978,7 +21978,7 @@ _02237FCE:
 	add r0, r6, #0
 	mov r1, #0x1b
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0xe
@@ -21987,7 +21987,7 @@ _02237FCE:
 	add r0, r6, #0
 	mov r1, #0x1c
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0xf
@@ -21996,7 +21996,7 @@ _02237FCE:
 	add r0, r6, #0
 	mov r1, #0x1d
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x10
@@ -22005,7 +22005,7 @@ _02237FCE:
 	add r0, r6, #0
 	mov r1, #0x1e
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x11
@@ -22014,7 +22014,7 @@ _02237FCE:
 	add r0, r6, #0
 	mov r1, #0x1f
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x12
@@ -22023,7 +22023,7 @@ _02237FCE:
 	add r0, r6, #0
 	mov r1, #0x16
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x13
@@ -22032,7 +22032,7 @@ _02237FCE:
 	add r0, r6, #0
 	mov r1, #0x17
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x14
@@ -22041,7 +22041,7 @@ _02237FCE:
 	add r0, r6, #0
 	mov r1, #0x18
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x15
@@ -22050,7 +22050,7 @@ _02237FCE:
 	add r0, r6, #0
 	mov r1, #0x21
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x16
@@ -22059,7 +22059,7 @@ _02237FCE:
 	add r0, r6, #0
 	mov r1, #0x2f
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x17
@@ -22068,7 +22068,7 @@ _02237FCE:
 	add r0, r6, #0
 	mov r1, #0x30
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x18
@@ -22081,7 +22081,7 @@ _0223815E:
 	add r0, r6, #0
 	add r1, #0xd
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	add r1, r5, #0
 	str r0, [sp, #8]
 	add r0, r4, #0
@@ -22091,7 +22091,7 @@ _0223815E:
 	add r0, r6, #0
 	mov r1, #0x15
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	mov r1, #3
 	lsl r1, r7
 	str r0, [sp, #8]
@@ -22121,7 +22121,7 @@ _0223815E:
 	add r0, r6, #0
 	mov r1, #0x27
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x46
@@ -22130,7 +22130,7 @@ _0223815E:
 	add r0, r6, #0
 	mov r1, #0x28
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x47
@@ -22139,7 +22139,7 @@ _0223815E:
 	add r0, r6, #0
 	mov r1, #0x29
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x48
@@ -22148,7 +22148,7 @@ _0223815E:
 	add r0, r6, #0
 	mov r1, #0x2a
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x49
@@ -22157,7 +22157,7 @@ _0223815E:
 	add r0, r6, #0
 	mov r1, #0x2b
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x4a
@@ -22166,7 +22166,7 @@ _0223815E:
 	add r0, r6, #0
 	mov r1, #0x2c
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x4b
@@ -22175,7 +22175,7 @@ _0223815E:
 	add r0, r6, #0
 	mov r1, #0x2d
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x4c
@@ -22184,7 +22184,7 @@ _0223815E:
 	add r0, r6, #0
 	mov r1, #0x32
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	add r7, r0, #0
 	cmp r7, #4
 	bgt _02238282
@@ -22206,7 +22206,7 @@ _02238282:
 	add r0, r6, #0
 	mov r1, #0x33
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	add r7, r0, #0
 	cmp r7, #4
 	bgt _022382AE
@@ -22228,7 +22228,7 @@ _022382AE:
 	add r0, r6, #0
 	mov r1, #0x34
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	add r7, r0, #0
 	cmp r7, #4
 	bgt _022382DA
@@ -22250,7 +22250,7 @@ _022382DA:
 	add r0, r6, #0
 	mov r1, #0x35
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	add r7, r0, #0
 	cmp r7, #4
 	bgt _02238306
@@ -22272,7 +22272,7 @@ _02238306:
 	add r0, r6, #0
 	mov r1, #0x36
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	add r7, r0, #0
 	cmp r7, #4
 	bgt _02238332
@@ -22294,7 +22294,7 @@ _02238332:
 	add r0, r6, #0
 	mov r1, #0x43
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x62
@@ -22303,7 +22303,7 @@ _02238332:
 	add r0, r6, #0
 	mov r1, #0x44
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x63
@@ -22312,7 +22312,7 @@ _02238332:
 	add r0, r6, #0
 	mov r1, #0x45
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x64
@@ -22321,7 +22321,7 @@ _02238332:
 	add r0, r6, #0
 	mov r1, #0x46
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x65
@@ -22330,7 +22330,7 @@ _02238332:
 	add r0, r6, #0
 	mov r1, #0x47
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x66
@@ -22339,7 +22339,7 @@ _02238332:
 	add r0, r6, #0
 	mov r1, #0x48
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x67
@@ -22348,7 +22348,7 @@ _02238332:
 	add r0, r6, #0
 	mov r1, #0x49
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x68
@@ -22357,7 +22357,7 @@ _02238332:
 	add r0, r6, #0
 	mov r1, #0x4a
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x69
@@ -22366,7 +22366,7 @@ _02238332:
 	add r0, r6, #0
 	mov r1, #0x4b
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x6a
@@ -22375,7 +22375,7 @@ _02238332:
 	add r0, r6, #0
 	mov r1, #0x4c
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x6b
@@ -22384,7 +22384,7 @@ _02238332:
 	add r0, r6, #0
 	mov r1, #0x4d
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x6c
@@ -22393,7 +22393,7 @@ _02238332:
 	add r0, r6, #0
 	mov r1, #0x4e
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x6d
@@ -22402,7 +22402,7 @@ _02238332:
 	add r0, r6, #0
 	mov r1, #0x50
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x6e
@@ -22424,7 +22424,7 @@ _02238332:
 	mov r1, #0
 	add r0, r6, #0
 	add r2, r1, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	add r3, r0, #0
 	mov r7, #3
 	lsl r0, r7, #8
@@ -22498,7 +22498,7 @@ _022384FE:
 	add r0, r6, #0
 	mov r1, #2
 	add r2, sp, #0x24
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	ldr r3, [sp, #4]
 	add r0, sp, #0x24
 	add r1, sp, #0xc
@@ -22511,7 +22511,7 @@ _022384FE:
 	add r0, r6, #0
 	mov r1, #3
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	ldr r1, _022385F8 ; =gGameLanguage
 	ldrb r1, [r1]
 	cmp r1, r0
@@ -22526,7 +22526,7 @@ _0223853E:
 	add r0, r6, #0
 	mov r1, #0x25
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x79
@@ -22535,7 +22535,7 @@ _0223853E:
 	add r0, r6, #0
 	mov r1, #7
 	add r2, sp, #0x24
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	ldr r3, [sp, #4]
 	add r0, sp, #0x24
 	add r1, sp, #0xc
@@ -22548,7 +22548,7 @@ _0223853E:
 	add r0, r6, #0
 	mov r1, #0x23
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x98
@@ -22557,7 +22557,7 @@ _0223853E:
 	add r0, r6, #0
 	mov r1, #0x22
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x99
@@ -22566,7 +22566,7 @@ _0223853E:
 	add r0, r6, #0
 	mov r1, #0x26
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x9a
@@ -22575,7 +22575,7 @@ _0223853E:
 	add r0, r6, #0
 	mov r1, #0x24
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x9b
@@ -22584,7 +22584,7 @@ _0223853E:
 	add r0, r6, #0
 	mov r1, #0x31
 	mov r2, #0
-	bl MOD83_02237A10
+	bl AGB_GetBoxMonData
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x9c
@@ -22599,7 +22599,7 @@ _0223853E:
 _022385F0: .word 0x00000182
 _022385F4: .word gUnk021C4918
 _022385F8: .word gGameLanguage
-	thumb_func_end MOD83_02237F6C
+	thumb_func_end MigrateBoxMon
 
 	thumb_func_start MOD83_022385FC
 MOD83_022385FC: ; 0x022385FC