Merge with master

2018-12-20 22:53:08 +01:00
parent 7dcb614cca 6ef9671718
commit ecee02816d
323 changed files with 74857 additions and 128444 deletions
--- a/src/save.c
+++ b/src/save.c
@@ -5,6 +5,7 @@
 #include "decompress.h"
 #include "load_save.h"
 #include "overworld.h"
+#include "pokemon_storage_system.h"
 #include "main.h"
 #include "constants/game_stat.h"