Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest

This commit is contained in:
GriffinR
2020-08-16 05:59:10 -04:00
511 changed files with 17469 additions and 16800 deletions

View File

@@ -34,8 +34,6 @@
#define POKEBLOCKS_COUNT 40
#define OBJECT_EVENTS_COUNT 16
#define BERRY_TREES_COUNT 128
#define FLAGS_COUNT 300
#define VARS_COUNT 256
#define MAIL_COUNT 16
#define SECRET_BASES_COUNT 20
#define TV_SHOWS_COUNT 25