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

This commit is contained in:
GriffinR
2020-07-08 15:45:31 -04:00
109 changed files with 7618 additions and 6664 deletions

View File

@@ -53,6 +53,7 @@
#define APPRENTICE_MAX_QUESTIONS 9
#define MAX_REMATCH_ENTRIES 100 // only REMATCH_TABLE_ENTRIES (78) are used
#define NUM_CONTEST_WINNERS 13
#define UNION_ROOM_KB_ROW_COUNT 10
#define PYRAMID_BAG_ITEMS_COUNT 10
#define HALL_FACILITIES_COUNT 9 // 7 facilities for single mode + tower double mode + tower multi mode.