diff options
| author | garak <garakmon@gmail.com> | 2019-01-15 23:00:25 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2019-01-15 23:26:17 -0500 |
| commit | 669e40cb15232f0631fba4a079a42dcc7e676adc (patch) | |
| tree | 91b7c68e65cb21efe5a8a1d3fda7c315c997a597 /include | |
| parent | e8b149e80e7b1411ce7a128e36ebc5d5490133e1 (diff) | |
sync region map data formats with pokeemerald
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/region_map_sections.h | 2 | ||||
| -rw-r--r-- | include/heated_rock.h | 2 | ||||
| -rw-r--r-- | include/region_map.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h index 254ae2edd..4fd9aa894 100644 --- a/include/constants/region_map_sections.h +++ b/include/constants/region_map_sections.h @@ -89,6 +89,6 @@ #define MAPSEC_SKY_PILLAR 0x55 #define MAPSEC_SECRET_BASE 0x56 #define MAPSEC_DYNAMIC 0x57 -#define MAPSEC_NOTHING 0x58 +#define MAPSEC_NONE 0x58 #endif // GUARD_REGIONMAPSEC_H diff --git a/include/heated_rock.h b/include/heated_rock.h index 26856fe7f..9ef460b35 100644 --- a/include/heated_rock.h +++ b/include/heated_rock.h @@ -7,4 +7,4 @@ u16 sub_80D5940(u8 spriteId); void sub_80D5994(struct Sprite *sprite, s16 x, s16 y); -#endif // GUARD_HEATED_ROCK_H
\ No newline at end of file +#endif // GUARD_HEATED_ROCK_H diff --git a/include/region_map.h b/include/region_map.h index 7ded72e49..a7f784448 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -80,6 +80,6 @@ void debug_sub_8110F28(void); u16 GetRegionMapSectionAt_(u16 x, u16 y); void sub_80FBF94(void); -extern const struct RegionMapLocation gRegionMapLocations[]; +extern const struct RegionMapLocation gRegionMapEntries[]; #endif // GUARD_REGION_MAP_H |