Merge branch 'master' into record_mixing

2018-02-11 20:12:40 -05:00
parent bc063b45d0 14a76793e5
commit 590c4b500b
6672 changed files with 937954 additions and 212286 deletions
@@ -7,7 +7,7 @@ void sub_818DA78(void);
 void sub_818DEF4(void);
 void sub_818E564(void);
 void sub_818E570(const LilycoveLady *lilycoveLady);
-bool8 sub_818E704(struct Pokeblock *pokeblock);
+bool8 GivePokeblockToContestLady(struct Pokeblock *pokeblock);
 void sub_818E7E0(u8 *dest1, u8 *dest2);
 void sub_818E81C(u8 *dest);
 void sub_818E848(u8 *dest);