diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-08-13 19:12:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-13 19:12:12 +0300 |
| commit | a82d0d55a67b12757b185fd149d6a14dcc7cad02 (patch) | |
| tree | 829d21a866de69dc92e1b8e5bb1857a21104027c /arm9/src/pokemon.c | |
| parent | c259e6ed18294c001033fed62d924d379276021a (diff) | |
| parent | ddd20f2c76a34b4fc46503c8bf88d53a755453a8 (diff) | |
Merge pull request #261 from PikalaxALT/pikalax_work
Name some scrcmds; save block 2 struct resolution
Diffstat (limited to 'arm9/src/pokemon.c')
| -rw-r--r-- | arm9/src/pokemon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index eb51d5fb..05df8811 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -3676,13 +3676,13 @@ BOOL FUN_0206A998(struct Pokemon * pokemon) return IsPokemonLegendaryOrMythical(species); } -BOOL FUN_0206A9AC(struct BoxPokemon * boxmon, struct SaveBlock2 * sb2, u32 heap_id) +BOOL FUN_0206A9AC(struct BoxPokemon * boxmon, struct PlayerData * sb2, u32 heap_id) { - u32 myId = FUN_020239BC(sb2); + u32 myId = PlayerProfile_GetTrainerID(sb2); u32 otId = GetBoxMonData(boxmon, MON_DATA_OTID, NULL); - u32 myGender = FUN_020239CC(sb2); + u32 myGender = PlayerProfile_GetTrainerGender(sb2); u32 otGender = GetBoxMonData(boxmon, MON_DATA_MET_GENDER, NULL); - struct String * r7 = FUN_020239A0(sb2, heap_id); + struct String * r7 = PlayerProfile_GetPlayerName_NewString(sb2, heap_id); struct String * r6 = String_ctor(OT_NAME_LENGTH + 1, heap_id); BOOL ret = FALSE; GetBoxMonData(boxmon, MON_DATA_OT_NAME_2, r6); |