Decompile trainer_data engine code

3 files changed, 16 insertions, 16 deletions

diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 2af29137..f20313a9 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -5094,7 +5094,7 @@ _0223BC5A:
 	str r0, [r1, #0x20]
 	ldr r0, [sp, #0x2c]
 	ldr r1, [r5, #0xc]
-	bl FUN_0206ABC4
+	bl EnemyTrainerSet_Init
 	add r0, sp, #0x30
 	str r0, [sp]
 	ldr r1, [sp, #0x20]
@@ -5531,7 +5531,7 @@ _0223BFFE:
 	str r0, [r1, #0x20]
 	ldr r0, [sp, #0x24]
 	ldr r1, [r5, #0xc]
-	bl FUN_0206ABC4
+	bl EnemyTrainerSet_Init
 	add r0, sp, #0x28
 	str r0, [sp]
 	ldr r1, [sp, #0x18]
@@ -5841,7 +5841,7 @@ _0223C2A2:
 	str r0, [r1, #0x20]
 	ldr r0, [r4]
 	ldr r1, [r5, #0xc]
-	bl FUN_0206ABC4
+	bl EnemyTrainerSet_Init
 	add r0, sp, #0x28
 	str r0, [sp]
 	ldr r1, [sp, #0x1c]
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s
index 2659dd5c..05283e3d 100644
--- a/arm9/modules/07/asm/module_07.s
+++ b/arm9/modules/07/asm/module_07.s
@@ -5049,7 +5049,7 @@ MOD07_02214720: ; 0x02214720
 	add r0, r1, r0
 	add r0, #0x29
 	ldrb r0, [r0]
-	bl FUN_0206AE00
+	bl TrainerClass_GetGenderOrTrainerCount
 	str r0, [sp, #0x10]
 	ldr r0, [r4, #0x24]
 	mov r1, #0x10
@@ -5101,7 +5101,7 @@ _022147BC:
 	add r0, r1, r0
 	add r0, #0x29
 	ldrb r0, [r0]
-	bl FUN_0206AE00
+	bl TrainerClass_GetGenderOrTrainerCount
 	str r0, [sp, #0x14]
 	ldr r0, [r4, #0x24]
 	mov r1, #0x10
@@ -5134,7 +5134,7 @@ _02214808:
 	add r0, r1, r0
 	add r0, #0x29
 	ldrb r0, [r0]
-	bl FUN_0206AE00
+	bl TrainerClass_GetGenderOrTrainerCount
 	str r0, [sp, #0x18]
 	ldr r0, [r4, #0x24]
 	mov r1, #0x10
@@ -5167,7 +5167,7 @@ _02214854:
 	add r0, r1, r0
 	add r0, #0x29
 	ldrb r0, [r0]
-	bl FUN_0206AE00
+	bl TrainerClass_GetGenderOrTrainerCount
 	str r0, [sp, #0x1c]
 	ldr r0, [r4, #0x24]
 	mov r1, #0x10
@@ -5205,12 +5205,12 @@ _022148A0:
 	bne _022148EA
 	add r0, #0x5d
 	ldrb r0, [r0]
-	bl FUN_0206AE00
+	bl TrainerClass_GetGenderOrTrainerCount
 	str r0, [sp, #8]
 	ldr r0, [r4]
 	add r0, #0xc5
 	ldrb r0, [r0]
-	bl FUN_0206AE00
+	bl TrainerClass_GetGenderOrTrainerCount
 	str r0, [sp, #0xc]
 	ldr r0, [r4, #0x18]
 	add r1, r5, #0
@@ -5224,12 +5224,12 @@ _022148A0:
 _022148EA:
 	add r0, #0x29
 	ldrb r0, [r0]
-	bl FUN_0206AE00
+	bl TrainerClass_GetGenderOrTrainerCount
 	str r0, [sp, #8]
 	ldr r0, [r4]
 	add r0, #0x91
 	ldrb r0, [r0]
-	bl FUN_0206AE00
+	bl TrainerClass_GetGenderOrTrainerCount
 	str r0, [sp, #0xc]
 	ldr r0, [r4, #0x14]
 	add r1, r5, #0
diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s
index a962fbf2..0c87c27f 100644
--- a/arm9/modules/11/asm/module_11_thumb2.s
+++ b/arm9/modules/11/asm/module_11_thumb2.s
@@ -4914,7 +4914,7 @@ _0223174C:
 	add r0, r4, #0
 	add r1, r7, #0
 	mov r3, #5
-	bl FUN_0206AD4C
+	bl GetTrainerMessageByIdPair
 	add r0, r6, #0
 	mov r1, #0xff
 	bl FUN_02019620
@@ -45181,7 +45181,7 @@ _022452F8:
 	ldr r0, [sp, #8]
 	mov r1, #0xd
 	mov r2, #5
-	bl FUN_0206ACD4
+	bl TrainerMessageWithIdPairExists
 	cmp r0, #0
 	beq _02245334
 	mov r1, #0x85
@@ -45219,7 +45219,7 @@ _0224533C:
 	ldr r0, [sp, #8]
 	mov r1, #0xe
 	mov r2, #5
-	bl FUN_0206ACD4
+	bl TrainerMessageWithIdPairExists
 	cmp r0, #0
 	beq _0224537C
 	ldr r1, _0224548C ; =0x00002E7D
@@ -45276,7 +45276,7 @@ _022453C6:
 	ldr r0, [sp, #8]
 	mov r1, #0xf
 	mov r2, #5
-	bl FUN_0206ACD4
+	bl TrainerMessageWithIdPairExists
 	cmp r0, #0
 	beq _022453F0
 	ldr r1, _0224548C ; =0x00002E7D
@@ -45340,7 +45340,7 @@ _0224543A:
 	ldr r0, [sp, #8]
 	mov r1, #0x10
 	mov r2, #5
-	bl FUN_0206ACD4
+	bl TrainerMessageWithIdPairExists
 	cmp r0, #0
 	beq _02245472
 	ldr r1, _0224548C ; =0x00002E7D