Merge pull request #261 from PikalaxALT/pikalax_work

Name some scrcmds; save block 2 struct resolution

1 files changed, 20 insertions, 20 deletions

diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s
index 8b6b5517..614bbffd 100644
--- a/arm9/modules/56/asm/module_56.s
+++ b/arm9/modules/56/asm/module_56.s
@@ -210,7 +210,7 @@ MOD56_02211F88: ; 0x02211F88
 	push {r3, r4, r5, r6, r7, lr}
 	add r0, #0xc4
 	ldr r0, [r0]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	str r0, [sp]
 	bl GetPartyCount
 	mov r5, #0
@@ -1013,7 +1013,7 @@ MOD56_0221257C: ; 0x0221257C
 	bl FUN_020068C8
 	add r5, #0xc4
 	ldr r0, [r5]
-	bl LoadPlayerDataAddress
+	bl Sav2_PlayerData_GetOptionsAddr
 	bl FUN_02025084
 	lsl r0, r0, #0x18
 	lsr r0, r0, #0x18
@@ -1974,7 +1974,7 @@ MOD56_02212E0C: ; 0x02212E0C
 	add r0, #0xc4
 	ldr r0, [r0]
 	str r1, [sp]
-	bl FUN_020238F4
+	bl Sav2_PlayerData_GetProfileAddr
 	str r0, [sp, #0x14]
 	add r0, r5, #0
 	add r0, #0xc4
@@ -1984,7 +1984,7 @@ MOD56_02212E0C: ; 0x02212E0C
 	add r0, r5, #0
 	add r0, #0xc4
 	ldr r0, [r0]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	str r0, [sp, #0xc]
 	add r0, r5, #0
 	add r0, #0xc4
@@ -2044,7 +2044,7 @@ _02212E82:
 	ldr r1, [r5, #4]
 	strb r0, [r1, #0x1d]
 	ldr r0, [sp, #0x14]
-	bl FUN_020239CC
+	bl PlayerProfile_GetTrainerGender
 	ldr r1, [r5, #4]
 	strb r0, [r1, #0x1e]
 	ldr r0, [sp, #8]
@@ -2767,9 +2767,9 @@ MOD56_0221341C: ; 0x0221341C
 	add r0, #0xc4
 	ldr r0, [r0]
 	ldr r5, _02213618 ; =0x00010200
-	bl FUN_020238F4
+	bl Sav2_PlayerData_GetProfileAddr
 	mov r1, #0x36
-	bl FUN_020239A0
+	bl PlayerProfile_GetPlayerName_NewString
 	add r6, r0, #0
 	mov r0, #0xd3
 	lsl r0, r0, #2
@@ -7051,7 +7051,7 @@ _02215532:
 	sub r2, #8
 	ldr r0, [r0]
 	ldr r2, [r5, r2]
-	bl FUN_0200B7B8
+	bl StringExpandPlaceholders
 	mov r3, #0
 	str r3, [sp]
 	mov r2, #0xff
@@ -7098,14 +7098,14 @@ _02215532:
 	add r3, r1, #0
 	bl AddTextPrinterParameterized2
 	mov r0, #0x36
-	bl FUN_02023928
+	bl PlayerProfile_init
 	add r6, r0, #0
 	ldr r0, [r5]
 	add r1, r4, #0
 	bl FUN_020283E8
 	add r1, r0, #0
 	add r0, r6, #0
-	bl FUN_0202395C
+	bl CopyPlayerName
 	add r0, r5, #0
 	add r0, #0xc8
 	ldr r0, [r0]
@@ -7130,7 +7130,7 @@ _02215532:
 	sub r2, #8
 	ldr r0, [r0]
 	ldr r2, [r5, r2]
-	bl FUN_0200B7B8
+	bl StringExpandPlaceholders
 	mov r1, #0x16
 	lsl r1, r1, #4
 	mov r0, #0
@@ -7206,7 +7206,7 @@ _02215532:
 	sub r2, #8
 	ldr r0, [r0]
 	ldr r2, [r5, r2]
-	bl FUN_0200B7B8
+	bl StringExpandPlaceholders
 	mov r0, #0x30
 	str r0, [sp]
 	mov r2, #0xff
@@ -7252,7 +7252,7 @@ _02215532:
 	sub r2, #8
 	ldr r0, [r0]
 	ldr r2, [r5, r2]
-	bl FUN_0200B7B8
+	bl StringExpandPlaceholders
 	mov r1, #0x16
 	lsl r1, r1, #4
 	mov r0, #0
@@ -7343,7 +7343,7 @@ _02215822:
 	sub r2, #8
 	ldr r0, [r0]
 	ldr r2, [r5, r2]
-	bl FUN_0200B7B8
+	bl StringExpandPlaceholders
 	mov r1, #0x16
 	lsl r1, r1, #4
 	mov r0, #0
@@ -7445,7 +7445,7 @@ _02215822:
 	sub r2, #8
 	ldr r0, [r0]
 	ldr r2, [r5, r2]
-	bl FUN_0200B7B8
+	bl StringExpandPlaceholders
 	mov r1, #0x16
 	lsl r1, r1, #4
 	mov r0, #0
@@ -8163,7 +8163,7 @@ MOD56_02215EA4: ; 0x02215EA4
 	ldr r0, [r0]
 	add r4, r1, #0
 	add r6, r2, #0
-	bl LoadPlayerDataAddress
+	bl Sav2_PlayerData_GetOptionsAddr
 	bl FUN_02024FF4
 	add r7, r0, #0
 	mov r0, #0xdb
@@ -8267,7 +8267,7 @@ _02215F82:
 	sub r2, r2, #4
 	ldr r0, [r0]
 	ldr r2, [r5, r2]
-	bl FUN_0200B7B8
+	bl StringExpandPlaceholders
 	mov r0, #0xcf
 	lsl r0, r0, #2
 	add r0, r5, r0
@@ -8383,7 +8383,7 @@ _02216048:
 	sub r2, r2, #4
 	ldr r0, [r0]
 	ldr r2, [r5, r2]
-	bl FUN_0200B7B8
+	bl StringExpandPlaceholders
 	mov r0, #0xdb
 	lsl r0, r0, #2
 	add r0, r5, r0
@@ -8431,14 +8431,14 @@ MOD56_022160E4: ; 0x022160E4
 	cmp r6, r0
 	beq _0221611C
 	mov r0, #0x36
-	bl FUN_02023928
+	bl PlayerProfile_init
 	add r4, r0, #0
 	ldr r0, [r5]
 	add r1, r6, #0
 	bl FUN_020283A4
 	add r1, r0, #0
 	add r0, r4, #0
-	bl FUN_0202395C
+	bl CopyPlayerName
 	add r5, #0xc8
 	ldr r0, [r5]
 	mov r1, #0