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/55 | |
| parent | 9e8e57cacbdb4e75cb7e3adce06a957dec25c33f (diff) | |
Merge two struct definitions
Diffstat (limited to 'arm9/modules/55')
| -rw-r--r-- | arm9/modules/55/asm/module_55.s | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index 7c114b63..f419f2dd 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -1309,7 +1309,7 @@ _021D7F86: cmp r6, #2 bne _021D7FF4 ldr r0, [r5, #8] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r2, r0, #0 ldr r0, [r5, #0xc] mov r1, #0 @@ -1974,7 +1974,7 @@ MOD55_021D84C8: ; 0x021D84C8 cmp r0, #0 beq _021D8534 mov r0, #0x34 - bl FUN_02023928 + bl PlayerData_init add r4, r0, #0 add r0, r5, #0 add r0, #0xd4 @@ -1982,7 +1982,7 @@ MOD55_021D84C8: ; 0x021D84C8 bl String_c_str add r1, r0, #0 add r0, r4, #0 - bl FUN_0202395C + bl CopyPlayerName ldr r0, [r5, #0xc] mov r1, #0 add r2, r4, #0 @@ -3314,7 +3314,7 @@ _021D8F1A: add r0, r5, r1 bl FUN_02019220 mov r0, #0x34 - bl FUN_02023928 + bl PlayerData_init mov r1, #0xf2 lsl r1, r1, #2 ldrb r1, [r5, r1] @@ -3326,7 +3326,7 @@ _021D8F1A: bl FUN_020283A4 add r1, r0, #0 add r0, r4, #0 - bl FUN_0202395C + bl CopyPlayerName ldr r0, [r5, #0xc] mov r1, #0 add r2, r4, #0 @@ -3504,7 +3504,7 @@ MOD55_021D90D8: ; 0x021D90D8 orr r0, r1 beq _021D9170 mov r0, #0x34 - bl FUN_02023928 + bl PlayerData_init mov r1, #0xf2 lsl r1, r1, #2 ldrb r1, [r5, r1] @@ -3516,7 +3516,7 @@ MOD55_021D90D8: ; 0x021D90D8 bl FUN_020283A4 add r1, r0, #0 add r0, r6, #0 - bl FUN_0202395C + bl CopyPlayerName ldr r0, _021D9180 ; =0x000005DC bl FUN_020054C8 ldr r2, [sp, #4] @@ -3607,7 +3607,7 @@ _021D91D6: mov r1, #0 bl FUN_02019620 ldr r0, [r5, #8] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r2, r0, #0 ldr r0, [r5, #0xc] mov r1, #0 @@ -4166,14 +4166,14 @@ _021D969A: mov r1, #0 bl FUN_02019620 mov r0, #0x34 - bl FUN_02023928 + bl PlayerData_init str r0, [sp, #0x20] ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] bl FUN_020283A4 add r1, r0, #0 ldr r0, [sp, #0x20] - bl FUN_0202395C + bl CopyPlayerName ldr r0, [r4, #0xc] ldr r2, [sp, #0x20] mov r1, #0 @@ -4406,14 +4406,14 @@ _021D987C: add r3, r1, #0 bl AddTextPrinterParameterized2 mov r0, #0x34 - bl FUN_02023928 + bl PlayerData_init add r5, r0, #0 ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] bl FUN_020283E8 add r1, r0, #0 add r0, r5, #0 - bl FUN_0202395C + bl CopyPlayerName ldr r0, [r4, #0xc] mov r1, #0 add r2, r5, #0 @@ -5204,7 +5204,7 @@ MOD55_021D9F8C: ; 0x021D9F8C add r5, r0, #0 mov r0, #0x34 add r6, r1, #0 - bl FUN_02023928 + bl PlayerData_init add r4, r0, #0 ldr r0, [r5, #8] bl FUN_020286EC @@ -5217,7 +5217,7 @@ MOD55_021D9F8C: ; 0x021D9F8C bl FUN_020283A4 add r1, r0, #0 add r0, r4, #0 - bl FUN_0202395C + bl CopyPlayerName ldr r0, [r5, #0xc] mov r1, #0 add r2, r4, #0 |