From 6b153b3a0d8bee97e13c395c1228b7465738f64c Mon Sep 17 00:00:00 2001 From: Jo Ruby P Date: Wed, 15 Aug 2018 13:37:13 +0100 Subject: load_save.c uses constants defined in global.h --- include/global.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/global.h') diff --git a/include/global.h b/include/global.h index 36e1db978..4dc23e12f 100644 --- a/include/global.h +++ b/include/global.h @@ -96,7 +96,8 @@ enum LanguageId // capacities of various saveblock objects #define DAYCARE_MON_COUNT 2 #define POKEBLOCKS_COUNT 40 -#define EVENT_OBJECTS_COUNT 16 +#define PARTY_SIZE 6 +#define EVENT_OBJECTS_COUNT 16 #define BERRY_TREES_COUNT 128 #define FLAGS_COUNT 288 #define VARS_COUNT 256 -- cgit v1.2.3 From ae4d91ce501864fef180155927912c32d931e14e Mon Sep 17 00:00:00 2001 From: Jo Ruby P Date: Wed, 15 Aug 2018 15:27:58 +0100 Subject: Label unknowns and fillers, add constants to global.h, use constants in record_mixing.c and tv.c --- include/global.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include/global.h') diff --git a/include/global.h b/include/global.h index 4dc23e12f..374701930 100644 --- a/include/global.h +++ b/include/global.h @@ -103,6 +103,8 @@ enum LanguageId #define VARS_COUNT 256 #define MAIL_COUNT 16 #define SECRET_BASES_COUNT 20 +#define TV_SHOWS_COUNT 25 +#define POKE_NEWS_COUNT 16 #define PC_ITEMS_COUNT 50 #define BAG_ITEMS_COUNT 20 #define BAG_KEYITEMS_COUNT 20 @@ -687,8 +689,8 @@ struct SaveBlock1 /* 0x02025734 */ /*0x2704*/ u8 decorDoll[40]; /*0x272C*/ u8 decorCushion[10]; /*0x2736*/ u8 padding_2736[2]; - /*0x2738*/ TVShow tvShows[25]; - /*0x2ABC*/ struct PokeNews pokeNews[16]; + /*0x2738*/ TVShow tvShows[TV_SHOWS_COUNT]; + /*0x2ABC*/ struct PokeNews pokeNews[POKE_NEWS_COUNT]; /*0x2AFC*/ u16 outbreakPokemonSpecies; /*0x2AFE*/ u8 outbreakLocationMapNum; /*0x2AFF*/ u8 outbreakLocationMapGroup; -- cgit v1.2.3