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

Rename REGION_MAP constants to adopt MAPSEC names from Ruby

Browse Source
This commit is contained in:
PikalaxALT
2017-10-28 22:03:33 -04:00
parent 27cee8bcf1
commit 4049ed7e2c
3 changed files with 218 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/region_map.h
+213 -213
View File
@@ -4,219 +4,219 @@
// Exported type declarations // Exported type declarations
enum { enum {
REGION_MAP_LITTLEROOT_TOWN, MAPSEC_LITTLEROOT_TOWN,
REGION_MAP_OLDALE_TOWN, MAPSEC_OLDALE_TOWN,
REGION_MAP_DEWFORD_TOWN, MAPSEC_DEWFORD_TOWN,
REGION_MAP_LAVARIDGE_TOWN, MAPSEC_LAVARIDGE_TOWN,
REGION_MAP_FALLARBOR_TOWN, MAPSEC_FALLARBOR_TOWN,
REGION_MAP_VERDANTURF_TOWN, MAPSEC_VERDANTURF_TOWN,
REGION_MAP_PACIFIDLOG_TOWN, MAPSEC_PACIFIDLOG_TOWN,
REGION_MAP_PETALBURG_CITY, MAPSEC_PETALBURG_CITY,
REGION_MAP_SLATEPORT_CITY, MAPSEC_SLATEPORT_CITY,
REGION_MAP_MAUVILLE_CITY, MAPSEC_MAUVILLE_CITY,
REGION_MAP_RUSTBORO_CITY, MAPSEC_RUSTBORO_CITY,
REGION_MAP_FORTREE_CITY, MAPSEC_FORTREE_CITY,
REGION_MAP_LILYCOVE_CITY, MAPSEC_LILYCOVE_CITY,
REGION_MAP_MOSSDEEP_CITY, MAPSEC_MOSSDEEP_CITY,
REGION_MAP_SOOTOPOLIS_CITY, MAPSEC_SOOTOPOLIS_CITY,
REGION_MAP_EVER_GRANDE_CITY, MAPSEC_EVER_GRANDE_CITY,
REGION_MAP_ROUTE_101, MAPSEC_ROUTE_101,
REGION_MAP_ROUTE_102, MAPSEC_ROUTE_102,
REGION_MAP_ROUTE_103, MAPSEC_ROUTE_103,
REGION_MAP_ROUTE_104, MAPSEC_ROUTE_104,
REGION_MAP_ROUTE_105, MAPSEC_ROUTE_105,
REGION_MAP_ROUTE_106, MAPSEC_ROUTE_106,
REGION_MAP_ROUTE_107, MAPSEC_ROUTE_107,
REGION_MAP_ROUTE_108, MAPSEC_ROUTE_108,
REGION_MAP_ROUTE_109, MAPSEC_ROUTE_109,
REGION_MAP_ROUTE_110, MAPSEC_ROUTE_110,
REGION_MAP_ROUTE_111, MAPSEC_ROUTE_111,
REGION_MAP_ROUTE_112, MAPSEC_ROUTE_112,
REGION_MAP_ROUTE_113, MAPSEC_ROUTE_113,
REGION_MAP_ROUTE_114, MAPSEC_ROUTE_114,
REGION_MAP_ROUTE_115, MAPSEC_ROUTE_115,
REGION_MAP_ROUTE_116, MAPSEC_ROUTE_116,
REGION_MAP_ROUTE_117, MAPSEC_ROUTE_117,
REGION_MAP_ROUTE_118, MAPSEC_ROUTE_118,
REGION_MAP_ROUTE_119, MAPSEC_ROUTE_119,
REGION_MAP_ROUTE_120, MAPSEC_ROUTE_120,
REGION_MAP_ROUTE_121, MAPSEC_ROUTE_121,
REGION_MAP_ROUTE_122, MAPSEC_ROUTE_122,
REGION_MAP_ROUTE_123, MAPSEC_ROUTE_123,
REGION_MAP_ROUTE_124, MAPSEC_ROUTE_124,
REGION_MAP_ROUTE_125, MAPSEC_ROUTE_125,
REGION_MAP_ROUTE_126, MAPSEC_ROUTE_126,
REGION_MAP_ROUTE_127, MAPSEC_ROUTE_127,
REGION_MAP_ROUTE_128, MAPSEC_ROUTE_128,
REGION_MAP_ROUTE_129, MAPSEC_ROUTE_129,
REGION_MAP_ROUTE_130, MAPSEC_ROUTE_130,
REGION_MAP_ROUTE_131, MAPSEC_ROUTE_131,
REGION_MAP_ROUTE_132, MAPSEC_ROUTE_132,
REGION_MAP_ROUTE_133, MAPSEC_ROUTE_133,
REGION_MAP_ROUTE_134, MAPSEC_ROUTE_134,
REGION_MAP_UNDERWATER_124, MAPSEC_UNDERWATER_124,
REGION_MAP_UNDERWATER_125, MAPSEC_UNDERWATER_125,
REGION_MAP_UNDERWATER_126, MAPSEC_UNDERWATER_126,
REGION_MAP_UNDERWATER_127, MAPSEC_UNDERWATER_127,
REGION_MAP_UNDERWATER_128, MAPSEC_UNDERWATER_128,
REGION_MAP_GRANITE_CAVE, MAPSEC_GRANITE_CAVE,
REGION_MAP_MT_CHIMNEY, MAPSEC_MT_CHIMNEY,
REGION_MAP_SAFARI_ZONE, MAPSEC_SAFARI_ZONE,
REGION_MAP_BATTLE_FRONTIER, MAPSEC_BATTLE_FRONTIER,
REGION_MAP_PETALBURG_WOODS, MAPSEC_PETALBURG_WOODS,
REGION_MAP_RUSTURF_TUNNEL, MAPSEC_RUSTURF_TUNNEL,
REGION_MAP_ABANDONED_SHIP, MAPSEC_ABANDONED_SHIP,
REGION_MAP_NEW_MAUVILLE, MAPSEC_NEW_MAUVILLE,
REGION_MAP_METEOR_FALLS, MAPSEC_METEOR_FALLS,
REGION_MAP_METEOR_FALLS2, MAPSEC_METEOR_FALLS2,
REGION_MAP_MT_PYRE, MAPSEC_MT_PYRE,
REGION_MAP_AQUA_HIDEOUT_OLD, MAPSEC_AQUA_HIDEOUT_OLD,
REGION_MAP_SHOAL_CAVE, MAPSEC_SHOAL_CAVE,
REGION_MAP_SEAFLOOR_CAVERN, MAPSEC_SEAFLOOR_CAVERN,
REGION_MAP_UNDERWATER, MAPSEC_UNDERWATER,
REGION_MAP_VICTORY_ROAD, MAPSEC_VICTORY_ROAD,
REGION_MAP_MIRAGE_ISLAND, MAPSEC_MIRAGE_ISLAND,
REGION_MAP_CAVE_OF_ORIGIN, MAPSEC_CAVE_OF_ORIGIN,
REGION_MAP_SOUTHERN_ISLAND, MAPSEC_SOUTHERN_ISLAND,
REGION_MAP_FIERY_PATH, MAPSEC_FIERY_PATH,
REGION_MAP_FIERY_PATH2, MAPSEC_FIERY_PATH2,
REGION_MAP_JAGGED_PASS, MAPSEC_JAGGED_PASS,
REGION_MAP_JAGGED_PASS2, MAPSEC_JAGGED_PASS2,
REGION_MAP_SEALED_CHAMBER, MAPSEC_SEALED_CHAMBER,
REGION_MAP_UNDERWATER_SEALED_CHAMBER, MAPSEC_UNDERWATER_SEALED_CHAMBER,
REGION_MAP_SCORCHED_SLAB, MAPSEC_SCORCHED_SLAB,
REGION_MAP_ISLAND_CAVE, MAPSEC_ISLAND_CAVE,
REGION_MAP_DESERT_RUINS, MAPSEC_DESERT_RUINS,
REGION_MAP_ANCIENT_TOMB, MAPSEC_ANCIENT_TOMB,
REGION_MAP_INSIDE_OF_TRUCK, MAPSEC_INSIDE_OF_TRUCK,
REGION_MAP_SKY_PILLAR, MAPSEC_SKY_PILLAR,
REGION_MAP_SECRET_BASE, MAPSEC_SECRET_BASE,
REGION_MAP_NONE, MAPSEC_NONE,
REGION_MAP_PALLET_TOWN, MAPSEC_PALLET_TOWN,
REGION_MAP_VIRIDIAN_CITY, MAPSEC_VIRIDIAN_CITY,
REGION_MAP_PEWTER_CITY, MAPSEC_PEWTER_CITY,
REGION_MAP_CERULEAN_CITY, MAPSEC_CERULEAN_CITY,
REGION_MAP_LAVENDER_TOWN, MAPSEC_LAVENDER_TOWN,
REGION_MAP_VERMILION_CITY, MAPSEC_VERMILION_CITY,
REGION_MAP_CELADON_CITY, MAPSEC_CELADON_CITY,
REGION_MAP_FUCHSIA_CITY, MAPSEC_FUCHSIA_CITY,
REGION_MAP_CINNABAR_ISLAND, MAPSEC_CINNABAR_ISLAND,
REGION_MAP_INDIGO_PLATEAU, MAPSEC_INDIGO_PLATEAU,
REGION_MAP_SAFFRON_CITY, MAPSEC_SAFFRON_CITY,
REGION_MAP_ROUTE_4, MAPSEC_ROUTE_4,
REGION_MAP_ROUTE_10, MAPSEC_ROUTE_10,
REGION_MAP_ROUTE_1, MAPSEC_ROUTE_1,
REGION_MAP_ROUTE_2, MAPSEC_ROUTE_2,
REGION_MAP_ROUTE_3, MAPSEC_ROUTE_3,
REGION_MAP_ROUTE_4_2, MAPSEC_ROUTE_4_2,
REGION_MAP_ROUTE_5, MAPSEC_ROUTE_5,
REGION_MAP_ROUTE_6, MAPSEC_ROUTE_6,
REGION_MAP_ROUTE_7, MAPSEC_ROUTE_7,
REGION_MAP_ROUTE_8, MAPSEC_ROUTE_8,
REGION_MAP_ROUTE_9, MAPSEC_ROUTE_9,
REGION_MAP_ROUTE_10_2, MAPSEC_ROUTE_10_2,
REGION_MAP_ROUTE_11, MAPSEC_ROUTE_11,
REGION_MAP_ROUTE_12, MAPSEC_ROUTE_12,
REGION_MAP_ROUTE_13, MAPSEC_ROUTE_13,
REGION_MAP_ROUTE_14, MAPSEC_ROUTE_14,
REGION_MAP_ROUTE_15, MAPSEC_ROUTE_15,
REGION_MAP_ROUTE_16, MAPSEC_ROUTE_16,
REGION_MAP_ROUTE_17, MAPSEC_ROUTE_17,
REGION_MAP_ROUTE_18, MAPSEC_ROUTE_18,
REGION_MAP_ROUTE_19, MAPSEC_ROUTE_19,
REGION_MAP_ROUTE_20, MAPSEC_ROUTE_20,
REGION_MAP_ROUTE_21, MAPSEC_ROUTE_21,
REGION_MAP_ROUTE_22, MAPSEC_ROUTE_22,
REGION_MAP_ROUTE_23, MAPSEC_ROUTE_23,
REGION_MAP_ROUTE_24, MAPSEC_ROUTE_24,
REGION_MAP_ROUTE_25, MAPSEC_ROUTE_25,
REGION_MAP_VIRIDIAN_FOREST, MAPSEC_VIRIDIAN_FOREST,
REGION_MAP_MT_MOON, MAPSEC_MT_MOON,
REGION_MAP_S_S_ANNE, MAPSEC_S_S_ANNE,
REGION_MAP_UNDERGROUND_PATH, MAPSEC_UNDERGROUND_PATH,
REGION_MAP_UNDERGROUND_PATH_2, MAPSEC_UNDERGROUND_PATH_2,
REGION_MAP_DIGLETTS_CAVE, MAPSEC_DIGLETTS_CAVE,
REGION_MAP_KANTO_VICTORY_ROAD, MAPSEC_KANTO_VICTORY_ROAD,
REGION_MAP_ROCKET_HIDEOUT, MAPSEC_ROCKET_HIDEOUT,
REGION_MAP_SILPH_CO, MAPSEC_SILPH_CO,
REGION_MAP_POKEMON_MANSION, MAPSEC_POKEMON_MANSION,
REGION_MAP_KANTO_SAFARI_ZONE, MAPSEC_KANTO_SAFARI_ZONE,
REGION_MAP_POKEMON_LEAGUE, MAPSEC_POKEMON_LEAGUE,
REGION_MAP_ROCK_TUNNEL, MAPSEC_ROCK_TUNNEL,
REGION_MAP_SEAFOAM_ISLANDS, MAPSEC_SEAFOAM_ISLANDS,
REGION_MAP_POKEMON_TOWER, MAPSEC_POKEMON_TOWER,
REGION_MAP_CERULEAN_CAVE, MAPSEC_CERULEAN_CAVE,
REGION_MAP_POWER_PLANT, MAPSEC_POWER_PLANT,
REGION_MAP_ONE_ISLAND, MAPSEC_ONE_ISLAND,
REGION_MAP_TWO_ISLAND, MAPSEC_TWO_ISLAND,
REGION_MAP_THREE_ISLAND, MAPSEC_THREE_ISLAND,
REGION_MAP_FOUR_ISLAND, MAPSEC_FOUR_ISLAND,
REGION_MAP_FIVE_ISLAND, MAPSEC_FIVE_ISLAND,
REGION_MAP_SEVEN_ISLAND, MAPSEC_SEVEN_ISLAND,
REGION_MAP_SIX_ISLAND, MAPSEC_SIX_ISLAND,
REGION_MAP_KINDLE_ROAD, MAPSEC_KINDLE_ROAD,
REGION_MAP_TREASURE_BEACH, MAPSEC_TREASURE_BEACH,
REGION_MAP_CAPE_BRINK, MAPSEC_CAPE_BRINK,
REGION_MAP_BOND_BRIDGE, MAPSEC_BOND_BRIDGE,
REGION_MAP_THREE_ISLE_PORT, MAPSEC_THREE_ISLE_PORT,
REGION_MAP_SEVII_ISLE_6, MAPSEC_SEVII_ISLE_6,
REGION_MAP_SEVII_ISLE_7, MAPSEC_SEVII_ISLE_7,
REGION_MAP_SEVII_ISLE_8, MAPSEC_SEVII_ISLE_8,
REGION_MAP_SEVII_ISLE_9, MAPSEC_SEVII_ISLE_9,
REGION_MAP_RESORT_GORGEOUS, MAPSEC_RESORT_GORGEOUS,
REGION_MAP_WATER_LABYRINTH, MAPSEC_WATER_LABYRINTH,
REGION_MAP_FIVE_ISLE_MEADOW, MAPSEC_FIVE_ISLE_MEADOW,
REGION_MAP_MEMORIAL_PILLAR, MAPSEC_MEMORIAL_PILLAR,
REGION_MAP_OUTCAST_ISLAND, MAPSEC_OUTCAST_ISLAND,
REGION_MAP_GREEN_PATH, MAPSEC_GREEN_PATH,
REGION_MAP_WATER_PATH, MAPSEC_WATER_PATH,
REGION_MAP_RUIN_VALLEY, MAPSEC_RUIN_VALLEY,
REGION_MAP_TRAINER_TOWER, MAPSEC_TRAINER_TOWER,
REGION_MAP_CANYON_ENTRANCE, MAPSEC_CANYON_ENTRANCE,
REGION_MAP_SEVAULT_CANYON, MAPSEC_SEVAULT_CANYON,
REGION_MAP_TANOBY_RUINS, MAPSEC_TANOBY_RUINS,
REGION_MAP_SEVII_ISLE_22, MAPSEC_SEVII_ISLE_22,
REGION_MAP_SEVII_ISLE_23, MAPSEC_SEVII_ISLE_23,
REGION_MAP_SEVII_ISLE_24, MAPSEC_SEVII_ISLE_24,
REGION_MAP_NAVEL_ROCK, MAPSEC_NAVEL_ROCK,
REGION_MAP_MT_EMBER, MAPSEC_MT_EMBER,
REGION_MAP_BERRY_FOREST, MAPSEC_BERRY_FOREST,
REGION_MAP_ICEFALL_CAVE, MAPSEC_ICEFALL_CAVE,
REGION_MAP_ROCKET_WAREHOUSE, MAPSEC_ROCKET_WAREHOUSE,
REGION_MAP_TRAINER_TOWER_2, MAPSEC_TRAINER_TOWER_2,
REGION_MAP_DOTTED_HOLE, MAPSEC_DOTTED_HOLE,
REGION_MAP_LOST_CAVE, MAPSEC_LOST_CAVE,
REGION_MAP_PATTERN_BUSH, MAPSEC_PATTERN_BUSH,
REGION_MAP_ALTERING_CAVE, MAPSEC_ALTERING_CAVE,
REGION_MAP_TANOBY_CHAMBERS, MAPSEC_TANOBY_CHAMBERS,
REGION_MAP_THREE_ISLE_PATH, MAPSEC_THREE_ISLE_PATH,
REGION_MAP_TANOBY_KEY, MAPSEC_TANOBY_KEY,
REGION_MAP_BIRTH_ISLAND, MAPSEC_BIRTH_ISLAND,
REGION_MAP_MONEAN_CHAMBER, MAPSEC_MONEAN_CHAMBER,
REGION_MAP_LIPTOO_CHAMBER, MAPSEC_LIPTOO_CHAMBER,
REGION_MAP_WEEPTH_CHAMBER, MAPSEC_WEEPTH_CHAMBER,
REGION_MAP_DILFORD_CHAMBER, MAPSEC_DILFORD_CHAMBER,
REGION_MAP_SCUFIB_CHAMBER, MAPSEC_SCUFIB_CHAMBER,
REGION_MAP_RIXY_CHAMBER, MAPSEC_RIXY_CHAMBER,
REGION_MAP_VIAPOIS_CHAMBER, MAPSEC_VIAPOIS_CHAMBER,
REGION_MAP_EMBER_SPA, MAPSEC_EMBER_SPA,
REGION_MAP_SPECIAL_AREA, MAPSEC_SPECIAL_AREA,
REGION_MAP_AQUA_HIDEOUT, MAPSEC_AQUA_HIDEOUT,
REGION_MAP_MAGMA_HIDEOUT, MAPSEC_MAGMA_HIDEOUT,
REGION_MAP_MIRAGE_TOWER, MAPSEC_MIRAGE_TOWER,
REGION_MAP_BIRTH_ISLAND_2, MAPSEC_BIRTH_ISLAND_2,
REGION_MAP_FARAWAY_ISLAND, MAPSEC_FARAWAY_ISLAND,
REGION_MAP_ARTISAN_CAVE, MAPSEC_ARTISAN_CAVE,
REGION_MAP_MARINE_CAVE, MAPSEC_MARINE_CAVE,
REGION_MAP_UNDERWATER_MARINE_CAVE, MAPSEC_UNDERWATER_MARINE_CAVE,
REGION_MAP_TERRA_CAVE, MAPSEC_TERRA_CAVE,
REGION_MAP_UNDERWATER_TERRA_CAVE, MAPSEC_UNDERWATER_TERRA_CAVE,
REGION_MAP_UNDERWATER_UNK1, MAPSEC_UNDERWATER_UNK1,
REGION_MAP_UNDERWATER_UNK2, MAPSEC_UNDERWATER_UNK2,
REGION_MAP_DESERT_UNDERPASS, MAPSEC_DESERT_UNDERPASS,
REGION_MAP_ALTERING_CAVE_2, MAPSEC_ALTERING_CAVE_2,
REGION_MAP_NAVEL_ROCK2, MAPSEC_NAVEL_ROCK2,
REGION_MAP_TRAINER_HILL MAPSEC_TRAINER_HILL
}; };
// Exported RAM declarations // Exported RAM declarations
src/decoration.c
+2 -2
View File
@@ -1603,7 +1603,7 @@ void sub_81289F0(u8 taskId)
ScriptContext1_SetupScript(gUnknown_08275D1F); ScriptContext1_SetupScript(gUnknown_08275D1F);
} }
gSprites[sDecor_CameraSpriteObjectIdx1].pos1.y += 2; gSprites[sDecor_CameraSpriteObjectIdx1].pos1.y += 2;
if (gMapHeader.regionMapSectionId == REGION_MAP_SECRET_BASE) if (gMapHeader.regionMapSectionId == MAPSEC_SECRET_BASE)
{ {
TV_PutSecretBaseVisitOnTheAir(); TV_PutSecretBaseVisitOnTheAir();
} }
@@ -2222,7 +2222,7 @@ void sub_81298EC(u8 taskId)
{ {
StringExpandPlaceholders(gStringVar4, gText_DecorationReturnedToPC); StringExpandPlaceholders(gStringVar4, gText_DecorationReturnedToPC);
DisplayItemMessageOnField(taskId, gStringVar4, sub_8129D64); DisplayItemMessageOnField(taskId, gStringVar4, sub_8129D64);
if (gMapHeader.regionMapSectionId == REGION_MAP_SECRET_BASE) if (gMapHeader.regionMapSectionId == MAPSEC_SECRET_BASE)
{ {
TV_PutSecretBaseVisitOnTheAir(); TV_PutSecretBaseVisitOnTheAir();
} }
src/tv.c
+3 -3
View File
@@ -6432,10 +6432,10 @@ void DoTVShowTodaysRivalTrainer(void)
default: default:
sTVShowState = 7; sTVShowState = 7;
break; break;
case REGION_MAP_SECRET_BASE: case MAPSEC_SECRET_BASE:
sTVShowState = 8; sTVShowState = 8;
break; break;
case REGION_MAP_NONE: case MAPSEC_NONE:
switch (show->rivalTrainer.mapDataId) switch (show->rivalTrainer.mapDataId)
{ {
case 0x115 ... 0x117: case 0x115 ... 0x117:
@@ -6633,7 +6633,7 @@ void DoTVShowHoennTreasureInvestigators(void)
{ {
case 0: case 0:
StringCopy(gStringVar1, ItemId_GetItem(show->treasureInvestigators.item)->name); StringCopy(gStringVar1, ItemId_GetItem(show->treasureInvestigators.item)->name);
if (show->treasureInvestigators.location == REGION_MAP_NONE) if (show->treasureInvestigators.location == MAPSEC_NONE)
{ {
switch (show->treasureInvestigators.mapDataId) switch (show->treasureInvestigators.mapDataId)
{ {