diff options
author | Revo <projectrevotpp@hotmail.com> | 2020-08-25 10:58:13 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-25 10:58:13 -0400 |
commit | 49e32814a3d7ba8a8a7e441a53d1a1c0ccd1f3fe (patch) | |
tree | d3b7dbd7bc8c129df02f80d9299cc546f47d0b3d /include/proto.h | |
parent | 7a6abfe3982d516b39a13a8fd934dbfe8211cfe6 (diff) | |
parent | b55789b64644420add50cf87715a1ab0ade16967 (diff) |
Merge pull request #267 from PikalaxALT/pikalax_work
sav_system_info; RTC_convert
Diffstat (limited to 'include/proto.h')
-rw-r--r-- | include/proto.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/proto.h b/include/proto.h index fb2f8a78..67a295ac 100644 --- a/include/proto.h +++ b/include/proto.h @@ -5,6 +5,7 @@ #include "pokemon.h" // for struct definitions #include "string16.h" // for struct definitions +#include "player_data.h" // for struct definitions int FUN_0206AE00(int x); u32 GetItemAttr(u16 item, u32 a1, u32 a2); @@ -15,7 +16,7 @@ int FUN_02005F14(int); void FUN_02005E80(int); void FUN_02005E90(int, int, int, int); void FUN_020056AC(int, int, int, int, int); -void FUN_020808AC(struct BoxPokemon *, int, int, int, int); +void FUN_020808AC(struct BoxPokemon *, struct PlayerData *, int, u32, u32); void StringExpandPlaceholders(u32 *, struct String *, struct String *); #endif //POKEDIAMOND_PROTO_H |