diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-18 13:09:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-18 13:09:19 -0600 |
| commit | e8415c51d199dd19ed122fef57ff5d09971cc5ea (patch) | |
| tree | ab117a11b93c66c0c333300b2e053a77275bae8e /include/global.h | |
| parent | 032dd251e628debd1ec7774fa42b6e7d39b3d83b (diff) | |
| parent | f2d3babd30c51b79c48d065f809273a10929a2ee (diff) | |
Merge pull request #387 from DizzyEggg/battle_pyramid
Battle pyramid
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/global.h b/include/global.h index 5a86d5daa..3da68185f 100644 --- a/include/global.h +++ b/include/global.h @@ -135,6 +135,7 @@ enum LanguageId #define BAG_POKEBALLS_COUNT 16 #define BAG_TMHM_COUNT 64 #define BAG_BERRIES_COUNT 46 +#define EVENT_OBJECT_TEMPLATES_COUNT 64 #define PYRAMID_BAG_ITEMS_COUNT 10 #define HALL_FACILITIES_COUNT 9 // 7 facilities for single mode + tower double mode + tower multi mode. @@ -442,12 +443,14 @@ struct BattleFrontier /*0xE10*/ u8 field_E10_1:3; /*0xE10*/ u8 field_E10_2:4; /*0xE10*/ u8 field_E10_3:1; - /*0xE12*/ u16 field_E12[4]; + /*0xE12*/ u16 field_E12[3]; + /*0xE18*/ u16 field_E18; /*0xE1A*/ u16 pyramidWinStreaks[2]; /*0xE1E*/ u16 pyramidRecordStreaks[2]; - /*0xE1E*/ u16 field_E1F[5]; + /*0xE22*/ u16 field_E22[4]; + /*0xE2A*/ u8 field_E2A; /*0xE2C*/ struct PyramidBag pyramidBag; - /*0xE58*/ u16 field_E58; + /*0xE68*/ u8 field_E68; /*0xE6A*/ u16 field_E6A; /*0xE6C*/ u16 field_E6C; /*0xE6E*/ u16 field_E6E; @@ -905,7 +908,7 @@ struct SaveBlock1 /*0x9C8*/ u16 trainerRematchStepCounter; /*0x9CA*/ u8 trainerRematches[100]; /*0xA30*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT]; - /*0xC70*/ struct EventObjectTemplate eventObjectTemplates[64]; + /*0xC70*/ struct EventObjectTemplate eventObjectTemplates[EVENT_OBJECT_TEMPLATES_COUNT]; /*0x1270*/ u8 flags[FLAGS_COUNT]; /*0x139C*/ u16 vars[VARS_COUNT]; /*0x159C*/ u32 gameStats[NUM_GAME_STATS]; |