diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-12 16:52:18 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-12 16:52:18 -0400 |
| commit | ad1e7f58f2912df805d9a768715497c9cc6a85c1 (patch) | |
| tree | c08534f0cb1a3269e632fec9996ec75482936070 /arm9/modules/71 | |
| parent | 9e8e57cacbdb4e75cb7e3adce06a957dec25c33f (diff) | |
Merge two struct definitions
Diffstat (limited to 'arm9/modules/71')
| -rw-r--r-- | arm9/modules/71/asm/module_71.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index b4e8e297..ce4e6ff9 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -207,11 +207,11 @@ MOD71_0222D780: ; 0x0222D780 add r6, r0, #0 add r0, r4, #0 mov r1, #0x1a - bl FUN_020239A0 + bl PlayerData_GetPlayerName_NewString add r4, r0, #0 add r0, r6, #0 mov r1, #0x1a - bl FUN_020239A0 + bl PlayerData_GetPlayerName_NewString add r6, r0, #0 mov r0, #0x61 lsl r0, r0, #2 @@ -2160,7 +2160,7 @@ MOD71_0222E76C: ; 0x0222E76C bl memset ldr r0, [r4, #4] mov r1, #0x1a - bl FUN_020239A0 + bl PlayerData_GetPlayerName_NewString mov r1, #0x63 lsl r1, r1, #2 str r0, [r5, r1] @@ -3748,7 +3748,7 @@ MOD71_0222F4BC: ; 0x0222F4BC add r0, r4, #0 bl CopyU16StringArray add r0, r6, #0 - bl FUN_020239BC + bl PlayerData_GetTrainerID str r0, [r4, #0x10] add r0, r6, #0 bl FUN_02023A70 @@ -3757,7 +3757,7 @@ MOD71_0222F4BC: ; 0x0222F4BC bl FUN_02023A68 strb r0, [r4, #0x15] add r0, r6, #0 - bl FUN_020239CC + bl PlayerData_GetTrainerGender strb r0, [r4, #0x16] mov r0, #0 add r1, r4, #0 @@ -4348,7 +4348,7 @@ _0222F9A0: ldr r0, _0222FA24 ; =0x00003670 str r4, [r5, r0] mov r0, #0x1a - bl FUN_02023928 + bl PlayerData_init add r6, r0, #0 ldr r0, _0222FA28 ; =0x00003694 add r1, r4, #0 @@ -4356,7 +4356,7 @@ _0222F9A0: bl FUN_020283A4 add r1, r0, #0 add r0, r6, #0 - bl FUN_0202395C + bl CopyPlayerName ldr r0, _0222FA18 ; =0x00003674 mov r1, #0 ldr r0, [r5, r0] @@ -6432,7 +6432,7 @@ MOD71_02230AE4: ; 0x02230AE4 bl FUN_0202398C add r7, r0, #0 add r0, r5, #0 - bl FUN_020239CC + bl PlayerData_GetTrainerGender add r5, r0, #0 add r0, r4, #0 bl GetMonGender |