diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/fieldmap.h | 20 | ||||
| -rw-r--r-- | include/game_stat.h | 56 | ||||
| -rw-r--r-- | include/global.h | 9 |
3 files changed, 83 insertions, 2 deletions
diff --git a/include/fieldmap.h b/include/fieldmap.h index 503b4b931..e60e4bbce 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -24,10 +24,28 @@ struct MapData struct Tileset *secondaryTileset; }; +struct MapObjectTemplate +{ + u8 filler[0x18]; +}; + +struct MapEvents +{ + u8 mapObjectCount; + u8 warpCount; + u8 coordEventCount; + u8 bgEventCount; + + struct MapObjectTemplate *mapObjects; + void *warps; + void *coordEvents; + void *bgEvents; +}; + struct MapHeader { struct MapData *mapData; - void *events; + struct MapEvents *events; u8 *mapScripts; // TODO: rest of struct }; diff --git a/include/game_stat.h b/include/game_stat.h new file mode 100644 index 000000000..70b6f51ce --- /dev/null +++ b/include/game_stat.h @@ -0,0 +1,56 @@ +#ifndef GUARD_GAME_STAT_H +#define GUARD_GAME_STAT_H + +#define GAME_STAT_SAVED_GAME 0 +#define GAME_STAT_FIRST_HOF_PLAY_TIME 1 +#define GAME_STAT_STARTED_TRENDS 2 +#define GAME_STAT_PLANTED_BERRIES 3 +#define GAME_STAT_TRADED_BIKES 4 +#define GAME_STAT_STEPS 5 +#define GAME_STAT_GOT_INTERVIEWED 6 +#define GAME_STAT_TOTAL_BATTLES 7 +#define GAME_STAT_WILD_BATTLES 8 +#define GAME_STAT_TRAINER_BATTLES 9 +#define GAME_STAT_ENTERED_HOF 10 +#define GAME_STAT_POKEMON_CAPTURES 11 +#define GAME_STAT_FISHING_CAPTURES 12 +#define GAME_STAT_HATCHED_EGGS 13 +#define GAME_STAT_EVOLVED_POKEMON 14 +#define GAME_STAT_USED_POKECENTER 15 +#define GAME_STAT_RESTED_AT_HOME 16 +#define GAME_STAT_ENTERED_SAFARI_ZONE 17 +#define GAME_STAT_USED_CUT 18 +#define GAME_STAT_USED_ROCK_SMASH 19 +#define GAME_STAT_MOVED_SECRET_BASE 20 +#define GAME_STAT_POKEMON_TRADES 21 +#define GAME_STAT_UNKNOWN_22 22 +#define GAME_STAT_LINK_BATTLE_WINS 23 +#define GAME_STAT_LINK_BATTLE_LOSSES 24 +#define GAME_STAT_LINK_BATTLE_DRAWS 25 +#define GAME_STAT_USED_SPLASH 26 +#define GAME_STAT_USED_STRUGGLE 27 +#define GAME_STAT_SLOT_JACKPOTS 28 +#define GAME_STAT_CONSECUTIVE_ROULETTE_WINS 29 +#define GAME_STAT_ENTERED_BATTLE_TOWER 30 +#define GAME_STAT_UNKNOWN_31 31 +#define GAME_STAT_BATTLE_TOWER_BEST_STREAK 32 +#define GAME_STAT_POKEBLOCKS 33 +#define GAME_STAT_POKEBLOCKS_WITH_FRIENDS 34 +#define GAME_STAT_WON_LINK_CONTEST 35 +#define GAME_STAT_ENTERED_CONTEST 36 +#define GAME_STAT_WON_CONTEST 37 +#define GAME_STAT_SHOPPED 38 +#define GAME_STAT_USED_ITEMFINDER 39 +#define GAME_STAT_GOT_RAINED_ON 40 +#define GAME_STAT_CHECKED_POKEDEX 41 +#define GAME_STAT_RECEIVED_RIBBONS 42 +#define GAME_STAT_JUMPED_DOWN_LEDGES 43 +#define GAME_STAT_WATCHED_TV 44 +#define GAME_STAT_CHECKED_CLOCK 45 +#define GAME_STAT_WON_POKEMON_LOTTERY 46 +#define GAME_STAT_USED_DAYCARE 47 +#define GAME_STAT_RODE_CABLE_CAR 48 +#define GAME_STAT_ENTERED_HOT_SPRINGS 49 +#define NUM_GAME_STATS 50 + +#endif // GUARD_GAME_STAT_H diff --git a/include/global.h b/include/global.h index 68ec7c6ca..ca3ae4509 100644 --- a/include/global.h +++ b/include/global.h @@ -91,6 +91,9 @@ struct SecretBaseRecord u8 partyEVs[6]; }; +#include "game_stat.h" +#include "fieldmap.h" + struct WarpData { s8 mapGroup; @@ -127,7 +130,11 @@ struct SaveBlock1 u32 money; u16 coins; u16 registeredItem; // registered for use with SELECT button - u8 filler_498[0x2A64]; + u8 filler_498[0x788]; + struct MapObjectTemplate mapObjectTemplates[64]; + u8 filler_1220[0x320]; + u32 gameStats[NUM_GAME_STATS]; + u8 filler_1608[0x18F4]; struct SB1_2EFC_Struct sb1_2EFC_struct[5]; u8 filler_2F9C[0x6F4]; struct RamScript ramScript; |