diff options
| author | huderlem <huderlem@gmail.com> | 2019-02-04 21:36:18 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-04 21:36:18 -0600 |
| commit | b0ee1009759ed1c46da81b1fb8410e2b75e42bb2 (patch) | |
| tree | ceee3e124b987b8dd24cb3a7bba85d4effe1ef5d /src/map_name_popup.c | |
| parent | 646533cfa3c8c42aee3efedaadfe49e495b64892 (diff) | |
| parent | d4125fef9bc9adb95c7a5fb5b8be903b34adc510 (diff) | |
Merge pull request #543 from pret/mapdata
Convert map data to JSON
Diffstat (limited to 'src/map_name_popup.c')
| -rw-r--r-- | src/map_name_popup.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map_name_popup.c b/src/map_name_popup.c index c13747006..0d88815c0 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -1,6 +1,4 @@ #include "global.h" -#include "constants/region_map_sections.h" -#include "constants/weather.h" #include "bg.h" #include "event_data.h" #include "gpu_regs.h" @@ -14,6 +12,9 @@ #include "string_util.h" #include "task.h" #include "text.h" +#include "constants/layouts.h" +#include "constants/region_map_sections.h" +#include "constants/weather.h" // enums enum MapPopUp_Themes @@ -305,7 +306,7 @@ static void ShowMapNamePopUpWindow(void) if (InBattlePyramid()) { - if (gMapHeader.mapLayoutId == 0x17A) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP) { withoutPrefixPtr = &(mapDisplayHeader[3]); mapDisplayHeaderSource = gBattlePyramid_MapHeaderStrings[7]; |