Merge branch 'master' into dodrio_berry_picking

2019-05-11 21:22:09 -04:00
parent a58d9a16dd fc72b74e6c
commit 539d472796
783 changed files with 74008 additions and 50982 deletions
@@ -1,7 +1,11 @@
 #ifndef GUARD_POKEMON_JUMP_H
 #define GUARD_POKEMON_JUMP_H

+#include "main.h"
+
 void sub_802EB24(u8, u8, u8, u8, u8);
 bool32 sub_802EB84(void);
+void sub_802A9A8(u16 monId, MainCallback callback);
+bool32 sub_802C908(u16 species);

 #endif //GUARD_POKEMON_JUMP_H