diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /include/region_map.h | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'include/region_map.h')
| -rw-r--r-- | include/region_map.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/region_map.h b/include/region_map.h index 6339f7a88..0c82232cf 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -78,6 +78,15 @@ struct RegionMap { /*0x284*/ u8 cursorLargeImage[0x600]; }; // size = 0x884 +struct RegionMapLocation +{ + u8 x; + u8 y; + u8 width; + u8 height; + const u8 *name; +}; + // Exported RAM declarations // Exported ROM declarations @@ -95,5 +104,10 @@ u8 *GetMapName(u8 *, u16, u16); bool32 sub_8124668(u8 mapSecId); u8 *sub_81245DC(u8 *dest, u16 mapSecId); u8 *sub_8124610(u8 *dest, u16 mapSecId); +u16 CorrectSpecialMapSecId(u16 mapSecId); +void sub_8122D88(struct RegionMap *regionMap); +void PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs(s16 x, s16 y); + +extern const struct RegionMapLocation gRegionMapEntries[]; #endif //GUARD_REGION_MAP_H |