Comment GetMonBaseStat arg values

18 files changed, 71 insertions, 65 deletions

diff --git a/arm9/asm/unk_02023C40.s b/arm9/asm/unk_02023C40.s
index 46a01c79..d4276bce 100644
--- a/arm9/asm/unk_02023C40.s
+++ b/arm9/asm/unk_02023C40.s
@@ -973,7 +973,7 @@ FUN_020242C8: ; 0x020242C8
 	add r6, r1, #0x0
 	add r5, r0, #0x0
 	add r0, r6, #0x0
-	mov r1, #0x12
+	mov r1, #0x12 ; BASE_GENDER_RATIO
 	add r4, r2, #0x0
 	bl GetMonBaseStat
 	cmp r0, #0xff
diff --git a/arm9/asm/unk_0207C328.s b/arm9/asm/unk_0207C328.s
index 486788c4..bf0bb784 100644
--- a/arm9/asm/unk_0207C328.s
+++ b/arm9/asm/unk_0207C328.s
@@ -1892,7 +1892,7 @@ _0207D00C:
 	mov r0, #0x97
 	lsl r0, r0, #0x2
 	ldrh r0, [r4, r0]
-	mov r1, #0x1c
+	mov r1, #0x1c ; BASE_FLIP
 	bl GetMonBaseStat
 	add r2, r0, #0x0
 	ldr r0, _0207D068 ; =0x00000454
diff --git a/arm9/asm/unk_0207EF6C.s b/arm9/asm/unk_0207EF6C.s
index 7050dea9..0ef763b0 100644
--- a/arm9/asm/unk_0207EF6C.s
+++ b/arm9/asm/unk_0207EF6C.s
@@ -1168,7 +1168,7 @@ _0207F876:
 	mov r0, #0x97
 	lsl r0, r0, #0x2
 	ldrh r0, [r4, r0]
-	mov r1, #0x1c
+	mov r1, #0x1c ; BASE_FLIP
 	bl GetMonBaseStat
 	mov r1, #0x1
 	eor r0, r1
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..dc64fd2e 100644
--- a/arm9/modules/11/asm/module_11.s
+++ b/arm9/modules/11/asm/module_11.s
@@ -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
@@ -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
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..72c69b42 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -21830,7 +21830,7 @@ MOD83_02237F04: ; 0x02237F04
 	bl MOD83_02237A10
 	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}
diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c
index 39739474..e56faac3 100644
--- a/arm9/src/pokemon.c
+++ b/arm9/src/pokemon.c
@@ -1870,16 +1870,16 @@ int GetPersonalAttr(struct BaseStats * baseStats, enum BaseStat attr)
     case BASE_FLIP:
         ret = baseStats->flip;
         break;
-    case BASE_UNKNOWN_29:
+    case BASE_TMHM_1:
         ret = (int)baseStats->unk1C;
         break;
-    case BASE_UNKNOWN_30:
+    case BASE_TMHM_2:
         ret = (int)baseStats->unk20;
         break;
-    case BASE_UNKNOWN_31:
+    case BASE_TMHM_3:
         ret = (int)baseStats->unk24;
         break;
-    case BASE_UNKNOWN_32:
+    case BASE_TMHM_4:
         ret = (int)baseStats->unk28;
         break;
     }
@@ -3397,22 +3397,22 @@ BOOL FUN_0206A16C(u16 species, int forme, u32 a2)
     if (a2 < 32)
     {
         r4 = 1ul << a2;
-        r2 = BASE_UNKNOWN_29;
+        r2 = BASE_TMHM_1;
     }
     else if (a2 < 64)
     {
         r4 = 1ul << (a2 - 32);
-        r2 = BASE_UNKNOWN_30;
+        r2 = BASE_TMHM_2;
     }
     else if (a2 < 96)
     {
         r4 = 1ul << (a2 - 64);
-        r2 = BASE_UNKNOWN_31;
+        r2 = BASE_TMHM_3;
     }
     else
     {
         r4 = 1ul << (a2 - 96);
-        r2 = BASE_UNKNOWN_32;
+        r2 = BASE_TMHM_4;
     }
     return !!(GetMonBaseStat_HandleFormeConversion(species, forme, r2) & r4);
 }
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index 0f9ba25c..c83847c6 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -316,10 +316,10 @@ enum BaseStat {
     BASE_GREAT_MARSH_RATE,
     BASE_COLOR,
     BASE_FLIP,
-    BASE_UNKNOWN_29,
-    BASE_UNKNOWN_30,
-    BASE_UNKNOWN_31,
-    BASE_UNKNOWN_32,
+    BASE_TMHM_1,
+    BASE_TMHM_2,
+    BASE_TMHM_3,
+    BASE_TMHM_4,
 };
 
 typedef enum {