dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

convert some constants to C headers

Browse Source
This commit is contained in:
camthesaxman
2017-12-05 11:55:48 -06:00
parent 54da963091
commit caa13f8777
64 changed files with 4874 additions and 2612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/save_location.c
View File

@@ -1,9 +1,6 @@
#include "global.h"
#include "save_location.h"
#include "map_constants.h"
// used to make the list defines a little less ugly.
#define MAP(name) ((MAP_GROUP_##name << 8) + (MAP_ID_##name))
#include "constants/maps.h"
// specialSaveWarp flags
#define POKECENTER_SAVEWARP (1 << 1)
@@ -29,44 +26,44 @@ static bool32 IsCurMapInLocationList(const u16 *list)
// TODO: Not require a packed u16 array for these lists
static const u16 sSaveLocationPokeCenterList[] =
{
MAP(OLDALE_TOWN_POKEMON_CENTER_1F),
MAP(OLDALE_TOWN_POKEMON_CENTER_2F),
MAP(DEWFORD_TOWN_POKEMON_CENTER_1F),
MAP(DEWFORD_TOWN_POKEMON_CENTER_2F),
MAP(LAVARIDGE_TOWN_POKEMON_CENTER_1F),
MAP(LAVARIDGE_TOWN_POKEMON_CENTER_2F),
MAP(FALLARBOR_TOWN_POKEMON_CENTER_1F),
MAP(FALLARBOR_TOWN_POKEMON_CENTER_2F),
MAP(VERDANTURF_TOWN_POKEMON_CENTER_1F),
MAP(VERDANTURF_TOWN_POKEMON_CENTER_2F),
MAP(PACIFIDLOG_TOWN_POKEMON_CENTER_1F),
MAP(PACIFIDLOG_TOWN_POKEMON_CENTER_2F),
MAP(PETALBURG_CITY_POKEMON_CENTER_1F),
MAP(PETALBURG_CITY_POKEMON_CENTER_2F),
MAP(SLATEPORT_CITY_POKEMON_CENTER_1F),
MAP(SLATEPORT_CITY_POKEMON_CENTER_2F),
MAP(MAUVILLE_CITY_POKEMON_CENTER_1F),
MAP(MAUVILLE_CITY_POKEMON_CENTER_2F),
MAP(RUSTBORO_CITY_POKEMON_CENTER_1F),
MAP(RUSTBORO_CITY_POKEMON_CENTER_2F),
MAP(FORTREE_CITY_POKEMON_CENTER_1F),
MAP(FORTREE_CITY_POKEMON_CENTER_2F),
MAP(LILYCOVE_CITY_POKEMON_CENTER_1F),
MAP(LILYCOVE_CITY_POKEMON_CENTER_2F),
MAP(MOSSDEEP_CITY_POKEMON_CENTER_1F),
MAP(MOSSDEEP_CITY_POKEMON_CENTER_2F),
MAP(SOOTOPOLIS_CITY_POKEMON_CENTER_1F),
MAP(SOOTOPOLIS_CITY_POKEMON_CENTER_2F),
MAP(EVER_GRANDE_CITY_POKEMON_CENTER_1F),
MAP(EVER_GRANDE_CITY_POKEMON_CENTER_2F),
MAP(EVER_GRANDE_CITY_POKEMON_LEAGUE_1F),
MAP(EVER_GRANDE_CITY_POKEMON_LEAGUE_2F),
MAP(BATTLE_FRONTIER_POKEMON_CENTER_1F),
MAP(BATTLE_FRONTIER_POKEMON_CENTER_2F),
MAP(SINGLE_BATTLE_COLOSSEUM),
MAP(TRADE_CENTER),
MAP(RECORD_CORNER),
MAP(DOUBLE_BATTLE_COLOSSEUM),
MAP_OLDALE_TOWN_POKEMON_CENTER_1F,
MAP_OLDALE_TOWN_POKEMON_CENTER_2F,
MAP_DEWFORD_TOWN_POKEMON_CENTER_1F,
MAP_DEWFORD_TOWN_POKEMON_CENTER_2F,
MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F,
MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F,
MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F,
MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F,
MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F,
MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F,
MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F,
MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F,
MAP_PETALBURG_CITY_POKEMON_CENTER_1F,
MAP_PETALBURG_CITY_POKEMON_CENTER_2F,
MAP_SLATEPORT_CITY_POKEMON_CENTER_1F,
MAP_SLATEPORT_CITY_POKEMON_CENTER_2F,
MAP_MAUVILLE_CITY_POKEMON_CENTER_1F,
MAP_MAUVILLE_CITY_POKEMON_CENTER_2F,
MAP_RUSTBORO_CITY_POKEMON_CENTER_1F,
MAP_RUSTBORO_CITY_POKEMON_CENTER_2F,
MAP_FORTREE_CITY_POKEMON_CENTER_1F,
MAP_FORTREE_CITY_POKEMON_CENTER_2F,
MAP_LILYCOVE_CITY_POKEMON_CENTER_1F,
MAP_LILYCOVE_CITY_POKEMON_CENTER_2F,
MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F,
MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F,
MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F,
MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F,
MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F,
MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F,
MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F,
MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F,
MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F,
MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F,
MAP_SINGLE_BATTLE_COLOSSEUM,
MAP_TRADE_CENTER,
MAP_RECORD_CORNER,
MAP_DOUBLE_BATTLE_COLOSSEUM,
0xFFFF,
};
@@ -77,7 +74,7 @@ static bool32 IsCurMapPokeCenter(void)
static const u16 sSaveLocationReloadLocList[] = // there's only 1 location, and it's presumed its for the save reload feature for battle tower
{
MAP(BATTLE_TOWER_LOBBY),
MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY,
0xFFFF,
};