summaryrefslogtreecommitdiff
path: root/include/pokeblock.h
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-11-21 21:25:48 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2017-11-21 21:25:48 -0500
commitadba0bacfccd15540f853dfd714ab8c91767e9c6 (patch)
tree9965f9c76e18bbab55474f1ae071d40ad3616c38 /include/pokeblock.h
parent161a37809bab3ab646c503a63d9ef258d9d518af (diff)
parent1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into load_save
Diffstat (limited to 'include/pokeblock.h')
-rw-r--r--include/pokeblock.h2
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);