diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-29 23:09:31 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-29 23:09:31 -0400 |
commit | 5adf807274aa36dc8f65a120f61debf5a0c1d360 (patch) | |
tree | c7ea8d26ae569724e24f93687bd0e7d3bf22f95b /include/pokeblock.h | |
parent | 06f5a396016aee2406749633b627bb9d729744ff (diff) | |
parent | 8d82578d3a101b06f9d2ced31738021007c4e533 (diff) |
Merge remote-tracking branch 'origin/master' into use_pokeblock
Diffstat (limited to 'include/pokeblock.h')
-rwxr-xr-x[-rw-r--r--] | include/pokeblock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/pokeblock.h b/include/pokeblock.h index 257c83f1c..b925894db 100644..100755 --- a/include/pokeblock.h +++ b/include/pokeblock.h @@ -5,6 +5,7 @@ void sub_810B96C(void); void sub_810BA7C(u8); void ClearPokeblocks(void); void sub_810CA6C(s32); +u8 sub_810CB68(u8, u8*); s16 sub_810CAE4(u8, struct Pokeblock *); #endif // GUARD_POKEBLOCK_H |