From dd5f6ccd3b14281952c4183a988e10968faaeed1 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 5 Feb 2022 13:42:46 -0500 Subject: [PATCH 1/3] Add union for clone objects --- include/global.fieldmap.h | 40 +++++++++++++++++++---------- src/event_object_movement.c | 50 ++++++++++++++++++------------------- src/field_player_avatar.c | 12 ++++----- src/overworld.c | 18 ++++++------- src/quest_log.c | 8 +++--- src/quest_log_objects.c | 4 +-- src/vs_seeker.c | 18 +++++++------ 7 files changed, 83 insertions(+), 67 deletions(-) diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 7ab2c12e4..520f06738 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -83,21 +83,35 @@ struct BackupMapLayout u16 *map; }; +#define OBJ_KIND_NORMAL 0 +#define OBJ_KIND_CLONE 255 + struct ObjectEventTemplate { - /*0x00*/ u8 localId; - /*0x01*/ u8 graphicsId; - /*0x02*/ u8 inConnection; - /*0x04*/ s16 x; - /*0x06*/ s16 y; - /*0x08*/ u8 elevation; - /*0x09*/ u8 movementType; - /*0x0A*/ u16 movementRangeX:4; - u16 movementRangeY:4; - /*0x0C*/ u16 trainerType; - /*0x0E*/ u16 trainerRange_berryTreeId; - /*0x10*/ const u8 *script; - /*0x14*/ u16 flagId; + u8 localId; + u8 graphicsId; + u8 kind; // The "kind" field determines how to access objUnion union below. + s16 x, y; + union { + struct { + u8 elevation; + u8 movementType; + u16 movementRangeX:4; + u16 movementRangeY:4; + u16 trainerType; + u16 trainerRange_berryTreeId; + } normal; + struct { + u8 targetLocalId; + u8 padding1; + u16 padding2:4; + u16 padding3:4; + u16 targetMapNum; + u16 targetMapGroup; + } clone; + } objUnion; + const u8 *script; + u16 flagId; }; /*size = 0x18*/ struct WarpEvent diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 52fb0c078..2da251912 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1322,7 +1322,7 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template, const struct MapHeader *mapHeader; u8 objectEventId; u8 var0; - u8 elevation; + u8 localId; s16 x; s16 y; s16 x2; @@ -1331,24 +1331,24 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template, s16 y3; var0 = 0; - elevation = 0; + localId = 0; x2 = 0; y2 = 0; x3 = 0; y3 = 0; - if (template->inConnection == 0xFF) + if (template->kind == OBJ_KIND_CLONE) { var0 = 1; - elevation = template->elevation; - mapNum = template->trainerType; - mapGroup = template->trainerRange_berryTreeId & 0xFF; + localId = template->objUnion.clone.targetLocalId; + mapNum = template->objUnion.clone.targetMapNum; + mapGroup = template->objUnion.clone.targetMapGroup & 0xFF; x2 = template->x; y2 = template->y; x3 = template->x; y3 = template->y; mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum); - template = &(mapHeader->events->objectEvents[elevation - 1]); + template = &(mapHeader->events->objectEvents[localId - 1]); } if (GetAvailableObjectEventId(template->localId, mapNum, mapGroup, &objectEventId) || !sub_805E238(template, var0, x3, y3)) @@ -1368,7 +1368,7 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template, objectEvent->active = TRUE; objectEvent->triggerGroundEffectsOnMove = TRUE; objectEvent->graphicsId = template->graphicsId; - objectEvent->movementType = template->movementType; + objectEvent->movementType = template->objUnion.normal.movementType; objectEvent->localId = template->localId; objectEvent->mapNum = mapNum; objectEvent->mapGroup = mapGroup; @@ -1378,14 +1378,14 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template, objectEvent->currentCoords.y = y; objectEvent->previousCoords.x = x; objectEvent->previousCoords.y = y; - objectEvent->currentElevation = template->elevation; - objectEvent->previousElevation = template->elevation; - objectEvent->rangeX = template->movementRangeX; - objectEvent->rangeY = template->movementRangeY; - objectEvent->trainerType = template->trainerType; - objectEvent->trainerRange_berryTreeId = template->trainerRange_berryTreeId; + objectEvent->currentElevation = template->objUnion.normal.elevation; + objectEvent->previousElevation = template->objUnion.normal.elevation; + objectEvent->rangeX = template->objUnion.normal.movementRangeX; + objectEvent->rangeY = template->objUnion.normal.movementRangeY; + objectEvent->trainerType = template->objUnion.normal.trainerType; + objectEvent->trainerRange_berryTreeId = template->objUnion.normal.trainerRange_berryTreeId; objectEvent->mapNum = mapNum; // oops (yes this is required for matching) - objectEvent->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType]; + objectEvent->previousMovementDirection = gInitialMovementTypeFacingDirections[template->objUnion.normal.movementType]; SetObjectEventDirection(objectEvent, objectEvent->previousMovementDirection); SetObjectEventDynamicGraphicsId(objectEvent); if (gRangedMovementTypes[objectEvent->movementType]) @@ -1675,15 +1675,15 @@ int SpawnSpecialObjectEventParameterized(u8 graphicsId, u8 movementBehavior, u8 y -= 7; objectEventTemplate.localId = localId; objectEventTemplate.graphicsId = graphicsId; - objectEventTemplate.inConnection = 0; + objectEventTemplate.kind = OBJ_KIND_NORMAL; objectEventTemplate.x = x; objectEventTemplate.y = y; - objectEventTemplate.elevation = z; - objectEventTemplate.movementType = movementBehavior; - objectEventTemplate.movementRangeX = 0; - objectEventTemplate.movementRangeY = 0; - objectEventTemplate.trainerType = 0; - objectEventTemplate.trainerRange_berryTreeId = 0; + objectEventTemplate.objUnion.normal.elevation = z; + objectEventTemplate.objUnion.normal.movementType = movementBehavior; + objectEventTemplate.objUnion.normal.movementRangeX = 0; + objectEventTemplate.objUnion.normal.movementRangeY = 0; + objectEventTemplate.objUnion.normal.trainerType = 0; + objectEventTemplate.objUnion.normal.trainerRange_berryTreeId = 0; return SpawnSpecialObjectEvent(&objectEventTemplate); } @@ -1729,7 +1729,7 @@ static void MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex(u16 g static void MakeObjectTemplateFromObjectEventTemplate(struct ObjectEventTemplate *objectEventTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) { - MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex(objectEventTemplate->graphicsId, objectEventTemplate->movementType, spriteTemplate, subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex(objectEventTemplate->graphicsId, objectEventTemplate->objUnion.normal.movementType, spriteTemplate, subspriteTables); } u8 AddPseudoObjectEvent(u16 graphicsId, SpriteCallback callback, s16 x, s16 y, u8 subpriority) @@ -2588,7 +2588,7 @@ u8 sub_805FC9C(u8 localId, u8 mapNum, u8 mapGroup) u16 GetObjectEventFlagByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - return GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->trainerType; + return GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->objUnion.normal.trainerType; } u8 sub_808F0BC(u8 objectEventId) @@ -2683,7 +2683,7 @@ void OverrideMovementTypeForObjectEvent(const struct ObjectEvent *objectEvent, u objectEventTemplate = GetBaseTemplateForObjectEvent(objectEvent); if (objectEventTemplate != NULL) { - objectEventTemplate->movementType = movementType; + objectEventTemplate->objUnion.normal.movementType = movementType; } } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 16426cdc4..059ec1094 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1291,12 +1291,12 @@ void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) playerObjEventTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_GFX_NORMAL, gender); playerObjEventTemplate.x = x - 7; playerObjEventTemplate.y = y - 7; - playerObjEventTemplate.elevation = 0; - playerObjEventTemplate.movementType = MOVEMENT_TYPE_PLAYER; - playerObjEventTemplate.movementRangeX = 0; - playerObjEventTemplate.movementRangeY = 0; - playerObjEventTemplate.trainerType = 0; - playerObjEventTemplate.trainerRange_berryTreeId = 0; + playerObjEventTemplate.objUnion.normal.elevation = 0; + playerObjEventTemplate.objUnion.normal.movementType = MOVEMENT_TYPE_PLAYER; + playerObjEventTemplate.objUnion.normal.movementRangeX = 0; + playerObjEventTemplate.objUnion.normal.movementRangeY = 0; + playerObjEventTemplate.objUnion.normal.trainerType = 0; + playerObjEventTemplate.objUnion.normal.trainerRange_berryTreeId = 0; playerObjEventTemplate.script = NULL; playerObjEventTemplate.flagId = 0; objectEventId = SpawnSpecialObjectEvent(&playerObjEventTemplate); diff --git a/src/overworld.c b/src/overworld.c index cb5507b4c..89bf5d785 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -403,22 +403,22 @@ static void LoadObjEventTemplatesFromHeader(void) u8 i, j; for (i = 0, j = 0; i < gMapHeader.events->objectEventCount; i++) { - if (gMapHeader.events->objectEvents[i].inConnection == 0xFF) + if (gMapHeader.events->objectEvents[i].kind == OBJ_KIND_CLONE) { // load "in_connection" object from the connecting map - u8 localId = gMapHeader.events->objectEvents[i].elevation; - u8 mapNum = gMapHeader.events->objectEvents[i].trainerType; - u8 mapGroup = gMapHeader.events->objectEvents[i].trainerRange_berryTreeId; + u8 localId = gMapHeader.events->objectEvents[i].objUnion.clone.targetLocalId; + u8 mapNum = gMapHeader.events->objectEvents[i].objUnion.clone.targetMapNum; + u8 mapGroup = gMapHeader.events->objectEvents[i].objUnion.clone.targetMapGroup; const struct MapHeader * connectionMap = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum); gSaveBlock1Ptr->objectEventTemplates[j] = connectionMap->events->objectEvents[localId - 1]; gSaveBlock1Ptr->objectEventTemplates[j].localId = gMapHeader.events->objectEvents[i].localId; gSaveBlock1Ptr->objectEventTemplates[j].x = gMapHeader.events->objectEvents[i].x; gSaveBlock1Ptr->objectEventTemplates[j].y = gMapHeader.events->objectEvents[i].y; - gSaveBlock1Ptr->objectEventTemplates[j].elevation = localId; - gSaveBlock1Ptr->objectEventTemplates[j].trainerType = mapNum; - gSaveBlock1Ptr->objectEventTemplates[j].trainerRange_berryTreeId = mapGroup; - gSaveBlock1Ptr->objectEventTemplates[j].inConnection = 0xFF; + gSaveBlock1Ptr->objectEventTemplates[j].objUnion.clone.targetLocalId = localId; + gSaveBlock1Ptr->objectEventTemplates[j].objUnion.clone.targetMapNum = mapNum; + gSaveBlock1Ptr->objectEventTemplates[j].objUnion.clone.targetMapGroup = mapGroup; + gSaveBlock1Ptr->objectEventTemplates[j].kind = OBJ_KIND_CLONE; j++; } else @@ -466,7 +466,7 @@ void Overworld_SetObjEventTemplateMovementType(u8 localId, u8 movementType) struct ObjectEventTemplate *objectEventTemplate = &savObjTemplates[i]; if (objectEventTemplate->localId == localId) { - objectEventTemplate->movementType = movementType; + objectEventTemplate->objUnion.normal.movementType = movementType; return; } } diff --git a/src/quest_log.c b/src/quest_log.c index 0032872fd..4f7c5866f 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -335,8 +335,8 @@ static void SetNPCInitialCoordsAtScene(u8 sceneNum) questLog->npcData[i].y = (u8)gSaveBlock1Ptr->objectEventTemplates[i].y; questLog->npcData[i].negy = FALSE; } - questLog->npcData[i].elevation = gSaveBlock1Ptr->objectEventTemplates[i].elevation; - questLog->npcData[i].movementType = gSaveBlock1Ptr->objectEventTemplates[i].movementType; + questLog->npcData[i].elevation = gSaveBlock1Ptr->objectEventTemplates[i].objUnion.normal.elevation; + questLog->npcData[i].movementType = gSaveBlock1Ptr->objectEventTemplates[i].objUnion.normal.movementType; } } @@ -525,8 +525,8 @@ static void QuestLogPlaybackSetObjectEventTemplates(u8 sceneNum) gSaveBlock1Ptr->objectEventTemplates[i].y = -(u8)questLog->npcData[i].y; else gSaveBlock1Ptr->objectEventTemplates[i].y = questLog->npcData[i].y; - gSaveBlock1Ptr->objectEventTemplates[i].elevation = questLog->npcData[i].elevation; - gSaveBlock1Ptr->objectEventTemplates[i].movementType = questLog->npcData[i].movementType; + gSaveBlock1Ptr->objectEventTemplates[i].objUnion.normal.elevation = questLog->npcData[i].elevation; + gSaveBlock1Ptr->objectEventTemplates[i].objUnion.normal.movementType = questLog->npcData[i].movementType; } SetSav1ObjectEventsFromQuestLog(questLog, gSaveBlock1Ptr->objectEventTemplates); diff --git a/src/quest_log_objects.c b/src/quest_log_objects.c index 47d328405..27f32b450 100644 --- a/src/quest_log_objects.c +++ b/src/quest_log_objects.c @@ -93,8 +93,8 @@ void SetSav1ObjectEventsFromQuestLog(const struct QuestLog * questLog, const str { gObjectEvents[i].initialCoords.x = templates[j].x + 7; gObjectEvents[i].initialCoords.y = templates[j].y + 7; - gObjectEvents[i].rangeX = templates[j].movementRangeX; - gObjectEvents[i].rangeY = templates[j].movementRangeY; + gObjectEvents[i].rangeX = templates[j].objUnion.normal.movementRangeX; + gObjectEvents[i].rangeY = templates[j].objUnion.normal.movementRangeY; } } diff --git a/src/vs_seeker.c b/src/vs_seeker.c index 295976dd8..91db509f3 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -639,12 +639,12 @@ void VsSeekerResetObjectMovementAfterChargeComplete(void) for (i = 0; i < gMapHeader.events->objectEventCount; i++) { if (( - templates[i].trainerType == TRAINER_TYPE_NORMAL - || templates[i].trainerType == TRAINER_TYPE_BURIED + templates[i].objUnion.normal.trainerType == TRAINER_TYPE_NORMAL + || templates[i].objUnion.normal.trainerType == TRAINER_TYPE_BURIED ) && ( - templates[i].movementType == MOVEMENT_TYPE_VS_SEEKER_4D - || templates[i].movementType == MOVEMENT_TYPE_VS_SEEKER_4E - || templates[i].movementType == MOVEMENT_TYPE_VS_SEEKER_4F + templates[i].objUnion.normal.movementType == MOVEMENT_TYPE_VS_SEEKER_4D + || templates[i].objUnion.normal.movementType == MOVEMENT_TYPE_VS_SEEKER_4E + || templates[i].objUnion.normal.movementType == MOVEMENT_TYPE_VS_SEEKER_4F )) { movementType = GetRandomFaceDirectionMovementType(); @@ -654,7 +654,7 @@ void VsSeekerResetObjectMovementAfterChargeComplete(void) { SetTrainerMovementType(objectEvent, movementType); } - templates[i].movementType = movementType; + templates[i].objUnion.normal.movementType = movementType; } } } @@ -808,7 +808,7 @@ static void GatherNearbyTrainerInfo(void) for (objectEventIdx = 0; objectEventIdx < gMapHeader.events->objectEventCount; objectEventIdx++) { - if (templates[objectEventIdx].trainerType == 1 || templates[objectEventIdx].trainerType == 3) + if (templates[objectEventIdx].objUnion.normal.trainerType == 1 || templates[objectEventIdx].objUnion.normal.trainerType == 3) { sVsSeeker->trainerInfo[vsSeekerObjectIdx].script = templates[objectEventIdx].script; sVsSeeker->trainerInfo[vsSeekerObjectIdx].trainerIdx = GetTrainerFlagFromScript(templates[objectEventIdx].script); @@ -942,7 +942,9 @@ void ClearRematchStateByTrainerId(void) for (i = 0; i < gMapHeader.events->objectEventCount; i++) { - if ((objectEventTemplates[i].trainerType == TRAINER_TYPE_NORMAL || objectEventTemplates[i].trainerType == TRAINER_TYPE_BURIED) && vsSeekerDataIdx == LookupVsSeekerOpponentInArray(sVsSeekerData, GetTrainerFlagFromScript(objectEventTemplates[i].script))) + if ((objectEventTemplates[i].objUnion.normal.trainerType == TRAINER_TYPE_NORMAL + || objectEventTemplates[i].objUnion.normal.trainerType == TRAINER_TYPE_BURIED) + && vsSeekerDataIdx == LookupVsSeekerOpponentInArray(sVsSeekerData, GetTrainerFlagFromScript(objectEventTemplates[i].script))) { struct ObjectEvent *objectEvent; From 38601cf09b77d1be4f1178d9ae5daf5f64034170 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 5 Feb 2022 14:02:35 -0500 Subject: [PATCH 2/3] Reformat clone objects in JSON --- asm/macros/map.inc | 20 +++++++++-- data/maps/BattleColosseum_2P/map.json | 1 + data/maps/BirthIsland_Exterior/map.json | 2 ++ data/maps/BirthIsland_Harbor/map.json | 2 ++ data/maps/CeladonCity/map.json | 26 +++++++++----- .../maps/CeladonCity_Condominiums_1F/map.json | 4 +++ .../maps/CeladonCity_Condominiums_2F/map.json | 2 ++ .../maps/CeladonCity_Condominiums_3F/map.json | 4 +++ .../map.json | 2 ++ .../CeladonCity_DepartmentStore_1F/map.json | 1 + .../CeladonCity_DepartmentStore_2F/map.json | 4 +++ .../CeladonCity_DepartmentStore_3F/map.json | 5 +++ .../CeladonCity_DepartmentStore_4F/map.json | 3 ++ .../CeladonCity_DepartmentStore_5F/map.json | 4 +++ .../CeladonCity_DepartmentStore_Roof/map.json | 2 ++ data/maps/CeladonCity_GameCorner/map.json | 11 ++++++ .../CeladonCity_GameCorner_PrizeRoom/map.json | 5 +++ data/maps/CeladonCity_Gym/map.json | 11 ++++++ data/maps/CeladonCity_Hotel/map.json | 4 +++ data/maps/CeladonCity_House1/map.json | 3 ++ .../CeladonCity_PokemonCenter_1F/map.json | 4 +++ .../CeladonCity_PokemonCenter_2F/map.json | 4 +++ data/maps/CeladonCity_Restaurant/map.json | 5 +++ data/maps/CeruleanCave_1F/map.json | 9 +++++ data/maps/CeruleanCave_2F/map.json | 13 +++++++ data/maps/CeruleanCave_B1F/map.json | 12 +++++++ data/maps/CeruleanCity/map.json | 23 +++++++----- data/maps/CeruleanCity_BikeShop/map.json | 3 ++ data/maps/CeruleanCity_Gym/map.json | 4 +++ data/maps/CeruleanCity_House1/map.json | 1 + data/maps/CeruleanCity_House2/map.json | 2 ++ data/maps/CeruleanCity_House3/map.json | 2 ++ data/maps/CeruleanCity_House4/map.json | 1 + data/maps/CeruleanCity_House5/map.json | 1 + data/maps/CeruleanCity_Mart/map.json | 3 ++ .../CeruleanCity_PokemonCenter_1F/map.json | 7 ++++ .../CeruleanCity_PokemonCenter_2F/map.json | 4 +++ data/maps/CinnabarIsland/map.json | 4 +++ data/maps/CinnabarIsland_Gym/map.json | 9 +++++ data/maps/CinnabarIsland_Mart/map.json | 3 ++ .../CinnabarIsland_PokemonCenter_1F/map.json | 7 ++++ .../CinnabarIsland_PokemonCenter_2F/map.json | 4 +++ .../map.json | 1 + .../map.json | 2 ++ .../CinnabarIsland_PokemonLab_Lounge/map.json | 3 ++ .../map.json | 2 ++ data/maps/DiglettsCave_NorthEntrance/map.json | 1 + data/maps/DiglettsCave_SouthEntrance/map.json | 1 + data/maps/FiveIsland/map.json | 14 +++----- data/maps/FiveIsland_Harbor/map.json | 2 ++ data/maps/FiveIsland_House1/map.json | 1 + data/maps/FiveIsland_House2/map.json | 1 + data/maps/FiveIsland_LostCave_Room1/map.json | 1 + data/maps/FiveIsland_LostCave_Room10/map.json | 2 ++ data/maps/FiveIsland_LostCave_Room11/map.json | 1 + data/maps/FiveIsland_LostCave_Room12/map.json | 1 + data/maps/FiveIsland_LostCave_Room13/map.json | 1 + data/maps/FiveIsland_LostCave_Room14/map.json | 1 + data/maps/FiveIsland_LostCave_Room4/map.json | 1 + data/maps/FiveIsland_Meadow/map.json | 7 ++++ data/maps/FiveIsland_MemorialPillar/map.json | 5 +++ .../maps/FiveIsland_PokemonCenter_1F/map.json | 5 +++ .../maps/FiveIsland_PokemonCenter_2F/map.json | 4 +++ data/maps/FiveIsland_ResortGorgeous/map.json | 8 +++++ .../FiveIsland_ResortGorgeous_House/map.json | 2 ++ data/maps/FiveIsland_RocketWarehouse/map.json | 10 ++++++ data/maps/FiveIsland_WaterLabyrinth/map.json | 2 ++ data/maps/FourIsland/map.json | 12 +++++++ data/maps/FourIsland_Harbor/map.json | 2 ++ data/maps/FourIsland_House1/map.json | 2 ++ data/maps/FourIsland_House2/map.json | 1 + data/maps/FourIsland_IcefallCave_1F/map.json | 2 ++ data/maps/FourIsland_IcefallCave_B1F/map.json | 2 ++ .../maps/FourIsland_IcefallCave_Back/map.json | 4 +++ data/maps/FourIsland_LoreleisHouse/map.json | 15 ++++++++ data/maps/FourIsland_Mart/map.json | 3 ++ .../maps/FourIsland_PokemonCenter_1F/map.json | 4 +++ .../maps/FourIsland_PokemonCenter_2F/map.json | 4 +++ data/maps/FourIsland_PokemonDayCare/map.json | 1 + data/maps/FuchsiaCity/map.json | 16 +++++++++ data/maps/FuchsiaCity_Gym/map.json | 8 +++++ data/maps/FuchsiaCity_House1/map.json | 3 ++ data/maps/FuchsiaCity_House2/map.json | 1 + data/maps/FuchsiaCity_House3/map.json | 1 + data/maps/FuchsiaCity_Mart/map.json | 3 ++ .../FuchsiaCity_PokemonCenter_1F/map.json | 4 +++ .../FuchsiaCity_PokemonCenter_2F/map.json | 4 +++ .../FuchsiaCity_SafariZone_Entrance/map.json | 2 ++ .../FuchsiaCity_SafariZone_Office/map.json | 4 +++ data/maps/FuchsiaCity_WardensHouse/map.json | 4 +++ data/maps/IndigoPlateau_Exterior/map.json | 2 ++ .../IndigoPlateau_PokemonCenter_1F/map.json | 8 +++++ .../IndigoPlateau_PokemonCenter_2F/map.json | 4 +++ data/maps/LavenderTown/map.json | 3 ++ data/maps/LavenderTown_House1/map.json | 2 ++ data/maps/LavenderTown_House2/map.json | 1 + data/maps/LavenderTown_Mart/map.json | 4 +++ .../LavenderTown_PokemonCenter_1F/map.json | 5 +++ .../LavenderTown_PokemonCenter_2F/map.json | 4 +++ .../map.json | 6 ++++ data/maps/MtEmber_Exterior/map.json | 20 +++++++++++ data/maps/MtEmber_RubyPath_1F/map.json | 5 +++ data/maps/MtEmber_RubyPath_B1F/map.json | 4 +++ .../maps/MtEmber_RubyPath_B1F_Stairs/map.json | 1 + data/maps/MtEmber_RubyPath_B2F/map.json | 7 ++++ .../maps/MtEmber_RubyPath_B2F_Stairs/map.json | 2 ++ data/maps/MtEmber_RubyPath_B3F/map.json | 10 ++++++ data/maps/MtEmber_RubyPath_B5F/map.json | 1 + data/maps/MtEmber_Summit/map.json | 5 +++ data/maps/MtEmber_SummitPath_2F/map.json | 9 +++++ data/maps/MtMoon_1F/map.json | 14 ++++++++ data/maps/MtMoon_B2F/map.json | 11 ++++++ data/maps/NavelRock_Base/map.json | 1 + data/maps/NavelRock_Harbor/map.json | 2 ++ data/maps/NavelRock_Summit/map.json | 1 + data/maps/OneIsland/map.json | 3 ++ data/maps/OneIsland_Harbor/map.json | 2 ++ data/maps/OneIsland_House1/map.json | 2 ++ data/maps/OneIsland_House2/map.json | 1 + data/maps/OneIsland_KindleRoad/map.json | 29 +++++++++++++++ .../OneIsland_KindleRoad_EmberSpa/map.json | 6 ++++ data/maps/OneIsland_PokemonCenter_1F/map.json | 6 ++++ data/maps/OneIsland_PokemonCenter_2F/map.json | 4 +++ data/maps/OneIsland_TreasureBeach/map.json | 2 ++ data/maps/PalletTown/map.json | 3 ++ data/maps/PalletTown_PlayersHouse_1F/map.json | 1 + .../maps/PalletTown_ProfessorOaksLab/map.json | 10 ++++++ data/maps/PalletTown_RivalsHouse/map.json | 2 ++ data/maps/PewterCity/map.json | 7 ++++ data/maps/PewterCity_Gym/map.json | 3 ++ data/maps/PewterCity_House1/map.json | 3 ++ data/maps/PewterCity_House2/map.json | 2 ++ data/maps/PewterCity_Mart/map.json | 3 ++ data/maps/PewterCity_Museum_1F/map.json | 6 ++++ data/maps/PewterCity_Museum_2F/map.json | 5 +++ .../maps/PewterCity_PokemonCenter_1F/map.json | 7 ++++ .../maps/PewterCity_PokemonCenter_2F/map.json | 4 +++ data/maps/PokemonLeague_AgathasRoom/map.json | 1 + data/maps/PokemonLeague_BrunosRoom/map.json | 1 + .../maps/PokemonLeague_ChampionsRoom/map.json | 2 ++ data/maps/PokemonLeague_HallOfFame/map.json | 1 + data/maps/PokemonLeague_LancesRoom/map.json | 1 + data/maps/PokemonLeague_LoreleisRoom/map.json | 1 + data/maps/PokemonMansion_1F/map.json | 5 +++ data/maps/PokemonMansion_2F/map.json | 4 +++ data/maps/PokemonMansion_3F/map.json | 4 +++ data/maps/PokemonMansion_B1F/map.json | 6 ++++ data/maps/PokemonTower_1F/map.json | 5 +++ data/maps/PokemonTower_2F/map.json | 2 ++ data/maps/PokemonTower_3F/map.json | 4 +++ data/maps/PokemonTower_4F/map.json | 6 ++++ data/maps/PokemonTower_5F/map.json | 7 ++++ data/maps/PokemonTower_6F/map.json | 5 +++ data/maps/PokemonTower_7F/map.json | 4 +++ data/maps/PowerPlant/map.json | 8 +++++ data/maps/RecordCorner/map.json | 1 + data/maps/RockTunnel_1F/map.json | 10 ++++++ data/maps/RockTunnel_B1F/map.json | 26 ++++++++++++++ data/maps/RocketHideout_B1F/map.json | 7 ++++ data/maps/RocketHideout_B2F/map.json | 5 +++ data/maps/RocketHideout_B3F/map.json | 5 +++ data/maps/RocketHideout_B4F/map.json | 9 +++++ data/maps/Route1/map.json | 2 ++ data/maps/Route10/map.json | 10 ++++++ data/maps/Route10_PokemonCenter_1F/map.json | 5 +++ data/maps/Route10_PokemonCenter_2F/map.json | 4 +++ data/maps/Route11/map.json | 13 +++++++ data/maps/Route11_EastEntrance_1F/map.json | 2 ++ data/maps/Route11_EastEntrance_2F/map.json | 2 ++ data/maps/Route12/map.json | 14 ++++++++ data/maps/Route12_FishingHouse/map.json | 1 + data/maps/Route12_NorthEntrance_1F/map.json | 1 + data/maps/Route12_NorthEntrance_2F/map.json | 1 + data/maps/Route13/map.json | 11 ++++++ data/maps/Route14/map.json | 15 ++++++++ data/maps/Route15/map.json | 25 ++++++++----- data/maps/Route15_WestEntrance_1F/map.json | 1 + data/maps/Route15_WestEntrance_2F/map.json | 1 + data/maps/Route16/map.json | 10 ++++++ data/maps/Route16_House/map.json | 2 ++ data/maps/Route16_NorthEntrance_1F/map.json | 2 ++ data/maps/Route16_NorthEntrance_2F/map.json | 3 ++ data/maps/Route17/map.json | 10 ++++++ data/maps/Route18/map.json | 3 ++ data/maps/Route18_EastEntrance_1F/map.json | 1 + data/maps/Route18_EastEntrance_2F/map.json | 1 + data/maps/Route19/map.json | 12 +++++++ data/maps/Route2/map.json | 18 +++++----- data/maps/Route20/map.json | 11 ++++++ data/maps/Route21_North/map.json | 17 +++++---- data/maps/Route21_South/map.json | 5 +++ data/maps/Route22/map.json | 1 + data/maps/Route22_NorthEntrance/map.json | 1 + data/maps/Route23/map.json | 7 ++++ data/maps/Route24/map.json | 8 +++++ data/maps/Route25/map.json | 13 +++++++ data/maps/Route25_SeaCottage/map.json | 2 ++ data/maps/Route2_EastBuilding/map.json | 2 ++ data/maps/Route2_House/map.json | 2 ++ .../map.json | 3 ++ .../map.json | 2 ++ data/maps/Route3/map.json | 9 +++++ data/maps/Route4/map.json | 18 +++++----- data/maps/Route4_PokemonCenter_1F/map.json | 6 ++++ data/maps/Route4_PokemonCenter_2F/map.json | 4 +++ data/maps/Route5_PokemonDayCare/map.json | 1 + data/maps/Route5_SouthEntrance/map.json | 1 + data/maps/Route6/map.json | 6 ++++ data/maps/Route6_NorthEntrance/map.json | 1 + data/maps/Route7/map.json | 12 ++----- data/maps/Route7_EastEntrance/map.json | 1 + data/maps/Route8/map.json | 15 ++++++++ data/maps/Route8_WestEntrance/map.json | 1 + data/maps/Route9/map.json | 12 +++++++ data/maps/SSAnne_1F_Corridor/map.json | 2 ++ data/maps/SSAnne_1F_Room1/map.json | 1 + data/maps/SSAnne_1F_Room2/map.json | 4 +++ data/maps/SSAnne_1F_Room3/map.json | 3 ++ data/maps/SSAnne_1F_Room4/map.json | 1 + data/maps/SSAnne_1F_Room5/map.json | 1 + data/maps/SSAnne_1F_Room6/map.json | 1 + data/maps/SSAnne_1F_Room7/map.json | 1 + data/maps/SSAnne_2F_Corridor/map.json | 2 ++ data/maps/SSAnne_2F_Room1/map.json | 1 + data/maps/SSAnne_2F_Room2/map.json | 3 ++ data/maps/SSAnne_2F_Room3/map.json | 2 ++ data/maps/SSAnne_2F_Room4/map.json | 3 ++ data/maps/SSAnne_2F_Room5/map.json | 2 ++ data/maps/SSAnne_2F_Room6/map.json | 2 ++ data/maps/SSAnne_3F_Corridor/map.json | 1 + data/maps/SSAnne_B1F_Room1/map.json | 2 ++ data/maps/SSAnne_B1F_Room2/map.json | 2 ++ data/maps/SSAnne_B1F_Room3/map.json | 2 ++ data/maps/SSAnne_B1F_Room4/map.json | 2 ++ data/maps/SSAnne_B1F_Room5/map.json | 3 ++ data/maps/SSAnne_CaptainsOffice/map.json | 1 + data/maps/SSAnne_Deck/map.json | 5 +++ data/maps/SSAnne_Exterior/map.json | 1 + data/maps/SSAnne_Kitchen/map.json | 8 +++++ data/maps/SafariZone_Center/map.json | 1 + .../maps/SafariZone_Center_RestHouse/map.json | 2 ++ data/maps/SafariZone_East/map.json | 4 +++ data/maps/SafariZone_East_RestHouse/map.json | 3 ++ data/maps/SafariZone_North/map.json | 3 ++ data/maps/SafariZone_North_RestHouse/map.json | 4 +++ data/maps/SafariZone_SecretHouse/map.json | 1 + data/maps/SafariZone_West/map.json | 4 +++ data/maps/SafariZone_West_RestHouse/map.json | 3 ++ data/maps/SaffronCity/map.json | 15 ++++++++ .../SaffronCity_CopycatsHouse_1F/map.json | 3 ++ .../SaffronCity_CopycatsHouse_2F/map.json | 4 +++ data/maps/SaffronCity_Dojo/map.json | 7 ++++ data/maps/SaffronCity_Gym/map.json | 9 +++++ data/maps/SaffronCity_House/map.json | 4 +++ data/maps/SaffronCity_Mart/map.json | 3 ++ .../maps/SaffronCity_MrPsychicsHouse/map.json | 1 + .../SaffronCity_PokemonCenter_1F/map.json | 6 ++++ .../SaffronCity_PokemonCenter_2F/map.json | 4 +++ .../map.json | 10 ++++++ data/maps/SeafoamIslands_1F/map.json | 3 ++ data/maps/SeafoamIslands_B1F/map.json | 4 +++ data/maps/SeafoamIslands_B2F/map.json | 3 ++ data/maps/SeafoamIslands_B3F/map.json | 6 ++++ data/maps/SeafoamIslands_B4F/map.json | 4 +++ data/maps/SevenIsland/map.json | 3 ++ data/maps/SevenIsland_Harbor/map.json | 2 ++ data/maps/SevenIsland_House_Room1/map.json | 1 + data/maps/SevenIsland_House_Room2/map.json | 1 + data/maps/SevenIsland_Mart/map.json | 4 +++ .../SevenIsland_PokemonCenter_1F/map.json | 6 ++++ .../SevenIsland_PokemonCenter_2F/map.json | 4 +++ data/maps/SevenIsland_SevaultCanyon/map.json | 20 +++++++++++ .../map.json | 18 +++++----- .../SevenIsland_SevaultCanyon_House/map.json | 3 ++ .../map.json | 7 ++++ data/maps/SevenIsland_TanobyRuins/map.json | 4 +++ data/maps/SevenIsland_TrainerTower/map.json | 2 ++ data/maps/SilphCo_10F/map.json | 6 ++++ data/maps/SilphCo_11F/map.json | 6 ++++ data/maps/SilphCo_1F/map.json | 1 + data/maps/SilphCo_2F/map.json | 5 +++ data/maps/SilphCo_3F/map.json | 4 +++ data/maps/SilphCo_4F/map.json | 8 +++++ data/maps/SilphCo_5F/map.json | 9 +++++ data/maps/SilphCo_6F/map.json | 10 ++++++ data/maps/SilphCo_7F/map.json | 11 ++++++ data/maps/SilphCo_8F/map.json | 6 ++++ data/maps/SilphCo_9F/map.json | 4 +++ data/maps/SixIsland/map.json | 2 ++ .../map.json | 2 ++ data/maps/SixIsland_GreenPath/map.json | 1 + data/maps/SixIsland_Harbor/map.json | 2 ++ data/maps/SixIsland_House/map.json | 1 + data/maps/SixIsland_Mart/map.json | 3 ++ data/maps/SixIsland_OutcastIsland/map.json | 7 ++++ data/maps/SixIsland_PatternBush/map.json | 12 +++++++ data/maps/SixIsland_PokemonCenter_1F/map.json | 4 +++ data/maps/SixIsland_PokemonCenter_2F/map.json | 4 +++ data/maps/SixIsland_RuinValley/map.json | 17 +++++++++ data/maps/SixIsland_WaterPath/map.json | 9 +++++ data/maps/SixIsland_WaterPath_House1/map.json | 1 + data/maps/SixIsland_WaterPath_House2/map.json | 1 + data/maps/ThreeIsland/map.json | 14 ++++++++ data/maps/ThreeIsland_BerryForest/map.json | 14 ++++++++ data/maps/ThreeIsland_BondBridge/map.json | 9 +++++ .../maps/ThreeIsland_DunsparceTunnel/map.json | 1 + data/maps/ThreeIsland_Harbor/map.json | 2 ++ data/maps/ThreeIsland_House1/map.json | 1 + data/maps/ThreeIsland_House2/map.json | 2 ++ data/maps/ThreeIsland_House3/map.json | 1 + data/maps/ThreeIsland_House4/map.json | 2 ++ data/maps/ThreeIsland_House5/map.json | 1 + data/maps/ThreeIsland_Mart/map.json | 4 +++ .../ThreeIsland_PokemonCenter_1F/map.json | 4 +++ .../ThreeIsland_PokemonCenter_2F/map.json | 4 +++ data/maps/ThreeIsland_Port/map.json | 3 ++ data/maps/TradeCenter/map.json | 1 + data/maps/TrainerTower_1F/map.json | 5 +++ data/maps/TrainerTower_2F/map.json | 5 +++ data/maps/TrainerTower_3F/map.json | 5 +++ data/maps/TrainerTower_4F/map.json | 5 +++ data/maps/TrainerTower_5F/map.json | 5 +++ data/maps/TrainerTower_6F/map.json | 5 +++ data/maps/TrainerTower_7F/map.json | 5 +++ data/maps/TrainerTower_8F/map.json | 5 +++ data/maps/TrainerTower_Lobby/map.json | 5 +++ data/maps/TrainerTower_Roof/map.json | 1 + data/maps/TwoIsland/map.json | 9 +++++ data/maps/TwoIsland_CapeBrink_House/map.json | 1 + data/maps/TwoIsland_Harbor/map.json | 2 ++ data/maps/TwoIsland_House/map.json | 1 + data/maps/TwoIsland_JoyfulGameCorner/map.json | 4 +++ data/maps/TwoIsland_PokemonCenter_1F/map.json | 3 ++ data/maps/TwoIsland_PokemonCenter_2F/map.json | 4 +++ .../UndergroundPath_EastEntrance/map.json | 1 + .../UndergroundPath_NorthEntrance/map.json | 1 + .../UndergroundPath_SouthEntrance/map.json | 1 + .../UndergroundPath_WestEntrance/map.json | 1 + data/maps/UnionRoom/map.json | 9 +++++ data/maps/VermilionCity/map.json | 8 +++++ data/maps/VermilionCity_Gym/map.json | 5 +++ data/maps/VermilionCity_House1/map.json | 1 + data/maps/VermilionCity_House2/map.json | 1 + data/maps/VermilionCity_House3/map.json | 4 +++ data/maps/VermilionCity_Mart/map.json | 3 ++ .../VermilionCity_PokemonCenter_1F/map.json | 7 ++++ .../VermilionCity_PokemonCenter_2F/map.json | 4 +++ .../VermilionCity_PokemonFanClub/map.json | 6 ++++ data/maps/VictoryRoad_1F/map.json | 7 ++++ data/maps/VictoryRoad_2F/map.json | 13 +++++++ data/maps/VictoryRoad_3F/map.json | 12 +++++++ data/maps/ViridianCity/map.json | 9 +++++ data/maps/ViridianCity_Gym/map.json | 10 ++++++ data/maps/ViridianCity_House1/map.json | 3 ++ data/maps/ViridianCity_House2/map.json | 2 ++ data/maps/ViridianCity_Mart/map.json | 3 ++ .../ViridianCity_PokemonCenter_1F/map.json | 4 +++ .../ViridianCity_PokemonCenter_2F/map.json | 4 +++ data/maps/ViridianForest/map.json | 11 ++++++ include/constants/event_objects.h | 3 ++ include/global.fieldmap.h | 7 +--- src/overworld.c | 3 +- tools/mapjson/mapjson.cpp | 35 ++++++++++++------- 363 files changed, 1711 insertions(+), 104 deletions(-) diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 881ffdbb4..1a0e3a3ec 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -14,11 +14,11 @@ .4byte \address .endm - .macro object_event index:req, gfx:req, in_connection:req x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req + .macro object_event index:req, gfx:req, x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req .byte \index .byte \gfx - .byte \in_connection - .byte 0 + .byte OBJ_KIND_NORMAL + .space 1 @ Padding .2byte \x, \y .byte \elevation, \movement_type, ((\y_radius << 4) | \x_radius), 0 .2byte \trainer_type, \sight_radius_tree_etc @@ -27,6 +27,20 @@ inc _num_npcs .endm + .macro clone_event index:req, gfx:req, x:req, y:req, target_local_id:req, target_map_id:req + .byte \index + .byte \gfx + .byte OBJ_KIND_CLONE + .space 1 @ Padding + .2byte \x, \y + .byte \target_local_id + .space 3 @ Padding + .2byte \target_map_id & 0xFF @ map num + .2byte \target_map_id >> 8 @ map group + .space 8 @ Padding + inc _num_npcs + .endm + .macro warp_def x, y, byte, warp, map_id .2byte \x, \y .byte \byte, \warp diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json index 84c7b2a8c..04b0103f4 100644 --- a/data/maps/BattleColosseum_2P/map.json +++ b/data/maps/BattleColosseum_2P/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 9, "y": 3, diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index a0522d51a..dc240a5a6 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_METEORITE", "x": 15, "y": 12, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 15, "y": 3, diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index 91769a123..c40a0a509 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 6, diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 6aa1807d3..fcc532d77 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 48, "y": 15, @@ -40,6 +41,7 @@ "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 38, "y": 14, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLIWRATH", "x": 36, "y": 14, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 11, "y": 18, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 18, "y": 22, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 30, "y": 24, @@ -105,6 +111,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 26, "y": 19, @@ -118,6 +125,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 38, "y": 31, @@ -131,6 +139,7 @@ "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 9, "y": 30, @@ -144,6 +153,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 52, "y": 22, @@ -157,6 +167,7 @@ "flag": "FLAG_TEMP_14" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 40, "y": 35, @@ -170,6 +181,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 25, "y": 10, @@ -183,20 +195,15 @@ "flag": "0" }, { + "type": "clone", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", - "in_connection": true, "x": -7, "y": 21, - "elevation": 7, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "34", - "trainer_sight_or_berry_tree_id": "3", - "script": "0x0", - "flag": "0" + "target_local_id": 7, + "target_map": "MAP_ROUTE16" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, @@ -210,6 +217,7 @@ "flag": "FLAG_HIDE_CELADON_CITY_ETHER" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 47, "y": 24, diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index aeac5b626..0ce266087 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MEOWTH", "x": 1, "y": 9, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLEFAIRY", "x": 5, "y": 13, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NIDORAN_F", "x": 5, "y": 8, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 2, "y": 9, diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index 756f74fb3..ba3c67dd8 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "0", "x": 6, "y": 6, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS" }, { + "type": "object", "graphics_id": "0", "x": 5, "y": 6, diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index cf2d74454..7d39a62cc 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 0, "y": 10, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 3, "y": 8, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 4, "y": 10, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 0, "y": 13, diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index 999f32e1f..3efe6a4d6 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 3, "y": 5, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index 0a33592cc..970ff3e58 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 6, "y": 10, diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index 0ebc6977e..a087c291c 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 5, "y": 10, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 1, "y": 8, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 1, "y": 6, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 11, "y": 6, diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index d59f34f42..b5d458946 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 10, "y": 9, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GBA_KID", "x": 11, "y": 6, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GBA_KID", "x": 4, "y": 9, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GBA_KID", "x": 1, "y": 9, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 9, "y": 14, diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index 225a88043..bc8b5737a 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 6, "y": 6, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 10, "y": 11, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 3, "y": 13, diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 09c967ec2..14248d0ec 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 11, "y": 6, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 6, "y": 8, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 1, "y": 7, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 1, "y": 6, diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index e13de4ef8..a0b948294 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 9, "y": 5, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 5, "y": 4, diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index b352a3967..58baa4145 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 4, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 6, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 1, "y": 6, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 1, "y": 8, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 4, "y": 7, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 7, "y": 10, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 7, "y": 8, @@ -107,6 +114,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 10, "y": 9, @@ -120,6 +128,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 13, "y": 7, @@ -133,6 +142,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 16, "y": 10, @@ -146,6 +156,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 11, "y": 2, diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index 60063cd08..3c39900ed 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 2, "y": 6, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 6, "y": 7, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 4, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 6, "y": 2, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 2, "y": 2, diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index 9978fa9de..e73b79f7b 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 11, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 9, "y": 10, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 10, "y": 7, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 2, "y": 6, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 5, "y": 4, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 7, "y": 4, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ERIKA", "x": 6, "y": 4, @@ -107,6 +114,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 8, "y": 7, @@ -120,6 +128,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 6, "y": 8, @@ -133,6 +142,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 3, "y": 5, @@ -146,6 +156,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 9, "y": 6, diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index 02d7c416b..9ec22dbab 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 5, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 3, "y": 6, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 9, "y": 7, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 2, "y": 6, diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index acf95fde5..4c0b51f05 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 5, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 2, "y": 4, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 8, "y": 4, diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 5c2ca4f02..9283cbe47 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 4, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 10, "y": 6, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 12, "y": 5, diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index 9431c273d..84d0405bc 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index 71f2e4f30..ef5f6e4ed 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 12, "y": 7, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 11, "y": 4, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 9, "y": 4, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 1, "y": 2, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 3, "y": 7, diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index abc495f92..41aa39ad7 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 3, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 16, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 25, "y": 5, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 21, @@ -68,6 +72,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 21, @@ -81,6 +86,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 20, @@ -94,6 +100,7 @@ "flag": "FLAG_TEMP_14" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 14, "y": 20, @@ -107,6 +114,7 @@ "flag": "FLAG_TEMP_15" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 21, @@ -120,6 +128,7 @@ "flag": "FLAG_TEMP_16" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 18, diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index 45e4fc963..db465862c 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 18, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 16, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 12, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 10, @@ -68,6 +72,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 9, @@ -81,6 +86,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 25, "y": 11, @@ -94,6 +100,7 @@ "flag": "FLAG_TEMP_14" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 28, "y": 20, @@ -107,6 +114,7 @@ "flag": "FLAG_TEMP_15" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 30, "y": 20, @@ -120,6 +128,7 @@ "flag": "FLAG_TEMP_16" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 13, @@ -133,6 +142,7 @@ "flag": "FLAG_TEMP_17" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 16, @@ -146,6 +156,7 @@ "flag": "FLAG_TEMP_18" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 6, @@ -159,6 +170,7 @@ "flag": "FLAG_TEMP_19" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 12, @@ -172,6 +184,7 @@ "flag": "FLAG_TEMP_1A" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 20, diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 478ddf111..498c360c8 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 9, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 2, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MEWTWO", "x": 7, "y": 12, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_MEWTWO" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 37, "y": 1, @@ -68,6 +72,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 38, "y": 2, @@ -81,6 +86,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 35, "y": 1, @@ -94,6 +100,7 @@ "flag": "FLAG_TEMP_14" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 37, "y": 4, @@ -107,6 +114,7 @@ "flag": "FLAG_TEMP_15" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 35, "y": 5, @@ -120,6 +128,7 @@ "flag": "FLAG_TEMP_16" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 2, "y": 2, @@ -133,6 +142,7 @@ "flag": "FLAG_TEMP_17" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 1, @@ -146,6 +156,7 @@ "flag": "FLAG_TEMP_18" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 1, @@ -159,6 +170,7 @@ "flag": "FLAG_TEMP_19" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 4, diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 282eaf4cc..1618eacea 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -37,6 +37,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 31, "y": 12, @@ -50,6 +51,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 33, "y": 6, @@ -63,6 +65,7 @@ "flag": "FLAG_HIDE_CERULEAN_ROCKET" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 16, "y": 21, @@ -76,6 +79,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 9, "y": 23, @@ -89,6 +93,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SLOWBRO", "x": 32, "y": 29, @@ -102,6 +107,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 33, "y": 29, @@ -115,6 +121,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 34, "y": 22, @@ -128,6 +135,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 22, "y": 0, @@ -141,6 +149,7 @@ "flag": "FLAG_HIDE_CERULEAN_RIVAL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 26, "y": 32, @@ -154,20 +163,15 @@ "flag": "FLAG_TEMP_13" }, { + "type": "clone", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", - "in_connection": true, "x": 50, "y": 18, - "elevation": 10, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "27", - "trainer_sight_or_berry_tree_id": "3", - "script": "0x0", - "flag": "0" + "target_local_id": 10, + "target_map": "MAP_ROUTE9" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 12, "y": 30, @@ -181,6 +185,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 1, "y": 13, diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index d7c0ea6d2..b614cbd6b 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 9, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 9, "y": 7, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, "y": 5, diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json index 78f866633..e1f673ced 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 10, "y": 12, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 4, "y": 7, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MISTY", "x": 8, "y": 6, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 7, "y": 16, diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json index 006be49fa..e8a336444 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 6, "y": 5, diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index 4cc6cd713..4aaf6d44a 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 1, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 7, "y": 6, diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json index 0c0bb10c4..f26980765 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 2, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 7, "y": 5, diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index a2b792ede..63c7b16e0 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 5, "y": 3, diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index a54a593b6..314a11123 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 7, "y": 4, diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json index 69dfbd2c0..fde948c8a 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 9, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 1, "y": 7, diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index 7c797a653..bf92db5b5 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 12, "y": 5, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 5, "y": 4, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 4, "y": 8, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 3, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "0", "x": 2, "y": 1, @@ -94,6 +100,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { + "type": "object", "graphics_id": "0", "x": 3, "y": 1, diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index a706e5b4d..142d3b21c 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index 9798a6be3..de15e8e78 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 14, "y": 6, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 11, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 20, "y": 7, @@ -66,6 +69,7 @@ "flag": "FLAG_HIDE_CINNABAR_BILL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 23, "y": 7, diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index ae40512d5..77973ab9f 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 25, "y": 11, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 25, "y": 4, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 17, "y": 5, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 16, "y": 11, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 16, "y": 18, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 4, "y": 19, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 4, "y": 11, @@ -107,6 +114,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLAINE", "x": 5, "y": 4, @@ -120,6 +128,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 24, "y": 20, diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index 0d5c16415..f6d0106eb 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 6, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 8, "y": 2, diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index 83b962c02..69fe81200 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 2, "y": 4, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 9, "y": 7, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 14, "y": 6, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "0", "x": 2, "y": 1, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { + "type": "object", "graphics_id": "0", "x": 3, "y": 1, @@ -94,6 +100,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 11, "y": 5, diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 32fcb549f..7c7647dbf 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index 8d3b7c92b..ca87e241b 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 2, "y": 4, diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index d6856c1f1..f266abb85 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 11, "y": 8, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 12, "y": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index f51aa1fa8..0eb411782 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 5, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 4, "y": 6, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 10, "y": 5, diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index a615b6830..4ed0d75ca 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 5, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 10, "y": 3, diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json index 5135b3e28..b330b8eac 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 4, "y": 4, diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json index 493f30be7..daa426fc2 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 4, diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index 29e667d27..088394782 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 8, "y": 5, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 16, "y": 10, @@ -53,18 +55,12 @@ "flag": "0" }, { + "type": "clone", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", - "in_connection": true, "x": 32, "y": 9, - "elevation": 4, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "56", - "trainer_sight_or_berry_tree_id": "3", - "script": "0x0", - "flag": "0" + "target_local_id": 4, + "target_map": "MAP_FIVE_ISLAND_MEADOW" } ], "warp_events": [ diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index e86f2333a..4ff5f5249 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 6, diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index c4a14839d..ad10095dd 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 10, "y": 2, diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index bd75ab0c3..6003998f6 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 2, "y": 3, diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index 9d6e27c73..7f7d06cee 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 5, "y": 4, diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index 20835f0bc..f5eaeed87 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, "y": 5, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_LOST_CAVE_SELPHY" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 2, diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index ab63d2ea3..0c018195f 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 5, diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index c14996b6f..67adcdd17 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 5, diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index 84a0f34ea..f21ac95fc 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 5, diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index 2d24d97c8..5607e08e8 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 5, diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index 93de2af9a..0489a8b11 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 6, "y": 4, diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index 16c52f2af..d9f9de9b8 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_F", "x": 18, "y": 18, @@ -40,6 +41,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 17, "y": 5, @@ -53,6 +55,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 11, "y": 27, @@ -66,6 +69,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 8, "y": 9, @@ -79,6 +83,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 19, "y": 12, @@ -92,6 +97,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 11, @@ -105,6 +111,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_MAX_POTION" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 22, diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 489f63372..184aec2ca 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -22,6 +22,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 8, "y": 44, @@ -35,6 +36,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 12, "y": 6, @@ -48,6 +50,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 14, "y": 17, @@ -61,6 +64,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 17, "y": 31, @@ -74,6 +78,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 47, diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index 24c72dd7e..b97c5f124 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 9, "y": 4, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 4, "y": 8, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "0", "x": 2, "y": 1, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { + "type": "object", "graphics_id": "0", "x": 3, "y": 1, diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index bb3bdd1eb..415be644e 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index 5c596b3bc..c86041b08 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -22,6 +22,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 44, "y": 10, @@ -35,6 +36,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 33, "y": 12, @@ -48,6 +50,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 12, "y": 10, @@ -61,6 +64,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 23, "y": 9, @@ -74,6 +78,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 33, "y": 8, @@ -87,6 +92,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 33, "y": 3, @@ -100,6 +106,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 56, "y": 7, @@ -113,6 +120,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 39, "y": 9, diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index d361589b7..59f076913 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 4, "y": 4, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 6, "y": 2, diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index e14361861..08f53138b 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 15, "y": 11, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 17, "y": 15, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_F", "x": 27, "y": 16, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 25, "y": 11, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_F", "x": 6, "y": 6, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 27, "y": 4, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 25, @@ -107,6 +114,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_BIG_PEARL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 3, @@ -120,6 +128,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_TM36" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 16, @@ -133,6 +142,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_PEARL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 5, diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index 002a02f36..a0ff618d3 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 14, "y": 11, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 9, "y": 7, diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 33abf1091..13eab3339 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 16, "y": 13, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_DODUO", "x": 12, "y": 9, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NIDORAN_F", "x": 13, "y": 7, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NIDORAN_M", "x": 14, "y": 7, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PSYDUCK", "x": 17, "y": 9, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 26, "y": 19, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 11, @@ -107,6 +114,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 6, @@ -120,6 +128,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_STAR_PIECE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 19, @@ -133,6 +142,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_STARDUST" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 8, "y": 25, @@ -146,6 +156,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_RIVAL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 36, "y": 13, @@ -159,6 +170,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 31, "y": 21, diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index afa0aca6c..ad551aef5 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 6, diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index 44bf35f30..fe8f822d3 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 8, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 9, "y": 3, diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index d31d74e77..084eec236 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 4, "y": 4, diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index d8ddd44d1..7358bea0f 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 7, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_ULTRA_BALL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 16, diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index 8e5bdb8bf..addbe2579 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, "y": 14, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_FULL_RESTORE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 21, "y": 7, diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index bbb4afb7c..99cc4c00f 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 11, "y": 14, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 13, "y": 14, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LORELEI", "x": 12, "y": 16, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 10, "y": 15, diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index 72070ccbf..743db1a81 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LORELEI", "x": 7, "y": 4, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_LORELEI_IN_HER_HOUSE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WIGGLYTUFF", "x": 0, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SEEL", "x": 10, "y": 3, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 9, "y": 3, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SLOWPOKE", "x": 7, "y": 2, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SLOWBRO", "x": 6, "y": 2, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PSYDUCK", "x": 6, "y": 4, @@ -107,6 +114,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MEOWTH", "x": 9, "y": 4, @@ -120,6 +128,7 @@ "flag": "FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANSEY", "x": 10, "y": 4, @@ -133,6 +142,7 @@ "flag": "FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_JIGGLYPUFF", "x": 0, "y": 3, @@ -146,6 +156,7 @@ "flag": "FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NIDORAN_F", "x": 0, "y": 5, @@ -159,6 +170,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NIDORAN_M", "x": 1, "y": 5, @@ -172,6 +184,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PIDGEOT", "x": 9, "y": 0, @@ -185,6 +198,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FEAROW", "x": 10, "y": 0, @@ -198,6 +212,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LAPRAS_DOLL", "x": 9, "y": 6, diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index ab36dfb24..36ddc0271 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 6, "y": 5, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 8, "y": 3, diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index 89ddda178..a8abb5e39 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 10, "y": 6, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 5, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 2, "y": 2, diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index 7d6092bea..43c798013 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index 81c7c0d9d..726acdcb4 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 2, "y": 2, diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 7363a4b82..1ce04d84f 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -32,6 +32,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 37, "y": 17, @@ -45,6 +46,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SLOWPOKE", "x": 36, "y": 15, @@ -58,6 +60,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VOLTORB", "x": 33, "y": 8, @@ -71,6 +74,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 33, "y": 11, @@ -84,6 +88,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANSEY", "x": 39, "y": 8, @@ -97,6 +102,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 14, "y": 15, @@ -110,6 +116,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LAPRAS", "x": 12, "y": 20, @@ -123,6 +130,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 36, "y": 20, @@ -136,6 +144,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 8, "y": 8, @@ -149,6 +158,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_KANGASKHAN", "x": 16, "y": 9, @@ -162,6 +172,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 30, "y": 10, @@ -175,6 +186,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 21, "y": 13, @@ -188,6 +200,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 32, "y": 16, @@ -201,6 +214,7 @@ "flag": "FLAG_TEMP_14" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 24, "y": 22, @@ -214,6 +228,7 @@ "flag": "FLAG_TEMP_15" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 15, "y": 11, @@ -227,6 +242,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 40, "y": 6, diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json index 031e69071..5deac5214 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 12, "y": 16, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 2, "y": 9, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 11, "y": 11, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 13, "y": 4, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 4, "y": 6, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 2, "y": 16, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_KOGA", "x": 7, "y": 13, @@ -107,6 +114,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 11, "y": 19, diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json index ac9fbd673..8823e1c20 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 7, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 1, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 2, "y": 5, diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json index 9d66853a4..d133581c1 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 6, "y": 5, diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json index b6916bec8..73d65c047 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 4, "y": 4, diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json index 10e7deb5a..a09a2e10f 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 6, "y": 3, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 9, "y": 5, diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index 04e1112cd..73b1270bc 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 12, "y": 5, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 13, "y": 3, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 4, "y": 8, diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index 16e7f5606..8b3526aa7 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index 62161f69f..02a4768ed 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 7, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 1, "y": 6, diff --git a/data/maps/FuchsiaCity_SafariZone_Office/map.json b/data/maps/FuchsiaCity_SafariZone_Office/map.json index 89bf9cffc..1a4032edf 100644 --- a/data/maps/FuchsiaCity_SafariZone_Office/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Office/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 2, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 12, "y": 3, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 6, "y": 4, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 10, "y": 8, diff --git a/data/maps/FuchsiaCity_WardensHouse/map.json b/data/maps/FuchsiaCity_WardensHouse/map.json index 73a8ee885..7b402867f 100644 --- a/data/maps/FuchsiaCity_WardensHouse/map.json +++ b/data/maps/FuchsiaCity_WardensHouse/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 3, "y": 5, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 6, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 5, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_FUCHSIA_CITY_WARDENS_HOUSE_RARE_CANDY" }, { + "type": "object", "graphics_id": "0", "x": 4, "y": 1, diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index 31461c51f..89a1dd9b4 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -22,6 +22,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 11, "y": 6, @@ -35,6 +36,7 @@ "flag": "FLAG_HIDE_CREDITS_RIVAL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PROF_OAK", "x": 11, "y": 6, diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index 485be4c63..4c0c97759 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 0, "y": 7, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 13, "y": 10, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 7, "y": 14, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 5, "y": 3, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 23, "y": 13, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { + "type": "object", "graphics_id": "0", "x": 22, "y": 9, @@ -94,6 +100,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 16, "y": 15, @@ -107,6 +114,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { + "type": "object", "graphics_id": "0", "x": 23, "y": 9, diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index bdb442d7a..f717a09ea 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index 07fe80598..8d9fe4be8 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -32,6 +32,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 19, "y": 10, @@ -45,6 +46,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 12, "y": 12, @@ -58,6 +60,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 10, "y": 7, diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index 2920d0f11..94a07604b 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 4, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUBONE", "x": 8, "y": 6, diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index 51f227c93..94383a699 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 4, diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index c855026dc..b6f7c5055 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 6, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 9, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 9, "y": 5, diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index f418ed011..14433de2a 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 9, "y": 4, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 5, "y": 6, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 2, "y": 2, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 14, "y": 6, diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index 108d34364..232f6ecce 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index 02b70d9ef..7f241ad23 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MR_FUJI", "x": 3, "y": 3, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_POKEHOUSE_FUJI" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NIDORINO", "x": 1, "y": 4, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PSYDUCK", "x": 9, "y": 6, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 9, "y": 5, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 3, "y": 5, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 7, "y": 2, diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 42e1ea87f..6f300b9d6 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 29, "y": 45, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 41, "y": 40, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 42, "y": 40, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 22, "y": 35, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 15, "y": 28, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 14, "y": 42, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 29, "y": 41, @@ -107,6 +114,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 30, "y": 42, @@ -120,6 +128,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 22, "y": 45, @@ -133,6 +142,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 17, "y": 46, @@ -146,6 +156,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 36, "y": 14, @@ -159,6 +170,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 34, "y": 14, @@ -172,6 +184,7 @@ "flag": "FLAG_TEMP_14" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 36, "y": 15, @@ -185,6 +198,7 @@ "flag": "FLAG_TEMP_15" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 35, "y": 14, @@ -198,6 +212,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 35, "y": 17, @@ -211,6 +226,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 39, @@ -224,6 +240,7 @@ "flag": "FLAG_TEMP_16" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 19, "y": 40, @@ -237,6 +254,7 @@ "flag": "FLAG_TEMP_17" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 6, @@ -250,6 +268,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ULTRA_BALL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 38, "y": 10, @@ -263,6 +282,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_FIRE_STONE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 48, "y": 20, diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index 3a3d01a84..32108cf47 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 11, @@ -29,6 +30,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 16, @@ -42,6 +44,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 20, "y": 12, @@ -55,6 +58,7 @@ "flag": "FLAG_TEMP_14" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 19, "y": 7, @@ -68,6 +72,7 @@ "flag": "FLAG_TEMP_15" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 21, "y": 15, diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index 131ba8fd6..b2e84cd47 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 8, @@ -29,6 +30,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 11, @@ -42,6 +44,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 12, @@ -55,6 +58,7 @@ "flag": "FLAG_TEMP_14" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 14, diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index ea9fa2586..e55831c9d 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 2, diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index aaf1b8dc3..99d15f9bd 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 5, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 8, @@ -68,6 +72,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 8, @@ -81,6 +86,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 5, @@ -94,6 +100,7 @@ "flag": "FLAG_TEMP_14" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 5, diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index b9c4074f9..2935f1bf9 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 3, @@ -29,6 +30,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 2, diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 7ee35c5ef..df674ff77 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 10, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 26, "y": 12, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 28, "y": 8, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 2, @@ -68,6 +72,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 3, @@ -81,6 +86,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 6, @@ -94,6 +100,7 @@ "flag": "FLAG_TEMP_14" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 6, @@ -107,6 +114,7 @@ "flag": "FLAG_TEMP_15" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 5, @@ -120,6 +128,7 @@ "flag": "FLAG_TEMP_16" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 2, @@ -133,6 +142,7 @@ "flag": "FLAG_TEMP_17" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 15, "y": 13, diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index 267cedd37..9b032993f 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_RUBY", "x": 7, "y": 7, diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index e750d9d65..0a697576a 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MOLTRES", "x": 9, "y": 6, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_MOLTRES" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 10, "y": 12, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 12, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 11, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 10, diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index 0cc16016d..07c8acf42 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 40, "y": 7, @@ -29,6 +30,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 5, @@ -42,6 +44,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 19, @@ -55,6 +58,7 @@ "flag": "FLAG_TEMP_14" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 23, @@ -68,6 +72,7 @@ "flag": "FLAG_TEMP_15" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 21, @@ -81,6 +86,7 @@ "flag": "FLAG_TEMP_16" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 38, @@ -94,6 +100,7 @@ "flag": "FLAG_TEMP_17" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 35, @@ -107,6 +114,7 @@ "flag": "FLAG_TEMP_18" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 34, @@ -120,6 +128,7 @@ "flag": "FLAG_TEMP_19" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 26, diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 4e91905de..91415dca0 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 20, "y": 26, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 36, "y": 30, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 30, "y": 35, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 33, "y": 4, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 26, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 13, "y": 17, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 7, "y": 10, @@ -107,6 +114,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 22, @@ -120,6 +128,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_PARALYZE_HEAL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 35, @@ -133,6 +142,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_TM09" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 32, @@ -146,6 +156,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_POTION" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 42, "y": 35, @@ -159,6 +170,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_RARE_CANDY" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 44, "y": 21, @@ -172,6 +184,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_ESCAPE_ROPE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 2, @@ -185,6 +198,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_MOON_STONE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 42, "y": 7, diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 358d791b8..3b8d645ed 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 13, "y": 7, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_DOME_FOSSIL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 14, "y": 7, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_HELIX_FOSSIL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 13, "y": 11, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 37, "y": 21, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 12, "y": 20, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 35, "y": 12, @@ -94,6 +100,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 18, "y": 27, @@ -107,6 +114,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 26, @@ -120,6 +128,7 @@ "flag": "FLAG_HIDE_MT_MOON_B2F_STAR_PIECE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 35, "y": 5, @@ -133,6 +142,7 @@ "flag": "FLAG_HIDE_MT_MOON_B2F_TM46" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 24, "y": 6, @@ -146,6 +156,7 @@ "flag": "FLAG_HIDE_MT_MOON_B2F_REVIVE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 11, diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index 6350185f9..3d3791a51 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LUGIA", "x": 10, "y": 15, diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index a94603087..e65348867 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 6, diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index 2718158b2..cd1e58794 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HO_OH", "x": 9, "y": 6, diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index e49ef37ef..43cff9bfd 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 12, "y": 16, @@ -40,6 +41,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_BILL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 16, "y": 12, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 13, "y": 9, diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index 0ca6c7b3f..b56d7746d 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 6, diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index 5823a4c3c..a3f225e6a 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 5, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 7, "y": 5, diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index 3f51fb461..9600e847e 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 9, "y": 4, diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 963d70acc..c7f3793c7 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -22,6 +22,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 11, "y": 32, @@ -35,6 +36,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_LAND", "x": 17, "y": 132, @@ -48,6 +50,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 7, "y": 39, @@ -61,6 +64,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_LAND", "x": 19, "y": 79, @@ -74,6 +78,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 15, "y": 25, @@ -87,6 +92,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 9, "y": 53, @@ -100,6 +106,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 18, "y": 105, @@ -113,6 +120,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 16, "y": 64, @@ -126,6 +134,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 11, "y": 64, @@ -139,6 +148,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 11, "y": 89, @@ -152,6 +162,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 9, "y": 108, @@ -165,6 +176,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 8, "y": 68, @@ -178,6 +190,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 9, "y": 68, @@ -191,6 +204,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 8, "y": 104, @@ -204,6 +218,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 95, @@ -217,6 +232,7 @@ "flag": "FLAG_TEMP_15" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 12, "y": 96, @@ -230,6 +246,7 @@ "flag": "FLAG_TEMP_16" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 95, @@ -243,6 +260,7 @@ "flag": "FLAG_TEMP_17" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 105, @@ -256,6 +274,7 @@ "flag": "FLAG_TEMP_18" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 75, @@ -269,6 +288,7 @@ "flag": "FLAG_TEMP_19" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 84, @@ -282,6 +302,7 @@ "flag": "FLAG_TEMP_1A" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 74, @@ -295,6 +316,7 @@ "flag": "FLAG_TEMP_1B" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 73, @@ -308,6 +330,7 @@ "flag": "FLAG_TEMP_1C" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 111, @@ -321,6 +344,7 @@ "flag": "FLAG_TEMP_1D" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 86, @@ -334,6 +358,7 @@ "flag": "FLAG_TEMP_1E" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 110, @@ -347,6 +372,7 @@ "flag": "FLAG_TEMP_1F" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 112, @@ -360,6 +386,7 @@ "flag": "FLAG_TEMP_11" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 70, @@ -373,6 +400,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_ETHER" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 103, @@ -386,6 +414,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_MAX_REPEL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 18, "y": 114, diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index f31b4b26f..2bc4bec54 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 13, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 15, "y": 11, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 6, "y": 8, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 20, "y": 7, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 10, "y": 5, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 11, "y": 20, diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index 1223e5a2d..473d8a751 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 5, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 14, "y": 6, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CELIO", "x": 15, "y": 6, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_CELIO" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 6, "y": 8, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 3, "y": 7, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 7, "y": 4, diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index f7fd1a1bb..00ac518fe 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index 1eaf448bc..d940dbe08 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -22,6 +22,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 8, "y": 11, @@ -35,6 +36,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 13, "y": 20, diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 9296719e0..8926beb48 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 3, "y": 10, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 13, "y": 17, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PROF_OAK", "x": 10, "y": 8, diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index f40f63125..6622fca15 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 8, "y": 4, diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index 4ba6d636b..7ae7434e7 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 3, "y": 11, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 2, "y": 10, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 11, "y": 10, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PROF_OAK", "x": 6, "y": 3, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_OAK_IN_HIS_LAB" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 4, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_BULBASAUR_BALL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 4, @@ -94,6 +100,7 @@ "flag": "FLAG_HIDE_SQUIRTLE_BALL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, "y": 4, @@ -107,6 +114,7 @@ "flag": "FLAG_HIDE_CHARMANDER_BALL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 5, "y": 4, @@ -120,6 +128,7 @@ "flag": "FLAG_HIDE_RIVAL_IN_LAB" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POKEDEX", "x": 4, "y": 1, @@ -133,6 +142,7 @@ "flag": "FLAG_HIDE_POKEDEX" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POKEDEX", "x": 5, "y": 1, diff --git a/data/maps/PalletTown_RivalsHouse/map.json b/data/maps/PalletTown_RivalsHouse/map.json index d6eafde70..6c354f2f6 100644 --- a/data/maps/PalletTown_RivalsHouse/map.json +++ b/data/maps/PalletTown_RivalsHouse/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_DAISY", "x": 10, "y": 6, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_TOWN_MAP", "x": 6, "y": 4, diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index eca9af0b8..25d8be29f 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 6, "y": 15, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 33, "y": 17, @@ -53,6 +55,7 @@ "flag": "FLAG_HIDE_PEWTER_MUSEUM_GUIDE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 21, "y": 28, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 33, "y": 27, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 42, "y": 20, @@ -92,6 +97,7 @@ "flag": "FLAG_HIDE_PEWTER_CITY_GYM_GUIDE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 30, "y": 5, @@ -105,6 +111,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 46, "y": 20, diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json index 7c160945a..7c11199d4 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BROCK", "x": 6, "y": 5, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 3, "y": 8, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 7, "y": 12, diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index 70b274917..44ca8f0d9 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 1, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 5, "y": 3, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NIDORAN_M", "x": 6, "y": 3, diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index 224bf438e..7ecc4596e 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 3, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 5, "y": 3, diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index df4620ff7..1cbef2d6a 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 8, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 6, "y": 4, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index a96ec184e..2959ccf25 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 16, "y": 5, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 2, "y": 4, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 21, "y": 3, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_AMBER", "x": 22, "y": 3, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_OLD_AMBER" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 26, "y": 4, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 26, "y": 7, diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index 95c1b6aa4..b57a75607 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 10, "y": 5, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 4, "y": 9, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 0, "y": 6, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 15, "y": 8, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 16, "y": 8, diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index ebc6c532b..7d6fafb6c 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_JIGGLYPUFF", "x": 2, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 8, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 1, "y": 2, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 13, "y": 2, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GBA_KID", "x": 10, "y": 7, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GBA_KID", "x": 14, "y": 6, diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index 45d753045..e91aeba2a 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index 86fda6a3e..791f4fc2f 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_AGATHA", "x": 6, "y": 5, diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index cf1448886..a10f99c0a 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BRUNO", "x": 6, "y": 5, diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index a4c1da00f..89988b5fb 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 6, "y": 8, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PROF_OAK", "x": 6, "y": 15, diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index bbe302813..baa87e865 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PROF_OAK", "x": 6, "y": 4, diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index 05c1daa01..8ef0a06bb 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LANCE", "x": 6, "y": 8, diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json index d34bcabc7..4b03e865c 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/map.json +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LORELEI", "x": 6, "y": 5, diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index d8ff775b8..32073b70a 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 22, "y": 24, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 32, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_1F_CARBOS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 22, "y": 6, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_1F_ESCAPE_ROPE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 15, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_1F_PROTEIN" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 8, "y": 8, diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index 6fb09a8e7..d600cf6cb 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 5, "y": 23, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 36, "y": 8, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_2F_CALCIUM" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 18, "y": 23, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_2F_ZINC" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 35, "y": 17, diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index 6ca394a7d..a567098a8 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 7, "y": 13, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 22, "y": 13, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 19, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_3F_MAX_POTION" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 6, diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index 4f4ad6ea1..3f2b04726 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 21, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM22" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 20, "y": 25, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 34, "y": 13, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 23, "y": 4, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM14" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 29, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_FULL_RESTORE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 7, diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json index b0d8cafa2..e67ce4974 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 18, "y": 13, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 18, "y": 7, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 15, "y": 6, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 7, "y": 8, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 8, "y": 12, diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index 36281aa79..86f397409 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 16, "y": 5, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_TOWER_RIVAL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 3, "y": 7, diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index ee15b4a68..8e5d2599e 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 10, "y": 14, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 9, "y": 9, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 12, "y": 4, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 2, diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index 7924b4f3c..286e7b07f 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 17, "y": 7, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 15, "y": 13, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 4, "y": 12, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 11, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_4F_ELIXIR" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 11, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_4F_AWAKENING" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 16, diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index 9f74a6aab..cd58f14a4 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 11, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 19, "y": 7, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 7, "y": 12, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 11, "y": 16, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 12, "y": 8, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 16, @@ -94,6 +100,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_5F_NUGGET" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 9, diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index ae72e35e6..b54a5d499 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 13, "y": 10, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 18, "y": 6, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 9, "y": 6, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 15, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_6F_RARE_CANDY" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 15, diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index 327b9311b..a0f23bd76 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MR_FUJI", "x": 11, "y": 4, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_TOWER_FUJI" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 9, "y": 10, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_TOWER_ROCKET_1" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 13, "y": 8, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_TOWER_ROCKET_2" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 9, "y": 6, diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index f019d6320..fc61ef633 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 27, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_MAX_POTION" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 40, "y": 22, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_TM17" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 46, "y": 37, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_TM25" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 45, "y": 4, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_THUNDER_STONE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 22, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_ELIXIR" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ZAPDOS", "x": 5, "y": 11, @@ -94,6 +100,7 @@ "flag": "FLAG_HIDE_ZAPDOS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 36, "y": 5, @@ -107,6 +114,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_ELECTRODE_2" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 38, diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index 67d6be4a5..b12044673 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 10, "y": 5, diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index 2c0ae4315..185bdab33 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 26, "y": 28, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 39, "y": 27, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 45, "y": 24, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 20, "y": 17, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 5, "y": 20, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 7, "y": 5, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 27, "y": 10, @@ -107,6 +114,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 37, "y": 5, @@ -120,6 +128,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_REPEL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 22, @@ -133,6 +142,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_PEARL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 22, "y": 22, diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index 186cd6336..9c2fcb6ae 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 2, "y": 6, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 5, "y": 11, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 11, "y": 15, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 36, "y": 11, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 41, "y": 5, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 23, "y": 23, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 15, "y": 33, @@ -107,6 +114,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 29, "y": 35, @@ -120,6 +128,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 2, "y": 29, @@ -133,6 +142,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 37, @@ -146,6 +156,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_REVIVE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 2, @@ -159,6 +170,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_MAX_ETHER" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 20, @@ -172,6 +184,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 22, @@ -185,6 +198,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 23, @@ -198,6 +212,7 @@ "flag": "FLAG_TEMP_14" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 2, "y": 23, @@ -211,6 +226,7 @@ "flag": "FLAG_TEMP_15" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 39, "y": 26, @@ -224,6 +240,7 @@ "flag": "FLAG_TEMP_16" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 42, "y": 26, @@ -237,6 +254,7 @@ "flag": "FLAG_TEMP_17" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 43, "y": 28, @@ -250,6 +268,7 @@ "flag": "FLAG_TEMP_18" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 45, "y": 30, @@ -263,6 +282,7 @@ "flag": "FLAG_TEMP_19" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 45, "y": 33, @@ -276,6 +296,7 @@ "flag": "FLAG_TEMP_1A" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 25, "y": 1, @@ -289,6 +310,7 @@ "flag": "FLAG_TEMP_1B" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 27, "y": 4, @@ -302,6 +324,7 @@ "flag": "FLAG_TEMP_1C" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 2, @@ -315,6 +338,7 @@ "flag": "FLAG_TEMP_1D" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 26, "y": 2, @@ -328,6 +352,7 @@ "flag": "FLAG_TEMP_1E" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 24, "y": 7, @@ -341,6 +366,7 @@ "flag": "FLAG_TEMP_1F" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 27, "y": 6, diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 54cf4bdef..9380f0fdf 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 4, "y": 9, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 24, "y": 12, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 6, "y": 32, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 10, "y": 22, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 21, "y": 27, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 16, @@ -94,6 +100,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_ESCAPE_ROPE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 22, diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index 9cdb75e2a..c5e9b5e55 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 20, "y": 6, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 3, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_X_SPEED" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 5, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_MOON_STONE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 7, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_TM12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 14, diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index 5ab261edf..5b54baeb8 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 19, "y": 9, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 2, "y": 20, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 12, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_RARE_CANDY" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 14, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_TM21" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 24, diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 0e55fb111..da0f43378 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GIOVANNI", "x": 19, "y": 4, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_HIDEOUT_GIOVANNI" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, "y": 5, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_SILPH_SCOPE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 4, "y": 2, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 2, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_LIFT_KEY" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 19, "y": 14, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 16, "y": 14, @@ -94,6 +100,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 6, @@ -107,6 +114,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_TM49" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 14, @@ -120,6 +128,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_MAX_ETHER" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 23, diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index 96878b73b..b2145ee92 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 6, "y": 28, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 19, "y": 16, diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index 9c82434fb..7b14e946d 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 7, "y": 60, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 4, "y": 62, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 15, "y": 70, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 4, "y": 68, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 13, "y": 44, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 9, "y": 27, @@ -105,6 +111,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 10, "y": 20, @@ -118,6 +125,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 10, "y": 22, @@ -131,6 +139,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 10, "y": 24, @@ -144,6 +153,7 @@ "flag": "FLAG_TEMP_14" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 10, "y": 26, diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index b8c0aa7ed..ce0147d0e 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 9, "y": 4, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 3, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 14, "y": 6, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 12, "y": 5, diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index 665f25678..5c653874f 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index c948dcfc4..0c0f76b57 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 19, "y": 8, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 16, "y": 17, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 31, "y": 8, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 28, "y": 10, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 38, "y": 15, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 50, "y": 4, @@ -105,6 +111,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 42, "y": 8, @@ -118,6 +125,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 50, "y": 14, @@ -131,6 +139,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 57, "y": 16, @@ -144,6 +153,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 32, "y": 18, @@ -157,6 +167,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 42, "y": 12, @@ -170,6 +181,7 @@ "flag": "FLAG_HIDE_ROUTE11_X_DEFEND" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 63, "y": 13, @@ -183,6 +195,7 @@ "flag": "FLAG_HIDE_ROUTE11_GREAT_BALL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 3, diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index 4063642d2..a09cc6f74 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 4, "y": 10, diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index ae37f03ea..9c5a0986e 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 7, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 2, "y": 6, diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index 49f08179c..0d6f31a05 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -32,6 +32,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 17, "y": 32, @@ -45,6 +46,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 9, "y": 40, @@ -58,6 +60,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 16, "y": 47, @@ -71,6 +74,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 13, "y": 59, @@ -84,6 +88,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SNORLAX", "x": 14, "y": 70, @@ -97,6 +102,7 @@ "flag": "FLAG_HIDE_ROUTE_12_SNORLAX" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 13, "y": 92, @@ -110,6 +116,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 10, "y": 99, @@ -123,6 +130,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 18, "y": 108, @@ -136,6 +144,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 11, "y": 100, @@ -149,6 +158,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 18, "y": 36, @@ -162,6 +172,7 @@ "flag": "FLAG_HIDE_ROUTE12_TM48" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 101, @@ -175,6 +186,7 @@ "flag": "FLAG_HIDE_ROUTE12_IRON" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 19, "y": 64, @@ -188,6 +200,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 19, "y": 63, @@ -201,6 +214,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 12, "y": 111, diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index 1ae854e05..1cedae260 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 4, "y": 4, diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index 552880a86..436bc8e47 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 1, "y": 5, diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index 192b2f407..81267ac70 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 7, "y": 5, diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index d22b8fe8b..b2c0fd745 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 62, "y": 6, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 63, "y": 12, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 54, "y": 11, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 42, "y": 7, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 43, "y": 7, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 35, "y": 10, @@ -105,6 +111,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 29, "y": 11, @@ -118,6 +125,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 9, "y": 14, @@ -131,6 +139,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 16, "y": 5, @@ -144,6 +153,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 14, "y": 8, @@ -157,6 +167,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 44, "y": 5, diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 212b190b0..2aea43623 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 7, "y": 37, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 18, "y": 35, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 10, "y": 14, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 16, "y": 16, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 7, "y": 31, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 7, "y": 34, @@ -105,6 +111,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 8, "y": 9, @@ -118,6 +125,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 7, "y": 6, @@ -131,6 +139,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 10, "y": 37, @@ -144,6 +153,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 18, "y": 47, @@ -157,6 +167,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 7, "y": 26, @@ -170,6 +181,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 12, "y": 35, @@ -183,6 +195,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 1, "y": 47, @@ -196,6 +209,7 @@ "flag": "FLAG_TEMP_14" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 13, "y": 51, @@ -209,6 +223,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 12, "y": 51, diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index df6d62329..a698de29c 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 22, "y": 13, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 31, "y": 12, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 37, "y": 14, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 44, "y": 13, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 50, "y": 12, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 59, "y": 12, @@ -105,6 +111,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 63, "y": 13, @@ -118,6 +125,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 52, "y": 8, @@ -131,6 +139,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 54, "y": 12, @@ -144,6 +153,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 28, "y": 6, @@ -157,6 +167,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, "y": 6, @@ -170,6 +181,7 @@ "flag": "FLAG_HIDE_ROUTE15_TM18" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 39, "y": 7, @@ -183,6 +195,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 40, "y": 7, @@ -196,18 +209,12 @@ "flag": "0" }, { + "type": "clone", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", - "in_connection": true, "x": 73, "y": 7, - "elevation": 13, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "32", - "trainer_sight_or_berry_tree_id": "3", - "script": "0x0", - "flag": "0" + "target_local_id": 13, + "target_map": "MAP_ROUTE14" } ], "warp_events": [ diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index 1317b92f8..9ac95b3ef 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index 1bba0494e..ca878b2ba 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 5, "y": 5, diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index 3b63483b2..d0e7f771a 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 16, "y": 12, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 14, "y": 14, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 12, "y": 12, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 8, "y": 12, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 10, "y": 14, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 6, "y": 14, @@ -105,6 +111,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 41, "y": 11, @@ -118,6 +125,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 30, "y": 5, @@ -131,6 +139,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 31, "y": 5, @@ -144,6 +153,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SNORLAX", "x": 31, "y": 13, diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index f8bd335b3..c9e7f326a 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 4, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FEAROW", "x": 9, "y": 3, diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index d79f1d50b..2d289ca2e 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, "y": 8, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 7, "y": 4, diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index bf37d4ab4..256220887 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 6, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 4, "y": 8, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 10, "y": 6, diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 7218a151b..22a4c7ba1 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 4, "y": 18, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 11, "y": 15, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 15, "y": 24, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 18, "y": 41, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 7, "y": 38, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 2, "y": 61, @@ -105,6 +111,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 21, "y": 61, @@ -118,6 +125,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 18, "y": 94, @@ -131,6 +139,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 16, "y": 134, @@ -144,6 +153,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 4, "y": 116, diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 28e35b7a3..fb6c538fc 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 46, "y": 14, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 41, "y": 15, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 39, "y": 12, diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 0cd6eaa19..032fdeb9f 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index 80b9973f6..427e0deb1 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 5, "y": 3, diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index 5fc1f6821..fe9fe5c29 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_LAND", "x": 15, "y": 10, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_LAND", "x": 10, "y": 9, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 12, "y": 17, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 18, "y": 33, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 8, "y": 27, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 16, "y": 22, @@ -105,6 +111,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 11, "y": 47, @@ -118,6 +125,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 14, "y": 48, @@ -131,6 +139,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 12, "y": 49, @@ -144,6 +153,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 9, "y": 48, @@ -157,6 +167,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 8, "y": 41, @@ -170,6 +181,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_TUBER_M_WATER", "x": 9, "y": 41, diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 6ad6a8e57..8bdcf3f51 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 16, "y": 62, @@ -40,6 +41,7 @@ "flag": "FLAG_TEMP_14" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 15, "y": 69, @@ -53,6 +55,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 11, "y": 13, @@ -66,6 +69,7 @@ "flag": "FLAG_TEMP_15" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 18, "y": 26, @@ -79,6 +83,7 @@ "flag": "FLAG_TEMP_16" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 54, @@ -92,6 +97,7 @@ "flag": "FLAG_HIDE_ROUTE2_ETHER" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 64, @@ -105,18 +111,12 @@ "flag": "FLAG_HIDE_ROUTE2_PARALYZE_HEAL" }, { + "type": "clone", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", - "in_connection": true, "x": 6, "y": 85, - "elevation": 8, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NORMAL", - "trainer_sight_or_berry_tree_id": "3", - "script": "0x0", - "flag": "0" + "target_local_id": 8, + "target_map": "MAP_VIRIDIAN_CITY" } ], "warp_events": [ diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index 0f606647d..c53ce065f 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 8, "y": 11, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 16, "y": 14, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 34, "y": 7, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 43, "y": 9, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 23, "y": 10, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 73, "y": 16, @@ -105,6 +111,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 111, "y": 9, @@ -118,6 +125,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 106, "y": 11, @@ -131,6 +139,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 93, "y": 10, @@ -144,6 +153,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 54, "y": 11, @@ -157,6 +167,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 69, "y": 3, diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index 33d256f6e..0126f8d90 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 7, "y": 27, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 16, "y": 26, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 12, "y": 44, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 14, "y": 35, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_TUBER_M_WATER", "x": 15, "y": 35, @@ -92,18 +97,12 @@ "flag": "0" }, { + "type": "clone", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", - "in_connection": true, "x": 13, "y": -3, - "elevation": 2, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "3", - "script": "0x0", - "flag": "0" + "target_local_id": 2, + "target_map": "MAP_PALLET_TOWN" } ], "warp_events": [], diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index f5e648729..72b604725 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 11, "y": 8, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 14, "y": 15, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 15, "y": 24, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 15, "y": 38, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 10, "y": 29, diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index a00677beb..1317ff4e3 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 25, "y": 4, diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index 7367db717..01ab2de00 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 8, "y": 2, diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index 01889aff9..ddb4eeef9 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 15, "y": 149, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 8, "y": 140, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 14, "y": 123, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 16, "y": 112, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 10, "y": 94, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 14, "y": 61, @@ -105,6 +111,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, "y": 35, diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index d3e00bab0..9335104bc 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 12, "y": 15, @@ -40,6 +41,7 @@ "flag": "FLAG_HIDE_NUGGET_BRIDGE_ROCKET" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 12, "y": 19, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 10, "y": 22, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 12, "y": 25, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 10, "y": 28, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 31, @@ -105,6 +111,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 5, "y": 21, @@ -118,6 +125,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 4, diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index 8f93b33a7..7b45398b3 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -22,6 +22,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 11, "y": 4, @@ -35,6 +36,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 18, "y": 2, @@ -48,6 +50,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 17, "y": 7, @@ -61,6 +64,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 22, "y": 4, @@ -74,6 +78,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 22, "y": 8, @@ -87,6 +92,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 27, "y": 9, @@ -100,6 +106,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 28, "y": 4, @@ -113,6 +120,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 36, "y": 4, @@ -126,6 +134,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 42, "y": 5, @@ -139,6 +148,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 2, @@ -152,6 +162,7 @@ "flag": "FLAG_HIDE_ROUTE25_TM43" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 30, "y": 3, @@ -165,6 +176,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 49, "y": 10, @@ -178,6 +190,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 49, "y": 11, diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index 60a490867..d1550e65d 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BILL", "x": 7, "y": 5, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLEFAIRY", "x": 10, "y": 6, diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index f7997cb0b..1ba0e9df0 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 4, "y": 6, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 10, "y": 3, diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index 39c841dd3..4531b0c79 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 4, "y": 5, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GBA_KID", "x": 7, "y": 2, diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index c6cc23713..652f096ff 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 5, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 7, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 10, "y": 5, diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index fbe4c75e0..7930c462d 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 10, "y": 6, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 4, "y": 7, diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index f310180b7..9fbd3634c 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 70, "y": 13, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 40, "y": 11, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 32, "y": 6, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 30, "y": 3, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 25, "y": 4, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 29, "y": 10, @@ -105,6 +111,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 19, "y": 9, @@ -118,6 +125,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 6, @@ -131,6 +139,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 17, "y": 4, diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index a588a2cd1..4692d24dc 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 9, "y": 8, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 75, "y": 3, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 67, "y": 5, @@ -66,6 +69,7 @@ "flag": "FLAG_HIDE_ROUTE4_TM05" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 15, "y": 14, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 47, "y": 3, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 50, "y": 3, @@ -105,18 +111,12 @@ "flag": "0" }, { + "type": "clone", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", - "in_connection": true, "x": 109, "y": 3, - "elevation": 12, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "3", - "trainer_sight_or_berry_tree_id": "3", - "script": "0x0", - "flag": "0" + "target_local_id": 12, + "target_map": "MAP_CERULEAN_CITY" } ], "warp_events": [ diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index b62ee3fbe..071aabffd 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 1, "y": 3, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 12, "y": 5, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 5, "y": 4, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 14, "y": 4, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLIPBOARD", "x": 12, "y": 6, diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index b70232abd..e3deac4ae 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index fa866f235..9f8624c7a 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 4, diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index 9d40775e8..fc8b66ac8 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 1, "y": 5, diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 47c69f5c5..8f9f1821e 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 3, "y": 16, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 12, "y": 21, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 13, "y": 21, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 20, "y": 25, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 13, "y": 32, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 13, "y": 33, diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index 287d13d1c..04867359f 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 7, "y": 5, diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 922a44476..80de4df63 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -27,18 +27,12 @@ ], "object_events": [ { + "type": "clone", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", - "in_connection": true, "x": -8, "y": 12, - "elevation": 10, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "6", - "trainer_sight_or_berry_tree_id": "3", - "script": "0x0", - "flag": "0" + "target_local_id": 10, + "target_map": "MAP_CELADON_CITY" } ], "warp_events": [ diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index b05ab81e7..0dd963003 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 7f0b2e8c4..e1304aa90 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 62, "y": 14, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 55, "y": 15, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 51, "y": 6, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 29, "y": 3, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 29, "y": 4, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 29, "y": 5, @@ -105,6 +111,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 29, "y": 6, @@ -118,6 +125,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 21, "y": 3, @@ -131,6 +139,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 9, "y": 6, @@ -144,6 +153,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 33, "y": 15, @@ -157,6 +167,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 47, "y": 12, @@ -170,6 +181,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 40, "y": 3, @@ -183,6 +195,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 41, "y": 3, @@ -196,6 +209,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 14, "y": 16, @@ -209,6 +223,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 24, "y": 17, diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index d759be75e..f1583f862 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index b733f7a21..1523fc0c4 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 14, "y": 10, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 20, "y": 17, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 61, "y": 16, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 26, "y": 7, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 26, "y": 1, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 49, "y": 7, @@ -105,6 +111,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 53, "y": 2, @@ -118,6 +125,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 60, "y": 9, @@ -131,6 +139,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 36, "y": 6, @@ -144,6 +153,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 2, "y": 8, @@ -157,6 +167,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 17, @@ -170,6 +181,7 @@ "flag": "FLAG_HIDE_ROUTE9_TM40" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 65, "y": 17, diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index fe30bc49f..c7737b75b 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 18, "y": 8, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 12, "y": 9, diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index 47fa01a0c..89cb5ca70 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 2, "y": 5, diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index 0f93495b2..f96591fc9 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 5, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 0, "y": 4, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 2, "y": 6, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 7, diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index 7eec1735f..68c4d8dc8 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 3, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WIGGLYTUFF", "x": 4, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 0, "y": 4, diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index 8a932c9c9..5598fb79f 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 2, "y": 4, diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index 6a3a6e6b0..38456ea10 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 2, "y": 6, diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index 2a504adce..83d01462c 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 3, "y": 5, diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index 91746ee78..2435e864c 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 3, diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index f23f839ee..59678eb49 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 30, "y": 2, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_SS_ANNE_RIVAL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 2, "y": 7, diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index cfd1b60be..cd85d395e 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 1, "y": 4, diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index 2e12441b4..27ffa8b66 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 5, "y": 5, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 1, "y": 4, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 3, diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index 5d8ff0753..f4ca52f39 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 2, "y": 5, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 3, "y": 2, diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index 157f29bf3..3a3e4d107 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 0, "y": 5, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 3, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 4, diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index 7c3e77e1e..c75da955a 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 5, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 3, "y": 5, diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index a57b2e30d..6c87a8ec0 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 1, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 4, "y": 4, diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index 9c2079431..9337e19f3 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 10, "y": 4, diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index cf7bf15ec..e0b41fc12 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 5, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 3, "y": 2, diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index cd01d82b8..af0e08af2 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 3, "y": 5, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 2, diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index 2dbef096c..703525282 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 4, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 5, diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index 68a1ecf65..2da162618 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 3, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 2, "y": 6, diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index ee81b03b4..35487ba46 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 3, "y": 5, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MACHOKE", "x": 2, "y": 5, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 2, diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index ffd6cc1ec..bba9fdf25 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CAPTAIN", "x": 5, "y": 4, diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index 2f74b00ec..4d3dde7f3 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 12, "y": 10, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 14, "y": 11, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 13, "y": 13, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 6, "y": 9, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 11, "y": 5, diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index 000138ce8..bc9a9f9c2 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SS_ANNE", "x": 30, "y": 16, diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 2470b482a..163b88d12 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 1, "y": 5, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 6, "y": 6, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 10, "y": 4, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 8, "y": 9, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 14, "y": 5, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 14, "y": 7, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHEF", "x": 14, "y": 9, @@ -107,6 +114,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 10, diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index 19231b544..bf49fb4b8 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 24, "y": 15, diff --git a/data/maps/SafariZone_Center_RestHouse/map.json b/data/maps/SafariZone_Center_RestHouse/map.json index 9a6211cd5..b5b111f7a 100644 --- a/data/maps/SafariZone_Center_RestHouse/map.json +++ b/data/maps/SafariZone_Center_RestHouse/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 3, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 7, "y": 3, diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index aabf6edc8..3e2151f8c 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 12, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_MAX_POTION" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 37, "y": 15, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_FULL_RESTORE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 18, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_TM11" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 36, "y": 17, diff --git a/data/maps/SafariZone_East_RestHouse/map.json b/data/maps/SafariZone_East_RestHouse/map.json index 136eeb85d..5c0b460ac 100644 --- a/data/maps/SafariZone_East_RestHouse/map.json +++ b/data/maps/SafariZone_East_RestHouse/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 3, "y": 5, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 6, "y": 3, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 7, "y": 3, diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 9611e34fa..e90b9aa0d 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 5, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_PROTEIN" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 28, "y": 9, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_TM47" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 17, diff --git a/data/maps/SafariZone_North_RestHouse/map.json b/data/maps/SafariZone_North_RestHouse/map.json index 7e2f211cd..cecf86a54 100644 --- a/data/maps/SafariZone_North_RestHouse/map.json +++ b/data/maps/SafariZone_North_RestHouse/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 3, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 7, "y": 5, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 6, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 11, "y": 2, diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index 87cd7742d..49061ae7c 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 6, "y": 5, diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index 239f7caef..ed9cef50c 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 28, "y": 14, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 13, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_TM32" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 27, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_POTION" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 24, diff --git a/data/maps/SafariZone_West_RestHouse/map.json b/data/maps/SafariZone_West_RestHouse/map.json index 0716b11b6..ea046b849 100644 --- a/data/maps/SafariZone_West_RestHouse/map.json +++ b/data/maps/SafariZone_West_RestHouse/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 3, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 7, "y": 3, diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index d2a1b424e..8da2e4099 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -38,6 +38,7 @@ "connections_no_include": true, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 22, "y": 15, @@ -51,6 +52,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 26, "y": 16, @@ -64,6 +66,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 46, "y": 13, @@ -77,6 +80,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 27, "y": 22, @@ -90,6 +94,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 25, "y": 33, @@ -103,6 +108,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 34, "y": 31, @@ -116,6 +122,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 30, "y": 39, @@ -129,6 +136,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 48, "y": 24, @@ -142,6 +150,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 37, "y": 32, @@ -155,6 +164,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 21, "y": 23, @@ -168,6 +178,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 39, "y": 16, @@ -181,6 +192,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 44, "y": 22, @@ -194,6 +206,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PIDGEOT", "x": 45, "y": 22, @@ -207,6 +220,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 32, "y": 39, @@ -220,6 +234,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 47, "y": 24, diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/map.json b/data/maps/SaffronCity_CopycatsHouse_1F/map.json index a53910775..c7abb00d7 100644 --- a/data/maps/SaffronCity_CopycatsHouse_1F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 8, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 3, "y": 3, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANSEY", "x": 4, "y": 4, diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json index d281922d1..919c12a0b 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_DODUO", "x": 6, "y": 8, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 4, "y": 6, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_JIGGLYPUFF", "x": 7, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 9, "y": 6, diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index 34a64c7c4..01f94fc0d 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 11, "y": 10, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 1, "y": 10, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 11, "y": 8, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 1, "y": 8, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 6, "y": 5, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, @@ -94,6 +100,7 @@ "flag": "FLAG_HIDE_DOJO_HITMONLEE_BALL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 3, diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index 26a6736b6..4fc950d9b 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 24, "y": 18, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 24, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 4, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 14, "y": 2, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 4, "y": 10, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 4, "y": 18, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SABRINA", "x": 14, "y": 11, @@ -107,6 +114,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 24, "y": 10, @@ -120,6 +128,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 15, "y": 20, diff --git a/data/maps/SaffronCity_House/map.json b/data/maps/SaffronCity_House/map.json index d1232cadb..70e9b3fe9 100644 --- a/data/maps/SaffronCity_House/map.json +++ b/data/maps/SaffronCity_House/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PIDGEY", "x": 0, "y": 5, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 4, "y": 4, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 6, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLIPBOARD", "x": 5, "y": 4, diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index 451ee31d9..b72d0e84e 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 1, "y": 7, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 9, "y": 5, diff --git a/data/maps/SaffronCity_MrPsychicsHouse/map.json b/data/maps/SaffronCity_MrPsychicsHouse/map.json index 6e9a5508d..9e01e083f 100644 --- a/data/maps/SaffronCity_MrPsychicsHouse/map.json +++ b/data/maps/SaffronCity_MrPsychicsHouse/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 7, "y": 4, diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index 3bf36c736..5a87f8862 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 14, "y": 6, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 4, "y": 4, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 9, "y": 6, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "0", "x": 2, "y": 1, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS" }, { + "type": "object", "graphics_id": "0", "x": 3, "y": 1, diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index 71c05de46..24e3e4730 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index dc9f24d6d..538df731e 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 7, "y": 13, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 11, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 3, "y": 13, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 3, "y": 12, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 9, "y": 11, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 7, "y": 12, @@ -94,6 +100,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 9, "y": 12, @@ -107,6 +114,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 5, "y": 11, @@ -120,6 +128,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT" }, { + "type": "object", "graphics_id": "0", "x": 2, "y": 1, @@ -133,6 +142,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { + "type": "object", "graphics_id": "0", "x": 3, "y": 1, diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index b85000671..2f9568cac 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 22, "y": 12, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_1" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 32, "y": 9, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_2" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 8, diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index 014da39a1..f77547a32 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 22, "y": 8, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_1" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 30, "y": 8, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_2" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 18, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B1F_WATER_STONE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 24, "y": 14, diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index 5d770655f..2c538969c 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 22, "y": 8, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_1" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 30, "y": 8, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_2" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 18, "y": 15, diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index 21f25cfba..9c0d910c4 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 23, "y": 8, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_1" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 24, "y": 8, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_2" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 16, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_5" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 13, "y": 16, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_6" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 16, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_4" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 17, diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 44c4268c8..f7cf6a0a0 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 18, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_1" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 18, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_2" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ARTICUNO", "x": 9, "y": 2, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_ARTICUNO" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 22, "y": 19, diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index 08494194a..6f0157a1c 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 7, "y": 18, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 9, "y": 7, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 15, "y": 5, diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index 3e11a65ca..4c0a1879e 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 6, diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index d1dc104c8..1315c5430 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 4, "y": 4, diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json index 93b0a3a6e..04375b39e 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 6, "y": 5, diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index a74ef6c45..0dac386df 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 6, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 9, "y": 5, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 5, "y": 4, diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index a73cb405b..ab0e7158c 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 5, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 14, "y": 6, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 4, "y": 4, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "0", "x": 3, "y": 1, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { + "type": "object", "graphics_id": "0", "x": 2, "y": 1, diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index f7d97b3ca..ef43a8fa1 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 824d75723..ce1002299 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "x": 13, "y": 43, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 13, "y": 36, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 3, "y": 35, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 3, "y": 36, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 7, "y": 56, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 11, "y": 63, @@ -105,6 +111,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 14, "y": 13, @@ -118,6 +125,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 14, "y": 14, @@ -131,6 +139,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 41, @@ -144,6 +153,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 13, "y": 47, @@ -157,6 +167,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 44, @@ -170,6 +181,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 12, "y": 47, @@ -183,6 +195,7 @@ "flag": "FLAG_TEMP_15" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 46, @@ -196,6 +209,7 @@ "flag": "FLAG_TEMP_16" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 16, "y": 47, @@ -209,6 +223,7 @@ "flag": "FLAG_TEMP_17" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 17, "y": 47, @@ -222,6 +237,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 31, @@ -235,6 +251,7 @@ "flag": "FLAG_TEMP_1B" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 18, "y": 45, @@ -248,6 +265,7 @@ "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_KINGS_ROCK" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 38, @@ -261,6 +279,7 @@ "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_MAX_ELIXIR" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 23, @@ -274,6 +293,7 @@ "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_NUGGET" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 8, "y": 26, diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 58c07698e..b86e59a1d 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 12, "y": 6, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 3, "y": 34, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 4, "y": 34, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 11, "y": 26, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 10, "y": 26, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 11, "y": 17, @@ -105,18 +111,12 @@ "flag": "0" }, { + "type": "clone", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", - "in_connection": true, "x": 7, "y": -2, - "elevation": 1, - "movement_type": "MOVEMENT_TYPE_NONE", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "17", - "trainer_sight_or_berry_tree_id": "3", - "script": "0x0", - "flag": "0" + "target_local_id": 1, + "target_map": "MAP_SEVEN_ISLAND" } ], "warp_events": [], diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index f697cb790..e1a5d7460 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 2, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANSEY", "x": 4, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 4, diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index e8f0d9181..d59f38bd2 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 6, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 6, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 9, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 10, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 10, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 9, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 6, diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index 31455ac19..e589e8362 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -22,6 +22,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 35, "y": 7, @@ -35,6 +36,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 121, "y": 11, @@ -48,6 +50,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 85, "y": 8, @@ -61,6 +64,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 85, "y": 5, diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index d6be87d75..365be8499 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -22,6 +22,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 56, "y": 26, @@ -35,6 +36,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 56, "y": 29, diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index b867283ab..f3ca6b9ed 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 2, "y": 7, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 10, "y": 17, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 0, "y": 13, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 15, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_SILPH_CO_10F_CARBOS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 15, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_SILPH_CO_10F_ULTRA_BALL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 17, diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 07479d1d8..0a40ff336 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 9, "y": 9, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 11, "y": 9, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GIOVANNI", "x": 6, "y": 11, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 16, "y": 12, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 18, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_SILPH_CO_11F_ZINC" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 2, "y": 19, diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index aba93eb0a..fe60d23e3 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 3, "y": 7, diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index 55b2da754..3b7940b21 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 29, "y": 12, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 28, "y": 18, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 20, "y": 14, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 5, "y": 19, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 10, "y": 4, diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index b8617c70b..75c82254c 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 25, "y": 9, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 31, "y": 13, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 4, "y": 12, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 10, diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index e02b30912..978582eac 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 33, "y": 16, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 10, "y": 19, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 14, "y": 8, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 5, "y": 5, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 11, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_SILPH_CO_4F_MAX_REVIVE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 12, @@ -94,6 +100,7 @@ "flag": "FLAG_HIDE_SILPH_CO_4F_ESCAPE_ROPE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 13, @@ -107,6 +114,7 @@ "flag": "FLAG_HIDE_SILPH_CO_4F_FULL_HEAL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 18, diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 6fcc56f08..5f76346bf 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 35, "y": 7, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 23, "y": 13, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 16, "y": 13, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 11, "y": 6, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 9, "y": 21, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 9, @@ -94,6 +100,7 @@ "flag": "FLAG_HIDE_SILPH_CO_5F_PROTEIN" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 18, @@ -107,6 +114,7 @@ "flag": "FLAG_HIDE_SILPH_CO_5F_TM01" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 22, "y": 21, @@ -120,6 +128,7 @@ "flag": "FLAG_HIDE_SILPH_CO_5F_CARD_KEY" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 2, "y": 7, diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index ca17ad516..081752b34 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 21, "y": 5, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 23, "y": 9, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 24, "y": 9, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 22, "y": 13, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 14, "y": 9, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 16, "y": 12, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 9, "y": 11, @@ -107,6 +114,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 14, @@ -120,6 +128,7 @@ "flag": "FLAG_HIDE_SILPH_CO_6F_HP_UP" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 17, @@ -133,6 +142,7 @@ "flag": "FLAG_HIDE_SILPH_CO_6F_X_SPECIAL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 18, "y": 17, diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index 2257544b7..21e3dc0ad 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 2, "y": 6, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_SILPH_RIVAL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 0, "y": 7, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 24, "y": 5, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 24, "y": 15, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 13, "y": 4, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 10, "y": 10, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 13, "y": 14, @@ -107,6 +114,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 9, "y": 14, @@ -120,6 +128,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 3, "y": 13, @@ -133,6 +142,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 12, @@ -146,6 +156,7 @@ "flag": "FLAG_HIDE_SILPH_CO_7F_CALCIUM" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 11, diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index ed2d8dd32..a901ec1b8 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 28, "y": 5, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 10, "y": 17, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 9, "y": 4, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_M", "x": 2, "y": 5, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 24, "y": 8, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_SILPH_CO_8F_IRON" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 29, "y": 9, diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index a5cb18329..cbd76fef4 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 26, "y": 16, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 15, "y": 18, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 2, "y": 16, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 1, "y": 6, diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index 89d0c6eff..daa46f76c 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -22,6 +22,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 10, "y": 15, @@ -35,6 +36,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 15, "y": 13, diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index 9909f8a4a..1df78033e 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAPPHIRE", "x": 7, "y": 7, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_SAPPHIRE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 5, "y": 9, diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index 30ca97e51..0b9dde9b6 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 11, "y": 8, diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index ce3ba9b04..18524878a 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 6, diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index 682351b4c..acca8851e 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 7, "y": 5, diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index 7201f0851..90774c5ec 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 8, "y": 3, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 7, "y": 7, diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index 1c353c29b..c5a4b7c8e 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -22,6 +22,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKET_M", "x": 9, "y": 24, @@ -35,6 +36,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 12, "y": 15, @@ -48,6 +50,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 13, "y": 34, @@ -61,6 +64,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 14, "y": 61, @@ -74,6 +78,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 10, "y": 44, @@ -87,6 +92,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_TUBER_M_WATER", "x": 11, "y": 44, @@ -100,6 +106,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 16, diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index 37c0cca48..8231109bd 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 48, "y": 15, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 10, "y": 5, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 51, "y": 6, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 13, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 37, "y": 23, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 32, "y": 5, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 52, "y": 20, @@ -107,6 +114,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 8, "y": 21, @@ -120,6 +128,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 39, "y": 6, @@ -133,6 +142,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 3, "y": 9, @@ -146,6 +156,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 19, "y": 24, @@ -159,6 +170,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 30, "y": 19, diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index 4ddf8f3b5..34fadf276 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLUE", "x": 5, "y": 5, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 13, "y": 3, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 12, "y": 5, diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index 6fa988e71..941989e3d 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index 1233ea32a..9e2851451 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -22,6 +22,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 24, "y": 25, @@ -35,6 +36,7 @@ "flag": "FLAG_HIDE_RUIN_VALLEY_SCIENTIST" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 32, "y": 11, @@ -48,6 +50,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 33, "y": 16, @@ -61,6 +64,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 31, "y": 24, @@ -74,6 +78,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 14, "y": 10, @@ -87,6 +92,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 21, "y": 29, @@ -100,6 +106,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 17, "y": 10, @@ -113,6 +120,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 17, "y": 12, @@ -126,6 +134,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 18, "y": 11, @@ -139,6 +148,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 33, @@ -152,6 +162,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 34, @@ -165,6 +176,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 41, "y": 32, @@ -178,6 +190,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 41, "y": 33, @@ -191,6 +204,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 42, "y": 33, @@ -204,6 +218,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 33, @@ -217,6 +232,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_HP_UP" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 11, @@ -230,6 +246,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_FULL_RESTORE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 43, "y": 32, diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index 952fd541e..080a0749d 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -32,6 +32,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 12, "y": 13, @@ -45,6 +46,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 11, "y": 52, @@ -58,6 +60,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M_WATER", "x": 13, "y": 35, @@ -71,6 +74,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 15, "y": 45, @@ -84,6 +88,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 21, @@ -97,6 +102,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 7, "y": 21, @@ -110,6 +116,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 11, "y": 76, @@ -123,6 +130,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 19, @@ -136,6 +144,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_WATER_PATH_ELIXIR" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 87, diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index 88e50542f..266c79a8a 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 3, "y": 4, diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index fe1e53c65..0964b2399 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 7, "y": 4, diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index b760e50b2..7b593a7be 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 7, "y": 24, @@ -40,6 +41,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 8, "y": 23, @@ -53,6 +55,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 8, "y": 24, @@ -66,6 +69,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_LONE_BIKER" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 9, "y": 23, @@ -79,6 +83,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 9, "y": 24, @@ -92,6 +97,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 10, "y": 22, @@ -105,6 +111,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 10, "y": 24, @@ -118,6 +125,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 11, "y": 23, @@ -131,6 +139,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 20, "y": 7, @@ -144,6 +153,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 18, "y": 17, @@ -157,6 +167,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_ZINC" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 15, "y": 7, @@ -170,6 +181,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 14, "y": 14, @@ -183,6 +195,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_DODUO", "x": 15, "y": 14, @@ -196,6 +209,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 15, "y": 31, diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 874b9f089..7c03e0d7c 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 4, "y": 8, @@ -29,6 +30,7 @@ "flag": "FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 12, "y": 11, @@ -42,6 +44,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 19, "y": 7, @@ -55,6 +58,7 @@ "flag": "FLAG_TEMP_13" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 23, "y": 17, @@ -68,6 +72,7 @@ "flag": "FLAG_TEMP_14" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 38, "y": 23, @@ -81,6 +86,7 @@ "flag": "FLAG_TEMP_15" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 44, "y": 23, @@ -94,6 +100,7 @@ "flag": "FLAG_TEMP_16" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 44, "y": 29, @@ -107,6 +114,7 @@ "flag": "FLAG_TEMP_17" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 16, "y": 43, @@ -120,6 +128,7 @@ "flag": "FLAG_TEMP_18" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 17, "y": 39, @@ -133,6 +142,7 @@ "flag": "FLAG_TEMP_19" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 14, "y": 39, @@ -146,6 +156,7 @@ "flag": "FLAG_TEMP_1A" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 11, "y": 39, @@ -159,6 +170,7 @@ "flag": "FLAG_TEMP_1B" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 5, @@ -172,6 +184,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ETHER" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 11, @@ -185,6 +198,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_FULL_HEAL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 43, diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 80f8c79ed..69cd2ab45 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -22,6 +22,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 27, "y": 10, @@ -35,6 +36,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 68, "y": 10, @@ -48,6 +50,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 33, "y": 13, @@ -61,6 +64,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 50, "y": 11, @@ -74,6 +78,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F_WATER", "x": 36, "y": 4, @@ -87,6 +92,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 77, "y": 5, @@ -100,6 +106,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 78, "y": 5, @@ -113,6 +120,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 72, "y": 8, @@ -126,6 +134,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 86, "y": 13, diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index f5c957505..c4b7b5a6a 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 23, "y": 2, diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index f9219d5c2..17d8caccd 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 6, diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index aa356997b..0922488e0 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 3, "y": 4, diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index 01fd8fe58..a079b8482 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 4, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 7, "y": 4, diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index e3c4c467c..608bae55e 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 2, diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index 25e2193a0..93c3d4c12 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 7, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 6, "y": 3, diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index 19f808a4a..7f2f8becf 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 2, "y": 5, diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index c1e596005..682126052 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 2, "y": 7, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 6, "y": 5, diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 532c0766c..1f61598aa 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 12, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 4, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 11, "y": 5, diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index 265d66974..a6ba54a41 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index 794b27b4e..e5cd31db8 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -22,6 +22,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 14, "y": 9, @@ -35,6 +36,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 8, "y": 8, @@ -48,6 +50,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 13, "y": 10, diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 4c35a5942..098772ac9 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 9, "y": 6, diff --git a/data/maps/TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json index 4b12dc8a0..58b696f35 100644 --- a/data/maps/TrainerTower_1F/map.json +++ b/data/maps/TrainerTower_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, @@ -29,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 11, "y": 10, @@ -42,6 +44,7 @@ "flag": "FLAG_TEMP_2" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, @@ -55,6 +58,7 @@ "flag": "FLAG_TEMP_3" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, @@ -68,6 +72,7 @@ "flag": "FLAG_TEMP_4" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 10, "y": 10, diff --git a/data/maps/TrainerTower_2F/map.json b/data/maps/TrainerTower_2F/map.json index 5972e45b4..c40c83b34 100644 --- a/data/maps/TrainerTower_2F/map.json +++ b/data/maps/TrainerTower_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, @@ -29,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, @@ -42,6 +44,7 @@ "flag": "FLAG_TEMP_2" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, @@ -55,6 +58,7 @@ "flag": "FLAG_TEMP_3" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, @@ -68,6 +72,7 @@ "flag": "FLAG_TEMP_4" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, diff --git a/data/maps/TrainerTower_3F/map.json b/data/maps/TrainerTower_3F/map.json index 10becb1c8..6c1bc8950 100644 --- a/data/maps/TrainerTower_3F/map.json +++ b/data/maps/TrainerTower_3F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, @@ -29,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, @@ -42,6 +44,7 @@ "flag": "FLAG_TEMP_2" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, @@ -55,6 +58,7 @@ "flag": "FLAG_TEMP_3" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, @@ -68,6 +72,7 @@ "flag": "FLAG_TEMP_4" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, diff --git a/data/maps/TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json index 07c1183f3..40abcc338 100644 --- a/data/maps/TrainerTower_4F/map.json +++ b/data/maps/TrainerTower_4F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, @@ -29,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, @@ -42,6 +44,7 @@ "flag": "FLAG_TEMP_2" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, @@ -55,6 +58,7 @@ "flag": "FLAG_TEMP_3" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, @@ -68,6 +72,7 @@ "flag": "FLAG_TEMP_4" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, diff --git a/data/maps/TrainerTower_5F/map.json b/data/maps/TrainerTower_5F/map.json index 5f7d41602..0e4e358fd 100644 --- a/data/maps/TrainerTower_5F/map.json +++ b/data/maps/TrainerTower_5F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, @@ -29,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, @@ -42,6 +44,7 @@ "flag": "FLAG_TEMP_2" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, @@ -55,6 +58,7 @@ "flag": "FLAG_TEMP_3" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, @@ -68,6 +72,7 @@ "flag": "FLAG_TEMP_4" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json index 8a30e713c..37fc68129 100644 --- a/data/maps/TrainerTower_6F/map.json +++ b/data/maps/TrainerTower_6F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, @@ -29,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, @@ -42,6 +44,7 @@ "flag": "FLAG_TEMP_2" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, @@ -55,6 +58,7 @@ "flag": "FLAG_TEMP_3" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, @@ -68,6 +72,7 @@ "flag": "FLAG_TEMP_4" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json index bfdd31391..83b8b8a8f 100644 --- a/data/maps/TrainerTower_7F/map.json +++ b/data/maps/TrainerTower_7F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, @@ -29,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, @@ -42,6 +44,7 @@ "flag": "FLAG_TEMP_2" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, @@ -55,6 +58,7 @@ "flag": "FLAG_TEMP_3" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, @@ -68,6 +72,7 @@ "flag": "FLAG_TEMP_4" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json index 2b3358855..3ae1211bb 100644 --- a/data/maps/TrainerTower_8F/map.json +++ b/data/maps/TrainerTower_8F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, @@ -29,6 +30,7 @@ "flag": "FLAG_TEMP_6" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 10, @@ -42,6 +44,7 @@ "flag": "FLAG_TEMP_2" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 13, @@ -55,6 +58,7 @@ "flag": "FLAG_TEMP_3" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 16, @@ -68,6 +72,7 @@ "flag": "FLAG_TEMP_4" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 11, "y": 10, diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json index 1fa9f1869..3bd89a4c9 100644 --- a/data/maps/TrainerTower_Lobby/map.json +++ b/data/maps/TrainerTower_Lobby/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 4, "y": 9, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 14, "y": 9, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 11, "y": 7, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 12, "y": 13, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 2, "y": 12, diff --git a/data/maps/TrainerTower_Roof/map.json b/data/maps/TrainerTower_Roof/map.json index ee528571e..cc42f893c 100644 --- a/data/maps/TrainerTower_Roof/map.json +++ b/data/maps/TrainerTower_Roof/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index bb680ce77..8263f2953 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -22,6 +22,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 28, "y": 4, @@ -35,6 +36,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 31, "y": 6, @@ -48,6 +50,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_WOMAN" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 30, "y": 11, @@ -61,6 +64,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_BEAUTY" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 26, "y": 5, @@ -74,6 +78,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 27, "y": 6, @@ -87,6 +92,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_SUPER_NERD" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 30, "y": 16, @@ -100,6 +106,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 39, "y": 16, @@ -113,6 +120,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_REVIVE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 37, "y": 12, @@ -126,6 +134,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 24, "y": 12, diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index 5ffda9b54..6d6456e21 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CHANNELER", "x": 4, "y": 4, diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index be3073e86..07c78ebf4 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 6, diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index acb50d880..28286b198 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 7, "y": 5, diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 213e7ea20..efaeecdc9 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 5, "y": 5, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BIKER", "x": 5, "y": 8, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 5, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 4, "y": 2, diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index ad6c90d96..b241134ff 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GBA_KID", "x": 11, "y": 5, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 4, "y": 4, diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index d6c52f551..9d57d7a33 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json index fdd6613a0..91fe1143e 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, "y": 6, diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json index 9dda62055..ee360615b 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 5, "y": 6, diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json index 9109d7035..e6b3ea257 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, "y": 6, diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json index 9fbfb4cd6..e987e2e7f 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 5, "y": 6, diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index ec4ea7e21..057ee2fc3 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 3, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 1, "y": 8, @@ -42,6 +44,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 7, "y": 8, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 1, "y": 4, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 7, "y": 4, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 13, "y": 4, @@ -94,6 +100,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 6, @@ -107,6 +114,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 8, @@ -120,6 +128,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 4, "y": 6, diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 9c3a5e558..f37f90399 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -27,6 +27,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 22, "y": 11, @@ -40,6 +41,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 17, "y": 9, @@ -53,6 +55,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 36, "y": 10, @@ -66,6 +69,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MACHOP", "x": 35, "y": 11, @@ -79,6 +83,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 31, "y": 30, @@ -92,6 +97,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 24, "y": 33, @@ -105,6 +111,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 19, "y": 24, @@ -118,6 +125,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 25, "y": 7, diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json index 66c27c611..936866d6c 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LT_SURGE", "x": 5, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 2, "y": 11, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 13, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 4, "y": 17, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 7, "y": 8, diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index 5ddb668e4..9c8bdec89 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FISHER", "x": 4, "y": 5, diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index c91403a4e..ce9ed5ee3 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 4, "y": 4, diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index 00228071a..1283bfdb7 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 7, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PIDGEY", "x": 2, "y": 5, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLIPBOARD", "x": 6, "y": 4, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 2, "y": 4, diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index 472cfd606..5eca5f366 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 4, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 9, "y": 4, diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index d08b85b28..42b53dd2b 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 4, "y": 8, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 12, "y": 5, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 14, "y": 4, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 6, "y": 4, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "0", "x": 2, "y": 1, @@ -94,6 +100,7 @@ "flag": "FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL" }, { + "type": "object", "graphics_id": "0", "x": 3, "y": 1, diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 8866e68b4..49f8af57e 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index b5df8639c..9d7e914f0 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 5, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WORKER_F", "x": 6, "y": 4, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 7, "y": 6, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SEEL", "x": 4, "y": 6, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 4, "y": 5, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 7, "y": 5, diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 45801a27c..3fdf718bd 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 5, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 14, "y": 6, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 3, @@ -55,6 +58,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_1F_RARE_CANDY" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 1, @@ -68,6 +72,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 18, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 12, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 16, "y": 3, diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 0c389ff08..9bdf82001 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", "x": 7, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 20, "y": 11, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 31, "y": 16, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 26, "y": 6, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ROCKER", "x": 36, "y": 5, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 6, @@ -94,6 +100,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_GUARD_SPEC" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 40, "y": 7, @@ -107,6 +114,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM07" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 25, "y": 13, @@ -120,6 +128,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_FULL_HEAL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 13, @@ -133,6 +142,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM37" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 7, @@ -146,6 +156,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 17, @@ -159,6 +170,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 33, "y": 19, @@ -172,6 +184,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_BOULDER" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 40, "y": 9, diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index c53d1d2cc..98d26f392 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 40, "y": 7, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 21, "y": 5, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 10, "y": 17, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 11, "y": 16, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 38, "y": 7, @@ -81,6 +86,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_MAX_REVIVE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 9, @@ -94,6 +100,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 19, "y": 15, @@ -107,6 +114,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 33, "y": 18, @@ -120,6 +128,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_BOULDER" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 35, "y": 13, @@ -133,6 +142,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 32, "y": 5, @@ -146,6 +156,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 38, "y": 13, @@ -159,6 +170,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F", "x": 39, "y": 13, diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index ea6a6794a..c20f232af 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -32,6 +32,7 @@ ], "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 8, "y": 26, @@ -45,6 +46,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 11, "y": 24, @@ -58,6 +60,7 @@ "flag": "FLAG_TEMP_11" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 34, "y": 11, @@ -71,6 +74,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 21, "y": 6, @@ -84,6 +88,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 20, "y": 12, @@ -97,6 +102,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 33, "y": 26, @@ -110,6 +116,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 16, "y": 22, @@ -123,6 +130,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "x": 18, "y": 5, @@ -136,6 +144,7 @@ "flag": "FLAG_TEMP_12" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 5, diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index b0e1599f5..0c7278947 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 10, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 12, "y": 10, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 11, "y": 14, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 10, "y": 10, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MAN", "x": 2, "y": 21, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", "x": 3, "y": 11, @@ -94,6 +100,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 6, "y": 8, @@ -107,6 +114,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GIOVANNI", "x": 2, "y": 2, @@ -120,6 +128,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_GIOVANNI" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M", "x": 13, "y": 7, @@ -133,6 +142,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GYM_GUY", "x": 16, "y": 20, diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index eb5780daa..35fe859f1 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN", "x": 7, "y": 4, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 2, "y": 5, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_SPEAROW", "x": 6, "y": 6, diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index 3b2b1cbbf..3524669b8 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 4, "y": 5, diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index 0428205d0..91bb7aead 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CLERK", "x": 2, "y": 3, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 6, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 9, "y": 5, diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index 935bcd10b..2b8733bc3 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 12, "y": 5, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 4, "y": 7, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 2, "y": 3, diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index d34ec1462..5453270bb 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index f8d799501..494dbd394 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -16,6 +16,7 @@ "connections": null, "object_events": [ { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 29, "y": 58, @@ -29,6 +30,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BOY", "x": 45, "y": 58, @@ -42,6 +44,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 47, "y": 45, @@ -55,6 +58,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 47, "y": 29, @@ -68,6 +72,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 22, @@ -81,6 +86,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 41, @@ -94,6 +100,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POKE_BALL" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 40, "y": 21, @@ -107,6 +114,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_FOREST_ANTIDOTE" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 21, "y": 34, @@ -120,6 +128,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 43, "y": 6, @@ -133,6 +142,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 16, "y": 5, @@ -146,6 +156,7 @@ "flag": "0" }, { + "type": "object", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 49, "y": 60, diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index f1291b1ea..99d3e4209 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -192,4 +192,7 @@ #define OBJ_EVENT_ID_PLAYER 0xFF #define OBJ_EVENT_ID_CAMERA 0x7F +#define OBJ_KIND_NORMAL 0 +#define OBJ_KIND_CLONE 255 + #endif // GUARD_CONSTANTS_EVENT_OBJECTS_H diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 520f06738..ad6789759 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -83,9 +83,6 @@ struct BackupMapLayout u16 *map; }; -#define OBJ_KIND_NORMAL 0 -#define OBJ_KIND_CLONE 255 - struct ObjectEventTemplate { u8 localId; @@ -103,9 +100,7 @@ struct ObjectEventTemplate } normal; struct { u8 targetLocalId; - u8 padding1; - u16 padding2:4; - u16 padding3:4; + u8 padding[3]; u16 targetMapNum; u16 targetMapGroup; } clone; diff --git a/src/overworld.c b/src/overworld.c index 89bf5d785..4c1aa54b1 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -47,6 +47,7 @@ #include "trainer_pokemon_sprites.h" #include "vs_seeker.h" #include "wild_encounter.h" +#include "constants/event_objects.h" #include "constants/maps.h" #include "constants/region_map_sections.h" #include "constants/songs.h" @@ -405,7 +406,7 @@ static void LoadObjEventTemplatesFromHeader(void) { if (gMapHeader.events->objectEvents[i].kind == OBJ_KIND_CLONE) { - // load "in_connection" object from the connecting map + // load target object from the connecting map u8 localId = gMapHeader.events->objectEvents[i].objUnion.clone.targetLocalId; u8 mapNum = gMapHeader.events->objectEvents[i].objUnion.clone.targetMapNum; u8 mapGroup = gMapHeader.events->objectEvents[i].objUnion.clone.targetMapGroup; diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 0b07f1208..79445e6cd 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -288,19 +288,28 @@ string generate_firered_map_events_text(Json map_data) { text << objects_label << "::\n"; for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) { auto obj_event = map_data["object_events"].array_items()[i]; - text << "\tobject_event " << i + 1 << ", " - << obj_event["graphics_id"].string_value() << ", " - << (obj_event["in_connection"].bool_value() ? 255 : 0) << ", " - << obj_event["x"].int_value() << ", " - << obj_event["y"].int_value() << ", " - << obj_event["elevation"].int_value() << ", " - << obj_event["movement_type"].string_value() << ", " - << obj_event["movement_range_x"].int_value() << ", " - << obj_event["movement_range_y"].int_value() << ", " - << obj_event["trainer_type"].string_value() << ", " - << obj_event["trainer_sight_or_berry_tree_id"].string_value() << ", " - << obj_event["script"].string_value() << ", " - << obj_event["flag"].string_value() << "\n"; + string type = obj_event["type"].string_value(); + if (type == "object") { + text << "\tobject_event " << i + 1 << ", " + << obj_event["graphics_id"].string_value() << ", " + << obj_event["x"].int_value() << ", " + << obj_event["y"].int_value() << ", " + << obj_event["elevation"].int_value() << ", " + << obj_event["movement_type"].string_value() << ", " + << obj_event["movement_range_x"].int_value() << ", " + << obj_event["movement_range_y"].int_value() << ", " + << obj_event["trainer_type"].string_value() << ", " + << obj_event["trainer_sight_or_berry_tree_id"].string_value() << ", " + << obj_event["script"].string_value() << ", " + << obj_event["flag"].string_value() << "\n"; + } else if (type == "clone") { + text << "\tclone_event " << i + 1 << ", " + << obj_event["graphics_id"].string_value() << ", " + << obj_event["x"].int_value() << ", " + << obj_event["y"].int_value() << ", " + << obj_event["target_local_id"].int_value() << ", " + << obj_event["target_map"].string_value() << "\n"; + } } text << "\n"; } else { From bfd1fb2419de4a3eef9bf9c09349a38f91d9c3c9 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 3 Sep 2022 14:59:18 -0400 Subject: [PATCH 3/3] MAP_NONE -> MAP_DYNAMIC, treat warp ids as strings to allow constants --- asm/macros/event.inc | 2 +- data/maps/BattleColosseum_2P/map.json | 8 +-- data/maps/BattleColosseum_4P/map.json | 16 ++--- data/maps/BirthIsland_Exterior/map.json | 2 +- data/maps/BirthIsland_Harbor/map.json | 2 +- data/maps/CeladonCity/map.json | 26 ++++---- .../maps/CeladonCity_Condominiums_1F/map.json | 12 ++-- .../maps/CeladonCity_Condominiums_2F/map.json | 8 +-- .../maps/CeladonCity_Condominiums_3F/map.json | 8 +-- .../CeladonCity_Condominiums_Roof/map.json | 6 +- .../map.json | 6 +- .../CeladonCity_DepartmentStore_1F/map.json | 16 ++--- .../CeladonCity_DepartmentStore_2F/map.json | 6 +- .../CeladonCity_DepartmentStore_3F/map.json | 6 +- .../CeladonCity_DepartmentStore_4F/map.json | 6 +- .../CeladonCity_DepartmentStore_5F/map.json | 6 +- .../map.json | 8 +-- .../CeladonCity_DepartmentStore_Roof/map.json | 2 +- data/maps/CeladonCity_GameCorner/map.json | 8 +-- .../CeladonCity_GameCorner_PrizeRoom/map.json | 6 +- data/maps/CeladonCity_Gym/map.json | 6 +- data/maps/CeladonCity_Hotel/map.json | 6 +- data/maps/CeladonCity_House1/map.json | 6 +- .../CeladonCity_PokemonCenter_1F/map.json | 8 +-- .../CeladonCity_PokemonCenter_2F/map.json | 6 +- data/maps/CeladonCity_Restaurant/map.json | 6 +- data/maps/CeruleanCave_1F/map.json | 16 ++--- data/maps/CeruleanCave_2F/map.json | 12 ++-- data/maps/CeruleanCave_B1F/map.json | 2 +- data/maps/CeruleanCity/map.json | 28 ++++---- data/maps/CeruleanCity_BikeShop/map.json | 6 +- data/maps/CeruleanCity_Gym/map.json | 6 +- data/maps/CeruleanCity_House1/map.json | 8 +-- data/maps/CeruleanCity_House2/map.json | 8 +-- data/maps/CeruleanCity_House3/map.json | 6 +- data/maps/CeruleanCity_House4/map.json | 2 +- data/maps/CeruleanCity_House5/map.json | 2 +- data/maps/CeruleanCity_Mart/map.json | 6 +- .../CeruleanCity_PokemonCenter_1F/map.json | 8 +-- .../CeruleanCity_PokemonCenter_2F/map.json | 6 +- data/maps/CinnabarIsland/map.json | 10 +-- data/maps/CinnabarIsland_Gym/map.json | 6 +- data/maps/CinnabarIsland_Mart/map.json | 6 +- .../CinnabarIsland_PokemonCenter_1F/map.json | 8 +-- .../CinnabarIsland_PokemonCenter_2F/map.json | 6 +- .../map.json | 12 ++-- .../map.json | 2 +- .../CinnabarIsland_PokemonLab_Lounge/map.json | 2 +- .../map.json | 2 +- data/maps/DiglettsCave_B1F/map.json | 4 +- data/maps/DiglettsCave_NorthEntrance/map.json | 4 +- data/maps/DiglettsCave_SouthEntrance/map.json | 4 +- data/maps/FiveIsland/map.json | 8 +-- data/maps/FiveIsland_Harbor/map.json | 2 +- data/maps/FiveIsland_House1/map.json | 2 +- data/maps/FiveIsland_House2/map.json | 2 +- .../FiveIsland_LostCave_Entrance/map.json | 4 +- data/maps/FiveIsland_LostCave_Room1/map.json | 10 +-- data/maps/FiveIsland_LostCave_Room10/map.json | 2 +- data/maps/FiveIsland_LostCave_Room11/map.json | 2 +- data/maps/FiveIsland_LostCave_Room12/map.json | 2 +- data/maps/FiveIsland_LostCave_Room13/map.json | 2 +- data/maps/FiveIsland_LostCave_Room14/map.json | 2 +- data/maps/FiveIsland_LostCave_Room2/map.json | 8 +-- data/maps/FiveIsland_LostCave_Room3/map.json | 8 +-- data/maps/FiveIsland_LostCave_Room4/map.json | 8 +-- data/maps/FiveIsland_LostCave_Room5/map.json | 8 +-- data/maps/FiveIsland_LostCave_Room6/map.json | 8 +-- data/maps/FiveIsland_LostCave_Room7/map.json | 8 +-- data/maps/FiveIsland_LostCave_Room8/map.json | 8 +-- data/maps/FiveIsland_LostCave_Room9/map.json | 8 +-- data/maps/FiveIsland_Meadow/map.json | 2 +- .../maps/FiveIsland_PokemonCenter_1F/map.json | 4 +- .../maps/FiveIsland_PokemonCenter_2F/map.json | 6 +- data/maps/FiveIsland_ResortGorgeous/map.json | 4 +- .../FiveIsland_ResortGorgeous_House/map.json | 2 +- data/maps/FiveIsland_RocketWarehouse/map.json | 2 +- data/maps/FourIsland/map.json | 16 ++--- data/maps/FourIsland_Harbor/map.json | 2 +- data/maps/FourIsland_House1/map.json | 2 +- data/maps/FourIsland_House2/map.json | 2 +- data/maps/FourIsland_IcefallCave_1F/map.json | 12 ++-- data/maps/FourIsland_IcefallCave_B1F/map.json | 6 +- .../maps/FourIsland_IcefallCave_Back/map.json | 2 +- .../FourIsland_IcefallCave_Entrance/map.json | 6 +- data/maps/FourIsland_LoreleisHouse/map.json | 2 +- data/maps/FourIsland_Mart/map.json | 2 +- .../maps/FourIsland_PokemonCenter_1F/map.json | 4 +- .../maps/FourIsland_PokemonCenter_2F/map.json | 6 +- data/maps/FourIsland_PokemonDayCare/map.json | 2 +- data/maps/FuchsiaCity/map.json | 22 +++---- data/maps/FuchsiaCity_Gym/map.json | 6 +- data/maps/FuchsiaCity_House1/map.json | 6 +- data/maps/FuchsiaCity_House2/map.json | 8 +-- data/maps/FuchsiaCity_House3/map.json | 2 +- data/maps/FuchsiaCity_Mart/map.json | 6 +- .../FuchsiaCity_PokemonCenter_1F/map.json | 8 +-- .../FuchsiaCity_PokemonCenter_2F/map.json | 6 +- .../FuchsiaCity_SafariZone_Entrance/map.json | 8 +-- .../FuchsiaCity_SafariZone_Office/map.json | 6 +- data/maps/FuchsiaCity_WardensHouse/map.json | 6 +- data/maps/IndigoPlateau_Exterior/map.json | 2 +- .../IndigoPlateau_PokemonCenter_1F/map.json | 6 +- .../IndigoPlateau_PokemonCenter_2F/map.json | 6 +- data/maps/LavenderTown/map.json | 12 ++-- data/maps/LavenderTown_House1/map.json | 6 +- data/maps/LavenderTown_House2/map.json | 6 +- data/maps/LavenderTown_Mart/map.json | 6 +- .../LavenderTown_PokemonCenter_1F/map.json | 8 +-- .../LavenderTown_PokemonCenter_2F/map.json | 6 +- .../map.json | 6 +- data/maps/MtEmber_Exterior/map.json | 12 ++-- data/maps/MtEmber_RubyPath_1F/map.json | 6 +- data/maps/MtEmber_RubyPath_B1F/map.json | 4 +- .../maps/MtEmber_RubyPath_B1F_Stairs/map.json | 4 +- data/maps/MtEmber_RubyPath_B2F/map.json | 4 +- .../maps/MtEmber_RubyPath_B2F_Stairs/map.json | 4 +- data/maps/MtEmber_RubyPath_B3F/map.json | 6 +- data/maps/MtEmber_RubyPath_B4F/map.json | 4 +- data/maps/MtEmber_RubyPath_B5F/map.json | 2 +- data/maps/MtEmber_Summit/map.json | 2 +- data/maps/MtEmber_SummitPath_1F/map.json | 4 +- data/maps/MtEmber_SummitPath_2F/map.json | 4 +- data/maps/MtEmber_SummitPath_3F/map.json | 4 +- data/maps/MtMoon_1F/map.json | 8 +-- data/maps/MtMoon_B1F/map.json | 16 ++--- data/maps/MtMoon_B2F/map.json | 8 +-- data/maps/NavelRock_1F/map.json | 4 +- data/maps/NavelRock_B1F/map.json | 4 +- data/maps/NavelRock_Base/map.json | 2 +- data/maps/NavelRock_BasePath_B10F/map.json | 4 +- data/maps/NavelRock_BasePath_B11F/map.json | 4 +- data/maps/NavelRock_BasePath_B1F/map.json | 4 +- data/maps/NavelRock_BasePath_B2F/map.json | 4 +- data/maps/NavelRock_BasePath_B3F/map.json | 4 +- data/maps/NavelRock_BasePath_B4F/map.json | 4 +- data/maps/NavelRock_BasePath_B5F/map.json | 4 +- data/maps/NavelRock_BasePath_B6F/map.json | 4 +- data/maps/NavelRock_BasePath_B7F/map.json | 4 +- data/maps/NavelRock_BasePath_B8F/map.json | 4 +- data/maps/NavelRock_BasePath_B9F/map.json | 4 +- data/maps/NavelRock_Exterior/map.json | 4 +- data/maps/NavelRock_Fork/map.json | 6 +- data/maps/NavelRock_Harbor/map.json | 2 +- data/maps/NavelRock_Summit/map.json | 2 +- data/maps/NavelRock_SummitPath_2F/map.json | 4 +- data/maps/NavelRock_SummitPath_3F/map.json | 4 +- data/maps/NavelRock_SummitPath_4F/map.json | 4 +- data/maps/NavelRock_SummitPath_5F/map.json | 4 +- data/maps/OneIsland/map.json | 8 +-- data/maps/OneIsland_Harbor/map.json | 2 +- data/maps/OneIsland_House1/map.json | 2 +- data/maps/OneIsland_House2/map.json | 2 +- data/maps/OneIsland_KindleRoad/map.json | 6 +- .../OneIsland_KindleRoad_EmberSpa/map.json | 2 +- data/maps/OneIsland_PokemonCenter_1F/map.json | 4 +- data/maps/OneIsland_PokemonCenter_2F/map.json | 6 +- data/maps/PalletTown/map.json | 6 +- data/maps/PalletTown_PlayersHouse_1F/map.json | 8 +-- data/maps/PalletTown_PlayersHouse_2F/map.json | 2 +- .../maps/PalletTown_ProfessorOaksLab/map.json | 6 +- data/maps/PalletTown_RivalsHouse/map.json | 6 +- data/maps/PewterCity/map.json | 14 ++-- data/maps/PewterCity_Gym/map.json | 6 +- data/maps/PewterCity_House1/map.json | 6 +- data/maps/PewterCity_House2/map.json | 6 +- data/maps/PewterCity_Mart/map.json | 6 +- data/maps/PewterCity_Museum_1F/map.json | 12 ++-- data/maps/PewterCity_Museum_2F/map.json | 2 +- .../maps/PewterCity_PokemonCenter_1F/map.json | 8 +-- .../maps/PewterCity_PokemonCenter_2F/map.json | 6 +- data/maps/PokemonLeague_AgathasRoom/map.json | 4 +- data/maps/PokemonLeague_BrunosRoom/map.json | 4 +- .../maps/PokemonLeague_ChampionsRoom/map.json | 4 +- data/maps/PokemonLeague_HallOfFame/map.json | 2 +- data/maps/PokemonLeague_LancesRoom/map.json | 4 +- data/maps/PokemonLeague_LoreleisRoom/map.json | 4 +- data/maps/PokemonMansion_1F/map.json | 20 +++--- data/maps/PokemonMansion_2F/map.json | 10 +-- data/maps/PokemonMansion_3F/map.json | 16 ++--- data/maps/PokemonMansion_B1F/map.json | 2 +- data/maps/PokemonTower_1F/map.json | 8 +-- data/maps/PokemonTower_2F/map.json | 4 +- data/maps/PokemonTower_3F/map.json | 4 +- data/maps/PokemonTower_4F/map.json | 4 +- data/maps/PokemonTower_5F/map.json | 4 +- data/maps/PokemonTower_6F/map.json | 4 +- data/maps/PokemonTower_7F/map.json | 2 +- data/maps/PowerPlant/map.json | 10 +-- data/maps/RecordCorner/map.json | 16 ++--- data/maps/RockTunnel_1F/map.json | 12 ++-- data/maps/RockTunnel_B1F/map.json | 8 +-- data/maps/RocketHideout_B1F/map.json | 12 ++-- data/maps/RocketHideout_B2F/map.json | 10 +-- data/maps/RocketHideout_B3F/map.json | 4 +- data/maps/RocketHideout_B4F/map.json | 6 +- data/maps/RocketHideout_Elevator/map.json | 8 +-- data/maps/Route10/map.json | 10 +-- data/maps/Route10_PokemonCenter_1F/map.json | 8 +-- data/maps/Route10_PokemonCenter_2F/map.json | 6 +- data/maps/Route11/map.json | 6 +- data/maps/Route11_EastEntrance_1F/map.json | 10 +-- data/maps/Route11_EastEntrance_2F/map.json | 2 +- data/maps/Route12/map.json | 8 +-- data/maps/Route12_FishingHouse/map.json | 6 +- data/maps/Route12_NorthEntrance_1F/map.json | 10 +-- data/maps/Route12_NorthEntrance_2F/map.json | 2 +- data/maps/Route15/map.json | 4 +- data/maps/Route15_WestEntrance_1F/map.json | 10 +-- data/maps/Route15_WestEntrance_2F/map.json | 2 +- data/maps/Route16/map.json | 10 +-- data/maps/Route16_House/map.json | 6 +- data/maps/Route16_NorthEntrance_1F/map.json | 10 +-- data/maps/Route16_NorthEntrance_2F/map.json | 2 +- data/maps/Route18/map.json | 4 +- data/maps/Route18_EastEntrance_1F/map.json | 6 +- data/maps/Route18_EastEntrance_2F/map.json | 2 +- data/maps/Route2/map.json | 20 +++--- data/maps/Route20/map.json | 4 +- data/maps/Route22/map.json | 4 +- data/maps/Route22_NorthEntrance/map.json | 8 +-- data/maps/Route23/map.json | 8 +-- data/maps/Route25/map.json | 2 +- data/maps/Route25_SeaCottage/map.json | 6 +- data/maps/Route2_EastBuilding/map.json | 8 +-- data/maps/Route2_House/map.json | 6 +- .../map.json | 8 +-- .../map.json | 8 +-- data/maps/Route4/map.json | 6 +- data/maps/Route4_PokemonCenter_1F/map.json | 8 +-- data/maps/Route4_PokemonCenter_2F/map.json | 6 +- data/maps/Route5/map.json | 8 +-- data/maps/Route5_PokemonDayCare/map.json | 6 +- data/maps/Route5_SouthEntrance/map.json | 8 +-- data/maps/Route6/map.json | 6 +- data/maps/Route6_NorthEntrance/map.json | 8 +-- data/maps/Route7/map.json | 4 +- data/maps/Route7_EastEntrance/map.json | 8 +-- data/maps/Route8/map.json | 4 +- data/maps/Route8_WestEntrance/map.json | 8 +-- data/maps/SSAnne_1F_Corridor/map.json | 26 ++++---- data/maps/SSAnne_1F_Room1/map.json | 2 +- data/maps/SSAnne_1F_Room2/map.json | 2 +- data/maps/SSAnne_1F_Room3/map.json | 2 +- data/maps/SSAnne_1F_Room4/map.json | 2 +- data/maps/SSAnne_1F_Room5/map.json | 2 +- data/maps/SSAnne_1F_Room6/map.json | 2 +- data/maps/SSAnne_1F_Room7/map.json | 2 +- data/maps/SSAnne_2F_Corridor/map.json | 18 ++--- data/maps/SSAnne_2F_Room1/map.json | 2 +- data/maps/SSAnne_2F_Room2/map.json | 2 +- data/maps/SSAnne_2F_Room3/map.json | 2 +- data/maps/SSAnne_2F_Room4/map.json | 2 +- data/maps/SSAnne_2F_Room5/map.json | 2 +- data/maps/SSAnne_2F_Room6/map.json | 2 +- data/maps/SSAnne_3F_Corridor/map.json | 6 +- data/maps/SSAnne_B1F_Corridor/map.json | 12 ++-- data/maps/SSAnne_B1F_Room1/map.json | 2 +- data/maps/SSAnne_B1F_Room2/map.json | 2 +- data/maps/SSAnne_B1F_Room3/map.json | 2 +- data/maps/SSAnne_B1F_Room4/map.json | 2 +- data/maps/SSAnne_B1F_Room5/map.json | 2 +- data/maps/SSAnne_CaptainsOffice/map.json | 2 +- data/maps/SSAnne_Deck/map.json | 4 +- data/maps/SSAnne_Exterior/map.json | 10 +-- data/maps/SSAnne_Kitchen/map.json | 2 +- data/maps/SafariZone_Center/map.json | 26 ++++---- .../maps/SafariZone_Center_RestHouse/map.json | 6 +- data/maps/SafariZone_East/map.json | 14 ++-- data/maps/SafariZone_East_RestHouse/map.json | 6 +- data/maps/SafariZone_North/map.json | 26 ++++---- data/maps/SafariZone_North_RestHouse/map.json | 6 +- data/maps/SafariZone_SecretHouse/map.json | 6 +- data/maps/SafariZone_West/map.json | 22 +++---- data/maps/SafariZone_West_RestHouse/map.json | 6 +- data/maps/SaffronCity/map.json | 30 ++++----- .../SaffronCity_CopycatsHouse_1F/map.json | 8 +-- .../SaffronCity_CopycatsHouse_2F/map.json | 2 +- data/maps/SaffronCity_Dojo/map.json | 6 +- data/maps/SaffronCity_Gym/map.json | 66 +++++++++---------- data/maps/SaffronCity_House/map.json | 6 +- data/maps/SaffronCity_Mart/map.json | 6 +- .../maps/SaffronCity_MrPsychicsHouse/map.json | 6 +- .../SaffronCity_PokemonCenter_1F/map.json | 8 +-- .../SaffronCity_PokemonCenter_2F/map.json | 6 +- .../map.json | 2 +- data/maps/SeafoamIslands_1F/map.json | 14 ++-- data/maps/SeafoamIslands_B1F/map.json | 22 +++---- data/maps/SeafoamIslands_B2F/map.json | 22 +++---- data/maps/SeafoamIslands_B3F/map.json | 18 ++--- data/maps/SeafoamIslands_B4F/map.json | 8 +-- data/maps/SevenIsland/map.json | 8 +-- data/maps/SevenIsland_Harbor/map.json | 2 +- data/maps/SevenIsland_House_Room1/map.json | 4 +- data/maps/SevenIsland_House_Room2/map.json | 2 +- data/maps/SevenIsland_Mart/map.json | 2 +- .../SevenIsland_PokemonCenter_1F/map.json | 4 +- .../SevenIsland_PokemonCenter_2F/map.json | 6 +- data/maps/SevenIsland_SevaultCanyon/map.json | 4 +- .../SevenIsland_SevaultCanyon_House/map.json | 2 +- .../map.json | 2 +- data/maps/SevenIsland_TanobyRuins/map.json | 14 ++-- .../map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- .../map.json | 2 +- data/maps/SevenIsland_TrainerTower/map.json | 2 +- data/maps/SilphCo_10F/map.json | 12 ++-- data/maps/SilphCo_11F/map.json | 6 +- data/maps/SilphCo_1F/map.json | 10 +-- data/maps/SilphCo_2F/map.json | 14 ++-- data/maps/SilphCo_3F/map.json | 20 +++--- data/maps/SilphCo_4F/map.json | 14 ++-- data/maps/SilphCo_5F/map.json | 14 ++-- data/maps/SilphCo_6F/map.json | 10 +-- data/maps/SilphCo_7F/map.json | 12 ++-- data/maps/SilphCo_8F/map.json | 14 ++-- data/maps/SilphCo_9F/map.json | 10 +-- data/maps/SilphCo_Elevator/map.json | 4 +- data/maps/SixIsland/map.json | 8 +-- data/maps/SixIsland_AlteringCave/map.json | 2 +- data/maps/SixIsland_DottedHole_1F/map.json | 8 +-- data/maps/SixIsland_DottedHole_B1F/map.json | 10 +-- data/maps/SixIsland_DottedHole_B2F/map.json | 10 +-- data/maps/SixIsland_DottedHole_B3F/map.json | 10 +-- data/maps/SixIsland_DottedHole_B4F/map.json | 10 +-- .../map.json | 4 +- data/maps/SixIsland_GreenPath/map.json | 8 +-- data/maps/SixIsland_Harbor/map.json | 2 +- data/maps/SixIsland_House/map.json | 2 +- data/maps/SixIsland_Mart/map.json | 2 +- data/maps/SixIsland_OutcastIsland/map.json | 2 +- data/maps/SixIsland_PatternBush/map.json | 12 ++-- data/maps/SixIsland_PokemonCenter_1F/map.json | 4 +- data/maps/SixIsland_PokemonCenter_2F/map.json | 6 +- data/maps/SixIsland_RuinValley/map.json | 2 +- data/maps/SixIsland_WaterPath/map.json | 4 +- data/maps/SixIsland_WaterPath_House1/map.json | 2 +- data/maps/SixIsland_WaterPath_House2/map.json | 2 +- data/maps/ThreeIsland/map.json | 14 ++-- data/maps/ThreeIsland_BerryForest/map.json | 6 +- data/maps/ThreeIsland_BondBridge/map.json | 4 +- .../maps/ThreeIsland_DunsparceTunnel/map.json | 4 +- data/maps/ThreeIsland_Harbor/map.json | 2 +- data/maps/ThreeIsland_House1/map.json | 2 +- data/maps/ThreeIsland_House2/map.json | 2 +- data/maps/ThreeIsland_House3/map.json | 2 +- data/maps/ThreeIsland_House4/map.json | 2 +- data/maps/ThreeIsland_House5/map.json | 2 +- data/maps/ThreeIsland_Mart/map.json | 2 +- .../ThreeIsland_PokemonCenter_1F/map.json | 4 +- .../ThreeIsland_PokemonCenter_2F/map.json | 6 +- data/maps/ThreeIsland_Port/map.json | 6 +- data/maps/TradeCenter/map.json | 8 +-- data/maps/TrainerTower_1F/map.json | 4 +- data/maps/TrainerTower_2F/map.json | 6 +- data/maps/TrainerTower_3F/map.json | 6 +- data/maps/TrainerTower_4F/map.json | 6 +- data/maps/TrainerTower_5F/map.json | 6 +- data/maps/TrainerTower_6F/map.json | 6 +- data/maps/TrainerTower_7F/map.json | 6 +- data/maps/TrainerTower_8F/map.json | 6 +- data/maps/TrainerTower_Elevator/map.json | 4 +- data/maps/TrainerTower_Lobby/map.json | 6 +- data/maps/TrainerTower_Roof/map.json | 4 +- data/maps/TwoIsland/map.json | 8 +-- data/maps/TwoIsland_CapeBrink/map.json | 2 +- data/maps/TwoIsland_CapeBrink_House/map.json | 2 +- data/maps/TwoIsland_Harbor/map.json | 2 +- data/maps/TwoIsland_House/map.json | 2 +- data/maps/TwoIsland_JoyfulGameCorner/map.json | 2 +- data/maps/TwoIsland_PokemonCenter_1F/map.json | 4 +- data/maps/TwoIsland_PokemonCenter_2F/map.json | 6 +- .../UndergroundPath_EastEntrance/map.json | 8 +-- .../UndergroundPath_EastWestTunnel/map.json | 4 +- .../UndergroundPath_NorthEntrance/map.json | 8 +-- .../UndergroundPath_NorthSouthTunnel/map.json | 4 +- .../UndergroundPath_SouthEntrance/map.json | 8 +-- .../UndergroundPath_WestEntrance/map.json | 8 +-- data/maps/UnionRoom/map.json | 4 +- data/maps/VermilionCity/map.json | 20 +++--- data/maps/VermilionCity_Gym/map.json | 6 +- data/maps/VermilionCity_House1/map.json | 6 +- data/maps/VermilionCity_House2/map.json | 6 +- data/maps/VermilionCity_House3/map.json | 6 +- data/maps/VermilionCity_Mart/map.json | 6 +- .../VermilionCity_PokemonCenter_1F/map.json | 8 +-- .../VermilionCity_PokemonCenter_2F/map.json | 6 +- .../VermilionCity_PokemonFanClub/map.json | 6 +- data/maps/VictoryRoad_1F/map.json | 4 +- data/maps/VictoryRoad_2F/map.json | 18 ++--- data/maps/VictoryRoad_3F/map.json | 10 +-- data/maps/ViridianCity/map.json | 10 +-- data/maps/ViridianCity_Gym/map.json | 6 +- data/maps/ViridianCity_House/map.json | 6 +- data/maps/ViridianCity_Mart/map.json | 6 +- .../ViridianCity_PokemonCenter_1F/map.json | 8 +-- .../ViridianCity_PokemonCenter_2F/map.json | 6 +- data/maps/ViridianCity_School/map.json | 6 +- data/maps/ViridianForest/map.json | 12 ++-- include/constants/maps.h | 9 ++- src/field_control_avatar.c | 4 +- tools/mapjson/mapjson.cpp | 4 +- 406 files changed, 1326 insertions(+), 1319 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 50115b361..612d45efa 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -476,7 +476,7 @@ formatwarp \map, \a, \b, \c .endm - @ Sets the dynamic warp destination. Warps with a destination map of MAP_NONE will target this destination. + @ Sets the dynamic warp destination. Warps with a destination map of MAP_DYNAMIC will target this destination. @ Warp commands can be given either the id of which warp location to go to on the destination map @ or a pair of x/y coordinates to go to directly on the destination map. .macro setdynamicwarp map:req, a, b, c diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json index 04b0103f4..1a9f7fd6a 100644 --- a/data/maps/BattleColosseum_2P/map.json +++ b/data/maps/BattleColosseum_2P/map.json @@ -35,15 +35,15 @@ "x": 6, "y": 8, "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 + "dest_map": "MAP_DYNAMIC", + "dest_warp_id": "WARP_ID_DYNAMIC" }, { "x": 7, "y": 8, "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 + "dest_map": "MAP_DYNAMIC", + "dest_warp_id": "WARP_ID_DYNAMIC" } ], "coord_events": [ diff --git a/data/maps/BattleColosseum_4P/map.json b/data/maps/BattleColosseum_4P/map.json index 3a1be5e7d..82103f13d 100644 --- a/data/maps/BattleColosseum_4P/map.json +++ b/data/maps/BattleColosseum_4P/map.json @@ -20,29 +20,29 @@ "x": 5, "y": 8, "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 + "dest_map": "MAP_DYNAMIC", + "dest_warp_id": "WARP_ID_DYNAMIC" }, { "x": 6, "y": 8, "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 + "dest_map": "MAP_DYNAMIC", + "dest_warp_id": "WARP_ID_DYNAMIC" }, { "x": 7, "y": 8, "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 + "dest_map": "MAP_DYNAMIC", + "dest_warp_id": "WARP_ID_DYNAMIC" }, { "x": 8, "y": 8, "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 + "dest_map": "MAP_DYNAMIC", + "dest_warp_id": "WARP_ID_DYNAMIC" } ], "coord_events": [ diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index dc240a5a6..255ca4645 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -50,7 +50,7 @@ "y": 24, "elevation": 3, "dest_map": "MAP_BIRTH_ISLAND_HARBOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index c40a0a509..d26338c28 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -50,7 +50,7 @@ "y": 2, "elevation": 3, "dest_map": "MAP_BIRTH_ISLAND_EXTERIOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index fcc532d77..a6a2a5935 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -237,91 +237,91 @@ "y": 21, "elevation": 0, "dest_map": "MAP_CELADON_CITY_GAME_CORNER", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 11, "y": 14, "elevation": 0, "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 15, "y": 14, "elevation": 0, "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 30, "y": 11, "elevation": 0, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 48, "y": 11, "elevation": 0, "dest_map": "MAP_CELADON_CITY_POKEMON_CENTER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 39, "y": 20, "elevation": 0, "dest_map": "MAP_CELADON_CITY_GAME_CORNER_PRIZE_ROOM", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 11, "y": 30, "elevation": 0, "dest_map": "MAP_CELADON_CITY_GYM", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 37, "y": 29, "elevation": 0, "dest_map": "MAP_CELADON_CITY_RESTAURANT", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 41, "y": 29, "elevation": 0, "dest_map": "MAP_CELADON_CITY_HOUSE1", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 49, "y": 29, "elevation": 0, "dest_map": "MAP_CELADON_CITY_HOTEL", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 29, "y": 5, "elevation": 0, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 30, "y": 4, "elevation": 3, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 31, "y": 5, "elevation": 0, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F", - "dest_warp_id": 5 + "dest_warp_id": "5" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index 0ce266087..f85c98135 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -78,42 +78,42 @@ "y": 19, "elevation": 0, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 12, "y": 18, "elevation": 3, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 13, "y": 19, "elevation": 0, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 4, "y": 2, "elevation": 3, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 12, "y": 2, "elevation": 3, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 2, "y": 1, "elevation": 3, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 11 + "dest_warp_id": "11" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index ba3c67dd8..30dbdcacd 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -50,28 +50,28 @@ "y": 2, "elevation": 3, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 2, "y": 2, "elevation": 3, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 11, "y": 2, "elevation": 3, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 12, "y": 2, "elevation": 3, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_1F", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index 7d39a62cc..7b62fae53 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -78,28 +78,28 @@ "y": 2, "elevation": 3, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 2, "elevation": 3, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 12, "y": 2, "elevation": 3, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 11, "y": 2, "elevation": 3, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_2F", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json index 7492b8718..ab42bbd0e 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/map.json +++ b/data/maps/CeladonCity_Condominiums_Roof/map.json @@ -21,21 +21,21 @@ "y": 2, "elevation": 3, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 10, "y": 2, "elevation": 3, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_3F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 2, "y": 12, "elevation": 3, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index 3efe6a4d6..26d0871ed 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -50,21 +50,21 @@ "y": 8, "elevation": 0, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 5, "y": 8, "elevation": 0, "dest_map": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index 970ff3e58..85e4641bf 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -36,56 +36,56 @@ "y": 15, "elevation": 0, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 2, "y": 14, "elevation": 3, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 3, "y": 15, "elevation": 0, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 9, "y": 15, "elevation": 0, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 10, "y": 14, "elevation": 3, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 11, "y": 15, "elevation": 0, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 6, "y": 1, "elevation": 0, "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 4, "y": 2, "elevation": 3, "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_2F", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index a087c291c..f97e35bfd 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -78,21 +78,21 @@ "y": 1, "elevation": 0, "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 3, "y": 2, "elevation": 3, "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 9, "y": 2, "elevation": 3, "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_3F", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index b5d458946..4fa3b75b3 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -92,21 +92,21 @@ "y": 1, "elevation": 0, "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 2, "elevation": 0, "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_2F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 3, "y": 2, "elevation": 0, "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_4F", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index bc8b5737a..deedb2485 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -64,21 +64,21 @@ "y": 1, "elevation": 0, "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 3, "y": 2, "elevation": 0, "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_3F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 9, "y": 2, "elevation": 0, "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_5F", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 14248d0ec..27de2a596 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -78,21 +78,21 @@ "y": 1, "elevation": 0, "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 2, "elevation": 3, "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_4F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 3, "y": 2, "elevation": 3, "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_ROOF", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json index a863045a7..7805bb3f1 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json @@ -20,15 +20,15 @@ "x": 2, "y": 5, "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 + "dest_map": "MAP_DYNAMIC", + "dest_warp_id": "WARP_ID_DYNAMIC" }, { "x": 2, "y": 6, "elevation": 0, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 + "dest_map": "MAP_DYNAMIC", + "dest_warp_id": "WARP_ID_DYNAMIC" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index a0b948294..7d8881bce 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -50,7 +50,7 @@ "y": 6, "elevation": 3, "dest_map": "MAP_CELADON_CITY_DEPARTMENT_STORE_5F", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 58baa4145..f17531201 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -176,28 +176,28 @@ "y": 13, "elevation": 0, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 10, "y": 13, "elevation": 0, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 11, "y": 13, "elevation": 0, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 15, "y": 2, "elevation": 3, "dest_map": "MAP_ROCKET_HIDEOUT_B1F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index 3c39900ed..7efe5a838 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -92,21 +92,21 @@ "y": 9, "elevation": 0, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 4, "y": 8, "elevation": 3, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 5, "y": 9, "elevation": 0, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 5 + "dest_warp_id": "5" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index e73b79f7b..5db7ad035 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -176,21 +176,21 @@ "y": 18, "elevation": 3, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 6, "y": 18, "elevation": 3, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 7, "y": 18, "elevation": 3, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 6 + "dest_warp_id": "6" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index 9ec22dbab..70c59e155 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -78,21 +78,21 @@ "y": 10, "elevation": 0, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 9 + "dest_warp_id": "9" }, { "x": 4, "y": 9, "elevation": 0, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 9 + "dest_warp_id": "9" }, { "x": 5, "y": 10, "elevation": 0, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 9 + "dest_warp_id": "9" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index 4c0b51f05..db88aa3ed 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -64,21 +64,21 @@ "y": 7, "elevation": 3, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 8 + "dest_warp_id": "8" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 8 + "dest_warp_id": "8" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 8 + "dest_warp_id": "8" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 9283cbe47..6cf24c45c 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -78,28 +78,28 @@ "y": 8, "elevation": 3, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 7, "y": 8, "elevation": 3, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 8, "y": 8, "elevation": 3, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 1, "y": 6, "elevation": 4, "dest_map": "MAP_CELADON_CITY_POKEMON_CENTER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index 84d0405bc..91313423e 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -78,21 +78,21 @@ "y": 6, "elevation": 4, "dest_map": "MAP_CELADON_CITY_POKEMON_CENTER_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_UNION_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 1, "elevation": 0, "dest_map": "MAP_TRADE_CENTER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index ef5f6e4ed..3488bf4fb 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -92,21 +92,21 @@ "y": 9, "elevation": 0, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 6, "y": 9, "elevation": 0, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 7, "y": 9, "elevation": 0, "dest_map": "MAP_CELADON_CITY", - "dest_warp_id": 7 + "dest_warp_id": "7" } ], "coord_events": [], diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index 41aa39ad7..de5b0a516 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -148,56 +148,56 @@ "y": 21, "elevation": 3, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 34, "y": 2, "elevation": 3, "dest_map": "MAP_CERULEAN_CAVE_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 1, "y": 7, "elevation": 3, "dest_map": "MAP_CERULEAN_CAVE_B1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 10, "y": 2, "elevation": 3, "dest_map": "MAP_CERULEAN_CAVE_2F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 5, "y": 15, "elevation": 3, "dest_map": "MAP_CERULEAN_CAVE_2F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 30, "y": 10, "elevation": 4, "dest_map": "MAP_CERULEAN_CAVE_2F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 24, "y": 11, "elevation": 3, "dest_map": "MAP_CERULEAN_CAVE_2F", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 2, "y": 4, "elevation": 3, "dest_map": "MAP_CERULEAN_CAVE_2F", - "dest_warp_id": 5 + "dest_warp_id": "5" } ], "coord_events": [], diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index db465862c..fb800f0dc 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -204,42 +204,42 @@ "y": 4, "elevation": 3, "dest_map": "MAP_CERULEAN_CAVE_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 13, "y": 4, "elevation": 3, "dest_map": "MAP_CERULEAN_CAVE_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 7, "y": 14, "elevation": 3, "dest_map": "MAP_CERULEAN_CAVE_1F", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 26, "y": 9, "elevation": 3, "dest_map": "MAP_CERULEAN_CAVE_1F", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 23, "y": 10, "elevation": 3, "dest_map": "MAP_CERULEAN_CAVE_1F", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 5, "y": 6, "elevation": 3, "dest_map": "MAP_CERULEAN_CAVE_1F", - "dest_warp_id": 7 + "dest_warp_id": "7" } ], "coord_events": [], diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 498c360c8..d155ea0b3 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -190,7 +190,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_CERULEAN_CAVE_1F", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 1618eacea..836696f94 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -205,98 +205,98 @@ "y": 11, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY_HOUSE1", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 30, "y": 11, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY_HOUSE2", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 15, "y": 17, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY_HOUSE3", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 22, "y": 19, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 31, "y": 21, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY_GYM", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 13, "y": 28, "elevation": 3, "dest_map": "MAP_CERULEAN_CITY_BIKE_SHOP", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 29, "y": 28, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY_MART", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 1, "y": 12, "elevation": 0, "dest_map": "MAP_CERULEAN_CAVE_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 10, "y": 8, "elevation": 3, "dest_map": "MAP_CERULEAN_CITY_HOUSE1", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 31, "y": 8, "elevation": 3, "dest_map": "MAP_CERULEAN_CITY_HOUSE2", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 31, "y": 9, "elevation": 3, "dest_map": "MAP_CERULEAN_CITY_HOUSE2", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 14, "y": 28, "elevation": 3, "dest_map": "MAP_CERULEAN_CITY_BIKE_SHOP", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 23, "y": 28, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY_HOUSE4", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 17, "y": 11, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY_HOUSE5", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index b614cbd6b..3cf55978f 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -64,21 +64,21 @@ "y": 9, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 5, "y": 8, "elevation": 3, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 6, "y": 9, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 5 + "dest_warp_id": "5" } ], "coord_events": [], diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json index e1f673ced..8bb783973 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -78,21 +78,21 @@ "y": 18, "elevation": 3, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 8, "y": 18, "elevation": 3, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 9, "y": 18, "elevation": 3, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json index e8a336444..7082d2aa1 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -36,28 +36,28 @@ "y": 9, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 3, "y": 8, "elevation": 3, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 4, "y": 9, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 3, "y": 1, "elevation": 3, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 8 + "dest_warp_id": "8" } ], "coord_events": [], diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index 4aaf6d44a..ed5913862 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -50,28 +50,28 @@ "y": 7, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 3, "y": 7, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 7, "elevation": 1, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 1, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 9 + "dest_warp_id": "9" } ], "coord_events": [], diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json index f26980765..7e9abe77f 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -50,21 +50,21 @@ "y": 7, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 4, "y": 7, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 5, "y": 7, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index 63c7b16e0..48fad54a7 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -36,7 +36,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 12 + "dest_warp_id": "12" } ], "coord_events": [], diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index 314a11123..b56b2de33 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -36,7 +36,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 13 + "dest_warp_id": "13" } ], "coord_events": [], diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json index fde948c8a..62860b2bc 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -64,21 +64,21 @@ "y": 7, "elevation": 3, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 6 + "dest_warp_id": "6" } ], "coord_events": [], diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index bf92db5b5..074444248 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -120,28 +120,28 @@ "y": 8, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 7, "y": 8, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 8, "y": 8, "elevation": 0, "dest_map": "MAP_CERULEAN_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 1, "y": 6, "elevation": 4, "dest_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index 142d3b21c..a8a570130 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -78,21 +78,21 @@ "y": 6, "elevation": 4, "dest_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_UNION_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 1, "elevation": 0, "dest_map": "MAP_TRADE_CENTER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index de15e8e78..09e909d0c 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -89,35 +89,35 @@ "y": 3, "elevation": 0, "dest_map": "MAP_POKEMON_MANSION_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 20, "y": 4, "elevation": 0, "dest_map": "MAP_CINNABAR_ISLAND_GYM", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 8, "y": 9, "elevation": 0, "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 14, "y": 11, "elevation": 0, "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 19, "y": 11, "elevation": 0, "dest_map": "MAP_CINNABAR_ISLAND_MART", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [ diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index 77973ab9f..0a1fa5e2e 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -148,21 +148,21 @@ "y": 23, "elevation": 3, "dest_map": "MAP_CINNABAR_ISLAND", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 25, "y": 23, "elevation": 3, "dest_map": "MAP_CINNABAR_ISLAND", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 26, "y": 23, "elevation": 3, "dest_map": "MAP_CINNABAR_ISLAND", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index f6d0106eb..cd11131ca 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -64,21 +64,21 @@ "y": 7, "elevation": 3, "dest_map": "MAP_CINNABAR_ISLAND", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_CINNABAR_ISLAND", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_CINNABAR_ISLAND", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index 69fe81200..9491f5f43 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -120,28 +120,28 @@ "y": 8, "elevation": 0, "dest_map": "MAP_CINNABAR_ISLAND", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 6, "y": 8, "elevation": 3, "dest_map": "MAP_CINNABAR_ISLAND", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 8, "y": 8, "elevation": 0, "dest_map": "MAP_CINNABAR_ISLAND", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 1, "y": 6, "elevation": 4, "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 7c7647dbf..637d748d8 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -78,21 +78,21 @@ "y": 6, "elevation": 4, "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_UNION_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 1, "elevation": 0, "dest_map": "MAP_TRADE_CENTER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index ca87e241b..c7a013141 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -36,42 +36,42 @@ "y": 9, "elevation": 3, "dest_map": "MAP_CINNABAR_ISLAND", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 4, "y": 9, "elevation": 3, "dest_map": "MAP_CINNABAR_ISLAND", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 5, "y": 9, "elevation": 3, "dest_map": "MAP_CINNABAR_ISLAND", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 13, "y": 5, "elevation": 0, "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 19, "y": 5, "elevation": 0, "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 25, "y": 5, "elevation": 0, "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index f266abb85..2730a98a1 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -50,7 +50,7 @@ "y": 9, "elevation": 3, "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", - "dest_warp_id": 5 + "dest_warp_id": "5" } ], "coord_events": [], diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index 0eb411782..28f1e04ae 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -64,7 +64,7 @@ "y": 9, "elevation": 3, "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index 4ed0d75ca..415475d3c 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -50,7 +50,7 @@ "y": 9, "elevation": 3, "dest_map": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/DiglettsCave_B1F/map.json b/data/maps/DiglettsCave_B1F/map.json index a95991fad..081e09b45 100644 --- a/data/maps/DiglettsCave_B1F/map.json +++ b/data/maps/DiglettsCave_B1F/map.json @@ -21,14 +21,14 @@ "y": 3, "elevation": 3, "dest_map": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 82, "y": 71, "elevation": 3, "dest_map": "MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json index b330b8eac..8c3705955 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -36,14 +36,14 @@ "y": 4, "elevation": 3, "dest_map": "MAP_DIGLETTS_CAVE_B1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 4, "y": 6, "elevation": 3, "dest_map": "MAP_ROUTE2", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json index daa426fc2..c1758eeae 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -36,14 +36,14 @@ "y": 6, "elevation": 3, "dest_map": "MAP_ROUTE11", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 6, "y": 4, "elevation": 3, "dest_map": "MAP_DIGLETTS_CAVE_B1F", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index 088394782..2da00d1c3 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -69,28 +69,28 @@ "y": 14, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_HARBOR", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 18, "y": 6, "elevation": 0, "dest_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 12, "y": 6, "elevation": 0, "dest_map": "MAP_FIVE_ISLAND_HOUSE1", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 22, "y": 9, "elevation": 0, "dest_map": "MAP_FIVE_ISLAND_HOUSE2", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index 4ff5f5249..5a290ddfb 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -50,7 +50,7 @@ "y": 2, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index ad10095dd..6c2d5b9bf 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -36,7 +36,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index 6003998f6..e065f4771 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -36,7 +36,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_LostCave_Entrance/map.json b/data/maps/FiveIsland_LostCave_Entrance/map.json index d91c86b79..4e607722d 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/map.json +++ b/data/maps/FiveIsland_LostCave_Entrance/map.json @@ -21,14 +21,14 @@ "y": 8, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 5, "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index 7f7d06cee..da449b0ad 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -36,35 +36,35 @@ "y": 2, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 5, "y": 1, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 8, "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM2", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 8, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 2, "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index f5eaeed87..d7b55d659 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -50,7 +50,7 @@ "y": 8, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index 0c018195f..622087adf 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -36,7 +36,7 @@ "y": 1, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index 67adcdd17..8d4ef0a00 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -36,7 +36,7 @@ "y": 8, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index f21ac95fc..593bb763c 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -36,7 +36,7 @@ "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index 5607e08e8..9510f3d3f 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -36,7 +36,7 @@ "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room2/map.json b/data/maps/FiveIsland_LostCave_Room2/map.json index d1a5ff27d..e549c4f42 100644 --- a/data/maps/FiveIsland_LostCave_Room2/map.json +++ b/data/maps/FiveIsland_LostCave_Room2/map.json @@ -21,28 +21,28 @@ "y": 1, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM3", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 8, "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 5, "y": 8, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM11", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 2, "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room3/map.json b/data/maps/FiveIsland_LostCave_Room3/map.json index 97c46a1dd..a8fe5ef25 100644 --- a/data/maps/FiveIsland_LostCave_Room3/map.json +++ b/data/maps/FiveIsland_LostCave_Room3/map.json @@ -21,28 +21,28 @@ "y": 1, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 8, "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 5, "y": 8, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM4", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 2, "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index 0489a8b11..8547d0586 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -36,28 +36,28 @@ "y": 1, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM12", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 8, "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 5, "y": 8, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM5", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 2, "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room5/map.json b/data/maps/FiveIsland_LostCave_Room5/map.json index 099d76722..4b3cf3b80 100644 --- a/data/maps/FiveIsland_LostCave_Room5/map.json +++ b/data/maps/FiveIsland_LostCave_Room5/map.json @@ -21,28 +21,28 @@ "y": 1, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 8, "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM6", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 8, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 2, "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room6/map.json b/data/maps/FiveIsland_LostCave_Room6/map.json index c96ab57f7..83c0a0a6f 100644 --- a/data/maps/FiveIsland_LostCave_Room6/map.json +++ b/data/maps/FiveIsland_LostCave_Room6/map.json @@ -21,28 +21,28 @@ "y": 1, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 8, "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM13", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 5, "y": 8, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 2, "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM7", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room7/map.json b/data/maps/FiveIsland_LostCave_Room7/map.json index 91f787589..51916314c 100644 --- a/data/maps/FiveIsland_LostCave_Room7/map.json +++ b/data/maps/FiveIsland_LostCave_Room7/map.json @@ -21,28 +21,28 @@ "y": 1, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 8, "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 5, "y": 8, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM8", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 2, "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room8/map.json b/data/maps/FiveIsland_LostCave_Room8/map.json index 243b3fed6..869de172b 100644 --- a/data/maps/FiveIsland_LostCave_Room8/map.json +++ b/data/maps/FiveIsland_LostCave_Room8/map.json @@ -21,28 +21,28 @@ "y": 1, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 8, "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM9", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 8, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 2, "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM14", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_LostCave_Room9/map.json b/data/maps/FiveIsland_LostCave_Room9/map.json index b2bb357d8..4f90d61b0 100644 --- a/data/maps/FiveIsland_LostCave_Room9/map.json +++ b/data/maps/FiveIsland_LostCave_Room9/map.json @@ -21,28 +21,28 @@ "y": 1, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM10", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 8, "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 5, "y": 8, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 2, "y": 5, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index d9f9de9b8..b543265d1 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -131,7 +131,7 @@ "y": 21, "elevation": 0, "dest_map": "MAP_FIVE_ISLAND_ROCKET_WAREHOUSE", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index b97c5f124..7d8d75de3 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -92,14 +92,14 @@ "y": 8, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 1, "y": 6, "elevation": 4, "dest_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index 415be644e..2122e04d1 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -78,21 +78,21 @@ "y": 6, "elevation": 4, "dest_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_UNION_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 1, "elevation": 0, "dest_map": "MAP_TRADE_CENTER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index c86041b08..a23843293 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -140,14 +140,14 @@ "y": 13, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 39, "y": 8, "elevation": 0, "dest_map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index 59f076913..bec5ba745 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -50,7 +50,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index 08f53138b..81c2fc436 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -162,7 +162,7 @@ "y": 25, "elevation": 3, "dest_map": "MAP_FIVE_ISLAND_MEADOW", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 13eab3339..f986e9868 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -190,56 +190,56 @@ "y": 20, "elevation": 0, "dest_map": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 12, "y": 13, "elevation": 0, "dest_map": "MAP_FOUR_ISLAND_POKEMON_DAY_CARE", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 25, "y": 14, "elevation": 0, "dest_map": "MAP_FOUR_ISLAND_HOUSE1", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 38, "y": 12, "elevation": 0, "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 33, "y": 23, "elevation": 0, "dest_map": "MAP_FOUR_ISLAND_LORELEIS_HOUSE", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 25, "y": 26, "elevation": 0, "dest_map": "MAP_FOUR_ISLAND_HOUSE2", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 10, "y": 28, "elevation": 3, "dest_map": "MAP_FOUR_ISLAND_HARBOR", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 22, "y": 26, "elevation": 0, "dest_map": "MAP_FOUR_ISLAND_MART", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index ad551aef5..5a9432afd 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -50,7 +50,7 @@ "y": 2, "elevation": 3, "dest_map": "MAP_FOUR_ISLAND", - "dest_warp_id": 6 + "dest_warp_id": "6" } ], "coord_events": [], diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index fe8f822d3..d84c882d9 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -50,7 +50,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_FOUR_ISLAND", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index 084eec236..70e18a4c3 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -36,7 +36,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_FOUR_ISLAND", - "dest_warp_id": 5 + "dest_warp_id": "5" } ], "coord_events": [], diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index 7358bea0f..c0fe62b24 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -50,42 +50,42 @@ "y": 17, "elevation": 0, "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 2, "y": 8, "elevation": 3, "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 12, "y": 12, "elevation": 3, "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 12, "y": 3, "elevation": 3, "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 15, "y": 16, "elevation": 3, "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 3, "y": 6, "elevation": 3, "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_BACK", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index addbe2579..d9fdf61df 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -50,21 +50,21 @@ "y": 12, "elevation": 3, "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 12, "y": 3, "elevation": 3, "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 15, "y": 16, "elevation": 3, "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index 99cc4c00f..be6cb7c39 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -78,7 +78,7 @@ "y": 23, "elevation": 0, "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", - "dest_warp_id": 5 + "dest_warp_id": "5" } ], "coord_events": [ diff --git a/data/maps/FourIsland_IcefallCave_Entrance/map.json b/data/maps/FourIsland_IcefallCave_Entrance/map.json index aa97ac246..728d15c3d 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/map.json +++ b/data/maps/FourIsland_IcefallCave_Entrance/map.json @@ -21,21 +21,21 @@ "y": 30, "elevation": 3, "dest_map": "MAP_FOUR_ISLAND", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 10, "y": 21, "elevation": 3, "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 7, "elevation": 3, "dest_map": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index 743db1a81..ba745bf94 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -232,7 +232,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_FOUR_ISLAND", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index 36ddc0271..d3dbae34a 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -64,7 +64,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_FOUR_ISLAND", - "dest_warp_id": 7 + "dest_warp_id": "7" } ], "coord_events": [], diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index a8abb5e39..c6e9f2aba 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -78,14 +78,14 @@ "y": 8, "elevation": 3, "dest_map": "MAP_FOUR_ISLAND", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 1, "y": 6, "elevation": 4, "dest_map": "MAP_FOUR_ISLAND_POKEMON_CENTER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index 43c798013..d606536c8 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -78,21 +78,21 @@ "y": 6, "elevation": 4, "dest_map": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_UNION_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 1, "elevation": 0, "dest_map": "MAP_TRADE_CENTER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index 726acdcb4..380c5574d 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -36,7 +36,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_FOUR_ISLAND", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index af2d5818f..38e9352c6 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -262,77 +262,77 @@ "y": 5, "elevation": 0, "dest_map": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 33, "y": 31, "elevation": 0, "dest_map": "MAP_FUCHSIA_CITY_WARDENS_HOUSE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 11, "y": 15, "elevation": 0, "dest_map": "MAP_FUCHSIA_CITY_MART", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 28, "y": 16, "elevation": 0, "dest_map": "MAP_FUCHSIA_CITY_SAFARI_ZONE_OFFICE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 9, "y": 32, "elevation": 0, "dest_map": "MAP_FUCHSIA_CITY_GYM", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 14, "y": 31, "elevation": 0, "dest_map": "MAP_FUCHSIA_CITY_HOUSE1", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 25, "y": 31, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 38, "y": 31, "elevation": 0, "dest_map": "MAP_FUCHSIA_CITY_HOUSE2", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 39, "y": 28, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY_HOUSE2", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 39, "y": 29, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY_HOUSE2", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 19, "y": 31, "elevation": 0, "dest_map": "MAP_FUCHSIA_CITY_HOUSE3", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json index 5deac5214..abeb179e0 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -134,21 +134,21 @@ "y": 21, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 7, "y": 21, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 8, "y": 21, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json index 8823e1c20..aff96b597 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -64,21 +64,21 @@ "y": 7, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 5 + "dest_warp_id": "5" } ], "coord_events": [], diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json index d133581c1..d800bc15f 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -36,28 +36,28 @@ "y": 9, "elevation": 0, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 3, "y": 8, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 4, "y": 9, "elevation": 0, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 3, "y": 1, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 8 + "dest_warp_id": "8" } ], "coord_events": [], diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json index 73d65c047..5b7e20007 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -36,7 +36,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 10 + "dest_warp_id": "10" } ], "coord_events": [], diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json index a09a2e10f..e4d04596b 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -64,21 +64,21 @@ "y": 7, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index 73b1270bc..9d1b7c252 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -78,28 +78,28 @@ "y": 8, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 7, "y": 8, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 8, "y": 8, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 1, "y": 6, "elevation": 4, "dest_map": "MAP_FUCHSIA_CITY_POKEMON_CENTER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index 8b3526aa7..60eb84ecf 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -78,21 +78,21 @@ "y": 6, "elevation": 4, "dest_map": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_UNION_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 1, "elevation": 0, "dest_map": "MAP_TRADE_CENTER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index 02a4768ed..c74062929 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -50,28 +50,28 @@ "y": 1, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_CENTER", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 3, "y": 7, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/FuchsiaCity_SafariZone_Office/map.json b/data/maps/FuchsiaCity_SafariZone_Office/map.json index 1a4032edf..7a8dca1b5 100644 --- a/data/maps/FuchsiaCity_SafariZone_Office/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Office/map.json @@ -78,21 +78,21 @@ "y": 9, "elevation": 0, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 6, "y": 9, "elevation": 0, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 7, "y": 9, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/FuchsiaCity_WardensHouse/map.json b/data/maps/FuchsiaCity_WardensHouse/map.json index 7b402867f..527e9c22d 100644 --- a/data/maps/FuchsiaCity_WardensHouse/map.json +++ b/data/maps/FuchsiaCity_WardensHouse/map.json @@ -78,21 +78,21 @@ "y": 10, "elevation": 0, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 6, "y": 9, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 7, "y": 10, "elevation": 0, "dest_map": "MAP_FUCHSIA_CITY", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index 89a1dd9b4..13d14c825 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -56,7 +56,7 @@ "y": 6, "elevation": 0, "dest_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index 4c0c97759..7955bd1cd 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -134,21 +134,21 @@ "y": 16, "elevation": 3, "dest_map": "MAP_INDIGO_PLATEAU_EXTERIOR", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 4, "y": 1, "elevation": 3, "dest_map": "MAP_POKEMON_LEAGUE_LORELEIS_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 1, "y": 14, "elevation": 4, "dest_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index f717a09ea..770645384 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -78,21 +78,21 @@ "y": 6, "elevation": 4, "dest_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_UNION_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 1, "elevation": 0, "dest_map": "MAP_TRADE_CENTER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index 8d9fe4be8..edbe04fb6 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -80,42 +80,42 @@ "y": 6, "elevation": 0, "dest_map": "MAP_POKEMON_TOWER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 6, "y": 5, "elevation": 0, "dest_map": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 10, "y": 11, "elevation": 0, "dest_map": "MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 5, "y": 16, "elevation": 0, "dest_map": "MAP_LAVENDER_TOWN_HOUSE1", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 10, "y": 16, "elevation": 0, "dest_map": "MAP_LAVENDER_TOWN_HOUSE2", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 20, "y": 15, "elevation": 0, "dest_map": "MAP_LAVENDER_TOWN_MART", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index 94a07604b..98f026fbf 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -50,21 +50,21 @@ "y": 7, "elevation": 3, "dest_map": "MAP_LAVENDER_TOWN", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_LAVENDER_TOWN", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_LAVENDER_TOWN", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index 94383a699..688eeddc9 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -36,21 +36,21 @@ "y": 7, "elevation": 3, "dest_map": "MAP_LAVENDER_TOWN", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_LAVENDER_TOWN", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_LAVENDER_TOWN", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index b6f7c5055..6a7fbb2ca 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -78,21 +78,21 @@ "y": 7, "elevation": 3, "dest_map": "MAP_LAVENDER_TOWN", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_LAVENDER_TOWN", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_LAVENDER_TOWN", - "dest_warp_id": 5 + "dest_warp_id": "5" } ], "coord_events": [], diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index 14433de2a..055802ae6 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -92,28 +92,28 @@ "y": 8, "elevation": 3, "dest_map": "MAP_LAVENDER_TOWN", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 7, "y": 8, "elevation": 3, "dest_map": "MAP_LAVENDER_TOWN", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 8, "y": 8, "elevation": 3, "dest_map": "MAP_LAVENDER_TOWN", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 1, "y": 6, "elevation": 4, "dest_map": "MAP_LAVENDER_TOWN_POKEMON_CENTER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index 232f6ecce..6fc2a4346 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -78,21 +78,21 @@ "y": 6, "elevation": 4, "dest_map": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_UNION_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 1, "elevation": 0, "dest_map": "MAP_TRADE_CENTER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index 7f241ad23..304d66005 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -106,21 +106,21 @@ "y": 7, "elevation": 3, "dest_map": "MAP_LAVENDER_TOWN", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_LAVENDER_TOWN", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_LAVENDER_TOWN", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 6f300b9d6..c2e580138 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -302,42 +302,42 @@ "y": 48, "elevation": 3, "dest_map": "MAP_ONE_ISLAND_KINDLE_ROAD", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 29, "y": 48, "elevation": 3, "dest_map": "MAP_ONE_ISLAND_KINDLE_ROAD", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 14, "y": 24, "elevation": 3, "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 39, "y": 19, "elevation": 3, "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_3F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 29, "y": 7, "elevation": 3, "dest_map": "MAP_MT_EMBER_SUMMIT", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 42, "y": 39, "elevation": 0, "dest_map": "MAP_MT_EMBER_RUBY_PATH_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index 32108cf47..62b96b80b 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -92,21 +92,21 @@ "y": 17, "elevation": 3, "dest_map": "MAP_MT_EMBER_EXTERIOR", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 1, "y": 1, "elevation": 0, "dest_map": "MAP_MT_EMBER_RUBY_PATH_B1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 24, "y": 5, "elevation": 0, "dest_map": "MAP_MT_EMBER_RUBY_PATH_B2F_STAIRS", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index b2e84cd47..8b118eecd 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -78,14 +78,14 @@ "y": 21, "elevation": 0, "dest_map": "MAP_MT_EMBER_RUBY_PATH_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 6, "y": 1, "elevation": 0, "dest_map": "MAP_MT_EMBER_RUBY_PATH_B2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index e55831c9d..d3242092b 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -36,14 +36,14 @@ "y": 1, "elevation": 0, "dest_map": "MAP_MT_EMBER_RUBY_PATH_B3F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 1, "y": 5, "elevation": 0, "dest_map": "MAP_MT_EMBER_RUBY_PATH_B2F_STAIRS", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index 99d15f9bd..5dd0f9e7b 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -120,14 +120,14 @@ "y": 7, "elevation": 3, "dest_map": "MAP_MT_EMBER_RUBY_PATH_B1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 13, "y": 9, "elevation": 3, "dest_map": "MAP_MT_EMBER_RUBY_PATH_B3F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index 2935f1bf9..9b0c34663 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -50,14 +50,14 @@ "y": 1, "elevation": 0, "dest_map": "MAP_MT_EMBER_RUBY_PATH_B1F_STAIRS", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 1, "y": 4, "elevation": 0, "dest_map": "MAP_MT_EMBER_RUBY_PATH_1F", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index df674ff77..87a812708 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -162,21 +162,21 @@ "y": 4, "elevation": 0, "dest_map": "MAP_MT_EMBER_RUBY_PATH_B2F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 19, "y": 19, "elevation": 3, "dest_map": "MAP_MT_EMBER_RUBY_PATH_B1F_STAIRS", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 5, "y": 19, "elevation": 3, "dest_map": "MAP_MT_EMBER_RUBY_PATH_B4F", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/MtEmber_RubyPath_B4F/map.json b/data/maps/MtEmber_RubyPath_B4F/map.json index d4ed67e9c..ebd016595 100644 --- a/data/maps/MtEmber_RubyPath_B4F/map.json +++ b/data/maps/MtEmber_RubyPath_B4F/map.json @@ -21,14 +21,14 @@ "y": 14, "elevation": 3, "dest_map": "MAP_MT_EMBER_RUBY_PATH_B5F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 4, "y": 2, "elevation": 3, "dest_map": "MAP_MT_EMBER_RUBY_PATH_B3F", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index 9b032993f..fc7a056fa 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -36,7 +36,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_MT_EMBER_RUBY_PATH_B4F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index 0a697576a..c9ca661b4 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -92,7 +92,7 @@ "y": 15, "elevation": 0, "dest_map": "MAP_MT_EMBER_EXTERIOR", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/MtEmber_SummitPath_1F/map.json b/data/maps/MtEmber_SummitPath_1F/map.json index 2f577dc02..ecaef12c0 100644 --- a/data/maps/MtEmber_SummitPath_1F/map.json +++ b/data/maps/MtEmber_SummitPath_1F/map.json @@ -21,14 +21,14 @@ "y": 15, "elevation": 0, "dest_map": "MAP_MT_EMBER_EXTERIOR", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 11, "y": 1, "elevation": 0, "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index 07c8acf42..6b6b5e92a 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -148,14 +148,14 @@ "y": 39, "elevation": 0, "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 39, "y": 6, "elevation": 3, "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_3F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/MtEmber_SummitPath_3F/map.json b/data/maps/MtEmber_SummitPath_3F/map.json index 19dd584bc..e8571acce 100644 --- a/data/maps/MtEmber_SummitPath_3F/map.json +++ b/data/maps/MtEmber_SummitPath_3F/map.json @@ -21,14 +21,14 @@ "y": 4, "elevation": 0, "dest_map": "MAP_MT_EMBER_SUMMIT_PATH_2F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 11, "y": 8, "elevation": 0, "dest_map": "MAP_MT_EMBER_EXTERIOR", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 91415dca0..163749680 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -218,28 +218,28 @@ "y": 6, "elevation": 3, "dest_map": "MAP_MT_MOON_B1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 19, "y": 14, "elevation": 3, "dest_map": "MAP_MT_MOON_B1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 31, "y": 16, "elevation": 3, "dest_map": "MAP_MT_MOON_B1F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 18, "y": 37, "elevation": 3, "dest_map": "MAP_ROUTE4", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/MtMoon_B1F/map.json b/data/maps/MtMoon_B1F/map.json index 68723ddee..81281c549 100644 --- a/data/maps/MtMoon_B1F/map.json +++ b/data/maps/MtMoon_B1F/map.json @@ -21,56 +21,56 @@ "y": 3, "elevation": 3, "dest_map": "MAP_MT_MOON_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 25, "y": 4, "elevation": 3, "dest_map": "MAP_MT_MOON_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 43, "y": 21, "elevation": 3, "dest_map": "MAP_MT_MOON_1F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 22, "y": 18, "elevation": 3, "dest_map": "MAP_MT_MOON_B2F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 17, "y": 5, "elevation": 3, "dest_map": "MAP_MT_MOON_B2F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 26, "y": 36, "elevation": 3, "dest_map": "MAP_MT_MOON_B2F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 39, "y": 4, "elevation": 3, "dest_map": "MAP_MT_MOON_B2F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 45, "y": 4, "elevation": 3, "dest_map": "MAP_ROUTE4", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 3b8d645ed..0ce444496 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -176,28 +176,28 @@ "y": 21, "elevation": 3, "dest_map": "MAP_MT_MOON_B1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 31, "y": 11, "elevation": 3, "dest_map": "MAP_MT_MOON_B1F", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 17, "y": 31, "elevation": 3, "dest_map": "MAP_MT_MOON_B1F", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 5, "y": 10, "elevation": 3, "dest_map": "MAP_MT_MOON_B1F", - "dest_warp_id": 6 + "dest_warp_id": "6" } ], "coord_events": [ diff --git a/data/maps/NavelRock_1F/map.json b/data/maps/NavelRock_1F/map.json index 1cee54ae8..59660ad6c 100644 --- a/data/maps/NavelRock_1F/map.json +++ b/data/maps/NavelRock_1F/map.json @@ -21,14 +21,14 @@ "y": 4, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_B1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 8, "y": 23, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_EXTERIOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json index 8ebd55017..2485fe670 100644 --- a/data/maps/NavelRock_B1F/map.json +++ b/data/maps/NavelRock_B1F/map.json @@ -21,14 +21,14 @@ "y": 2, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 11, "y": 5, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_FORK", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index 3d3791a51..faa3eef81 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -36,7 +36,7 @@ "y": 20, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B11F", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/NavelRock_BasePath_B10F/map.json b/data/maps/NavelRock_BasePath_B10F/map.json index c579af031..a9a1f7497 100644 --- a/data/maps/NavelRock_BasePath_B10F/map.json +++ b/data/maps/NavelRock_BasePath_B10F/map.json @@ -21,14 +21,14 @@ "y": 4, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B9F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 2, "y": 2, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B11F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/NavelRock_BasePath_B11F/map.json b/data/maps/NavelRock_BasePath_B11F/map.json index 579b13577..a16259cf4 100644 --- a/data/maps/NavelRock_BasePath_B11F/map.json +++ b/data/maps/NavelRock_BasePath_B11F/map.json @@ -21,14 +21,14 @@ "y": 2, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B10F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 4, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/NavelRock_BasePath_B1F/map.json b/data/maps/NavelRock_BasePath_B1F/map.json index f0289d880..5e88bf657 100644 --- a/data/maps/NavelRock_BasePath_B1F/map.json +++ b/data/maps/NavelRock_BasePath_B1F/map.json @@ -21,14 +21,14 @@ "y": 2, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_FORK", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 4, "y": 4, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/NavelRock_BasePath_B2F/map.json b/data/maps/NavelRock_BasePath_B2F/map.json index 5cd175db3..9c871d0d7 100644 --- a/data/maps/NavelRock_BasePath_B2F/map.json +++ b/data/maps/NavelRock_BasePath_B2F/map.json @@ -21,14 +21,14 @@ "y": 4, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 2, "y": 2, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B3F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/NavelRock_BasePath_B3F/map.json b/data/maps/NavelRock_BasePath_B3F/map.json index fdbe8f4e3..8db0435a4 100644 --- a/data/maps/NavelRock_BasePath_B3F/map.json +++ b/data/maps/NavelRock_BasePath_B3F/map.json @@ -21,14 +21,14 @@ "y": 2, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B2F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 4, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B4F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/NavelRock_BasePath_B4F/map.json b/data/maps/NavelRock_BasePath_B4F/map.json index e90cabc93..a8ad85aa9 100644 --- a/data/maps/NavelRock_BasePath_B4F/map.json +++ b/data/maps/NavelRock_BasePath_B4F/map.json @@ -21,14 +21,14 @@ "y": 4, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B3F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 2, "y": 2, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B5F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/NavelRock_BasePath_B5F/map.json b/data/maps/NavelRock_BasePath_B5F/map.json index 61737e2e6..a5f95b8ba 100644 --- a/data/maps/NavelRock_BasePath_B5F/map.json +++ b/data/maps/NavelRock_BasePath_B5F/map.json @@ -21,14 +21,14 @@ "y": 2, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B4F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 4, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B6F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/NavelRock_BasePath_B6F/map.json b/data/maps/NavelRock_BasePath_B6F/map.json index 54801807e..2dba61b3e 100644 --- a/data/maps/NavelRock_BasePath_B6F/map.json +++ b/data/maps/NavelRock_BasePath_B6F/map.json @@ -21,14 +21,14 @@ "y": 4, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B5F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 2, "y": 2, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B7F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/NavelRock_BasePath_B7F/map.json b/data/maps/NavelRock_BasePath_B7F/map.json index b64c7ae1c..ac3ad1a6d 100644 --- a/data/maps/NavelRock_BasePath_B7F/map.json +++ b/data/maps/NavelRock_BasePath_B7F/map.json @@ -21,14 +21,14 @@ "y": 2, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B6F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 4, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B8F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/NavelRock_BasePath_B8F/map.json b/data/maps/NavelRock_BasePath_B8F/map.json index 5a50563b7..5e74b9780 100644 --- a/data/maps/NavelRock_BasePath_B8F/map.json +++ b/data/maps/NavelRock_BasePath_B8F/map.json @@ -21,14 +21,14 @@ "y": 4, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B7F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 2, "y": 2, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B9F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/NavelRock_BasePath_B9F/map.json b/data/maps/NavelRock_BasePath_B9F/map.json index a14c35048..1d4cf4847 100644 --- a/data/maps/NavelRock_BasePath_B9F/map.json +++ b/data/maps/NavelRock_BasePath_B9F/map.json @@ -21,14 +21,14 @@ "y": 2, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B8F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 4, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B10F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json index e7578b073..e8d2476bc 100644 --- a/data/maps/NavelRock_Exterior/map.json +++ b/data/maps/NavelRock_Exterior/map.json @@ -21,14 +21,14 @@ "y": 8, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 9, "y": 16, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_HARBOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json index 25e7ecf40..e20f46526 100644 --- a/data/maps/NavelRock_Fork/map.json +++ b/data/maps/NavelRock_Fork/map.json @@ -21,21 +21,21 @@ "y": 95, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_B1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 3, "y": 1, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 26, "y": 1, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_BASE_PATH_B1F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index e65348867..f53a46a84 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -50,7 +50,7 @@ "y": 2, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_EXTERIOR", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index cd1e58794..c7ea83f07 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -36,7 +36,7 @@ "y": 18, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_5F", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [ diff --git a/data/maps/NavelRock_SummitPath_2F/map.json b/data/maps/NavelRock_SummitPath_2F/map.json index 9a61e4b79..06f005826 100644 --- a/data/maps/NavelRock_SummitPath_2F/map.json +++ b/data/maps/NavelRock_SummitPath_2F/map.json @@ -21,14 +21,14 @@ "y": 4, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_FORK", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 2, "y": 2, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_3F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/NavelRock_SummitPath_3F/map.json b/data/maps/NavelRock_SummitPath_3F/map.json index e61f23fb8..30a79db74 100644 --- a/data/maps/NavelRock_SummitPath_3F/map.json +++ b/data/maps/NavelRock_SummitPath_3F/map.json @@ -21,14 +21,14 @@ "y": 2, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_2F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 4, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_4F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/NavelRock_SummitPath_4F/map.json b/data/maps/NavelRock_SummitPath_4F/map.json index 3d55fb5d7..371d04ef3 100644 --- a/data/maps/NavelRock_SummitPath_4F/map.json +++ b/data/maps/NavelRock_SummitPath_4F/map.json @@ -21,14 +21,14 @@ "y": 4, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_3F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 2, "y": 2, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_5F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/NavelRock_SummitPath_5F/map.json b/data/maps/NavelRock_SummitPath_5F/map.json index 0182b2eec..3256004c8 100644 --- a/data/maps/NavelRock_SummitPath_5F/map.json +++ b/data/maps/NavelRock_SummitPath_5F/map.json @@ -21,14 +21,14 @@ "y": 2, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_SUMMIT_PATH_4F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 4, "elevation": 3, "dest_map": "MAP_NAVEL_ROCK_SUMMIT", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index 43cff9bfd..f8ac5c92d 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -75,28 +75,28 @@ "y": 5, "elevation": 0, "dest_map": "MAP_ONE_ISLAND_POKEMON_CENTER_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 19, "y": 9, "elevation": 0, "dest_map": "MAP_ONE_ISLAND_HOUSE1", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 8, "y": 11, "elevation": 0, "dest_map": "MAP_ONE_ISLAND_HOUSE2", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 12, "y": 18, "elevation": 3, "dest_map": "MAP_ONE_ISLAND_HARBOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index b56d7746d..d26171247 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -50,7 +50,7 @@ "y": 2, "elevation": 3, "dest_map": "MAP_ONE_ISLAND", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index a3f225e6a..33677be61 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -50,7 +50,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_ONE_ISLAND", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index 9600e847e..07bc21d68 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -36,7 +36,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_ONE_ISLAND", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index c7f3793c7..b23c862a1 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -434,21 +434,21 @@ "y": 6, "elevation": 3, "dest_map": "MAP_MT_EMBER_EXTERIOR", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 12, "y": 6, "elevation": 3, "dest_map": "MAP_MT_EMBER_EXTERIOR", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 15, "y": 58, "elevation": 3, "dest_map": "MAP_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index 2bc4bec54..ea0c5a2e1 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -106,7 +106,7 @@ "y": 36, "elevation": 3, "dest_map": "MAP_ONE_ISLAND_KINDLE_ROAD", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [ diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index 473d8a751..98c9bb585 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -106,14 +106,14 @@ "y": 9, "elevation": 3, "dest_map": "MAP_ONE_ISLAND", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 1, "y": 5, "elevation": 4, "dest_map": "MAP_ONE_ISLAND_POKEMON_CENTER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index 00ac518fe..62c92bff7 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -78,21 +78,21 @@ "y": 6, "elevation": 4, "dest_map": "MAP_ONE_ISLAND_POKEMON_CENTER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_UNION_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 1, "elevation": 0, "dest_map": "MAP_TRADE_CENTER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 8926beb48..355411bc1 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -75,21 +75,21 @@ "y": 7, "elevation": 0, "dest_map": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 15, "y": 7, "elevation": 0, "dest_map": "MAP_PALLET_TOWN_RIVALS_HOUSE", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 16, "y": 13, "elevation": 0, "dest_map": "MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index 6622fca15..a03192be5 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -36,28 +36,28 @@ "y": 8, "elevation": 3, "dest_map": "MAP_PALLET_TOWN", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 4, "y": 8, "elevation": 3, "dest_map": "MAP_PALLET_TOWN", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 10, "y": 2, "elevation": 3, "dest_map": "MAP_PALLET_TOWN_PLAYERS_HOUSE_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 3, "y": 9, "elevation": 0, "dest_map": "MAP_PALLET_TOWN", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json index 9d38997a1..05337daa4 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/map.json +++ b/data/maps/PalletTown_PlayersHouse_2F/map.json @@ -21,7 +21,7 @@ "y": 2, "elevation": 3, "dest_map": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index 7ae7434e7..ddbc3e3e2 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -162,21 +162,21 @@ "y": 12, "elevation": 3, "dest_map": "MAP_PALLET_TOWN", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 7, "y": 12, "elevation": 3, "dest_map": "MAP_PALLET_TOWN", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 5, "y": 12, "elevation": 3, "dest_map": "MAP_PALLET_TOWN", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [ diff --git a/data/maps/PalletTown_RivalsHouse/map.json b/data/maps/PalletTown_RivalsHouse/map.json index 6c354f2f6..ad9b2880d 100644 --- a/data/maps/PalletTown_RivalsHouse/map.json +++ b/data/maps/PalletTown_RivalsHouse/map.json @@ -50,21 +50,21 @@ "y": 8, "elevation": 3, "dest_map": "MAP_PALLET_TOWN", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 5, "y": 8, "elevation": 3, "dest_map": "MAP_PALLET_TOWN", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 3, "y": 8, "elevation": 3, "dest_map": "MAP_PALLET_TOWN", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index 25d8be29f..b39ee8b85 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -131,49 +131,49 @@ "y": 6, "elevation": 0, "dest_map": "MAP_PEWTER_CITY_MUSEUM_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 25, "y": 4, "elevation": 0, "dest_map": "MAP_PEWTER_CITY_MUSEUM_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 15, "y": 16, "elevation": 0, "dest_map": "MAP_PEWTER_CITY_GYM", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 28, "y": 18, "elevation": 0, "dest_map": "MAP_PEWTER_CITY_MART", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 33, "y": 11, "elevation": 0, "dest_map": "MAP_PEWTER_CITY_HOUSE1", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 17, "y": 25, "elevation": 0, "dest_map": "MAP_PEWTER_CITY_POKEMON_CENTER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 9, "y": 30, "elevation": 0, "dest_map": "MAP_PEWTER_CITY_HOUSE2", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [ diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json index 7c11199d4..5ecb2eb7c 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -64,21 +64,21 @@ "y": 14, "elevation": 3, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 6, "y": 14, "elevation": 3, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 7, "y": 14, "elevation": 3, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index 44ca8f0d9..097a58484 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -64,21 +64,21 @@ "y": 7, "elevation": 0, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 4, "y": 7, "elevation": 0, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 5, "y": 7, "elevation": 0, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index 7ecc4596e..b1c86a681 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -50,21 +50,21 @@ "y": 7, "elevation": 0, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 4, "y": 7, "elevation": 0, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 5, "y": 7, "elevation": 0, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 6 + "dest_warp_id": "6" } ], "coord_events": [], diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index 1cbef2d6a..c11a3939b 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -64,21 +64,21 @@ "y": 7, "elevation": 3, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 2959ccf25..530760e18 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -106,42 +106,42 @@ "y": 9, "elevation": 3, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 14, "y": 9, "elevation": 3, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 15, "y": 9, "elevation": 3, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 21, "y": 9, "elevation": 3, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 22, "y": 9, "elevation": 3, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 8, "y": 8, "elevation": 3, "dest_map": "MAP_PEWTER_CITY_MUSEUM_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index b57a75607..4e10ce252 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -92,7 +92,7 @@ "y": 8, "elevation": 3, "dest_map": "MAP_PEWTER_CITY_MUSEUM_1F", - "dest_warp_id": 5 + "dest_warp_id": "5" } ], "coord_events": [], diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index 7d6fafb6c..d8840a13b 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -120,28 +120,28 @@ "y": 8, "elevation": 0, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 7, "y": 8, "elevation": 3, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 8, "y": 8, "elevation": 0, "dest_map": "MAP_PEWTER_CITY", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 1, "y": 6, "elevation": 4, "dest_map": "MAP_PEWTER_CITY_POKEMON_CENTER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index e91aeba2a..756892072 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -78,21 +78,21 @@ "y": 6, "elevation": 4, "dest_map": "MAP_PEWTER_CITY_POKEMON_CENTER_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_UNION_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 1, "elevation": 0, "dest_map": "MAP_TRADE_CENTER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index 791f4fc2f..c1791ebf0 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -36,14 +36,14 @@ "y": 12, "elevation": 0, "dest_map": "MAP_POKEMON_LEAGUE_BRUNOS_ROOM", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 6, "y": 2, "elevation": 0, "dest_map": "MAP_POKEMON_LEAGUE_LANCES_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index a10f99c0a..3150972ac 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -36,14 +36,14 @@ "y": 12, "elevation": 0, "dest_map": "MAP_POKEMON_LEAGUE_LORELEIS_ROOM", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 6, "y": 2, "elevation": 0, "dest_map": "MAP_POKEMON_LEAGUE_AGATHAS_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index 89988b5fb..32329b02d 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -50,14 +50,14 @@ "y": 19, "elevation": 3, "dest_map": "MAP_POKEMON_LEAGUE_LANCES_ROOM", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 6, "y": 2, "elevation": 3, "dest_map": "MAP_POKEMON_LEAGUE_HALL_OF_FAME", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index baa87e865..e728c6554 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -36,7 +36,7 @@ "y": 12, "elevation": 3, "dest_map": "MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index 8ef0a06bb..4a1dde336 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -36,14 +36,14 @@ "y": 13, "elevation": 3, "dest_map": "MAP_POKEMON_LEAGUE_AGATHAS_ROOM", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 6, "y": 5, "elevation": 0, "dest_map": "MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json index 4b03e865c..0e6943857 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/map.json +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -36,14 +36,14 @@ "y": 12, "elevation": 0, "dest_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 6, "y": 2, "elevation": 0, "dest_map": "MAP_POKEMON_LEAGUE_BRUNOS_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index 32073b70a..f517febf3 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -92,70 +92,70 @@ "y": 33, "elevation": 3, "dest_map": "MAP_CINNABAR_ISLAND", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 8, "y": 33, "elevation": 3, "dest_map": "MAP_CINNABAR_ISLAND", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 33, "elevation": 3, "dest_map": "MAP_CINNABAR_ISLAND", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 10, "y": 13, "elevation": 3, "dest_map": "MAP_POKEMON_MANSION_2F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 25, "y": 27, "elevation": 3, "dest_map": "MAP_POKEMON_MANSION_B1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 34, "y": 33, "elevation": 3, "dest_map": "MAP_CINNABAR_ISLAND", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 35, "y": 34, "elevation": 0, "dest_map": "MAP_CINNABAR_ISLAND", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 19, "y": 22, "elevation": 3, "dest_map": "MAP_POKEMON_MANSION_3F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 20, "y": 22, "elevation": 3, "dest_map": "MAP_POKEMON_MANSION_3F", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 11, "y": 13, "elevation": 0, "dest_map": "MAP_POKEMON_MANSION_2F", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index d600cf6cb..89220add4 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -78,35 +78,35 @@ "y": 3, "elevation": 3, "dest_map": "MAP_POKEMON_MANSION_3F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 34, "y": 22, "elevation": 3, "dest_map": "MAP_POKEMON_MANSION_3F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 6, "y": 14, "elevation": 3, "dest_map": "MAP_POKEMON_MANSION_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 9, "y": 14, "elevation": 3, "dest_map": "MAP_POKEMON_MANSION_3F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 27, "y": 17, "elevation": 3, "dest_map": "MAP_POKEMON_MANSION_3F", - "dest_warp_id": 5 + "dest_warp_id": "5" } ], "coord_events": [], diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index a567098a8..66816e89f 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -78,56 +78,56 @@ "y": 3, "elevation": 3, "dest_map": "MAP_POKEMON_MANSION_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 34, "y": 18, "elevation": 3, "dest_map": "MAP_POKEMON_MANSION_2F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 11, "y": 11, "elevation": 3, "dest_map": "MAP_POKEMON_MANSION_2F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 18, "y": 18, "elevation": 3, "dest_map": "MAP_POKEMON_MANSION_1F", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 19, "y": 18, "elevation": 3, "dest_map": "MAP_POKEMON_MANSION_1F", - "dest_warp_id": 8 + "dest_warp_id": "8" }, { "x": 23, "y": 18, "elevation": 3, "dest_map": "MAP_POKEMON_MANSION_2F", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 20, "y": 18, "elevation": 3, "dest_map": "MAP_POKEMON_MANSION_1F", - "dest_warp_id": 8 + "dest_warp_id": "8" }, { "x": 24, "y": 18, "elevation": 3, "dest_map": "MAP_POKEMON_MANSION_2F", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index 3f2b04726..75fe3af53 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -106,7 +106,7 @@ "y": 29, "elevation": 3, "dest_map": "MAP_POKEMON_MANSION_1F", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json index e67ce4974..900da797b 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -92,28 +92,28 @@ "y": 19, "elevation": 3, "dest_map": "MAP_LAVENDER_TOWN", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 11, "y": 18, "elevation": 3, "dest_map": "MAP_LAVENDER_TOWN", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 12, "y": 19, "elevation": 3, "dest_map": "MAP_LAVENDER_TOWN", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 18, "y": 9, "elevation": 3, "dest_map": "MAP_POKEMON_TOWER_2F", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index 86f397409..05e924e0f 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -50,14 +50,14 @@ "y": 10, "elevation": 3, "dest_map": "MAP_POKEMON_TOWER_3F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 18, "y": 10, "elevation": 3, "dest_map": "MAP_POKEMON_TOWER_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [ diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index 8e5d2599e..f894e4cf4 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -78,14 +78,14 @@ "y": 10, "elevation": 3, "dest_map": "MAP_POKEMON_TOWER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 18, "y": 10, "elevation": 3, "dest_map": "MAP_POKEMON_TOWER_4F", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index 286e7b07f..67aa43d0f 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -106,14 +106,14 @@ "y": 10, "elevation": 3, "dest_map": "MAP_POKEMON_TOWER_5F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 18, "y": 10, "elevation": 3, "dest_map": "MAP_POKEMON_TOWER_3F", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index cd58f14a4..b4feeb07c 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -120,14 +120,14 @@ "y": 10, "elevation": 3, "dest_map": "MAP_POKEMON_TOWER_4F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 18, "y": 10, "elevation": 3, "dest_map": "MAP_POKEMON_TOWER_6F", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [ diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index b54a5d499..da60ee269 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -92,14 +92,14 @@ "y": 16, "elevation": 3, "dest_map": "MAP_POKEMON_TOWER_7F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 18, "y": 10, "elevation": 3, "dest_map": "MAP_POKEMON_TOWER_5F", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [ diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index a0f23bd76..f5289a31e 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -78,7 +78,7 @@ "y": 16, "elevation": 3, "dest_map": "MAP_POKEMON_TOWER_6F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index fc61ef633..d0c40dcd5 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -134,35 +134,35 @@ "y": 39, "elevation": 3, "dest_map": "MAP_ROUTE10", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 5, "y": 38, "elevation": 3, "dest_map": "MAP_ROUTE10", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 6, "y": 39, "elevation": 3, "dest_map": "MAP_ROUTE10", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 1, "y": 11, "elevation": 3, "dest_map": "MAP_ROUTE10", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 0, "y": 13, "elevation": 3, "dest_map": "MAP_ROUTE10", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index b12044673..48aea0b56 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -35,29 +35,29 @@ "x": 8, "y": 9, "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 + "dest_map": "MAP_DYNAMIC", + "dest_warp_id": "WARP_ID_DYNAMIC" }, { "x": 9, "y": 9, "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 + "dest_map": "MAP_DYNAMIC", + "dest_warp_id": "WARP_ID_DYNAMIC" }, { "x": 11, "y": 9, "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 + "dest_map": "MAP_DYNAMIC", + "dest_warp_id": "WARP_ID_DYNAMIC" }, { "x": 10, "y": 9, "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 + "dest_map": "MAP_DYNAMIC", + "dest_warp_id": "WARP_ID_DYNAMIC" } ], "coord_events": [ diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index 185bdab33..8c56778c2 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -162,42 +162,42 @@ "y": 2, "elevation": 3, "dest_map": "MAP_ROUTE10", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 45, "y": 2, "elevation": 3, "dest_map": "MAP_ROCK_TUNNEL_B1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 4, "y": 2, "elevation": 3, "dest_map": "MAP_ROCK_TUNNEL_B1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 20, "y": 13, "elevation": 3, "dest_map": "MAP_ROCK_TUNNEL_B1F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 45, "y": 21, "elevation": 3, "dest_map": "MAP_ROCK_TUNNEL_B1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 18, "y": 37, "elevation": 3, "dest_map": "MAP_ROUTE10", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index 9c2fcb6ae..b5dac6490 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -386,28 +386,28 @@ "y": 28, "elevation": 3, "dest_map": "MAP_ROCK_TUNNEL_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 33, "y": 3, "elevation": 3, "dest_map": "MAP_ROCK_TUNNEL_1F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 27, "y": 12, "elevation": 3, "dest_map": "MAP_ROCK_TUNNEL_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 2, "y": 3, "elevation": 3, "dest_map": "MAP_ROCK_TUNNEL_1F", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 9380f0fdf..a387f96e2 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -120,42 +120,42 @@ "y": 2, "elevation": 3, "dest_map": "MAP_CELADON_CITY_GAME_CORNER", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 17, "y": 2, "elevation": 3, "dest_map": "MAP_ROCKET_HIDEOUT_B2F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 15, "y": 30, "elevation": 3, "dest_map": "MAP_ROCKET_HIDEOUT_B2F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 23, "y": 25, "elevation": 0, "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 24, "y": 25, "elevation": 0, "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 25, "y": 25, "elevation": 0, "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index c5e9b5e55..6b465505d 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -92,35 +92,35 @@ "y": 2, "elevation": 3, "dest_map": "MAP_ROCKET_HIDEOUT_B3F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 28, "y": 2, "elevation": 3, "dest_map": "MAP_ROCKET_HIDEOUT_B1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 23, "y": 12, "elevation": 3, "dest_map": "MAP_ROCKET_HIDEOUT_B1F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 28, "y": 16, "elevation": 0, "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 29, "y": 16, "elevation": 0, "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index 5b54baeb8..af785dae4 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -92,14 +92,14 @@ "y": 2, "elevation": 3, "dest_map": "MAP_ROCKET_HIDEOUT_B2F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 15, "y": 18, "elevation": 3, "dest_map": "MAP_ROCKET_HIDEOUT_B4F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index da0f43378..4bfdfca24 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -148,21 +148,21 @@ "y": 15, "elevation": 3, "dest_map": "MAP_ROCKET_HIDEOUT_B3F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 20, "y": 23, "elevation": 0, "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 21, "y": 23, "elevation": 0, "dest_map": "MAP_ROCKET_HIDEOUT_ELEVATOR", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json index 71a762a19..223fa0497 100644 --- a/data/maps/RocketHideout_Elevator/map.json +++ b/data/maps/RocketHideout_Elevator/map.json @@ -20,15 +20,15 @@ "x": 1, "y": 5, "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 + "dest_map": "MAP_DYNAMIC", + "dest_warp_id": "WARP_ID_DYNAMIC" }, { "x": 2, "y": 5, "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 + "dest_map": "MAP_DYNAMIC", + "dest_warp_id": "WARP_ID_DYNAMIC" } ], "coord_events": [], diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index 7b14e946d..ff5cce9b0 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -173,35 +173,35 @@ "y": 19, "elevation": 3, "dest_map": "MAP_ROCK_TUNNEL_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 8, "y": 57, "elevation": 3, "dest_map": "MAP_ROCK_TUNNEL_1F", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 7, "y": 40, "elevation": 3, "dest_map": "MAP_POWER_PLANT", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 13, "y": 20, "elevation": 0, "dest_map": "MAP_ROUTE10_POKEMON_CENTER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 2, "y": 37, "elevation": 3, "dest_map": "MAP_POWER_PLANT", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index ce0147d0e..a49cb927d 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -92,28 +92,28 @@ "y": 8, "elevation": 3, "dest_map": "MAP_ROUTE10", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 7, "y": 8, "elevation": 3, "dest_map": "MAP_ROUTE10", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 8, "y": 8, "elevation": 3, "dest_map": "MAP_ROUTE10", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 1, "y": 6, "elevation": 4, "dest_map": "MAP_ROUTE10_POKEMON_CENTER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index 5c653874f..314ea1b67 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -78,21 +78,21 @@ "y": 6, "elevation": 4, "dest_map": "MAP_ROUTE10_POKEMON_CENTER_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_UNION_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 1, "elevation": 0, "dest_map": "MAP_TRADE_CENTER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index 0c0f76b57..24ee24b14 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -215,21 +215,21 @@ "y": 7, "elevation": 0, "dest_map": "MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 58, "y": 10, "elevation": 3, "dest_map": "MAP_ROUTE11_EAST_ENTRANCE_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 65, "y": 10, "elevation": 3, "dest_map": "MAP_ROUTE11_EAST_ENTRANCE_1F", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index a09cc6f74..e6a85b2a2 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -50,35 +50,35 @@ "y": 6, "elevation": 3, "dest_map": "MAP_ROUTE11", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 1, "y": 7, "elevation": 3, "dest_map": "MAP_ROUTE11", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 11, "y": 6, "elevation": 3, "dest_map": "MAP_ROUTE11", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 11, "y": 7, "elevation": 3, "dest_map": "MAP_ROUTE11", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 9, "y": 10, "elevation": 3, "dest_map": "MAP_ROUTE11_EAST_ENTRANCE_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index 9c5a0986e..50a7c6f58 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -50,7 +50,7 @@ "y": 9, "elevation": 3, "dest_map": "MAP_ROUTE11_EAST_ENTRANCE_1F", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index 0d6f31a05..54d24b715 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -234,28 +234,28 @@ "y": 86, "elevation": 0, "dest_map": "MAP_ROUTE12_FISHING_HOUSE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 14, "y": 15, "elevation": 3, "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 15, "y": 15, "elevation": 3, "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 14, "y": 21, "elevation": 3, "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_1F", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index 1cedae260..c0e761da1 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -36,21 +36,21 @@ "y": 8, "elevation": 0, "dest_map": "MAP_ROUTE12", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 3, "y": 7, "elevation": 3, "dest_map": "MAP_ROUTE12", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 4, "y": 8, "elevation": 0, "dest_map": "MAP_ROUTE12", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index 436bc8e47..4a03cf2cf 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -36,35 +36,35 @@ "y": 1, "elevation": 3, "dest_map": "MAP_ROUTE12", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 6, "y": 1, "elevation": 0, "dest_map": "MAP_ROUTE12", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 5, "y": 11, "elevation": 3, "dest_map": "MAP_ROUTE12", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 6, "y": 11, "elevation": 3, "dest_map": "MAP_ROUTE12", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 8, "y": 10, "elevation": 3, "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index 81267ac70..0a57d4beb 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -36,7 +36,7 @@ "y": 9, "elevation": 3, "dest_map": "MAP_ROUTE12_NORTH_ENTRANCE_1F", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index a698de29c..433c045bb 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -223,14 +223,14 @@ "y": 11, "elevation": 3, "dest_map": "MAP_ROUTE15_WEST_ENTRANCE_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 16, "y": 11, "elevation": 3, "dest_map": "MAP_ROUTE15_WEST_ENTRANCE_1F", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index 9ac95b3ef..e1d529a19 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -36,35 +36,35 @@ "y": 6, "elevation": 3, "dest_map": "MAP_ROUTE15", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 1, "y": 7, "elevation": 3, "dest_map": "MAP_ROUTE15", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 11, "y": 6, "elevation": 3, "dest_map": "MAP_ROUTE15", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 11, "y": 7, "elevation": 3, "dest_map": "MAP_ROUTE15", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 9, "y": 10, "elevation": 3, "dest_map": "MAP_ROUTE15_WEST_ENTRANCE_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index ca878b2ba..4163c8bb8 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -36,7 +36,7 @@ "y": 9, "elevation": 3, "dest_map": "MAP_ROUTE15_WEST_ENTRANCE_1F", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index d0e7f771a..af1c20d8b 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -173,35 +173,35 @@ "y": 5, "elevation": 0, "dest_map": "MAP_ROUTE16_HOUSE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 20, "y": 6, "elevation": 3, "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 27, "y": 6, "elevation": 3, "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 20, "y": 13, "elevation": 3, "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 27, "y": 13, "elevation": 3, "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index c9e7f326a..b2a9374c7 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -50,21 +50,21 @@ "y": 7, "elevation": 3, "dest_map": "MAP_ROUTE16", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_ROUTE16", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_ROUTE16", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 2d289ca2e..272c358b9 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -50,35 +50,35 @@ "y": 3, "elevation": 3, "dest_map": "MAP_ROUTE16", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 11, "y": 3, "elevation": 3, "dest_map": "MAP_ROUTE16", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 1, "y": 12, "elevation": 3, "dest_map": "MAP_ROUTE16", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 11, "y": 12, "elevation": 3, "dest_map": "MAP_ROUTE16", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 9, "y": 16, "elevation": 3, "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index 256220887..6bea3b6cd 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -64,7 +64,7 @@ "y": 9, "elevation": 3, "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index fb6c538fc..14f7aee1c 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -75,14 +75,14 @@ "y": 9, "elevation": 3, "dest_map": "MAP_ROUTE18_EAST_ENTRANCE_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 48, "y": 9, "elevation": 3, "dest_map": "MAP_ROUTE18_EAST_ENTRANCE_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 032fdeb9f..cb905b343 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -36,21 +36,21 @@ "y": 6, "elevation": 3, "dest_map": "MAP_ROUTE18", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 11, "y": 6, "elevation": 3, "dest_map": "MAP_ROUTE18", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 9, "y": 10, "elevation": 3, "dest_map": "MAP_ROUTE18_EAST_ENTRANCE_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index 427e0deb1..e29d59992 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -36,7 +36,7 @@ "y": 9, "elevation": 3, "dest_map": "MAP_ROUTE18_EAST_ENTRANCE_1F", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 8bdcf3f51..ae86c838d 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -125,70 +125,70 @@ "y": 13, "elevation": 3, "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 6, "y": 13, "elevation": 3, "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 51, "elevation": 3, "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 17, "y": 11, "elevation": 3, "dest_map": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 17, "y": 22, "elevation": 0, "dest_map": "MAP_ROUTE2_HOUSE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 18, "y": 46, "elevation": 3, "dest_map": "MAP_ROUTE2_EAST_BUILDING", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 18, "y": 41, "elevation": 3, "dest_map": "MAP_ROUTE2_EAST_BUILDING", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 19, "y": 41, "elevation": 3, "dest_map": "MAP_ROUTE2_EAST_BUILDING", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 19, "y": 46, "elevation": 3, "dest_map": "MAP_ROUTE2_EAST_BUILDING", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 6, "y": 51, "elevation": 3, "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index c53ce065f..2900cf4ac 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -187,14 +187,14 @@ "y": 8, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 72, "y": 14, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_1F", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index 1317ff4e3..ee918e6fa 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -47,14 +47,14 @@ "y": 5, "elevation": 0, "dest_map": "MAP_ROUTE22_NORTH_ENTRANCE", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 9, "y": 5, "elevation": 0, "dest_map": "MAP_ROUTE22_NORTH_ENTRANCE", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [ diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index 01ab2de00..40191e5c2 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -36,28 +36,28 @@ "y": 1, "elevation": 3, "dest_map": "MAP_ROUTE23", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 6, "y": 10, "elevation": 3, "dest_map": "MAP_ROUTE22", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 7, "y": 10, "elevation": 3, "dest_map": "MAP_ROUTE22", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 8, "y": 10, "elevation": 3, "dest_map": "MAP_ROUTE22", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index ddb4eeef9..86044c923 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -131,28 +131,28 @@ "y": 28, "elevation": 3, "dest_map": "MAP_VICTORY_ROAD_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 18, "y": 28, "elevation": 3, "dest_map": "MAP_VICTORY_ROAD_2F", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 8, "y": 153, "elevation": 3, "dest_map": "MAP_ROUTE22_NORTH_ENTRANCE", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 154, "elevation": 0, "dest_map": "MAP_ROUTE22_NORTH_ENTRANCE", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index 7b45398b3..9ebeb1841 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -210,7 +210,7 @@ "y": 4, "elevation": 0, "dest_map": "MAP_ROUTE25_SEA_COTTAGE", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index d1550e65d..82dd50402 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -50,21 +50,21 @@ "y": 9, "elevation": 3, "dest_map": "MAP_ROUTE25", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 7, "y": 9, "elevation": 3, "dest_map": "MAP_ROUTE25", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 8, "y": 9, "elevation": 3, "dest_map": "MAP_ROUTE25", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index 1ba0e9df0..e7d96be6e 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -50,28 +50,28 @@ "y": 10, "elevation": 0, "dest_map": "MAP_ROUTE2", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 7, "y": 10, "elevation": 3, "dest_map": "MAP_ROUTE2", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 8, "y": 10, "elevation": 3, "dest_map": "MAP_ROUTE2", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 7, "y": 1, "elevation": 3, "dest_map": "MAP_ROUTE2", - "dest_warp_id": 6 + "dest_warp_id": "6" } ], "coord_events": [], diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index 4531b0c79..a688bf780 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -50,21 +50,21 @@ "y": 7, "elevation": 0, "dest_map": "MAP_ROUTE2", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 4, "y": 7, "elevation": 0, "dest_map": "MAP_ROUTE2", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 5, "y": 7, "elevation": 0, "dest_map": "MAP_ROUTE2", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index 652f096ff..f0b7393b2 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -64,28 +64,28 @@ "y": 10, "elevation": 3, "dest_map": "MAP_VIRIDIAN_FOREST", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 7, "y": 10, "elevation": 3, "dest_map": "MAP_VIRIDIAN_FOREST", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 8, "y": 10, "elevation": 3, "dest_map": "MAP_VIRIDIAN_FOREST", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 7, "y": 1, "elevation": 3, "dest_map": "MAP_ROUTE2", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index 7930c462d..4f5a7fb05 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -50,28 +50,28 @@ "y": 10, "elevation": 3, "dest_map": "MAP_ROUTE2", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 7, "y": 10, "elevation": 3, "dest_map": "MAP_ROUTE2", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 8, "y": 10, "elevation": 3, "dest_map": "MAP_ROUTE2", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 7, "y": 1, "elevation": 3, "dest_map": "MAP_VIRIDIAN_FOREST", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index 4692d24dc..5bd534dfa 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -125,21 +125,21 @@ "y": 5, "elevation": 3, "dest_map": "MAP_MT_MOON_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 32, "y": 5, "elevation": 0, "dest_map": "MAP_MT_MOON_B1F", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 12, "y": 5, "elevation": 0, "dest_map": "MAP_ROUTE4_POKEMON_CENTER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 071aabffd..52cf73b1d 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -106,28 +106,28 @@ "y": 8, "elevation": 3, "dest_map": "MAP_ROUTE4", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 7, "y": 8, "elevation": 3, "dest_map": "MAP_ROUTE4", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 8, "y": 8, "elevation": 3, "dest_map": "MAP_ROUTE4", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 1, "y": 6, "elevation": 4, "dest_map": "MAP_ROUTE4_POKEMON_CENTER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index e3deac4ae..cdadbfccf 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -78,21 +78,21 @@ "y": 6, "elevation": 4, "dest_map": "MAP_ROUTE4_POKEMON_CENTER_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_UNION_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 1, "elevation": 0, "dest_map": "MAP_TRADE_CENTER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json index 85b0e75a2..34199b1bd 100644 --- a/data/maps/Route5/map.json +++ b/data/maps/Route5/map.json @@ -32,28 +32,28 @@ "y": 31, "elevation": 0, "dest_map": "MAP_UNDERGROUND_PATH_NORTH_ENTRANCE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 23, "y": 25, "elevation": 0, "dest_map": "MAP_ROUTE5_POKEMON_DAY_CARE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 24, "y": 32, "elevation": 3, "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 25, "y": 32, "elevation": 3, "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index 9f8624c7a..773450928 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -36,21 +36,21 @@ "y": 7, "elevation": 0, "dest_map": "MAP_ROUTE5", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 7, "elevation": 0, "dest_map": "MAP_ROUTE5", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 5, "y": 7, "elevation": 0, "dest_map": "MAP_ROUTE5", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index fc8b66ac8..650568ac1 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -36,28 +36,28 @@ "y": 9, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 9 + "dest_warp_id": "9" }, { "x": 4, "y": 1, "elevation": 3, "dest_map": "MAP_ROUTE5", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 4, "y": 9, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 9 + "dest_warp_id": "9" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_ROUTE5", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [ diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 8f9f1821e..a8a7754c7 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -117,21 +117,21 @@ "y": 13, "elevation": 0, "dest_map": "MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 12, "y": 5, "elevation": 3, "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 13, "y": 5, "elevation": 3, "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index 04867359f..fb2edae08 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -36,28 +36,28 @@ "y": 1, "elevation": 0, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 11 + "dest_warp_id": "11" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 11 + "dest_warp_id": "11" }, { "x": 4, "y": 9, "elevation": 3, "dest_map": "MAP_ROUTE6", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 5, "y": 9, "elevation": 3, "dest_map": "MAP_ROUTE6", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [ diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 80de4df63..b6227e677 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -41,14 +41,14 @@ "y": 14, "elevation": 0, "dest_map": "MAP_UNDERGROUND_PATH_WEST_ENTRANCE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 15, "y": 10, "elevation": 3, "dest_map": "MAP_ROUTE7_EAST_ENTRANCE", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index 0dd963003..4be396210 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -36,28 +36,28 @@ "y": 5, "elevation": 3, "dest_map": "MAP_ROUTE7", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 1, "y": 6, "elevation": 3, "dest_map": "MAP_ROUTE7", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 11, "y": 5, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 8 + "dest_warp_id": "8" }, { "x": 11, "y": 6, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 8 + "dest_warp_id": "8" } ], "coord_events": [ diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index e1304aa90..7741c79f8 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -243,14 +243,14 @@ "y": 4, "elevation": 0, "dest_map": "MAP_UNDERGROUND_PATH_EAST_ENTRANCE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 7, "y": 10, "elevation": 3, "dest_map": "MAP_ROUTE8_WEST_ENTRANCE", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index f1583f862..538e467a2 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -36,28 +36,28 @@ "y": 4, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 10 + "dest_warp_id": "10" }, { "x": 1, "y": 5, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 10 + "dest_warp_id": "10" }, { "x": 11, "y": 5, "elevation": 3, "dest_map": "MAP_ROUTE8", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 11, "y": 6, "elevation": 3, "dest_map": "MAP_ROUTE8", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [ diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index c7737b75b..45bd8e606 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -50,91 +50,91 @@ "y": 8, "elevation": 3, "dest_map": "MAP_SSANNE_2F_CORRIDOR", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 2, "y": 18, "elevation": 3, "dest_map": "MAP_SSANNE_KITCHEN", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 19, "y": 1, "elevation": 3, "dest_map": "MAP_SSANNE_EXTERIOR", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 20, "y": 0, "elevation": 0, "dest_map": "MAP_SSANNE_EXTERIOR", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 3, "y": 20, "elevation": 0, "dest_map": "MAP_SSANNE_KITCHEN", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 28, "y": 17, "elevation": 3, "dest_map": "MAP_SSANNE_B1F_CORRIDOR", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 5, "y": 10, "elevation": 3, "dest_map": "MAP_SSANNE_1F_ROOM1", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 8, "y": 10, "elevation": 3, "dest_map": "MAP_SSANNE_1F_ROOM2", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 11, "y": 10, "elevation": 3, "dest_map": "MAP_SSANNE_1F_ROOM3", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 14, "y": 10, "elevation": 3, "dest_map": "MAP_SSANNE_1F_ROOM4", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 17, "y": 10, "elevation": 3, "dest_map": "MAP_SSANNE_1F_ROOM5", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 23, "y": 10, "elevation": 3, "dest_map": "MAP_SSANNE_1F_ROOM7", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 20, "y": 10, "elevation": 3, "dest_map": "MAP_SSANNE_1F_ROOM6", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index 89cb5ca70..a74f0215e 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -36,7 +36,7 @@ "y": 1, "elevation": 0, "dest_map": "MAP_SSANNE_1F_CORRIDOR", - "dest_warp_id": 6 + "dest_warp_id": "6" } ], "coord_events": [], diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index f96591fc9..3681c1b97 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -78,7 +78,7 @@ "y": 1, "elevation": 0, "dest_map": "MAP_SSANNE_1F_CORRIDOR", - "dest_warp_id": 7 + "dest_warp_id": "7" } ], "coord_events": [], diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index 68c4d8dc8..1523f1259 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -64,7 +64,7 @@ "y": 1, "elevation": 0, "dest_map": "MAP_SSANNE_1F_CORRIDOR", - "dest_warp_id": 8 + "dest_warp_id": "8" } ], "coord_events": [], diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index 5598fb79f..08de2fce8 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -36,7 +36,7 @@ "y": 1, "elevation": 0, "dest_map": "MAP_SSANNE_1F_CORRIDOR", - "dest_warp_id": 9 + "dest_warp_id": "9" } ], "coord_events": [], diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index 38456ea10..a796b3aa7 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -36,7 +36,7 @@ "y": 1, "elevation": 0, "dest_map": "MAP_SSANNE_1F_CORRIDOR", - "dest_warp_id": 10 + "dest_warp_id": "10" } ], "coord_events": [], diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index 83d01462c..2b19578a0 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -36,7 +36,7 @@ "y": 1, "elevation": 0, "dest_map": "MAP_SSANNE_1F_CORRIDOR", - "dest_warp_id": 12 + "dest_warp_id": "12" } ], "coord_events": [], diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index 2435e864c..92dd20902 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -36,7 +36,7 @@ "y": 1, "elevation": 0, "dest_map": "MAP_SSANNE_1F_CORRIDOR", - "dest_warp_id": 11 + "dest_warp_id": "11" } ], "coord_events": [], diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index 59678eb49..90934647d 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -50,63 +50,63 @@ "y": 2, "elevation": 3, "dest_map": "MAP_SSANNE_1F_CORRIDOR", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 3, "y": 12, "elevation": 3, "dest_map": "MAP_SSANNE_3F_CORRIDOR", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 30, "y": 2, "elevation": 3, "dest_map": "MAP_SSANNE_CAPTAINS_OFFICE", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 6, "y": 10, "elevation": 0, "dest_map": "MAP_SSANNE_2F_ROOM1", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 10, "y": 10, "elevation": 0, "dest_map": "MAP_SSANNE_2F_ROOM2", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 14, "y": 10, "elevation": 0, "dest_map": "MAP_SSANNE_2F_ROOM3", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 18, "y": 10, "elevation": 0, "dest_map": "MAP_SSANNE_2F_ROOM4", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 22, "y": 10, "elevation": 0, "dest_map": "MAP_SSANNE_2F_ROOM5", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 26, "y": 10, "elevation": 0, "dest_map": "MAP_SSANNE_2F_ROOM6", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index cd85d395e..9bf965c75 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -36,7 +36,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SSANNE_2F_CORRIDOR", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index 27ffa8b66..0809ce817 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -64,7 +64,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SSANNE_2F_CORRIDOR", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index f4ca52f39..c1dce2a6d 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -50,7 +50,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SSANNE_2F_CORRIDOR", - "dest_warp_id": 5 + "dest_warp_id": "5" } ], "coord_events": [], diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index 3a3e4d107..ee878da63 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -64,7 +64,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SSANNE_2F_CORRIDOR", - "dest_warp_id": 6 + "dest_warp_id": "6" } ], "coord_events": [], diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index c75da955a..f982577f8 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -50,7 +50,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SSANNE_2F_CORRIDOR", - "dest_warp_id": 7 + "dest_warp_id": "7" } ], "coord_events": [], diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index 6c87a8ec0..9b199c30a 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -50,7 +50,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SSANNE_2F_CORRIDOR", - "dest_warp_id": 8 + "dest_warp_id": "8" } ], "coord_events": [], diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index 9337e19f3..4c7259290 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -36,21 +36,21 @@ "y": 4, "elevation": 3, "dest_map": "MAP_SSANNE_DECK", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 18, "y": 2, "elevation": 3, "dest_map": "MAP_SSANNE_2F_CORRIDOR", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 0, "y": 5, "elevation": 0, "dest_map": "MAP_SSANNE_DECK", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SSAnne_B1F_Corridor/map.json b/data/maps/SSAnne_B1F_Corridor/map.json index 4e0ad1134..858673bc5 100644 --- a/data/maps/SSAnne_B1F_Corridor/map.json +++ b/data/maps/SSAnne_B1F_Corridor/map.json @@ -21,42 +21,42 @@ "y": 3, "elevation": 3, "dest_map": "MAP_SSANNE_1F_CORRIDOR", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 2, "y": 2, "elevation": 0, "dest_map": "MAP_SSANNE_B1F_ROOM1", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 6, "y": 2, "elevation": 0, "dest_map": "MAP_SSANNE_B1F_ROOM2", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 10, "y": 2, "elevation": 0, "dest_map": "MAP_SSANNE_B1F_ROOM3", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 14, "y": 2, "elevation": 0, "dest_map": "MAP_SSANNE_B1F_ROOM4", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 18, "y": 2, "elevation": 0, "dest_map": "MAP_SSANNE_B1F_ROOM5", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index e0b41fc12..254074b36 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -50,7 +50,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SSANNE_B1F_CORRIDOR", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index af0e08af2..edbedddbe 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -50,7 +50,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SSANNE_B1F_CORRIDOR", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index 703525282..f46cc525a 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -50,7 +50,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SSANNE_B1F_CORRIDOR", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index 2da162618..d57823eb4 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -50,7 +50,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SSANNE_B1F_CORRIDOR", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index 35487ba46..dce8aff51 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -64,7 +64,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SSANNE_B1F_CORRIDOR", - "dest_warp_id": 5 + "dest_warp_id": "5" } ], "coord_events": [], diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index bba9fdf25..4282796c7 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -36,7 +36,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SSANNE_2F_CORRIDOR", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index 4d3dde7f3..193652c1e 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -92,14 +92,14 @@ "y": 8, "elevation": 3, "dest_map": "MAP_SSANNE_3F_CORRIDOR", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 16, "y": 9, "elevation": 3, "dest_map": "MAP_SSANNE_3F_CORRIDOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index bc9a9f9c2..211b244e4 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -36,35 +36,35 @@ "y": 5, "elevation": 0, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 32, "y": 5, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 32, "y": 14, "elevation": 3, "dest_map": "MAP_SSANNE_1F_CORRIDOR", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 33, "y": 15, "elevation": 0, "dest_map": "MAP_SSANNE_1F_CORRIDOR", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 33, "y": 5, "elevation": 0, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 163b88d12..af1f147ac 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -134,7 +134,7 @@ "y": 1, "elevation": 0, "dest_map": "MAP_SSANNE_1F_CORRIDOR", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index bf49fb4b8..1eaad1f23 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -36,91 +36,91 @@ "y": 30, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 26, "y": 30, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 27, "y": 30, "elevation": 3, "dest_map": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 25, "y": 5, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_NORTH", - "dest_warp_id": 9 + "dest_warp_id": "9" }, { "x": 26, "y": 5, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_NORTH", - "dest_warp_id": 10 + "dest_warp_id": "10" }, { "x": 27, "y": 5, "elevation": 0, "dest_map": "MAP_SAFARI_ZONE_NORTH", - "dest_warp_id": 11 + "dest_warp_id": "11" }, { "x": 8, "y": 17, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_WEST", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 8, "y": 18, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_WEST", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 8, "y": 19, "elevation": 0, "dest_map": "MAP_SAFARI_ZONE_WEST", - "dest_warp_id": 8 + "dest_warp_id": "8" }, { "x": 43, "y": 15, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_EAST", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 43, "y": 16, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_EAST", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 43, "y": 17, "elevation": 0, "dest_map": "MAP_SAFARI_ZONE_EAST", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 29, "y": 25, "elevation": 0, "dest_map": "MAP_SAFARI_ZONE_CENTER_REST_HOUSE", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/SafariZone_Center_RestHouse/map.json b/data/maps/SafariZone_Center_RestHouse/map.json index b5b111f7a..1bf350eb9 100644 --- a/data/maps/SafariZone_Center_RestHouse/map.json +++ b/data/maps/SafariZone_Center_RestHouse/map.json @@ -50,21 +50,21 @@ "y": 9, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_CENTER", - "dest_warp_id": 12 + "dest_warp_id": "12" }, { "x": 4, "y": 9, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_CENTER", - "dest_warp_id": 12 + "dest_warp_id": "12" }, { "x": 5, "y": 9, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_CENTER", - "dest_warp_id": 12 + "dest_warp_id": "12" } ], "coord_events": [], diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index 3e2151f8c..cc9ed8726 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -78,49 +78,49 @@ "y": 9, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_NORTH", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 8, "y": 10, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_NORTH", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 8, "y": 11, "elevation": 0, "dest_map": "MAP_SAFARI_ZONE_NORTH", - "dest_warp_id": 8 + "dest_warp_id": "8" }, { "x": 8, "y": 26, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_CENTER", - "dest_warp_id": 9 + "dest_warp_id": "9" }, { "x": 8, "y": 27, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_CENTER", - "dest_warp_id": 10 + "dest_warp_id": "10" }, { "x": 8, "y": 28, "elevation": 0, "dest_map": "MAP_SAFARI_ZONE_CENTER", - "dest_warp_id": 11 + "dest_warp_id": "11" }, { "x": 40, "y": 14, "elevation": 0, "dest_map": "MAP_SAFARI_ZONE_EAST_REST_HOUSE", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/SafariZone_East_RestHouse/map.json b/data/maps/SafariZone_East_RestHouse/map.json index 5c0b460ac..a9682a68e 100644 --- a/data/maps/SafariZone_East_RestHouse/map.json +++ b/data/maps/SafariZone_East_RestHouse/map.json @@ -64,21 +64,21 @@ "y": 9, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_EAST", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 4, "y": 9, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_EAST", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 5, "y": 9, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_EAST", - "dest_warp_id": 6 + "dest_warp_id": "6" } ], "coord_events": [], diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index e90b9aa0d..f0d2e8639 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -64,91 +64,91 @@ "y": 34, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_WEST", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 11, "y": 34, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_WEST", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 12, "y": 34, "elevation": 0, "dest_map": "MAP_SAFARI_ZONE_WEST", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 20, "y": 34, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_WEST", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 21, "y": 34, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_WEST", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 22, "y": 34, "elevation": 0, "dest_map": "MAP_SAFARI_ZONE_WEST", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 48, "y": 31, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_EAST", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 48, "y": 32, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_EAST", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 48, "y": 33, "elevation": 0, "dest_map": "MAP_SAFARI_ZONE_EAST", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 30, "y": 34, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_CENTER", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 31, "y": 34, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_CENTER", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 32, "y": 34, "elevation": 0, "dest_map": "MAP_SAFARI_ZONE_CENTER", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 43, "y": 8, "elevation": 0, "dest_map": "MAP_SAFARI_ZONE_NORTH_REST_HOUSE", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/SafariZone_North_RestHouse/map.json b/data/maps/SafariZone_North_RestHouse/map.json index cecf86a54..2a55ff569 100644 --- a/data/maps/SafariZone_North_RestHouse/map.json +++ b/data/maps/SafariZone_North_RestHouse/map.json @@ -78,21 +78,21 @@ "y": 9, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_NORTH", - "dest_warp_id": 12 + "dest_warp_id": "12" }, { "x": 4, "y": 9, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_NORTH", - "dest_warp_id": 12 + "dest_warp_id": "12" }, { "x": 5, "y": 9, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_NORTH", - "dest_warp_id": 12 + "dest_warp_id": "12" } ], "coord_events": [], diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index 49061ae7c..782716f0c 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -36,21 +36,21 @@ "y": 9, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_WEST", - "dest_warp_id": 9 + "dest_warp_id": "9" }, { "x": 4, "y": 9, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_WEST", - "dest_warp_id": 9 + "dest_warp_id": "9" }, { "x": 5, "y": 9, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_WEST", - "dest_warp_id": 9 + "dest_warp_id": "9" } ], "coord_events": [], diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index ed9cef50c..ccbf3d8b6 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -78,77 +78,77 @@ "y": 5, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_NORTH", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 31, "y": 5, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_NORTH", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 32, "y": 5, "elevation": 0, "dest_map": "MAP_SAFARI_ZONE_NORTH", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 37, "y": 5, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_NORTH", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 38, "y": 5, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_NORTH", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 39, "y": 5, "elevation": 0, "dest_map": "MAP_SAFARI_ZONE_NORTH", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 40, "y": 26, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_CENTER", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 40, "y": 27, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_CENTER", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 40, "y": 28, "elevation": 0, "dest_map": "MAP_SAFARI_ZONE_CENTER", - "dest_warp_id": 8 + "dest_warp_id": "8" }, { "x": 12, "y": 7, "elevation": 0, "dest_map": "MAP_SAFARI_ZONE_SECRET_HOUSE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 19, "y": 18, "elevation": 0, "dest_map": "MAP_SAFARI_ZONE_WEST_REST_HOUSE", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/SafariZone_West_RestHouse/map.json b/data/maps/SafariZone_West_RestHouse/map.json index ea046b849..0b7b3bb6e 100644 --- a/data/maps/SafariZone_West_RestHouse/map.json +++ b/data/maps/SafariZone_West_RestHouse/map.json @@ -64,21 +64,21 @@ "y": 9, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_WEST", - "dest_warp_id": 10 + "dest_warp_id": "10" }, { "x": 4, "y": 9, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_WEST", - "dest_warp_id": 10 + "dest_warp_id": "10" }, { "x": 5, "y": 9, "elevation": 3, "dest_map": "MAP_SAFARI_ZONE_WEST", - "dest_warp_id": 10 + "dest_warp_id": "10" } ], "coord_events": [], diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 8da2e4099..31eb5193c 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -254,105 +254,105 @@ "y": 30, "elevation": 0, "dest_map": "MAP_SILPH_CO_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 22, "y": 14, "elevation": 0, "dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 40, "y": 12, "elevation": 0, "dest_map": "MAP_SAFFRON_CITY_DOJO", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 46, "y": 12, "elevation": 0, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 27, "y": 21, "elevation": 0, "dest_map": "MAP_SAFFRON_CITY_HOUSE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 40, "y": 21, "elevation": 0, "dest_map": "MAP_SAFFRON_CITY_MART", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 24, "y": 38, "elevation": 0, "dest_map": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 43, "y": 38, "elevation": 0, "dest_map": "MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 8, "y": 27, "elevation": 3, "dest_map": "MAP_ROUTE7_EAST_ENTRANCE", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 34, "y": 5, "elevation": 3, "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 58, "y": 27, "elevation": 3, "dest_map": "MAP_ROUTE8_WEST_ENTRANCE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 34, "y": 46, "elevation": 3, "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 35, "y": 46, "elevation": 3, "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 35, "y": 5, "elevation": 3, "dest_map": "MAP_ROUTE5_SOUTH_ENTRANCE", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 47, "y": 21, "elevation": 0, "dest_map": "MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/map.json b/data/maps/SaffronCity_CopycatsHouse_1F/map.json index c7abb00d7..4bb8a60a8 100644 --- a/data/maps/SaffronCity_CopycatsHouse_1F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_1F/map.json @@ -64,28 +64,28 @@ "y": 8, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 8, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 5, "y": 8, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 10, "y": 2, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json index 919c12a0b..9a6be7486 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json @@ -78,7 +78,7 @@ "y": 2, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index 01f94fc0d..062741bfa 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -120,21 +120,21 @@ "y": 14, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 6, "y": 14, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 7, "y": 14, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [ diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index 4fc950d9b..faf4769e4 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -148,231 +148,231 @@ "y": 23, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 14, "y": 23, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 15, "y": 23, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 18, "y": 20, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 32 + "dest_warp_id": "32" }, { "x": 0, "y": 4, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 22 + "dest_warp_id": "22" }, { "x": 0, "y": 7, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 20 + "dest_warp_id": "20" }, { "x": 0, "y": 12, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 30 + "dest_warp_id": "30" }, { "x": 0, "y": 15, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 11 + "dest_warp_id": "11" }, { "x": 0, "y": 20, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 28 + "dest_warp_id": "28" }, { "x": 0, "y": 23, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 19 + "dest_warp_id": "19" }, { "x": 8, "y": 4, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 18 + "dest_warp_id": "18" }, { "x": 8, "y": 7, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 8, "y": 12, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 17 + "dest_warp_id": "17" }, { "x": 8, "y": 15, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 15 + "dest_warp_id": "15" }, { "x": 8, "y": 20, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 26 + "dest_warp_id": "26" }, { "x": 8, "y": 23, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 13 + "dest_warp_id": "13" }, { "x": 12, "y": 4, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 24 + "dest_warp_id": "24" }, { "x": 12, "y": 7, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 12 + "dest_warp_id": "12" }, { "x": 16, "y": 4, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 10 + "dest_warp_id": "10" }, { "x": 16, "y": 7, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 9 + "dest_warp_id": "9" }, { "x": 18, "y": 15, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 20, "y": 4, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 23 + "dest_warp_id": "23" }, { "x": 20, "y": 7, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 20, "y": 12, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 21 + "dest_warp_id": "21" }, { "x": 20, "y": 15, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 16 + "dest_warp_id": "16" }, { "x": 20, "y": 20, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 27 + "dest_warp_id": "27" }, { "x": 20, "y": 23, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 14 + "dest_warp_id": "14" }, { "x": 28, "y": 4, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 25 + "dest_warp_id": "25" }, { "x": 28, "y": 7, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 8 + "dest_warp_id": "8" }, { "x": 28, "y": 12, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 31 + "dest_warp_id": "31" }, { "x": 28, "y": 15, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 28, "y": 20, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 29 + "dest_warp_id": "29" }, { "x": 28, "y": 23, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY_GYM", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/SaffronCity_House/map.json b/data/maps/SaffronCity_House/map.json index 70e9b3fe9..304d9cb7b 100644 --- a/data/maps/SaffronCity_House/map.json +++ b/data/maps/SaffronCity_House/map.json @@ -78,21 +78,21 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index b72d0e84e..0618e78d1 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -64,21 +64,21 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 5 + "dest_warp_id": "5" } ], "coord_events": [], diff --git a/data/maps/SaffronCity_MrPsychicsHouse/map.json b/data/maps/SaffronCity_MrPsychicsHouse/map.json index 9e01e083f..444045571 100644 --- a/data/maps/SaffronCity_MrPsychicsHouse/map.json +++ b/data/maps/SaffronCity_MrPsychicsHouse/map.json @@ -36,21 +36,21 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 7 + "dest_warp_id": "7" } ], "coord_events": [], diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index 5a87f8862..dfb7b03be 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -106,28 +106,28 @@ "y": 8, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 7, "y": 8, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 8, "y": 8, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 1, "y": 6, "elevation": 4, "dest_map": "MAP_SAFFRON_CITY_POKEMON_CENTER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index 24e3e4730..53db3c4ca 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -78,21 +78,21 @@ "y": 6, "elevation": 4, "dest_map": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_UNION_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 1, "elevation": 0, "dest_map": "MAP_TRADE_CENTER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index 538df731e..02db9fdb5 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -162,7 +162,7 @@ "y": 15, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 14 + "dest_warp_id": "14" } ], "coord_events": [], diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index ab8ec8235..3893afd63 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -64,49 +64,49 @@ "y": 6, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 31, "y": 4, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 28, "y": 19, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 6, "y": 21, "elevation": 3, "dest_map": "MAP_ROUTE20", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 32, "y": 21, "elevation": 3, "dest_map": "MAP_ROUTE20", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 21, "y": 8, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", - "dest_warp_id": 9 + "dest_warp_id": "9" }, { "x": 30, "y": 8, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", - "dest_warp_id": 10 + "dest_warp_id": "10" } ], "coord_events": [], diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index 39f6184bf..ddd704e26 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -78,77 +78,77 @@ "y": 6, "elevation": 4, "dest_map": "MAP_SEAFOAM_ISLANDS_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 31, "y": 4, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 28, "y": 19, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_1F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 7, "y": 3, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 17, "y": 9, "elevation": 4, "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 25, "y": 19, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 32, "y": 14, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 23, "y": 8, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 28, "y": 8, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", - "dest_warp_id": 8 + "dest_warp_id": "8" }, { "x": 21, "y": 8, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_1F", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 29, "y": 8, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_1F", - "dest_warp_id": 6 + "dest_warp_id": "6" } ], "coord_events": [], diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index 7f620f30b..421b263b4 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -64,77 +64,77 @@ "y": 17, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 32, "y": 4, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 31, "y": 17, "elevation": 4, "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 7, "y": 4, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 17, "y": 9, "elevation": 4, "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 25, "y": 19, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 32, "y": 14, "elevation": 4, "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 22, "y": 7, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 29, "y": 8, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B1F", - "dest_warp_id": 8 + "dest_warp_id": "8" }, { "x": 24, "y": 8, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 27, "y": 8, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", - "dest_warp_id": 6 + "dest_warp_id": "6" } ], "coord_events": [], diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index 4cbf7e29a..6f53158a4 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -106,63 +106,63 @@ "y": 14, "elevation": 4, "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 31, "y": 4, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 31, "y": 16, "elevation": 4, "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 12, "y": 9, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B4F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 29, "y": 5, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B4F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 23, "y": 9, "elevation": 1, "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 24, "y": 9, "elevation": 1, "dest_map": "MAP_SEAFOAM_ISLANDS_B2F", - "dest_warp_id": 8 + "dest_warp_id": "8" }, { "x": 6, "y": 18, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B4F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 9, "y": 18, "elevation": 3, "dest_map": "MAP_SEAFOAM_ISLANDS_B4F", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index f7cf6a0a0..41f9a7597 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -78,28 +78,28 @@ "y": 9, "elevation": 4, "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 32, "y": 5, "elevation": 4, "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 8, "y": 17, "elevation": 1, "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 9, "y": 17, "elevation": 1, "dest_map": "MAP_SEAFOAM_ISLANDS_B3F", - "dest_warp_id": 8 + "dest_warp_id": "8" } ], "coord_events": [ diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index 6f0157a1c..d775303af 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -75,28 +75,28 @@ "y": 9, "elevation": 0, "dest_map": "MAP_SEVEN_ISLAND_HOUSE_ROOM1", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 5, "y": 9, "elevation": 0, "dest_map": "MAP_SEVEN_ISLAND_MART", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 12, "y": 3, "elevation": 0, "dest_map": "MAP_SEVEN_ISLAND_POKEMON_CENTER_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 16, "y": 13, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND_HARBOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index 4c0a1879e..22f5f6844 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -50,7 +50,7 @@ "y": 2, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index 1315c5430..4204f1811 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -36,14 +36,14 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 4, "y": 1, "elevation": 0, "dest_map": "MAP_SEVEN_ISLAND_HOUSE_ROOM2", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json index 04375b39e..2e280939c 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -36,7 +36,7 @@ "y": 1, "elevation": 0, "dest_map": "MAP_SEVEN_ISLAND_HOUSE_ROOM1", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index 0dac386df..227c6931a 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -78,7 +78,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index ab0e7158c..010db8bec 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -106,14 +106,14 @@ "y": 8, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 1, "y": 6, "elevation": 4, "dest_map": "MAP_SEVEN_ISLAND_POKEMON_CENTER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index ef43a8fa1..95ff5a714 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -78,21 +78,21 @@ "y": 6, "elevation": 4, "dest_map": "MAP_SEVEN_ISLAND_POKEMON_CENTER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_UNION_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 1, "elevation": 0, "dest_map": "MAP_TRADE_CENTER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index ce1002299..2c8f76642 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -313,14 +313,14 @@ "y": 17, "elevation": 5, "dest_map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 14, "y": 61, "elevation": 0, "dest_map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index e1a5d7460..e5e14894a 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -64,7 +64,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index d59f38bd2..639d495cb 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -120,7 +120,7 @@ "y": 13, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index e589e8362..ff476137c 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -84,49 +84,49 @@ "y": 10, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 103, "y": 10, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 88, "y": 8, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 44, "y": 11, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 32, "y": 9, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 12, "y": 15, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 11, "y": 6, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json index f51307ed0..df2917eb6 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json @@ -21,7 +21,7 @@ "y": 15, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json index 5786a9f73..ba3dc36ec 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json @@ -21,7 +21,7 @@ "y": 15, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json index efb2dc13c..edf7c74bd 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json @@ -21,7 +21,7 @@ "y": 15, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json index e0a656acf..75b490006 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json @@ -21,7 +21,7 @@ "y": 15, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", - "dest_warp_id": 5 + "dest_warp_id": "5" } ], "coord_events": [], diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json index 266b18579..072eeb144 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json @@ -21,7 +21,7 @@ "y": 15, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json index a1cd61249..9d2d4594f 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json @@ -21,7 +21,7 @@ "y": 15, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", - "dest_warp_id": 6 + "dest_warp_id": "6" } ], "coord_events": [], diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json index b9e11db9b..15124e2d2 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json @@ -21,7 +21,7 @@ "y": 15, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index 365be8499..079f8ce1b 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -56,7 +56,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_TRAINER_TOWER_LOBBY", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index f3ca6b9ed..0ba516fdb 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -106,42 +106,42 @@ "y": 2, "elevation": 3, "dest_map": "MAP_SILPH_CO_11F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 10, "y": 14, "elevation": 3, "dest_map": "MAP_SILPH_CO_4F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 14, "y": 9, "elevation": 3, "dest_map": "MAP_SILPH_CO_4F", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 8, "y": 2, "elevation": 3, "dest_map": "MAP_SILPH_CO_9F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 14, "y": 17, "elevation": 3, "dest_map": "MAP_SILPH_CO_4F", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 13, "y": 3, "elevation": 0, "dest_map": "MAP_SILPH_CO_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 0a40ff336..eb5c24042 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -106,21 +106,21 @@ "y": 2, "elevation": 3, "dest_map": "MAP_SILPH_CO_10F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 2, "y": 5, "elevation": 3, "dest_map": "MAP_SILPH_CO_7F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 13, "y": 3, "elevation": 0, "dest_map": "MAP_SILPH_CO_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index fe60d23e3..60dcf04ee 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -36,35 +36,35 @@ "y": 21, "elevation": 0, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 8, "y": 20, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 20, "elevation": 3, "dest_map": "MAP_SAFFRON_CITY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 31, "y": 2, "elevation": 3, "dest_map": "MAP_SILPH_CO_2F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 22, "y": 3, "elevation": 0, "dest_map": "MAP_SILPH_CO_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index 3b7940b21..91a37c98f 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -92,49 +92,49 @@ "y": 2, "elevation": 3, "dest_map": "MAP_SILPH_CO_3F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 2, "y": 6, "elevation": 3, "dest_map": "MAP_SILPH_CO_3F", - "dest_warp_id": 8 + "dest_warp_id": "8" }, { "x": 15, "y": 6, "elevation": 3, "dest_map": "MAP_SILPH_CO_8F", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 30, "y": 2, "elevation": 3, "dest_map": "MAP_SILPH_CO_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 7, "y": 19, "elevation": 3, "dest_map": "MAP_SILPH_CO_6F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 33, "y": 19, "elevation": 3, "dest_map": "MAP_SILPH_CO_8F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 22, "y": 3, "elevation": 0, "dest_map": "MAP_SILPH_CO_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index 75c82254c..9e0bfe88a 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -78,70 +78,70 @@ "y": 2, "elevation": 3, "dest_map": "MAP_SILPH_CO_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 4, "y": 6, "elevation": 3, "dest_map": "MAP_SILPH_CO_5F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 13, "y": 14, "elevation": 3, "dest_map": "MAP_SILPH_CO_7F", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 30, "y": 2, "elevation": 3, "dest_map": "MAP_SILPH_CO_4F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 2, "y": 14, "elevation": 3, "dest_map": "MAP_SILPH_CO_9F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 3, "y": 20, "elevation": 3, "dest_map": "MAP_SILPH_CO_5F", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 29, "y": 14, "elevation": 3, "dest_map": "MAP_SILPH_CO_3F", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 32, "y": 20, "elevation": 3, "dest_map": "MAP_SILPH_CO_3F", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 33, "y": 5, "elevation": 3, "dest_map": "MAP_SILPH_CO_2F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 22, "y": 3, "elevation": 0, "dest_map": "MAP_SILPH_CO_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 978582eac..15b95fb8b 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -134,49 +134,49 @@ "y": 2, "elevation": 3, "dest_map": "MAP_SILPH_CO_5F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 18, "y": 6, "elevation": 3, "dest_map": "MAP_SILPH_CO_6F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 30, "y": 2, "elevation": 3, "dest_map": "MAP_SILPH_CO_3F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 12, "y": 9, "elevation": 3, "dest_map": "MAP_SILPH_CO_10F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 2, "y": 20, "elevation": 3, "dest_map": "MAP_SILPH_CO_10F", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 18, "y": 14, "elevation": 3, "dest_map": "MAP_SILPH_CO_10F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 22, "y": 3, "elevation": 0, "dest_map": "MAP_SILPH_CO_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 5f76346bf..a134b7d4b 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -148,49 +148,49 @@ "y": 2, "elevation": 3, "dest_map": "MAP_SILPH_CO_4F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 15, "y": 7, "elevation": 3, "dest_map": "MAP_SILPH_CO_3F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 30, "y": 2, "elevation": 3, "dest_map": "MAP_SILPH_CO_6F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 10, "y": 20, "elevation": 3, "dest_map": "MAP_SILPH_CO_9F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 2, "y": 20, "elevation": 3, "dest_map": "MAP_SILPH_CO_3F", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 33, "y": 5, "elevation": 3, "dest_map": "MAP_SILPH_CO_7F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 22, "y": 3, "elevation": 0, "dest_map": "MAP_SILPH_CO_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index 081752b34..29b033bdb 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -162,35 +162,35 @@ "y": 2, "elevation": 3, "dest_map": "MAP_SILPH_CO_7F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 29, "y": 5, "elevation": 3, "dest_map": "MAP_SILPH_CO_2F", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 26, "y": 2, "elevation": 3, "dest_map": "MAP_SILPH_CO_5F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 2, "y": 6, "elevation": 3, "dest_map": "MAP_SILPH_CO_4F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 20, "y": 3, "elevation": 0, "dest_map": "MAP_SILPH_CO_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index 21e3dc0ad..b5072b37f 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -176,42 +176,42 @@ "y": 2, "elevation": 3, "dest_map": "MAP_SILPH_CO_6F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 5, "y": 8, "elevation": 3, "dest_map": "MAP_SILPH_CO_11F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 25, "y": 17, "elevation": 3, "dest_map": "MAP_SILPH_CO_5F", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 27, "y": 2, "elevation": 3, "dest_map": "MAP_SILPH_CO_8F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 4, "elevation": 3, "dest_map": "MAP_SILPH_CO_3F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 23, "y": 3, "elevation": 0, "dest_map": "MAP_SILPH_CO_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index a901ec1b8..49ee7a3e4 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -106,49 +106,49 @@ "y": 2, "elevation": 3, "dest_map": "MAP_SILPH_CO_9F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 11, "y": 10, "elevation": 3, "dest_map": "MAP_SILPH_CO_8F", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 10, "y": 6, "elevation": 3, "dest_map": "MAP_SILPH_CO_2F", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 28, "y": 2, "elevation": 3, "dest_map": "MAP_SILPH_CO_7F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 2, "y": 12, "elevation": 3, "dest_map": "MAP_SILPH_CO_8F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 2, "y": 17, "elevation": 3, "dest_map": "MAP_SILPH_CO_2F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 22, "y": 3, "elevation": 0, "dest_map": "MAP_SILPH_CO_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index cbd76fef4..bf2ab5433 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -78,35 +78,35 @@ "y": 2, "elevation": 0, "dest_map": "MAP_SILPH_CO_8F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 22, "y": 18, "elevation": 3, "dest_map": "MAP_SILPH_CO_5F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 9, "y": 4, "elevation": 3, "dest_map": "MAP_SILPH_CO_3F", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 18, "y": 2, "elevation": 3, "dest_map": "MAP_SILPH_CO_10F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 24, "y": 3, "elevation": 0, "dest_map": "MAP_SILPH_CO_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json index 95e2bdfcd..846cd8fce 100644 --- a/data/maps/SilphCo_Elevator/map.json +++ b/data/maps/SilphCo_Elevator/map.json @@ -20,8 +20,8 @@ "x": 2, "y": 5, "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 + "dest_map": "MAP_DYNAMIC", + "dest_warp_id": "WARP_ID_DYNAMIC" } ], "coord_events": [], diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index daa46f76c..87e66d7e4 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -56,28 +56,28 @@ "y": 23, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_HARBOR", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 11, "y": 11, "elevation": 0, "dest_map": "MAP_SIX_ISLAND_POKEMON_CENTER_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 16, "y": 17, "elevation": 0, "dest_map": "MAP_SIX_ISLAND_HOUSE", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 20, "y": 11, "elevation": 0, "dest_map": "MAP_SIX_ISLAND_MART", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SixIsland_AlteringCave/map.json b/data/maps/SixIsland_AlteringCave/map.json index b6447b1b2..2b97053f3 100644 --- a/data/maps/SixIsland_AlteringCave/map.json +++ b/data/maps/SixIsland_AlteringCave/map.json @@ -21,7 +21,7 @@ "y": 22, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_OUTCAST_ISLAND", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SixIsland_DottedHole_1F/map.json b/data/maps/SixIsland_DottedHole_1F/map.json index 802d67e26..dc2a4ae75 100644 --- a/data/maps/SixIsland_DottedHole_1F/map.json +++ b/data/maps/SixIsland_DottedHole_1F/map.json @@ -21,28 +21,28 @@ "y": 9, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_RUIN_VALLEY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 6, "y": 5, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 13, "y": 5, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 6, "y": 7, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B1F", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json index 7522ff81c..60032fcc2 100644 --- a/data/maps/SixIsland_DottedHole_B1F/map.json +++ b/data/maps/SixIsland_DottedHole_B1F/map.json @@ -21,35 +21,35 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 6, "y": 1, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B2F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 11, "y": 5, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 6, "y": 9, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 1, "y": 5, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json index e45898a49..cd3365b4c 100644 --- a/data/maps/SixIsland_DottedHole_B2F/map.json +++ b/data/maps/SixIsland_DottedHole_B2F/map.json @@ -21,35 +21,35 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 6, "y": 1, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 11, "y": 5, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 6, "y": 9, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 1, "y": 5, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B3F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json index 5c871db50..91528bf0b 100644 --- a/data/maps/SixIsland_DottedHole_B3F/map.json +++ b/data/maps/SixIsland_DottedHole_B3F/map.json @@ -21,35 +21,35 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B2F", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 6, "y": 1, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 11, "y": 5, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B4F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 6, "y": 9, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 1, "y": 5, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json index 108aa3cce..1fe17117d 100644 --- a/data/maps/SixIsland_DottedHole_B4F/map.json +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -21,35 +21,35 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B3F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 6, "y": 1, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 11, "y": 5, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 6, "y": 9, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 1, "y": 5, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index 1df78033e..fe9af6319 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -50,14 +50,14 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 5, "y": 9, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_B4F", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index 0b9dde9b6..ed2e62719 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -47,28 +47,28 @@ "y": 10, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_PATTERN_BUSH", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 64, "y": 10, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_PATTERN_BUSH", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 45, "y": 10, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_PATTERN_BUSH", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 46, "y": 10, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_PATTERN_BUSH", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index 18524878a..84482518c 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -50,7 +50,7 @@ "y": 2, "elevation": 3, "dest_map": "MAP_SIX_ISLAND", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index acca8851e..37cd73c6e 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -36,7 +36,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SIX_ISLAND", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index 90774c5ec..0f5b787e9 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -64,7 +64,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SIX_ISLAND", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index c5a4b7c8e..69fec4d9b 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -126,7 +126,7 @@ "y": 21, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_ALTERING_CAVE", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index 8231109bd..9595abbc9 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -190,42 +190,42 @@ "y": 26, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_GREEN_PATH", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 55, "y": 26, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_GREEN_PATH", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 56, "y": 26, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_GREEN_PATH", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 3, "y": 26, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_GREEN_PATH", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 4, "y": 26, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_GREEN_PATH", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 5, "y": 26, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_GREEN_PATH", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index 34fadf276..b027d1990 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -78,14 +78,14 @@ "y": 8, "elevation": 3, "dest_map": "MAP_SIX_ISLAND", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 1, "y": 6, "elevation": 4, "dest_map": "MAP_SIX_ISLAND_POKEMON_CENTER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index 941989e3d..fd46d24fa 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -78,21 +78,21 @@ "y": 6, "elevation": 4, "dest_map": "MAP_SIX_ISLAND_POKEMON_CENTER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_UNION_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 1, "elevation": 0, "dest_map": "MAP_TRADE_CENTER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index 9e2851451..72cc69b52 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -266,7 +266,7 @@ "y": 24, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index 080a0749d..0ff0b08f6 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -164,14 +164,14 @@ "y": 13, "elevation": 0, "dest_map": "MAP_SIX_ISLAND_WATER_PATH_HOUSE1", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 11, "y": 19, "elevation": 0, "dest_map": "MAP_SIX_ISLAND_WATER_PATH_HOUSE2", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index 266c79a8a..69b8967f4 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -36,7 +36,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_WATER_PATH", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index 0964b2399..3de52cacd 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -36,7 +36,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_SIX_ISLAND_WATER_PATH", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 7b593a7be..450c66f3c 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -229,49 +229,49 @@ "y": 31, "elevation": 0, "dest_map": "MAP_THREE_ISLAND_HOUSE1", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 14, "y": 27, "elevation": 0, "dest_map": "MAP_THREE_ISLAND_POKEMON_CENTER_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 18, "y": 12, "elevation": 0, "dest_map": "MAP_THREE_ISLAND_MART", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 4, "y": 6, "elevation": 0, "dest_map": "MAP_THREE_ISLAND_HOUSE2", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 12, "y": 6, "elevation": 0, "dest_map": "MAP_THREE_ISLAND_HOUSE3", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 12, "y": 12, "elevation": 0, "dest_map": "MAP_THREE_ISLAND_HOUSE4", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 13, "y": 19, "elevation": 0, "dest_map": "MAP_THREE_ISLAND_HOUSE5", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 7c03e0d7c..53d69e452 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -218,21 +218,21 @@ "y": 41, "elevation": 3, "dest_map": "MAP_THREE_ISLAND_BOND_BRIDGE", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 42, "y": 41, "elevation": 3, "dest_map": "MAP_THREE_ISLAND_BOND_BRIDGE", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 44, "y": 41, "elevation": 3, "dest_map": "MAP_THREE_ISLAND_BOND_BRIDGE", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 69cd2ab45..65bcf0c7e 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -154,14 +154,14 @@ "y": 6, "elevation": 3, "dest_map": "MAP_THREE_ISLAND_BERRY_FOREST", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 13, "y": 6, "elevation": 3, "dest_map": "MAP_THREE_ISLAND_BERRY_FOREST", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index c4b7b5a6a..d04bd68b5 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -36,14 +36,14 @@ "y": 4, "elevation": 3, "dest_map": "MAP_THREE_ISLAND_PORT", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 25, "y": 5, "elevation": 3, "dest_map": "MAP_THREE_ISLAND_PORT", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index 17d8caccd..91b0068f3 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -50,7 +50,7 @@ "y": 2, "elevation": 3, "dest_map": "MAP_THREE_ISLAND_PORT", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index 0922488e0..6f8adafad 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -36,7 +36,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_THREE_ISLAND", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index a079b8482..16f5c6329 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -50,7 +50,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_THREE_ISLAND", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index 608bae55e..92dd72209 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -36,7 +36,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_THREE_ISLAND", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index 93c3d4c12..3f717a01e 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -50,7 +50,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_THREE_ISLAND", - "dest_warp_id": 5 + "dest_warp_id": "5" } ], "coord_events": [], diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index 7f2f8becf..078de6766 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -36,7 +36,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_THREE_ISLAND", - "dest_warp_id": 6 + "dest_warp_id": "6" } ], "coord_events": [], diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index 682126052..87d40bc50 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -78,7 +78,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_THREE_ISLAND", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 1f61598aa..40a381d8a 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -78,14 +78,14 @@ "y": 8, "elevation": 3, "dest_map": "MAP_THREE_ISLAND", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 1, "y": 6, "elevation": 4, "dest_map": "MAP_THREE_ISLAND_POKEMON_CENTER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index a6ba54a41..fc9dc06bf 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -78,21 +78,21 @@ "y": 6, "elevation": 4, "dest_map": "MAP_THREE_ISLAND_POKEMON_CENTER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_UNION_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 1, "elevation": 0, "dest_map": "MAP_TRADE_CENTER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index e5cd31db8..061bf2808 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -70,21 +70,21 @@ "y": 4, "elevation": 0, "dest_map": "MAP_THREE_ISLAND_DUNSPARCE_TUNNEL", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 38, "y": 5, "elevation": 3, "dest_map": "MAP_THREE_ISLAND_DUNSPARCE_TUNNEL", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 12, "y": 13, "elevation": 3, "dest_map": "MAP_THREE_ISLAND_HARBOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 098772ac9..6a630234f 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -35,15 +35,15 @@ "x": 5, "y": 8, "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 + "dest_map": "MAP_DYNAMIC", + "dest_warp_id": "WARP_ID_DYNAMIC" }, { "x": 6, "y": 8, "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 + "dest_map": "MAP_DYNAMIC", + "dest_warp_id": "WARP_ID_DYNAMIC" } ], "coord_events": [ diff --git a/data/maps/TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json index 58b696f35..7547f513b 100644 --- a/data/maps/TrainerTower_1F/map.json +++ b/data/maps/TrainerTower_1F/map.json @@ -92,14 +92,14 @@ "y": 6, "elevation": 3, "dest_map": "MAP_TRAINER_TOWER_2F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 6, "elevation": 3, "dest_map": "MAP_TRAINER_TOWER_LOBBY", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/TrainerTower_2F/map.json b/data/maps/TrainerTower_2F/map.json index c40c83b34..b92b7b6b7 100644 --- a/data/maps/TrainerTower_2F/map.json +++ b/data/maps/TrainerTower_2F/map.json @@ -92,21 +92,21 @@ "y": 6, "elevation": 3, "dest_map": "MAP_TRAINER_TOWER_3F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 6, "elevation": 3, "dest_map": "MAP_TRAINER_TOWER_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 13, "y": 5, "elevation": 0, "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/TrainerTower_3F/map.json b/data/maps/TrainerTower_3F/map.json index 6c1bc8950..e6adefa4b 100644 --- a/data/maps/TrainerTower_3F/map.json +++ b/data/maps/TrainerTower_3F/map.json @@ -92,21 +92,21 @@ "y": 6, "elevation": 3, "dest_map": "MAP_TRAINER_TOWER_4F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 6, "elevation": 3, "dest_map": "MAP_TRAINER_TOWER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 13, "y": 5, "elevation": 0, "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json index 40abcc338..82ad54a67 100644 --- a/data/maps/TrainerTower_4F/map.json +++ b/data/maps/TrainerTower_4F/map.json @@ -92,21 +92,21 @@ "y": 6, "elevation": 3, "dest_map": "MAP_TRAINER_TOWER_5F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 6, "elevation": 3, "dest_map": "MAP_TRAINER_TOWER_3F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 13, "y": 5, "elevation": 0, "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/TrainerTower_5F/map.json b/data/maps/TrainerTower_5F/map.json index 0e4e358fd..706a18d53 100644 --- a/data/maps/TrainerTower_5F/map.json +++ b/data/maps/TrainerTower_5F/map.json @@ -92,21 +92,21 @@ "y": 6, "elevation": 3, "dest_map": "MAP_TRAINER_TOWER_6F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 6, "elevation": 3, "dest_map": "MAP_TRAINER_TOWER_4F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 13, "y": 5, "elevation": 0, "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json index 37fc68129..b10e110e0 100644 --- a/data/maps/TrainerTower_6F/map.json +++ b/data/maps/TrainerTower_6F/map.json @@ -92,21 +92,21 @@ "y": 6, "elevation": 3, "dest_map": "MAP_TRAINER_TOWER_7F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 6, "elevation": 3, "dest_map": "MAP_TRAINER_TOWER_5F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 13, "y": 5, "elevation": 0, "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json index 83b8b8a8f..33fa4b6bc 100644 --- a/data/maps/TrainerTower_7F/map.json +++ b/data/maps/TrainerTower_7F/map.json @@ -92,21 +92,21 @@ "y": 6, "elevation": 3, "dest_map": "MAP_TRAINER_TOWER_8F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 6, "elevation": 3, "dest_map": "MAP_TRAINER_TOWER_6F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 13, "y": 5, "elevation": 0, "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json index 3ae1211bb..5624035e3 100644 --- a/data/maps/TrainerTower_8F/map.json +++ b/data/maps/TrainerTower_8F/map.json @@ -92,21 +92,21 @@ "y": 6, "elevation": 3, "dest_map": "MAP_TRAINER_TOWER_ROOF", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 6, "elevation": 3, "dest_map": "MAP_TRAINER_TOWER_7F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 13, "y": 5, "elevation": 0, "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/TrainerTower_Elevator/map.json b/data/maps/TrainerTower_Elevator/map.json index c0a71f79e..285a704d1 100644 --- a/data/maps/TrainerTower_Elevator/map.json +++ b/data/maps/TrainerTower_Elevator/map.json @@ -20,8 +20,8 @@ "x": 2, "y": 5, "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 + "dest_map": "MAP_DYNAMIC", + "dest_warp_id": "WARP_ID_DYNAMIC" } ], "coord_events": [], diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json index 3bd89a4c9..8ca6a756d 100644 --- a/data/maps/TrainerTower_Lobby/map.json +++ b/data/maps/TrainerTower_Lobby/map.json @@ -92,21 +92,21 @@ "y": 2, "elevation": 3, "dest_map": "MAP_TRAINER_TOWER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 9, "y": 15, "elevation": 3, "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 17, "y": 8, "elevation": 0, "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/TrainerTower_Roof/map.json b/data/maps/TrainerTower_Roof/map.json index cc42f893c..3e603b3cd 100644 --- a/data/maps/TrainerTower_Roof/map.json +++ b/data/maps/TrainerTower_Roof/map.json @@ -36,14 +36,14 @@ "y": 5, "elevation": 0, "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 4, "y": 6, "elevation": 3, "dest_map": "MAP_TRAINER_TOWER_8F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 8263f2953..41ae31f39 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -154,28 +154,28 @@ "y": 9, "elevation": 0, "dest_map": "MAP_TWO_ISLAND_JOYFUL_GAME_CORNER", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 33, "y": 9, "elevation": 0, "dest_map": "MAP_TWO_ISLAND_HOUSE", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 21, "y": 7, "elevation": 0, "dest_map": "MAP_TWO_ISLAND_POKEMON_CENTER_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 10, "y": 8, "elevation": 3, "dest_map": "MAP_TWO_ISLAND_HARBOR", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/TwoIsland_CapeBrink/map.json b/data/maps/TwoIsland_CapeBrink/map.json index f4fbfe4e4..85e333654 100644 --- a/data/maps/TwoIsland_CapeBrink/map.json +++ b/data/maps/TwoIsland_CapeBrink/map.json @@ -27,7 +27,7 @@ "y": 16, "elevation": 0, "dest_map": "MAP_TWO_ISLAND_CAPE_BRINK_HOUSE", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index 6d6456e21..a37a6d584 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -36,7 +36,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_TWO_ISLAND_CAPE_BRINK", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index 07c78ebf4..19734c66e 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -50,7 +50,7 @@ "y": 2, "elevation": 3, "dest_map": "MAP_TWO_ISLAND", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index 28286b198..b8ebaf876 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -36,7 +36,7 @@ "y": 7, "elevation": 3, "dest_map": "MAP_TWO_ISLAND", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index efaeecdc9..58f88994c 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -78,7 +78,7 @@ "y": 8, "elevation": 3, "dest_map": "MAP_TWO_ISLAND", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index b241134ff..6daf7c00a 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -64,14 +64,14 @@ "y": 8, "elevation": 3, "dest_map": "MAP_TWO_ISLAND", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 1, "y": 6, "elevation": 4, "dest_map": "MAP_TWO_ISLAND_POKEMON_CENTER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index 9d57d7a33..adb9a6b49 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -78,21 +78,21 @@ "y": 6, "elevation": 4, "dest_map": "MAP_TWO_ISLAND_POKEMON_CENTER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_UNION_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 1, "elevation": 0, "dest_map": "MAP_TRADE_CENTER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json index 91fe1143e..88777f77c 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -36,28 +36,28 @@ "y": 8, "elevation": 3, "dest_map": "MAP_ROUTE8", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 6, "y": 8, "elevation": 3, "dest_map": "MAP_ROUTE8", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 7, "y": 8, "elevation": 3, "dest_map": "MAP_ROUTE8", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 7, "y": 4, "elevation": 3, "dest_map": "MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/UndergroundPath_EastWestTunnel/map.json b/data/maps/UndergroundPath_EastWestTunnel/map.json index 9648812ad..174cbc920 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/map.json +++ b/data/maps/UndergroundPath_EastWestTunnel/map.json @@ -21,14 +21,14 @@ "y": 3, "elevation": 3, "dest_map": "MAP_UNDERGROUND_PATH_EAST_ENTRANCE", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 3, "y": 4, "elevation": 3, "dest_map": "MAP_UNDERGROUND_PATH_WEST_ENTRANCE", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json index ee360615b..f3602bf1f 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -36,28 +36,28 @@ "y": 8, "elevation": 3, "dest_map": "MAP_ROUTE5", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 6, "y": 8, "elevation": 3, "dest_map": "MAP_ROUTE5", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 7, "y": 8, "elevation": 3, "dest_map": "MAP_ROUTE5", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 7, "y": 4, "elevation": 3, "dest_map": "MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/map.json b/data/maps/UndergroundPath_NorthSouthTunnel/map.json index 5358160b7..321e1071a 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/map.json +++ b/data/maps/UndergroundPath_NorthSouthTunnel/map.json @@ -21,14 +21,14 @@ "y": 3, "elevation": 3, "dest_map": "MAP_UNDERGROUND_PATH_NORTH_ENTRANCE", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 3, "y": 60, "elevation": 3, "dest_map": "MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json index e6b3ea257..3b1d0c9b9 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -36,28 +36,28 @@ "y": 8, "elevation": 3, "dest_map": "MAP_ROUTE6", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 6, "y": 8, "elevation": 3, "dest_map": "MAP_ROUTE6", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 7, "y": 8, "elevation": 3, "dest_map": "MAP_ROUTE6", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 7, "y": 4, "elevation": 3, "dest_map": "MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json index e987e2e7f..92162da3a 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -36,28 +36,28 @@ "y": 8, "elevation": 3, "dest_map": "MAP_ROUTE7", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 6, "y": 8, "elevation": 3, "dest_map": "MAP_ROUTE7", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 7, "y": 8, "elevation": 3, "dest_map": "MAP_ROUTE7", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 7, "y": 4, "elevation": 3, "dest_map": "MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index 057ee2fc3..45c625f84 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -147,8 +147,8 @@ "x": 7, "y": 11, "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 + "dest_map": "MAP_DYNAMIC", + "dest_warp_id": "WARP_ID_DYNAMIC" } ], "coord_events": [], diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index f37f90399..3df3a72b7 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -145,70 +145,70 @@ "y": 34, "elevation": 3, "dest_map": "MAP_SSANNE_EXTERIOR", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 23, "y": 34, "elevation": 3, "dest_map": "MAP_SSANNE_EXTERIOR", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 24, "y": 34, "elevation": 3, "dest_map": "MAP_SSANNE_EXTERIOR", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 9, "y": 6, "elevation": 0, "dest_map": "MAP_VERMILION_CITY_HOUSE1", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 15, "y": 6, "elevation": 3, "dest_map": "MAP_VERMILION_CITY_POKEMON_CENTER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 12, "y": 17, "elevation": 0, "dest_map": "MAP_VERMILION_CITY_POKEMON_FAN_CLUB", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 19, "y": 17, "elevation": 0, "dest_map": "MAP_VERMILION_CITY_HOUSE2", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 29, "y": 17, "elevation": 0, "dest_map": "MAP_VERMILION_CITY_MART", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 28, "y": 24, "elevation": 0, "dest_map": "MAP_VERMILION_CITY_HOUSE3", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 14, "y": 25, "elevation": 0, "dest_map": "MAP_VERMILION_CITY_GYM", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [ diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json index 936866d6c..62d686734 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -92,21 +92,21 @@ "y": 19, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 9 + "dest_warp_id": "9" }, { "x": 5, "y": 19, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 9 + "dest_warp_id": "9" }, { "x": 6, "y": 19, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 9 + "dest_warp_id": "9" } ], "coord_events": [], diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index 9c8bdec89..d2628a141 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -36,21 +36,21 @@ "y": 7, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index ce9ed5ee3..6e9117fa7 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -36,21 +36,21 @@ "y": 7, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 6 + "dest_warp_id": "6" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 6 + "dest_warp_id": "6" } ], "coord_events": [], diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index 1283bfdb7..f9c6bc68a 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -78,21 +78,21 @@ "y": 7, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 8 + "dest_warp_id": "8" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 8 + "dest_warp_id": "8" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 8 + "dest_warp_id": "8" } ], "coord_events": [], diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index 5eca5f366..b62113ed5 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -64,21 +64,21 @@ "y": 7, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 7 + "dest_warp_id": "7" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 7 + "dest_warp_id": "7" } ], "coord_events": [], diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index 42b53dd2b..4faf56365 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -120,28 +120,28 @@ "y": 8, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 7, "y": 8, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 8, "y": 8, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 1, "y": 6, "elevation": 4, "dest_map": "MAP_VERMILION_CITY_POKEMON_CENTER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 49f8af57e..d9e4b1808 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -78,21 +78,21 @@ "y": 6, "elevation": 4, "dest_map": "MAP_VERMILION_CITY_POKEMON_CENTER_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_UNION_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 1, "elevation": 0, "dest_map": "MAP_TRADE_CENTER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index 9d7e914f0..2ab3825ad 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -106,21 +106,21 @@ "y": 10, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 5, "y": 10, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 5 + "dest_warp_id": "5" }, { "x": 6, "y": 10, "elevation": 3, "dest_map": "MAP_VERMILION_CITY", - "dest_warp_id": 5 + "dest_warp_id": "5" } ], "coord_events": [], diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 3fdf718bd..634e03995 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -120,14 +120,14 @@ "y": 2, "elevation": 3, "dest_map": "MAP_VICTORY_ROAD_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 11, "y": 20, "elevation": 3, "dest_map": "MAP_ROUTE23", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [ diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 9bdf82001..ab71c632d 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -204,63 +204,63 @@ "y": 9, "elevation": 3, "dest_map": "MAP_VICTORY_ROAD_1F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 3, "y": 3, "elevation": 3, "dest_map": "MAP_VICTORY_ROAD_3F", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 34, "y": 9, "elevation": 3, "dest_map": "MAP_VICTORY_ROAD_3F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 38, "y": 9, "elevation": 3, "dest_map": "MAP_VICTORY_ROAD_3F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 36, "y": 17, "elevation": 4, "dest_map": "MAP_VICTORY_ROAD_3F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 49, "y": 13, "elevation": 0, "dest_map": "MAP_ROUTE23", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 48, "y": 12, "elevation": 3, "dest_map": "MAP_ROUTE23", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 47, "y": 13, "elevation": 0, "dest_map": "MAP_ROUTE23", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 34, "y": 19, "elevation": 3, "dest_map": "MAP_VICTORY_ROAD_3F", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [ diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index a3100ccd3..1c62f8a19 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -190,35 +190,35 @@ "y": 2, "elevation": 3, "dest_map": "MAP_VICTORY_ROAD_2F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 34, "y": 9, "elevation": 3, "dest_map": "MAP_VICTORY_ROAD_2F", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 37, "y": 10, "elevation": 3, "dest_map": "MAP_VICTORY_ROAD_2F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 39, "y": 17, "elevation": 3, "dest_map": "MAP_VICTORY_ROAD_2F", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 34, "y": 18, "elevation": 3, "dest_map": "MAP_VICTORY_ROAD_2F", - "dest_warp_id": 8 + "dest_warp_id": "8" } ], "coord_events": [ diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 5efc88834..ccd10d432 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -164,35 +164,35 @@ "y": 26, "elevation": 0, "dest_map": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 25, "y": 11, "elevation": 3, "dest_map": "MAP_VIRIDIAN_CITY_HOUSE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 36, "y": 10, "elevation": 0, "dest_map": "MAP_VIRIDIAN_CITY_GYM", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 25, "y": 18, "elevation": 0, "dest_map": "MAP_VIRIDIAN_CITY_SCHOOL", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 36, "y": 19, "elevation": 0, "dest_map": "MAP_VIRIDIAN_CITY_MART", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [ diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index 0c7278947..083b0cf07 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -162,21 +162,21 @@ "y": 22, "elevation": 3, "dest_map": "MAP_VIRIDIAN_CITY", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 17, "y": 22, "elevation": 3, "dest_map": "MAP_VIRIDIAN_CITY", - "dest_warp_id": 2 + "dest_warp_id": "2" }, { "x": 18, "y": 22, "elevation": 3, "dest_map": "MAP_VIRIDIAN_CITY", - "dest_warp_id": 2 + "dest_warp_id": "2" } ], "coord_events": [], diff --git a/data/maps/ViridianCity_House/map.json b/data/maps/ViridianCity_House/map.json index 29ed4175a..7448c7a66 100644 --- a/data/maps/ViridianCity_House/map.json +++ b/data/maps/ViridianCity_House/map.json @@ -64,21 +64,21 @@ "y": 7, "elevation": 0, "dest_map": "MAP_VIRIDIAN_CITY", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 4, "y": 7, "elevation": 0, "dest_map": "MAP_VIRIDIAN_CITY", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_VIRIDIAN_CITY", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index 91bb7aead..23cbb6e81 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -64,21 +64,21 @@ "y": 7, "elevation": 3, "dest_map": "MAP_VIRIDIAN_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 4, "y": 7, "elevation": 3, "dest_map": "MAP_VIRIDIAN_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_VIRIDIAN_CITY", - "dest_warp_id": 4 + "dest_warp_id": "4" } ], "coord_events": [], diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index 2b8733bc3..84ad95c4d 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -78,28 +78,28 @@ "y": 8, "elevation": 3, "dest_map": "MAP_VIRIDIAN_CITY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 7, "y": 8, "elevation": 3, "dest_map": "MAP_VIRIDIAN_CITY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 8, "y": 8, "elevation": 3, "dest_map": "MAP_VIRIDIAN_CITY", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 1, "y": 6, "elevation": 4, "dest_map": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_2F", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index 5453270bb..6458e0f52 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -78,21 +78,21 @@ "y": 6, "elevation": 4, "dest_map": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 1, "elevation": 0, "dest_map": "MAP_UNION_ROOM", - "dest_warp_id": 0 + "dest_warp_id": "0" }, { "x": 9, "y": 1, "elevation": 0, "dest_map": "MAP_TRADE_CENTER", - "dest_warp_id": 0 + "dest_warp_id": "0" } ], "coord_events": [], diff --git a/data/maps/ViridianCity_School/map.json b/data/maps/ViridianCity_School/map.json index 76bb354f4..195161147 100644 --- a/data/maps/ViridianCity_School/map.json +++ b/data/maps/ViridianCity_School/map.json @@ -50,21 +50,21 @@ "y": 7, "elevation": 0, "dest_map": "MAP_VIRIDIAN_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 4, "y": 7, "elevation": 0, "dest_map": "MAP_VIRIDIAN_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 7, "elevation": 3, "dest_map": "MAP_VIRIDIAN_CITY", - "dest_warp_id": 3 + "dest_warp_id": "3" } ], "coord_events": [], diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index 494dbd394..ef89e4b3f 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -176,42 +176,42 @@ "y": 62, "elevation": 3, "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 28, "y": 62, "elevation": 3, "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 5, "y": 9, "elevation": 3, "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 6, "y": 9, "elevation": 3, "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", - "dest_warp_id": 1 + "dest_warp_id": "1" }, { "x": 30, "y": 62, "elevation": 3, "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", - "dest_warp_id": 3 + "dest_warp_id": "3" }, { "x": 4, "y": 9, "elevation": 3, "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", - "dest_warp_id": 1 + "dest_warp_id": "1" } ], "coord_events": [], diff --git a/include/constants/maps.h b/include/constants/maps.h index 6e127ede6..0452a6666 100644 --- a/include/constants/maps.h +++ b/include/constants/maps.h @@ -4,7 +4,10 @@ #include "constants/map_groups.h" #include "constants/map_types.h" -#define MAP_NONE (0x7F | (0x7F << 8)) +// Warps using this map will instead use the warp data stored in gSaveBlock1Ptr->dynamicWarp. +// Used for warps that need to change destinations, e.g. when stepping off an elevator. +#define MAP_DYNAMIC (0x7F | (0x7F << 8)) + #define MAP_UNDEFINED (0xFF | (0xFF << 8)) #define MAP_GROUP(map) (MAP_##map >> 8) @@ -12,6 +15,10 @@ #define MAP(map) MAP_GROUP(map), MAP_NUM(map) +// ID for dynamic warps. Used in the dest_warp_id field for warp events, but it's never +// read in practice. A dest_map of MAP_DYNAMIC is used to indicate that a dynamic warp +// should be used, at which point the warp id is ignored. It can be passed to SetDynamicWarp +// or SetDynamicWarpWithCoords as the first argument, but this argument is unused. #define WARP_ID_DYNAMIC 0x7F // Used to indicate an invalid warp id, for dummy warps or when a warp should diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 949369b77..6e11a45f5 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -968,7 +968,7 @@ static void SetupWarp(struct MapHeader *unused, s8 warpEventId, struct MapPositi warpEvent = &gMapHeader.events->warps[warpEventId]; - if (warpEvent->mapNum == MAP_NUM(NONE)) + if (warpEvent->mapNum == MAP_NUM(DYNAMIC)) { SetWarpDestinationToDynamicWarp(warpEvent->warpId); } @@ -979,7 +979,7 @@ static void SetupWarp(struct MapHeader *unused, s8 warpEventId, struct MapPositi SetWarpDestinationToMapWarp(warpEvent->mapGroup, warpEvent->mapNum, warpEvent->warpId); UpdateEscapeWarp(position->x, position->y); mapHeader = Overworld_GetMapHeaderByGroupAndId(warpEvent->mapGroup, warpEvent->mapNum); - if (mapHeader->events->warps[warpEvent->warpId].mapNum == MAP_NUM(NONE)) + if (mapHeader->events->warps[warpEvent->warpId].mapNum == MAP_NUM(DYNAMIC)) SetDynamicWarp(mapHeader->events->warps[warpEventId].warpId, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, warpEventId); } } diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 79445e6cd..8978305e8 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -200,7 +200,7 @@ string generate_map_events_text(Json map_data) { << warp_event["x"].int_value() << ", " << warp_event["y"].int_value() << ", " << warp_event["elevation"].int_value() << ", " - << warp_event["dest_warp_id"].int_value() << ", " + << warp_event["dest_warp_id"].string_value() << ", " << warp_event["dest_map"].string_value() << "\n"; } text << "\n"; @@ -324,7 +324,7 @@ string generate_firered_map_events_text(Json map_data) { << warp_event["x"].int_value() << ", " << warp_event["y"].int_value() << ", " << warp_event["elevation"].int_value() << ", " - << warp_event["dest_warp_id"].int_value() << ", " + << warp_event["dest_warp_id"].string_value() << ", " << warp_event["dest_map"].string_value() << "\n"; } text << "\n";