dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync map macro change with pokeemerald

Browse Source
This commit is contained in:
GriffinR
2024-08-27 13:57:07 -04:00
parent f155bf5419
commit 5e464c2091
32 changed files with 738 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/BirthIsland_Exterior/scripts.inc
+2 -2
View File
@@ -71,8 +71,8 @@ BirthIsland_Exterior_EventScript_Deoxys::
addobject LOCALID_DEOXYS addobject LOCALID_DEOXYS
waitse waitse
setfieldeffectargument 0, LOCALID_DEOXYS_ROCK setfieldeffectargument 0, LOCALID_DEOXYS_ROCK
setfieldeffectargument 1, MAP_NUM(BIRTH_ISLAND_EXTERIOR) setfieldeffectargument 1, MAP_NUM(MAP_BIRTH_ISLAND_EXTERIOR)
setfieldeffectargument 2, MAP_GROUP(BIRTH_ISLAND_EXTERIOR) setfieldeffectargument 2, MAP_GROUP(MAP_BIRTH_ISLAND_EXTERIOR)
dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
playbgm MUS_ENCOUNTER_DEOXYS, 0 playbgm MUS_ENCOUNTER_DEOXYS, 0
waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
data/maps/CeladonCity_GameCorner/scripts.inc
+4 -4
View File
@@ -248,12 +248,12 @@ CeladonCity_GameCorner_EventScript_SlotMachine::
goto_if_eq VAR_RESULT, NO, CeladonCity_GameCorner_EventScript_DontPlaySlotMachine goto_if_eq VAR_RESULT, NO, CeladonCity_GameCorner_EventScript_DontPlaySlotMachine
setfieldeffectargument 0, OBJ_EVENT_ID_PLAYER setfieldeffectargument 0, OBJ_EVENT_ID_PLAYER
.ifdef BUGFIX .ifdef BUGFIX
setfieldeffectargument 1, MAP_NUM(CELADON_CITY_GAME_CORNER) setfieldeffectargument 1, MAP_NUM(MAP_CELADON_CITY_GAME_CORNER)
setfieldeffectargument 2, MAP_GROUP(CELADON_CITY_GAME_CORNER) setfieldeffectargument 2, MAP_GROUP(MAP_CELADON_CITY_GAME_CORNER)
.else .else
@ Map num/group were provided in the wrong order @ Map num/group were provided in the wrong order
setfieldeffectargument 1, MAP_GROUP(CELADON_CITY_GAME_CORNER) setfieldeffectargument 1, MAP_GROUP(MAP_CELADON_CITY_GAME_CORNER)
setfieldeffectargument 2, MAP_NUM(CELADON_CITY_GAME_CORNER) setfieldeffectargument 2, MAP_NUM(MAP_CELADON_CITY_GAME_CORNER)
.endif .endif
dofieldeffect FLDEFF_SMILEY_FACE_ICON dofieldeffect FLDEFF_SMILEY_FACE_ICON
waitfieldeffect FLDEFF_SMILEY_FACE_ICON waitfieldeffect FLDEFF_SMILEY_FACE_ICON
include/constants/maps.h
+2 -2
View File
@@ -10,8 +10,8 @@
#define MAP_UNDEFINED (0xFF | (0xFF << 8)) #define MAP_UNDEFINED (0xFF | (0xFF << 8))
#define MAP_GROUP(map) (MAP_##map >> 8) #define MAP_GROUP(map) (map >> 8)
#define MAP_NUM(map) (MAP_##map & 0xFF) #define MAP_NUM(map) (map & 0xFF)
#define MAP(map) MAP_GROUP(map), MAP_NUM(map) #define MAP(map) MAP_GROUP(map), MAP_NUM(map)
src/battle_records.c
+1 -1
View File
@@ -442,7 +442,7 @@ static void UpdateBattleOutcomeOnTrainerCards(s32 battlerId)
void UpdatePlayerLinkBattleRecords(s32 battlerId) void UpdatePlayerLinkBattleRecords(s32 battlerId)
{ {
if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(UNION_ROOM) || gSaveBlock1Ptr->location.mapNum != MAP_NUM(UNION_ROOM)) if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(MAP_UNION_ROOM) || gSaveBlock1Ptr->location.mapNum != MAP_NUM(MAP_UNION_ROOM))
{ {
UpdateBattleOutcomeOnTrainerCards(battlerId); UpdateBattleOutcomeOnTrainerCards(battlerId);
AddOpponentLinkBattleRecord(&gSaveBlock2Ptr->linkBattleRecords, gTrainerCards[battlerId].rse.playerName, gTrainerCards[battlerId].rse.trainerId, gBattleOutcome, gLinkPlayers[battlerId].language); AddOpponentLinkBattleRecord(&gSaveBlock2Ptr->linkBattleRecords, gTrainerCards[battlerId].rse.playerName, gTrainerCards[battlerId].rse.trainerId, gBattleOutcome, gLinkPlayers[battlerId].language);
src/battle_setup.c
+8 -8
View File
@@ -219,14 +219,14 @@ static void CreateBattleStartTask(u8 transition, u16 song) // song == 0 means de
static bool8 CheckSilphScopeInPokemonTower(u16 mapGroup, u16 mapNum) static bool8 CheckSilphScopeInPokemonTower(u16 mapGroup, u16 mapNum)
{ {
if (mapGroup == MAP_GROUP(POKEMON_TOWER_1F) if (mapGroup == MAP_GROUP(MAP_POKEMON_TOWER_1F)
&& (mapNum == MAP_NUM(POKEMON_TOWER_1F) && (mapNum == MAP_NUM(MAP_POKEMON_TOWER_1F)
|| mapNum == MAP_NUM(POKEMON_TOWER_2F) || mapNum == MAP_NUM(MAP_POKEMON_TOWER_2F)
|| mapNum == MAP_NUM(POKEMON_TOWER_3F) || mapNum == MAP_NUM(MAP_POKEMON_TOWER_3F)
|| mapNum == MAP_NUM(POKEMON_TOWER_4F) || mapNum == MAP_NUM(MAP_POKEMON_TOWER_4F)
|| mapNum == MAP_NUM(POKEMON_TOWER_5F) || mapNum == MAP_NUM(MAP_POKEMON_TOWER_5F)
|| mapNum == MAP_NUM(POKEMON_TOWER_6F) || mapNum == MAP_NUM(MAP_POKEMON_TOWER_6F)
|| mapNum == MAP_NUM(POKEMON_TOWER_7F)) || mapNum == MAP_NUM(MAP_POKEMON_TOWER_7F))
&& !(CheckBagHasItem(ITEM_SILPH_SCOPE, 1))) && !(CheckBagHasItem(ITEM_SILPH_SCOPE, 1)))
return TRUE; return TRUE;
else else
src/credits.c
+13 -13
View File
@@ -569,79 +569,79 @@ static const struct SpriteTemplate sGroundSpriteTemplate_Static = {
}; };
static const struct CreditsOverworldCmd sOverworldCmd_Route23[] = { static const struct CreditsOverworldCmd sOverworldCmd_Route23[] = {
CREDITSOVWLDLOADMAP(ROUTE23, 11, 107, 1), CREDITSOVWLDLOADMAP(MAP_ROUTE23, 11, 107, 1),
CREDITSOVWLDSCROLL(0, 1, 0x0500), // Scroll down CREDITSOVWLDSCROLL(0, 1, 0x0500), // Scroll down
CREDITSOVWLDEND CREDITSOVWLDEND
}; };
static const struct CreditsOverworldCmd sOverworldCmd_ViridianCity[] = { static const struct CreditsOverworldCmd sOverworldCmd_ViridianCity[] = {
CREDITSOVWLDLOADMAP(VIRIDIAN_CITY, 30, 34, 1), CREDITSOVWLDLOADMAP(MAP_VIRIDIAN_CITY, 30, 34, 1),
CREDITSOVWLDSCROLL(0, -1, 0x0500), // Scroll up CREDITSOVWLDSCROLL(0, -1, 0x0500), // Scroll up
CREDITSOVWLDEND CREDITSOVWLDEND
}; };
static const struct CreditsOverworldCmd sOverworldCmd_PewterCity[] = { static const struct CreditsOverworldCmd sOverworldCmd_PewterCity[] = {
CREDITSOVWLDLOADMAP(PEWTER_CITY, 20, 26, 1), CREDITSOVWLDLOADMAP(MAP_PEWTER_CITY, 20, 26, 1),
CREDITSOVWLDSCROLL(0, -1, 0x0500), // Scroll up CREDITSOVWLDSCROLL(0, -1, 0x0500), // Scroll up
CREDITSOVWLDEND CREDITSOVWLDEND
}; };
static const struct CreditsOverworldCmd sOverworldCmd_CeruleanCity[] = { static const struct CreditsOverworldCmd sOverworldCmd_CeruleanCity[] = {
CREDITSOVWLDLOADMAP(CERULEAN_CITY, 8, 6, 1), CREDITSOVWLDLOADMAP(MAP_CERULEAN_CITY, 8, 6, 1),
CREDITSOVWLDSCROLL(1, 1, 0x0500), // Scroll right and down CREDITSOVWLDSCROLL(1, 1, 0x0500), // Scroll right and down
CREDITSOVWLDEND CREDITSOVWLDEND
}; };
static const struct CreditsOverworldCmd sOverworldCmd_Route25[] = { static const struct CreditsOverworldCmd sOverworldCmd_Route25[] = {
CREDITSOVWLDLOADMAP(ROUTE25, 25, 6, 1), CREDITSOVWLDLOADMAP(MAP_ROUTE25, 25, 6, 1),
CREDITSOVWLDSCROLL(1, 0, 0x0500), // Scroll right CREDITSOVWLDSCROLL(1, 0, 0x0500), // Scroll right
CREDITSOVWLDEND CREDITSOVWLDEND
}; };
static const struct CreditsOverworldCmd sOverworldCmd_VermilionCity[] = { static const struct CreditsOverworldCmd sOverworldCmd_VermilionCity[] = {
CREDITSOVWLDLOADMAP(VERMILION_CITY, 9, 7, 1), CREDITSOVWLDLOADMAP(MAP_VERMILION_CITY, 9, 7, 1),
CREDITSOVWLDSCROLL(1, 1, 0x0500), // Scroll right and down CREDITSOVWLDSCROLL(1, 1, 0x0500), // Scroll right and down
CREDITSOVWLDEND CREDITSOVWLDEND
}; };
static const struct CreditsOverworldCmd sOverworldCmd_Route10[] = { static const struct CreditsOverworldCmd sOverworldCmd_Route10[] = {
CREDITSOVWLDLOADMAP(ROUTE10, 11, 68, 1), CREDITSOVWLDLOADMAP(MAP_ROUTE10, 11, 68, 1),
CREDITSOVWLDSCROLL(0, 1, 0x0500), // Scroll down CREDITSOVWLDSCROLL(0, 1, 0x0500), // Scroll down
CREDITSOVWLDEND CREDITSOVWLDEND
}; };
static const struct CreditsOverworldCmd sOverworldCmd_CeladonCity[] = { static const struct CreditsOverworldCmd sOverworldCmd_CeladonCity[] = {
CREDITSOVWLDLOADMAP(CELADON_CITY, 48, 16, 1), CREDITSOVWLDLOADMAP(MAP_CELADON_CITY, 48, 16, 1),
CREDITSOVWLDSCROLL(-1, 0, 0x0500), // Scroll left CREDITSOVWLDSCROLL(-1, 0, 0x0500), // Scroll left
CREDITSOVWLDEND CREDITSOVWLDEND
}; };
static const struct CreditsOverworldCmd sOverworldCmd_SaffronCity[] = { static const struct CreditsOverworldCmd sOverworldCmd_SaffronCity[] = {
CREDITSOVWLDLOADMAP(SAFFRON_CITY, 39, 5, 1), CREDITSOVWLDLOADMAP(MAP_SAFFRON_CITY, 39, 5, 1),
CREDITSOVWLDSCROLL(0, 1, 0x0500), // Scroll down CREDITSOVWLDSCROLL(0, 1, 0x0500), // Scroll down
CREDITSOVWLDEND CREDITSOVWLDEND
}; };
static const struct CreditsOverworldCmd sOverworldCmd_Route17[] = { static const struct CreditsOverworldCmd sOverworldCmd_Route17[] = {
CREDITSOVWLDLOADMAP(ROUTE17, 7, 43, 1), CREDITSOVWLDLOADMAP(MAP_ROUTE17, 7, 43, 1),
CREDITSOVWLDSCROLL(0, 1, 0x0500), // Scroll down CREDITSOVWLDSCROLL(0, 1, 0x0500), // Scroll down
CREDITSOVWLDEND CREDITSOVWLDEND
}; };
static const struct CreditsOverworldCmd sOverworldCmd_FuchsiaCity[] = { static const struct CreditsOverworldCmd sOverworldCmd_FuchsiaCity[] = {
CREDITSOVWLDLOADMAP(FUCHSIA_CITY, 28, 5, 1), CREDITSOVWLDLOADMAP(MAP_FUCHSIA_CITY, 28, 5, 1),
CREDITSOVWLDSCROLL(0, 1, 0x0500), // Scroll down CREDITSOVWLDSCROLL(0, 1, 0x0500), // Scroll down
CREDITSOVWLDEND CREDITSOVWLDEND
}; };
static const struct CreditsOverworldCmd sOverworldCmd_CinnabarIsland[] = { static const struct CreditsOverworldCmd sOverworldCmd_CinnabarIsland[] = {
CREDITSOVWLDLOADMAP(CINNABAR_ISLAND, 13, 17, 1), CREDITSOVWLDLOADMAP(MAP_CINNABAR_ISLAND, 13, 17, 1),
CREDITSOVWLDSCROLL(0, -1, 0x0500), // Scroll up CREDITSOVWLDSCROLL(0, -1, 0x0500), // Scroll up
CREDITSOVWLDEND CREDITSOVWLDEND
}; };
static const struct CreditsOverworldCmd sOverworldCmd_Route21[] = { static const struct CreditsOverworldCmd sOverworldCmd_Route21[] = {
CREDITSOVWLDLOADMAP(ROUTE21_NORTH, 8, 20, 1), CREDITSOVWLDLOADMAP(MAP_ROUTE21_NORTH, 8, 20, 1),
CREDITSOVWLDSCROLL(0, -1, 0x0500), // Scroll up CREDITSOVWLDSCROLL(0, -1, 0x0500), // Scroll up
CREDITSOVWLDEND, CREDITSOVWLDEND,
}; };
src/data/heal_locations.h
+40 -40
View File
@@ -1,49 +1,49 @@
static const struct HealLocation sSpawnPoints[] = static const struct HealLocation sSpawnPoints[] =
{ {
[SPAWN_PALLET_TOWN - 1] = {MAP_GROUP(PALLET_TOWN), MAP_NUM(PALLET_TOWN), 6, 8}, [SPAWN_PALLET_TOWN - 1] = {MAP_GROUP(MAP_PALLET_TOWN), MAP_NUM(MAP_PALLET_TOWN), 6, 8},
[SPAWN_VIRIDIAN_CITY - 1] = {MAP_GROUP(VIRIDIAN_CITY), MAP_NUM(VIRIDIAN_CITY), 26, 27}, [SPAWN_VIRIDIAN_CITY - 1] = {MAP_GROUP(MAP_VIRIDIAN_CITY), MAP_NUM(MAP_VIRIDIAN_CITY), 26, 27},
[SPAWN_PEWTER_CITY - 1] = {MAP_GROUP(PEWTER_CITY), MAP_NUM(PEWTER_CITY), 17, 26}, [SPAWN_PEWTER_CITY - 1] = {MAP_GROUP(MAP_PEWTER_CITY), MAP_NUM(MAP_PEWTER_CITY), 17, 26},
[SPAWN_CERULEAN_CITY - 1] = {MAP_GROUP(CERULEAN_CITY), MAP_NUM(CERULEAN_CITY), 22, 20}, [SPAWN_CERULEAN_CITY - 1] = {MAP_GROUP(MAP_CERULEAN_CITY), MAP_NUM(MAP_CERULEAN_CITY), 22, 20},
[SPAWN_LAVENDER_TOWN - 1] = {MAP_GROUP(LAVENDER_TOWN), MAP_NUM(LAVENDER_TOWN), 6, 6}, [SPAWN_LAVENDER_TOWN - 1] = {MAP_GROUP(MAP_LAVENDER_TOWN), MAP_NUM(MAP_LAVENDER_TOWN), 6, 6},
[SPAWN_VERMILION_CITY - 1] = {MAP_GROUP(VERMILION_CITY), MAP_NUM(VERMILION_CITY), 15, 7}, [SPAWN_VERMILION_CITY - 1] = {MAP_GROUP(MAP_VERMILION_CITY), MAP_NUM(MAP_VERMILION_CITY), 15, 7},
[SPAWN_CELADON_CITY - 1] = {MAP_GROUP(CELADON_CITY), MAP_NUM(CELADON_CITY), 48, 12}, [SPAWN_CELADON_CITY - 1] = {MAP_GROUP(MAP_CELADON_CITY), MAP_NUM(MAP_CELADON_CITY), 48, 12},
[SPAWN_FUCHSIA_CITY - 1] = {MAP_GROUP(FUCHSIA_CITY), MAP_NUM(FUCHSIA_CITY), 25, 32}, [SPAWN_FUCHSIA_CITY - 1] = {MAP_GROUP(MAP_FUCHSIA_CITY), MAP_NUM(MAP_FUCHSIA_CITY), 25, 32},
[SPAWN_CINNABAR_ISLAND - 1] = {MAP_GROUP(CINNABAR_ISLAND), MAP_NUM(CINNABAR_ISLAND), 14, 12}, [SPAWN_CINNABAR_ISLAND - 1] = {MAP_GROUP(MAP_CINNABAR_ISLAND), MAP_NUM(MAP_CINNABAR_ISLAND), 14, 12},
[SPAWN_INDIGO_PLATEAU - 1] = {MAP_GROUP(INDIGO_PLATEAU_EXTERIOR), MAP_NUM(INDIGO_PLATEAU_EXTERIOR), 11, 7}, [SPAWN_INDIGO_PLATEAU - 1] = {MAP_GROUP(MAP_INDIGO_PLATEAU_EXTERIOR), MAP_NUM(MAP_INDIGO_PLATEAU_EXTERIOR), 11, 7},
[SPAWN_SAFFRON_CITY - 1] = {MAP_GROUP(SAFFRON_CITY), MAP_NUM(SAFFRON_CITY), 24, 39}, [SPAWN_SAFFRON_CITY - 1] = {MAP_GROUP(MAP_SAFFRON_CITY), MAP_NUM(MAP_SAFFRON_CITY), 24, 39},
[SPAWN_ROUTE4 - 1] = {MAP_GROUP(ROUTE4), MAP_NUM(ROUTE4), 12, 6}, [SPAWN_ROUTE4 - 1] = {MAP_GROUP(MAP_ROUTE4), MAP_NUM(MAP_ROUTE4), 12, 6},
[SPAWN_ROUTE10 - 1] = {MAP_GROUP(ROUTE10), MAP_NUM(ROUTE10), 13, 21}, [SPAWN_ROUTE10 - 1] = {MAP_GROUP(MAP_ROUTE10), MAP_NUM(MAP_ROUTE10), 13, 21},
[SPAWN_ONE_ISLAND - 1] = {MAP_GROUP(ONE_ISLAND), MAP_NUM(ONE_ISLAND), 14, 6}, [SPAWN_ONE_ISLAND - 1] = {MAP_GROUP(MAP_ONE_ISLAND), MAP_NUM(MAP_ONE_ISLAND), 14, 6},
[SPAWN_TWO_ISLAND - 1] = {MAP_GROUP(TWO_ISLAND), MAP_NUM(TWO_ISLAND), 21, 8}, [SPAWN_TWO_ISLAND - 1] = {MAP_GROUP(MAP_TWO_ISLAND), MAP_NUM(MAP_TWO_ISLAND), 21, 8},
[SPAWN_THREE_ISLAND - 1] = {MAP_GROUP(THREE_ISLAND), MAP_NUM(THREE_ISLAND), 14, 28}, [SPAWN_THREE_ISLAND - 1] = {MAP_GROUP(MAP_THREE_ISLAND), MAP_NUM(MAP_THREE_ISLAND), 14, 28},
[SPAWN_FOUR_ISLAND - 1] = {MAP_GROUP(FOUR_ISLAND), MAP_NUM(FOUR_ISLAND), 18, 21}, [SPAWN_FOUR_ISLAND - 1] = {MAP_GROUP(MAP_FOUR_ISLAND), MAP_NUM(MAP_FOUR_ISLAND), 18, 21},
[SPAWN_FIVE_ISLAND - 1] = {MAP_GROUP(FIVE_ISLAND), MAP_NUM(FIVE_ISLAND), 18, 7}, [SPAWN_FIVE_ISLAND - 1] = {MAP_GROUP(MAP_FIVE_ISLAND), MAP_NUM(MAP_FIVE_ISLAND), 18, 7},
[SPAWN_SEVEN_ISLAND - 1] = {MAP_GROUP(SEVEN_ISLAND), MAP_NUM(SEVEN_ISLAND), 12, 4}, [SPAWN_SEVEN_ISLAND - 1] = {MAP_GROUP(MAP_SEVEN_ISLAND), MAP_NUM(MAP_SEVEN_ISLAND), 12, 4},
[SPAWN_SIX_ISLAND - 1] = {MAP_GROUP(SIX_ISLAND), MAP_NUM(SIX_ISLAND), 11, 12}, [SPAWN_SIX_ISLAND - 1] = {MAP_GROUP(MAP_SIX_ISLAND), MAP_NUM(MAP_SIX_ISLAND), 11, 12},
}; };
static const u16 sWhiteoutRespawnHealCenterMapIdxs[][2] = static const u16 sWhiteoutRespawnHealCenterMapIdxs[][2] =
{ {
[SPAWN_PALLET_TOWN - 1] = {MAP_GROUP(PALLET_TOWN_PLAYERS_HOUSE_1F), MAP_NUM(PALLET_TOWN_PLAYERS_HOUSE_1F)}, [SPAWN_PALLET_TOWN - 1] = {MAP_GROUP(MAP_PALLET_TOWN_PLAYERS_HOUSE_1F), MAP_NUM(MAP_PALLET_TOWN_PLAYERS_HOUSE_1F)},
[SPAWN_VIRIDIAN_CITY - 1] = {MAP_GROUP(VIRIDIAN_CITY_POKEMON_CENTER_1F), MAP_NUM(VIRIDIAN_CITY_POKEMON_CENTER_1F)}, [SPAWN_VIRIDIAN_CITY - 1] = {MAP_GROUP(MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F), MAP_NUM(MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F)},
[SPAWN_PEWTER_CITY - 1] = {MAP_GROUP(PEWTER_CITY_POKEMON_CENTER_1F), MAP_NUM(PEWTER_CITY_POKEMON_CENTER_1F)}, [SPAWN_PEWTER_CITY - 1] = {MAP_GROUP(MAP_PEWTER_CITY_POKEMON_CENTER_1F), MAP_NUM(MAP_PEWTER_CITY_POKEMON_CENTER_1F)},
[SPAWN_CERULEAN_CITY - 1] = {MAP_GROUP(CERULEAN_CITY_POKEMON_CENTER_1F), MAP_NUM(CERULEAN_CITY_POKEMON_CENTER_1F)}, [SPAWN_CERULEAN_CITY - 1] = {MAP_GROUP(MAP_CERULEAN_CITY_POKEMON_CENTER_1F), MAP_NUM(MAP_CERULEAN_CITY_POKEMON_CENTER_1F)},
[SPAWN_LAVENDER_TOWN - 1] = {MAP_GROUP(LAVENDER_TOWN_POKEMON_CENTER_1F), MAP_NUM(LAVENDER_TOWN_POKEMON_CENTER_1F)}, [SPAWN_LAVENDER_TOWN - 1] = {MAP_GROUP(MAP_LAVENDER_TOWN_POKEMON_CENTER_1F), MAP_NUM(MAP_LAVENDER_TOWN_POKEMON_CENTER_1F)},
[SPAWN_VERMILION_CITY - 1] = {MAP_GROUP(VERMILION_CITY_POKEMON_CENTER_1F), MAP_NUM(VERMILION_CITY_POKEMON_CENTER_1F)}, [SPAWN_VERMILION_CITY - 1] = {MAP_GROUP(MAP_VERMILION_CITY_POKEMON_CENTER_1F), MAP_NUM(MAP_VERMILION_CITY_POKEMON_CENTER_1F)},
[SPAWN_CELADON_CITY - 1] = {MAP_GROUP(CELADON_CITY_POKEMON_CENTER_1F), MAP_NUM(CELADON_CITY_POKEMON_CENTER_1F)}, [SPAWN_CELADON_CITY - 1] = {MAP_GROUP(MAP_CELADON_CITY_POKEMON_CENTER_1F), MAP_NUM(MAP_CELADON_CITY_POKEMON_CENTER_1F)},
[SPAWN_FUCHSIA_CITY - 1] = {MAP_GROUP(FUCHSIA_CITY_POKEMON_CENTER_1F), MAP_NUM(FUCHSIA_CITY_POKEMON_CENTER_1F)}, [SPAWN_FUCHSIA_CITY - 1] = {MAP_GROUP(MAP_FUCHSIA_CITY_POKEMON_CENTER_1F), MAP_NUM(MAP_FUCHSIA_CITY_POKEMON_CENTER_1F)},
[SPAWN_CINNABAR_ISLAND - 1] = {MAP_GROUP(CINNABAR_ISLAND_POKEMON_CENTER_1F), MAP_NUM(CINNABAR_ISLAND_POKEMON_CENTER_1F)}, [SPAWN_CINNABAR_ISLAND - 1] = {MAP_GROUP(MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F), MAP_NUM(MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F)},
[SPAWN_INDIGO_PLATEAU - 1] = {MAP_GROUP(INDIGO_PLATEAU_POKEMON_CENTER_1F), MAP_NUM(INDIGO_PLATEAU_POKEMON_CENTER_1F)}, [SPAWN_INDIGO_PLATEAU - 1] = {MAP_GROUP(MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F), MAP_NUM(MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F)},
[SPAWN_SAFFRON_CITY - 1] = {MAP_GROUP(SAFFRON_CITY_POKEMON_CENTER_1F), MAP_NUM(SAFFRON_CITY_POKEMON_CENTER_1F)}, [SPAWN_SAFFRON_CITY - 1] = {MAP_GROUP(MAP_SAFFRON_CITY_POKEMON_CENTER_1F), MAP_NUM(MAP_SAFFRON_CITY_POKEMON_CENTER_1F)},
[SPAWN_ROUTE4 - 1] = {MAP_GROUP(ROUTE4_POKEMON_CENTER_1F), MAP_NUM(ROUTE4_POKEMON_CENTER_1F)}, [SPAWN_ROUTE4 - 1] = {MAP_GROUP(MAP_ROUTE4_POKEMON_CENTER_1F), MAP_NUM(MAP_ROUTE4_POKEMON_CENTER_1F)},
[SPAWN_ROUTE10 - 1] = {MAP_GROUP(ROUTE10_POKEMON_CENTER_1F), MAP_NUM(ROUTE10_POKEMON_CENTER_1F)}, [SPAWN_ROUTE10 - 1] = {MAP_GROUP(MAP_ROUTE10_POKEMON_CENTER_1F), MAP_NUM(MAP_ROUTE10_POKEMON_CENTER_1F)},
[SPAWN_ONE_ISLAND - 1] = {MAP_GROUP(ONE_ISLAND_POKEMON_CENTER_1F), MAP_NUM(ONE_ISLAND_POKEMON_CENTER_1F)}, [SPAWN_ONE_ISLAND - 1] = {MAP_GROUP(MAP_ONE_ISLAND_POKEMON_CENTER_1F), MAP_NUM(MAP_ONE_ISLAND_POKEMON_CENTER_1F)},
[SPAWN_TWO_ISLAND - 1] = {MAP_GROUP(TWO_ISLAND_POKEMON_CENTER_1F), MAP_NUM(TWO_ISLAND_POKEMON_CENTER_1F)}, [SPAWN_TWO_ISLAND - 1] = {MAP_GROUP(MAP_TWO_ISLAND_POKEMON_CENTER_1F), MAP_NUM(MAP_TWO_ISLAND_POKEMON_CENTER_1F)},
[SPAWN_THREE_ISLAND - 1] = {MAP_GROUP(THREE_ISLAND_POKEMON_CENTER_1F), MAP_NUM(THREE_ISLAND_POKEMON_CENTER_1F)}, [SPAWN_THREE_ISLAND - 1] = {MAP_GROUP(MAP_THREE_ISLAND_POKEMON_CENTER_1F), MAP_NUM(MAP_THREE_ISLAND_POKEMON_CENTER_1F)},
[SPAWN_FOUR_ISLAND - 1] = {MAP_GROUP(FOUR_ISLAND_POKEMON_CENTER_1F), MAP_NUM(FOUR_ISLAND_POKEMON_CENTER_1F)}, [SPAWN_FOUR_ISLAND - 1] = {MAP_GROUP(MAP_FOUR_ISLAND_POKEMON_CENTER_1F), MAP_NUM(MAP_FOUR_ISLAND_POKEMON_CENTER_1F)},
[SPAWN_FIVE_ISLAND - 1] = {MAP_GROUP(FIVE_ISLAND_POKEMON_CENTER_1F), MAP_NUM(FIVE_ISLAND_POKEMON_CENTER_1F)}, [SPAWN_FIVE_ISLAND - 1] = {MAP_GROUP(MAP_FIVE_ISLAND_POKEMON_CENTER_1F), MAP_NUM(MAP_FIVE_ISLAND_POKEMON_CENTER_1F)},
[SPAWN_SEVEN_ISLAND - 1] = {MAP_GROUP(SEVEN_ISLAND_POKEMON_CENTER_1F), MAP_NUM(SEVEN_ISLAND_POKEMON_CENTER_1F)}, [SPAWN_SEVEN_ISLAND - 1] = {MAP_GROUP(MAP_SEVEN_ISLAND_POKEMON_CENTER_1F), MAP_NUM(MAP_SEVEN_ISLAND_POKEMON_CENTER_1F)},
[SPAWN_SIX_ISLAND - 1] = {MAP_GROUP(SIX_ISLAND_POKEMON_CENTER_1F), MAP_NUM(SIX_ISLAND_POKEMON_CENTER_1F)}, [SPAWN_SIX_ISLAND - 1] = {MAP_GROUP(MAP_SIX_ISLAND_POKEMON_CENTER_1F), MAP_NUM(MAP_SIX_ISLAND_POKEMON_CENTER_1F)},
}; };
static const u8 sWhiteoutRespawnHealerNpcIds[] = static const u8 sWhiteoutRespawnHealerNpcIds[] =
src/data/wild_encounters.json.txt
+4 -4
View File
@@ -84,8 +84,8 @@ const struct WildPokemonHeader {{ wild_encounter_group.label }}[] =
#ifdef FIRERED #ifdef FIRERED
{% endif %} {% endif %}
{ {
.mapGroup = {% if wild_encounter_group.for_maps %}MAP_GROUP({{ removePrefix(encounter.map, "MAP_") }}){% else %}0{% endif %}, .mapGroup = {% if wild_encounter_group.for_maps %}MAP_GROUP({{ encounter.map }}){% else %}0{% endif %},
.mapNum = {% if wild_encounter_group.for_maps %}MAP_NUM({{ removePrefix(encounter.map, "MAP_") }}){% else %}{{ loop.index1 }}{% endif %}, .mapNum = {% if wild_encounter_group.for_maps %}MAP_NUM({{ encounter.map }}){% else %}{{ loop.index1 }}{% endif %},
.landMonsInfo = {% if existsIn(encounter, "land_mons") %}&{{ encounter.base_label }}_LandMonsInfo{% else %}NULL{% endif %}, .landMonsInfo = {% if existsIn(encounter, "land_mons") %}&{{ encounter.base_label }}_LandMonsInfo{% else %}NULL{% endif %},
.waterMonsInfo = {% if existsIn(encounter, "water_mons") %}&{{ encounter.base_label }}_WaterMonsInfo{% else %}NULL{% endif %}, .waterMonsInfo = {% if existsIn(encounter, "water_mons") %}&{{ encounter.base_label }}_WaterMonsInfo{% else %}NULL{% endif %},
.rockSmashMonsInfo = {% if existsIn(encounter, "rock_smash_mons") %}&{{ encounter.base_label }}_RockSmashMonsInfo{% else %}NULL{% endif %}, .rockSmashMonsInfo = {% if existsIn(encounter, "rock_smash_mons") %}&{{ encounter.base_label }}_RockSmashMonsInfo{% else %}NULL{% endif %},
@@ -96,8 +96,8 @@ const struct WildPokemonHeader {{ wild_encounter_group.label }}[] =
{% endif %} {% endif %}
## endfor ## endfor
{ {
.mapGroup = MAP_GROUP(UNDEFINED), .mapGroup = MAP_GROUP(MAP_UNDEFINED),
.mapNum = MAP_NUM(UNDEFINED), .mapNum = MAP_NUM(MAP_UNDEFINED),
.landMonsInfo = NULL, .landMonsInfo = NULL,
.waterMonsInfo = NULL, .waterMonsInfo = NULL,
.rockSmashMonsInfo = NULL, .rockSmashMonsInfo = NULL,
src/event_object_movement.c
+4 -4
View File
@@ -1207,8 +1207,8 @@ static void ClearObjectEvent(struct ObjectEvent *objectEvent)
{ {
*objectEvent = (struct ObjectEvent){}; *objectEvent = (struct ObjectEvent){};
objectEvent->localId = 0xFF; objectEvent->localId = 0xFF;
objectEvent->mapNum = MAP_NUM(UNDEFINED); objectEvent->mapNum = MAP_NUM(MAP_UNDEFINED);
objectEvent->mapGroup = MAP_GROUP(UNDEFINED); objectEvent->mapGroup = MAP_GROUP(MAP_UNDEFINED);
objectEvent->movementActionId = MOVEMENT_ACTION_NONE; objectEvent->movementActionId = MOVEMENT_ACTION_NONE;
} }
@@ -7989,8 +7989,8 @@ static void CalcWhetherObjectIsOffscreen(struct ObjectEvent *objectEvent, struct
x2 = graphicsInfo->width + (s16)x; x2 = graphicsInfo->width + (s16)x;
y2 = graphicsInfo->height + (s16)y; y2 = graphicsInfo->height + (s16)y;
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SSANNE_EXTERIOR) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_SSANNE_EXTERIOR)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(SSANNE_EXTERIOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SSANNE_EXTERIOR)
&& objectEvent->localId == 1) && objectEvent->localId == 1)
{ {
var = -32; var = -32;
src/field_control_avatar.c
+2 -2
View File
@@ -968,7 +968,7 @@ static void SetupWarp(struct MapHeader *unused, s8 warpEventId, struct MapPositi
warpEvent = &gMapHeader.events->warps[warpEventId]; warpEvent = &gMapHeader.events->warps[warpEventId];
if (warpEvent->mapNum == MAP_NUM(DYNAMIC)) if (warpEvent->mapNum == MAP_NUM(MAP_DYNAMIC))
{ {
SetWarpDestinationToDynamicWarp(warpEvent->warpId); SetWarpDestinationToDynamicWarp(warpEvent->warpId);
} }
@@ -979,7 +979,7 @@ static void SetupWarp(struct MapHeader *unused, s8 warpEventId, struct MapPositi
SetWarpDestinationToMapWarp(warpEvent->mapGroup, warpEvent->mapNum, warpEvent->warpId); SetWarpDestinationToMapWarp(warpEvent->mapGroup, warpEvent->mapNum, warpEvent->warpId);
UpdateEscapeWarp(position->x, position->y); UpdateEscapeWarp(position->x, position->y);
mapHeader = Overworld_GetMapHeaderByGroupAndId(warpEvent->mapGroup, warpEvent->mapNum); mapHeader = Overworld_GetMapHeaderByGroupAndId(warpEvent->mapGroup, warpEvent->mapNum);
if (mapHeader->events->warps[warpEvent->warpId].mapNum == MAP_NUM(DYNAMIC)) if (mapHeader->events->warps[warpEvent->warpId].mapNum == MAP_NUM(MAP_DYNAMIC))
SetDynamicWarp(mapHeader->events->warps[warpEventId].warpId, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, warpEventId); SetDynamicWarp(mapHeader->events->warps[warpEventId].warpId, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, warpEventId);
} }
} }
src/field_specials.c
+142 -142
View File
@@ -836,91 +836,91 @@ static const u8 sElevatorWindowAnimDuration[] = {
void GetElevatorFloor(void) void GetElevatorFloor(void)
{ {
u16 floor = 4; u16 floor = 4;
if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(ROCKET_HIDEOUT_B1F)) if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(MAP_ROCKET_HIDEOUT_B1F))
{ {
switch (gSaveBlock1Ptr->dynamicWarp.mapNum) switch (gSaveBlock1Ptr->dynamicWarp.mapNum)
{ {
case MAP_NUM(SILPH_CO_1F): case MAP_NUM(MAP_SILPH_CO_1F):
floor = 4; floor = 4;
break; break;
case MAP_NUM(SILPH_CO_2F): case MAP_NUM(MAP_SILPH_CO_2F):
floor = 5; floor = 5;
break; break;
case MAP_NUM(SILPH_CO_3F): case MAP_NUM(MAP_SILPH_CO_3F):
floor = 6; floor = 6;
break; break;
case MAP_NUM(SILPH_CO_4F): case MAP_NUM(MAP_SILPH_CO_4F):
floor = 7; floor = 7;
break; break;
case MAP_NUM(SILPH_CO_5F): case MAP_NUM(MAP_SILPH_CO_5F):
floor = 8; floor = 8;
break; break;
case MAP_NUM(SILPH_CO_6F): case MAP_NUM(MAP_SILPH_CO_6F):
floor = 9; floor = 9;
break; break;
case MAP_NUM(SILPH_CO_7F): case MAP_NUM(MAP_SILPH_CO_7F):
floor = 10; floor = 10;
break; break;
case MAP_NUM(SILPH_CO_8F): case MAP_NUM(MAP_SILPH_CO_8F):
floor = 11; floor = 11;
break; break;
case MAP_NUM(SILPH_CO_9F): case MAP_NUM(MAP_SILPH_CO_9F):
floor = 12; floor = 12;
break; break;
case MAP_NUM(SILPH_CO_10F): case MAP_NUM(MAP_SILPH_CO_10F):
floor = 13; floor = 13;
break; break;
case MAP_NUM(SILPH_CO_11F): case MAP_NUM(MAP_SILPH_CO_11F):
floor = 14; floor = 14;
break; break;
case MAP_NUM(ROCKET_HIDEOUT_B1F): case MAP_NUM(MAP_ROCKET_HIDEOUT_B1F):
floor = 3; floor = 3;
break; break;
case MAP_NUM(ROCKET_HIDEOUT_B2F): case MAP_NUM(MAP_ROCKET_HIDEOUT_B2F):
floor = 2; floor = 2;
break; break;
case MAP_NUM(ROCKET_HIDEOUT_B4F): case MAP_NUM(MAP_ROCKET_HIDEOUT_B4F):
floor = 0; floor = 0;
break; break;
} }
} }
if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(CELADON_CITY_DEPARTMENT_STORE_1F)) if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(MAP_CELADON_CITY_DEPARTMENT_STORE_1F))
{ {
switch (gSaveBlock1Ptr->dynamicWarp.mapNum) switch (gSaveBlock1Ptr->dynamicWarp.mapNum)
{ {
case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_1F): case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_1F):
floor = 4; floor = 4;
break; break;
case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_2F): case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_2F):
floor = 5; floor = 5;
break; break;
case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_3F): case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_3F):
floor = 6; floor = 6;
break; break;
case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_4F): case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_4F):
floor = 7; floor = 7;
break; break;
case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_5F): case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_5F):
floor = 8; floor = 8;
break; break;
} }
} }
if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(TRAINER_TOWER_1F)) if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(MAP_TRAINER_TOWER_1F))
{ {
switch (gSaveBlock1Ptr->dynamicWarp.mapNum) switch (gSaveBlock1Ptr->dynamicWarp.mapNum)
{ {
case MAP_NUM(TRAINER_TOWER_1F): case MAP_NUM(MAP_TRAINER_TOWER_1F):
case MAP_NUM(TRAINER_TOWER_2F): case MAP_NUM(MAP_TRAINER_TOWER_2F):
case MAP_NUM(TRAINER_TOWER_3F): case MAP_NUM(MAP_TRAINER_TOWER_3F):
case MAP_NUM(TRAINER_TOWER_4F): case MAP_NUM(MAP_TRAINER_TOWER_4F):
case MAP_NUM(TRAINER_TOWER_5F): case MAP_NUM(MAP_TRAINER_TOWER_5F):
case MAP_NUM(TRAINER_TOWER_6F): case MAP_NUM(MAP_TRAINER_TOWER_6F):
case MAP_NUM(TRAINER_TOWER_7F): case MAP_NUM(MAP_TRAINER_TOWER_7F):
case MAP_NUM(TRAINER_TOWER_8F): case MAP_NUM(MAP_TRAINER_TOWER_8F):
case MAP_NUM(TRAINER_TOWER_ROOF): case MAP_NUM(MAP_TRAINER_TOWER_ROOF):
floor = 15; floor = 15;
break; break;
case MAP_NUM(TRAINER_TOWER_LOBBY): case MAP_NUM(MAP_TRAINER_TOWER_LOBBY):
floor = 3; floor = 3;
break; break;
} }
@@ -933,111 +933,111 @@ u16 InitElevatorFloorSelectMenuPos(void)
sElevatorScroll = 0; sElevatorScroll = 0;
sElevatorCursorPos = 0; sElevatorCursorPos = 0;
if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(ROCKET_HIDEOUT_B1F)) if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(MAP_ROCKET_HIDEOUT_B1F))
{ {
switch (gSaveBlock1Ptr->dynamicWarp.mapNum) switch (gSaveBlock1Ptr->dynamicWarp.mapNum)
{ {
case MAP_NUM(SILPH_CO_11F): case MAP_NUM(MAP_SILPH_CO_11F):
sElevatorScroll = 0; sElevatorScroll = 0;
sElevatorCursorPos = 0; sElevatorCursorPos = 0;
break; break;
case MAP_NUM(SILPH_CO_10F): case MAP_NUM(MAP_SILPH_CO_10F):
sElevatorScroll = 0; sElevatorScroll = 0;
sElevatorCursorPos = 1; sElevatorCursorPos = 1;
break; break;
case MAP_NUM(SILPH_CO_9F): case MAP_NUM(MAP_SILPH_CO_9F):
sElevatorScroll = 0; sElevatorScroll = 0;
sElevatorCursorPos = 2; sElevatorCursorPos = 2;
break; break;
case MAP_NUM(SILPH_CO_8F): case MAP_NUM(MAP_SILPH_CO_8F):
sElevatorScroll = 0; sElevatorScroll = 0;
sElevatorCursorPos = 3; sElevatorCursorPos = 3;
break; break;
case MAP_NUM(SILPH_CO_7F): case MAP_NUM(MAP_SILPH_CO_7F):
sElevatorScroll = 0; sElevatorScroll = 0;
sElevatorCursorPos = 4; sElevatorCursorPos = 4;
break; break;
case MAP_NUM(SILPH_CO_6F): case MAP_NUM(MAP_SILPH_CO_6F):
sElevatorScroll = 1; sElevatorScroll = 1;
sElevatorCursorPos = 4; sElevatorCursorPos = 4;
break; break;
case MAP_NUM(SILPH_CO_5F): case MAP_NUM(MAP_SILPH_CO_5F):
sElevatorScroll = 2; sElevatorScroll = 2;
sElevatorCursorPos = 4; sElevatorCursorPos = 4;
break; break;
case MAP_NUM(SILPH_CO_4F): case MAP_NUM(MAP_SILPH_CO_4F):
sElevatorScroll = 3; sElevatorScroll = 3;
sElevatorCursorPos = 4; sElevatorCursorPos = 4;
break; break;
case MAP_NUM(SILPH_CO_3F): case MAP_NUM(MAP_SILPH_CO_3F):
sElevatorScroll = 4; sElevatorScroll = 4;
sElevatorCursorPos = 4; sElevatorCursorPos = 4;
break; break;
case MAP_NUM(SILPH_CO_2F): case MAP_NUM(MAP_SILPH_CO_2F):
sElevatorScroll = 5; sElevatorScroll = 5;
sElevatorCursorPos = 4; sElevatorCursorPos = 4;
break; break;
case MAP_NUM(SILPH_CO_1F): case MAP_NUM(MAP_SILPH_CO_1F):
sElevatorScroll = 5; sElevatorScroll = 5;
sElevatorCursorPos = 5; sElevatorCursorPos = 5;
break; break;
case MAP_NUM(ROCKET_HIDEOUT_B1F): case MAP_NUM(MAP_ROCKET_HIDEOUT_B1F):
sElevatorScroll = 0; sElevatorScroll = 0;
sElevatorCursorPos = 0; sElevatorCursorPos = 0;
break; break;
case MAP_NUM(ROCKET_HIDEOUT_B2F): case MAP_NUM(MAP_ROCKET_HIDEOUT_B2F):
sElevatorScroll = 0; sElevatorScroll = 0;
sElevatorCursorPos = 1; sElevatorCursorPos = 1;
break; break;
case MAP_NUM(ROCKET_HIDEOUT_B4F): case MAP_NUM(MAP_ROCKET_HIDEOUT_B4F):
sElevatorScroll = 0; sElevatorScroll = 0;
sElevatorCursorPos = 2; sElevatorCursorPos = 2;
break; break;
} }
} }
if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(CELADON_CITY_DEPARTMENT_STORE_1F)) if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(MAP_CELADON_CITY_DEPARTMENT_STORE_1F))
{ {
switch (gSaveBlock1Ptr->dynamicWarp.mapNum) switch (gSaveBlock1Ptr->dynamicWarp.mapNum)
{ {
case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_5F): case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_5F):
sElevatorScroll = 0; sElevatorScroll = 0;
sElevatorCursorPos = 0; sElevatorCursorPos = 0;
break; break;
case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_4F): case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_4F):
sElevatorScroll = 0; sElevatorScroll = 0;
sElevatorCursorPos = 1; sElevatorCursorPos = 1;
break; break;
case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_3F): case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_3F):
sElevatorScroll = 0; sElevatorScroll = 0;
sElevatorCursorPos = 2; sElevatorCursorPos = 2;
break; break;
case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_2F): case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_2F):
sElevatorScroll = 0; sElevatorScroll = 0;
sElevatorCursorPos = 3; sElevatorCursorPos = 3;
break; break;
case MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_1F): case MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_1F):
sElevatorScroll = 0; sElevatorScroll = 0;
sElevatorCursorPos = 4; sElevatorCursorPos = 4;
break; break;
} }
} }
if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(TRAINER_TOWER_1F)) if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(MAP_TRAINER_TOWER_1F))
{ {
switch (gSaveBlock1Ptr->dynamicWarp.mapNum) switch (gSaveBlock1Ptr->dynamicWarp.mapNum)
{ {
case MAP_NUM(TRAINER_TOWER_1F): case MAP_NUM(MAP_TRAINER_TOWER_1F):
case MAP_NUM(TRAINER_TOWER_2F): case MAP_NUM(MAP_TRAINER_TOWER_2F):
case MAP_NUM(TRAINER_TOWER_3F): case MAP_NUM(MAP_TRAINER_TOWER_3F):
case MAP_NUM(TRAINER_TOWER_4F): case MAP_NUM(MAP_TRAINER_TOWER_4F):
case MAP_NUM(TRAINER_TOWER_5F): case MAP_NUM(MAP_TRAINER_TOWER_5F):
case MAP_NUM(TRAINER_TOWER_6F): case MAP_NUM(MAP_TRAINER_TOWER_6F):
case MAP_NUM(TRAINER_TOWER_7F): case MAP_NUM(MAP_TRAINER_TOWER_7F):
case MAP_NUM(TRAINER_TOWER_8F): case MAP_NUM(MAP_TRAINER_TOWER_8F):
case MAP_NUM(TRAINER_TOWER_ROOF): case MAP_NUM(MAP_TRAINER_TOWER_ROOF):
sElevatorScroll = 0; sElevatorScroll = 0;
sElevatorCursorPos = 0; sElevatorCursorPos = 0;
break; break;
case MAP_NUM(TRAINER_TOWER_LOBBY): case MAP_NUM(MAP_TRAINER_TOWER_LOBBY):
sElevatorScroll = 0; sElevatorScroll = 0;
sElevatorCursorPos = 1; sElevatorCursorPos = 1;
break; break;
@@ -1777,18 +1777,18 @@ bool8 DoesPlayerPartyContainSpecies(void)
} }
static const u8 sMartMaps[][3] = { static const u8 sMartMaps[][3] = {
{MAP(VIRIDIAN_CITY_MART), 1}, {MAP(MAP_VIRIDIAN_CITY_MART), 1},
{MAP(PEWTER_CITY_MART), 3}, {MAP(MAP_PEWTER_CITY_MART), 3},
{MAP(CERULEAN_CITY_MART), 1}, {MAP(MAP_CERULEAN_CITY_MART), 1},
{MAP(LAVENDER_TOWN_MART), 1}, {MAP(MAP_LAVENDER_TOWN_MART), 1},
{MAP(VERMILION_CITY_MART), 1}, {MAP(MAP_VERMILION_CITY_MART), 1},
{MAP(FUCHSIA_CITY_MART), 1}, {MAP(MAP_FUCHSIA_CITY_MART), 1},
{MAP(CINNABAR_ISLAND_MART), 1}, {MAP(MAP_CINNABAR_ISLAND_MART), 1},
{MAP(SAFFRON_CITY_MART), 1}, {MAP(MAP_SAFFRON_CITY_MART), 1},
{MAP(THREE_ISLAND_MART), 1}, {MAP(MAP_THREE_ISLAND_MART), 1},
{MAP(FOUR_ISLAND_MART), 1}, {MAP(MAP_FOUR_ISLAND_MART), 1},
{MAP(SEVEN_ISLAND_MART), 1}, {MAP(MAP_SEVEN_ISLAND_MART), 1},
{MAP(SIX_ISLAND_MART), 1} {MAP(MAP_SIX_ISLAND_MART), 1}
}; };
u8 GetMartClerkObjectId(void) u8 GetMartClerkObjectId(void)
@@ -1813,57 +1813,57 @@ static const struct {
u16 outside_grp; u16 outside_grp;
u16 outside_num; u16 outside_num;
} sInsideOutsidePairs[] = { } sInsideOutsidePairs[] = {
[QL_LOCATION_HOME] = {MAP(PALLET_TOWN_PLAYERS_HOUSE_1F), MAP(PALLET_TOWN)}, [QL_LOCATION_HOME] = {MAP(MAP_PALLET_TOWN_PLAYERS_HOUSE_1F), MAP(MAP_PALLET_TOWN)},
[QL_LOCATION_OAKS_LAB] = {MAP(PALLET_TOWN_PROFESSOR_OAKS_LAB), MAP(PALLET_TOWN)}, [QL_LOCATION_OAKS_LAB] = {MAP(MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB), MAP(MAP_PALLET_TOWN)},
[QL_LOCATION_VIRIDIAN_GYM] = {MAP(VIRIDIAN_CITY_GYM), MAP(VIRIDIAN_CITY)}, [QL_LOCATION_VIRIDIAN_GYM] = {MAP(MAP_VIRIDIAN_CITY_GYM), MAP(MAP_VIRIDIAN_CITY)},
[QL_LOCATION_LEAGUE_GATE_1] = {MAP(ROUTE22_NORTH_ENTRANCE), MAP(ROUTE22)}, [QL_LOCATION_LEAGUE_GATE_1] = {MAP(MAP_ROUTE22_NORTH_ENTRANCE), MAP(MAP_ROUTE22)},
[QL_LOCATION_LEAGUE_GATE_2] = {MAP(ROUTE22_NORTH_ENTRANCE), MAP(ROUTE23)}, [QL_LOCATION_LEAGUE_GATE_2] = {MAP(MAP_ROUTE22_NORTH_ENTRANCE), MAP(MAP_ROUTE23)},
[QL_LOCATION_VIRIDIAN_FOREST_1] = {MAP(VIRIDIAN_FOREST), MAP(ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE)}, [QL_LOCATION_VIRIDIAN_FOREST_1] = {MAP(MAP_VIRIDIAN_FOREST), MAP(MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE)},
[QL_LOCATION_VIRIDIAN_FOREST_2] = {MAP(VIRIDIAN_FOREST), MAP(ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE)}, [QL_LOCATION_VIRIDIAN_FOREST_2] = {MAP(MAP_VIRIDIAN_FOREST), MAP(MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE)},
[QL_LOCATION_PEWTER_MUSEUM] = {MAP(PEWTER_CITY_MUSEUM_1F), MAP(PEWTER_CITY)}, [QL_LOCATION_PEWTER_MUSEUM] = {MAP(MAP_PEWTER_CITY_MUSEUM_1F), MAP(MAP_PEWTER_CITY)},
[QL_LOCATION_PEWTER_GYM] = {MAP(PEWTER_CITY_GYM), MAP(PEWTER_CITY)}, [QL_LOCATION_PEWTER_GYM] = {MAP(MAP_PEWTER_CITY_GYM), MAP(MAP_PEWTER_CITY)},
[QL_LOCATION_MT_MOON_1] = {MAP(MT_MOON_1F), MAP(ROUTE4)}, [QL_LOCATION_MT_MOON_1] = {MAP(MAP_MT_MOON_1F), MAP(MAP_ROUTE4)},
[QL_LOCATION_MT_MOON_2] = {MAP(MT_MOON_B1F), MAP(ROUTE4)}, [QL_LOCATION_MT_MOON_2] = {MAP(MAP_MT_MOON_B1F), MAP(MAP_ROUTE4)},
[QL_LOCATION_CERULEAN_GYM] = {MAP(CERULEAN_CITY_GYM), MAP(CERULEAN_CITY)}, [QL_LOCATION_CERULEAN_GYM] = {MAP(MAP_CERULEAN_CITY_GYM), MAP(MAP_CERULEAN_CITY)},
[QL_LOCATION_BIKE_SHOP] = {MAP(CERULEAN_CITY_BIKE_SHOP), MAP(CERULEAN_CITY)}, [QL_LOCATION_BIKE_SHOP] = {MAP(MAP_CERULEAN_CITY_BIKE_SHOP), MAP(MAP_CERULEAN_CITY)},
[QL_LOCATION_BILLS_HOUSE] = {MAP(ROUTE25_SEA_COTTAGE), MAP(ROUTE25)}, [QL_LOCATION_BILLS_HOUSE] = {MAP(MAP_ROUTE25_SEA_COTTAGE), MAP(MAP_ROUTE25)},
[QL_LOCATION_DAY_CARE] = {MAP(ROUTE5_POKEMON_DAY_CARE), MAP(ROUTE5)}, [QL_LOCATION_DAY_CARE] = {MAP(MAP_ROUTE5_POKEMON_DAY_CARE), MAP(MAP_ROUTE5)},
[QL_LOCATION_UNDERGROUND_PATH_1] = {MAP(UNDERGROUND_PATH_NORTH_ENTRANCE), MAP(ROUTE5)}, [QL_LOCATION_UNDERGROUND_PATH_1] = {MAP(MAP_UNDERGROUND_PATH_NORTH_ENTRANCE), MAP(MAP_ROUTE5)},
[QL_LOCATION_UNDERGROUND_PATH_2] = {MAP(UNDERGROUND_PATH_SOUTH_ENTRANCE), MAP(ROUTE6)}, [QL_LOCATION_UNDERGROUND_PATH_2] = {MAP(MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE), MAP(MAP_ROUTE6)},
[QL_LOCATION_PKMN_FAN_CLUB] = {MAP(VERMILION_CITY_POKEMON_FAN_CLUB), MAP(VERMILION_CITY)}, [QL_LOCATION_PKMN_FAN_CLUB] = {MAP(MAP_VERMILION_CITY_POKEMON_FAN_CLUB), MAP(MAP_VERMILION_CITY)},
[QL_LOCATION_VERMILION_GYM] = {MAP(VERMILION_CITY_GYM), MAP(VERMILION_CITY)}, [QL_LOCATION_VERMILION_GYM] = {MAP(MAP_VERMILION_CITY_GYM), MAP(MAP_VERMILION_CITY)},
[QL_LOCATION_SS_ANNE] = {MAP(SSANNE_1F_CORRIDOR), MAP(VERMILION_CITY)}, [QL_LOCATION_SS_ANNE] = {MAP(MAP_SSANNE_1F_CORRIDOR), MAP(MAP_VERMILION_CITY)},
[QL_LOCATION_DIGLETTS_CAVE_1] = {MAP(DIGLETTS_CAVE_NORTH_ENTRANCE), MAP(ROUTE2)}, [QL_LOCATION_DIGLETTS_CAVE_1] = {MAP(MAP_DIGLETTS_CAVE_NORTH_ENTRANCE), MAP(MAP_ROUTE2)},
[QL_LOCATION_DIGLETTS_CAVE_2] = {MAP(DIGLETTS_CAVE_SOUTH_ENTRANCE), MAP(ROUTE11)}, [QL_LOCATION_DIGLETTS_CAVE_2] = {MAP(MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE), MAP(MAP_ROUTE11)},
[QL_LOCATION_ROCK_TUNNEL_1] = {MAP(ROCK_TUNNEL_1F), MAP(ROUTE10)}, [QL_LOCATION_ROCK_TUNNEL_1] = {MAP(MAP_ROCK_TUNNEL_1F), MAP(MAP_ROUTE10)},
[QL_LOCATION_ROCK_TUNNEL_2] = {MAP(ROCK_TUNNEL_1F), MAP(ROUTE10)}, [QL_LOCATION_ROCK_TUNNEL_2] = {MAP(MAP_ROCK_TUNNEL_1F), MAP(MAP_ROUTE10)},
[QL_LOCATION_POWER_PLANT] = {MAP(POWER_PLANT), MAP(ROUTE10)}, [QL_LOCATION_POWER_PLANT] = {MAP(MAP_POWER_PLANT), MAP(MAP_ROUTE10)},
[QL_LOCATION_PKMN_TOWER] = {MAP(POKEMON_TOWER_1F), MAP(LAVENDER_TOWN)}, [QL_LOCATION_PKMN_TOWER] = {MAP(MAP_POKEMON_TOWER_1F), MAP(MAP_LAVENDER_TOWN)},
[QL_LOCATION_VOLUNTEER_HOUSE] = {MAP(LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE), MAP(LAVENDER_TOWN)}, [QL_LOCATION_VOLUNTEER_HOUSE] = {MAP(MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE), MAP(MAP_LAVENDER_TOWN)},
[QL_LOCATION_NAME_RATERS_HOUSE] = {MAP(LAVENDER_TOWN_HOUSE2), MAP(LAVENDER_TOWN)}, [QL_LOCATION_NAME_RATERS_HOUSE] = {MAP(MAP_LAVENDER_TOWN_HOUSE2), MAP(MAP_LAVENDER_TOWN)},
[QL_LOCATION_UNDERGROUND_PATH_3] = {MAP(UNDERGROUND_PATH_EAST_ENTRANCE), MAP(ROUTE8)}, [QL_LOCATION_UNDERGROUND_PATH_3] = {MAP(MAP_UNDERGROUND_PATH_EAST_ENTRANCE), MAP(MAP_ROUTE8)},
[QL_LOCATION_UNDERGROUND_PATH_4] = {MAP(UNDERGROUND_PATH_WEST_ENTRANCE), MAP(ROUTE7)}, [QL_LOCATION_UNDERGROUND_PATH_4] = {MAP(MAP_UNDERGROUND_PATH_WEST_ENTRANCE), MAP(MAP_ROUTE7)},
[QL_LOCATION_CELADON_DEPT_STORE] = {MAP(CELADON_CITY_DEPARTMENT_STORE_1F), MAP(CELADON_CITY)}, [QL_LOCATION_CELADON_DEPT_STORE] = {MAP(MAP_CELADON_CITY_DEPARTMENT_STORE_1F), MAP(MAP_CELADON_CITY)},
[QL_LOCATION_CELADON_MANSION] = {MAP(CELADON_CITY_CONDOMINIUMS_1F), MAP(CELADON_CITY)}, [QL_LOCATION_CELADON_MANSION] = {MAP(MAP_CELADON_CITY_CONDOMINIUMS_1F), MAP(MAP_CELADON_CITY)},
[QL_LOCATION_GAME_CORNER] = {MAP(CELADON_CITY_GAME_CORNER), MAP(CELADON_CITY)}, [QL_LOCATION_GAME_CORNER] = {MAP(MAP_CELADON_CITY_GAME_CORNER), MAP(MAP_CELADON_CITY)},
[QL_LOCATION_CELADON_GYM] = {MAP(CELADON_CITY_GYM), MAP(CELADON_CITY)}, [QL_LOCATION_CELADON_GYM] = {MAP(MAP_CELADON_CITY_GYM), MAP(MAP_CELADON_CITY)},
[QL_LOCATION_CELADON_RESTAURANT] = {MAP(CELADON_CITY_RESTAURANT), MAP(CELADON_CITY)}, [QL_LOCATION_CELADON_RESTAURANT] = {MAP(MAP_CELADON_CITY_RESTAURANT), MAP(MAP_CELADON_CITY)},
[QL_LOCATION_ROCKET_HIDEOUT] = {MAP(ROCKET_HIDEOUT_B1F), MAP(CELADON_CITY_GAME_CORNER)}, [QL_LOCATION_ROCKET_HIDEOUT] = {MAP(MAP_ROCKET_HIDEOUT_B1F), MAP(MAP_CELADON_CITY_GAME_CORNER)},
[QL_LOCATION_SAFARI_ZONE] = {MAP(SAFARI_ZONE_CENTER), MAP(FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE)}, [QL_LOCATION_SAFARI_ZONE] = {MAP(MAP_SAFARI_ZONE_CENTER), MAP(MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE)},
[QL_LOCATION_FUCHSIA_GYM] = {MAP(FUCHSIA_CITY_GYM), MAP(FUCHSIA_CITY)}, [QL_LOCATION_FUCHSIA_GYM] = {MAP(MAP_FUCHSIA_CITY_GYM), MAP(MAP_FUCHSIA_CITY)},
[QL_LOCATION_WARDENS_HOME] = {MAP(FUCHSIA_CITY_WARDENS_HOUSE), MAP(FUCHSIA_CITY)}, [QL_LOCATION_WARDENS_HOME] = {MAP(MAP_FUCHSIA_CITY_WARDENS_HOUSE), MAP(MAP_FUCHSIA_CITY)},
[QL_LOCATION_FIGHTING_DOJO] = {MAP(SAFFRON_CITY_DOJO), MAP(SAFFRON_CITY)}, [QL_LOCATION_FIGHTING_DOJO] = {MAP(MAP_SAFFRON_CITY_DOJO), MAP(MAP_SAFFRON_CITY)},
[QL_LOCATION_SAFFRON_GYM] = {MAP(SAFFRON_CITY_GYM), MAP(SAFFRON_CITY)}, [QL_LOCATION_SAFFRON_GYM] = {MAP(MAP_SAFFRON_CITY_GYM), MAP(MAP_SAFFRON_CITY)},
[QL_LOCATION_SILPH_CO] = {MAP(SILPH_CO_1F), MAP(SAFFRON_CITY)}, [QL_LOCATION_SILPH_CO] = {MAP(MAP_SILPH_CO_1F), MAP(MAP_SAFFRON_CITY)},
[QL_LOCATION_SEAFOAM_ISLANDS_1] = {MAP(SEAFOAM_ISLANDS_1F), MAP(ROUTE20)}, [QL_LOCATION_SEAFOAM_ISLANDS_1] = {MAP(MAP_SEAFOAM_ISLANDS_1F), MAP(MAP_ROUTE20)},
[QL_LOCATION_SEAFOAM_ISLANDS_2] = {MAP(SEAFOAM_ISLANDS_1F), MAP(ROUTE20)}, [QL_LOCATION_SEAFOAM_ISLANDS_2] = {MAP(MAP_SEAFOAM_ISLANDS_1F), MAP(MAP_ROUTE20)},
[QL_LOCATION_PKMN_MANSION] = {MAP(POKEMON_MANSION_1F), MAP(CINNABAR_ISLAND)}, [QL_LOCATION_PKMN_MANSION] = {MAP(MAP_POKEMON_MANSION_1F), MAP(MAP_CINNABAR_ISLAND)},
[QL_LOCATION_CINNABAR_GYM] = {MAP(CINNABAR_ISLAND_GYM), MAP(CINNABAR_ISLAND)}, [QL_LOCATION_CINNABAR_GYM] = {MAP(MAP_CINNABAR_ISLAND_GYM), MAP(MAP_CINNABAR_ISLAND)},
[QL_LOCATION_CINNABAR_LAB] = {MAP(CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE), MAP(CINNABAR_ISLAND)}, [QL_LOCATION_CINNABAR_LAB] = {MAP(MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE), MAP(MAP_CINNABAR_ISLAND)},
[QL_LOCATION_VICTORY_ROAD_1] = {MAP(VICTORY_ROAD_1F), MAP(ROUTE23)}, [QL_LOCATION_VICTORY_ROAD_1] = {MAP(MAP_VICTORY_ROAD_1F), MAP(MAP_ROUTE23)},
[QL_LOCATION_VICTORY_ROAD_2] = {MAP(VICTORY_ROAD_2F), MAP(ROUTE23)}, [QL_LOCATION_VICTORY_ROAD_2] = {MAP(MAP_VICTORY_ROAD_2F), MAP(MAP_ROUTE23)},
[QL_LOCATION_PKMN_LEAGUE] = {MAP(INDIGO_PLATEAU_POKEMON_CENTER_1F), MAP(INDIGO_PLATEAU_EXTERIOR)}, [QL_LOCATION_PKMN_LEAGUE] = {MAP(MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F), MAP(MAP_INDIGO_PLATEAU_EXTERIOR)},
[QL_LOCATION_CERULEAN_CAVE] = {MAP(CERULEAN_CAVE_1F), MAP(CERULEAN_CITY)} [QL_LOCATION_CERULEAN_CAVE] = {MAP(MAP_CERULEAN_CAVE_1F), MAP(MAP_CERULEAN_CITY)}
}; };
void QuestLog_CheckDepartingIndoorsMap(void) void QuestLog_CheckDepartingIndoorsMap(void)
@@ -1894,12 +1894,12 @@ void QuestLog_TryRecordDepartedLocation(void)
{ {
if (locationId == QL_LOCATION_VIRIDIAN_FOREST_1) if (locationId == QL_LOCATION_VIRIDIAN_FOREST_1)
{ {
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE)
&& (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE) && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE))) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE)))
{ {
data.mapSec = MAPSEC_ROUTE_2; data.mapSec = MAPSEC_ROUTE_2;
if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE)) if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE))
data.locationId = locationId; data.locationId = locationId;
else else
data.locationId = locationId + 1; data.locationId = locationId + 1;
@@ -1910,12 +1910,12 @@ void QuestLog_TryRecordDepartedLocation(void)
} }
else if (locationId == QL_LOCATION_LEAGUE_GATE_1) else if (locationId == QL_LOCATION_LEAGUE_GATE_1)
{ {
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE22) && if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_ROUTE22) &&
(gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE22) (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE22)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE23))) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE23)))
{ {
data.mapSec = Overworld_GetMapHeaderByGroupAndId(sInsideOutsidePairs[locationId].inside_grp, sInsideOutsidePairs[locationId].inside_num)->regionMapSectionId; data.mapSec = Overworld_GetMapHeaderByGroupAndId(sInsideOutsidePairs[locationId].inside_grp, sInsideOutsidePairs[locationId].inside_num)->regionMapSectionId;
if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE22)) if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE22))
data.locationId = locationId; data.locationId = locationId;
else else
data.locationId = locationId + 1; data.locationId = locationId + 1;
@@ -2140,7 +2140,7 @@ void DoPokemonLeagueLightingEffect(void)
} }
else else
{ {
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(POKEMON_LEAGUE_CHAMPIONS_ROOM)) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM))
{ {
data[0] = sChampionRoomLightingTimers[0]; data[0] = sChampionRoomLightingTimers[0];
data[2] = 8; data[2] = 8;
@@ -2170,7 +2170,7 @@ static void Task_RunPokemonLeagueLightingEffect(u8 taskId)
if (++data[1] == data[2]) if (++data[1] == data[2])
data[1] = 0; data[1] = 0;
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(POKEMON_LEAGUE_CHAMPIONS_ROOM)) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM))
{ {
data[0] = sChampionRoomLightingTimers[data[1]]; data[0] = sChampionRoomLightingTimers[data[1]];
LoadPalette(sChampionRoomLightingPalettes[data[1]], BG_PLTT_ID(7), PLTT_SIZE_4BPP); LoadPalette(sChampionRoomLightingPalettes[data[1]], BG_PLTT_ID(7), PLTT_SIZE_4BPP);
@@ -2189,7 +2189,7 @@ static void Task_CancelPokemonLeagueLightingEffect(u8 taskId)
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
if (FlagGet(FLAG_TEMP_4) != FALSE) if (FlagGet(FLAG_TEMP_4) != FALSE)
{ {
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(POKEMON_LEAGUE_CHAMPIONS_ROOM)) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM))
LoadPalette(sChampionRoomLightingPalettes[8], BG_PLTT_ID(7), PLTT_SIZE_4BPP); LoadPalette(sChampionRoomLightingPalettes[8], BG_PLTT_ID(7), PLTT_SIZE_4BPP);
else else
LoadPalette(sEliteFourLightingPalettes[11], BG_PLTT_ID(7), PLTT_SIZE_4BPP); LoadPalette(sEliteFourLightingPalettes[11], BG_PLTT_ID(7), PLTT_SIZE_4BPP);
@@ -2296,8 +2296,8 @@ bool8 HasLearnedAllMovesFromCapeBrinkTutor(void)
bool8 CutMoveRuinValleyCheck(void) bool8 CutMoveRuinValleyCheck(void)
{ {
if (FlagGet(FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE) != TRUE if (FlagGet(FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE) != TRUE
&& gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SIX_ISLAND_RUIN_VALLEY) && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_SIX_ISLAND_RUIN_VALLEY)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(SIX_ISLAND_RUIN_VALLEY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SIX_ISLAND_RUIN_VALLEY)
&& gSaveBlock1Ptr->pos.x == 24 && gSaveBlock1Ptr->pos.x == 24
&& gSaveBlock1Ptr->pos.y == 25 && gSaveBlock1Ptr->pos.y == 25
&& GetPlayerFacingDirection() == DIR_NORTH && GetPlayerFacingDirection() == DIR_NORTH
@@ -2438,7 +2438,7 @@ static void Task_WaitDeoxysFieldEffect(u8 taskId)
void IncrementBirthIslandRockStepCount(void) void IncrementBirthIslandRockStepCount(void)
{ {
u16 count = VarGet(VAR_DEOXYS_INTERACTION_STEP_COUNTER); u16 count = VarGet(VAR_DEOXYS_INTERACTION_STEP_COUNTER);
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BIRTH_ISLAND_EXTERIOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BIRTH_ISLAND_EXTERIOR)) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_BIRTH_ISLAND_EXTERIOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_BIRTH_ISLAND_EXTERIOR))
{ {
count++; count++;
if (count > 99) if (count > 99)
@@ -2469,7 +2469,7 @@ bool8 IsBadEggInParty(void)
bool8 IsPlayerNotInTrainerTowerLobby(void) bool8 IsPlayerNotInTrainerTowerLobby(void)
{ {
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRAINER_TOWER_LOBBY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_LOBBY)) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_TRAINER_TOWER_LOBBY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_LOBBY))
return FALSE; return FALSE;
else else
return TRUE; return TRUE;
src/hall_of_fame.c
+1 -1
View File
@@ -701,7 +701,7 @@ static void SetWarpsToRollCredits(void)
VarSet(VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1); VarSet(VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1);
FlagSet(FLAG_DONT_SHOW_MAP_NAME_POPUP); FlagSet(FLAG_DONT_SHOW_MAP_NAME_POPUP);
gDisableMapMusicChangeOnMapLoad = 2; gDisableMapMusicChangeOnMapLoad = 2;
SetWarpDestination(MAP_GROUP(INDIGO_PLATEAU_EXTERIOR), MAP_NUM(INDIGO_PLATEAU_EXTERIOR), -1, 11, 6); SetWarpDestination(MAP_GROUP(MAP_INDIGO_PLATEAU_EXTERIOR), MAP_NUM(MAP_INDIGO_PLATEAU_EXTERIOR), -1, 11, 6);
DoWarp(); DoWarp();
ResetInitialPlayerAvatarState(); ResetInitialPlayerAvatarState();
} }
src/heal_location.c
+6 -6
View File
@@ -69,8 +69,8 @@ void SetWhiteoutRespawnWarpAndHealerNpc(struct WarpData * warp)
gSpecialVar_LastTalked = 1; gSpecialVar_LastTalked = 1;
warp->x = 4; warp->x = 4;
warp->y = 11; warp->y = 11;
warp->mapGroup = MAP_GROUP(TRAINER_TOWER_LOBBY); warp->mapGroup = MAP_GROUP(MAP_TRAINER_TOWER_LOBBY);
warp->mapNum = MAP_NUM(TRAINER_TOWER_LOBBY); warp->mapNum = MAP_NUM(MAP_TRAINER_TOWER_LOBBY);
warp->warpId = 0xFF; warp->warpId = 0xFF;
} }
else else
@@ -80,22 +80,22 @@ void SetWhiteoutRespawnWarpAndHealerNpc(struct WarpData * warp)
warp->mapNum = sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1]; warp->mapNum = sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1];
warp->warpId = 0xFF; warp->warpId = 0xFF;
if (sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(PALLET_TOWN_PLAYERS_HOUSE_1F) && sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(PALLET_TOWN_PLAYERS_HOUSE_1F)) if (sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(MAP_PALLET_TOWN_PLAYERS_HOUSE_1F) && sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(MAP_PALLET_TOWN_PLAYERS_HOUSE_1F))
{ {
warp->x = 8; warp->x = 8;
warp->y = 5; warp->y = 5;
} }
else if (sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(INDIGO_PLATEAU_POKEMON_CENTER_1F) && sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(INDIGO_PLATEAU_POKEMON_CENTER_1F)) else if (sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F) && sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F))
{ {
warp->x = 13; warp->x = 13;
warp->y = 12; warp->y = 12;
} }
else if (sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(ONE_ISLAND_POKEMON_CENTER_1F) && sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(ONE_ISLAND_POKEMON_CENTER_1F)) else if (sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(MAP_ONE_ISLAND_POKEMON_CENTER_1F) && sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(MAP_ONE_ISLAND_POKEMON_CENTER_1F))
{ {
warp->x = 5; warp->x = 5;
warp->y = 4; warp->y = 4;
} }
else if (sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(TRAINER_TOWER_LOBBY) && sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(TRAINER_TOWER_LOBBY)) else if (sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(MAP_TRAINER_TOWER_LOBBY) && sWhiteoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(MAP_TRAINER_TOWER_LOBBY))
{ {
warp->x = 4; warp->x = 4;
warp->y = 11; warp->y = 11;
src/help_system.c
+22 -22
View File
@@ -1743,22 +1743,22 @@ static const u16 sGymMaps[] = {
}; };
static const u8 sDungeonMaps[][3] = { static const u8 sDungeonMaps[][3] = {
{ MAP_GROUP(VIRIDIAN_FOREST), MAP_NUM(VIRIDIAN_FOREST), 1 }, { MAP_GROUP(MAP_VIRIDIAN_FOREST), MAP_NUM(MAP_VIRIDIAN_FOREST), 1 },
{ MAP_GROUP(MT_MOON_1F), MAP_NUM(MT_MOON_1F), 3 }, { MAP_GROUP(MAP_MT_MOON_1F), MAP_NUM(MAP_MT_MOON_1F), 3 },
{ MAP_GROUP(ROCK_TUNNEL_1F), MAP_NUM(ROCK_TUNNEL_1F), 2 }, { MAP_GROUP(MAP_ROCK_TUNNEL_1F), MAP_NUM(MAP_ROCK_TUNNEL_1F), 2 },
{ MAP_GROUP(DIGLETTS_CAVE_NORTH_ENTRANCE), MAP_NUM(DIGLETTS_CAVE_NORTH_ENTRANCE), 3 }, { MAP_GROUP(MAP_DIGLETTS_CAVE_NORTH_ENTRANCE), MAP_NUM(MAP_DIGLETTS_CAVE_NORTH_ENTRANCE), 3 },
{ MAP_GROUP(SEAFOAM_ISLANDS_1F), MAP_NUM(SEAFOAM_ISLANDS_1F), 5 }, { MAP_GROUP(MAP_SEAFOAM_ISLANDS_1F), MAP_NUM(MAP_SEAFOAM_ISLANDS_1F), 5 },
{ MAP_GROUP(VICTORY_ROAD_1F), MAP_NUM(VICTORY_ROAD_1F), 3 }, { MAP_GROUP(MAP_VICTORY_ROAD_1F), MAP_NUM(MAP_VICTORY_ROAD_1F), 3 },
{ MAP_GROUP(CERULEAN_CAVE_1F), MAP_NUM(CERULEAN_CAVE_1F), 3 }, { MAP_GROUP(MAP_CERULEAN_CAVE_1F), MAP_NUM(MAP_CERULEAN_CAVE_1F), 3 },
{ MAP_GROUP(MT_EMBER_RUBY_PATH_B4F), MAP_NUM(MT_EMBER_RUBY_PATH_B4F), 1 }, { MAP_GROUP(MAP_MT_EMBER_RUBY_PATH_B4F), MAP_NUM(MAP_MT_EMBER_RUBY_PATH_B4F), 1 },
{ MAP_GROUP(MT_EMBER_SUMMIT_PATH_1F), MAP_NUM(MT_EMBER_SUMMIT_PATH_1F), 3 }, { MAP_GROUP(MAP_MT_EMBER_SUMMIT_PATH_1F), MAP_NUM(MAP_MT_EMBER_SUMMIT_PATH_1F), 3 },
{ MAP_GROUP(MT_EMBER_RUBY_PATH_B5F), MAP_NUM(MT_EMBER_RUBY_PATH_B5F), 7 }, { MAP_GROUP(MAP_MT_EMBER_RUBY_PATH_B5F), MAP_NUM(MAP_MT_EMBER_RUBY_PATH_B5F), 7 },
{ MAP_GROUP(THREE_ISLAND_BERRY_FOREST), MAP_NUM(THREE_ISLAND_BERRY_FOREST), 1 }, { MAP_GROUP(MAP_THREE_ISLAND_BERRY_FOREST), MAP_NUM(MAP_THREE_ISLAND_BERRY_FOREST), 1 },
{ MAP_GROUP(SIX_ISLAND_PATTERN_BUSH), MAP_NUM(SIX_ISLAND_PATTERN_BUSH), 1 }, { MAP_GROUP(MAP_SIX_ISLAND_PATTERN_BUSH), MAP_NUM(MAP_SIX_ISLAND_PATTERN_BUSH), 1 },
{ MAP_GROUP(FIVE_ISLAND_LOST_CAVE_ENTRANCE), MAP_NUM(FIVE_ISLAND_LOST_CAVE_ENTRANCE), 15 }, { MAP_GROUP(MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE), MAP_NUM(MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE), 15 },
{ MAP_GROUP(FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE), MAP_NUM(FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE), 4 }, { MAP_GROUP(MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE), MAP_NUM(MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE), 4 },
{ MAP_GROUP(SIX_ISLAND_ALTERING_CAVE), MAP_NUM(SIX_ISLAND_ALTERING_CAVE), 1 }, { MAP_GROUP(MAP_SIX_ISLAND_ALTERING_CAVE), MAP_NUM(MAP_SIX_ISLAND_ALTERING_CAVE), 1 },
{ MAP_GROUP(SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER), MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER), 7 } { MAP_GROUP(MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER), MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER), 7 }
}; };
void SetHelpContextDontCheckBattle(u8 contextId) void SetHelpContextDontCheckBattle(u8 contextId)
@@ -1847,14 +1847,14 @@ static bool8 IsInDungeonMap(void)
} }
#define IN_PLAYERS_HOUSE \ #define IN_PLAYERS_HOUSE \
((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(PALLET_TOWN_PLAYERS_HOUSE_1F) \ ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_PALLET_TOWN_PLAYERS_HOUSE_1F) \
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN_PLAYERS_HOUSE_1F)) \ && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_PALLET_TOWN_PLAYERS_HOUSE_1F)) \
|| (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(PALLET_TOWN_PLAYERS_HOUSE_2F) \ || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_PALLET_TOWN_PLAYERS_HOUSE_2F) \
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN_PLAYERS_HOUSE_2F))) \ && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_PALLET_TOWN_PLAYERS_HOUSE_2F))) \
#define IN_OAKS_LAB \ #define IN_OAKS_LAB \
(gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(PALLET_TOWN_PROFESSOR_OAKS_LAB) \ (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB) \
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN_PROFESSOR_OAKS_LAB)) \ && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB)) \
void SetHelpContextForMap(void) void SetHelpContextForMap(void)
{ {
src/item.c
+1 -1
View File
@@ -589,7 +589,7 @@ void TrySetObtainedItemQuestLogEvent(u16 itemId)
|| itemId == ITEM_RUBY || itemId == ITEM_RUBY
|| itemId == ITEM_SAPPHIRE) || itemId == ITEM_SAPPHIRE)
{ {
if (itemId != ITEM_TOWN_MAP || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(PALLET_TOWN_RIVALS_HOUSE) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN_RIVALS_HOUSE))) if (itemId != ITEM_TOWN_MAP || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_PALLET_TOWN_RIVALS_HOUSE) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_PALLET_TOWN_RIVALS_HOUSE)))
{ {
struct QuestLogEvent_StoryItem * data = malloc(sizeof(*data)); struct QuestLogEvent_StoryItem * data = malloc(sizeof(*data));
data->itemId = itemId; data->itemId = itemId;
src/item_use.c
+5 -5
View File
@@ -714,11 +714,11 @@ void FieldUseFunc_VsSeeker(u8 taskId)
if ((gMapHeader.mapType != MAP_TYPE_ROUTE if ((gMapHeader.mapType != MAP_TYPE_ROUTE
&& gMapHeader.mapType != MAP_TYPE_TOWN && gMapHeader.mapType != MAP_TYPE_TOWN
&& gMapHeader.mapType != MAP_TYPE_CITY) && gMapHeader.mapType != MAP_TYPE_CITY)
|| (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(VIRIDIAN_FOREST) || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_VIRIDIAN_FOREST)
&& (gSaveBlock1Ptr->location.mapNum == MAP_NUM(VIRIDIAN_FOREST) && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_VIRIDIAN_FOREST)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(MT_EMBER_EXTERIOR) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_MT_EMBER_EXTERIOR)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(THREE_ISLAND_BERRY_FOREST) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_THREE_ISLAND_BERRY_FOREST)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(SIX_ISLAND_PATTERN_BUSH)))) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SIX_ISLAND_PATTERN_BUSH))))
{ {
PrintNotTheTimeToUseThat(taskId, gTasks[taskId].data[3]); PrintNotTheTimeToUseThat(taskId, gTasks[taskId].data[3]);
} }
src/menu_helpers.c
+2 -2
View File
@@ -95,8 +95,8 @@ bool8 IsHoldingItemAllowed(u16 itemId)
{ {
// Enigma Berry can't be held in link areas // Enigma Berry can't be held in link areas
if (itemId == ITEM_ENIGMA_BERRY if (itemId == ITEM_ENIGMA_BERRY
&& ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRADE_CENTER) && ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_TRADE_CENTER)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRADE_CENTER)) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRADE_CENTER))
|| InUnionRoom() == TRUE)) || InUnionRoom() == TRUE))
return FALSE; return FALSE;
else else
src/new_game.c
+1 -1
View File
@@ -81,7 +81,7 @@ static void ClearBattleTower(void)
static void WarpToPlayersRoom(void) static void WarpToPlayersRoom(void)
{ {
SetWarpDestination(MAP_GROUP(PALLET_TOWN_PLAYERS_HOUSE_2F), MAP_NUM(PALLET_TOWN_PLAYERS_HOUSE_2F), -1, 6, 6); SetWarpDestination(MAP_GROUP(MAP_PALLET_TOWN_PLAYERS_HOUSE_2F), MAP_NUM(MAP_PALLET_TOWN_PLAYERS_HOUSE_2F), -1, 6, 6);
WarpIntoMap(); WarpIntoMap();
} }
src/overworld.c
+10 -10
View File
@@ -493,8 +493,8 @@ static const struct MapLayout *GetMapLayout(void)
// Routines related to warps // Routines related to warps
static const struct WarpData sDummyWarpData = { static const struct WarpData sDummyWarpData = {
.mapGroup = MAP_GROUP(UNDEFINED), .mapGroup = MAP_GROUP(MAP_UNDEFINED),
.mapNum = MAP_NUM(UNDEFINED), .mapNum = MAP_NUM(MAP_UNDEFINED),
.warpId = 0xFF, .warpId = 0xFF,
.x = -1, .x = -1,
.y = -1 .y = -1
@@ -519,9 +519,9 @@ static void SetWarpData(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId
static bool32 IsDummyWarp(struct WarpData *warp) static bool32 IsDummyWarp(struct WarpData *warp)
{ {
if (warp->mapGroup != (s8)MAP_GROUP(UNDEFINED)) if (warp->mapGroup != (s8)MAP_GROUP(MAP_UNDEFINED))
return FALSE; return FALSE;
else if (warp->mapNum != (s8)MAP_NUM(UNDEFINED)) else if (warp->mapNum != (s8)MAP_NUM(MAP_UNDEFINED))
return FALSE; return FALSE;
else if (warp->warpId != -1) else if (warp->warpId != -1)
return FALSE; return FALSE;
@@ -636,7 +636,7 @@ void UpdateEscapeWarp(s16 x, s16 y)
u8 currMapType = GetCurrentMapType(); u8 currMapType = GetCurrentMapType();
u8 destMapType = GetMapTypeByGroupAndId(sWarpDestination.mapGroup, sWarpDestination.mapNum); u8 destMapType = GetMapTypeByGroupAndId(sWarpDestination.mapGroup, sWarpDestination.mapNum);
u8 delta; u8 delta;
if (IsMapTypeOutdoors(currMapType) && IsMapTypeOutdoors(destMapType) != TRUE && !(gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(VIRIDIAN_FOREST) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(VIRIDIAN_FOREST))) if (IsMapTypeOutdoors(currMapType) && IsMapTypeOutdoors(destMapType) != TRUE && !(gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_VIRIDIAN_FOREST) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_VIRIDIAN_FOREST)))
{ {
delta = GetPlayerFacingDirection() != DIR_SOUTH; delta = GetPlayerFacingDirection() != DIR_SOUTH;
SetEscapeWarp(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x - 7, y - 7 + delta); SetEscapeWarp(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x - 7, y - 7 + delta);
@@ -894,10 +894,10 @@ bool8 MetatileBehavior_IsSurfableInSeafoamIslands(u16 metatileBehavior)
{ {
if (MetatileBehavior_IsSurfable(metatileBehavior) != TRUE) if (MetatileBehavior_IsSurfable(metatileBehavior) != TRUE)
return FALSE; return FALSE;
if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SEAFOAM_ISLANDS_B3F) if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_SEAFOAM_ISLANDS_B3F)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEAFOAM_ISLANDS_B3F)) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEAFOAM_ISLANDS_B3F))
|| (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SEAFOAM_ISLANDS_B4F) || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_SEAFOAM_ISLANDS_B4F)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEAFOAM_ISLANDS_B4F))) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEAFOAM_ISLANDS_B4F)))
return TRUE; return TRUE;
return FALSE; return FALSE;
} }
@@ -1019,7 +1019,7 @@ void Overworld_PlaySpecialMapMusic(void)
if (gDisableMapMusicChangeOnMapLoad == MUSIC_DISABLE_KEEP) if (gDisableMapMusicChangeOnMapLoad == MUSIC_DISABLE_KEEP)
return; return;
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(POKEMON_LEAGUE_CHAMPIONS_ROOM)) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM))
{ {
PlayerGetDestCoords(&x, &y); PlayerGetDestCoords(&x, &y);
if (y - 7 < 11 && gMPlayInfo_BGM.songHeader == &mus_victory_gym_leader) if (y - 7 < 11 && gMPlayInfo_BGM.songHeader == &mus_victory_gym_leader)
src/party_menu.c
+3 -3
View File
@@ -4087,9 +4087,9 @@ static void DisplayCantUseSurfMessage(void)
GetXYCoordsOneStepInFrontOfPlayer(&x, &y); GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
if (MetatileBehavior_IsFastWater(MapGridGetMetatileBehaviorAt(x, y)) == TRUE) if (MetatileBehavior_IsFastWater(MapGridGetMetatileBehaviorAt(x, y)) == TRUE)
DisplayPartyMenuStdMessage(PARTY_MSG_CURRENT_TOO_FAST); DisplayPartyMenuStdMessage(PARTY_MSG_CURRENT_TOO_FAST);
else if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE17)) else if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_ROUTE17))
&& ((gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE17)) && ((gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE17))
|| (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE18)))) || (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE18))))
DisplayPartyMenuStdMessage(PARTY_MSG_ENJOY_CYCLING); DisplayPartyMenuStdMessage(PARTY_MSG_ENJOY_CYCLING);
else else
DisplayPartyMenuStdMessage(PARTY_MSG_CANT_SURF_HERE); DisplayPartyMenuStdMessage(PARTY_MSG_CANT_SURF_HERE);
src/quest_log.c
+2 -2
View File
@@ -472,8 +472,8 @@ void TryStartQuestLogPlayback(u8 taskId)
static void Task_BeginQuestLogPlayback(u8 taskId) static void Task_BeginQuestLogPlayback(u8 taskId)
{ {
gSaveBlock1Ptr->location.mapGroup = MAP_GROUP(ROUTE1); gSaveBlock1Ptr->location.mapGroup = MAP_GROUP(MAP_ROUTE1);
gSaveBlock1Ptr->location.mapNum = MAP_NUM(ROUTE1); gSaveBlock1Ptr->location.mapNum = MAP_NUM(MAP_ROUTE1);
gSaveBlock1Ptr->location.warpId = WARP_ID_NONE; gSaveBlock1Ptr->location.warpId = WARP_ID_NONE;
sCurrentSceneNum = 0; sCurrentSceneNum = 0;
gDisableMapMusicChangeOnMapLoad = 1; gDisableMapMusicChangeOnMapLoad = 1;
src/quest_log_events.c
+21 -21
View File
@@ -551,36 +551,36 @@ void SetQuestLogEvent(u16 eventId, const u16 * data)
static bool8 InQuestLogDisabledLocation(void) static bool8 InQuestLogDisabledLocation(void)
{ {
// In Trainer Tower // In Trainer Tower
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRAINER_TOWER_1F) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_TRAINER_TOWER_1F)
&& (gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_1F) && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_1F)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_2F) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_2F)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_3F) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_3F)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_4F) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_4F)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_5F) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_5F)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_6F) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_6F)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_7F) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_7F)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_8F) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_8F)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_ROOF) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_ROOF)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_LOBBY) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_LOBBY)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_ELEVATOR))) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_ELEVATOR)))
return TRUE; return TRUE;
// In pokemon trainer fan club // In pokemon trainer fan club
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB)) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB))
return TRUE; return TRUE;
// In E-Reader house // In E-Reader house
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SEVEN_ISLAND_HOUSE_ROOM1) && if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_SEVEN_ISLAND_HOUSE_ROOM1) &&
(gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_HOUSE_ROOM1) (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEVEN_ISLAND_HOUSE_ROOM1)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_HOUSE_ROOM2))) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEVEN_ISLAND_HOUSE_ROOM2)))
return TRUE; return TRUE;
// In elevator // In elevator
if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROCKET_HIDEOUT_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROCKET_HIDEOUT_ELEVATOR)) if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_ROCKET_HIDEOUT_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROCKET_HIDEOUT_ELEVATOR))
|| (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SILPH_CO_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SILPH_CO_ELEVATOR)) || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_SILPH_CO_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SILPH_CO_ELEVATOR))
|| (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRAINER_TOWER_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_ELEVATOR)) || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_TRAINER_TOWER_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_TRAINER_TOWER_ELEVATOR))
|| (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(CELADON_CITY_DEPARTMENT_STORE_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_ELEVATOR))) || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR)))
return TRUE; return TRUE;
return FALSE; return FALSE;
src/region_map.c
+126 -126
View File
@@ -826,114 +826,114 @@ static const u8 sTextColors[] = {TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_CO
#include "data/region_map/region_map_layout_sevii_67.h" #include "data/region_map/region_map_layout_sevii_67.h"
static const u8 sMapFlyDestinations[][3] = { static const u8 sMapFlyDestinations[][3] = {
[MAPSEC_PALLET_TOWN - MAPSECS_KANTO] = {MAP(PALLET_TOWN), SPAWN_PALLET_TOWN}, [MAPSEC_PALLET_TOWN - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), SPAWN_PALLET_TOWN},
[MAPSEC_VIRIDIAN_CITY - MAPSECS_KANTO] = {MAP(VIRIDIAN_CITY), SPAWN_VIRIDIAN_CITY}, [MAPSEC_VIRIDIAN_CITY - MAPSECS_KANTO] = {MAP(MAP_VIRIDIAN_CITY), SPAWN_VIRIDIAN_CITY},
[MAPSEC_PEWTER_CITY - MAPSECS_KANTO] = {MAP(PEWTER_CITY), SPAWN_PEWTER_CITY}, [MAPSEC_PEWTER_CITY - MAPSECS_KANTO] = {MAP(MAP_PEWTER_CITY), SPAWN_PEWTER_CITY},
[MAPSEC_CERULEAN_CITY - MAPSECS_KANTO] = {MAP(CERULEAN_CITY), SPAWN_CERULEAN_CITY}, [MAPSEC_CERULEAN_CITY - MAPSECS_KANTO] = {MAP(MAP_CERULEAN_CITY), SPAWN_CERULEAN_CITY},
[MAPSEC_LAVENDER_TOWN - MAPSECS_KANTO] = {MAP(LAVENDER_TOWN), SPAWN_LAVENDER_TOWN}, [MAPSEC_LAVENDER_TOWN - MAPSECS_KANTO] = {MAP(MAP_LAVENDER_TOWN), SPAWN_LAVENDER_TOWN},
[MAPSEC_VERMILION_CITY - MAPSECS_KANTO] = {MAP(VERMILION_CITY), SPAWN_VERMILION_CITY}, [MAPSEC_VERMILION_CITY - MAPSECS_KANTO] = {MAP(MAP_VERMILION_CITY), SPAWN_VERMILION_CITY},
[MAPSEC_CELADON_CITY - MAPSECS_KANTO] = {MAP(CELADON_CITY), SPAWN_CELADON_CITY}, [MAPSEC_CELADON_CITY - MAPSECS_KANTO] = {MAP(MAP_CELADON_CITY), SPAWN_CELADON_CITY},
[MAPSEC_FUCHSIA_CITY - MAPSECS_KANTO] = {MAP(FUCHSIA_CITY), SPAWN_FUCHSIA_CITY}, [MAPSEC_FUCHSIA_CITY - MAPSECS_KANTO] = {MAP(MAP_FUCHSIA_CITY), SPAWN_FUCHSIA_CITY},
[MAPSEC_CINNABAR_ISLAND - MAPSECS_KANTO] = {MAP(CINNABAR_ISLAND), SPAWN_CINNABAR_ISLAND}, [MAPSEC_CINNABAR_ISLAND - MAPSECS_KANTO] = {MAP(MAP_CINNABAR_ISLAND), SPAWN_CINNABAR_ISLAND},
[MAPSEC_INDIGO_PLATEAU - MAPSECS_KANTO] = {MAP(INDIGO_PLATEAU_EXTERIOR), SPAWN_INDIGO_PLATEAU}, [MAPSEC_INDIGO_PLATEAU - MAPSECS_KANTO] = {MAP(MAP_INDIGO_PLATEAU_EXTERIOR), SPAWN_INDIGO_PLATEAU},
[MAPSEC_SAFFRON_CITY - MAPSECS_KANTO] = {MAP(SAFFRON_CITY), SPAWN_SAFFRON_CITY}, [MAPSEC_SAFFRON_CITY - MAPSECS_KANTO] = {MAP(MAP_SAFFRON_CITY), SPAWN_SAFFRON_CITY},
[MAPSEC_ROUTE_4_POKECENTER - MAPSECS_KANTO] = {MAP(ROUTE4), SPAWN_ROUTE4}, [MAPSEC_ROUTE_4_POKECENTER - MAPSECS_KANTO] = {MAP(MAP_ROUTE4), SPAWN_ROUTE4},
[MAPSEC_ROUTE_10_POKECENTER - MAPSECS_KANTO] = {MAP(ROUTE10), SPAWN_ROUTE10}, [MAPSEC_ROUTE_10_POKECENTER - MAPSECS_KANTO] = {MAP(MAP_ROUTE10), SPAWN_ROUTE10},
[MAPSEC_ROUTE_1 - MAPSECS_KANTO] = {MAP(ROUTE1), 0}, [MAPSEC_ROUTE_1 - MAPSECS_KANTO] = {MAP(MAP_ROUTE1), 0},
[MAPSEC_ROUTE_2 - MAPSECS_KANTO] = {MAP(ROUTE2), 0}, [MAPSEC_ROUTE_2 - MAPSECS_KANTO] = {MAP(MAP_ROUTE2), 0},
[MAPSEC_ROUTE_3 - MAPSECS_KANTO] = {MAP(ROUTE3), 0}, [MAPSEC_ROUTE_3 - MAPSECS_KANTO] = {MAP(MAP_ROUTE3), 0},
[MAPSEC_ROUTE_4 - MAPSECS_KANTO] = {MAP(ROUTE4), 0}, [MAPSEC_ROUTE_4 - MAPSECS_KANTO] = {MAP(MAP_ROUTE4), 0},
[MAPSEC_ROUTE_5 - MAPSECS_KANTO] = {MAP(ROUTE5), 0}, [MAPSEC_ROUTE_5 - MAPSECS_KANTO] = {MAP(MAP_ROUTE5), 0},
[MAPSEC_ROUTE_6 - MAPSECS_KANTO] = {MAP(ROUTE6), 0}, [MAPSEC_ROUTE_6 - MAPSECS_KANTO] = {MAP(MAP_ROUTE6), 0},
[MAPSEC_ROUTE_7 - MAPSECS_KANTO] = {MAP(ROUTE7), 0}, [MAPSEC_ROUTE_7 - MAPSECS_KANTO] = {MAP(MAP_ROUTE7), 0},
[MAPSEC_ROUTE_8 - MAPSECS_KANTO] = {MAP(ROUTE8), 0}, [MAPSEC_ROUTE_8 - MAPSECS_KANTO] = {MAP(MAP_ROUTE8), 0},
[MAPSEC_ROUTE_9 - MAPSECS_KANTO] = {MAP(ROUTE9), 0}, [MAPSEC_ROUTE_9 - MAPSECS_KANTO] = {MAP(MAP_ROUTE9), 0},
[MAPSEC_ROUTE_10 - MAPSECS_KANTO] = {MAP(ROUTE10), 0}, [MAPSEC_ROUTE_10 - MAPSECS_KANTO] = {MAP(MAP_ROUTE10), 0},
[MAPSEC_ROUTE_11 - MAPSECS_KANTO] = {MAP(ROUTE11), 0}, [MAPSEC_ROUTE_11 - MAPSECS_KANTO] = {MAP(MAP_ROUTE11), 0},
[MAPSEC_ROUTE_12 - MAPSECS_KANTO] = {MAP(ROUTE12), 0}, [MAPSEC_ROUTE_12 - MAPSECS_KANTO] = {MAP(MAP_ROUTE12), 0},
[MAPSEC_ROUTE_13 - MAPSECS_KANTO] = {MAP(ROUTE13), 0}, [MAPSEC_ROUTE_13 - MAPSECS_KANTO] = {MAP(MAP_ROUTE13), 0},
[MAPSEC_ROUTE_14 - MAPSECS_KANTO] = {MAP(ROUTE14), 0}, [MAPSEC_ROUTE_14 - MAPSECS_KANTO] = {MAP(MAP_ROUTE14), 0},
[MAPSEC_ROUTE_15 - MAPSECS_KANTO] = {MAP(ROUTE15), 0}, [MAPSEC_ROUTE_15 - MAPSECS_KANTO] = {MAP(MAP_ROUTE15), 0},
[MAPSEC_ROUTE_16 - MAPSECS_KANTO] = {MAP(ROUTE16), 0}, [MAPSEC_ROUTE_16 - MAPSECS_KANTO] = {MAP(MAP_ROUTE16), 0},
[MAPSEC_ROUTE_17 - MAPSECS_KANTO] = {MAP(ROUTE17), 0}, [MAPSEC_ROUTE_17 - MAPSECS_KANTO] = {MAP(MAP_ROUTE17), 0},
[MAPSEC_ROUTE_18 - MAPSECS_KANTO] = {MAP(ROUTE18), 0}, [MAPSEC_ROUTE_18 - MAPSECS_KANTO] = {MAP(MAP_ROUTE18), 0},
[MAPSEC_ROUTE_19 - MAPSECS_KANTO] = {MAP(ROUTE19), 0}, [MAPSEC_ROUTE_19 - MAPSECS_KANTO] = {MAP(MAP_ROUTE19), 0},
[MAPSEC_ROUTE_20 - MAPSECS_KANTO] = {MAP(ROUTE20), 0}, [MAPSEC_ROUTE_20 - MAPSECS_KANTO] = {MAP(MAP_ROUTE20), 0},
[MAPSEC_ROUTE_21 - MAPSECS_KANTO] = {MAP(ROUTE21_NORTH), 0}, [MAPSEC_ROUTE_21 - MAPSECS_KANTO] = {MAP(MAP_ROUTE21_NORTH), 0},
[MAPSEC_ROUTE_22 - MAPSECS_KANTO] = {MAP(ROUTE22), 0}, [MAPSEC_ROUTE_22 - MAPSECS_KANTO] = {MAP(MAP_ROUTE22), 0},
[MAPSEC_ROUTE_23 - MAPSECS_KANTO] = {MAP(ROUTE23), 0}, [MAPSEC_ROUTE_23 - MAPSECS_KANTO] = {MAP(MAP_ROUTE23), 0},
[MAPSEC_ROUTE_24 - MAPSECS_KANTO] = {MAP(ROUTE24), 0}, [MAPSEC_ROUTE_24 - MAPSECS_KANTO] = {MAP(MAP_ROUTE24), 0},
[MAPSEC_ROUTE_25 - MAPSECS_KANTO] = {MAP(ROUTE25), 0}, [MAPSEC_ROUTE_25 - MAPSECS_KANTO] = {MAP(MAP_ROUTE25), 0},
[MAPSEC_VIRIDIAN_FOREST - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_VIRIDIAN_FOREST - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_MT_MOON - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_MT_MOON - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_S_S_ANNE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_S_S_ANNE - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_UNDERGROUND_PATH - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_UNDERGROUND_PATH - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_UNDERGROUND_PATH_2 - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_UNDERGROUND_PATH_2 - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_DIGLETTS_CAVE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_DIGLETTS_CAVE - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_KANTO_VICTORY_ROAD - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_KANTO_VICTORY_ROAD - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_ROCKET_HIDEOUT - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_ROCKET_HIDEOUT - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_SILPH_CO - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_SILPH_CO - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_POKEMON_MANSION - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_POKEMON_MANSION - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_KANTO_SAFARI_ZONE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_KANTO_SAFARI_ZONE - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_POKEMON_LEAGUE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_POKEMON_LEAGUE - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_ROCK_TUNNEL - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_ROCK_TUNNEL - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_SEAFOAM_ISLANDS - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_SEAFOAM_ISLANDS - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_POKEMON_TOWER - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_POKEMON_TOWER - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_CERULEAN_CAVE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_CERULEAN_CAVE - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_POWER_PLANT - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_POWER_PLANT - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_ONE_ISLAND - MAPSECS_KANTO] = {MAP(ONE_ISLAND), SPAWN_ONE_ISLAND}, [MAPSEC_ONE_ISLAND - MAPSECS_KANTO] = {MAP(MAP_ONE_ISLAND), SPAWN_ONE_ISLAND},
[MAPSEC_TWO_ISLAND - MAPSECS_KANTO] = {MAP(TWO_ISLAND), SPAWN_TWO_ISLAND}, [MAPSEC_TWO_ISLAND - MAPSECS_KANTO] = {MAP(MAP_TWO_ISLAND), SPAWN_TWO_ISLAND},
[MAPSEC_THREE_ISLAND - MAPSECS_KANTO] = {MAP(THREE_ISLAND), SPAWN_THREE_ISLAND}, [MAPSEC_THREE_ISLAND - MAPSECS_KANTO] = {MAP(MAP_THREE_ISLAND), SPAWN_THREE_ISLAND},
[MAPSEC_FOUR_ISLAND - MAPSECS_KANTO] = {MAP(FOUR_ISLAND), SPAWN_FOUR_ISLAND}, [MAPSEC_FOUR_ISLAND - MAPSECS_KANTO] = {MAP(MAP_FOUR_ISLAND), SPAWN_FOUR_ISLAND},
[MAPSEC_FIVE_ISLAND - MAPSECS_KANTO] = {MAP(FIVE_ISLAND), SPAWN_FIVE_ISLAND}, [MAPSEC_FIVE_ISLAND - MAPSECS_KANTO] = {MAP(MAP_FIVE_ISLAND), SPAWN_FIVE_ISLAND},
[MAPSEC_SEVEN_ISLAND - MAPSECS_KANTO] = {MAP(SEVEN_ISLAND), SPAWN_SEVEN_ISLAND}, [MAPSEC_SEVEN_ISLAND - MAPSECS_KANTO] = {MAP(MAP_SEVEN_ISLAND), SPAWN_SEVEN_ISLAND},
[MAPSEC_SIX_ISLAND - MAPSECS_KANTO] = {MAP(SIX_ISLAND), SPAWN_SIX_ISLAND}, [MAPSEC_SIX_ISLAND - MAPSECS_KANTO] = {MAP(MAP_SIX_ISLAND), SPAWN_SIX_ISLAND},
[MAPSEC_KINDLE_ROAD - MAPSECS_KANTO] = {MAP(ONE_ISLAND_KINDLE_ROAD), 0}, [MAPSEC_KINDLE_ROAD - MAPSECS_KANTO] = {MAP(MAP_ONE_ISLAND_KINDLE_ROAD), 0},
[MAPSEC_TREASURE_BEACH - MAPSECS_KANTO] = {MAP(ONE_ISLAND_TREASURE_BEACH), 0}, [MAPSEC_TREASURE_BEACH - MAPSECS_KANTO] = {MAP(MAP_ONE_ISLAND_TREASURE_BEACH), 0},
[MAPSEC_CAPE_BRINK - MAPSECS_KANTO] = {MAP(TWO_ISLAND_CAPE_BRINK), 0}, [MAPSEC_CAPE_BRINK - MAPSECS_KANTO] = {MAP(MAP_TWO_ISLAND_CAPE_BRINK), 0},
[MAPSEC_BOND_BRIDGE - MAPSECS_KANTO] = {MAP(THREE_ISLAND_BOND_BRIDGE), 0}, [MAPSEC_BOND_BRIDGE - MAPSECS_KANTO] = {MAP(MAP_THREE_ISLAND_BOND_BRIDGE), 0},
[MAPSEC_THREE_ISLE_PORT - MAPSECS_KANTO] = {MAP(THREE_ISLAND_PORT), 0}, [MAPSEC_THREE_ISLE_PORT - MAPSECS_KANTO] = {MAP(MAP_THREE_ISLAND_PORT), 0},
[MAPSEC_SEVII_ISLE_6 - MAPSECS_KANTO] = {MAP(PROTOTYPE_SEVII_ISLE_6), 0}, [MAPSEC_SEVII_ISLE_6 - MAPSECS_KANTO] = {MAP(MAP_PROTOTYPE_SEVII_ISLE_6), 0},
[MAPSEC_SEVII_ISLE_7 - MAPSECS_KANTO] = {MAP(PROTOTYPE_SEVII_ISLE_7), 0}, [MAPSEC_SEVII_ISLE_7 - MAPSECS_KANTO] = {MAP(MAP_PROTOTYPE_SEVII_ISLE_7), 0},
[MAPSEC_SEVII_ISLE_8 - MAPSECS_KANTO] = {MAP(PROTOTYPE_SEVII_ISLE_8), 0}, [MAPSEC_SEVII_ISLE_8 - MAPSECS_KANTO] = {MAP(MAP_PROTOTYPE_SEVII_ISLE_8), 0},
[MAPSEC_SEVII_ISLE_9 - MAPSECS_KANTO] = {MAP(PROTOTYPE_SEVII_ISLE_9), 0}, [MAPSEC_SEVII_ISLE_9 - MAPSECS_KANTO] = {MAP(MAP_PROTOTYPE_SEVII_ISLE_9), 0},
[MAPSEC_RESORT_GORGEOUS - MAPSECS_KANTO] = {MAP(FIVE_ISLAND_RESORT_GORGEOUS), 0}, [MAPSEC_RESORT_GORGEOUS - MAPSECS_KANTO] = {MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS), 0},
[MAPSEC_WATER_LABYRINTH - MAPSECS_KANTO] = {MAP(FIVE_ISLAND_WATER_LABYRINTH), 0}, [MAPSEC_WATER_LABYRINTH - MAPSECS_KANTO] = {MAP(MAP_FIVE_ISLAND_WATER_LABYRINTH), 0},
[MAPSEC_FIVE_ISLE_MEADOW - MAPSECS_KANTO] = {MAP(FIVE_ISLAND_MEADOW), 0}, [MAPSEC_FIVE_ISLE_MEADOW - MAPSECS_KANTO] = {MAP(MAP_FIVE_ISLAND_MEADOW), 0},
[MAPSEC_MEMORIAL_PILLAR - MAPSECS_KANTO] = {MAP(FIVE_ISLAND_MEMORIAL_PILLAR), 0}, [MAPSEC_MEMORIAL_PILLAR - MAPSECS_KANTO] = {MAP(MAP_FIVE_ISLAND_MEMORIAL_PILLAR), 0},
[MAPSEC_OUTCAST_ISLAND - MAPSECS_KANTO] = {MAP(SIX_ISLAND_OUTCAST_ISLAND), 0}, [MAPSEC_OUTCAST_ISLAND - MAPSECS_KANTO] = {MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND), 0},
[MAPSEC_GREEN_PATH - MAPSECS_KANTO] = {MAP(SIX_ISLAND_GREEN_PATH), 0}, [MAPSEC_GREEN_PATH - MAPSECS_KANTO] = {MAP(MAP_SIX_ISLAND_GREEN_PATH), 0},
[MAPSEC_WATER_PATH - MAPSECS_KANTO] = {MAP(SIX_ISLAND_WATER_PATH), 0}, [MAPSEC_WATER_PATH - MAPSECS_KANTO] = {MAP(MAP_SIX_ISLAND_WATER_PATH), 0},
[MAPSEC_RUIN_VALLEY - MAPSECS_KANTO] = {MAP(SIX_ISLAND_RUIN_VALLEY), 0}, [MAPSEC_RUIN_VALLEY - MAPSECS_KANTO] = {MAP(MAP_SIX_ISLAND_RUIN_VALLEY), 0},
[MAPSEC_TRAINER_TOWER - MAPSECS_KANTO] = {MAP(SEVEN_ISLAND_TRAINER_TOWER), 0}, [MAPSEC_TRAINER_TOWER - MAPSECS_KANTO] = {MAP(MAP_SEVEN_ISLAND_TRAINER_TOWER), 0},
[MAPSEC_CANYON_ENTRANCE - MAPSECS_KANTO] = {MAP(SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE), 0}, [MAPSEC_CANYON_ENTRANCE - MAPSECS_KANTO] = {MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE), 0},
[MAPSEC_SEVAULT_CANYON - MAPSECS_KANTO] = {MAP(SEVEN_ISLAND_SEVAULT_CANYON), 0}, [MAPSEC_SEVAULT_CANYON - MAPSECS_KANTO] = {MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON), 0},
[MAPSEC_TANOBY_RUINS - MAPSECS_KANTO] = {MAP(SEVEN_ISLAND_TANOBY_RUINS), 0}, [MAPSEC_TANOBY_RUINS - MAPSECS_KANTO] = {MAP(MAP_SEVEN_ISLAND_TANOBY_RUINS), 0},
[MAPSEC_SEVII_ISLE_22 - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_SEVII_ISLE_22 - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_SEVII_ISLE_23 - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_SEVII_ISLE_23 - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_SEVII_ISLE_24 - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_SEVII_ISLE_24 - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_NAVEL_ROCK - MAPSECS_KANTO] = {MAP(NAVEL_ROCK_EXTERIOR), 0}, [MAPSEC_NAVEL_ROCK - MAPSECS_KANTO] = {MAP(MAP_NAVEL_ROCK_EXTERIOR), 0},
[MAPSEC_MT_EMBER - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_MT_EMBER - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_BERRY_FOREST - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_BERRY_FOREST - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_ICEFALL_CAVE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_ICEFALL_CAVE - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_ROCKET_WAREHOUSE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_ROCKET_WAREHOUSE - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_TRAINER_TOWER_2 - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_TRAINER_TOWER_2 - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_DOTTED_HOLE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_DOTTED_HOLE - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_LOST_CAVE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_LOST_CAVE - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_PATTERN_BUSH - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_PATTERN_BUSH - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_ALTERING_CAVE - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_ALTERING_CAVE - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_TANOBY_CHAMBERS - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_TANOBY_CHAMBERS - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_THREE_ISLE_PATH - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_THREE_ISLE_PATH - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_TANOBY_KEY - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_TANOBY_KEY - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_BIRTH_ISLAND - MAPSECS_KANTO] = {MAP(BIRTH_ISLAND_EXTERIOR), 0}, [MAPSEC_BIRTH_ISLAND - MAPSECS_KANTO] = {MAP(MAP_BIRTH_ISLAND_EXTERIOR), 0},
[MAPSEC_MONEAN_CHAMBER - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_MONEAN_CHAMBER - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_LIPTOO_CHAMBER - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_LIPTOO_CHAMBER - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_WEEPTH_CHAMBER - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_WEEPTH_CHAMBER - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_DILFORD_CHAMBER - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_DILFORD_CHAMBER - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_SCUFIB_CHAMBER - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_SCUFIB_CHAMBER - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_RIXY_CHAMBER - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_RIXY_CHAMBER - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_VIAPOIS_CHAMBER - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_VIAPOIS_CHAMBER - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
[MAPSEC_EMBER_SPA - MAPSECS_KANTO] = {MAP(PALLET_TOWN), 0}, [MAPSEC_EMBER_SPA - MAPSECS_KANTO] = {MAP(MAP_PALLET_TOWN), 0},
}; };
static void RegionMap_DarkenPalette(u16 *pal, u16 size, u16 tint) static void RegionMap_DarkenPalette(u16 *pal, u16 size, u16 tint)
@@ -3210,7 +3210,7 @@ static void GetPlayerPositionOnRegionMap_HandleOverrides(void)
case MAPSEC_UNDERGROUND_PATH: case MAPSEC_UNDERGROUND_PATH:
sMapCursor->x = 14; sMapCursor->x = 14;
sMapCursor->y = 7; sMapCursor->y = 7;
if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(UNDERGROUND_PATH_NORTH_ENTRANCE)) if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_UNDERGROUND_PATH_NORTH_ENTRANCE))
{ {
sMapCursor->x = 14; // optimized out but required to match sMapCursor->x = 14; // optimized out but required to match
sMapCursor->y = 5; sMapCursor->y = 5;
@@ -3219,7 +3219,7 @@ static void GetPlayerPositionOnRegionMap_HandleOverrides(void)
case MAPSEC_UNDERGROUND_PATH_2: case MAPSEC_UNDERGROUND_PATH_2:
sMapCursor->x = 12; sMapCursor->x = 12;
sMapCursor->y = 6; sMapCursor->y = 6;
if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(UNDERGROUND_PATH_EAST_ENTRANCE)) if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_UNDERGROUND_PATH_EAST_ENTRANCE))
{ {
sMapCursor->x = 15; sMapCursor->x = 15;
sMapCursor->y = 6; // optimized out but required to match sMapCursor->y = 6; // optimized out but required to match
@@ -3273,12 +3273,12 @@ static void GetPlayerPositionOnRegionMap_HandleOverrides(void)
sMapCursor->y = 6; sMapCursor->y = 6;
break; break;
case MAPSEC_ROUTE_2: case MAPSEC_ROUTE_2:
if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN)) if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_PALLET_TOWN))
{ {
sMapCursor->x = 4; sMapCursor->x = 4;
sMapCursor->y = 7; sMapCursor->y = 7;
} }
else if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(CERULEAN_CITY)) else if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_CERULEAN_CITY))
{ {
sMapCursor->x = 4; sMapCursor->x = 4;
sMapCursor->y = 5; sMapCursor->y = 5;
@@ -3289,19 +3289,19 @@ static void GetPlayerPositionOnRegionMap_HandleOverrides(void)
} }
break; break;
case MAPSEC_ROUTE_21: case MAPSEC_ROUTE_21:
if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE21_NORTH)) if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE21_NORTH))
{ {
sMapCursor->x = 4; sMapCursor->x = 4;
sMapCursor->y = 12; sMapCursor->y = 12;
} }
else if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE21_SOUTH)) else if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_ROUTE21_SOUTH))
{ {
sMapCursor->x = 4; sMapCursor->x = 4;
sMapCursor->y = 13; sMapCursor->y = 13;
} }
break; break;
case MAPSEC_ROUTE_5: case MAPSEC_ROUTE_5:
if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(VIRIDIAN_CITY)) if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_VIRIDIAN_CITY))
{ {
sMapCursor->x = 14; sMapCursor->x = 14;
sMapCursor->y = 5; sMapCursor->y = 5;
@@ -3312,7 +3312,7 @@ static void GetPlayerPositionOnRegionMap_HandleOverrides(void)
} }
break; break;
case MAPSEC_ROUTE_6: case MAPSEC_ROUTE_6:
if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN)) if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_PALLET_TOWN))
{ {
sMapCursor->x = 14; sMapCursor->x = 14;
sMapCursor->y = 7; sMapCursor->y = 7;
@@ -3323,7 +3323,7 @@ static void GetPlayerPositionOnRegionMap_HandleOverrides(void)
} }
break; break;
case MAPSEC_ROUTE_7: case MAPSEC_ROUTE_7:
if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN)) if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_PALLET_TOWN))
{ {
sMapCursor->x = 13; sMapCursor->x = 13;
sMapCursor->y = 6; sMapCursor->y = 6;
@@ -3334,7 +3334,7 @@ static void GetPlayerPositionOnRegionMap_HandleOverrides(void)
} }
break; break;
case MAPSEC_ROUTE_8: case MAPSEC_ROUTE_8:
if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN)) if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_PALLET_TOWN))
{ {
sMapCursor->x = 15; sMapCursor->x = 15;
sMapCursor->y = 6; sMapCursor->y = 6;
@@ -3785,15 +3785,15 @@ static bool32 IsCeladonDeptStoreMapsec(u16 mapsec)
return FALSE; return FALSE;
if (mapsec != MAPSEC_CELADON_CITY) if (mapsec != MAPSEC_CELADON_CITY)
return FALSE; return FALSE;
if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(CELADON_CITY_DEPARTMENT_STORE_1F)) if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(MAP_CELADON_CITY_DEPARTMENT_STORE_1F))
return FALSE; return FALSE;
if (gSaveBlock1Ptr->location.mapNum != MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_1F) if (gSaveBlock1Ptr->location.mapNum != MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_1F)
&& gSaveBlock1Ptr->location.mapNum != MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_2F) && gSaveBlock1Ptr->location.mapNum != MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_2F)
&& gSaveBlock1Ptr->location.mapNum != MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_3F) && gSaveBlock1Ptr->location.mapNum != MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_3F)
&& gSaveBlock1Ptr->location.mapNum != MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_4F) && gSaveBlock1Ptr->location.mapNum != MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_4F)
&& gSaveBlock1Ptr->location.mapNum != MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_5F) && gSaveBlock1Ptr->location.mapNum != MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_5F)
&& gSaveBlock1Ptr->location.mapNum != MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_ROOF) && gSaveBlock1Ptr->location.mapNum != MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_ROOF)
&& gSaveBlock1Ptr->location.mapNum != MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_ELEVATOR)) && gSaveBlock1Ptr->location.mapNum != MAP_NUM(MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR))
return FALSE; return FALSE;
return TRUE; return TRUE;
} }
src/renewable_hidden_items.c
+30 -30
View File
@@ -22,8 +22,8 @@ static void SampleRenewableItemFlags(void);
static const struct RenewableHiddenItemData sRenewableHiddenItems[] = { static const struct RenewableHiddenItemData sRenewableHiddenItems[] = {
{ {
.mapGroup = MAP_GROUP(ROUTE20), .mapGroup = MAP_GROUP(MAP_ROUTE20),
.mapNum = MAP_NUM(ROUTE20), .mapNum = MAP_NUM(MAP_ROUTE20),
.rare = { .rare = {
NO_ITEM, NO_ITEM,
NO_ITEM, NO_ITEM,
@@ -56,8 +56,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = {
} }
}, },
{ {
.mapGroup = MAP_GROUP(ROUTE21_NORTH), .mapGroup = MAP_GROUP(MAP_ROUTE21_NORTH),
.mapNum = MAP_NUM(ROUTE21_NORTH), .mapNum = MAP_NUM(MAP_ROUTE21_NORTH),
.rare = { .rare = {
NO_ITEM, NO_ITEM,
NO_ITEM, NO_ITEM,
@@ -90,8 +90,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = {
} }
}, },
{ {
.mapGroup = MAP_GROUP(UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL), .mapGroup = MAP_GROUP(MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL),
.mapNum = MAP_NUM(UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL), .mapNum = MAP_NUM(MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL),
.rare = { .rare = {
HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ETHER), HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ETHER),
NO_ITEM, NO_ITEM,
@@ -124,8 +124,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = {
} }
}, },
{ {
.mapGroup = MAP_GROUP(UNDERGROUND_PATH_EAST_WEST_TUNNEL), .mapGroup = MAP_GROUP(MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL),
.mapNum = MAP_NUM(UNDERGROUND_PATH_EAST_WEST_TUNNEL), .mapNum = MAP_NUM(MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL),
.rare = { .rare = {
HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ETHER), HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ETHER),
NO_ITEM, NO_ITEM,
@@ -158,8 +158,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = {
} }
}, },
{ {
.mapGroup = MAP_GROUP(SEVEN_ISLAND_TANOBY_RUINS), .mapGroup = MAP_GROUP(MAP_SEVEN_ISLAND_TANOBY_RUINS),
.mapNum = MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS), .mapNum = MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS),
.rare = { .rare = {
HIDDEN_ID(FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_4), HIDDEN_ID(FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_4),
HIDDEN_ID(FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE), HIDDEN_ID(FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE),
@@ -192,8 +192,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = {
} }
}, },
{ {
.mapGroup = MAP_GROUP(MT_MOON_B1F), .mapGroup = MAP_GROUP(MAP_MT_MOON_B1F),
.mapNum = MAP_NUM(MT_MOON_B1F), .mapNum = MAP_NUM(MAP_MT_MOON_B1F),
.rare = { .rare = {
HIDDEN_ID(FLAG_HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM), HIDDEN_ID(FLAG_HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM),
HIDDEN_ID(FLAG_HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_2), HIDDEN_ID(FLAG_HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_2),
@@ -226,8 +226,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = {
} }
}, },
{ {
.mapGroup = MAP_GROUP(THREE_ISLAND_BERRY_FOREST), .mapGroup = MAP_GROUP(MAP_THREE_ISLAND_BERRY_FOREST),
.mapNum = MAP_NUM(THREE_ISLAND_BERRY_FOREST), .mapNum = MAP_NUM(MAP_THREE_ISLAND_BERRY_FOREST),
.rare = { .rare = {
HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_BLUK_BERRY), HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_BLUK_BERRY),
HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_WEPEAR_BERRY), HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_WEPEAR_BERRY),
@@ -260,8 +260,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = {
} }
}, },
{ {
.mapGroup = MAP_GROUP(ONE_ISLAND_TREASURE_BEACH), .mapGroup = MAP_GROUP(MAP_ONE_ISLAND_TREASURE_BEACH),
.mapNum = MAP_NUM(ONE_ISLAND_TREASURE_BEACH), .mapNum = MAP_NUM(MAP_ONE_ISLAND_TREASURE_BEACH),
.rare = { .rare = {
HIDDEN_ID(FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL), HIDDEN_ID(FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL),
HIDDEN_ID(FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL_2), HIDDEN_ID(FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL_2),
@@ -294,8 +294,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = {
} }
}, },
{ {
.mapGroup = MAP_GROUP(THREE_ISLAND_BOND_BRIDGE), .mapGroup = MAP_GROUP(MAP_THREE_ISLAND_BOND_BRIDGE),
.mapNum = MAP_NUM(THREE_ISLAND_BOND_BRIDGE), .mapNum = MAP_NUM(MAP_THREE_ISLAND_BOND_BRIDGE),
.rare = { .rare = {
NO_ITEM, NO_ITEM,
NO_ITEM, NO_ITEM,
@@ -328,8 +328,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = {
} }
}, },
{ {
.mapGroup = MAP_GROUP(FOUR_ISLAND), .mapGroup = MAP_GROUP(MAP_FOUR_ISLAND),
.mapNum = MAP_NUM(FOUR_ISLAND), .mapNum = MAP_NUM(MAP_FOUR_ISLAND),
.rare = { .rare = {
NO_ITEM, NO_ITEM,
NO_ITEM, NO_ITEM,
@@ -362,8 +362,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = {
} }
}, },
{ {
.mapGroup = MAP_GROUP(FIVE_ISLAND_MEMORIAL_PILLAR), .mapGroup = MAP_GROUP(MAP_FIVE_ISLAND_MEMORIAL_PILLAR),
.mapNum = MAP_NUM(FIVE_ISLAND_MEMORIAL_PILLAR), .mapNum = MAP_NUM(MAP_FIVE_ISLAND_MEMORIAL_PILLAR),
.rare = { .rare = {
HIDDEN_ID(FLAG_HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BIG_PEARL), HIDDEN_ID(FLAG_HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BIG_PEARL),
NO_ITEM, NO_ITEM,
@@ -396,8 +396,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = {
} }
}, },
{ {
.mapGroup = MAP_GROUP(FIVE_ISLAND_RESORT_GORGEOUS), .mapGroup = MAP_GROUP(MAP_FIVE_ISLAND_RESORT_GORGEOUS),
.mapNum = MAP_NUM(FIVE_ISLAND_RESORT_GORGEOUS), .mapNum = MAP_NUM(MAP_FIVE_ISLAND_RESORT_GORGEOUS),
.rare = { .rare = {
HIDDEN_ID(FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_NEST_BALL), HIDDEN_ID(FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_NEST_BALL),
HIDDEN_ID(FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STAR_PIECE), HIDDEN_ID(FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STAR_PIECE),
@@ -430,8 +430,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = {
} }
}, },
{ {
.mapGroup = MAP_GROUP(SIX_ISLAND_OUTCAST_ISLAND), .mapGroup = MAP_GROUP(MAP_SIX_ISLAND_OUTCAST_ISLAND),
.mapNum = MAP_NUM(SIX_ISLAND_OUTCAST_ISLAND), .mapNum = MAP_NUM(MAP_SIX_ISLAND_OUTCAST_ISLAND),
.rare = { .rare = {
HIDDEN_ID(FLAG_HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_STAR_PIECE), HIDDEN_ID(FLAG_HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_STAR_PIECE),
HIDDEN_ID(FLAG_HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_NET_BALL), HIDDEN_ID(FLAG_HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_NET_BALL),
@@ -464,8 +464,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = {
} }
}, },
{ {
.mapGroup = MAP_GROUP(SIX_ISLAND_GREEN_PATH), .mapGroup = MAP_GROUP(MAP_SIX_ISLAND_GREEN_PATH),
.mapNum = MAP_NUM(SIX_ISLAND_GREEN_PATH), .mapNum = MAP_NUM(MAP_SIX_ISLAND_GREEN_PATH),
.rare = { .rare = {
NO_ITEM, NO_ITEM,
NO_ITEM, NO_ITEM,
@@ -498,8 +498,8 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = {
} }
}, },
{ {
.mapGroup = MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER), .mapGroup = MAP_GROUP(MAP_SEVEN_ISLAND_TRAINER_TOWER),
.mapNum = MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER), .mapNum = MAP_NUM(MAP_SEVEN_ISLAND_TRAINER_TOWER),
.rare = { .rare = {
HIDDEN_ID(FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_BIG_PEARL), HIDDEN_ID(FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_BIG_PEARL),
NO_ITEM, NO_ITEM,
src/roamer.c
+27 -27
View File
@@ -19,7 +19,7 @@ enum
EWRAM_DATA u8 sLocationHistory[3][2] = {}; EWRAM_DATA u8 sLocationHistory[3][2] = {};
EWRAM_DATA u8 sRoamerLocation[2] = {}; EWRAM_DATA u8 sRoamerLocation[2] = {};
#define ___ MAP_NUM(UNDEFINED) // For empty spots in the location table #define ___ MAP_NUM(MAP_UNDEFINED) // For empty spots in the location table
// Note: There are two potential softlocks that can occur with this table if its maps are // Note: There are two potential softlocks that can occur with this table if its maps are
// changed in particular ways. They can be avoided by ensuring the following: // changed in particular ways. They can be avoided by ensuring the following:
@@ -34,31 +34,31 @@ EWRAM_DATA u8 sRoamerLocation[2] = {};
// that map then the roamer will be significantly less likely to move away // that map then the roamer will be significantly less likely to move away
// from that map when it lands there. // from that map when it lands there.
static const u8 sRoamerLocations[][7] = { static const u8 sRoamerLocations[][7] = {
{MAP_NUM(ROUTE1), MAP_NUM(ROUTE2), MAP_NUM(ROUTE21_NORTH), MAP_NUM(ROUTE22), ___, ___, ___}, {MAP_NUM(MAP_ROUTE1), MAP_NUM(MAP_ROUTE2), MAP_NUM(MAP_ROUTE21_NORTH), MAP_NUM(MAP_ROUTE22), ___, ___, ___},
{MAP_NUM(ROUTE2), MAP_NUM(ROUTE1), MAP_NUM(ROUTE3), MAP_NUM(ROUTE22), ___, ___, ___}, {MAP_NUM(MAP_ROUTE2), MAP_NUM(MAP_ROUTE1), MAP_NUM(MAP_ROUTE3), MAP_NUM(MAP_ROUTE22), ___, ___, ___},
{MAP_NUM(ROUTE3), MAP_NUM(ROUTE2), MAP_NUM(ROUTE4), ___, ___, ___, ___}, {MAP_NUM(MAP_ROUTE3), MAP_NUM(MAP_ROUTE2), MAP_NUM(MAP_ROUTE4), ___, ___, ___, ___},
{MAP_NUM(ROUTE4), MAP_NUM(ROUTE3), MAP_NUM(ROUTE5), MAP_NUM(ROUTE9), MAP_NUM(ROUTE24), ___, ___}, {MAP_NUM(MAP_ROUTE4), MAP_NUM(MAP_ROUTE3), MAP_NUM(MAP_ROUTE5), MAP_NUM(MAP_ROUTE9), MAP_NUM(MAP_ROUTE24), ___, ___},
{MAP_NUM(ROUTE5), MAP_NUM(ROUTE4), MAP_NUM(ROUTE6), MAP_NUM(ROUTE7), MAP_NUM(ROUTE8), MAP_NUM(ROUTE9), MAP_NUM(ROUTE24)}, {MAP_NUM(MAP_ROUTE5), MAP_NUM(MAP_ROUTE4), MAP_NUM(MAP_ROUTE6), MAP_NUM(MAP_ROUTE7), MAP_NUM(MAP_ROUTE8), MAP_NUM(MAP_ROUTE9), MAP_NUM(MAP_ROUTE24)},
{MAP_NUM(ROUTE6), MAP_NUM(ROUTE5), MAP_NUM(ROUTE7), MAP_NUM(ROUTE8), MAP_NUM(ROUTE11), ___, ___}, {MAP_NUM(MAP_ROUTE6), MAP_NUM(MAP_ROUTE5), MAP_NUM(MAP_ROUTE7), MAP_NUM(MAP_ROUTE8), MAP_NUM(MAP_ROUTE11), ___, ___},
{MAP_NUM(ROUTE7), MAP_NUM(ROUTE5), MAP_NUM(ROUTE6), MAP_NUM(ROUTE8), MAP_NUM(ROUTE16), ___, ___}, {MAP_NUM(MAP_ROUTE7), MAP_NUM(MAP_ROUTE5), MAP_NUM(MAP_ROUTE6), MAP_NUM(MAP_ROUTE8), MAP_NUM(MAP_ROUTE16), ___, ___},
{MAP_NUM(ROUTE8), MAP_NUM(ROUTE5), MAP_NUM(ROUTE6), MAP_NUM(ROUTE7), MAP_NUM(ROUTE10), MAP_NUM(ROUTE12), ___}, {MAP_NUM(MAP_ROUTE8), MAP_NUM(MAP_ROUTE5), MAP_NUM(MAP_ROUTE6), MAP_NUM(MAP_ROUTE7), MAP_NUM(MAP_ROUTE10), MAP_NUM(MAP_ROUTE12), ___},
{MAP_NUM(ROUTE9), MAP_NUM(ROUTE4), MAP_NUM(ROUTE5), MAP_NUM(ROUTE10), MAP_NUM(ROUTE24), ___, ___}, {MAP_NUM(MAP_ROUTE9), MAP_NUM(MAP_ROUTE4), MAP_NUM(MAP_ROUTE5), MAP_NUM(MAP_ROUTE10), MAP_NUM(MAP_ROUTE24), ___, ___},
{MAP_NUM(ROUTE10), MAP_NUM(ROUTE8), MAP_NUM(ROUTE9), MAP_NUM(ROUTE12), ___, ___, ___}, {MAP_NUM(MAP_ROUTE10), MAP_NUM(MAP_ROUTE8), MAP_NUM(MAP_ROUTE9), MAP_NUM(MAP_ROUTE12), ___, ___, ___},
{MAP_NUM(ROUTE11), MAP_NUM(ROUTE6), MAP_NUM(ROUTE12), ___, ___, ___, ___}, {MAP_NUM(MAP_ROUTE11), MAP_NUM(MAP_ROUTE6), MAP_NUM(MAP_ROUTE12), ___, ___, ___, ___},
{MAP_NUM(ROUTE12), MAP_NUM(ROUTE10), MAP_NUM(ROUTE11), MAP_NUM(ROUTE13), ___, ___, ___}, {MAP_NUM(MAP_ROUTE12), MAP_NUM(MAP_ROUTE10), MAP_NUM(MAP_ROUTE11), MAP_NUM(MAP_ROUTE13), ___, ___, ___},
{MAP_NUM(ROUTE13), MAP_NUM(ROUTE12), MAP_NUM(ROUTE14), ___, ___, ___, ___}, {MAP_NUM(MAP_ROUTE13), MAP_NUM(MAP_ROUTE12), MAP_NUM(MAP_ROUTE14), ___, ___, ___, ___},
{MAP_NUM(ROUTE14), MAP_NUM(ROUTE13), MAP_NUM(ROUTE15), ___, ___, ___, ___}, {MAP_NUM(MAP_ROUTE14), MAP_NUM(MAP_ROUTE13), MAP_NUM(MAP_ROUTE15), ___, ___, ___, ___},
{MAP_NUM(ROUTE15), MAP_NUM(ROUTE14), MAP_NUM(ROUTE18), MAP_NUM(ROUTE19), ___, ___, ___}, {MAP_NUM(MAP_ROUTE15), MAP_NUM(MAP_ROUTE14), MAP_NUM(MAP_ROUTE18), MAP_NUM(MAP_ROUTE19), ___, ___, ___},
{MAP_NUM(ROUTE16), MAP_NUM(ROUTE7), MAP_NUM(ROUTE17), ___, ___, ___, ___}, {MAP_NUM(MAP_ROUTE16), MAP_NUM(MAP_ROUTE7), MAP_NUM(MAP_ROUTE17), ___, ___, ___, ___},
{MAP_NUM(ROUTE17), MAP_NUM(ROUTE16), MAP_NUM(ROUTE18), ___, ___, ___, ___}, {MAP_NUM(MAP_ROUTE17), MAP_NUM(MAP_ROUTE16), MAP_NUM(MAP_ROUTE18), ___, ___, ___, ___},
{MAP_NUM(ROUTE18), MAP_NUM(ROUTE15), MAP_NUM(ROUTE17), MAP_NUM(ROUTE19), ___, ___, ___}, {MAP_NUM(MAP_ROUTE18), MAP_NUM(MAP_ROUTE15), MAP_NUM(MAP_ROUTE17), MAP_NUM(MAP_ROUTE19), ___, ___, ___},
{MAP_NUM(ROUTE19), MAP_NUM(ROUTE15), MAP_NUM(ROUTE18), MAP_NUM(ROUTE20), ___, ___, ___}, {MAP_NUM(MAP_ROUTE19), MAP_NUM(MAP_ROUTE15), MAP_NUM(MAP_ROUTE18), MAP_NUM(MAP_ROUTE20), ___, ___, ___},
{MAP_NUM(ROUTE20), MAP_NUM(ROUTE19), MAP_NUM(ROUTE21_NORTH), ___, ___, ___, ___}, {MAP_NUM(MAP_ROUTE20), MAP_NUM(MAP_ROUTE19), MAP_NUM(MAP_ROUTE21_NORTH), ___, ___, ___, ___},
{MAP_NUM(ROUTE21_NORTH), MAP_NUM(ROUTE1), MAP_NUM(ROUTE20), ___, ___, ___, ___}, {MAP_NUM(MAP_ROUTE21_NORTH), MAP_NUM(MAP_ROUTE1), MAP_NUM(MAP_ROUTE20), ___, ___, ___, ___},
{MAP_NUM(ROUTE22), MAP_NUM(ROUTE1), MAP_NUM(ROUTE2), MAP_NUM(ROUTE23), ___, ___, ___}, {MAP_NUM(MAP_ROUTE22), MAP_NUM(MAP_ROUTE1), MAP_NUM(MAP_ROUTE2), MAP_NUM(MAP_ROUTE23), ___, ___, ___},
{MAP_NUM(ROUTE23), MAP_NUM(ROUTE22), MAP_NUM(ROUTE2), ___, ___, ___, ___}, {MAP_NUM(MAP_ROUTE23), MAP_NUM(MAP_ROUTE22), MAP_NUM(MAP_ROUTE2), ___, ___, ___, ___},
{MAP_NUM(ROUTE24), MAP_NUM(ROUTE4), MAP_NUM(ROUTE5), MAP_NUM(ROUTE9), ___, ___, ___}, {MAP_NUM(MAP_ROUTE24), MAP_NUM(MAP_ROUTE4), MAP_NUM(MAP_ROUTE5), MAP_NUM(MAP_ROUTE9), ___, ___, ___},
{MAP_NUM(ROUTE25), MAP_NUM(ROUTE24), MAP_NUM(ROUTE9), ___, ___, ___, ___}, {MAP_NUM(MAP_ROUTE25), MAP_NUM(MAP_ROUTE24), MAP_NUM(MAP_ROUTE9), ___, ___, ___, ___},
{___, ___, ___, ___, ___, ___, ___} {___, ___, ___, ___, ___, ___, ___}
}; };
@@ -184,7 +184,7 @@ void RoamerMove(void)
mapNum = sRoamerLocations[locSet][(Random() % (NUM_LOCATIONS_PER_SET - 1)) + 1]; mapNum = sRoamerLocations[locSet][(Random() % (NUM_LOCATIONS_PER_SET - 1)) + 1];
if (!(sLocationHistory[2][MAP_GRP] == ROAMER_MAP_GROUP if (!(sLocationHistory[2][MAP_GRP] == ROAMER_MAP_GROUP
&& sLocationHistory[2][MAP_NUM] == mapNum) && sLocationHistory[2][MAP_NUM] == mapNum)
&& mapNum != MAP_NUM(UNDEFINED)) && mapNum != MAP_NUM(MAP_UNDEFINED))
break; break;
} }
sRoamerLocation[MAP_NUM] = mapNum; sRoamerLocation[MAP_NUM] = mapNum;
src/scrcmd.c
+1 -1
View File
@@ -765,7 +765,7 @@ bool8 ScrCmd_warphole(struct ScriptContext * ctx)
u16 y; u16 y;
PlayerGetDestCoords(&x, &y); PlayerGetDestCoords(&x, &y);
if (mapGroup == MAP_GROUP(UNDEFINED) && mapNum == MAP_NUM(UNDEFINED)) if (mapGroup == MAP_GROUP(MAP_UNDEFINED) && mapNum == MAP_NUM(MAP_UNDEFINED))
SetWarpDestinationToFixedHoleWarp(x - MAP_OFFSET, y - MAP_OFFSET); SetWarpDestinationToFixedHoleWarp(x - MAP_OFFSET, y - MAP_OFFSET);
else else
SetWarpDestination(mapGroup, mapNum, WARP_ID_NONE, x - MAP_OFFSET, y - MAP_OFFSET); SetWarpDestination(mapGroup, mapNum, WARP_ID_NONE, x - MAP_OFFSET, y - MAP_OFFSET);
src/script.c
+5 -5
View File
@@ -540,9 +540,9 @@ bool32 ValidateRamScript(void)
struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data; struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data;
if (scriptData->magic != RAM_SCRIPT_MAGIC) if (scriptData->magic != RAM_SCRIPT_MAGIC)
return FALSE; return FALSE;
if (scriptData->mapGroup != MAP_GROUP(UNDEFINED)) if (scriptData->mapGroup != MAP_GROUP(MAP_UNDEFINED))
return FALSE; return FALSE;
if (scriptData->mapNum != MAP_NUM(UNDEFINED)) if (scriptData->mapNum != MAP_NUM(MAP_UNDEFINED))
return FALSE; return FALSE;
if (scriptData->objectId != 0xFF) if (scriptData->objectId != 0xFF)
return FALSE; return FALSE;
@@ -558,9 +558,9 @@ u8 *GetSavedRamScriptIfValid(void)
return NULL; return NULL;
if (scriptData->magic != RAM_SCRIPT_MAGIC) if (scriptData->magic != RAM_SCRIPT_MAGIC)
return NULL; return NULL;
if (scriptData->mapGroup != MAP_GROUP(UNDEFINED)) if (scriptData->mapGroup != MAP_GROUP(MAP_UNDEFINED))
return NULL; return NULL;
if (scriptData->mapNum != MAP_NUM(UNDEFINED)) if (scriptData->mapNum != MAP_NUM(MAP_UNDEFINED))
return NULL; return NULL;
if (scriptData->objectId != 0xFF) if (scriptData->objectId != 0xFF)
return NULL; return NULL;
@@ -579,5 +579,5 @@ void InitRamScript_NoObjectEvent(u8 *script, u16 scriptSize)
{ {
if (scriptSize > sizeof(gSaveBlock1Ptr->ramScript.data.script)) if (scriptSize > sizeof(gSaveBlock1Ptr->ramScript.data.script))
scriptSize = sizeof(gSaveBlock1Ptr->ramScript.data.script); scriptSize = sizeof(gSaveBlock1Ptr->ramScript.data.script);
InitRamScript(script, scriptSize, MAP_GROUP(UNDEFINED), MAP_NUM(UNDEFINED), 0xFF); InitRamScript(script, scriptSize, MAP_GROUP(MAP_UNDEFINED), MAP_NUM(MAP_UNDEFINED), 0xFF);
} }
src/seagallop.c
+13 -13
View File
@@ -61,17 +61,17 @@ static const struct BgTemplate sBGTemplates[] = {
static const s8 sSeag[][4] = { static const s8 sSeag[][4] = {
// Map X Y // Map X Y
[SEAGALLOP_VERMILION_CITY] = {MAP(VERMILION_CITY), 0x17, 0x20}, [SEAGALLOP_VERMILION_CITY] = {MAP(MAP_VERMILION_CITY), 0x17, 0x20},
[SEAGALLOP_ONE_ISLAND] = {MAP(ONE_ISLAND_HARBOR), 0x08, 0x05}, [SEAGALLOP_ONE_ISLAND] = {MAP(MAP_ONE_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_TWO_ISLAND] = {MAP(TWO_ISLAND_HARBOR), 0x08, 0x05}, [SEAGALLOP_TWO_ISLAND] = {MAP(MAP_TWO_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_THREE_ISLAND] = {MAP(THREE_ISLAND_HARBOR), 0x08, 0x05}, [SEAGALLOP_THREE_ISLAND] = {MAP(MAP_THREE_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_FOUR_ISLAND] = {MAP(FOUR_ISLAND_HARBOR), 0x08, 0x05}, [SEAGALLOP_FOUR_ISLAND] = {MAP(MAP_FOUR_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_FIVE_ISLAND] = {MAP(FIVE_ISLAND_HARBOR), 0x08, 0x05}, [SEAGALLOP_FIVE_ISLAND] = {MAP(MAP_FIVE_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_SIX_ISLAND] = {MAP(SIX_ISLAND_HARBOR), 0x08, 0x05}, [SEAGALLOP_SIX_ISLAND] = {MAP(MAP_SIX_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_SEVEN_ISLAND] = {MAP(SEVEN_ISLAND_HARBOR), 0x08, 0x05}, [SEAGALLOP_SEVEN_ISLAND] = {MAP(MAP_SEVEN_ISLAND_HARBOR), 0x08, 0x05},
[SEAGALLOP_CINNABAR_ISLAND] = {MAP(CINNABAR_ISLAND), 0x15, 0x07}, [SEAGALLOP_CINNABAR_ISLAND] = {MAP(MAP_CINNABAR_ISLAND), 0x15, 0x07},
[SEAGALLOP_NAVEL_ROCK] = {MAP(NAVEL_ROCK_HARBOR), 0x08, 0x05}, [SEAGALLOP_NAVEL_ROCK] = {MAP(MAP_NAVEL_ROCK_HARBOR), 0x08, 0x05},
[SEAGALLOP_BIRTH_ISLAND] = {MAP(BIRTH_ISLAND_HARBOR), 0x08, 0x05} [SEAGALLOP_BIRTH_ISLAND] = {MAP(MAP_BIRTH_ISLAND_HARBOR), 0x08, 0x05}
}; };
// Bitpacked array. In the commented section, right-most bit is the // Bitpacked array. In the commented section, right-most bit is the
@@ -495,8 +495,8 @@ u8 GetSeagallopNumber(void)
bool8 IsPlayerLeftOfVermilionSailor(void) bool8 IsPlayerLeftOfVermilionSailor(void)
{ {
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(VERMILION_CITY) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_VERMILION_CITY)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(VERMILION_CITY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_VERMILION_CITY)
&& gSaveBlock1Ptr->pos.x < 24) && gSaveBlock1Ptr->pos.x < 24)
return TRUE; return TRUE;
src/union_room.c
+6 -6
View File
@@ -1571,7 +1571,7 @@ static void Task_StartActivity(u8 taskId)
HealPlayerParty(); HealPlayerParty();
SavePlayerParty(); SavePlayerParty();
LoadPlayerBag(); LoadPlayerBag();
WarpForCableClubActivity(MAP_GROUP(BATTLE_COLOSSEUM_2P), MAP_NUM(BATTLE_COLOSSEUM_2P), 6, 8, USING_SINGLE_BATTLE); WarpForCableClubActivity(MAP_GROUP(MAP_BATTLE_COLOSSEUM_2P), MAP_NUM(MAP_BATTLE_COLOSSEUM_2P), 6, 8, USING_SINGLE_BATTLE);
SetMainCallback2(CB2_TransitionToCableClub); SetMainCallback2(CB2_TransitionToCableClub);
break; break;
case ACTIVITY_BATTLE_DOUBLE: case ACTIVITY_BATTLE_DOUBLE:
@@ -1580,7 +1580,7 @@ static void Task_StartActivity(u8 taskId)
SavePlayerParty(); SavePlayerParty();
LoadPlayerBag(); LoadPlayerBag();
CreateTrainerCardInBuffer(gBlockSendBuffer, TRUE); CreateTrainerCardInBuffer(gBlockSendBuffer, TRUE);
WarpForCableClubActivity(MAP_GROUP(BATTLE_COLOSSEUM_2P), MAP_NUM(BATTLE_COLOSSEUM_2P), 6, 8, USING_DOUBLE_BATTLE); WarpForCableClubActivity(MAP_GROUP(MAP_BATTLE_COLOSSEUM_2P), MAP_NUM(MAP_BATTLE_COLOSSEUM_2P), 6, 8, USING_DOUBLE_BATTLE);
SetMainCallback2(CB2_TransitionToCableClub); SetMainCallback2(CB2_TransitionToCableClub);
break; break;
case ACTIVITY_BATTLE_MULTI: case ACTIVITY_BATTLE_MULTI:
@@ -1589,13 +1589,13 @@ static void Task_StartActivity(u8 taskId)
SavePlayerParty(); SavePlayerParty();
LoadPlayerBag(); LoadPlayerBag();
CreateTrainerCardInBuffer(gBlockSendBuffer, TRUE); CreateTrainerCardInBuffer(gBlockSendBuffer, TRUE);
WarpForCableClubActivity(MAP_GROUP(BATTLE_COLOSSEUM_4P), MAP_NUM(BATTLE_COLOSSEUM_4P), 5, 8, USING_MULTI_BATTLE); WarpForCableClubActivity(MAP_GROUP(MAP_BATTLE_COLOSSEUM_4P), MAP_NUM(MAP_BATTLE_COLOSSEUM_4P), 5, 8, USING_MULTI_BATTLE);
SetMainCallback2(CB2_TransitionToCableClub); SetMainCallback2(CB2_TransitionToCableClub);
break; break;
case ACTIVITY_TRADE: case ACTIVITY_TRADE:
CreateTrainerCardInBuffer(gBlockSendBuffer, TRUE); CreateTrainerCardInBuffer(gBlockSendBuffer, TRUE);
CleanupOverworldWindowsAndTilemaps(); CleanupOverworldWindowsAndTilemaps();
WarpForCableClubActivity(MAP_GROUP(TRADE_CENTER), MAP_NUM(TRADE_CENTER), 5, 8, USING_TRADE_CENTER); WarpForCableClubActivity(MAP_GROUP(MAP_TRADE_CENTER), MAP_NUM(MAP_TRADE_CENTER), 5, 8, USING_TRADE_CENTER);
SetMainCallback2(CB2_TransitionToCableClub); SetMainCallback2(CB2_TransitionToCableClub);
break; break;
case ACTIVITY_TRADE | IN_UNION_ROOM: case ACTIVITY_TRADE | IN_UNION_ROOM:
@@ -4132,8 +4132,8 @@ static bool32 PollPartnerYesNoResponse(struct WirelessLink_URoom * uroom)
bool32 InUnionRoom(void) bool32 InUnionRoom(void)
{ {
return gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(UNION_ROOM) return gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_UNION_ROOM)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(UNION_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_UNION_ROOM)
? TRUE : FALSE; ? TRUE : FALSE;
} }
src/vs_seeker.c
+221 -221
View File
@@ -118,446 +118,446 @@ static bool8 ObjectEventIdIsSane(u8 objectEventId);
static u8 GetRandomFaceDirectionMovementType(); static u8 GetRandomFaceDirectionMovementType();
static const struct RematchData sRematches[] = { static const struct RematchData sRematches[] = {
{ {TRAINER_YOUNGSTER_BEN, TRAINER_YOUNGSTER_BEN_2, SKIP, TRAINER_YOUNGSTER_BEN_3, TRAINER_YOUNGSTER_BEN_4}, MAP(ROUTE3) }, { {TRAINER_YOUNGSTER_BEN, TRAINER_YOUNGSTER_BEN_2, SKIP, TRAINER_YOUNGSTER_BEN_3, TRAINER_YOUNGSTER_BEN_4}, MAP(MAP_ROUTE3) },
{ {TRAINER_YOUNGSTER_CALVIN, TRAINER_YOUNGSTER_CALVIN}, MAP(ROUTE3) }, { {TRAINER_YOUNGSTER_CALVIN, TRAINER_YOUNGSTER_CALVIN}, MAP(MAP_ROUTE3) },
{ {TRAINER_BUG_CATCHER_COLTON, TRAINER_BUG_CATCHER_COLTON_2, SKIP, TRAINER_BUG_CATCHER_COLTON_3, SKIP, TRAINER_BUG_CATCHER_COLTON_4}, { {TRAINER_BUG_CATCHER_COLTON, TRAINER_BUG_CATCHER_COLTON_2, SKIP, TRAINER_BUG_CATCHER_COLTON_3, SKIP, TRAINER_BUG_CATCHER_COLTON_4},
MAP(ROUTE3) }, MAP(MAP_ROUTE3) },
{ {TRAINER_BUG_CATCHER_GREG, TRAINER_BUG_CATCHER_GREG}, { {TRAINER_BUG_CATCHER_GREG, TRAINER_BUG_CATCHER_GREG},
MAP(ROUTE3) }, MAP(MAP_ROUTE3) },
{ {TRAINER_BUG_CATCHER_JAMES, TRAINER_BUG_CATCHER_JAMES}, { {TRAINER_BUG_CATCHER_JAMES, TRAINER_BUG_CATCHER_JAMES},
MAP(ROUTE3) }, MAP(MAP_ROUTE3) },
{ {TRAINER_LASS_JANICE, TRAINER_LASS_JANICE_2, SKIP, TRAINER_LASS_JANICE_3}, { {TRAINER_LASS_JANICE, TRAINER_LASS_JANICE_2, SKIP, TRAINER_LASS_JANICE_3},
MAP(ROUTE3) }, MAP(MAP_ROUTE3) },
{ {TRAINER_LASS_SALLY, TRAINER_LASS_SALLY}, { {TRAINER_LASS_SALLY, TRAINER_LASS_SALLY},
MAP(ROUTE3) }, MAP(MAP_ROUTE3) },
{ {TRAINER_LASS_ROBIN, TRAINER_LASS_ROBIN}, { {TRAINER_LASS_ROBIN, TRAINER_LASS_ROBIN},
MAP(ROUTE3) }, MAP(MAP_ROUTE3) },
{ {TRAINER_LASS_CRISSY, TRAINER_LASS_CRISSY}, { {TRAINER_LASS_CRISSY, TRAINER_LASS_CRISSY},
MAP(ROUTE4) }, MAP(MAP_ROUTE4) },
{ {TRAINER_YOUNGSTER_TIMMY, TRAINER_YOUNGSTER_TIMMY_2, SKIP, TRAINER_YOUNGSTER_TIMMY_3, SKIP, TRAINER_YOUNGSTER_TIMMY_4}, { {TRAINER_YOUNGSTER_TIMMY, TRAINER_YOUNGSTER_TIMMY_2, SKIP, TRAINER_YOUNGSTER_TIMMY_3, SKIP, TRAINER_YOUNGSTER_TIMMY_4},
MAP(ROUTE24) }, MAP(MAP_ROUTE24) },
{ {TRAINER_BUG_CATCHER_CALE, TRAINER_BUG_CATCHER_CALE}, { {TRAINER_BUG_CATCHER_CALE, TRAINER_BUG_CATCHER_CALE},
MAP(ROUTE24) }, MAP(MAP_ROUTE24) },
{ {TRAINER_LASS_RELI, TRAINER_LASS_RELI_2, SKIP, TRAINER_LASS_RELI_3}, { {TRAINER_LASS_RELI, TRAINER_LASS_RELI_2, SKIP, TRAINER_LASS_RELI_3},
MAP(ROUTE24) }, MAP(MAP_ROUTE24) },
{ {TRAINER_LASS_ALI, TRAINER_LASS_ALI}, { {TRAINER_LASS_ALI, TRAINER_LASS_ALI},
MAP(ROUTE24) }, MAP(MAP_ROUTE24) },
{ {TRAINER_CAMPER_SHANE, TRAINER_CAMPER_SHANE}, { {TRAINER_CAMPER_SHANE, TRAINER_CAMPER_SHANE},
MAP(ROUTE24) }, MAP(MAP_ROUTE24) },
{ {TRAINER_CAMPER_ETHAN, TRAINER_CAMPER_ETHAN}, { {TRAINER_CAMPER_ETHAN, TRAINER_CAMPER_ETHAN},
MAP(ROUTE24) }, MAP(MAP_ROUTE24) },
{ {TRAINER_YOUNGSTER_JOEY, TRAINER_YOUNGSTER_JOEY}, { {TRAINER_YOUNGSTER_JOEY, TRAINER_YOUNGSTER_JOEY},
MAP(ROUTE25) }, MAP(MAP_ROUTE25) },
{ {TRAINER_YOUNGSTER_DAN, TRAINER_YOUNGSTER_DAN}, { {TRAINER_YOUNGSTER_DAN, TRAINER_YOUNGSTER_DAN},
MAP(ROUTE25) }, MAP(MAP_ROUTE25) },
{ {TRAINER_YOUNGSTER_CHAD, TRAINER_YOUNGSTER_CHAD_2, SKIP, TRAINER_YOUNGSTER_CHAD_3, TRAINER_YOUNGSTER_CHAD_4}, { {TRAINER_YOUNGSTER_CHAD, TRAINER_YOUNGSTER_CHAD_2, SKIP, TRAINER_YOUNGSTER_CHAD_3, TRAINER_YOUNGSTER_CHAD_4},
MAP(ROUTE25) }, MAP(MAP_ROUTE25) },
{ {TRAINER_PICNICKER_KELSEY, TRAINER_PICNICKER_KELSEY_2, SKIP, TRAINER_PICNICKER_KELSEY_3, TRAINER_PICNICKER_KELSEY_4}, { {TRAINER_PICNICKER_KELSEY, TRAINER_PICNICKER_KELSEY_2, SKIP, TRAINER_PICNICKER_KELSEY_3, TRAINER_PICNICKER_KELSEY_4},
MAP(ROUTE25) }, MAP(MAP_ROUTE25) },
{ {TRAINER_LASS_HALEY, TRAINER_LASS_HALEY}, { {TRAINER_LASS_HALEY, TRAINER_LASS_HALEY},
MAP(ROUTE25) }, MAP(MAP_ROUTE25) },
{ {TRAINER_HIKER_FRANKLIN, SKIP, TRAINER_HIKER_FRANKLIN_2}, { {TRAINER_HIKER_FRANKLIN, SKIP, TRAINER_HIKER_FRANKLIN_2},
MAP(ROUTE25) }, MAP(MAP_ROUTE25) },
{ {TRAINER_HIKER_NOB, TRAINER_HIKER_NOB}, { {TRAINER_HIKER_NOB, TRAINER_HIKER_NOB},
MAP(ROUTE25) }, MAP(MAP_ROUTE25) },
{ {TRAINER_HIKER_WAYNE, TRAINER_HIKER_WAYNE}, { {TRAINER_HIKER_WAYNE, TRAINER_HIKER_WAYNE},
MAP(ROUTE25) }, MAP(MAP_ROUTE25) },
{ {TRAINER_CAMPER_FLINT, TRAINER_CAMPER_FLINT}, { {TRAINER_CAMPER_FLINT, TRAINER_CAMPER_FLINT},
MAP(ROUTE25) }, MAP(MAP_ROUTE25) },
{ {TRAINER_BUG_CATCHER_KEIGO, TRAINER_BUG_CATCHER_KEIGO}, { {TRAINER_BUG_CATCHER_KEIGO, TRAINER_BUG_CATCHER_KEIGO},
MAP(ROUTE6) }, MAP(MAP_ROUTE6) },
{ {TRAINER_BUG_CATCHER_ELIJAH, TRAINER_BUG_CATCHER_ELIJAH}, { {TRAINER_BUG_CATCHER_ELIJAH, TRAINER_BUG_CATCHER_ELIJAH},
MAP(ROUTE6) }, MAP(MAP_ROUTE6) },
{ {TRAINER_CAMPER_RICKY, TRAINER_CAMPER_RICKY_2, SKIP, TRAINER_CAMPER_RICKY_3, SKIP, TRAINER_CAMPER_RICKY_4}, { {TRAINER_CAMPER_RICKY, TRAINER_CAMPER_RICKY_2, SKIP, TRAINER_CAMPER_RICKY_3, SKIP, TRAINER_CAMPER_RICKY_4},
MAP(ROUTE6) }, MAP(MAP_ROUTE6) },
{ {TRAINER_CAMPER_JEFF, TRAINER_CAMPER_JEFF_2, SKIP, TRAINER_CAMPER_JEFF_3, SKIP, TRAINER_CAMPER_JEFF_4}, { {TRAINER_CAMPER_JEFF, TRAINER_CAMPER_JEFF_2, SKIP, TRAINER_CAMPER_JEFF_3, SKIP, TRAINER_CAMPER_JEFF_4},
MAP(ROUTE6) }, MAP(MAP_ROUTE6) },
{ {TRAINER_PICNICKER_NANCY, TRAINER_PICNICKER_NANCY}, { {TRAINER_PICNICKER_NANCY, TRAINER_PICNICKER_NANCY},
MAP(ROUTE6) }, MAP(MAP_ROUTE6) },
{ {TRAINER_PICNICKER_ISABELLE, TRAINER_PICNICKER_ISABELLE_2, SKIP, TRAINER_PICNICKER_ISABELLE_3, TRAINER_PICNICKER_ISABELLE_4}, { {TRAINER_PICNICKER_ISABELLE, TRAINER_PICNICKER_ISABELLE_2, SKIP, TRAINER_PICNICKER_ISABELLE_3, TRAINER_PICNICKER_ISABELLE_4},
MAP(ROUTE6) }, MAP(MAP_ROUTE6) },
{ {TRAINER_YOUNGSTER_EDDIE, TRAINER_YOUNGSTER_EDDIE}, { {TRAINER_YOUNGSTER_EDDIE, TRAINER_YOUNGSTER_EDDIE},
MAP(ROUTE11) }, MAP(MAP_ROUTE11) },
{ {TRAINER_YOUNGSTER_DILLON, TRAINER_YOUNGSTER_DILLON}, { {TRAINER_YOUNGSTER_DILLON, TRAINER_YOUNGSTER_DILLON},
MAP(ROUTE11) }, MAP(MAP_ROUTE11) },
{ {TRAINER_YOUNGSTER_YASU, SKIP, TRAINER_YOUNGSTER_YASU_2, SKIP, TRAINER_YOUNGSTER_YASU_3}, { {TRAINER_YOUNGSTER_YASU, SKIP, TRAINER_YOUNGSTER_YASU_2, SKIP, TRAINER_YOUNGSTER_YASU_3},
MAP(ROUTE11) }, MAP(MAP_ROUTE11) },
{ {TRAINER_YOUNGSTER_DAVE, TRAINER_YOUNGSTER_DAVE}, { {TRAINER_YOUNGSTER_DAVE, TRAINER_YOUNGSTER_DAVE},
MAP(ROUTE11) }, MAP(MAP_ROUTE11) },
{ {TRAINER_ENGINEER_BRAXTON, TRAINER_ENGINEER_BRAXTON}, { {TRAINER_ENGINEER_BRAXTON, TRAINER_ENGINEER_BRAXTON},
MAP(ROUTE11) }, MAP(MAP_ROUTE11) },
{ {TRAINER_ENGINEER_BERNIE, SKIP, SKIP, TRAINER_ENGINEER_BERNIE_2}, { {TRAINER_ENGINEER_BERNIE, SKIP, SKIP, TRAINER_ENGINEER_BERNIE_2},
MAP(ROUTE11) }, MAP(MAP_ROUTE11) },
{ {TRAINER_GAMER_HUGO, TRAINER_GAMER_HUGO}, { {TRAINER_GAMER_HUGO, TRAINER_GAMER_HUGO},
MAP(ROUTE11) }, MAP(MAP_ROUTE11) },
{ {TRAINER_GAMER_JASPER, TRAINER_GAMER_JASPER}, { {TRAINER_GAMER_JASPER, TRAINER_GAMER_JASPER},
MAP(ROUTE11) }, MAP(MAP_ROUTE11) },
{ {TRAINER_GAMER_DIRK, TRAINER_GAMER_DIRK}, { {TRAINER_GAMER_DIRK, TRAINER_GAMER_DIRK},
MAP(ROUTE11) }, MAP(MAP_ROUTE11) },
{ {TRAINER_GAMER_DARIAN, SKIP, SKIP, TRAINER_GAMER_DARIAN_2}, { {TRAINER_GAMER_DARIAN, SKIP, SKIP, TRAINER_GAMER_DARIAN_2},
MAP(ROUTE11) }, MAP(MAP_ROUTE11) },
{ {TRAINER_BUG_CATCHER_BRENT, TRAINER_BUG_CATCHER_BRENT}, { {TRAINER_BUG_CATCHER_BRENT, TRAINER_BUG_CATCHER_BRENT},
MAP(ROUTE9) }, MAP(MAP_ROUTE9) },
{ {TRAINER_BUG_CATCHER_CONNER, TRAINER_BUG_CATCHER_CONNER}, { {TRAINER_BUG_CATCHER_CONNER, TRAINER_BUG_CATCHER_CONNER},
MAP(ROUTE9) }, MAP(MAP_ROUTE9) },
{ {TRAINER_CAMPER_CHRIS, SKIP, TRAINER_CAMPER_CHRIS_2, TRAINER_CAMPER_CHRIS_3, SKIP, TRAINER_CAMPER_CHRIS_4}, { {TRAINER_CAMPER_CHRIS, SKIP, TRAINER_CAMPER_CHRIS_2, TRAINER_CAMPER_CHRIS_3, SKIP, TRAINER_CAMPER_CHRIS_4},
MAP(ROUTE9) }, MAP(MAP_ROUTE9) },
{ {TRAINER_CAMPER_DREW, TRAINER_CAMPER_DREW}, { {TRAINER_CAMPER_DREW, TRAINER_CAMPER_DREW},
MAP(ROUTE9) }, MAP(MAP_ROUTE9) },
{ {TRAINER_PICNICKER_ALICIA, SKIP, TRAINER_PICNICKER_ALICIA_2, TRAINER_PICNICKER_ALICIA_3, SKIP, TRAINER_PICNICKER_ALICIA_4}, { {TRAINER_PICNICKER_ALICIA, SKIP, TRAINER_PICNICKER_ALICIA_2, TRAINER_PICNICKER_ALICIA_3, SKIP, TRAINER_PICNICKER_ALICIA_4},
MAP(ROUTE9) }, MAP(MAP_ROUTE9) },
{ {TRAINER_PICNICKER_CAITLIN, TRAINER_PICNICKER_CAITLIN}, { {TRAINER_PICNICKER_CAITLIN, TRAINER_PICNICKER_CAITLIN},
MAP(ROUTE9) }, MAP(MAP_ROUTE9) },
{ {TRAINER_HIKER_ALAN, TRAINER_HIKER_ALAN}, { {TRAINER_HIKER_ALAN, TRAINER_HIKER_ALAN},
MAP(ROUTE9) }, MAP(MAP_ROUTE9) },
{ {TRAINER_HIKER_BRICE, TRAINER_HIKER_BRICE}, { {TRAINER_HIKER_BRICE, TRAINER_HIKER_BRICE},
MAP(ROUTE9) }, MAP(MAP_ROUTE9) },
{ {TRAINER_HIKER_JEREMY, SKIP, SKIP, TRAINER_HIKER_JEREMY_2}, { {TRAINER_HIKER_JEREMY, SKIP, SKIP, TRAINER_HIKER_JEREMY_2},
MAP(ROUTE9) }, MAP(MAP_ROUTE9) },
{ {TRAINER_PICNICKER_HEIDI, TRAINER_PICNICKER_HEIDI}, { {TRAINER_PICNICKER_HEIDI, TRAINER_PICNICKER_HEIDI},
MAP(ROUTE10) }, MAP(MAP_ROUTE10) },
{ {TRAINER_PICNICKER_CAROL, TRAINER_PICNICKER_CAROL}, { {TRAINER_PICNICKER_CAROL, TRAINER_PICNICKER_CAROL},
MAP(ROUTE10) }, MAP(MAP_ROUTE10) },
{ {TRAINER_POKEMANIAC_MARK, SKIP, SKIP, TRAINER_POKEMANIAC_MARK_2, SKIP, TRAINER_POKEMANIAC_MARK_3}, { {TRAINER_POKEMANIAC_MARK, SKIP, SKIP, TRAINER_POKEMANIAC_MARK_2, SKIP, TRAINER_POKEMANIAC_MARK_3},
MAP(ROUTE10) }, MAP(MAP_ROUTE10) },
{ {TRAINER_POKEMANIAC_HERMAN, SKIP, SKIP, TRAINER_POKEMANIAC_HERMAN_2, SKIP, TRAINER_POKEMANIAC_HERMAN_3}, { {TRAINER_POKEMANIAC_HERMAN, SKIP, SKIP, TRAINER_POKEMANIAC_HERMAN_2, SKIP, TRAINER_POKEMANIAC_HERMAN_3},
MAP(ROUTE10) }, MAP(MAP_ROUTE10) },
{ {TRAINER_HIKER_CLARK, TRAINER_HIKER_CLARK}, { {TRAINER_HIKER_CLARK, TRAINER_HIKER_CLARK},
MAP(ROUTE10) }, MAP(MAP_ROUTE10) },
{ {TRAINER_HIKER_TRENT, SKIP, SKIP, TRAINER_HIKER_TRENT_2}, { {TRAINER_HIKER_TRENT, SKIP, SKIP, TRAINER_HIKER_TRENT_2},
MAP(ROUTE10) }, MAP(MAP_ROUTE10) },
{ {TRAINER_LASS_PAIGE, TRAINER_LASS_PAIGE}, { {TRAINER_LASS_PAIGE, TRAINER_LASS_PAIGE},
MAP(ROUTE8) }, MAP(MAP_ROUTE8) },
{ {TRAINER_LASS_ANDREA, TRAINER_LASS_ANDREA}, { {TRAINER_LASS_ANDREA, TRAINER_LASS_ANDREA},
MAP(ROUTE8) }, MAP(MAP_ROUTE8) },
{ {TRAINER_LASS_MEGAN, SKIP, TRAINER_LASS_MEGAN_2, SKIP, TRAINER_LASS_MEGAN_3}, { {TRAINER_LASS_MEGAN, SKIP, TRAINER_LASS_MEGAN_2, SKIP, TRAINER_LASS_MEGAN_3},
MAP(ROUTE8) }, MAP(MAP_ROUTE8) },
{ {TRAINER_LASS_JULIA, TRAINER_LASS_JULIA}, { {TRAINER_LASS_JULIA, TRAINER_LASS_JULIA},
MAP(ROUTE8) }, MAP(MAP_ROUTE8) },
{ {TRAINER_SUPER_NERD_AIDAN, TRAINER_SUPER_NERD_AIDAN}, { {TRAINER_SUPER_NERD_AIDAN, TRAINER_SUPER_NERD_AIDAN},
MAP(ROUTE8) }, MAP(MAP_ROUTE8) },
{ {TRAINER_SUPER_NERD_GLENN, SKIP, SKIP, TRAINER_SUPER_NERD_GLENN_2}, { {TRAINER_SUPER_NERD_GLENN, SKIP, SKIP, TRAINER_SUPER_NERD_GLENN_2},
MAP(ROUTE8) }, MAP(MAP_ROUTE8) },
{ {TRAINER_SUPER_NERD_LESLIE, TRAINER_SUPER_NERD_LESLIE}, { {TRAINER_SUPER_NERD_LESLIE, TRAINER_SUPER_NERD_LESLIE},
MAP(ROUTE8) }, MAP(MAP_ROUTE8) },
{ {TRAINER_GAMER_STAN, TRAINER_GAMER_STAN}, { {TRAINER_GAMER_STAN, TRAINER_GAMER_STAN},
MAP(ROUTE8) }, MAP(MAP_ROUTE8) },
{ {TRAINER_GAMER_RICH, SKIP, SKIP, TRAINER_GAMER_RICH_2}, { {TRAINER_GAMER_RICH, SKIP, SKIP, TRAINER_GAMER_RICH_2},
MAP(ROUTE8) }, MAP(MAP_ROUTE8) },
{ {TRAINER_TWINS_ELI_ANNE, SKIP, SKIP, TRAINER_TWINS_ELI_ANNE_2}, { {TRAINER_TWINS_ELI_ANNE, SKIP, SKIP, TRAINER_TWINS_ELI_ANNE_2},
MAP(ROUTE8) }, MAP(MAP_ROUTE8) },
{ {TRAINER_BIKER_RICARDO, TRAINER_BIKER_RICARDO}, { {TRAINER_BIKER_RICARDO, TRAINER_BIKER_RICARDO},
MAP(ROUTE8) }, MAP(MAP_ROUTE8) },
{ {TRAINER_BIKER_JAREN, SKIP, SKIP, TRAINER_BIKER_JAREN_2}, { {TRAINER_BIKER_JAREN, SKIP, SKIP, TRAINER_BIKER_JAREN_2},
MAP(ROUTE8) }, MAP(MAP_ROUTE8) },
{ {TRAINER_FISHERMAN_NED, TRAINER_FISHERMAN_NED}, { {TRAINER_FISHERMAN_NED, TRAINER_FISHERMAN_NED},
MAP(ROUTE12) }, MAP(MAP_ROUTE12) },
{ {TRAINER_FISHERMAN_CHIP, TRAINER_FISHERMAN_CHIP}, { {TRAINER_FISHERMAN_CHIP, TRAINER_FISHERMAN_CHIP},
MAP(ROUTE12) }, MAP(MAP_ROUTE12) },
{ {TRAINER_FISHERMAN_HANK, TRAINER_FISHERMAN_HANK}, { {TRAINER_FISHERMAN_HANK, TRAINER_FISHERMAN_HANK},
MAP(ROUTE12) }, MAP(MAP_ROUTE12) },
{ {TRAINER_FISHERMAN_ELLIOT, SKIP, SKIP, TRAINER_FISHERMAN_ELLIOT_2}, { {TRAINER_FISHERMAN_ELLIOT, SKIP, SKIP, TRAINER_FISHERMAN_ELLIOT_2},
MAP(ROUTE12) }, MAP(MAP_ROUTE12) },
{ {TRAINER_FISHERMAN_ANDREW, TRAINER_FISHERMAN_ANDREW}, { {TRAINER_FISHERMAN_ANDREW, TRAINER_FISHERMAN_ANDREW},
MAP(ROUTE12) }, MAP(MAP_ROUTE12) },
{ {TRAINER_ROCKER_LUCA, SKIP, SKIP, TRAINER_ROCKER_LUCA_2}, { {TRAINER_ROCKER_LUCA, SKIP, SKIP, TRAINER_ROCKER_LUCA_2},
MAP(ROUTE12) }, MAP(MAP_ROUTE12) },
{ {TRAINER_CAMPER_JUSTIN, TRAINER_CAMPER_JUSTIN}, { {TRAINER_CAMPER_JUSTIN, TRAINER_CAMPER_JUSTIN},
MAP(ROUTE12) }, MAP(MAP_ROUTE12) },
{ {TRAINER_YOUNG_COUPLE_GIA_JES, SKIP, SKIP, TRAINER_YOUNG_COUPLE_GIA_JES_2, SKIP, TRAINER_YOUNG_COUPLE_GIA_JES_3}, { {TRAINER_YOUNG_COUPLE_GIA_JES, SKIP, SKIP, TRAINER_YOUNG_COUPLE_GIA_JES_2, SKIP, TRAINER_YOUNG_COUPLE_GIA_JES_3},
MAP(ROUTE12) }, MAP(MAP_ROUTE12) },
{ {TRAINER_BIKER_JARED, TRAINER_BIKER_JARED}, { {TRAINER_BIKER_JARED, TRAINER_BIKER_JARED},
MAP(ROUTE13) }, MAP(MAP_ROUTE13) },
{ {TRAINER_BEAUTY_LOLA, TRAINER_BEAUTY_LOLA}, { {TRAINER_BEAUTY_LOLA, TRAINER_BEAUTY_LOLA},
MAP(ROUTE13) }, MAP(MAP_ROUTE13) },
{ {TRAINER_BEAUTY_SHEILA, SKIP, SKIP, SKIP, TRAINER_BEAUTY_SHEILA_2}, { {TRAINER_BEAUTY_SHEILA, SKIP, SKIP, SKIP, TRAINER_BEAUTY_SHEILA_2},
MAP(ROUTE13) }, MAP(MAP_ROUTE13) },
{ {TRAINER_BIRD_KEEPER_SEBASTIAN, TRAINER_BIRD_KEEPER_SEBASTIAN}, { {TRAINER_BIRD_KEEPER_SEBASTIAN, TRAINER_BIRD_KEEPER_SEBASTIAN},
MAP(ROUTE13) }, MAP(MAP_ROUTE13) },
{ {TRAINER_BIRD_KEEPER_PERRY, TRAINER_BIRD_KEEPER_PERRY}, { {TRAINER_BIRD_KEEPER_PERRY, TRAINER_BIRD_KEEPER_PERRY},
MAP(ROUTE13) }, MAP(MAP_ROUTE13) },
{ {TRAINER_BIRD_KEEPER_ROBERT, SKIP, SKIP, TRAINER_BIRD_KEEPER_ROBERT_2, TRAINER_BIRD_KEEPER_ROBERT_3}, { {TRAINER_BIRD_KEEPER_ROBERT, SKIP, SKIP, TRAINER_BIRD_KEEPER_ROBERT_2, TRAINER_BIRD_KEEPER_ROBERT_3},
MAP(ROUTE13) }, MAP(MAP_ROUTE13) },
{ {TRAINER_PICNICKER_ALMA, TRAINER_PICNICKER_ALMA}, { {TRAINER_PICNICKER_ALMA, TRAINER_PICNICKER_ALMA},
MAP(ROUTE13) }, MAP(MAP_ROUTE13) },
{ {TRAINER_PICNICKER_SUSIE, SKIP, SKIP, TRAINER_PICNICKER_SUSIE_2, TRAINER_PICNICKER_SUSIE_3, TRAINER_PICNICKER_SUSIE_4}, { {TRAINER_PICNICKER_SUSIE, SKIP, SKIP, TRAINER_PICNICKER_SUSIE_2, TRAINER_PICNICKER_SUSIE_3, TRAINER_PICNICKER_SUSIE_4},
MAP(ROUTE13) }, MAP(MAP_ROUTE13) },
{ {TRAINER_PICNICKER_VALERIE, TRAINER_PICNICKER_VALERIE}, { {TRAINER_PICNICKER_VALERIE, TRAINER_PICNICKER_VALERIE},
MAP(ROUTE13) }, MAP(MAP_ROUTE13) },
{ {TRAINER_PICNICKER_GWEN, TRAINER_PICNICKER_GWEN}, { {TRAINER_PICNICKER_GWEN, TRAINER_PICNICKER_GWEN},
MAP(ROUTE13) }, MAP(MAP_ROUTE13) },
{ {TRAINER_BIKER_MALIK, TRAINER_BIKER_MALIK}, { {TRAINER_BIKER_MALIK, TRAINER_BIKER_MALIK},
MAP(ROUTE14) }, MAP(MAP_ROUTE14) },
{ {TRAINER_BIKER_LUKAS, SKIP, SKIP, SKIP, TRAINER_BIKER_LUKAS_2}, { {TRAINER_BIKER_LUKAS, SKIP, SKIP, SKIP, TRAINER_BIKER_LUKAS_2},
MAP(ROUTE14) }, MAP(MAP_ROUTE14) },
{ {TRAINER_BIKER_ISAAC, TRAINER_BIKER_ISAAC}, { {TRAINER_BIKER_ISAAC, TRAINER_BIKER_ISAAC},
MAP(ROUTE14) }, MAP(MAP_ROUTE14) },
{ {TRAINER_BIKER_GERALD, TRAINER_BIKER_GERALD}, { {TRAINER_BIKER_GERALD, TRAINER_BIKER_GERALD},
MAP(ROUTE14) }, MAP(MAP_ROUTE14) },
{ {TRAINER_BIRD_KEEPER_DONALD, TRAINER_BIRD_KEEPER_DONALD}, { {TRAINER_BIRD_KEEPER_DONALD, TRAINER_BIRD_KEEPER_DONALD},
MAP(ROUTE14) }, MAP(MAP_ROUTE14) },
{ {TRAINER_BIRD_KEEPER_BENNY, SKIP, SKIP, TRAINER_BIRD_KEEPER_BENNY_2, TRAINER_BIRD_KEEPER_BENNY_3}, { {TRAINER_BIRD_KEEPER_BENNY, SKIP, SKIP, TRAINER_BIRD_KEEPER_BENNY_2, TRAINER_BIRD_KEEPER_BENNY_3},
MAP(ROUTE14) }, MAP(MAP_ROUTE14) },
{ {TRAINER_BIRD_KEEPER_CARTER, TRAINER_BIRD_KEEPER_CARTER}, { {TRAINER_BIRD_KEEPER_CARTER, TRAINER_BIRD_KEEPER_CARTER},
MAP(ROUTE14) }, MAP(MAP_ROUTE14) },
{ {TRAINER_BIRD_KEEPER_MITCH, TRAINER_BIRD_KEEPER_MITCH}, { {TRAINER_BIRD_KEEPER_MITCH, TRAINER_BIRD_KEEPER_MITCH},
MAP(ROUTE14) }, MAP(MAP_ROUTE14) },
{ {TRAINER_BIRD_KEEPER_BECK, TRAINER_BIRD_KEEPER_BECK}, { {TRAINER_BIRD_KEEPER_BECK, TRAINER_BIRD_KEEPER_BECK},
MAP(ROUTE14) }, MAP(MAP_ROUTE14) },
{ {TRAINER_BIRD_KEEPER_MARLON, SKIP, SKIP, TRAINER_BIRD_KEEPER_MARLON_2, TRAINER_BIRD_KEEPER_MARLON_3}, { {TRAINER_BIRD_KEEPER_MARLON, SKIP, SKIP, TRAINER_BIRD_KEEPER_MARLON_2, TRAINER_BIRD_KEEPER_MARLON_3},
MAP(ROUTE14) }, MAP(MAP_ROUTE14) },
{ {TRAINER_TWINS_KIRI_JAN, TRAINER_TWINS_KIRI_JAN}, { {TRAINER_TWINS_KIRI_JAN, TRAINER_TWINS_KIRI_JAN},
MAP(ROUTE14) }, MAP(MAP_ROUTE14) },
{ {TRAINER_BIKER_ERNEST, TRAINER_BIKER_ERNEST}, { {TRAINER_BIKER_ERNEST, TRAINER_BIKER_ERNEST},
MAP(ROUTE15) }, MAP(MAP_ROUTE15) },
{ {TRAINER_BIKER_ALEX, TRAINER_BIKER_ALEX}, { {TRAINER_BIKER_ALEX, TRAINER_BIKER_ALEX},
MAP(ROUTE15) }, MAP(MAP_ROUTE15) },
{ {TRAINER_BEAUTY_GRACE, SKIP, SKIP, SKIP, TRAINER_BEAUTY_GRACE_2}, { {TRAINER_BEAUTY_GRACE, SKIP, SKIP, SKIP, TRAINER_BEAUTY_GRACE_2},
MAP(ROUTE15) }, MAP(MAP_ROUTE15) },
{ {TRAINER_BEAUTY_OLIVIA, TRAINER_BEAUTY_OLIVIA}, { {TRAINER_BEAUTY_OLIVIA, TRAINER_BEAUTY_OLIVIA},
MAP(ROUTE15) }, MAP(MAP_ROUTE15) },
{ {TRAINER_BIRD_KEEPER_EDWIN, TRAINER_BIRD_KEEPER_EDWIN}, { {TRAINER_BIRD_KEEPER_EDWIN, TRAINER_BIRD_KEEPER_EDWIN},
MAP(ROUTE15) }, MAP(MAP_ROUTE15) },
{ {TRAINER_BIRD_KEEPER_CHESTER, SKIP, SKIP, TRAINER_BIRD_KEEPER_CHESTER_2, TRAINER_BIRD_KEEPER_CHESTER_3}, { {TRAINER_BIRD_KEEPER_CHESTER, SKIP, SKIP, TRAINER_BIRD_KEEPER_CHESTER_2, TRAINER_BIRD_KEEPER_CHESTER_3},
MAP(ROUTE15) }, MAP(MAP_ROUTE15) },
{ {TRAINER_PICNICKER_YAZMIN, TRAINER_PICNICKER_YAZMIN}, { {TRAINER_PICNICKER_YAZMIN, TRAINER_PICNICKER_YAZMIN},
MAP(ROUTE15) }, MAP(MAP_ROUTE15) },
{ {TRAINER_PICNICKER_KINDRA, TRAINER_PICNICKER_KINDRA}, { {TRAINER_PICNICKER_KINDRA, TRAINER_PICNICKER_KINDRA},
MAP(ROUTE15) }, MAP(MAP_ROUTE15) },
{ {TRAINER_PICNICKER_BECKY, SKIP, SKIP, TRAINER_PICNICKER_BECKY_2, TRAINER_PICNICKER_BECKY_3, TRAINER_PICNICKER_BECKY_4}, { {TRAINER_PICNICKER_BECKY, SKIP, SKIP, TRAINER_PICNICKER_BECKY_2, TRAINER_PICNICKER_BECKY_3, TRAINER_PICNICKER_BECKY_4},
MAP(ROUTE15) }, MAP(MAP_ROUTE15) },
{ {TRAINER_PICNICKER_CELIA, TRAINER_PICNICKER_CELIA}, { {TRAINER_PICNICKER_CELIA, TRAINER_PICNICKER_CELIA},
MAP(ROUTE15) }, MAP(MAP_ROUTE15) },
{ {TRAINER_CRUSH_KIN_RON_MYA, SKIP, SKIP, TRAINER_CRUSH_KIN_RON_MYA_2, TRAINER_CRUSH_KIN_RON_MYA_3, TRAINER_CRUSH_KIN_RON_MYA_4}, { {TRAINER_CRUSH_KIN_RON_MYA, SKIP, SKIP, TRAINER_CRUSH_KIN_RON_MYA_2, TRAINER_CRUSH_KIN_RON_MYA_3, TRAINER_CRUSH_KIN_RON_MYA_4},
MAP(ROUTE15) }, MAP(MAP_ROUTE15) },
{ {TRAINER_BIKER_LAO, TRAINER_BIKER_LAO}, { {TRAINER_BIKER_LAO, TRAINER_BIKER_LAO},
MAP(ROUTE16) }, MAP(MAP_ROUTE16) },
{ {TRAINER_BIKER_HIDEO, TRAINER_BIKER_HIDEO}, { {TRAINER_BIKER_HIDEO, TRAINER_BIKER_HIDEO},
MAP(ROUTE16) }, MAP(MAP_ROUTE16) },
{ {TRAINER_BIKER_RUBEN, SKIP, SKIP, SKIP, TRAINER_BIKER_RUBEN_2}, { {TRAINER_BIKER_RUBEN, SKIP, SKIP, SKIP, TRAINER_BIKER_RUBEN_2},
MAP(ROUTE16) }, MAP(MAP_ROUTE16) },
{ {TRAINER_CUE_BALL_KOJI, TRAINER_CUE_BALL_KOJI}, { {TRAINER_CUE_BALL_KOJI, TRAINER_CUE_BALL_KOJI},
MAP(ROUTE16) }, MAP(MAP_ROUTE16) },
{ {TRAINER_CUE_BALL_LUKE, TRAINER_CUE_BALL_LUKE}, { {TRAINER_CUE_BALL_LUKE, TRAINER_CUE_BALL_LUKE},
MAP(ROUTE16) }, MAP(MAP_ROUTE16) },
{ {TRAINER_CUE_BALL_CAMRON, SKIP, SKIP, SKIP, TRAINER_CUE_BALL_CAMRON_2}, { {TRAINER_CUE_BALL_CAMRON, SKIP, SKIP, SKIP, TRAINER_CUE_BALL_CAMRON_2},
MAP(ROUTE16) }, MAP(MAP_ROUTE16) },
{ {TRAINER_YOUNG_COUPLE_LEA_JED, TRAINER_YOUNG_COUPLE_LEA_JED}, { {TRAINER_YOUNG_COUPLE_LEA_JED, TRAINER_YOUNG_COUPLE_LEA_JED},
MAP(ROUTE16) }, MAP(MAP_ROUTE16) },
{ {TRAINER_BIKER_BILLY, TRAINER_BIKER_BILLY}, { {TRAINER_BIKER_BILLY, TRAINER_BIKER_BILLY},
MAP(ROUTE17) }, MAP(MAP_ROUTE17) },
{ {TRAINER_BIKER_NIKOLAS, TRAINER_BIKER_NIKOLAS}, { {TRAINER_BIKER_NIKOLAS, TRAINER_BIKER_NIKOLAS},
MAP(ROUTE17) }, MAP(MAP_ROUTE17) },
{ {TRAINER_BIKER_JAXON, SKIP, SKIP, SKIP, TRAINER_BIKER_JAXON_2}, { {TRAINER_BIKER_JAXON, SKIP, SKIP, SKIP, TRAINER_BIKER_JAXON_2},
MAP(ROUTE17) }, MAP(MAP_ROUTE17) },
{ {TRAINER_BIKER_WILLIAM, TRAINER_BIKER_WILLIAM}, { {TRAINER_BIKER_WILLIAM, TRAINER_BIKER_WILLIAM},
MAP(ROUTE17) }, MAP(MAP_ROUTE17) },
{ {TRAINER_CUE_BALL_RAUL, TRAINER_CUE_BALL_RAUL}, { {TRAINER_CUE_BALL_RAUL, TRAINER_CUE_BALL_RAUL},
MAP(ROUTE17) }, MAP(MAP_ROUTE17) },
{ {TRAINER_CUE_BALL_ISAIAH, SKIP, SKIP, SKIP, TRAINER_CUE_BALL_ISAIAH_2}, { {TRAINER_CUE_BALL_ISAIAH, SKIP, SKIP, SKIP, TRAINER_CUE_BALL_ISAIAH_2},
MAP(ROUTE17) }, MAP(MAP_ROUTE17) },
{ {TRAINER_CUE_BALL_ZEEK, TRAINER_CUE_BALL_ZEEK}, { {TRAINER_CUE_BALL_ZEEK, TRAINER_CUE_BALL_ZEEK},
MAP(ROUTE17) }, MAP(MAP_ROUTE17) },
{ {TRAINER_CUE_BALL_JAMAL, TRAINER_CUE_BALL_JAMAL}, { {TRAINER_CUE_BALL_JAMAL, TRAINER_CUE_BALL_JAMAL},
MAP(ROUTE17) }, MAP(MAP_ROUTE17) },
{ {TRAINER_CUE_BALL_COREY, SKIP, SKIP, SKIP, TRAINER_CUE_BALL_COREY_2}, { {TRAINER_CUE_BALL_COREY, SKIP, SKIP, SKIP, TRAINER_CUE_BALL_COREY_2},
MAP(ROUTE17) }, MAP(MAP_ROUTE17) },
{ {TRAINER_BIKER_VIRGIL, TRAINER_BIKER_VIRGIL}, { {TRAINER_BIKER_VIRGIL, TRAINER_BIKER_VIRGIL},
MAP(ROUTE17) }, MAP(MAP_ROUTE17) },
{ {TRAINER_BIRD_KEEPER_WILTON, TRAINER_BIRD_KEEPER_WILTON}, { {TRAINER_BIRD_KEEPER_WILTON, TRAINER_BIRD_KEEPER_WILTON},
MAP(ROUTE18) }, MAP(MAP_ROUTE18) },
{ {TRAINER_BIRD_KEEPER_RAMIRO, TRAINER_BIRD_KEEPER_RAMIRO}, { {TRAINER_BIRD_KEEPER_RAMIRO, TRAINER_BIRD_KEEPER_RAMIRO},
MAP(ROUTE18) }, MAP(MAP_ROUTE18) },
{ {TRAINER_BIRD_KEEPER_JACOB, SKIP, SKIP, TRAINER_BIRD_KEEPER_JACOB_2, TRAINER_BIRD_KEEPER_JACOB_3}, { {TRAINER_BIRD_KEEPER_JACOB, SKIP, SKIP, TRAINER_BIRD_KEEPER_JACOB_2, TRAINER_BIRD_KEEPER_JACOB_3},
MAP(ROUTE18) }, MAP(MAP_ROUTE18) },
{ {TRAINER_SWIMMER_MALE_RICHARD, TRAINER_SWIMMER_MALE_RICHARD}, { {TRAINER_SWIMMER_MALE_RICHARD, TRAINER_SWIMMER_MALE_RICHARD},
MAP(ROUTE19) }, MAP(MAP_ROUTE19) },
{ {TRAINER_SWIMMER_MALE_REECE, TRAINER_SWIMMER_MALE_REECE}, { {TRAINER_SWIMMER_MALE_REECE, TRAINER_SWIMMER_MALE_REECE},
MAP(ROUTE19) }, MAP(MAP_ROUTE19) },
{ {TRAINER_SWIMMER_MALE_MATTHEW, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_MATTHEW_2}, { {TRAINER_SWIMMER_MALE_MATTHEW, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_MATTHEW_2},
MAP(ROUTE19) }, MAP(MAP_ROUTE19) },
{ {TRAINER_SWIMMER_MALE_DOUGLAS, TRAINER_SWIMMER_MALE_DOUGLAS}, { {TRAINER_SWIMMER_MALE_DOUGLAS, TRAINER_SWIMMER_MALE_DOUGLAS},
MAP(ROUTE19) }, MAP(MAP_ROUTE19) },
{ {TRAINER_SWIMMER_MALE_DAVID, TRAINER_SWIMMER_MALE_DAVID}, { {TRAINER_SWIMMER_MALE_DAVID, TRAINER_SWIMMER_MALE_DAVID},
MAP(ROUTE19) }, MAP(MAP_ROUTE19) },
{ {TRAINER_SWIMMER_MALE_TONY, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_TONY_2}, { {TRAINER_SWIMMER_MALE_TONY, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_TONY_2},
MAP(ROUTE19) }, MAP(MAP_ROUTE19) },
{ {TRAINER_SWIMMER_MALE_AXLE, TRAINER_SWIMMER_MALE_AXLE}, { {TRAINER_SWIMMER_MALE_AXLE, TRAINER_SWIMMER_MALE_AXLE},
MAP(ROUTE19) }, MAP(MAP_ROUTE19) },
{ {TRAINER_SWIMMER_FEMALE_ANYA, TRAINER_SWIMMER_FEMALE_ANYA}, { {TRAINER_SWIMMER_FEMALE_ANYA, TRAINER_SWIMMER_FEMALE_ANYA},
MAP(ROUTE19) }, MAP(MAP_ROUTE19) },
{ {TRAINER_SWIMMER_FEMALE_ALICE, SKIP, SKIP, SKIP, TRAINER_SWIMMER_FEMALE_ALICE_2}, { {TRAINER_SWIMMER_FEMALE_ALICE, SKIP, SKIP, SKIP, TRAINER_SWIMMER_FEMALE_ALICE_2},
MAP(ROUTE19) }, MAP(MAP_ROUTE19) },
{ {TRAINER_SWIMMER_FEMALE_CONNIE, TRAINER_SWIMMER_FEMALE_CONNIE}, { {TRAINER_SWIMMER_FEMALE_CONNIE, TRAINER_SWIMMER_FEMALE_CONNIE},
MAP(ROUTE19) }, MAP(MAP_ROUTE19) },
{ {TRAINER_SIS_AND_BRO_LIA_LUC, TRAINER_SIS_AND_BRO_LIA_LUC}, { {TRAINER_SIS_AND_BRO_LIA_LUC, TRAINER_SIS_AND_BRO_LIA_LUC},
MAP(ROUTE19) }, MAP(MAP_ROUTE19) },
{ {TRAINER_SWIMMER_MALE_BARRY, TRAINER_SWIMMER_MALE_BARRY}, { {TRAINER_SWIMMER_MALE_BARRY, TRAINER_SWIMMER_MALE_BARRY},
MAP(ROUTE20) }, MAP(MAP_ROUTE20) },
{ {TRAINER_SWIMMER_MALE_DEAN, TRAINER_SWIMMER_MALE_DEAN}, { {TRAINER_SWIMMER_MALE_DEAN, TRAINER_SWIMMER_MALE_DEAN},
MAP(ROUTE20) }, MAP(MAP_ROUTE20) },
{ {TRAINER_SWIMMER_MALE_DARRIN, SKIP, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_DARRIN_2}, { {TRAINER_SWIMMER_MALE_DARRIN, SKIP, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_DARRIN_2},
MAP(ROUTE20) }, MAP(MAP_ROUTE20) },
{ {TRAINER_SWIMMER_FEMALE_TIFFANY, TRAINER_SWIMMER_FEMALE_TIFFANY}, { {TRAINER_SWIMMER_FEMALE_TIFFANY, TRAINER_SWIMMER_FEMALE_TIFFANY},
MAP(ROUTE20) }, MAP(MAP_ROUTE20) },
{ {TRAINER_SWIMMER_FEMALE_NORA, TRAINER_SWIMMER_FEMALE_NORA}, { {TRAINER_SWIMMER_FEMALE_NORA, TRAINER_SWIMMER_FEMALE_NORA},
MAP(ROUTE20) }, MAP(MAP_ROUTE20) },
{ {TRAINER_SWIMMER_FEMALE_MELISSA, SKIP, SKIP, SKIP, TRAINER_SWIMMER_FEMALE_MELISSA_2}, { {TRAINER_SWIMMER_FEMALE_MELISSA, SKIP, SKIP, SKIP, TRAINER_SWIMMER_FEMALE_MELISSA_2},
MAP(ROUTE20) }, MAP(MAP_ROUTE20) },
{ {TRAINER_SWIMMER_FEMALE_SHIRLEY, TRAINER_SWIMMER_FEMALE_SHIRLEY}, { {TRAINER_SWIMMER_FEMALE_SHIRLEY, TRAINER_SWIMMER_FEMALE_SHIRLEY},
MAP(ROUTE20) }, MAP(MAP_ROUTE20) },
{ {TRAINER_BIRD_KEEPER_ROGER, TRAINER_BIRD_KEEPER_ROGER}, { {TRAINER_BIRD_KEEPER_ROGER, TRAINER_BIRD_KEEPER_ROGER},
MAP(ROUTE20) }, MAP(MAP_ROUTE20) },
{ {TRAINER_PICNICKER_MISSY, SKIP, SKIP, SKIP, TRAINER_PICNICKER_MISSY_2, TRAINER_PICNICKER_MISSY_3}, { {TRAINER_PICNICKER_MISSY, SKIP, SKIP, SKIP, TRAINER_PICNICKER_MISSY_2, TRAINER_PICNICKER_MISSY_3},
MAP(ROUTE20) }, MAP(MAP_ROUTE20) },
{ {TRAINER_PICNICKER_IRENE, TRAINER_PICNICKER_IRENE}, { {TRAINER_PICNICKER_IRENE, TRAINER_PICNICKER_IRENE},
MAP(ROUTE20) }, MAP(MAP_ROUTE20) },
{ {TRAINER_FISHERMAN_RONALD, TRAINER_FISHERMAN_RONALD}, { {TRAINER_FISHERMAN_RONALD, TRAINER_FISHERMAN_RONALD},
MAP(ROUTE21_NORTH) }, MAP(MAP_ROUTE21_NORTH) },
{ {TRAINER_FISHERMAN_CLAUDE, TRAINER_FISHERMAN_CLAUDE}, { {TRAINER_FISHERMAN_CLAUDE, TRAINER_FISHERMAN_CLAUDE},
MAP(ROUTE21_NORTH) }, MAP(MAP_ROUTE21_NORTH) },
{ {TRAINER_FISHERMAN_WADE, SKIP, SKIP, SKIP, TRAINER_FISHERMAN_WADE_2}, { {TRAINER_FISHERMAN_WADE, SKIP, SKIP, SKIP, TRAINER_FISHERMAN_WADE_2},
MAP(ROUTE21_NORTH) }, MAP(MAP_ROUTE21_NORTH) },
{ {TRAINER_FISHERMAN_NOLAN, TRAINER_FISHERMAN_NOLAN}, { {TRAINER_FISHERMAN_NOLAN, TRAINER_FISHERMAN_NOLAN},
MAP(ROUTE21_NORTH) }, MAP(MAP_ROUTE21_NORTH) },
{ {TRAINER_SWIMMER_MALE_SPENCER, TRAINER_SWIMMER_MALE_SPENCER}, { {TRAINER_SWIMMER_MALE_SPENCER, TRAINER_SWIMMER_MALE_SPENCER},
MAP(ROUTE21_NORTH) }, MAP(MAP_ROUTE21_NORTH) },
{ {TRAINER_SWIMMER_MALE_JACK, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_JACK_2}, { {TRAINER_SWIMMER_MALE_JACK, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_JACK_2},
MAP(ROUTE21_NORTH) }, MAP(MAP_ROUTE21_NORTH) },
{ {TRAINER_SWIMMER_MALE_JEROME, TRAINER_SWIMMER_MALE_JEROME}, { {TRAINER_SWIMMER_MALE_JEROME, TRAINER_SWIMMER_MALE_JEROME},
MAP(ROUTE21_NORTH) }, MAP(MAP_ROUTE21_NORTH) },
{ {TRAINER_SWIMMER_MALE_ROLAND, TRAINER_SWIMMER_MALE_ROLAND}, { {TRAINER_SWIMMER_MALE_ROLAND, TRAINER_SWIMMER_MALE_ROLAND},
MAP(ROUTE21_NORTH) }, MAP(MAP_ROUTE21_NORTH) },
{ {TRAINER_SIS_AND_BRO_LIL_IAN, SKIP, SKIP, SKIP, TRAINER_SIS_AND_BRO_LIL_IAN_2, TRAINER_SIS_AND_BRO_LIL_IAN_3}, { {TRAINER_SIS_AND_BRO_LIL_IAN, SKIP, SKIP, SKIP, TRAINER_SIS_AND_BRO_LIL_IAN_2, TRAINER_SIS_AND_BRO_LIL_IAN_3},
MAP(ROUTE21_NORTH) }, MAP(MAP_ROUTE21_NORTH) },
{ {TRAINER_SWIMMER_FEMALE_MARIA, TRAINER_SWIMMER_FEMALE_MARIA}, { {TRAINER_SWIMMER_FEMALE_MARIA, TRAINER_SWIMMER_FEMALE_MARIA},
MAP(ONE_ISLAND_KINDLE_ROAD) }, MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
{ {TRAINER_SWIMMER_FEMALE_ABIGAIL, TRAINER_SWIMMER_FEMALE_ABIGAIL}, { {TRAINER_SWIMMER_FEMALE_ABIGAIL, TRAINER_SWIMMER_FEMALE_ABIGAIL},
MAP(ONE_ISLAND_KINDLE_ROAD) }, MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
{ {TRAINER_SWIMMER_MALE_FINN, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_FINN_2}, { {TRAINER_SWIMMER_MALE_FINN, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_FINN_2},
MAP(ONE_ISLAND_KINDLE_ROAD) }, MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
{ {TRAINER_SWIMMER_MALE_GARRETT, TRAINER_SWIMMER_MALE_GARRETT}, { {TRAINER_SWIMMER_MALE_GARRETT, TRAINER_SWIMMER_MALE_GARRETT},
MAP(ONE_ISLAND_KINDLE_ROAD) }, MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
{ {TRAINER_FISHERMAN_TOMMY, TRAINER_FISHERMAN_TOMMY}, { {TRAINER_FISHERMAN_TOMMY, TRAINER_FISHERMAN_TOMMY},
MAP(ONE_ISLAND_KINDLE_ROAD) }, MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
{ {TRAINER_CRUSH_GIRL_SHARON, SKIP, SKIP, SKIP, TRAINER_CRUSH_GIRL_SHARON_2, TRAINER_CRUSH_GIRL_SHARON_3}, { {TRAINER_CRUSH_GIRL_SHARON, SKIP, SKIP, SKIP, TRAINER_CRUSH_GIRL_SHARON_2, TRAINER_CRUSH_GIRL_SHARON_3},
MAP(ONE_ISLAND_KINDLE_ROAD) }, MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
{ {TRAINER_CRUSH_GIRL_TANYA, SKIP, SKIP, SKIP, TRAINER_CRUSH_GIRL_TANYA_2, TRAINER_CRUSH_GIRL_TANYA_3}, { {TRAINER_CRUSH_GIRL_TANYA, SKIP, SKIP, SKIP, TRAINER_CRUSH_GIRL_TANYA_2, TRAINER_CRUSH_GIRL_TANYA_3},
MAP(ONE_ISLAND_KINDLE_ROAD) }, MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
{ {TRAINER_BLACK_BELT_SHEA, SKIP, SKIP, SKIP, TRAINER_BLACK_BELT_SHEA_2, TRAINER_BLACK_BELT_SHEA_3}, { {TRAINER_BLACK_BELT_SHEA, SKIP, SKIP, SKIP, TRAINER_BLACK_BELT_SHEA_2, TRAINER_BLACK_BELT_SHEA_3},
MAP(ONE_ISLAND_KINDLE_ROAD) }, MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
{ {TRAINER_BLACK_BELT_HUGH, SKIP, SKIP, SKIP, TRAINER_BLACK_BELT_HUGH_2, TRAINER_BLACK_BELT_HUGH_3}, { {TRAINER_BLACK_BELT_HUGH, SKIP, SKIP, SKIP, TRAINER_BLACK_BELT_HUGH_2, TRAINER_BLACK_BELT_HUGH_3},
MAP(ONE_ISLAND_KINDLE_ROAD) }, MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
{ {TRAINER_CAMPER_BRYCE, TRAINER_CAMPER_BRYCE}, { {TRAINER_CAMPER_BRYCE, TRAINER_CAMPER_BRYCE},
MAP(ONE_ISLAND_KINDLE_ROAD) }, MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
{ {TRAINER_PICNICKER_CLAIRE, TRAINER_PICNICKER_CLAIRE}, { {TRAINER_PICNICKER_CLAIRE, TRAINER_PICNICKER_CLAIRE},
MAP(ONE_ISLAND_KINDLE_ROAD) }, MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
{ {TRAINER_CRUSH_KIN_MIK_KIA, SKIP, SKIP, SKIP, TRAINER_CRUSH_KIN_MIK_KIA_2, TRAINER_CRUSH_KIN_MIK_KIA_3}, { {TRAINER_CRUSH_KIN_MIK_KIA, SKIP, SKIP, SKIP, TRAINER_CRUSH_KIN_MIK_KIA_2, TRAINER_CRUSH_KIN_MIK_KIA_3},
MAP(ONE_ISLAND_KINDLE_ROAD) }, MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
{ {TRAINER_SWIMMER_FEMALE_AMARA, TRAINER_SWIMMER_FEMALE_AMARA}, { {TRAINER_SWIMMER_FEMALE_AMARA, TRAINER_SWIMMER_FEMALE_AMARA},
MAP(ONE_ISLAND_TREASURE_BEACH) }, MAP(MAP_ONE_ISLAND_TREASURE_BEACH) },
{ {TRAINER_AROMA_LADY_NIKKI, TRAINER_AROMA_LADY_NIKKI}, { {TRAINER_AROMA_LADY_NIKKI, TRAINER_AROMA_LADY_NIKKI},
MAP(THREE_ISLAND_BOND_BRIDGE) }, MAP(MAP_THREE_ISLAND_BOND_BRIDGE) },
{ {TRAINER_AROMA_LADY_VIOLET, TRAINER_AROMA_LADY_VIOLET}, { {TRAINER_AROMA_LADY_VIOLET, TRAINER_AROMA_LADY_VIOLET},
MAP(THREE_ISLAND_BOND_BRIDGE) }, MAP(MAP_THREE_ISLAND_BOND_BRIDGE) },
{ {TRAINER_TUBER_AMIRA, SKIP, SKIP, SKIP, TRAINER_TUBER_AMIRA_2}, { {TRAINER_TUBER_AMIRA, SKIP, SKIP, SKIP, TRAINER_TUBER_AMIRA_2},
MAP(THREE_ISLAND_BOND_BRIDGE) }, MAP(MAP_THREE_ISLAND_BOND_BRIDGE) },
{ {TRAINER_TUBER_ALEXIS, TRAINER_TUBER_ALEXIS}, { {TRAINER_TUBER_ALEXIS, TRAINER_TUBER_ALEXIS},
MAP(THREE_ISLAND_BOND_BRIDGE) }, MAP(MAP_THREE_ISLAND_BOND_BRIDGE) },
{ {TRAINER_SWIMMER_FEMALE_TISHA, TRAINER_SWIMMER_FEMALE_TISHA}, { {TRAINER_SWIMMER_FEMALE_TISHA, TRAINER_SWIMMER_FEMALE_TISHA},
MAP(THREE_ISLAND_BOND_BRIDGE) }, MAP(MAP_THREE_ISLAND_BOND_BRIDGE) },
{ {TRAINER_TWINS_JOY_MEG, SKIP, SKIP, SKIP, TRAINER_TWINS_JOY_MEG_2}, { {TRAINER_TWINS_JOY_MEG, SKIP, SKIP, SKIP, TRAINER_TWINS_JOY_MEG_2},
MAP(THREE_ISLAND_BOND_BRIDGE) }, MAP(MAP_THREE_ISLAND_BOND_BRIDGE) },
{ {TRAINER_PAINTER_DAISY, TRAINER_PAINTER_DAISY}, { {TRAINER_PAINTER_DAISY, TRAINER_PAINTER_DAISY},
MAP(FIVE_ISLAND_RESORT_GORGEOUS) }, MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
{ {TRAINER_PAINTER_CELINA, TRAINER_PAINTER_CELINA}, { {TRAINER_PAINTER_CELINA, TRAINER_PAINTER_CELINA},
MAP(FIVE_ISLAND_RESORT_GORGEOUS) }, MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
{ {TRAINER_PAINTER_RAYNA, SKIP, SKIP, SKIP, SKIP, TRAINER_PAINTER_RAYNA_2}, { {TRAINER_PAINTER_RAYNA, SKIP, SKIP, SKIP, SKIP, TRAINER_PAINTER_RAYNA_2},
MAP(FIVE_ISLAND_RESORT_GORGEOUS) }, MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
{ {TRAINER_LADY_JACKI, TRAINER_LADY_JACKI}, { {TRAINER_LADY_JACKI, TRAINER_LADY_JACKI},
MAP(FIVE_ISLAND_RESORT_GORGEOUS) }, MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
{ {TRAINER_LADY_GILLIAN, TRAINER_LADY_GILLIAN}, { {TRAINER_LADY_GILLIAN, TRAINER_LADY_GILLIAN},
MAP(FIVE_ISLAND_RESORT_GORGEOUS) }, MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
{ {TRAINER_YOUNGSTER_DESTIN, SKIP, SKIP, SKIP, SKIP, TRAINER_YOUNGSTER_DESTIN_2}, { {TRAINER_YOUNGSTER_DESTIN, SKIP, SKIP, SKIP, SKIP, TRAINER_YOUNGSTER_DESTIN_2},
MAP(FIVE_ISLAND_RESORT_GORGEOUS) }, MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
{ {TRAINER_SWIMMER_MALE_TOBY, TRAINER_SWIMMER_MALE_TOBY}, { {TRAINER_SWIMMER_MALE_TOBY, TRAINER_SWIMMER_MALE_TOBY},
MAP(FIVE_ISLAND_RESORT_GORGEOUS) }, MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
{ {TRAINER_PKMN_BREEDER_ALIZE, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_BREEDER_ALIZE_2}, { {TRAINER_PKMN_BREEDER_ALIZE, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_BREEDER_ALIZE_2},
MAP(FIVE_ISLAND_WATER_LABYRINTH) }, MAP(MAP_FIVE_ISLAND_WATER_LABYRINTH) },
{ {TRAINER_BIRD_KEEPER_MILO, SKIP, SKIP, SKIP, SKIP, TRAINER_BIRD_KEEPER_MILO_2}, { {TRAINER_BIRD_KEEPER_MILO, SKIP, SKIP, SKIP, SKIP, TRAINER_BIRD_KEEPER_MILO_2},
MAP(FIVE_ISLAND_MEMORIAL_PILLAR) }, MAP(MAP_FIVE_ISLAND_MEMORIAL_PILLAR) },
{ {TRAINER_BIRD_KEEPER_CHAZ, SKIP, SKIP, SKIP, SKIP, TRAINER_BIRD_KEEPER_CHAZ_2}, { {TRAINER_BIRD_KEEPER_CHAZ, SKIP, SKIP, SKIP, SKIP, TRAINER_BIRD_KEEPER_CHAZ_2},
MAP(FIVE_ISLAND_MEMORIAL_PILLAR) }, MAP(MAP_FIVE_ISLAND_MEMORIAL_PILLAR) },
{ {TRAINER_BIRD_KEEPER_HAROLD, SKIP, SKIP, SKIP, SKIP, TRAINER_BIRD_KEEPER_HAROLD_2}, { {TRAINER_BIRD_KEEPER_HAROLD, SKIP, SKIP, SKIP, SKIP, TRAINER_BIRD_KEEPER_HAROLD_2},
MAP(FIVE_ISLAND_MEMORIAL_PILLAR) }, MAP(MAP_FIVE_ISLAND_MEMORIAL_PILLAR) },
{ {TRAINER_FISHERMAN_TYLOR, TRAINER_FISHERMAN_TYLOR}, { {TRAINER_FISHERMAN_TYLOR, TRAINER_FISHERMAN_TYLOR},
MAP(SIX_ISLAND_OUTCAST_ISLAND) }, MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND) },
{ {TRAINER_SWIMMER_MALE_MYMO, TRAINER_SWIMMER_MALE_MYMO}, { {TRAINER_SWIMMER_MALE_MYMO, TRAINER_SWIMMER_MALE_MYMO},
MAP(SIX_ISLAND_OUTCAST_ISLAND) }, MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND) },
{ {TRAINER_SWIMMER_FEMALE_NICOLE, SKIP, SKIP, SKIP, SKIP, TRAINER_SWIMMER_FEMALE_NICOLE_2}, { {TRAINER_SWIMMER_FEMALE_NICOLE, SKIP, SKIP, SKIP, SKIP, TRAINER_SWIMMER_FEMALE_NICOLE_2},
MAP(SIX_ISLAND_OUTCAST_ISLAND) }, MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND) },
{ {TRAINER_SIS_AND_BRO_AVA_GEB, TRAINER_SIS_AND_BRO_AVA_GEB}, { {TRAINER_SIS_AND_BRO_AVA_GEB, TRAINER_SIS_AND_BRO_AVA_GEB},
MAP(SIX_ISLAND_OUTCAST_ISLAND) }, MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND) },
{ {TRAINER_PSYCHIC_JACLYN, SKIP, SKIP, SKIP, SKIP, TRAINER_PSYCHIC_JACLYN_2}, { {TRAINER_PSYCHIC_JACLYN, SKIP, SKIP, SKIP, SKIP, TRAINER_PSYCHIC_JACLYN_2},
MAP(SIX_ISLAND_GREEN_PATH) }, MAP(MAP_SIX_ISLAND_GREEN_PATH) },
{ {TRAINER_AROMA_LADY_ROSE, TRAINER_AROMA_LADY_ROSE}, { {TRAINER_AROMA_LADY_ROSE, TRAINER_AROMA_LADY_ROSE},
MAP(SIX_ISLAND_WATER_PATH) }, MAP(MAP_SIX_ISLAND_WATER_PATH) },
{ {TRAINER_JUGGLER_EDWARD, TRAINER_JUGGLER_EDWARD}, { {TRAINER_JUGGLER_EDWARD, TRAINER_JUGGLER_EDWARD},
MAP(SIX_ISLAND_WATER_PATH) }, MAP(MAP_SIX_ISLAND_WATER_PATH) },
{ {TRAINER_SWIMMER_MALE_SAMIR, SKIP, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_SAMIR_2}, { {TRAINER_SWIMMER_MALE_SAMIR, SKIP, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_SAMIR_2},
MAP(SIX_ISLAND_WATER_PATH) }, MAP(MAP_SIX_ISLAND_WATER_PATH) },
{ {TRAINER_SWIMMER_FEMALE_DENISE, TRAINER_SWIMMER_FEMALE_DENISE}, { {TRAINER_SWIMMER_FEMALE_DENISE, TRAINER_SWIMMER_FEMALE_DENISE},
MAP(SIX_ISLAND_WATER_PATH) }, MAP(MAP_SIX_ISLAND_WATER_PATH) },
{ {TRAINER_TWINS_MIU_MIA, TRAINER_TWINS_MIU_MIA}, { {TRAINER_TWINS_MIU_MIA, TRAINER_TWINS_MIU_MIA},
MAP(SIX_ISLAND_WATER_PATH) }, MAP(MAP_SIX_ISLAND_WATER_PATH) },
{ {TRAINER_HIKER_EARL, SKIP, SKIP, SKIP, SKIP, TRAINER_HIKER_EARL_2}, { {TRAINER_HIKER_EARL, SKIP, SKIP, SKIP, SKIP, TRAINER_HIKER_EARL_2},
MAP(SIX_ISLAND_WATER_PATH) }, MAP(MAP_SIX_ISLAND_WATER_PATH) },
{ {TRAINER_RUIN_MANIAC_STANLY, TRAINER_RUIN_MANIAC_STANLY}, { {TRAINER_RUIN_MANIAC_STANLY, TRAINER_RUIN_MANIAC_STANLY},
MAP(SIX_ISLAND_RUIN_VALLEY) }, MAP(MAP_SIX_ISLAND_RUIN_VALLEY) },
{ {TRAINER_RUIN_MANIAC_FOSTER, TRAINER_RUIN_MANIAC_FOSTER}, { {TRAINER_RUIN_MANIAC_FOSTER, TRAINER_RUIN_MANIAC_FOSTER},
MAP(SIX_ISLAND_RUIN_VALLEY) }, MAP(MAP_SIX_ISLAND_RUIN_VALLEY) },
{ {TRAINER_RUIN_MANIAC_LARRY, SKIP, SKIP, SKIP, SKIP, TRAINER_RUIN_MANIAC_LARRY_2}, { {TRAINER_RUIN_MANIAC_LARRY, SKIP, SKIP, SKIP, SKIP, TRAINER_RUIN_MANIAC_LARRY_2},
MAP(SIX_ISLAND_RUIN_VALLEY) }, MAP(MAP_SIX_ISLAND_RUIN_VALLEY) },
{ {TRAINER_HIKER_DARYL, TRAINER_HIKER_DARYL}, { {TRAINER_HIKER_DARYL, TRAINER_HIKER_DARYL},
MAP(SIX_ISLAND_RUIN_VALLEY) }, MAP(MAP_SIX_ISLAND_RUIN_VALLEY) },
{ {TRAINER_POKEMANIAC_HECTOR, SKIP, SKIP, SKIP, SKIP, TRAINER_POKEMANIAC_HECTOR_2}, { {TRAINER_POKEMANIAC_HECTOR, SKIP, SKIP, SKIP, SKIP, TRAINER_POKEMANIAC_HECTOR_2},
MAP(SIX_ISLAND_RUIN_VALLEY) }, MAP(MAP_SIX_ISLAND_RUIN_VALLEY) },
{ {TRAINER_PSYCHIC_DARIO, SKIP, SKIP, SKIP, SKIP, TRAINER_PSYCHIC_DARIO_2}, { {TRAINER_PSYCHIC_DARIO, SKIP, SKIP, SKIP, SKIP, TRAINER_PSYCHIC_DARIO_2},
MAP(SEVEN_ISLAND_TRAINER_TOWER) }, MAP(MAP_SEVEN_ISLAND_TRAINER_TOWER) },
{ {TRAINER_PSYCHIC_RODETTE, SKIP, SKIP, SKIP, SKIP, TRAINER_PSYCHIC_RODETTE_2}, { {TRAINER_PSYCHIC_RODETTE, SKIP, SKIP, SKIP, SKIP, TRAINER_PSYCHIC_RODETTE_2},
MAP(SEVEN_ISLAND_TRAINER_TOWER) }, MAP(MAP_SEVEN_ISLAND_TRAINER_TOWER) },
{ {TRAINER_AROMA_LADY_MIAH, TRAINER_AROMA_LADY_MIAH}, { {TRAINER_AROMA_LADY_MIAH, TRAINER_AROMA_LADY_MIAH},
MAP(SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) }, MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) },
{ {TRAINER_YOUNG_COUPLE_EVE_JON, TRAINER_YOUNG_COUPLE_EVE_JON}, { {TRAINER_YOUNG_COUPLE_EVE_JON, TRAINER_YOUNG_COUPLE_EVE_JON},
MAP(SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) }, MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) },
{ {TRAINER_JUGGLER_MASON, SKIP, SKIP, SKIP, SKIP, TRAINER_JUGGLER_MASON_2}, { {TRAINER_JUGGLER_MASON, SKIP, SKIP, SKIP, SKIP, TRAINER_JUGGLER_MASON_2},
MAP(SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) }, MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) },
{ {TRAINER_PKMN_RANGER_NICOLAS, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_NICOLAS_2}, { {TRAINER_PKMN_RANGER_NICOLAS, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_NICOLAS_2},
MAP(SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) }, MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) },
{ {TRAINER_PKMN_RANGER_MADELINE, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_MADELINE_2}, { {TRAINER_PKMN_RANGER_MADELINE, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_MADELINE_2},
MAP(SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) }, MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) },
{ {TRAINER_CRUSH_GIRL_CYNDY, SKIP, SKIP, SKIP, SKIP, TRAINER_CRUSH_GIRL_CYNDY_2}, { {TRAINER_CRUSH_GIRL_CYNDY, SKIP, SKIP, SKIP, SKIP, TRAINER_CRUSH_GIRL_CYNDY_2},
MAP(SEVEN_ISLAND_SEVAULT_CANYON) }, MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) },
{ {TRAINER_TAMER_EVAN, SKIP, SKIP, SKIP, SKIP, TRAINER_TAMER_EVAN_2}, { {TRAINER_TAMER_EVAN, SKIP, SKIP, SKIP, SKIP, TRAINER_TAMER_EVAN_2},
MAP(SEVEN_ISLAND_SEVAULT_CANYON) }, MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) },
{ {TRAINER_PKMN_RANGER_JACKSON, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_JACKSON_2}, { {TRAINER_PKMN_RANGER_JACKSON, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_JACKSON_2},
MAP(SEVEN_ISLAND_SEVAULT_CANYON) }, MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) },
{ {TRAINER_PKMN_RANGER_KATELYN, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_KATELYN_2}, { {TRAINER_PKMN_RANGER_KATELYN, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_KATELYN_2},
MAP(SEVEN_ISLAND_SEVAULT_CANYON) }, MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) },
{ {TRAINER_COOLTRAINER_LEROY, SKIP, SKIP, SKIP, SKIP, TRAINER_COOLTRAINER_LEROY_2}, { {TRAINER_COOLTRAINER_LEROY, SKIP, SKIP, SKIP, SKIP, TRAINER_COOLTRAINER_LEROY_2},
MAP(SEVEN_ISLAND_SEVAULT_CANYON) }, MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) },
{ {TRAINER_COOLTRAINER_MICHELLE, SKIP, SKIP, SKIP, SKIP, TRAINER_COOLTRAINER_MICHELLE_2}, { {TRAINER_COOLTRAINER_MICHELLE, SKIP, SKIP, SKIP, SKIP, TRAINER_COOLTRAINER_MICHELLE_2},
MAP(SEVEN_ISLAND_SEVAULT_CANYON) }, MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) },
{ {TRAINER_COOL_COUPLE_LEX_NYA, SKIP, SKIP, SKIP, SKIP, TRAINER_COOL_COUPLE_LEX_NYA_2}, { {TRAINER_COOL_COUPLE_LEX_NYA, SKIP, SKIP, SKIP, SKIP, TRAINER_COOL_COUPLE_LEX_NYA_2},
MAP(SEVEN_ISLAND_SEVAULT_CANYON) }, MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) },
{ {TRAINER_RUIN_MANIAC_BRANDON, TRAINER_RUIN_MANIAC_BRANDON}, { {TRAINER_RUIN_MANIAC_BRANDON, TRAINER_RUIN_MANIAC_BRANDON},
MAP(SEVEN_ISLAND_TANOBY_RUINS) }, MAP(MAP_SEVEN_ISLAND_TANOBY_RUINS) },
{ {TRAINER_RUIN_MANIAC_BENJAMIN, TRAINER_RUIN_MANIAC_BENJAMIN}, { {TRAINER_RUIN_MANIAC_BENJAMIN, TRAINER_RUIN_MANIAC_BENJAMIN},
MAP(SEVEN_ISLAND_TANOBY_RUINS) }, MAP(MAP_SEVEN_ISLAND_TANOBY_RUINS) },
{ {TRAINER_PAINTER_EDNA, TRAINER_PAINTER_EDNA}, { {TRAINER_PAINTER_EDNA, TRAINER_PAINTER_EDNA},
MAP(SEVEN_ISLAND_TANOBY_RUINS) }, MAP(MAP_SEVEN_ISLAND_TANOBY_RUINS) },
{ {TRAINER_GENTLEMAN_CLIFFORD, TRAINER_GENTLEMAN_CLIFFORD}, { {TRAINER_GENTLEMAN_CLIFFORD, TRAINER_GENTLEMAN_CLIFFORD},
MAP(SEVEN_ISLAND_TANOBY_RUINS) }, MAP(MAP_SEVEN_ISLAND_TANOBY_RUINS) },
}; };
static const u8 sMovementScript_Wait48[] = { static const u8 sMovementScript_Wait48[] = {
src/wild_encounter.c
+12 -12
View File
@@ -180,14 +180,14 @@ static u16 GetCurrentMapWildMonHeaderId(void)
for (i = 0; ; i++) for (i = 0; ; i++)
{ {
const struct WildPokemonHeader * wildHeader = &gWildMonHeaders[i]; const struct WildPokemonHeader * wildHeader = &gWildMonHeaders[i];
if (wildHeader->mapGroup == MAP_GROUP(UNDEFINED)) if (wildHeader->mapGroup == MAP_GROUP(MAP_UNDEFINED))
break; break;
if (gWildMonHeaders[i].mapGroup == gSaveBlock1Ptr->location.mapGroup && if (gWildMonHeaders[i].mapGroup == gSaveBlock1Ptr->location.mapGroup &&
gWildMonHeaders[i].mapNum == gSaveBlock1Ptr->location.mapNum) gWildMonHeaders[i].mapNum == gSaveBlock1Ptr->location.mapNum)
{ {
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SIX_ISLAND_ALTERING_CAVE) && if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_SIX_ISLAND_ALTERING_CAVE) &&
gSaveBlock1Ptr->location.mapNum == MAP_NUM(SIX_ISLAND_ALTERING_CAVE)) gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SIX_ISLAND_ALTERING_CAVE))
{ {
u16 alteringCaveId = VarGet(VAR_ALTERING_CAVE_WILD_SET); u16 alteringCaveId = VarGet(VAR_ALTERING_CAVE_WILD_SET);
if (alteringCaveId >= NUM_ALTERING_CAVE_TABLES) if (alteringCaveId >= NUM_ALTERING_CAVE_TABLES)
@@ -209,15 +209,15 @@ static bool8 UnlockedTanobyOrAreNotInTanoby(void)
{ {
if (FlagGet(FLAG_SYS_UNLOCKED_TANOBY_RUINS)) if (FlagGet(FLAG_SYS_UNLOCKED_TANOBY_RUINS))
return TRUE; return TRUE;
if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER)) if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(MAP_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER))
return TRUE; return TRUE;
if (!(gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER) if (!(gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER)
|| gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER)
)) ))
return TRUE; return TRUE;
return FALSE; return FALSE;
@@ -234,7 +234,7 @@ static void GenerateWildMon(u16 species, u8 level, u8 slot)
} }
else else
{ {
chamber = gSaveBlock1Ptr->location.mapNum - MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER); chamber = gSaveBlock1Ptr->location.mapNum - MAP_NUM(MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER);
personality = GenerateUnownPersonalityByLetter(sUnownLetterSlots[chamber][slot]); personality = GenerateUnownPersonalityByLetter(sUnownLetterSlots[chamber][slot]);
CreateMon(&gEnemyParty[0], species, level, USE_RANDOM_IVS, TRUE, personality, FALSE, 0); CreateMon(&gEnemyParty[0], species, level, USE_RANDOM_IVS, TRUE, personality, FALSE, 0);
} }
src/wild_pokemon_area.c
+1 -1
View File
@@ -181,7 +181,7 @@ s32 GetSpeciesPokedexAreaMarkers(u16 species, struct Subsprite * subsprites)
alteringCaveNum = VarGet(VAR_ALTERING_CAVE_WILD_SET); alteringCaveNum = VarGet(VAR_ALTERING_CAVE_WILD_SET);
if (alteringCaveNum >= NUM_ALTERING_CAVE_TABLES) if (alteringCaveNum >= NUM_ALTERING_CAVE_TABLES)
alteringCaveNum = 0; alteringCaveNum = 0;
for (i = 0, areaCount = 0; gWildMonHeaders[i].mapGroup != MAP_GROUP(UNDEFINED); i++) for (i = 0, areaCount = 0; gWildMonHeaders[i].mapGroup != MAP_GROUP(MAP_UNDEFINED); i++)
{ {
mapSecId = GetMapSecIdFromWildMonHeader(&gWildMonHeaders[i]); mapSecId = GetMapSecIdFromWildMonHeader(&gWildMonHeaders[i]);
if (mapSecId == MAPSEC_ALTERING_CAVE) if (mapSecId == MAPSEC_ALTERING_CAVE)