diff options
Diffstat (limited to 'arm9/src')
| -rw-r--r-- | arm9/src/main.c | 2 | ||||
| -rw-r--r-- | arm9/src/pokemon.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arm9/src/main.c b/arm9/src/main.c index bdb6078e..3de65c45 100644 --- a/arm9/src/main.c +++ b/arm9/src/main.c @@ -74,7 +74,7 @@ THUMB_FUNC void NitroMain(void) FUN_02002C50(3, 3); gBacklightTop.unk18 = -1; gBacklightTop.unk20 = FUN_0202254C(); - InitSoundData(FUN_02029EF8(gBacklightTop.unk20), LoadPlayerDataAddress(gBacklightTop.unk20)); + InitSoundData(FUN_02029EF8(gBacklightTop.unk20), Sav2_PlayerData_GetOptionsAddr(gBacklightTop.unk20)); FUN_02020AFC(); if (FUN_020337E8(3) == 3) FUN_02034188(3, 0); diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index 5367ae45..05df8811 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -3678,11 +3678,11 @@ BOOL FUN_0206A998(struct Pokemon * pokemon) BOOL FUN_0206A9AC(struct BoxPokemon * boxmon, struct PlayerData * sb2, u32 heap_id) { - u32 myId = PlayerData_GetTrainerID(sb2); + u32 myId = PlayerProfile_GetTrainerID(sb2); u32 otId = GetBoxMonData(boxmon, MON_DATA_OTID, NULL); - u32 myGender = PlayerData_GetTrainerGender(sb2); + u32 myGender = PlayerProfile_GetTrainerGender(sb2); u32 otGender = GetBoxMonData(boxmon, MON_DATA_MET_GENDER, NULL); - struct String * r7 = PlayerData_GetPlayerName_NewString(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); |