diff options
| author | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
| commit | 31d8bfb04850a9a1c1639b40b7ff305a673b9c09 (patch) | |
| tree | bba0c7d4e6230c2eecbb167b458bad89b8f01e04 /include/region_map.h | |
| parent | d1142b4290e8688a0d42bfc1b95b9d90b1721459 (diff) | |
| parent | 19ecb1631b5fce1147077026a8eff890c6ec315a (diff) | |
fix merge conflicts
Diffstat (limited to 'include/region_map.h')
| -rw-r--r-- | include/region_map.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/region_map.h b/include/region_map.h index 394fee469..67287b6c4 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -94,7 +94,8 @@ void CreateRegionMapPlayerIcon(u16 x, u16 y); void CreateRegionMapCursor(u16 tileTag, u16 paletteTag); u8 *GetMapName(u8 *, u16, u16); bool32 sub_8124668(u8 mapSecId); -void sub_80C4DF8(u8 *, u8); +void GetMapNameGeneric(u8 *, u8); void sub_80BFF50(u8 a0, void (*a1)(void)); +void MCB2_FlyMap(void); #endif //GUARD_REGION_MAP_H |