diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-28 09:35:24 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-28 09:35:24 -0400 |
| commit | 921a99ec5bc3a310d896a6a148294c04612ed354 (patch) | |
| tree | 4d4407de4a9d44c6f3204023ae3d208886c5c8d9 /include | |
| parent | f90a42fa5248c61fef9bf1c485f479314da176cd (diff) | |
Merge region map state structs
Diffstat (limited to 'include')
| -rw-r--r-- | include/ewram.h | 2 | ||||
| -rw-r--r-- | include/region_map.h | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/include/ewram.h b/include/ewram.h index 5a1f4e13b..55edf1b05 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -10,11 +10,11 @@ extern u8 gSharedMem[]; // seperated. #define gDecompressionBuffer (gSharedMem + 0x1E000) +#define eRegionMapState (*(struct RegionMapState *)gSharedMem) #define eDroughtPaletteData (*(struct WeatherPaletteData *)gSharedMem) #define gBattleStruct ((struct BattleStruct *) (gSharedMem + 0x0)) #define namingScreenData (*(struct NamingScreenData *)(gSharedMem + 0x0)) #define ewramBerryPic (gSharedMem + 0x0) -#define ewram0_5 (*(struct UnkStruct *)(gSharedMem + 0x0)) #define eMatsudaDebugVar (gSharedMem[0x0]) #define eBrendanSprite (gSharedMem + 0x0) #define ewram0_7 (&gSharedMem[0]) diff --git a/include/region_map.h b/include/region_map.h index 24c768ea5..474e1ebda 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -60,6 +60,19 @@ struct RegionMap /*0x280*/ u8 cursorLargeImage[0x600]; }; // size: 0x880 +// Replaces field_region_map.c:UnkStruct, region_map.c:UnknownStruct3 +struct RegionMapState +{ + void (*callback)(void); + u16 state; + u16 mapSectionId; + struct RegionMap regionMap; + u16 unk_888[0xE0]; + u8 blankMapName[12]; +}; + +extern struct RegionMapState *const gRegionMapState; + void InitRegionMap(struct RegionMap *regionMap, bool8 zoomed); void sub_80FA904(struct RegionMap *regionMap, bool8 zoomed); bool8 sub_80FA940(void); |