diff options
author | itskobold <itskobold@users.noreply.github.com> | 2017-11-20 18:27:23 +0000 |
---|---|---|
committer | itskobold <itskobold@users.noreply.github.com> | 2017-11-20 18:27:23 +0000 |
commit | caf952e02eb29f56a0c8b8571a6c5c4f8d0d2ef2 (patch) | |
tree | f0592fc84aeb433b0fb59d9ceabd025b5589f83b /include/pokeblock.h | |
parent | 625be4bf04c9f14c4e1ee2e1ab74e7a5a7964a33 (diff) | |
parent | 1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'include/pokeblock.h')
-rw-r--r-- | include/pokeblock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/pokeblock.h b/include/pokeblock.h index 5d52f8e55..b0e93f0e5 100644 --- a/include/pokeblock.h +++ b/include/pokeblock.h @@ -23,6 +23,7 @@ enum }; void ClearPokeblocks(void); +s16 PokeblockGetGain(u8, const struct Pokeblock *); /* void sub_810B96C(void); @@ -32,7 +33,6 @@ s16 GetPokeblockData(const struct Pokeblock *, u8); u8 sub_810C9E8(struct Pokeblock *); void sub_810BA7C(u8); bool8 PokeblockClearIfExists(u8); -s16 PokeblockGetGain(u8, const struct Pokeblock *); u8 sub_810CB68(u8, u8*); void PokeblockCopyName(struct Pokeblock *pokeblock, u8 *dest); void CB2_PreparePokeblockFeedScene(void); |