From ad1e7f58f2912df805d9a768715497c9cc6a85c1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 12 Aug 2020 16:52:18 -0400 Subject: Merge two struct definitions --- arm9/modules/16/asm/module_16.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arm9/modules/16') diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index a6d13041..2e9d483c 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -4634,12 +4634,12 @@ _021D980C: ldr r1, _021D989C ; =0x0000174C str r0, [r5, r1] ldr r0, [r4, #4] - bl FUN_020239CC + bl PlayerData_GetTrainerGender ldr r1, _021D98A0 ; =0x00001750 str r0, [r5, r1] ldr r0, [r4, #4] add r1, r6, #0 - bl FUN_020239A0 + bl PlayerData_GetPlayerName_NewString ldr r1, _021D98A4 ; =0x00001754 str r0, [r5, r1] add r0, r6, #0 -- cgit v1.2.3