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/src | |
| parent | 9e8e57cacbdb4e75cb7e3adce06a957dec25c33f (diff) | |
Merge two struct definitions
Diffstat (limited to 'arm9/src')
| -rw-r--r-- | arm9/src/main.c | 8 | ||||
| -rw-r--r-- | arm9/src/pokemon.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arm9/src/main.c b/arm9/src/main.c index ac2d9ca9..bdb6078e 100644 --- a/arm9/src/main.c +++ b/arm9/src/main.c @@ -6,7 +6,7 @@ #include "PAD_pad.h" #include "main.h" #include "poke_overlay.h" -#include "options.h" +#include "save_block_2.h" #include "sound.h" FS_EXTERN_OVERLAY(MODULE_52); @@ -32,12 +32,12 @@ extern void FUN_02022294(void); extern void FUN_0201259C(void); extern void FUN_02002C14(void); extern void FUN_02002C50(int, int); -extern struct UnkStruct_021C59C8 * FUN_0202254C(void); -extern u32 FUN_02029EF8(struct UnkStruct_021C59C8 *); +extern struct SaveBlock2 * FUN_0202254C(void); +extern u32 FUN_02029EF8(struct SaveBlock2 *); extern void FUN_02020AFC(void); extern int FUN_020337E8(int); extern void FUN_02034188(int, int); -extern int FUN_020227FC(struct UnkStruct_021C59C8 *); +extern int FUN_020227FC(struct SaveBlock2 *); extern void FUN_02089D90(int); extern void FUN_0200A2AC(void); extern void FUN_02015E30(void); diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index eb51d5fb..5367ae45 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 = PlayerData_GetTrainerID(sb2); u32 otId = GetBoxMonData(boxmon, MON_DATA_OTID, NULL); - u32 myGender = FUN_020239CC(sb2); + u32 myGender = PlayerData_GetTrainerGender(sb2); u32 otGender = GetBoxMonData(boxmon, MON_DATA_MET_GENDER, NULL); - struct String * r7 = FUN_020239A0(sb2, heap_id); + struct String * r7 = PlayerData_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); |