From 04deeb66076e5c579610b6ba308ed8da0069057e Mon Sep 17 00:00:00 2001 From: dayfine Date: Fri, 13 Nov 2026 11:20:00 -0800 Subject: [PATCH] FRLG maps: export object movement and walkers' boxes Every object keeps its pret movement_type and movement range as `movement`. People who walk back and forth or walk a sequence of directions get a `wander` box like wanderers do (start +- range, per IsCoordOutsideObjectEventMovementRange()): Route21_North's swimmer Spencer now covers (8..16, 42..46). Water tiles come from an explicit behaviour set instead of a 'WATER' substring match (#96 review); tiles are unchanged. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss --- data/games/frlg/maps/README.md | 6 + data/games/frlg/maps/base/CeladonCity.json | 43 +- .../base/CeladonCity_Condominiums_1F.json | 4 + .../base/CeladonCity_Condominiums_2F.json | 2 + .../base/CeladonCity_Condominiums_3F.json | 4 + .../CeladonCity_Condominiums_RoofRoom.json | 2 + .../base/CeladonCity_DepartmentStore_1F.json | 1 + .../base/CeladonCity_DepartmentStore_5F.json | 4 + .../maps/base/CeladonCity_GameCorner.json | 18 +- .../games/frlg/maps/base/CeladonCity_Gym.json | 18 +- .../games/frlg/maps/base/CeruleanCave_1F.json | 9 + .../games/frlg/maps/base/CeruleanCave_2F.json | 13 + .../frlg/maps/base/CeruleanCave_B1F.json | 12 + data/games/frlg/maps/base/CeruleanCity.json | 18 +- .../frlg/maps/base/CeruleanCity_BikeShop.json | 17 +- .../frlg/maps/base/CeruleanCity_Gym.json | 18 +- .../frlg/maps/base/CeruleanCity_House1.json | 1 + .../frlg/maps/base/CeruleanCity_House2.json | 9 +- .../frlg/maps/base/CeruleanCity_Mart.json | 10 +- .../base/CeruleanCity_PokemonCenter_1F.json | 7 + data/games/frlg/maps/base/CinnabarIsland.json | 11 +- .../frlg/maps/base/CinnabarIsland_Gym.json | 30 +- .../frlg/maps/base/CinnabarIsland_Mart.json | 17 +- data/games/frlg/maps/base/FuchsiaCity.json | 44 +- .../games/frlg/maps/base/FuchsiaCity_Gym.json | 22 +- .../frlg/maps/base/FuchsiaCity_Mart.json | 17 +- .../base/FuchsiaCity_SafariZone_Entrance.json | 9 +- .../maps/base/FuchsiaCity_WardensHouse.json | 11 +- .../maps/base/IndigoPlateau_Exterior.json | 2 + .../base/IndigoPlateau_PokemonCenter_1F.json | 8 + data/games/frlg/maps/base/LavenderTown.json | 17 +- .../frlg/maps/base/LavenderTown_Mart.json | 18 +- .../base/LavenderTown_PokemonCenter_1F.json | 5 + .../LavenderTown_VolunteerPokemonHouse.json | 6 + data/games/frlg/maps/base/MtMoon_1F.json | 22 +- data/games/frlg/maps/base/MtMoon_B2F.json | 11 + data/games/frlg/maps/base/PalletTown.json | 3 + .../maps/base/PalletTown_PlayersHouse_1F.json | 1 + .../base/PalletTown_ProfessorOaksLab.json | 10 + .../maps/base/PalletTown_RivalsHouse.json | 2 + data/games/frlg/maps/base/PewterCity.json | 21 +- data/games/frlg/maps/base/PewterCity_Gym.json | 17 +- .../games/frlg/maps/base/PewterCity_Mart.json | 24 +- .../frlg/maps/base/PewterCity_Museum_1F.json | 6 + .../base/PewterCity_PokemonCenter_1F.json | 14 +- .../maps/base/PokemonLeague_AgathasRoom.json | 1 + .../maps/base/PokemonLeague_BrunosRoom.json | 1 + .../base/PokemonLeague_ChampionsRoom.json | 2 + .../maps/base/PokemonLeague_HallOfFame.json | 1 + .../maps/base/PokemonLeague_LancesRoom.json | 1 + .../maps/base/PokemonLeague_LoreleisRoom.json | 1 + .../frlg/maps/base/PokemonMansion_1F.json | 5 + .../frlg/maps/base/PokemonMansion_2F.json | 4 + .../frlg/maps/base/PokemonMansion_3F.json | 4 + .../frlg/maps/base/PokemonMansion_B1F.json | 6 + .../games/frlg/maps/base/PokemonTower_1F.json | 26 +- .../games/frlg/maps/base/PokemonTower_2F.json | 9 +- .../games/frlg/maps/base/PokemonTower_3F.json | 4 + .../games/frlg/maps/base/PokemonTower_4F.json | 6 + .../games/frlg/maps/base/PokemonTower_5F.json | 14 +- .../games/frlg/maps/base/PokemonTower_6F.json | 5 + .../games/frlg/maps/base/PokemonTower_7F.json | 4 + data/games/frlg/maps/base/RockTunnel_1F.json | 10 + data/games/frlg/maps/base/RockTunnel_B1F.json | 26 + .../frlg/maps/base/RocketHideout_B1F.json | 7 + .../frlg/maps/base/RocketHideout_B2F.json | 5 + .../frlg/maps/base/RocketHideout_B3F.json | 5 + .../frlg/maps/base/RocketHideout_B4F.json | 9 + data/games/frlg/maps/base/Route1.json | 2 + data/games/frlg/maps/base/Route10.json | 10 + .../maps/base/Route10_PokemonCenter_1F.json | 5 + data/games/frlg/maps/base/Route11.json | 15 + .../maps/base/Route11_EastEntrance_1F.json | 2 + data/games/frlg/maps/base/Route12.json | 29 +- .../maps/base/Route12_NorthEntrance_1F.json | 1 + data/games/frlg/maps/base/Route13.json | 11 + data/games/frlg/maps/base/Route14.json | 16 + data/games/frlg/maps/base/Route15.json | 13 + .../maps/base/Route15_WestEntrance_1F.json | 1 + data/games/frlg/maps/base/Route16.json | 10 + data/games/frlg/maps/base/Route16_House.json | 2 + .../maps/base/Route16_NorthEntrance_1F.json | 2 + data/games/frlg/maps/base/Route18.json | 3 + .../maps/base/Route18_EastEntrance_1F.json | 1 + data/games/frlg/maps/base/Route19.json | 13 + data/games/frlg/maps/base/Route2.json | 6 + data/games/frlg/maps/base/Route20.json | 14 + data/games/frlg/maps/base/Route21_North.json | 20 +- data/games/frlg/maps/base/Route21_South.json | 19 +- data/games/frlg/maps/base/Route22.json | 1 + .../frlg/maps/base/Route22_NorthEntrance.json | 1 + data/games/frlg/maps/base/Route23.json | 7 + data/games/frlg/maps/base/Route24.json | 8 + data/games/frlg/maps/base/Route25.json | 28 +- .../frlg/maps/base/Route25_SeaCottage.json | 2 + .../frlg/maps/base/Route2_EastBuilding.json | 9 +- .../Route2_ViridianForest_NorthEntrance.json | 3 + .../Route2_ViridianForest_SouthEntrance.json | 2 + data/games/frlg/maps/base/Route3.json | 16 +- data/games/frlg/maps/base/Route4.json | 20 +- .../maps/base/Route4_PokemonCenter_1F.json | 6 + .../frlg/maps/base/Route5_SouthEntrance.json | 8 +- data/games/frlg/maps/base/Route6.json | 20 +- .../frlg/maps/base/Route6_NorthEntrance.json | 8 +- .../frlg/maps/base/Route7_EastEntrance.json | 8 +- data/games/frlg/maps/base/Route8.json | 17 + .../frlg/maps/base/Route8_WestEntrance.json | 8 +- data/games/frlg/maps/base/Route9.json | 12 + .../frlg/maps/base/SSAnne_1F_Corridor.json | 16 +- .../games/frlg/maps/base/SSAnne_1F_Room6.json | 8 +- .../frlg/maps/base/SSAnne_2F_Corridor.json | 2 + .../frlg/maps/base/SSAnne_CaptainsOffice.json | 1 + .../games/frlg/maps/base/SSAnne_Exterior.json | 1 + .../frlg/maps/base/SafariZone_Center.json | 1 + .../games/frlg/maps/base/SafariZone_East.json | 4 + .../frlg/maps/base/SafariZone_North.json | 3 + .../maps/base/SafariZone_SecretHouse.json | 1 + .../games/frlg/maps/base/SafariZone_West.json | 4 + data/games/frlg/maps/base/SaffronCity.json | 15 + .../games/frlg/maps/base/SaffronCity_Gym.json | 23 +- .../frlg/maps/base/SaffronCity_Mart.json | 17 +- data/games/frlg/maps/base/SilphCo_10F.json | 13 +- data/games/frlg/maps/base/SilphCo_11F.json | 20 +- data/games/frlg/maps/base/SilphCo_1F.json | 1 + data/games/frlg/maps/base/SilphCo_2F.json | 12 +- data/games/frlg/maps/base/SilphCo_3F.json | 11 +- data/games/frlg/maps/base/SilphCo_4F.json | 15 +- data/games/frlg/maps/base/SilphCo_5F.json | 24 +- data/games/frlg/maps/base/SilphCo_6F.json | 45 +- data/games/frlg/maps/base/SilphCo_7F.json | 33 +- data/games/frlg/maps/base/SilphCo_8F.json | 13 +- data/games/frlg/maps/base/SilphCo_9F.json | 11 +- .../base/UndergroundPath_EastEntrance.json | 1 + .../base/UndergroundPath_NorthEntrance.json | 1 + .../base/UndergroundPath_SouthEntrance.json | 1 + .../base/UndergroundPath_WestEntrance.json | 1 + data/games/frlg/maps/base/VermilionCity.json | 22 +- .../frlg/maps/base/VermilionCity_Gym.json | 19 +- .../frlg/maps/base/VermilionCity_Mart.json | 10 +- .../base/VermilionCity_PokemonCenter_1F.json | 7 + .../base/VermilionCity_PokemonFanClub.json | 6 + data/games/frlg/maps/base/VictoryRoad_1F.json | 21 +- data/games/frlg/maps/base/VictoryRoad_2F.json | 21 +- data/games/frlg/maps/base/VictoryRoad_3F.json | 19 +- data/games/frlg/maps/base/ViridianCity.json | 9 + .../frlg/maps/base/ViridianCity_Gym.json | 17 +- .../frlg/maps/base/ViridianCity_Mart.json | 3 + .../base/ViridianCity_PokemonCenter_1F.json | 4 + data/games/frlg/maps/base/ViridianForest.json | 25 +- data/games/frlg/maps/runtime/CeladonCity.json | 43 +- .../runtime/CeladonCity_Condominiums_1F.json | 4 + .../runtime/CeladonCity_Condominiums_2F.json | 2 + .../runtime/CeladonCity_Condominiums_3F.json | 4 + .../CeladonCity_Condominiums_RoofRoom.json | 2 + .../CeladonCity_DepartmentStore_1F.json | 1 + .../CeladonCity_DepartmentStore_5F.json | 4 + .../maps/runtime/CeladonCity_GameCorner.json | 18 +- .../frlg/maps/runtime/CeladonCity_Gym.json | 18 +- .../frlg/maps/runtime/CeruleanCave_1F.json | 9 + .../frlg/maps/runtime/CeruleanCave_2F.json | 13 + .../frlg/maps/runtime/CeruleanCave_B1F.json | 12 + .../games/frlg/maps/runtime/CeruleanCity.json | 18 +- .../maps/runtime/CeruleanCity_BikeShop.json | 17 +- .../frlg/maps/runtime/CeruleanCity_Gym.json | 18 +- .../maps/runtime/CeruleanCity_House1.json | 1 + .../maps/runtime/CeruleanCity_House2.json | 9 +- .../frlg/maps/runtime/CeruleanCity_Mart.json | 10 +- .../CeruleanCity_PokemonCenter_1F.json | 7 + .../frlg/maps/runtime/CinnabarIsland.json | 11 +- .../frlg/maps/runtime/CinnabarIsland_Gym.json | 30 +- .../maps/runtime/CinnabarIsland_Mart.json | 17 +- data/games/frlg/maps/runtime/FuchsiaCity.json | 44 +- .../frlg/maps/runtime/FuchsiaCity_Gym.json | 22 +- .../frlg/maps/runtime/FuchsiaCity_Mart.json | 17 +- .../FuchsiaCity_SafariZone_Entrance.json | 9 +- .../runtime/FuchsiaCity_WardensHouse.json | 11 +- .../maps/runtime/IndigoPlateau_Exterior.json | 2 + .../IndigoPlateau_PokemonCenter_1F.json | 8 + .../games/frlg/maps/runtime/LavenderTown.json | 17 +- .../frlg/maps/runtime/LavenderTown_Mart.json | 18 +- .../LavenderTown_PokemonCenter_1F.json | 5 + .../LavenderTown_VolunteerPokemonHouse.json | 6 + data/games/frlg/maps/runtime/MtMoon_1F.json | 22 +- data/games/frlg/maps/runtime/MtMoon_B2F.json | 11 + data/games/frlg/maps/runtime/PalletTown.json | 3 + .../runtime/PalletTown_PlayersHouse_1F.json | 1 + .../runtime/PalletTown_ProfessorOaksLab.json | 10 + .../maps/runtime/PalletTown_RivalsHouse.json | 2 + data/games/frlg/maps/runtime/PewterCity.json | 21 +- .../frlg/maps/runtime/PewterCity_Gym.json | 17 +- .../frlg/maps/runtime/PewterCity_Mart.json | 24 +- .../maps/runtime/PewterCity_Museum_1F.json | 6 + .../runtime/PewterCity_PokemonCenter_1F.json | 14 +- .../runtime/PokemonLeague_AgathasRoom.json | 1 + .../runtime/PokemonLeague_BrunosRoom.json | 1 + .../runtime/PokemonLeague_ChampionsRoom.json | 2 + .../runtime/PokemonLeague_HallOfFame.json | 1 + .../runtime/PokemonLeague_LancesRoom.json | 1 + .../runtime/PokemonLeague_LoreleisRoom.json | 1 + .../frlg/maps/runtime/PokemonMansion_1F.json | 5 + .../frlg/maps/runtime/PokemonMansion_2F.json | 4 + .../frlg/maps/runtime/PokemonMansion_3F.json | 4 + .../frlg/maps/runtime/PokemonMansion_B1F.json | 6 + .../frlg/maps/runtime/PokemonTower_1F.json | 26 +- .../frlg/maps/runtime/PokemonTower_2F.json | 9 +- .../frlg/maps/runtime/PokemonTower_3F.json | 4 + .../frlg/maps/runtime/PokemonTower_4F.json | 6 + .../frlg/maps/runtime/PokemonTower_5F.json | 14 +- .../frlg/maps/runtime/PokemonTower_6F.json | 5 + .../frlg/maps/runtime/PokemonTower_7F.json | 4 + .../frlg/maps/runtime/RockTunnel_1F.json | 10 + .../frlg/maps/runtime/RockTunnel_B1F.json | 26 + .../frlg/maps/runtime/RocketHideout_B1F.json | 7 + .../frlg/maps/runtime/RocketHideout_B2F.json | 5 + .../frlg/maps/runtime/RocketHideout_B3F.json | 5 + .../frlg/maps/runtime/RocketHideout_B4F.json | 9 + data/games/frlg/maps/runtime/Route1.json | 2 + data/games/frlg/maps/runtime/Route10.json | 10 + .../runtime/Route10_PokemonCenter_1F.json | 5 + data/games/frlg/maps/runtime/Route11.json | 15 + .../maps/runtime/Route11_EastEntrance_1F.json | 2 + data/games/frlg/maps/runtime/Route12.json | 29 +- .../runtime/Route12_NorthEntrance_1F.json | 1 + data/games/frlg/maps/runtime/Route13.json | 11 + data/games/frlg/maps/runtime/Route14.json | 16 + data/games/frlg/maps/runtime/Route15.json | 13 + .../maps/runtime/Route15_WestEntrance_1F.json | 1 + data/games/frlg/maps/runtime/Route16.json | 10 + .../frlg/maps/runtime/Route16_House.json | 2 + .../runtime/Route16_NorthEntrance_1F.json | 2 + data/games/frlg/maps/runtime/Route18.json | 3 + .../maps/runtime/Route18_EastEntrance_1F.json | 1 + data/games/frlg/maps/runtime/Route19.json | 13 + data/games/frlg/maps/runtime/Route2.json | 6 + data/games/frlg/maps/runtime/Route20.json | 14 + .../frlg/maps/runtime/Route21_North.json | 20 +- .../frlg/maps/runtime/Route21_South.json | 19 +- data/games/frlg/maps/runtime/Route22.json | 1 + .../maps/runtime/Route22_NorthEntrance.json | 1 + data/games/frlg/maps/runtime/Route23.json | 7 + data/games/frlg/maps/runtime/Route24.json | 8 + data/games/frlg/maps/runtime/Route25.json | 28 +- .../frlg/maps/runtime/Route25_SeaCottage.json | 2 + .../maps/runtime/Route2_EastBuilding.json | 9 +- .../Route2_ViridianForest_NorthEntrance.json | 3 + .../Route2_ViridianForest_SouthEntrance.json | 2 + data/games/frlg/maps/runtime/Route3.json | 16 +- data/games/frlg/maps/runtime/Route4.json | 20 +- .../maps/runtime/Route4_PokemonCenter_1F.json | 6 + .../maps/runtime/Route5_SouthEntrance.json | 8 +- data/games/frlg/maps/runtime/Route6.json | 20 +- .../maps/runtime/Route6_NorthEntrance.json | 8 +- .../maps/runtime/Route7_EastEntrance.json | 8 +- data/games/frlg/maps/runtime/Route8.json | 17 + .../maps/runtime/Route8_WestEntrance.json | 8 +- data/games/frlg/maps/runtime/Route9.json | 12 + .../frlg/maps/runtime/SSAnne_1F_Corridor.json | 16 +- .../frlg/maps/runtime/SSAnne_1F_Room6.json | 8 +- .../frlg/maps/runtime/SSAnne_2F_Corridor.json | 2 + .../maps/runtime/SSAnne_CaptainsOffice.json | 1 + .../frlg/maps/runtime/SSAnne_Exterior.json | 1 + .../frlg/maps/runtime/SafariZone_Center.json | 1 + .../frlg/maps/runtime/SafariZone_East.json | 4 + .../frlg/maps/runtime/SafariZone_North.json | 3 + .../maps/runtime/SafariZone_SecretHouse.json | 1 + .../frlg/maps/runtime/SafariZone_West.json | 4 + data/games/frlg/maps/runtime/SaffronCity.json | 15 + .../frlg/maps/runtime/SaffronCity_Gym.json | 23 +- .../frlg/maps/runtime/SaffronCity_Mart.json | 17 +- data/games/frlg/maps/runtime/SilphCo_10F.json | 13 +- data/games/frlg/maps/runtime/SilphCo_11F.json | 20 +- data/games/frlg/maps/runtime/SilphCo_1F.json | 1 + data/games/frlg/maps/runtime/SilphCo_2F.json | 12 +- data/games/frlg/maps/runtime/SilphCo_3F.json | 11 +- data/games/frlg/maps/runtime/SilphCo_4F.json | 15 +- data/games/frlg/maps/runtime/SilphCo_5F.json | 24 +- data/games/frlg/maps/runtime/SilphCo_6F.json | 45 +- data/games/frlg/maps/runtime/SilphCo_7F.json | 33 +- data/games/frlg/maps/runtime/SilphCo_8F.json | 13 +- data/games/frlg/maps/runtime/SilphCo_9F.json | 11 +- .../runtime/UndergroundPath_EastEntrance.json | 1 + .../UndergroundPath_NorthEntrance.json | 1 + .../UndergroundPath_SouthEntrance.json | 1 + .../runtime/UndergroundPath_WestEntrance.json | 1 + .../frlg/maps/runtime/VermilionCity.json | 22 +- .../frlg/maps/runtime/VermilionCity_Gym.json | 19 +- .../frlg/maps/runtime/VermilionCity_Mart.json | 10 +- .../VermilionCity_PokemonCenter_1F.json | 7 + .../runtime/VermilionCity_PokemonFanClub.json | 6 + .../frlg/maps/runtime/VictoryRoad_1F.json | 21 +- .../frlg/maps/runtime/VictoryRoad_2F.json | 21 +- .../frlg/maps/runtime/VictoryRoad_3F.json | 19 +- .../games/frlg/maps/runtime/ViridianCity.json | 9 + .../frlg/maps/runtime/ViridianCity_Gym.json | 17 +- .../frlg/maps/runtime/ViridianCity_Mart.json | 3 + .../ViridianCity_PokemonCenter_1F.json | 4 + .../frlg/maps/runtime/ViridianForest.json | 25 +- data/maps/runtime-manifest.json | 592 +++++++++--------- docs/maps/runtime-maps.md | 2 +- schemas/runtime-map-v2.schema.json | 14 +- src/pokesim/maps/frlg_decomp_map_builder.py | 30 +- src/pokesim/maps/goldens/frlg-fan-club.json | 2 +- .../maps/goldens/frlg-pallet-town.json | 2 +- .../maps/test_frlg_decomp_map_builder.py | 64 ++ .../maps/test_runtime_map_publication.py | 14 + 305 files changed, 3362 insertions(+), 512 deletions(-) diff --git a/data/games/frlg/maps/README.md b/data/games/frlg/maps/README.md index daefe81..84ef26b 100644 --- a/data/games/frlg/maps/README.md +++ b/data/games/frlg/maps/README.md @@ -220,6 +220,12 @@ A collision-free `MB_COUNTER` (PewterCity_Museum_1F (11, 5)) is floor: the counter only lets the player talk across it. NPCs and pickups keep source event, script and optional local-ID provenance. +Every object keeps its source movement as `movement`: the pret `movement_type` +and `[movement_range_x, movement_range_y]`. A person who walks on their own +(wanders, walks back and forth, or walks a sequence of directions) has a +`wander` box, their start tile +- range kept inside the map +(`IsCoordOutsideObjectEventMovementRange()`); back-and-forth walkers and +`*_UP_AND_DOWN`/`*_LEFT_AND_RIGHT` wanderers keep to their axis. `source_event` is a zero-based source array index, not an in-game object ID. An item ball's `item` and `quantity` come from the pinned catalog (`data/maps/item-identities.json`) or, for a map it doesn't list, from the diff --git a/data/games/frlg/maps/base/CeladonCity.json b/data/games/frlg/maps/base/CeladonCity.json index 4ed53fc..1d81ce3 100644 --- a/data/games/frlg/maps/base/CeladonCity.json +++ b/data/games/frlg/maps/base/CeladonCity.json @@ -148,6 +148,7 @@ { "name": "rocket_m", "coord": [48, 15], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [4, 1]}, "wander": {"min": [44, 15], "max": [52, 15]}, "hide_flag": "FLAG_HIDE_CELADON_ROCKETS", "source_event": 0, @@ -156,6 +157,7 @@ { "name": "fat_man", "coord": [38, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 1, "source_script": "CeladonCity_EventScript_FatMan", "source_local_id": "LOCALID_CELADON_FAT_MAN" @@ -163,37 +165,61 @@ { "name": "poliwrath", "coord": [36, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 2, "source_script": "CeladonCity_EventScript_Poliwrath", "source_local_id": "LOCALID_CELADON_POLIWRATH" }, - {"name": "little_girl", "coord": [11, 18], "source_event": 3, "source_script": "CeladonCity_EventScript_LittleGirl"}, + { + "name": "little_girl", + "coord": [11, 18], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "range": [4, 4]}, + "wander": {"min": [7, 14], "max": [15, 22]}, + "source_event": 3, + "source_script": "CeladonCity_EventScript_LittleGirl" + }, { "name": "woman_2", "coord": [18, 22], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 5]}, "wander": {"min": [16, 17], "max": [20, 27]}, "source_event": 4, "source_script": "CeladonCity_EventScript_Woman" }, - {"name": "old_man_1", "coord": [30, 24], "source_event": 5, "source_script": "CeladonCity_EventScript_OldMan2"}, + { + "name": "old_man_1", + "coord": [30, 24], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 5, + "source_script": "CeladonCity_EventScript_OldMan2" + }, { "name": "old_man_2", "coord": [26, 19], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 6, "source_script": "CeladonCity_EventScript_SoftboiledTutor" }, { "name": "rocket_m", "coord": [38, 31], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [5, 1]}, "wander": {"min": [33, 31], "max": [43, 31]}, "hide_flag": "FLAG_HIDE_CELADON_ROCKETS", "source_event": 7, "source_script": "CeladonCity_EventScript_RocketGrunt2" }, - {"name": "old_man_1", "coord": [9, 30], "source_event": 8, "source_script": "CeladonCity_EventScript_OldMan1"}, + { + "name": "old_man_1", + "coord": [9, 30], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 8, + "source_script": "CeladonCity_EventScript_OldMan1" + }, { "name": "cut_tree", "coord": [52, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 9, "source_script": "EventScript_CutTree", @@ -202,14 +228,22 @@ { "name": "cut_tree", "coord": [40, 35], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 10, "source_script": "EventScript_CutTree" }, - {"name": "boy", "coord": [25, 10], "source_event": 11, "source_script": "CeladonCity_EventScript_Boy"}, + { + "name": "boy", + "coord": [25, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 11, + "source_script": "CeladonCity_EventScript_Boy" + }, { "name": "scientist", "coord": [47, 24], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CELADON_ROCKETS", "source_event": 14, "source_script": "CeladonCity_EventScript_SilphCoScientist" @@ -220,6 +254,7 @@ "name": "item_ball", "coord": [5, 3], "source_event": 13, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CELADON_CITY_ETHER", "source_script": "CeladonCity_EventScript_ItemEther", "item": "ether" diff --git a/data/games/frlg/maps/base/CeladonCity_Condominiums_1F.json b/data/games/frlg/maps/base/CeladonCity_Condominiums_1F.json index 3afc216..5c35db8 100644 --- a/data/games/frlg/maps/base/CeladonCity_Condominiums_1F.json +++ b/data/games/frlg/maps/base/CeladonCity_Condominiums_1F.json @@ -45,12 +45,14 @@ { "name": "meowth", "coord": [1, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 0, "source_script": "CeladonCity_Condominiums_1F_EventScript_Meowth" }, { "name": "clefairy", "coord": [5, 13], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [4, 13], "max": [6, 13]}, "source_event": 1, "source_script": "CeladonCity_Condominiums_1F_EventScript_Clefairy" @@ -58,6 +60,7 @@ { "name": "nidoran_f", "coord": [5, 8], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 1]}, "wander": {"min": [3, 7], "max": [7, 9]}, "source_event": 2, "source_script": "CeladonCity_Condominiums_1F_EventScript_Nidoran" @@ -65,6 +68,7 @@ { "name": "old_woman", "coord": [2, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 3, "source_script": "CeladonCity_Condominiums_1F_EventScript_TeaWoman" } diff --git a/data/games/frlg/maps/base/CeladonCity_Condominiums_2F.json b/data/games/frlg/maps/base/CeladonCity_Condominiums_2F.json index 5124195..a227c23 100644 --- a/data/games/frlg/maps/base/CeladonCity_Condominiums_2F.json +++ b/data/games/frlg/maps/base/CeladonCity_Condominiums_2F.json @@ -43,6 +43,7 @@ { "name": "0", "coord": [6, 6], + "movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS", "source_event": 0, "source_script": "CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika" @@ -50,6 +51,7 @@ { "name": "0", "coord": [5, 6], + "movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS", "source_event": 1, "source_script": "CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika" diff --git a/data/games/frlg/maps/base/CeladonCity_Condominiums_3F.json b/data/games/frlg/maps/base/CeladonCity_Condominiums_3F.json index 887f2ad..cb6977f 100644 --- a/data/games/frlg/maps/base/CeladonCity_Condominiums_3F.json +++ b/data/games/frlg/maps/base/CeladonCity_Condominiums_3F.json @@ -43,24 +43,28 @@ { "name": "rocker", "coord": [0, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 0, "source_script": "CeladonCity_Condominiums_3F_EventScript_Programmer" }, { "name": "man", "coord": [3, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 1, "source_script": "CeladonCity_Condominiums_3F_EventScript_Designer" }, { "name": "poke_maniac", "coord": [4, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 2, "source_script": "CeladonCity_Condominiums_3F_EventScript_GraphicArtist" }, { "name": "fat_man", "coord": [0, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 3, "source_script": "CeladonCity_Condominiums_3F_EventScript_Writer" } diff --git a/data/games/frlg/maps/base/CeladonCity_Condominiums_RoofRoom.json b/data/games/frlg/maps/base/CeladonCity_Condominiums_RoofRoom.json index 8e678ed..d3f7293 100644 --- a/data/games/frlg/maps/base/CeladonCity_Condominiums_RoofRoom.json +++ b/data/games/frlg/maps/base/CeladonCity_Condominiums_RoofRoom.json @@ -43,6 +43,7 @@ { "name": "black_belt", "coord": [3, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "CeladonCity_Condominiums_RoofRoom_EventScript_BlackBelt" } @@ -52,6 +53,7 @@ "name": "item_ball", "coord": [7, 3], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_EEVEE_BALL", "source_script": "CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall", "source_local_id": "LOCALID_EEVEE_POKEBALL", diff --git a/data/games/frlg/maps/base/CeladonCity_DepartmentStore_1F.json b/data/games/frlg/maps/base/CeladonCity_DepartmentStore_1F.json index b9a7e8f..83ca62e 100644 --- a/data/games/frlg/maps/base/CeladonCity_DepartmentStore_1F.json +++ b/data/games/frlg/maps/base/CeladonCity_DepartmentStore_1F.json @@ -43,6 +43,7 @@ { "name": "worker_f", "coord": [6, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "CeladonCity_DepartmentStore_1F_EventScript_Receptionist" } diff --git a/data/games/frlg/maps/base/CeladonCity_DepartmentStore_5F.json b/data/games/frlg/maps/base/CeladonCity_DepartmentStore_5F.json index 81900af..79162ea 100644 --- a/data/games/frlg/maps/base/CeladonCity_DepartmentStore_5F.json +++ b/data/games/frlg/maps/base/CeladonCity_DepartmentStore_5F.json @@ -37,6 +37,7 @@ { "name": "gentleman", "coord": [11, 6], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [10, 6], "max": [12, 6]}, "source_event": 0, "source_script": "CeladonCity_DepartmentStore_5F_EventScript_Gentleman" @@ -44,6 +45,7 @@ { "name": "sailor", "coord": [6, 8], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [5, 7], "max": [7, 9]}, "source_event": 1, "source_script": "CeladonCity_DepartmentStore_5F_EventScript_Sailor" @@ -51,12 +53,14 @@ { "name": "clerk", "coord": [1, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [2, 1]}, "source_event": 2, "source_script": "CeladonCity_DepartmentStore_5F_EventScript_ClerkXItems" }, { "name": "clerk", "coord": [1, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [2, 1]}, "source_event": 3, "source_script": "CeladonCity_DepartmentStore_5F_EventScript_ClerkVitamins" } diff --git a/data/games/frlg/maps/base/CeladonCity_GameCorner.json b/data/games/frlg/maps/base/CeladonCity_GameCorner.json index 8ca924a..5500118 100644 --- a/data/games/frlg/maps/base/CeladonCity_GameCorner.json +++ b/data/games/frlg/maps/base/CeladonCity_GameCorner.json @@ -124,61 +124,77 @@ { "name": "worker_f", "coord": [4, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "CeladonCity_GameCorner_EventScript_InfoClerk" }, { "name": "worker_m", "coord": [6, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 1, "source_script": "CeladonCity_GameCorner_EventScript_CoinsClerk" }, { "name": "balding_man", "coord": [1, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 2, "source_script": "CeladonCity_GameCorner_EventScript_BaldingMan" }, { "name": "woman_2", "coord": [1, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 3, "source_script": "CeladonCity_GameCorner_EventScript_Woman1" }, - {"name": "fisher", "coord": [4, 7], "source_event": 4, "source_script": "CeladonCity_GameCorner_EventScript_Fisher"}, + { + "name": "fisher", + "coord": [4, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 4, + "source_script": "CeladonCity_GameCorner_EventScript_Fisher" + }, { "name": "gym_guy", "coord": [7, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 5, "source_script": "CeladonCity_GameCorner_EventScript_GymGuy" }, { "name": "woman_1", "coord": [7, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 6, "source_script": "CeladonCity_GameCorner_EventScript_Woman2" }, { "name": "old_man_2", "coord": [10, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 7, "source_script": "CeladonCity_GameCorner_EventScript_OldMan" }, { "name": "scientist", "coord": [13, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 8, "source_script": "CeladonCity_GameCorner_EventScript_Scientist" }, { "name": "gentleman", "coord": [16, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 9, "source_script": "CeladonCity_GameCorner_EventScript_Gentleman" }, { "name": "rocket_m", "coord": [11, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_GAME_CORNER_ROCKET", "source_event": 10, "source_script": "CeladonCity_GameCorner_EventScript_RocketGrunt", diff --git a/data/games/frlg/maps/base/CeladonCity_Gym.json b/data/games/frlg/maps/base/CeladonCity_Gym.json index ca39cb5..43a6eed 100644 --- a/data/games/frlg/maps/base/CeladonCity_Gym.json +++ b/data/games/frlg/maps/base/CeladonCity_Gym.json @@ -42,6 +42,7 @@ { "name": "lass", "coord": [3, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 3}, "source_event": 0, @@ -50,6 +51,7 @@ { "name": "beauty", "coord": [9, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 1, @@ -58,6 +60,7 @@ { "name": "picnicker", "coord": [10, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 2, @@ -66,6 +69,7 @@ { "name": "beauty", "coord": [2, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 3, @@ -74,6 +78,7 @@ { "name": "beauty", "coord": [5, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 4, @@ -82,15 +87,23 @@ { "name": "lass", "coord": [7, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 5, "source_script": "CeladonCity_Gym_EventScript_Lisa" }, - {"name": "erika", "coord": [6, 4], "source_event": 6, "source_script": "CeladonCity_Gym_EventScript_Erika"}, + { + "name": "erika", + "coord": [6, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 6, + "source_script": "CeladonCity_Gym_EventScript_Erika" + }, { "name": "cooltrainer_f", "coord": [8, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 2}, "source_event": 7, @@ -99,6 +112,7 @@ { "name": "cut_tree", "coord": [6, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 8, "source_script": "EventScript_CutTree" @@ -106,6 +120,7 @@ { "name": "cut_tree", "coord": [3, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 9, "source_script": "EventScript_CutTree" @@ -113,6 +128,7 @@ { "name": "cut_tree", "coord": [9, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 10, "source_script": "EventScript_CutTree" diff --git a/data/games/frlg/maps/base/CeruleanCave_1F.json b/data/games/frlg/maps/base/CeruleanCave_1F.json index 07a8e66..a259ce8 100644 --- a/data/games/frlg/maps/base/CeruleanCave_1F.json +++ b/data/games/frlg/maps/base/CeruleanCave_1F.json @@ -104,6 +104,7 @@ { "name": "rock_smash_rock", "coord": [7, 21], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 3, "source_script": "EventScript_RockSmash" @@ -111,6 +112,7 @@ { "name": "rock_smash_rock", "coord": [13, 21], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 4, "source_script": "EventScript_RockSmash" @@ -118,6 +120,7 @@ { "name": "rock_smash_rock", "coord": [5, 20], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 5, "source_script": "EventScript_RockSmash" @@ -125,6 +128,7 @@ { "name": "rock_smash_rock", "coord": [14, 20], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_15", "source_event": 6, "source_script": "EventScript_RockSmash" @@ -132,6 +136,7 @@ { "name": "rock_smash_rock", "coord": [11, 21], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_16", "source_event": 7, "source_script": "EventScript_RockSmash" @@ -139,6 +144,7 @@ { "name": "rock_smash_rock", "coord": [9, 18], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_17", "source_event": 8, "source_script": "EventScript_RockSmash" @@ -149,6 +155,7 @@ "name": "item_ball", "coord": [7, 3], "source_event": 0, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET", "source_script": "CeruleanCave_1F_EventScript_ItemNugget", "item": "nugget" @@ -157,6 +164,7 @@ "name": "item_ball", "coord": [11, 16], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE", "source_script": "CeruleanCave_1F_EventScript_ItemFullRestore", "item": "full_restore" @@ -165,6 +173,7 @@ "name": "item_ball", "coord": [25, 5], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR", "source_script": "CeruleanCave_1F_EventScript_ItemMaxElixir", "item": "max_elixir" diff --git a/data/games/frlg/maps/base/CeruleanCave_2F.json b/data/games/frlg/maps/base/CeruleanCave_2F.json index 3868eb6..33066d4 100644 --- a/data/games/frlg/maps/base/CeruleanCave_2F.json +++ b/data/games/frlg/maps/base/CeruleanCave_2F.json @@ -66,6 +66,7 @@ { "name": "rock_smash_rock", "coord": [33, 10], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 3, "source_script": "EventScript_RockSmash" @@ -73,6 +74,7 @@ { "name": "rock_smash_rock", "coord": [33, 9], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 4, "source_script": "EventScript_RockSmash" @@ -80,6 +82,7 @@ { "name": "rock_smash_rock", "coord": [25, 11], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 5, "source_script": "EventScript_RockSmash" @@ -87,6 +90,7 @@ { "name": "rock_smash_rock", "coord": [28, 20], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_15", "source_event": 6, "source_script": "EventScript_RockSmash" @@ -94,6 +98,7 @@ { "name": "rock_smash_rock", "coord": [30, 20], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_16", "source_event": 7, "source_script": "EventScript_RockSmash" @@ -101,6 +106,7 @@ { "name": "rock_smash_rock", "coord": [9, 13], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_17", "source_event": 8, "source_script": "EventScript_RockSmash" @@ -108,6 +114,7 @@ { "name": "rock_smash_rock", "coord": [23, 16], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_18", "source_event": 9, "source_script": "EventScript_RockSmash" @@ -115,6 +122,7 @@ { "name": "rock_smash_rock", "coord": [13, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_19", "source_event": 10, "source_script": "EventScript_RockSmash" @@ -122,6 +130,7 @@ { "name": "rock_smash_rock", "coord": [4, 12], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_1A", "source_event": 11, "source_script": "EventScript_RockSmash" @@ -129,6 +138,7 @@ { "name": "rock_smash_rock", "coord": [10, 20], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_1B", "source_event": 12, "source_script": "EventScript_RockSmash" @@ -139,6 +149,7 @@ "name": "item_ball", "coord": [9, 18], "source_event": 0, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP", "source_script": "CeruleanCave_2F_EventScript_ItemPPUp", "item": "pp_up" @@ -147,6 +158,7 @@ "name": "item_ball", "coord": [29, 16], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL", "source_script": "CeruleanCave_2F_EventScript_ItemUltraBall", "item": "ultra_ball" @@ -155,6 +167,7 @@ "name": "item_ball", "coord": [33, 12], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE", "source_script": "CeruleanCave_2F_EventScript_ItemFullRestore", "item": "full_restore" diff --git a/data/games/frlg/maps/base/CeruleanCave_B1F.json b/data/games/frlg/maps/base/CeruleanCave_B1F.json index c1165ae..007c3ae 100644 --- a/data/games/frlg/maps/base/CeruleanCave_B1F.json +++ b/data/games/frlg/maps/base/CeruleanCave_B1F.json @@ -76,6 +76,7 @@ { "name": "mewtwo", "coord": [7, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MEWTWO", "source_event": 2, "source_script": "CeruleanCave_B1F_EventScript_Mewtwo" @@ -83,6 +84,7 @@ { "name": "rock_smash_rock", "coord": [37, 1], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 3, "source_script": "EventScript_RockSmash" @@ -90,6 +92,7 @@ { "name": "rock_smash_rock", "coord": [38, 2], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 4, "source_script": "EventScript_RockSmash" @@ -97,6 +100,7 @@ { "name": "rock_smash_rock", "coord": [35, 1], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 5, "source_script": "EventScript_RockSmash" @@ -104,6 +108,7 @@ { "name": "rock_smash_rock", "coord": [37, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_15", "source_event": 6, "source_script": "EventScript_RockSmash" @@ -111,6 +116,7 @@ { "name": "rock_smash_rock", "coord": [35, 5], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_16", "source_event": 7, "source_script": "EventScript_RockSmash" @@ -118,6 +124,7 @@ { "name": "rock_smash_rock", "coord": [2, 2], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_17", "source_event": 8, "source_script": "EventScript_RockSmash" @@ -125,6 +132,7 @@ { "name": "rock_smash_rock", "coord": [4, 1], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_18", "source_event": 9, "source_script": "EventScript_RockSmash" @@ -132,6 +140,7 @@ { "name": "rock_smash_rock", "coord": [6, 1], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_19", "source_event": 10, "source_script": "EventScript_RockSmash" @@ -139,6 +148,7 @@ { "name": "rock_smash_rock", "coord": [3, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_1A", "source_event": 11, "source_script": "EventScript_RockSmash" @@ -149,6 +159,7 @@ "name": "item_ball", "coord": [31, 9], "source_event": 0, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL", "source_script": "CeruleanCave_B1F_EventScript_ItemUltraBall", "item": "ultra_ball" @@ -157,6 +168,7 @@ "name": "item_ball", "coord": [32, 2], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE", "source_script": "CeruleanCave_B1F_EventScript_ItemMaxRevive", "item": "max_revive" diff --git a/data/games/frlg/maps/base/CeruleanCity.json b/data/games/frlg/maps/base/CeruleanCity.json index e13aa82..fd05390 100644 --- a/data/games/frlg/maps/base/CeruleanCity.json +++ b/data/games/frlg/maps/base/CeruleanCity.json @@ -142,6 +142,7 @@ { "name": "policeman", "coord": [31, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "CeruleanCity_EventScript_Policeman", "source_local_id": "LOCALID_CERULEAN_POLICEMAN" @@ -149,6 +150,7 @@ { "name": "rocket_m", "coord": [33, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_ROCKET", "source_event": 1, "source_script": "CeruleanCity_EventScript_Grunt", @@ -157,6 +159,7 @@ { "name": "little_boy", "coord": [16, 21], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [1, 3]}, "wander": {"min": [16, 18], "max": [16, 24]}, "source_event": 2, "source_script": "CeruleanCity_EventScript_LittleBoy" @@ -164,6 +167,7 @@ { "name": "balding_man", "coord": [9, 23], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [8, 22], "max": [10, 24]}, "source_event": 3, "source_script": "CeruleanCity_EventScript_BaldingMan" @@ -171,6 +175,7 @@ { "name": "slowbro", "coord": [32, 29], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 4, "source_script": "CeruleanCity_EventScript_Slowbro", "source_local_id": "LOCALID_CERULEAN_SLOWBRO" @@ -178,14 +183,22 @@ { "name": "lass", "coord": [33, 29], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 5, "source_script": "CeruleanCity_EventScript_Lass", "source_local_id": "LOCALID_CERULEAN_LASS" }, - {"name": "youngster", "coord": [34, 22], "source_event": 6, "source_script": "CeruleanCity_EventScript_Youngster"}, + { + "name": "youngster", + "coord": [34, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 6, + "source_script": "CeruleanCity_EventScript_Youngster" + }, { "name": "blue", "coord": [22, 0], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_RIVAL", "source_event": 7, "source_script": "0x0", @@ -194,6 +207,7 @@ { "name": "cut_tree", "coord": [26, 32], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 8, "source_script": "EventScript_CutTree" @@ -201,6 +215,7 @@ { "name": "woman_1", "coord": [12, 30], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 10, "source_script": "CeruleanCity_EventScript_Woman", "source_local_id": "LOCALID_CERULEAN_WOMAN" @@ -208,6 +223,7 @@ { "name": "cooltrainer_m", "coord": [1, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_CAVE_GUARD", "source_event": 11, "source_script": "CeruleanCity_EventScript_CeruleanCaveGuard", diff --git a/data/games/frlg/maps/base/CeruleanCity_BikeShop.json b/data/games/frlg/maps/base/CeruleanCity_BikeShop.json index 0d4d239..3c0e72c 100644 --- a/data/games/frlg/maps/base/CeruleanCity_BikeShop.json +++ b/data/games/frlg/maps/base/CeruleanCity_BikeShop.json @@ -29,14 +29,27 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "man", "coord": [9, 3], "source_event": 0, "source_script": "CeruleanCity_BikeShop_EventScript_Clerk"}, + { + "name": "man", + "coord": [9, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 0, + "source_script": "CeruleanCity_BikeShop_EventScript_Clerk" + }, { "name": "youngster", "coord": [9, 7], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [8, 6], "max": [10, 8]}, "source_event": 1, "source_script": "CeruleanCity_BikeShop_EventScript_Youngster" }, - {"name": "woman_2", "coord": [5, 5], "source_event": 2, "source_script": "CeruleanCity_BikeShop_EventScript_Woman"} + { + "name": "woman_2", + "coord": [5, 5], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 2, + "source_script": "CeruleanCity_BikeShop_EventScript_Woman" + } ] } diff --git a/data/games/frlg/maps/base/CeruleanCity_Gym.json b/data/games/frlg/maps/base/CeruleanCity_Gym.json index 1c1b64e..4557075 100644 --- a/data/games/frlg/maps/base/CeruleanCity_Gym.json +++ b/data/games/frlg/maps/base/CeruleanCity_Gym.json @@ -63,6 +63,7 @@ { "name": "swimmer_m_water", "coord": [10, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 1}, "source_event": 0, @@ -71,12 +72,25 @@ { "name": "picnicker", "coord": [4, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 1, "source_script": "CeruleanCity_Gym_EventScript_Diana" }, - {"name": "misty", "coord": [8, 6], "source_event": 2, "source_script": "CeruleanCity_Gym_EventScript_Misty"}, - {"name": "gym_guy", "coord": [7, 16], "source_event": 3, "source_script": "CeruleanCity_Gym_EventScript_GymGuy"} + { + "name": "misty", + "coord": [8, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 2, + "source_script": "CeruleanCity_Gym_EventScript_Misty" + }, + { + "name": "gym_guy", + "coord": [7, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 3, + "source_script": "CeruleanCity_Gym_EventScript_GymGuy" + } ] } diff --git a/data/games/frlg/maps/base/CeruleanCity_House1.json b/data/games/frlg/maps/base/CeruleanCity_House1.json index 18fb648..cd1c710 100644 --- a/data/games/frlg/maps/base/CeruleanCity_House1.json +++ b/data/games/frlg/maps/base/CeruleanCity_House1.json @@ -33,6 +33,7 @@ { "name": "gentleman", "coord": [6, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 0, "source_script": "CeruleanCity_House1_EventScript_BadgeGuy" } diff --git a/data/games/frlg/maps/base/CeruleanCity_House2.json b/data/games/frlg/maps/base/CeruleanCity_House2.json index 43b29c9..7807abc 100644 --- a/data/games/frlg/maps/base/CeruleanCity_House2.json +++ b/data/games/frlg/maps/base/CeruleanCity_House2.json @@ -29,10 +29,17 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "hiker", "coord": [1, 2], "source_event": 0, "source_script": "CeruleanCity_House2_EventScript_Hiker"}, + { + "name": "hiker", + "coord": [1, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 0, + "source_script": "CeruleanCity_House2_EventScript_Hiker" + }, { "name": "lass", "coord": [7, 6], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [6, 5], "max": [8, 7]}, "source_event": 1, "source_script": "CeruleanCity_House2_EventScript_Lass" diff --git a/data/games/frlg/maps/base/CeruleanCity_Mart.json b/data/games/frlg/maps/base/CeruleanCity_Mart.json index 66b432d..b6a8bb5 100644 --- a/data/games/frlg/maps/base/CeruleanCity_Mart.json +++ b/data/games/frlg/maps/base/CeruleanCity_Mart.json @@ -28,10 +28,17 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "clerk", "coord": [2, 3], "source_event": 0, "source_script": "CeruleanCity_Mart_EventScript_Clerk"}, + { + "name": "clerk", + "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 0, + "source_script": "CeruleanCity_Mart_EventScript_Clerk" + }, { "name": "woman_1", "coord": [9, 2], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [4, 1]}, "wander": {"min": [5, 2], "max": [10, 2]}, "source_event": 1, "source_script": "CeruleanCity_Mart_EventScript_Woman" @@ -39,6 +46,7 @@ { "name": "youngster", "coord": [1, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 2, "source_script": "CeruleanCity_Mart_EventScript_Youngster" } diff --git a/data/games/frlg/maps/base/CeruleanCity_PokemonCenter_1F.json b/data/games/frlg/maps/base/CeruleanCity_PokemonCenter_1F.json index 3947a92..6a5c3cb 100644 --- a/data/games/frlg/maps/base/CeruleanCity_PokemonCenter_1F.json +++ b/data/games/frlg/maps/base/CeruleanCity_PokemonCenter_1F.json @@ -44,6 +44,7 @@ { "name": "nurse", "coord": [7, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "CeruleanCity_PokemonCenter_1F_EventScript_Nurse", "source_local_id": "LOCALID_CERULEAN_NURSE" @@ -51,12 +52,14 @@ { "name": "gentleman", "coord": [12, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 1, "source_script": "CeruleanCity_PokemonCenter_1F_EventScript_Gentleman" }, { "name": "rocker", "coord": [5, 4], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [4, 4], "max": [6, 4]}, "source_event": 2, "source_script": "CeruleanCity_PokemonCenter_1F_EventScript_Rocker" @@ -64,6 +67,7 @@ { "name": "youngster", "coord": [4, 8], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [3, 8], "max": [5, 8]}, "source_event": 3, "source_script": "CeruleanCity_PokemonCenter_1F_EventScript_Youngster" @@ -71,12 +75,14 @@ { "name": "lass", "coord": [3, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 4, "source_script": "CeruleanCity_PokemonCenter_1F_EventScript_Lass" }, { "name": "0", "coord": [2, 1], + "movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POSTGAME_GOSSIPERS", "source_event": 5, "source_script": "CeruleanCity_PokemonCenter_1F_EventScript_PokemonJournalMisty" @@ -84,6 +90,7 @@ { "name": "0", "coord": [3, 1], + "movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POSTGAME_GOSSIPERS", "source_event": 6, "source_script": "CeruleanCity_PokemonCenter_1F_EventScript_PokemonJournalMisty" diff --git a/data/games/frlg/maps/base/CinnabarIsland.json b/data/games/frlg/maps/base/CinnabarIsland.json index ce510cb..cff77ab 100644 --- a/data/games/frlg/maps/base/CinnabarIsland.json +++ b/data/games/frlg/maps/base/CinnabarIsland.json @@ -67,14 +67,22 @@ { "name": "woman_2", "coord": [14, 6], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [13, 6], "max": [15, 6]}, "source_event": 0, "source_script": "CinnabarIsland_EventScript_Woman" }, - {"name": "old_man_1", "coord": [11, 11], "source_event": 1, "source_script": "CinnabarIsland_EventScript_OldMan"}, + { + "name": "old_man_1", + "coord": [11, 11], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 1, + "source_script": "CinnabarIsland_EventScript_OldMan" + }, { "name": "bill", "coord": [20, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CINNABAR_BILL", "source_event": 2, "source_script": "0x0", @@ -83,6 +91,7 @@ { "name": "seagallop", "coord": [23, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CINNABAR_SEAGALLOP", "source_event": 3, "source_script": "0x0", diff --git a/data/games/frlg/maps/base/CinnabarIsland_Gym.json b/data/games/frlg/maps/base/CinnabarIsland_Gym.json index d1b31f6..5e55ec7 100644 --- a/data/games/frlg/maps/base/CinnabarIsland_Gym.json +++ b/data/games/frlg/maps/base/CinnabarIsland_Gym.json @@ -47,14 +47,22 @@ { "name": "poke_maniac", "coord": [25, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "CinnabarIsland_Gym_EventScript_Quinn", "source_local_id": "LOCALID_QUINN" }, - {"name": "scientist", "coord": [25, 4], "source_event": 1, "source_script": "CinnabarIsland_Gym_EventScript_Erik"}, + { + "name": "scientist", + "coord": [25, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 1, + "source_script": "CinnabarIsland_Gym_EventScript_Erik" + }, { "name": "scientist", "coord": [17, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 2, "source_script": "CinnabarIsland_Gym_EventScript_Avery", "source_local_id": "LOCALID_AVERY" @@ -62,6 +70,7 @@ { "name": "poke_maniac", "coord": [16, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 3, "source_script": "CinnabarIsland_Gym_EventScript_Ramon", "source_local_id": "LOCALID_RAMON" @@ -69,6 +78,7 @@ { "name": "scientist", "coord": [16, 18], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 4, "source_script": "CinnabarIsland_Gym_EventScript_Derek", "source_local_id": "LOCALID_DEREK" @@ -76,6 +86,7 @@ { "name": "poke_maniac", "coord": [4, 19], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 5, "source_script": "CinnabarIsland_Gym_EventScript_Dusty", "source_local_id": "LOCALID_DUSTY" @@ -83,11 +94,24 @@ { "name": "scientist", "coord": [4, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 6, "source_script": "CinnabarIsland_Gym_EventScript_Zac", "source_local_id": "LOCALID_ZAC" }, - {"name": "blaine", "coord": [5, 4], "source_event": 7, "source_script": "CinnabarIsland_Gym_EventScript_Blaine"}, - {"name": "gym_guy", "coord": [24, 20], "source_event": 8, "source_script": "CinnabarIsland_Gym_EventScript_GymGuy"} + { + "name": "blaine", + "coord": [5, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 7, + "source_script": "CinnabarIsland_Gym_EventScript_Blaine" + }, + { + "name": "gym_guy", + "coord": [24, 20], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 8, + "source_script": "CinnabarIsland_Gym_EventScript_GymGuy" + } ] } diff --git a/data/games/frlg/maps/base/CinnabarIsland_Mart.json b/data/games/frlg/maps/base/CinnabarIsland_Mart.json index 1bc4eae..24c1c36 100644 --- a/data/games/frlg/maps/base/CinnabarIsland_Mart.json +++ b/data/games/frlg/maps/base/CinnabarIsland_Mart.json @@ -28,11 +28,24 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "clerk", "coord": [2, 3], "source_event": 0, "source_script": "CinnabarIsland_Mart_EventScript_Clerk"}, - {"name": "woman_2", "coord": [6, 2], "source_event": 1, "source_script": "CinnabarIsland_Mart_EventScript_Woman"}, + { + "name": "clerk", + "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 0, + "source_script": "CinnabarIsland_Mart_EventScript_Clerk" + }, + { + "name": "woman_2", + "coord": [6, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 1, + "source_script": "CinnabarIsland_Mart_EventScript_Woman" + }, { "name": "scientist", "coord": [8, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 2, "source_script": "CinnabarIsland_Mart_EventScript_Scientist" } diff --git a/data/games/frlg/maps/base/FuchsiaCity.json b/data/games/frlg/maps/base/FuchsiaCity.json index 0f6b240..f38b436 100644 --- a/data/games/frlg/maps/base/FuchsiaCity.json +++ b/data/games/frlg/maps/base/FuchsiaCity.json @@ -131,19 +131,39 @@ } ], "npcs": [ - {"name": "fat_man", "coord": [37, 17], "source_event": 0, "source_script": "FuchsiaCity_EventScript_Erik"}, + { + "name": "fat_man", + "coord": [37, 17], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 0, + "source_script": "FuchsiaCity_EventScript_Erik" + }, { "name": "slowpoke", "coord": [36, 15], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND_SLOWER", "range": [4, 1]}, "wander": {"min": [32, 14], "max": [40, 16]}, "source_event": 1, "source_script": "0x0" }, - {"name": "voltorb", "coord": [33, 8], "source_event": 2, "source_script": "0x0"}, - {"name": "youngster", "coord": [33, 11], "source_event": 3, "source_script": "FuchsiaCity_EventScript_Youngster"}, + { + "name": "voltorb", + "coord": [33, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 2, + "source_script": "0x0" + }, + { + "name": "youngster", + "coord": [33, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 3, + "source_script": "FuchsiaCity_EventScript_Youngster" + }, { "name": "chansey", "coord": [39, 8], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [3, 1]}, "wander": {"min": [36, 7], "max": [42, 9]}, "source_event": 4, "source_script": "0x0" @@ -151,6 +171,7 @@ { "name": "little_boy", "coord": [14, 15], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [3, 1]}, "wander": {"min": [11, 15], "max": [17, 15]}, "source_event": 5, "source_script": "FuchsiaCity_EventScript_LittleBoy" @@ -158,6 +179,7 @@ { "name": "lapras", "coord": [12, 20], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 1]}, "wander": {"min": [10, 19], "max": [14, 21]}, "source_event": 6, "source_script": "0x0" @@ -165,14 +187,22 @@ { "name": "old_man_1", "coord": [36, 20], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [4, 1]}, "wander": {"min": [32, 20], "max": [40, 20]}, "source_event": 7, "source_script": "FuchsiaCity_EventScript_OldMan" }, - {"name": "var_0", "coord": [8, 8], "source_event": 8, "source_script": "0x0"}, + { + "name": "var_0", + "coord": [8, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 8, + "source_script": "0x0" + }, { "name": "kangaskhan", "coord": [16, 9], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [4, 1]}, "wander": {"min": [12, 8], "max": [20, 10]}, "source_event": 9, "source_script": "0x0" @@ -180,6 +210,7 @@ { "name": "cut_tree", "coord": [30, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 10, "source_script": "EventScript_CutTree" @@ -187,6 +218,7 @@ { "name": "cut_tree", "coord": [21, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 11, "source_script": "EventScript_CutTree" @@ -194,6 +226,7 @@ { "name": "cut_tree", "coord": [32, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 12, "source_script": "EventScript_CutTree" @@ -201,6 +234,7 @@ { "name": "cut_tree", "coord": [24, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_15", "source_event": 13, "source_script": "EventScript_CutTree" @@ -208,12 +242,14 @@ { "name": "bug_catcher", "coord": [15, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 14, "source_script": "FuchsiaCity_EventScript_SubstituteTutor" }, { "name": "lass", "coord": [40, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POSTGAME_GOSSIPERS", "source_event": 15, "source_script": "FuchsiaCity_EventScript_Lass" diff --git a/data/games/frlg/maps/base/FuchsiaCity_Gym.json b/data/games/frlg/maps/base/FuchsiaCity_Gym.json index ed7ab70..9c52ae3 100644 --- a/data/games/frlg/maps/base/FuchsiaCity_Gym.json +++ b/data/games/frlg/maps/base/FuchsiaCity_Gym.json @@ -45,6 +45,7 @@ { "name": "rocker", "coord": [12, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["south", "east"]}, "source_event": 0, "source_script": "FuchsiaCity_Gym_EventScript_Kayden" @@ -52,6 +53,7 @@ { "name": "rocker", "coord": [2, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 1}, "source_event": 1, @@ -60,6 +62,7 @@ { "name": "rocker", "coord": [11, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 3}, "source_event": 2, @@ -68,6 +71,7 @@ { "name": "man", "coord": [13, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "source_event": 3, "source_script": "FuchsiaCity_Gym_EventScript_Edgar" @@ -75,6 +79,7 @@ { "name": "man", "coord": [4, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "source_event": 4, "source_script": "FuchsiaCity_Gym_EventScript_Phil" @@ -82,12 +87,25 @@ { "name": "rocker", "coord": [2, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 5, "source_script": "FuchsiaCity_Gym_EventScript_Nate" }, - {"name": "koga", "coord": [7, 13], "source_event": 6, "source_script": "FuchsiaCity_Gym_EventScript_Koga"}, - {"name": "gym_guy", "coord": [11, 19], "source_event": 7, "source_script": "FuchsiaCity_Gym_EventScript_GymGuy"} + { + "name": "koga", + "coord": [7, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 6, + "source_script": "FuchsiaCity_Gym_EventScript_Koga" + }, + { + "name": "gym_guy", + "coord": [11, 19], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 7, + "source_script": "FuchsiaCity_Gym_EventScript_GymGuy" + } ] } diff --git a/data/games/frlg/maps/base/FuchsiaCity_Mart.json b/data/games/frlg/maps/base/FuchsiaCity_Mart.json index 1c1fdd4..b3abbdf 100644 --- a/data/games/frlg/maps/base/FuchsiaCity_Mart.json +++ b/data/games/frlg/maps/base/FuchsiaCity_Mart.json @@ -28,11 +28,24 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "clerk", "coord": [2, 3], "source_event": 0, "source_script": "FuchsiaCity_Mart_EventScript_Clerk"}, - {"name": "gentleman", "coord": [6, 3], "source_event": 1, "source_script": "FuchsiaCity_Mart_EventScript_Gentleman"}, + { + "name": "clerk", + "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 0, + "source_script": "FuchsiaCity_Mart_EventScript_Clerk" + }, + { + "name": "gentleman", + "coord": [6, 3], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 1, + "source_script": "FuchsiaCity_Mart_EventScript_Gentleman" + }, { "name": "cooltrainer_f", "coord": [9, 5], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [8, 4], "max": [10, 6]}, "source_event": 2, "source_script": "FuchsiaCity_Mart_EventScript_CooltrainerF" diff --git a/data/games/frlg/maps/base/FuchsiaCity_SafariZone_Entrance.json b/data/games/frlg/maps/base/FuchsiaCity_SafariZone_Entrance.json index 43a807a..6e9ef85 100644 --- a/data/games/frlg/maps/base/FuchsiaCity_SafariZone_Entrance.json +++ b/data/games/frlg/maps/base/FuchsiaCity_SafariZone_Entrance.json @@ -29,10 +29,17 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "worker_m", "coord": [7, 3], "source_event": 0, "source_script": "0x0"}, + { + "name": "worker_m", + "coord": [7, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 0, + "source_script": "0x0" + }, { "name": "worker_m", "coord": [1, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 1, "source_script": "FuchsiaCity_SafariZone_Entrance_EventScript_InfoAttendant" } diff --git a/data/games/frlg/maps/base/FuchsiaCity_WardensHouse.json b/data/games/frlg/maps/base/FuchsiaCity_WardensHouse.json index c267736..01b0e09 100644 --- a/data/games/frlg/maps/base/FuchsiaCity_WardensHouse.json +++ b/data/games/frlg/maps/base/FuchsiaCity_WardensHouse.json @@ -45,13 +45,21 @@ { "name": "old_man_2", "coord": [3, 5], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 0, "source_script": "FuchsiaCity_WardensHouse_EventScript_Warden" }, - {"name": "pushable_boulder", "coord": [11, 6], "source_event": 1, "source_script": "EventScript_StrengthBoulder"}, + { + "name": "pushable_boulder", + "coord": [11, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, + "source_event": 1, + "source_script": "EventScript_StrengthBoulder" + }, { "name": "0", "coord": [4, 1], + "movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_FAME_CHECKER_KOGA_JOURNAL", "source_event": 3, "source_script": "FuchsiaCity_WardensHouse_EventScript_PokemonJournalKoga" @@ -62,6 +70,7 @@ "name": "item_ball", "coord": [11, 5], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_FUCHSIA_CITY_WARDENS_HOUSE_RARE_CANDY", "source_script": "FuchsiaCity_WardensHouse_EventScript_ItemRareCandy", "item": "rare_candy" diff --git a/data/games/frlg/maps/base/IndigoPlateau_Exterior.json b/data/games/frlg/maps/base/IndigoPlateau_Exterior.json index 11e99d1..a1444da 100644 --- a/data/games/frlg/maps/base/IndigoPlateau_Exterior.json +++ b/data/games/frlg/maps/base/IndigoPlateau_Exterior.json @@ -37,6 +37,7 @@ { "name": "blue", "coord": [11, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CREDITS_RIVAL", "source_event": 0, "source_script": "0x0", @@ -45,6 +46,7 @@ { "name": "prof_oak", "coord": [11, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CREDITS_OAK", "source_event": 1, "source_script": "0x0", diff --git a/data/games/frlg/maps/base/IndigoPlateau_PokemonCenter_1F.json b/data/games/frlg/maps/base/IndigoPlateau_PokemonCenter_1F.json index 20c64a9..6f18811 100644 --- a/data/games/frlg/maps/base/IndigoPlateau_PokemonCenter_1F.json +++ b/data/games/frlg/maps/base/IndigoPlateau_PokemonCenter_1F.json @@ -59,12 +59,14 @@ { "name": "clerk", "coord": [0, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 0, "source_script": "IndigoPlateau_PokemonCenter_1F_EventScript_Clerk" }, { "name": "nurse", "coord": [13, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 1, "source_script": "IndigoPlateau_PokemonCenter_1F_EventScript_Nurse", "source_local_id": "LOCALID_LEAGUE_NURSE" @@ -72,12 +74,14 @@ { "name": "gym_guy", "coord": [7, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 2, "source_script": "IndigoPlateau_PokemonCenter_1F_EventScript_GymGuy" }, { "name": "cooltrainer_f", "coord": [5, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 3, "source_script": "IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard", "source_local_id": "LOCALID_LEAGUE_DOOR_GUARD" @@ -85,6 +89,7 @@ { "name": "black_belt", "coord": [23, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POSTGAME_GOSSIPERS", "source_event": 4, "source_script": "IndigoPlateau_PokemonCenter_1F_EventScript_BlackBelt" @@ -92,6 +97,7 @@ { "name": "0", "coord": [22, 9], + "movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POSTGAME_GOSSIPERS", "source_event": 5, "source_script": "IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal" @@ -99,6 +105,7 @@ { "name": "cooltrainer_m", "coord": [16, 15], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [15, 14], "max": [17, 16]}, "hide_flag": "FLAG_HIDE_POSTGAME_GOSSIPERS", "source_event": 6, @@ -107,6 +114,7 @@ { "name": "0", "coord": [23, 9], + "movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POSTGAME_GOSSIPERS", "source_event": 7, "source_script": "IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal" diff --git a/data/games/frlg/maps/base/LavenderTown.json b/data/games/frlg/maps/base/LavenderTown.json index 099006c..8bca02d 100644 --- a/data/games/frlg/maps/base/LavenderTown.json +++ b/data/games/frlg/maps/base/LavenderTown.json @@ -55,11 +55,24 @@ { "name": "little_girl", "coord": [19, 10], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 1]}, "wander": {"min": [17, 9], "max": [21, 11]}, "source_event": 0, "source_script": "LavenderTown_EventScript_LittleGirl" }, - {"name": "worker_m", "coord": [12, 12], "source_event": 1, "source_script": "LavenderTown_EventScript_WorkerM"}, - {"name": "boy", "coord": [10, 7], "source_event": 2, "source_script": "LavenderTown_EventScript_Boy"} + { + "name": "worker_m", + "coord": [12, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 1, + "source_script": "LavenderTown_EventScript_WorkerM" + }, + { + "name": "boy", + "coord": [10, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "range": [1, 1]}, + "source_event": 2, + "source_script": "LavenderTown_EventScript_Boy" + } ] } diff --git a/data/games/frlg/maps/base/LavenderTown_Mart.json b/data/games/frlg/maps/base/LavenderTown_Mart.json index 0240ff7..70ff67c 100644 --- a/data/games/frlg/maps/base/LavenderTown_Mart.json +++ b/data/games/frlg/maps/base/LavenderTown_Mart.json @@ -28,17 +28,31 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "clerk", "coord": [2, 3], "source_event": 0, "source_script": "LavenderTown_Mart_EventScript_Clerk"}, + { + "name": "clerk", + "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 0, + "source_script": "LavenderTown_Mart_EventScript_Clerk" + }, { "name": "balding_man", "coord": [6, 2], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 1, "source_script": "LavenderTown_Mart_EventScript_BaldingMan" }, - {"name": "rocker", "coord": [9, 2], "source_event": 2, "source_script": "LavenderTown_Mart_EventScript_Rocker"}, + { + "name": "rocker", + "coord": [9, 2], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 2, + "source_script": "LavenderTown_Mart_EventScript_Rocker" + }, { "name": "youngster", "coord": [9, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "range": [1, 1]}, "source_event": 3, "source_script": "LavenderTown_Mart_EventScript_Youngster" } diff --git a/data/games/frlg/maps/base/LavenderTown_PokemonCenter_1F.json b/data/games/frlg/maps/base/LavenderTown_PokemonCenter_1F.json index f8b771b..d84aea5 100644 --- a/data/games/frlg/maps/base/LavenderTown_PokemonCenter_1F.json +++ b/data/games/frlg/maps/base/LavenderTown_PokemonCenter_1F.json @@ -44,6 +44,7 @@ { "name": "nurse", "coord": [7, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "LavenderTown_PokemonCenter_1F_EventScript_Nurse", "source_local_id": "LOCALID_LAVENDER_NURSE" @@ -51,12 +52,14 @@ { "name": "gentleman", "coord": [9, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 1, "source_script": "LavenderTown_PokemonCenter_1F_EventScript_Gentleman" }, { "name": "lass", "coord": [5, 6], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [1, 2]}, "wander": {"min": [5, 4], "max": [5, 8]}, "source_event": 2, "source_script": "LavenderTown_PokemonCenter_1F_EventScript_Lass" @@ -64,6 +67,7 @@ { "name": "youngster", "coord": [2, 2], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [1, 1], "max": [3, 3]}, "source_event": 3, "source_script": "LavenderTown_PokemonCenter_1F_EventScript_Youngster" @@ -71,6 +75,7 @@ { "name": "balding_man", "coord": [14, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POSTGAME_GOSSIPERS", "source_event": 4, "source_script": "LavenderTown_PokemonCenter_1F_EventScript_BaldingMan" diff --git a/data/games/frlg/maps/base/LavenderTown_VolunteerPokemonHouse.json b/data/games/frlg/maps/base/LavenderTown_VolunteerPokemonHouse.json index 299365e..d9ec576 100644 --- a/data/games/frlg/maps/base/LavenderTown_VolunteerPokemonHouse.json +++ b/data/games/frlg/maps/base/LavenderTown_VolunteerPokemonHouse.json @@ -31,6 +31,7 @@ { "name": "mr_fuji", "coord": [3, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEHOUSE_FUJI", "source_event": 0, "source_script": "LavenderTown_VolunteerPokemonHouse_EventScript_MrFuji" @@ -38,30 +39,35 @@ { "name": "nidorino", "coord": [1, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 1, "source_script": "LavenderTown_VolunteerPokemonHouse_EventScript_Nidorino" }, { "name": "psyduck", "coord": [9, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 2, "source_script": "LavenderTown_VolunteerPokemonHouse_EventScript_Psyduck" }, { "name": "little_boy", "coord": [9, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 3, "source_script": "LavenderTown_VolunteerPokemonHouse_EventScript_LittleBoy" }, { "name": "youngster", "coord": [3, 5], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 4, "source_script": "LavenderTown_VolunteerPokemonHouse_EventScript_Youngster" }, { "name": "little_girl", "coord": [7, 2], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 5, "source_script": "LavenderTown_VolunteerPokemonHouse_EventScript_LittleGirl" } diff --git a/data/games/frlg/maps/base/MtMoon_1F.json b/data/games/frlg/maps/base/MtMoon_1F.json index 26204e9..7a08d04 100644 --- a/data/games/frlg/maps/base/MtMoon_1F.json +++ b/data/games/frlg/maps/base/MtMoon_1F.json @@ -74,6 +74,7 @@ { "name": "lass", "coord": [20, 26], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 0, @@ -82,6 +83,7 @@ { "name": "bug_catcher", "coord": [36, 30], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 1, @@ -90,6 +92,7 @@ { "name": "scientist", "coord": [30, 35], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["north", "east", "south", "west"]}, "source_event": 2, "source_script": "MtMoon_1F_EventScript_Jovan" @@ -97,6 +100,8 @@ { "name": "lass", "coord": [33, 4], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP", "range": [5, 3]}, + "wander": {"min": [28, 1], "max": [38, 7]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "source_event": 3, "source_script": "MtMoon_1F_EventScript_Miriam" @@ -104,6 +109,7 @@ { "name": "bug_catcher", "coord": [7, 26], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 4, @@ -112,6 +118,7 @@ { "name": "youngster", "coord": [13, 17], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 5, @@ -120,18 +127,26 @@ { "name": "hiker", "coord": [7, 10], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 2]}, "wander": {"min": [5, 8], "max": [9, 12]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 6, "source_script": "MtMoon_1F_EventScript_Marcos" }, - {"name": "balding_man", "coord": [42, 7], "source_event": 13, "source_script": "MtMoon_1F_EventScript_BaldingMan"} + { + "name": "balding_man", + "coord": [42, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "range": [1, 1]}, + "source_event": 13, + "source_script": "MtMoon_1F_EventScript_BaldingMan" + } ], "items": [ { "name": "item_ball", "coord": [2, 22], "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_1F_PARALYZE_HEAL", "source_script": "MtMoon_1F_EventScript_ItemParalyzeHeal", "item": "paralyze_heal" @@ -140,6 +155,7 @@ "name": "item_ball", "coord": [11, 35], "source_event": 8, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_1F_TM09", "source_script": "MtMoon_1F_EventScript_ItemTM09", "item": "tm09" @@ -148,6 +164,7 @@ "name": "item_ball", "coord": [26, 32], "source_event": 9, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_1F_POTION", "source_script": "MtMoon_1F_EventScript_ItemPotion", "item": "potion" @@ -156,6 +173,7 @@ "name": "item_ball", "coord": [42, 35], "source_event": 10, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_1F_RARE_CANDY", "source_script": "MtMoon_1F_EventScript_ItemRareCandy", "item": "rare_candy" @@ -164,6 +182,7 @@ "name": "item_ball", "coord": [44, 21], "source_event": 11, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_1F_ESCAPE_ROPE", "source_script": "MtMoon_1F_EventScript_ItemEscapeRope", "item": "escape_rope" @@ -172,6 +191,7 @@ "name": "item_ball", "coord": [3, 2], "source_event": 12, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_1F_MOON_STONE", "source_script": "MtMoon_1F_EventScript_ItemMoonStone", "item": "moon_stone" diff --git a/data/games/frlg/maps/base/MtMoon_B2F.json b/data/games/frlg/maps/base/MtMoon_B2F.json index c5da403..ed6a9aa 100644 --- a/data/games/frlg/maps/base/MtMoon_B2F.json +++ b/data/games/frlg/maps/base/MtMoon_B2F.json @@ -121,6 +121,7 @@ { "name": "fossil", "coord": [13, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_DOME_FOSSIL", "source_event": 0, "source_script": "MtMoon_B2F_EventScript_DomeFossil", @@ -129,6 +130,7 @@ { "name": "fossil", "coord": [14, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_HELIX_FOSSIL", "source_event": 1, "source_script": "MtMoon_B2F_EventScript_HelixFossil", @@ -137,6 +139,7 @@ { "name": "scientist", "coord": [13, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 2, "source_script": "MtMoon_B2F_EventScript_Miguel", "source_local_id": "LOCALID_MIGUEL" @@ -144,6 +147,7 @@ { "name": "rocket_m", "coord": [37, 21], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["north", "east", "south", "west"]}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", "source_event": 3, @@ -152,6 +156,7 @@ { "name": "rocket_m", "coord": [12, 20], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -161,6 +166,7 @@ { "name": "rocket_m", "coord": [35, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -170,6 +176,7 @@ { "name": "rocket_m", "coord": [18, 27], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -182,6 +189,7 @@ "name": "item_ball", "coord": [30, 26], "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_B2F_STAR_PIECE", "source_script": "MtMoon_B2F_EventScript_ItemStarPiece", "item": "star_piece" @@ -190,6 +198,7 @@ "name": "item_ball", "coord": [35, 5], "source_event": 8, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_B2F_TM46", "source_script": "MtMoon_B2F_EventScript_ItemTM46", "item": "tm46" @@ -198,6 +207,7 @@ "name": "item_ball", "coord": [24, 6], "source_event": 9, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_B2F_REVIVE", "source_script": "MtMoon_B2F_EventScript_ItemRevive", "item": "revive" @@ -206,6 +216,7 @@ "name": "item_ball", "coord": [3, 11], "source_event": 10, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_B2F_ANTIDOTE", "source_script": "MtMoon_B2F_EventScript_ItemAntidote", "item": "antidote" diff --git a/data/games/frlg/maps/base/PalletTown.json b/data/games/frlg/maps/base/PalletTown.json index 54e740d..197d9a7 100644 --- a/data/games/frlg/maps/base/PalletTown.json +++ b/data/games/frlg/maps/base/PalletTown.json @@ -65,6 +65,7 @@ { "name": "woman_1", "coord": [3, 10], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 4]}, "wander": {"min": [2, 6], "max": [4, 14]}, "source_event": 0, "source_script": "PalletTown_EventScript_SignLady", @@ -73,6 +74,7 @@ { "name": "fat_man", "coord": [13, 17], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [6, 2]}, "wander": {"min": [7, 15], "max": [19, 19]}, "source_event": 1, "source_script": "PalletTown_EventScript_FatMan", @@ -81,6 +83,7 @@ { "name": "prof_oak", "coord": [10, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_OAK_IN_PALLET_TOWN", "source_event": 2, "source_script": "0x0", diff --git a/data/games/frlg/maps/base/PalletTown_PlayersHouse_1F.json b/data/games/frlg/maps/base/PalletTown_PlayersHouse_1F.json index 3719282..3af48bf 100644 --- a/data/games/frlg/maps/base/PalletTown_PlayersHouse_1F.json +++ b/data/games/frlg/maps/base/PalletTown_PlayersHouse_1F.json @@ -33,6 +33,7 @@ { "name": "mom", "coord": [8, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [0, 0]}, "source_event": 0, "source_script": "PalletTown_PlayersHouse_1F_EventScript_Mom", "source_local_id": "LOCALID_MOM" diff --git a/data/games/frlg/maps/base/PalletTown_ProfessorOaksLab.json b/data/games/frlg/maps/base/PalletTown_ProfessorOaksLab.json index 55e69f7..860fdae 100644 --- a/data/games/frlg/maps/base/PalletTown_ProfessorOaksLab.json +++ b/data/games/frlg/maps/base/PalletTown_ProfessorOaksLab.json @@ -48,12 +48,14 @@ { "name": "scientist", "coord": [3, 11], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [0, 0]}, "source_event": 0, "source_script": "PalletTown_ProfessorOaksLab_EventScript_Aide1" }, { "name": "worker_f", "coord": [2, 10], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [0, 4]}, "wander": {"min": [2, 6], "max": [2, 13]}, "source_event": 1, "source_script": "PalletTown_ProfessorOaksLab_EventScript_Aide3" @@ -61,12 +63,14 @@ { "name": "scientist", "coord": [11, 10], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [0, 0]}, "source_event": 2, "source_script": "PalletTown_ProfessorOaksLab_EventScript_Aide2" }, { "name": "prof_oak", "coord": [6, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_OAK_IN_HIS_LAB", "source_event": 3, "source_script": "PalletTown_ProfessorOaksLab_EventScript_ProfOak", @@ -75,6 +79,7 @@ { "name": "blue", "coord": [5, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_RIVAL_IN_LAB", "source_event": 7, "source_script": "PalletTown_ProfessorOaksLab_EventScript_Rival", @@ -83,6 +88,7 @@ { "name": "pokedex", "coord": [4, 1], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEDEX", "source_event": 8, "source_script": "PalletTown_ProfessorOaksLab_EventScript_Pokedex", @@ -91,6 +97,7 @@ { "name": "pokedex", "coord": [5, 1], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEDEX", "source_event": 9, "source_script": "PalletTown_ProfessorOaksLab_EventScript_Pokedex", @@ -102,6 +109,7 @@ "name": "item_ball", "coord": [8, 4], "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_BULBASAUR_BALL", "source_script": "PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall", "source_local_id": "LOCALID_BULBASAUR_BALL", @@ -111,6 +119,7 @@ "name": "item_ball", "coord": [9, 4], "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SQUIRTLE_BALL", "source_script": "PalletTown_ProfessorOaksLab_EventScript_SquirtleBall", "source_local_id": "LOCALID_SQUIRTLE_BALL", @@ -120,6 +129,7 @@ "name": "item_ball", "coord": [10, 4], "source_event": 6, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CHARMANDER_BALL", "source_script": "PalletTown_ProfessorOaksLab_EventScript_CharmanderBall", "source_local_id": "LOCALID_CHARMANDER_BALL", diff --git a/data/games/frlg/maps/base/PalletTown_RivalsHouse.json b/data/games/frlg/maps/base/PalletTown_RivalsHouse.json index cd9fa22..ce9fdcd 100644 --- a/data/games/frlg/maps/base/PalletTown_RivalsHouse.json +++ b/data/games/frlg/maps/base/PalletTown_RivalsHouse.json @@ -32,6 +32,7 @@ { "name": "daisy", "coord": [10, 6], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 3]}, "wander": {"min": [9, 3], "max": [11, 9]}, "source_event": 0, "source_script": "PalletTown_RivalsHouse_EventScript_Daisy", @@ -40,6 +41,7 @@ { "name": "town_map", "coord": [6, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_TOWN_MAP", "source_event": 1, "source_script": "PalletTown_RivalsHouse_EventScript_TownMap", diff --git a/data/games/frlg/maps/base/PewterCity.json b/data/games/frlg/maps/base/PewterCity.json index 2992faa..96d685f 100644 --- a/data/games/frlg/maps/base/PewterCity.json +++ b/data/games/frlg/maps/base/PewterCity.json @@ -83,19 +83,33 @@ } ], "npcs": [ - {"name": "lass", "coord": [6, 15], "source_event": 0, "source_script": "PewterCity_EventScript_Lass"}, + { + "name": "lass", + "coord": [6, 15], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 0, + "source_script": "PewterCity_EventScript_Lass" + }, { "name": "man", "coord": [33, 17], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_PEWTER_MUSEUM_GUIDE", "source_event": 1, "source_script": "PewterCity_EventScript_MuseumGuide", "source_local_id": "LOCALID_PEWTER_MUSEUM_GUIDE" }, - {"name": "fat_man", "coord": [21, 28], "source_event": 2, "source_script": "PewterCity_EventScript_FatMan"}, + { + "name": "fat_man", + "coord": [21, 28], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 2, + "source_script": "PewterCity_EventScript_FatMan" + }, { "name": "bug_catcher", "coord": [33, 27], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [2, 1]}, "wander": {"min": [31, 27], "max": [35, 27]}, "source_event": 3, "source_script": "PewterCity_EventScript_BugCatcher" @@ -103,6 +117,7 @@ { "name": "boy", "coord": [42, 20], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_PEWTER_CITY_GYM_GUIDE", "source_event": 4, "source_script": "PewterCity_EventScript_GymGuide", @@ -111,6 +126,7 @@ { "name": "cut_tree", "coord": [30, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 5, "source_script": "EventScript_CutTree" @@ -118,6 +134,7 @@ { "name": "scientist", "coord": [46, 20], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_PEWTER_CITY_RUNNING_SHOES_GUY", "source_event": 6, "source_script": "PewterCity_EventScript_RunningShoesAide", diff --git a/data/games/frlg/maps/base/PewterCity_Gym.json b/data/games/frlg/maps/base/PewterCity_Gym.json index 288fc61..8a60df0 100644 --- a/data/games/frlg/maps/base/PewterCity_Gym.json +++ b/data/games/frlg/maps/base/PewterCity_Gym.json @@ -35,15 +35,28 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "brock", "coord": [6, 5], "source_event": 0, "source_script": "PewterCity_Gym_EventScript_Brock"}, + { + "name": "brock", + "coord": [6, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 0, + "source_script": "PewterCity_Gym_EventScript_Brock" + }, { "name": "camper", "coord": [3, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 1, "source_script": "PewterCity_Gym_EventScript_Liam" }, - {"name": "gym_guy", "coord": [7, 12], "source_event": 2, "source_script": "PewterCity_Gym_EventScript_GymGuy"} + { + "name": "gym_guy", + "coord": [7, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 2, + "source_script": "PewterCity_Gym_EventScript_GymGuy" + } ] } diff --git a/data/games/frlg/maps/base/PewterCity_Mart.json b/data/games/frlg/maps/base/PewterCity_Mart.json index 633e19a..51e9f56 100644 --- a/data/games/frlg/maps/base/PewterCity_Mart.json +++ b/data/games/frlg/maps/base/PewterCity_Mart.json @@ -28,8 +28,26 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "youngster", "coord": [8, 2], "source_event": 0, "source_script": "PewterCity_Mart_EventScript_Youngster"}, - {"name": "boy", "coord": [6, 4], "source_event": 1, "source_script": "PewterCity_Mart_EventScript_Boy"}, - {"name": "clerk", "coord": [2, 3], "source_event": 2, "source_script": "PewterCity_Mart_EventScript_Clerk"} + { + "name": "youngster", + "coord": [8, 2], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 0, + "source_script": "PewterCity_Mart_EventScript_Youngster" + }, + { + "name": "boy", + "coord": [6, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 1, + "source_script": "PewterCity_Mart_EventScript_Boy" + }, + { + "name": "clerk", + "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 2, + "source_script": "PewterCity_Mart_EventScript_Clerk" + } ] } diff --git a/data/games/frlg/maps/base/PewterCity_Museum_1F.json b/data/games/frlg/maps/base/PewterCity_Museum_1F.json index 1af401a..e23c697 100644 --- a/data/games/frlg/maps/base/PewterCity_Museum_1F.json +++ b/data/games/frlg/maps/base/PewterCity_Museum_1F.json @@ -36,6 +36,7 @@ { "name": "worker_m", "coord": [16, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 0, "source_script": "PewterCity_Museum_1F_EventScript_Scientist1", "source_local_id": "LOCALID_MUSEUM_SCIENTIST1" @@ -43,18 +44,21 @@ { "name": "old_man_1", "coord": [2, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 1, "source_script": "PewterCity_Museum_1F_EventScript_OldMan" }, { "name": "scientist", "coord": [21, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 2, "source_script": "PewterCity_Museum_1F_EventScript_OldAmberScientist" }, { "name": "old_amber", "coord": [22, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_OLD_AMBER", "source_event": 3, "source_script": "PewterCity_Museum_1F_EventScript_OldAmber", @@ -63,12 +67,14 @@ { "name": "scientist", "coord": [26, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 4, "source_script": "PewterCity_Museum_1F_EventScript_Scientist2" }, { "name": "scientist", "coord": [26, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 5, "source_script": "PewterCity_Museum_1F_EventScript_SeismicTossTutor" } diff --git a/data/games/frlg/maps/base/PewterCity_PokemonCenter_1F.json b/data/games/frlg/maps/base/PewterCity_PokemonCenter_1F.json index e8f4f73..b36a4df 100644 --- a/data/games/frlg/maps/base/PewterCity_PokemonCenter_1F.json +++ b/data/games/frlg/maps/base/PewterCity_PokemonCenter_1F.json @@ -44,18 +44,21 @@ { "name": "jigglypuff", "coord": [2, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "PewterCity_PokemonCenter_1F_EventScript_Jigglypuff" }, { "name": "gentleman", "coord": [4, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "range": [1, 1]}, "source_event": 1, "source_script": "PewterCity_PokemonCenter_1F_EventScript_Gentleman" }, { "name": "nurse", "coord": [7, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 2, "source_script": "PewterCity_PokemonCenter_1F_EventScript_Nurse", "source_local_id": "LOCALID_PEWTER_NURSE" @@ -63,19 +66,28 @@ { "name": "youngster", "coord": [1, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 3, "source_script": "PewterCity_PokemonCenter_1F_EventScript_Youngster" }, - {"name": "woman_1", "coord": [13, 2], "source_event": 4, "source_script": "MysteryEventClub_EventScript_Woman"}, + { + "name": "woman_1", + "coord": [13, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 4, + "source_script": "MysteryEventClub_EventScript_Woman" + }, { "name": "gba_kid", "coord": [10, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 5, "source_script": "PewterCity_PokemonCenter_1F_EventScript_GBAKid1" }, { "name": "gba_kid", "coord": [14, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 6, "source_script": "PewterCity_PokemonCenter_1F_EventScript_GBAKid2" } diff --git a/data/games/frlg/maps/base/PokemonLeague_AgathasRoom.json b/data/games/frlg/maps/base/PokemonLeague_AgathasRoom.json index 026a6de..3e1825f 100644 --- a/data/games/frlg/maps/base/PokemonLeague_AgathasRoom.json +++ b/data/games/frlg/maps/base/PokemonLeague_AgathasRoom.json @@ -34,6 +34,7 @@ { "name": "agatha", "coord": [6, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "PokemonLeague_AgathasRoom_EventScript_Agatha" } diff --git a/data/games/frlg/maps/base/PokemonLeague_BrunosRoom.json b/data/games/frlg/maps/base/PokemonLeague_BrunosRoom.json index e9e4bc7..bf5cf2f 100644 --- a/data/games/frlg/maps/base/PokemonLeague_BrunosRoom.json +++ b/data/games/frlg/maps/base/PokemonLeague_BrunosRoom.json @@ -34,6 +34,7 @@ { "name": "bruno", "coord": [6, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "PokemonLeague_BrunosRoom_EventScript_Bruno", "source_local_id": "LOCALID_BRUNO" diff --git a/data/games/frlg/maps/base/PokemonLeague_ChampionsRoom.json b/data/games/frlg/maps/base/PokemonLeague_ChampionsRoom.json index 9e9cac6..b408b7a 100644 --- a/data/games/frlg/maps/base/PokemonLeague_ChampionsRoom.json +++ b/data/games/frlg/maps/base/PokemonLeague_ChampionsRoom.json @@ -62,6 +62,7 @@ { "name": "blue", "coord": [6, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "0x0", "source_local_id": "LOCALID_CHAMPIONS_ROOM_RIVAL" @@ -69,6 +70,7 @@ { "name": "prof_oak", "coord": [6, 15], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_OAK_IN_CHAMP_ROOM", "source_event": 1, "source_script": "0x0", diff --git a/data/games/frlg/maps/base/PokemonLeague_HallOfFame.json b/data/games/frlg/maps/base/PokemonLeague_HallOfFame.json index d451cb4..940521b 100644 --- a/data/games/frlg/maps/base/PokemonLeague_HallOfFame.json +++ b/data/games/frlg/maps/base/PokemonLeague_HallOfFame.json @@ -31,6 +31,7 @@ { "name": "prof_oak", "coord": [6, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "0x0", "source_local_id": "LOCALID_HALL_OF_FAME_PROF_OAK" diff --git a/data/games/frlg/maps/base/PokemonLeague_LancesRoom.json b/data/games/frlg/maps/base/PokemonLeague_LancesRoom.json index 3c1041f..5c9cdfe 100644 --- a/data/games/frlg/maps/base/PokemonLeague_LancesRoom.json +++ b/data/games/frlg/maps/base/PokemonLeague_LancesRoom.json @@ -45,6 +45,7 @@ { "name": "lance", "coord": [6, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "PokemonLeague_LancesRoom_EventScript_Lance", "source_local_id": "LOCALID_LANCE" diff --git a/data/games/frlg/maps/base/PokemonLeague_LoreleisRoom.json b/data/games/frlg/maps/base/PokemonLeague_LoreleisRoom.json index d9ae0e6..edbd8dd 100644 --- a/data/games/frlg/maps/base/PokemonLeague_LoreleisRoom.json +++ b/data/games/frlg/maps/base/PokemonLeague_LoreleisRoom.json @@ -34,6 +34,7 @@ { "name": "lorelei", "coord": [6, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "PokemonLeague_LoreleisRoom_EventScript_Lorelei" } diff --git a/data/games/frlg/maps/base/PokemonMansion_1F.json b/data/games/frlg/maps/base/PokemonMansion_1F.json index 4b4351f..15f4c18 100644 --- a/data/games/frlg/maps/base/PokemonMansion_1F.json +++ b/data/games/frlg/maps/base/PokemonMansion_1F.json @@ -122,6 +122,7 @@ { "name": "scientist", "coord": [22, 24], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 4}, "source_event": 0, @@ -130,6 +131,7 @@ { "name": "youngster", "coord": [8, 8], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [2, 1]}, "wander": {"min": [6, 8], "max": [10, 8]}, "trainer": {"sight": 1, "looks": ["west", "east"]}, "source_event": 4, @@ -141,6 +143,7 @@ "name": "item_ball", "coord": [29, 32], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_1F_CARBOS", "source_script": "PokemonMansion_1F_EventScript_ItemCarbos", "item": "carbos" @@ -149,6 +152,7 @@ "name": "item_ball", "coord": [22, 6], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_1F_ESCAPE_ROPE", "source_script": "PokemonMansion_1F_EventScript_ItemEscapeRope", "item": "escape_rope" @@ -157,6 +161,7 @@ "name": "item_ball", "coord": [27, 15], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_1F_PROTEIN", "source_script": "PokemonMansion_1F_EventScript_ItemProtein", "item": "protein" diff --git a/data/games/frlg/maps/base/PokemonMansion_2F.json b/data/games/frlg/maps/base/PokemonMansion_2F.json index 40845c3..1e3da6b 100644 --- a/data/games/frlg/maps/base/PokemonMansion_2F.json +++ b/data/games/frlg/maps/base/PokemonMansion_2F.json @@ -104,6 +104,7 @@ { "name": "poke_maniac", "coord": [5, 23], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 0, "source_script": "PokemonMansion_2F_EventScript_Arnie" @@ -114,6 +115,7 @@ "name": "item_ball", "coord": [36, 8], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_2F_CALCIUM", "source_script": "PokemonMansion_2F_EventScript_ItemCalcium", "item": "calcium" @@ -122,6 +124,7 @@ "name": "item_ball", "coord": [18, 23], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_2F_ZINC", "source_script": "PokemonMansion_2F_EventScript_ItemZinc", "item": "zinc" @@ -130,6 +133,7 @@ "name": "item_ball", "coord": [35, 17], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_2F_HP_UP", "source_script": "PokemonMansion_2F_EventScript_ItemHPUp", "item": "hp_up" diff --git a/data/games/frlg/maps/base/PokemonMansion_3F.json b/data/games/frlg/maps/base/PokemonMansion_3F.json index 6591937..fc7486f 100644 --- a/data/games/frlg/maps/base/PokemonMansion_3F.json +++ b/data/games/frlg/maps/base/PokemonMansion_3F.json @@ -113,6 +113,7 @@ { "name": "poke_maniac", "coord": [7, 13], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [6, 12], "max": [8, 14]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 0, @@ -121,6 +122,7 @@ { "name": "scientist", "coord": [22, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 1, @@ -132,6 +134,7 @@ "name": "item_ball", "coord": [9, 19], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_3F_MAX_POTION", "source_script": "PokemonMansion_3F_EventScript_ItemMaxPotion", "item": "max_potion" @@ -140,6 +143,7 @@ "name": "item_ball", "coord": [32, 6], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_3F_IRON", "source_script": "PokemonMansion_3F_EventScript_ItemIron", "item": "iron" diff --git a/data/games/frlg/maps/base/PokemonMansion_B1F.json b/data/games/frlg/maps/base/PokemonMansion_B1F.json index 91e5fb5..d3b102e 100644 --- a/data/games/frlg/maps/base/PokemonMansion_B1F.json +++ b/data/games/frlg/maps/base/PokemonMansion_B1F.json @@ -114,6 +114,7 @@ { "name": "poke_maniac", "coord": [20, 25], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [19, 24], "max": [21, 26]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 1, @@ -122,6 +123,7 @@ { "name": "scientist", "coord": [34, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 6}, "source_event": 2, @@ -133,6 +135,7 @@ "name": "item_ball", "coord": [6, 21], "source_event": 0, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM22", "source_script": "PokemonMansion_B1F_EventScript_ItemTM22", "item": "tm22" @@ -141,6 +144,7 @@ "name": "item_ball", "coord": [23, 4], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM14", "source_script": "PokemonMansion_B1F_EventScript_ItemTM14", "item": "tm14" @@ -149,6 +153,7 @@ "name": "item_ball", "coord": [2, 29], "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_B1F_FULL_RESTORE", "source_script": "PokemonMansion_B1F_EventScript_ItemFullRestore", "item": "full_restore" @@ -157,6 +162,7 @@ "name": "item_ball", "coord": [5, 7], "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY", "source_script": "PokemonMansion_B1F_EventScript_ItemSecretKey", "item": "secret_key" diff --git a/data/games/frlg/maps/base/PokemonTower_1F.json b/data/games/frlg/maps/base/PokemonTower_1F.json index 644ee00..76bb656 100644 --- a/data/games/frlg/maps/base/PokemonTower_1F.json +++ b/data/games/frlg/maps/base/PokemonTower_1F.json @@ -40,12 +40,31 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "worker_f", "coord": [18, 13], "source_event": 0, "source_script": "PokemonTower_1F_EventScript_WorkerF"}, - {"name": "channeler", "coord": [18, 7], "source_event": 1, "source_script": "PokemonTower_1F_EventScript_Channeler"}, - {"name": "woman_2", "coord": [15, 6], "source_event": 2, "source_script": "PokemonTower_1F_EventScript_Woman1"}, + { + "name": "worker_f", + "coord": [18, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 0, + "source_script": "PokemonTower_1F_EventScript_WorkerF" + }, + { + "name": "channeler", + "coord": [18, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 1, + "source_script": "PokemonTower_1F_EventScript_Channeler" + }, + { + "name": "woman_2", + "coord": [15, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 2, + "source_script": "PokemonTower_1F_EventScript_Woman1" + }, { "name": "woman_3", "coord": [7, 8], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [6, 7], "max": [8, 9]}, "source_event": 3, "source_script": "PokemonTower_1F_EventScript_Woman2" @@ -53,6 +72,7 @@ { "name": "balding_man", "coord": [8, 12], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 2]}, "wander": {"min": [6, 10], "max": [10, 14]}, "source_event": 4, "source_script": "PokemonTower_1F_EventScript_BaldingMan" diff --git a/data/games/frlg/maps/base/PokemonTower_2F.json b/data/games/frlg/maps/base/PokemonTower_2F.json index 0797963..035f421 100644 --- a/data/games/frlg/maps/base/PokemonTower_2F.json +++ b/data/games/frlg/maps/base/PokemonTower_2F.json @@ -41,11 +41,18 @@ { "name": "blue", "coord": [16, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_TOWER_RIVAL", "source_event": 0, "source_script": "0x0", "source_local_id": "LOCALID_POKEMON_TOWER_RIVAL" }, - {"name": "channeler", "coord": [3, 7], "source_event": 1, "source_script": "PokemonTower_2F_EventScript_Channeler"} + { + "name": "channeler", + "coord": [3, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 1, + "source_script": "PokemonTower_2F_EventScript_Channeler" + } ] } diff --git a/data/games/frlg/maps/base/PokemonTower_3F.json b/data/games/frlg/maps/base/PokemonTower_3F.json index 02764e0..20ca840 100644 --- a/data/games/frlg/maps/base/PokemonTower_3F.json +++ b/data/games/frlg/maps/base/PokemonTower_3F.json @@ -53,6 +53,7 @@ { "name": "channeler", "coord": [10, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 0, @@ -61,6 +62,7 @@ { "name": "channeler", "coord": [9, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 1, @@ -69,6 +71,7 @@ { "name": "channeler", "coord": [12, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["south", "north"]}, "source_event": 2, "source_script": "PokemonTower_3F_EventScript_Hope" @@ -79,6 +82,7 @@ "name": "item_ball", "coord": [13, 2], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_TOWER_3F_ESCAPE_ROPE", "source_script": "PokemonTower_3F_EventScript_ItemEscapeRope", "item": "escape_rope" diff --git a/data/games/frlg/maps/base/PokemonTower_4F.json b/data/games/frlg/maps/base/PokemonTower_4F.json index 5715dbd..7ed721f 100644 --- a/data/games/frlg/maps/base/PokemonTower_4F.json +++ b/data/games/frlg/maps/base/PokemonTower_4F.json @@ -53,6 +53,7 @@ { "name": "channeler", "coord": [17, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 0, @@ -61,6 +62,7 @@ { "name": "channeler", "coord": [15, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 5}, "source_event": 1, @@ -69,6 +71,7 @@ { "name": "channeler", "coord": [4, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 2, @@ -80,6 +83,7 @@ "name": "item_ball", "coord": [12, 11], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_TOWER_4F_ELIXIR", "source_script": "PokemonTower_4F_EventScript_ItemElixir", "item": "elixir" @@ -88,6 +92,7 @@ "name": "item_ball", "coord": [8, 11], "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_TOWER_4F_AWAKENING", "source_script": "PokemonTower_4F_EventScript_ItemAwakening", "item": "awakening" @@ -96,6 +101,7 @@ "name": "item_ball", "coord": [11, 16], "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_TOWER_4F_GREAT_BALL", "source_script": "PokemonTower_4F_EventScript_ItemGreatBall", "item": "great_ball" diff --git a/data/games/frlg/maps/base/PokemonTower_5F.json b/data/games/frlg/maps/base/PokemonTower_5F.json index f83c279..edef3f0 100644 --- a/data/games/frlg/maps/base/PokemonTower_5F.json +++ b/data/games/frlg/maps/base/PokemonTower_5F.json @@ -62,6 +62,7 @@ { "name": "channeler", "coord": [11, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "source_event": 0, "source_script": "PokemonTower_5F_EventScript_Ruth" @@ -69,6 +70,7 @@ { "name": "channeler", "coord": [19, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 1, @@ -77,6 +79,7 @@ { "name": "channeler", "coord": [7, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 2, @@ -85,17 +88,25 @@ { "name": "channeler", "coord": [11, 16], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "source_event": 3, "source_script": "PokemonTower_5F_EventScript_Janae" }, - {"name": "channeler", "coord": [12, 8], "source_event": 4, "source_script": "PokemonTower_5F_EventScript_Channeler"} + { + "name": "channeler", + "coord": [12, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 4, + "source_script": "PokemonTower_5F_EventScript_Channeler" + } ], "items": [ { "name": "item_ball", "coord": [6, 16], "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_TOWER_5F_NUGGET", "source_script": "PokemonTower_5F_EventScript_ItemNugget", "item": "nugget" @@ -104,6 +115,7 @@ "name": "item_ball", "coord": [11, 9], "source_event": 6, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_TOWER_5F_CLEANSE_TAG", "source_script": "PokemonTower_5F_EventScript_ItemCleanseTag", "item": "cleanse_tag" diff --git a/data/games/frlg/maps/base/PokemonTower_6F.json b/data/games/frlg/maps/base/PokemonTower_6F.json index 89b9a37..a0a86a1 100644 --- a/data/games/frlg/maps/base/PokemonTower_6F.json +++ b/data/games/frlg/maps/base/PokemonTower_6F.json @@ -53,6 +53,7 @@ { "name": "channeler", "coord": [13, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 3}, "source_event": 0, @@ -61,6 +62,7 @@ { "name": "channeler", "coord": [18, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 1, @@ -69,6 +71,7 @@ { "name": "channeler", "coord": [9, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 2, @@ -80,6 +83,7 @@ "name": "item_ball", "coord": [5, 15], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_TOWER_6F_RARE_CANDY", "source_script": "PokemonTower_6F_EventScript_ItemRareCandy", "item": "rare_candy" @@ -88,6 +92,7 @@ "name": "item_ball", "coord": [15, 15], "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_TOWER_6F_X_ACCURACY", "source_script": "PokemonTower_6F_EventScript_ItemXAccuracy", "item": "x_accuracy" diff --git a/data/games/frlg/maps/base/PokemonTower_7F.json b/data/games/frlg/maps/base/PokemonTower_7F.json index 3be1601..40bb016 100644 --- a/data/games/frlg/maps/base/PokemonTower_7F.json +++ b/data/games/frlg/maps/base/PokemonTower_7F.json @@ -48,6 +48,7 @@ { "name": "mr_fuji", "coord": [11, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_TOWER_FUJI", "source_event": 0, "source_script": "PokemonTower_7F_EventScript_MrFuji" @@ -55,6 +56,7 @@ { "name": "rocket_m", "coord": [9, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_TOWER_ROCKET_1", @@ -65,6 +67,7 @@ { "name": "rocket_m", "coord": [13, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_TOWER_ROCKET_2", @@ -75,6 +78,7 @@ { "name": "rocket_m", "coord": [9, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_TOWER_ROCKET_3", diff --git a/data/games/frlg/maps/base/RockTunnel_1F.json b/data/games/frlg/maps/base/RockTunnel_1F.json index de54d57..7aad41d 100644 --- a/data/games/frlg/maps/base/RockTunnel_1F.json +++ b/data/games/frlg/maps/base/RockTunnel_1F.json @@ -83,6 +83,7 @@ { "name": "picnicker", "coord": [26, 28], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 0, @@ -91,6 +92,7 @@ { "name": "picnicker", "coord": [39, 27], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 1, @@ -99,6 +101,7 @@ { "name": "picnicker", "coord": [45, 24], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 5}, "source_event": 2, @@ -107,6 +110,7 @@ { "name": "hiker", "coord": [20, 17], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 4}, "source_event": 3, @@ -115,6 +119,7 @@ { "name": "hiker", "coord": [5, 20], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 4, @@ -123,6 +128,7 @@ { "name": "hiker", "coord": [7, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 5, @@ -131,6 +137,7 @@ { "name": "poke_maniac", "coord": [27, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 6, @@ -142,6 +149,7 @@ "name": "item_ball", "coord": [37, 5], "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCK_TUNNEL_1F_REPEL", "source_script": "RockTunnel_1F_EventScript_ItemRepel", "item": "repel" @@ -150,6 +158,7 @@ "name": "item_ball", "coord": [33, 22], "source_event": 8, + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCK_TUNNEL_1F_PEARL", "source_script": "RockTunnel_1F_EventScript_ItemPearl", "item": "pearl" @@ -158,6 +167,7 @@ "name": "item_ball", "coord": [22, 22], "source_event": 9, + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCK_TUNNEL_1F_ESCAPE_ROPE", "source_script": "RockTunnel_1F_EventScript_ItemEscapeRope", "item": "escape_rope" diff --git a/data/games/frlg/maps/base/RockTunnel_B1F.json b/data/games/frlg/maps/base/RockTunnel_B1F.json index ff7105b..8beba76 100644 --- a/data/games/frlg/maps/base/RockTunnel_B1F.json +++ b/data/games/frlg/maps/base/RockTunnel_B1F.json @@ -74,6 +74,7 @@ { "name": "poke_maniac", "coord": [2, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "source_event": 0, "source_script": "RockTunnel_B1F_EventScript_Cooper" @@ -81,6 +82,7 @@ { "name": "hiker", "coord": [5, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 1, @@ -89,6 +91,7 @@ { "name": "picnicker", "coord": [11, 15], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 2, @@ -97,6 +100,7 @@ { "name": "hiker", "coord": [36, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 3, @@ -105,6 +109,7 @@ { "name": "hiker", "coord": [41, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 3}, "source_event": 4, @@ -113,6 +118,7 @@ { "name": "poke_maniac", "coord": [23, 23], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 5, @@ -121,6 +127,7 @@ { "name": "picnicker", "coord": [15, 33], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 6, @@ -129,6 +136,7 @@ { "name": "poke_maniac", "coord": [29, 35], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 7, @@ -137,12 +145,14 @@ { "name": "youngster", "coord": [2, 29], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 8, "source_script": "RockTunnel_B1F_EventScript_RockSlideTutor" }, { "name": "rock_smash_rock", "coord": [1, 20], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 11, "source_script": "EventScript_RockSmash" @@ -150,6 +160,7 @@ { "name": "rock_smash_rock", "coord": [1, 22], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 12, "source_script": "EventScript_RockSmash" @@ -157,6 +168,7 @@ { "name": "rock_smash_rock", "coord": [4, 23], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 13, "source_script": "EventScript_RockSmash" @@ -164,6 +176,7 @@ { "name": "rock_smash_rock", "coord": [2, 23], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_15", "source_event": 14, "source_script": "EventScript_RockSmash" @@ -171,6 +184,7 @@ { "name": "rock_smash_rock", "coord": [39, 26], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_16", "source_event": 15, "source_script": "EventScript_RockSmash" @@ -178,6 +192,7 @@ { "name": "rock_smash_rock", "coord": [42, 26], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_17", "source_event": 16, "source_script": "EventScript_RockSmash" @@ -185,6 +200,7 @@ { "name": "rock_smash_rock", "coord": [43, 28], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_18", "source_event": 17, "source_script": "EventScript_RockSmash" @@ -192,6 +208,7 @@ { "name": "rock_smash_rock", "coord": [45, 30], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_19", "source_event": 18, "source_script": "EventScript_RockSmash" @@ -199,6 +216,7 @@ { "name": "rock_smash_rock", "coord": [45, 33], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_1A", "source_event": 19, "source_script": "EventScript_RockSmash" @@ -206,6 +224,7 @@ { "name": "rock_smash_rock", "coord": [25, 1], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_1B", "source_event": 20, "source_script": "EventScript_RockSmash" @@ -213,6 +232,7 @@ { "name": "rock_smash_rock", "coord": [27, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_1C", "source_event": 21, "source_script": "EventScript_RockSmash" @@ -220,6 +240,7 @@ { "name": "rock_smash_rock", "coord": [23, 2], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_1D", "source_event": 22, "source_script": "EventScript_RockSmash" @@ -227,6 +248,7 @@ { "name": "rock_smash_rock", "coord": [26, 2], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_1E", "source_event": 23, "source_script": "EventScript_RockSmash" @@ -234,6 +256,7 @@ { "name": "rock_smash_rock", "coord": [24, 7], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_1F", "source_event": 24, "source_script": "EventScript_RockSmash" @@ -241,6 +264,7 @@ { "name": "rock_smash_rock", "coord": [27, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_11", "source_event": 25, "source_script": "EventScript_RockSmash" @@ -251,6 +275,7 @@ "name": "item_ball", "coord": [2, 37], "source_event": 9, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_REVIVE", "source_script": "RockTunnel_B1F_EventScript_ItemRevive", "item": "revive" @@ -259,6 +284,7 @@ "name": "item_ball", "coord": [9, 2], "source_event": 10, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_MAX_ETHER", "source_script": "RockTunnel_B1F_EventScript_ItemMaxEther", "item": "max_ether" diff --git a/data/games/frlg/maps/base/RocketHideout_B1F.json b/data/games/frlg/maps/base/RocketHideout_B1F.json index 0dc8016..f4afc2c 100644 --- a/data/games/frlg/maps/base/RocketHideout_B1F.json +++ b/data/games/frlg/maps/base/RocketHideout_B1F.json @@ -79,6 +79,7 @@ { "name": "rocket_m", "coord": [4, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 5}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -88,6 +89,7 @@ { "name": "rocket_m", "coord": [24, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 2}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -97,6 +99,7 @@ { "name": "rocket_m", "coord": [6, 32], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -106,6 +109,7 @@ { "name": "rocket_m", "coord": [10, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -115,6 +119,7 @@ { "name": "rocket_m", "coord": [21, 27], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["north", "east"]}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", "source_event": 4, @@ -126,6 +131,7 @@ "name": "item_ball", "coord": [5, 16], "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_ESCAPE_ROPE", "source_script": "RocketHideout_B1F_EventScript_ItemEscapeRope", "item": "escape_rope" @@ -134,6 +140,7 @@ "name": "item_ball", "coord": [1, 22], "source_event": 6, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_HYPER_POTION", "source_script": "RocketHideout_B1F_EventScript_ItemHyperPotion", "item": "hyper_potion" diff --git a/data/games/frlg/maps/base/RocketHideout_B2F.json b/data/games/frlg/maps/base/RocketHideout_B2F.json index 85b14e3..4bf31b4 100644 --- a/data/games/frlg/maps/base/RocketHideout_B2F.json +++ b/data/games/frlg/maps/base/RocketHideout_B2F.json @@ -57,6 +57,7 @@ { "name": "rocket_m", "coord": [20, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", "source_event": 0, @@ -68,6 +69,7 @@ "name": "item_ball", "coord": [15, 3], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_X_SPEED", "source_script": "RocketHideout_B2F_EventScript_ItemXSpeed", "item": "x_speed" @@ -76,6 +78,7 @@ "name": "item_ball", "coord": [2, 5], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_MOON_STONE", "source_script": "RocketHideout_B2F_EventScript_ItemMoonStone", "item": "moon_stone" @@ -84,6 +87,7 @@ "name": "item_ball", "coord": [5, 7], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_TM12", "source_script": "RocketHideout_B2F_EventScript_ItemTM12", "item": "tm12" @@ -92,6 +96,7 @@ "name": "item_ball", "coord": [0, 14], "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_SUPER_POTION", "source_script": "RocketHideout_B2F_EventScript_ItemSuperPotion", "item": "super_potion" diff --git a/data/games/frlg/maps/base/RocketHideout_B3F.json b/data/games/frlg/maps/base/RocketHideout_B3F.json index 14aaaca..6766e39 100644 --- a/data/games/frlg/maps/base/RocketHideout_B3F.json +++ b/data/games/frlg/maps/base/RocketHideout_B3F.json @@ -68,6 +68,7 @@ { "name": "rocket_m", "coord": [19, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -77,6 +78,7 @@ { "name": "rocket_m", "coord": [2, 20], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -89,6 +91,7 @@ "name": "item_ball", "coord": [12, 12], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_RARE_CANDY", "source_script": "RocketHideout_B3F_EventScript_ItemRareCandy", "item": "rare_candy" @@ -97,6 +100,7 @@ "name": "item_ball", "coord": [19, 14], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_TM21", "source_script": "RocketHideout_B3F_EventScript_ItemTM21", "item": "tm21" @@ -105,6 +109,7 @@ "name": "item_ball", "coord": [14, 24], "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_BLACK_GLASSES", "source_script": "RocketHideout_B3F_EventScript_ItemBlackGlasses", "item": "black_glasses" diff --git a/data/games/frlg/maps/base/RocketHideout_B4F.json b/data/games/frlg/maps/base/RocketHideout_B4F.json index 4924cab..0c46d72 100644 --- a/data/games/frlg/maps/base/RocketHideout_B4F.json +++ b/data/games/frlg/maps/base/RocketHideout_B4F.json @@ -75,6 +75,7 @@ { "name": "giovanni", "coord": [19, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_HIDEOUT_GIOVANNI", "source_event": 0, "source_script": "RocketHideout_B4F_EventScript_Giovanni", @@ -83,6 +84,7 @@ { "name": "rocket_m", "coord": [4, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -92,6 +94,7 @@ { "name": "rocket_m", "coord": [19, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", "source_event": 4, "source_script": "RocketHideout_B4F_EventScript_Grunt3" @@ -99,6 +102,7 @@ { "name": "rocket_m", "coord": [16, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", "source_event": 5, "source_script": "RocketHideout_B4F_EventScript_Grunt2" @@ -109,6 +113,7 @@ "name": "item_ball", "coord": [20, 5], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_SCOPE", "source_script": "RocketHideout_B4F_EventScript_SilphScope", "source_local_id": "LOCALID_SILPH_SCOPE", @@ -118,6 +123,7 @@ "name": "item_ball", "coord": [3, 2], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_LIFT_KEY", "source_script": "RocketHideout_B4F_EventScript_LiftKey", "source_local_id": "LOCALID_LIFT_KEY", @@ -127,6 +133,7 @@ "name": "item_ball", "coord": [1, 6], "source_event": 6, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_TM49", "source_script": "RocketHideout_B4F_EventScript_ItemTM49", "item": "tm49" @@ -135,6 +142,7 @@ "name": "item_ball", "coord": [4, 14], "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_MAX_ETHER", "source_script": "RocketHideout_B4F_EventScript_ItemMaxEther", "item": "max_ether" @@ -143,6 +151,7 @@ "name": "item_ball", "coord": [6, 23], "source_event": 8, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_CALCIUM", "source_script": "RocketHideout_B4F_EventScript_ItemCalcium", "item": "calcium" diff --git a/data/games/frlg/maps/base/Route1.json b/data/games/frlg/maps/base/Route1.json index bf307f7..3cfb1c7 100644 --- a/data/games/frlg/maps/base/Route1.json +++ b/data/games/frlg/maps/base/Route1.json @@ -60,6 +60,7 @@ { "name": "clerk", "coord": [6, 28], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [1, 1]}, "wander": {"min": [6, 27], "max": [6, 29]}, "source_event": 0, "source_script": "Route1_EventScript_MartClerk" @@ -67,6 +68,7 @@ { "name": "boy", "coord": [19, 16], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 3]}, "wander": {"min": [18, 16], "max": [20, 16]}, "source_event": 1, "source_script": "Route1_EventScript_Boy" diff --git a/data/games/frlg/maps/base/Route10.json b/data/games/frlg/maps/base/Route10.json index 198801e..594520e 100644 --- a/data/games/frlg/maps/base/Route10.json +++ b/data/games/frlg/maps/base/Route10.json @@ -224,6 +224,7 @@ { "name": "picnicker", "coord": [7, 60], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "source_event": 0, "source_script": "Route10_EventScript_Carol" @@ -231,6 +232,7 @@ { "name": "hiker", "coord": [4, 62], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 1, "source_script": "Route10_EventScript_Clark" @@ -238,6 +240,7 @@ { "name": "poke_maniac", "coord": [15, 70], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [2, 1]}, "wander": {"min": [13, 70], "max": [17, 70]}, "trainer": {"sight": 2, "looks": ["west", "east"]}, "source_event": 2, @@ -246,6 +249,7 @@ { "name": "hiker", "coord": [4, 68], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 2}, "source_event": 3, @@ -254,6 +258,7 @@ { "name": "poke_maniac", "coord": [13, 44], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 5}, "source_event": 4, @@ -262,6 +267,7 @@ { "name": "picnicker", "coord": [9, 27], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 5, @@ -270,6 +276,7 @@ { "name": "cut_tree", "coord": [10, 20], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 6, "source_script": "EventScript_CutTree" @@ -277,6 +284,7 @@ { "name": "cut_tree", "coord": [10, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 7, "source_script": "EventScript_CutTree" @@ -284,6 +292,7 @@ { "name": "cut_tree", "coord": [10, 24], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 8, "source_script": "EventScript_CutTree" @@ -291,6 +300,7 @@ { "name": "cut_tree", "coord": [10, 26], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_15", "source_event": 9, "source_script": "EventScript_CutTree" diff --git a/data/games/frlg/maps/base/Route10_PokemonCenter_1F.json b/data/games/frlg/maps/base/Route10_PokemonCenter_1F.json index a95568a..c54b009 100644 --- a/data/games/frlg/maps/base/Route10_PokemonCenter_1F.json +++ b/data/games/frlg/maps/base/Route10_PokemonCenter_1F.json @@ -44,6 +44,7 @@ { "name": "nurse", "coord": [7, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "Route10_PokemonCenter_1F_EventScript_Nurse", "source_local_id": "LOCALID_ROUTE10_NURSE" @@ -51,6 +52,7 @@ { "name": "gentleman", "coord": [9, 4], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [8, 4], "max": [10, 4]}, "source_event": 1, "source_script": "Route10_PokemonCenter_1F_EventScript_Gentleman" @@ -58,6 +60,7 @@ { "name": "fat_man", "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [1, 3], "max": [3, 3]}, "source_event": 2, "source_script": "Route10_PokemonCenter_1F_EventScript_FatMan" @@ -65,12 +68,14 @@ { "name": "youngster", "coord": [14, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 3, "source_script": "Route10_PokemonCenter_1F_EventScript_Youngster" }, { "name": "scientist", "coord": [12, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 4, "source_script": "Route10_PokemonCenter_1F_EventScript_Aide" } diff --git a/data/games/frlg/maps/base/Route11.json b/data/games/frlg/maps/base/Route11.json index 2a96466..66636f0 100644 --- a/data/games/frlg/maps/base/Route11.json +++ b/data/games/frlg/maps/base/Route11.json @@ -86,6 +86,7 @@ { "name": "youngster", "coord": [19, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["south", "west"]}, "source_event": 0, "source_script": "Route11_EventScript_Eddie" @@ -93,6 +94,7 @@ { "name": "old_man_1", "coord": [16, 17], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 1, "source_script": "Route11_EventScript_Hugo" @@ -100,6 +102,7 @@ { "name": "youngster", "coord": [31, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["north", "west"]}, "source_event": 2, "source_script": "Route11_EventScript_Dillon" @@ -107,6 +110,8 @@ { "name": "youngster", "coord": [28, 10], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP", "range": [8, 4]}, + "wander": {"min": [20, 6], "max": [36, 14]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 3, "source_script": "Route11_EventScript_Dave" @@ -114,6 +119,7 @@ { "name": "old_man_1", "coord": [38, 15], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 4, "source_script": "Route11_EventScript_Jasper" @@ -121,6 +127,7 @@ { "name": "old_man_1", "coord": [50, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 5, "source_script": "Route11_EventScript_Darian" @@ -128,6 +135,7 @@ { "name": "balding_man", "coord": [42, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["west", "east"]}, "source_event": 6, "source_script": "Route11_EventScript_Braxton" @@ -135,6 +143,8 @@ { "name": "youngster", "coord": [50, 14], + "movement": {"type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "range": [1, 4]}, + "wander": {"min": [50, 10], "max": [50, 18]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 7, "source_script": "Route11_EventScript_Yasu" @@ -142,6 +152,7 @@ { "name": "old_man_1", "coord": [57, 16], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 8, "source_script": "Route11_EventScript_Dirk" @@ -149,6 +160,7 @@ { "name": "balding_man", "coord": [32, 18], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 6, "looks": ["west", "east"]}, "source_event": 9, "source_script": "Route11_EventScript_Bernie" @@ -159,6 +171,7 @@ "name": "item_ball", "coord": [42, 12], "source_event": 10, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE11_X_DEFEND", "source_script": "Route11_EventScript_ItemXDefend", "item": "x_defend" @@ -167,6 +180,7 @@ "name": "item_ball", "coord": [63, 13], "source_event": 11, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE11_GREAT_BALL", "source_script": "Route11_EventScript_ItemGreatBall", "item": "great_ball" @@ -175,6 +189,7 @@ "name": "item_ball", "coord": [13, 3], "source_event": 12, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE11_AWAKENING", "source_script": "Route11_EventScript_ItemAwakening", "item": "awakening" diff --git a/data/games/frlg/maps/base/Route11_EastEntrance_1F.json b/data/games/frlg/maps/base/Route11_EastEntrance_1F.json index 53d7b4a..acccc9d 100644 --- a/data/games/frlg/maps/base/Route11_EastEntrance_1F.json +++ b/data/games/frlg/maps/base/Route11_EastEntrance_1F.json @@ -35,12 +35,14 @@ { "name": "policeman", "coord": [6, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "Route11_EastEntrance_1F_EventScript_TopGuard" }, { "name": "policeman", "coord": [4, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 1, "source_script": "Route11_EastEntrance_1F_EventScript_BottomGuard" } diff --git a/data/games/frlg/maps/base/Route12.json b/data/games/frlg/maps/base/Route12.json index 839f89b..f6a905b 100644 --- a/data/games/frlg/maps/base/Route12.json +++ b/data/games/frlg/maps/base/Route12.json @@ -303,6 +303,7 @@ { "name": "fisher", "coord": [17, 32], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["south", "north"]}, "source_event": 0, "source_script": "Route12_EventScript_Ned" @@ -310,6 +311,7 @@ { "name": "fisher", "coord": [9, 40], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["west", "east"]}, "source_event": 1, "source_script": "Route12_EventScript_Chip" @@ -317,6 +319,7 @@ { "name": "fisher", "coord": [16, 47], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["south", "west"]}, "source_event": 2, "source_script": "Route12_EventScript_Hank" @@ -324,6 +327,7 @@ { "name": "fisher", "coord": [13, 59], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["south", "north"]}, "source_event": 3, "source_script": "Route12_EventScript_Elliot" @@ -331,6 +335,7 @@ { "name": "snorlax", "coord": [14, 70], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE_12_SNORLAX", "source_event": 4, "source_script": "Route12_EventScript_Snorlax" @@ -338,6 +343,8 @@ { "name": "rocker", "coord": [13, 92], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT", "range": [4, 4]}, + "wander": {"min": [9, 88], "max": [17, 96]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 5, "source_script": "Route12_EventScript_Luca" @@ -345,6 +352,7 @@ { "name": "camper", "coord": [10, 99], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 6, @@ -353,6 +361,7 @@ { "name": "fisher", "coord": [18, 108], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["west", "east"]}, "source_event": 7, "source_script": "Route12_EventScript_Andrew" @@ -360,15 +369,29 @@ { "name": "cut_tree", "coord": [11, 100], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 8, "source_script": "EventScript_CutTree" }, - {"name": "beauty", "coord": [19, 64], "source_event": 11, "source_script": "Route12_EventScript_Gia"}, - {"name": "man", "coord": [19, 63], "source_event": 12, "source_script": "Route12_EventScript_Jes"}, + { + "name": "beauty", + "coord": [19, 64], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 11, + "source_script": "Route12_EventScript_Gia" + }, + { + "name": "man", + "coord": [19, 63], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 12, + "source_script": "Route12_EventScript_Jes" + }, { "name": "cut_tree", "coord": [12, 111], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 13, "source_script": "EventScript_CutTree" @@ -379,6 +402,7 @@ "name": "item_ball", "coord": [18, 36], "source_event": 9, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE12_TM48", "source_script": "Route12_EventScript_ItemTM48", "item": "tm48" @@ -387,6 +411,7 @@ "name": "item_ball", "coord": [9, 101], "source_event": 10, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE12_IRON", "source_script": "Route12_EventScript_ItemIron", "item": "iron" diff --git a/data/games/frlg/maps/base/Route12_NorthEntrance_1F.json b/data/games/frlg/maps/base/Route12_NorthEntrance_1F.json index 0dff864..d593b20 100644 --- a/data/games/frlg/maps/base/Route12_NorthEntrance_1F.json +++ b/data/games/frlg/maps/base/Route12_NorthEntrance_1F.json @@ -36,6 +36,7 @@ { "name": "policeman", "coord": [1, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 0, "source_script": "Route12_NorthEntrance_1F_EventScript_Guard" } diff --git a/data/games/frlg/maps/base/Route13.json b/data/games/frlg/maps/base/Route13.json index 79f676e..02f2f46 100644 --- a/data/games/frlg/maps/base/Route13.json +++ b/data/games/frlg/maps/base/Route13.json @@ -64,6 +64,7 @@ { "name": "picnicker", "coord": [62, 6], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [61, 5], "max": [63, 7]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 0, @@ -72,6 +73,7 @@ { "name": "rocker", "coord": [63, 12], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [62, 11], "max": [64, 13]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 1, @@ -80,6 +82,7 @@ { "name": "picnicker", "coord": [54, 11], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [53, 10], "max": [55, 12]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 2, @@ -88,6 +91,7 @@ { "name": "beauty", "coord": [42, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 3, @@ -96,6 +100,7 @@ { "name": "beauty", "coord": [43, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 4, @@ -104,6 +109,7 @@ { "name": "picnicker", "coord": [35, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 5, @@ -112,6 +118,7 @@ { "name": "picnicker", "coord": [29, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 6, @@ -120,6 +127,7 @@ { "name": "rocker", "coord": [9, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 3}, "source_event": 7, @@ -128,6 +136,7 @@ { "name": "rocker", "coord": [16, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 3}, "source_event": 8, @@ -136,6 +145,7 @@ { "name": "biker", "coord": [14, 8], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 9, "source_script": "Route13_EventScript_Jared" @@ -143,6 +153,7 @@ { "name": "cut_tree", "coord": [44, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 10, "source_script": "EventScript_CutTree" diff --git a/data/games/frlg/maps/base/Route14.json b/data/games/frlg/maps/base/Route14.json index 185fb44..4721ae1 100644 --- a/data/games/frlg/maps/base/Route14.json +++ b/data/games/frlg/maps/base/Route14.json @@ -151,6 +151,7 @@ { "name": "biker", "coord": [7, 37], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 0, @@ -159,6 +160,7 @@ { "name": "rocker", "coord": [18, 35], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 2]}, "wander": {"min": [16, 33], "max": [20, 37]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 1, @@ -167,6 +169,7 @@ { "name": "rocker", "coord": [10, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 2, @@ -175,6 +178,7 @@ { "name": "rocker", "coord": [16, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 3}, "source_event": 3, @@ -183,6 +187,7 @@ { "name": "biker", "coord": [7, 31], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 4, @@ -191,6 +196,7 @@ { "name": "biker", "coord": [7, 34], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 5, @@ -199,6 +205,7 @@ { "name": "rocker", "coord": [8, 9], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [7, 9], "max": [9, 9]}, "trainer": {"sight": 1, "looks": ["west", "east"]}, "source_event": 6, @@ -207,6 +214,7 @@ { "name": "rocker", "coord": [7, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 1}, "source_event": 7, @@ -215,6 +223,8 @@ { "name": "biker", "coord": [10, 37], + "movement": {"type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "range": [1, 6]}, + "wander": {"min": [10, 31], "max": [10, 43]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 8, "source_script": "Route14_EventScript_Lukas" @@ -222,6 +232,7 @@ { "name": "rocker", "coord": [18, 47], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 2]}, "wander": {"min": [16, 45], "max": [20, 49]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 9, @@ -230,6 +241,7 @@ { "name": "cut_tree", "coord": [7, 26], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 10, "source_script": "EventScript_CutTree" @@ -237,6 +249,7 @@ { "name": "cut_tree", "coord": [12, 35], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 11, "source_script": "EventScript_CutTree" @@ -244,6 +257,7 @@ { "name": "cut_tree", "coord": [1, 47], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 12, "source_script": "EventScript_CutTree", @@ -252,6 +266,7 @@ { "name": "little_girl", "coord": [13, 51], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 13, @@ -260,6 +275,7 @@ { "name": "little_girl", "coord": [12, 51], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 14, diff --git a/data/games/frlg/maps/base/Route15.json b/data/games/frlg/maps/base/Route15.json index abb6368..5a18703 100644 --- a/data/games/frlg/maps/base/Route15.json +++ b/data/games/frlg/maps/base/Route15.json @@ -55,6 +55,7 @@ { "name": "picnicker", "coord": [22, 13], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [21, 12], "max": [23, 14]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 0, @@ -63,6 +64,7 @@ { "name": "rocker", "coord": [31, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 5}, "source_event": 1, @@ -71,6 +73,7 @@ { "name": "rocker", "coord": [37, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 2}, "source_event": 2, @@ -79,6 +82,7 @@ { "name": "picnicker", "coord": [44, 13], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [43, 12], "max": [45, 14]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 3, @@ -87,6 +91,7 @@ { "name": "beauty", "coord": [50, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 4, @@ -95,6 +100,7 @@ { "name": "biker", "coord": [59, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["south", "east"]}, "source_event": 5, "source_script": "Route15_EventScript_Alex" @@ -102,6 +108,7 @@ { "name": "biker", "coord": [63, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["south", "north"]}, "source_event": 6, "source_script": "Route15_EventScript_Ernest" @@ -109,6 +116,7 @@ { "name": "picnicker", "coord": [52, 8], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 4]}, "wander": {"min": [50, 4], "max": [54, 12]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 7, @@ -117,6 +125,7 @@ { "name": "beauty", "coord": [54, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 8, @@ -125,6 +134,7 @@ { "name": "picnicker", "coord": [28, 6], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 4]}, "wander": {"min": [26, 2], "max": [30, 10]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 9, @@ -133,6 +143,7 @@ { "name": "black_belt", "coord": [39, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 11, @@ -141,6 +152,7 @@ { "name": "crush_girl", "coord": [40, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 12, @@ -152,6 +164,7 @@ "name": "item_ball", "coord": [20, 6], "source_event": 10, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE15_TM18", "source_script": "Route15_EventScript_ItemTM18", "item": "tm18" diff --git a/data/games/frlg/maps/base/Route15_WestEntrance_1F.json b/data/games/frlg/maps/base/Route15_WestEntrance_1F.json index 86eeafe..8345642 100644 --- a/data/games/frlg/maps/base/Route15_WestEntrance_1F.json +++ b/data/games/frlg/maps/base/Route15_WestEntrance_1F.json @@ -35,6 +35,7 @@ { "name": "policeman", "coord": [6, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "Route15_WestEntrance_1F_EventScript_Guard" } diff --git a/data/games/frlg/maps/base/Route16.json b/data/games/frlg/maps/base/Route16.json index ba778b5..19a5585 100644 --- a/data/games/frlg/maps/base/Route16.json +++ b/data/games/frlg/maps/base/Route16.json @@ -77,6 +77,7 @@ { "name": "biker", "coord": [16, 12], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 0, "source_script": "Route16_EventScript_Lao" @@ -84,6 +85,7 @@ { "name": "biker", "coord": [14, 14], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 1, "source_script": "Route16_EventScript_Koji" @@ -91,6 +93,7 @@ { "name": "biker", "coord": [12, 12], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 2, "source_script": "Route16_EventScript_Luke" @@ -98,6 +101,7 @@ { "name": "biker", "coord": [8, 12], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 3, "source_script": "Route16_EventScript_Ruben" @@ -105,6 +109,7 @@ { "name": "biker", "coord": [10, 14], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 4, "source_script": "Route16_EventScript_Hideo" @@ -112,6 +117,7 @@ { "name": "biker", "coord": [6, 14], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 5, "source_script": "Route16_EventScript_Camron" @@ -119,6 +125,7 @@ { "name": "cut_tree", "coord": [41, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 6, "source_script": "EventScript_CutTree", @@ -127,6 +134,7 @@ { "name": "beauty", "coord": [30, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 7, @@ -135,6 +143,7 @@ { "name": "man", "coord": [31, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 8, @@ -143,6 +152,7 @@ { "name": "snorlax", "coord": [31, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE_16_SNORLAX", "source_event": 9, "source_script": "Route16_EventScript_Snorlax" diff --git a/data/games/frlg/maps/base/Route16_House.json b/data/games/frlg/maps/base/Route16_House.json index 7ff0b74..a8d1cdb 100644 --- a/data/games/frlg/maps/base/Route16_House.json +++ b/data/games/frlg/maps/base/Route16_House.json @@ -31,6 +31,7 @@ { "name": "woman_1", "coord": [4, 2], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [3, 1], "max": [5, 3]}, "source_event": 0, "source_script": "Route16_House_EventScript_Woman" @@ -38,6 +39,7 @@ { "name": "fearow", "coord": [9, 3], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [8, 2], "max": [10, 4]}, "source_event": 1, "source_script": "Route16_House_EventScript_Fearow" diff --git a/data/games/frlg/maps/base/Route16_NorthEntrance_1F.json b/data/games/frlg/maps/base/Route16_NorthEntrance_1F.json index f714263..16ba486 100644 --- a/data/games/frlg/maps/base/Route16_NorthEntrance_1F.json +++ b/data/games/frlg/maps/base/Route16_NorthEntrance_1F.json @@ -41,12 +41,14 @@ { "name": "policeman", "coord": [6, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "Route16_NorthEntrance_1F_EventScript_Guard" }, { "name": "old_man_1", "coord": [7, 4], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [6, 4], "max": [8, 4]}, "source_event": 1, "source_script": "Route16_NorthEntrance_1F_EventScript_OldMan" diff --git a/data/games/frlg/maps/base/Route18.json b/data/games/frlg/maps/base/Route18.json index 37d19f3..62a472a 100644 --- a/data/games/frlg/maps/base/Route18.json +++ b/data/games/frlg/maps/base/Route18.json @@ -64,6 +64,7 @@ { "name": "rocker", "coord": [46, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 4}, "source_event": 0, @@ -72,6 +73,7 @@ { "name": "rocker", "coord": [41, 15], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 1, "source_script": "Route18_EventScript_Ramiro" @@ -79,6 +81,7 @@ { "name": "rocker", "coord": [39, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 6}, "source_event": 2, diff --git a/data/games/frlg/maps/base/Route18_EastEntrance_1F.json b/data/games/frlg/maps/base/Route18_EastEntrance_1F.json index a656b36..2c4ee28 100644 --- a/data/games/frlg/maps/base/Route18_EastEntrance_1F.json +++ b/data/games/frlg/maps/base/Route18_EastEntrance_1F.json @@ -33,6 +33,7 @@ { "name": "policeman", "coord": [6, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "Route18_EastEntrance_1F_EventScript_Guard" } diff --git a/data/games/frlg/maps/base/Route19.json b/data/games/frlg/maps/base/Route19.json index 3285510..ecfd49d 100644 --- a/data/games/frlg/maps/base/Route19.json +++ b/data/games/frlg/maps/base/Route19.json @@ -141,6 +141,7 @@ { "name": "swimmer_m_land", "coord": [15, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [6, 3]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 0, @@ -149,6 +150,7 @@ { "name": "swimmer_m_land", "coord": [10, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 3}, "source_event": 1, @@ -157,6 +159,7 @@ { "name": "swimmer_m_water", "coord": [12, 17], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["north", "east", "south", "west"]}, "source_event": 2, "source_script": "Route19_EventScript_Tony" @@ -164,6 +167,8 @@ { "name": "swimmer_m_water", "coord": [18, 33], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "range": [5, 3]}, + "wander": {"min": [13, 30], "max": [23, 36]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 3, "source_script": "Route19_EventScript_Matthew" @@ -171,6 +176,7 @@ { "name": "swimmer_m_water", "coord": [8, 27], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 2]}, "wander": {"min": [6, 25], "max": [10, 29]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 4, @@ -179,6 +185,7 @@ { "name": "swimmer_m_water", "coord": [16, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 6, "looks": ["west", "east"]}, "source_event": 5, "source_script": "Route19_EventScript_David" @@ -186,6 +193,7 @@ { "name": "swimmer_m_water", "coord": [11, 47], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 6, "source_script": "Route19_EventScript_Axle" @@ -193,6 +201,7 @@ { "name": "swimmer_f_water", "coord": [14, 48], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 7, "source_script": "Route19_EventScript_Alice" @@ -200,6 +209,7 @@ { "name": "swimmer_f_water", "coord": [12, 49], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 8, "source_script": "Route19_EventScript_Connie" @@ -207,6 +217,7 @@ { "name": "swimmer_f_water", "coord": [9, 48], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 9, "source_script": "Route19_EventScript_Anya" @@ -214,6 +225,7 @@ { "name": "swimmer_f_water", "coord": [8, 41], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 10, @@ -222,6 +234,7 @@ { "name": "tuber_m_water", "coord": [9, 41], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 11, diff --git a/data/games/frlg/maps/base/Route2.json b/data/games/frlg/maps/base/Route2.json index 7b34b3c..75ef459 100644 --- a/data/games/frlg/maps/base/Route2.json +++ b/data/games/frlg/maps/base/Route2.json @@ -130,6 +130,7 @@ { "name": "cut_tree", "coord": [16, 62], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 0, "source_script": "EventScript_CutTree" @@ -137,6 +138,7 @@ { "name": "cut_tree", "coord": [15, 69], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 1, "source_script": "EventScript_CutTree" @@ -144,6 +146,7 @@ { "name": "cut_tree", "coord": [11, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_15", "source_event": 2, "source_script": "EventScript_CutTree" @@ -151,6 +154,7 @@ { "name": "cut_tree", "coord": [18, 26], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_16", "source_event": 3, "source_script": "EventScript_CutTree" @@ -161,6 +165,7 @@ "name": "item_ball", "coord": [17, 54], "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE2_ETHER", "source_script": "Route2_EventScript_ItemEther", "item": "ether" @@ -169,6 +174,7 @@ "name": "item_ball", "coord": [17, 64], "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE2_PARALYZE_HEAL", "source_script": "Route2_EventScript_ItemParalyzeHeal", "item": "paralyze_heal" diff --git a/data/games/frlg/maps/base/Route20.json b/data/games/frlg/maps/base/Route20.json index e73c851..4943ddf 100644 --- a/data/games/frlg/maps/base/Route20.json +++ b/data/games/frlg/maps/base/Route20.json @@ -73,6 +73,7 @@ { "name": "swimmer_f_water", "coord": [8, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["south", "north"]}, "source_event": 0, "source_script": "Route20_EventScript_Melissa" @@ -80,6 +81,7 @@ { "name": "picnicker", "coord": [16, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 1, @@ -88,6 +90,7 @@ { "name": "swimmer_f_water", "coord": [34, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 2, @@ -96,6 +99,7 @@ { "name": "rocker", "coord": [43, 9], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [42, 8], "max": [44, 10]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 3, @@ -104,6 +108,8 @@ { "name": "swimmer_m_water", "coord": [23, 10], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "range": [5, 4]}, + "wander": {"min": [18, 6], "max": [28, 14]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 4, "source_script": "Route20_EventScript_Dean" @@ -111,6 +117,7 @@ { "name": "picnicker", "coord": [73, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 2}, "source_event": 5, @@ -119,6 +126,8 @@ { "name": "swimmer_m_water", "coord": [111, 9], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", "range": [5, 3]}, + "wander": {"min": [106, 6], "max": [116, 12]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 6, "source_script": "Route20_EventScript_Barry" @@ -126,6 +135,8 @@ { "name": "swimmer_m_water", "coord": [106, 11], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "range": [5, 3]}, + "wander": {"min": [101, 8], "max": [111, 14]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 7, "source_script": "Route20_EventScript_Darrin" @@ -133,6 +144,7 @@ { "name": "swimmer_f_water", "coord": [93, 10], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 5, "looks": ["north", "east", "south", "west"]}, "source_event": 8, "source_script": "Route20_EventScript_Shirley" @@ -140,6 +152,7 @@ { "name": "swimmer_f_water", "coord": [54, 11], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 9, "source_script": "Route20_EventScript_Tiffany" @@ -147,6 +160,7 @@ { "name": "camper", "coord": [69, 3], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [2, 1]}, "wander": {"min": [67, 3], "max": [71, 3]}, "source_event": 10, "source_script": "Route20_EventScript_Camper" diff --git a/data/games/frlg/maps/base/Route21_North.json b/data/games/frlg/maps/base/Route21_North.json index 99260bd..6c26bc6 100644 --- a/data/games/frlg/maps/base/Route21_North.json +++ b/data/games/frlg/maps/base/Route21_North.json @@ -127,11 +127,25 @@ } ], "npcs": [ - {"name": "fisher", "coord": [7, 27], "source_event": 0, "source_script": "Route21_North_EventScript_Ronald"}, - {"name": "fisher", "coord": [16, 26], "source_event": 1, "source_script": "Route21_North_EventScript_Wade"}, + { + "name": "fisher", + "coord": [7, 27], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 0, + "source_script": "Route21_North_EventScript_Ronald" + }, + { + "name": "fisher", + "coord": [16, 26], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 1, + "source_script": "Route21_North_EventScript_Wade" + }, { "name": "swimmer_m_water", "coord": [12, 44], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "range": [4, 2]}, + "wander": {"min": [8, 42], "max": [16, 46]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 2, "source_script": "Route21_North_EventScript_Spencer" @@ -139,6 +153,7 @@ { "name": "swimmer_f_water", "coord": [14, 35], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 3, @@ -147,6 +162,7 @@ { "name": "tuber_m_water", "coord": [15, 35], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 4, diff --git a/data/games/frlg/maps/base/Route21_South.json b/data/games/frlg/maps/base/Route21_South.json index 6ce7c43..d309b56 100644 --- a/data/games/frlg/maps/base/Route21_South.json +++ b/data/games/frlg/maps/base/Route21_South.json @@ -118,11 +118,24 @@ {"side": "south", "to_map": "CinnabarIsland", "offset": 0} ], "npcs": [ - {"name": "fisher", "coord": [11, 8], "source_event": 0, "source_script": "Route21_South_EventScript_Claude"}, - {"name": "fisher", "coord": [14, 15], "source_event": 1, "source_script": "Route21_South_EventScript_Nolan"}, + { + "name": "fisher", + "coord": [11, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 0, + "source_script": "Route21_South_EventScript_Claude" + }, + { + "name": "fisher", + "coord": [14, 15], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 1, + "source_script": "Route21_South_EventScript_Nolan" + }, { "name": "swimmer_m_water", "coord": [15, 24], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["west", "east"]}, "source_event": 2, "source_script": "Route21_South_EventScript_Jack" @@ -130,6 +143,7 @@ { "name": "swimmer_m_water", "coord": [15, 38], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 3, @@ -138,6 +152,7 @@ { "name": "swimmer_m_water", "coord": [10, 29], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 2]}, "wander": {"min": [8, 27], "max": [12, 31]}, "trainer": {"sight": 4, "looks": ["north", "east", "south", "west"]}, "source_event": 4, diff --git a/data/games/frlg/maps/base/Route22.json b/data/games/frlg/maps/base/Route22.json index af9c6e8..1934bfb 100644 --- a/data/games/frlg/maps/base/Route22.json +++ b/data/games/frlg/maps/base/Route22.json @@ -72,6 +72,7 @@ { "name": "blue", "coord": [25, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE_22_RIVAL", "source_event": 0, "source_script": "0x0", diff --git a/data/games/frlg/maps/base/Route22_NorthEntrance.json b/data/games/frlg/maps/base/Route22_NorthEntrance.json index a37d579..cc805c0 100644 --- a/data/games/frlg/maps/base/Route22_NorthEntrance.json +++ b/data/games/frlg/maps/base/Route22_NorthEntrance.json @@ -35,6 +35,7 @@ { "name": "policeman", "coord": [8, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "Route22_NorthEntrance_EventScript_BoulderBadgeGuard" } diff --git a/data/games/frlg/maps/base/Route23.json b/data/games/frlg/maps/base/Route23.json index 6a63c31..26c4c29 100644 --- a/data/games/frlg/maps/base/Route23.json +++ b/data/games/frlg/maps/base/Route23.json @@ -404,6 +404,7 @@ { "name": "policeman", "coord": [15, 149], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "Route23_EventScript_CascadeBadgeGuard", "source_local_id": "LOCALID_CASCADE_BADGE_GUARD" @@ -411,6 +412,7 @@ { "name": "policeman", "coord": [8, 140], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 1, "source_script": "Route23_EventScript_ThunderBadgeGuard", "source_local_id": "LOCALID_THUNDER_BADGE_GUARD" @@ -418,6 +420,7 @@ { "name": "policeman", "coord": [14, 123], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 2, "source_script": "Route23_EventScript_RainbowBadgeGuard", "source_local_id": "LOCALID_RAINBOW_BADGE_GUARD" @@ -425,6 +428,7 @@ { "name": "policeman", "coord": [16, 112], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 3, "source_script": "Route23_EventScript_SoulBadgeGuard", "source_local_id": "LOCALID_SOUL_BADGE_GUARD" @@ -432,6 +436,7 @@ { "name": "policeman", "coord": [10, 94], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 4, "source_script": "Route23_EventScript_MarshBadgeGuard", "source_local_id": "LOCALID_MARSH_BADGE_GUARD" @@ -439,6 +444,7 @@ { "name": "policeman", "coord": [14, 61], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 5, "source_script": "Route23_EventScript_VolcanoBadgeGuard", "source_local_id": "LOCALID_VOLCANO_BADGE_GUARD" @@ -446,6 +452,7 @@ { "name": "policeman", "coord": [6, 35], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 6, "source_script": "Route23_EventScript_EarthBadgeGuard", "source_local_id": "LOCALID_EARTH_BADGE_GUARD" diff --git a/data/games/frlg/maps/base/Route24.json b/data/games/frlg/maps/base/Route24.json index d2465d6..48caa49 100644 --- a/data/games/frlg/maps/base/Route24.json +++ b/data/games/frlg/maps/base/Route24.json @@ -122,6 +122,7 @@ { "name": "man", "coord": [12, 15], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_NUGGET_BRIDGE_ROCKET", "source_event": 0, "source_script": "Route24_EventScript_Rocket", @@ -130,6 +131,7 @@ { "name": "camper", "coord": [12, 19], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 2}, "source_event": 1, @@ -138,6 +140,7 @@ { "name": "lass", "coord": [10, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 2, @@ -146,6 +149,7 @@ { "name": "youngster", "coord": [12, 25], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 2}, "source_event": 3, @@ -154,6 +158,7 @@ { "name": "lass", "coord": [10, 28], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 4, @@ -162,6 +167,7 @@ { "name": "bug_catcher", "coord": [12, 31], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 2}, "source_event": 5, @@ -170,6 +176,7 @@ { "name": "camper", "coord": [5, 21], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 5}, "source_event": 6, @@ -181,6 +188,7 @@ "name": "item_ball", "coord": [11, 4], "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE24_TM45", "source_script": "Route24_EventScript_ItemTM45", "item": "tm45" diff --git a/data/games/frlg/maps/base/Route25.json b/data/games/frlg/maps/base/Route25.json index b2a31f0..de08096 100644 --- a/data/games/frlg/maps/base/Route25.json +++ b/data/games/frlg/maps/base/Route25.json @@ -88,6 +88,7 @@ { "name": "hiker", "coord": [11, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 0, @@ -96,6 +97,7 @@ { "name": "youngster", "coord": [18, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 1, @@ -104,6 +106,7 @@ { "name": "hiker", "coord": [17, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 2, @@ -112,6 +115,7 @@ { "name": "youngster", "coord": [22, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "source_event": 3, "source_script": "Route25_EventScript_Dan" @@ -119,6 +123,7 @@ { "name": "picnicker", "coord": [22, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 4, @@ -127,6 +132,7 @@ { "name": "hiker", "coord": [27, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 3}, "source_event": 5, @@ -135,6 +141,7 @@ { "name": "camper", "coord": [28, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 6, @@ -143,6 +150,8 @@ { "name": "youngster", "coord": [36, 4], + "movement": {"type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "range": [1, 3]}, + "wander": {"min": [36, 1], "max": [36, 7]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "source_event": 7, "source_script": "Route25_EventScript_Chad" @@ -150,6 +159,7 @@ { "name": "lass", "coord": [42, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 8, @@ -158,18 +168,32 @@ { "name": "cut_tree", "coord": [30, 3], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 10, "source_script": "EventScript_CutTree" }, - {"name": "beauty", "coord": [49, 10], "source_event": 11, "source_script": "Route25_EventScript_Beauty"}, - {"name": "man", "coord": [49, 11], "source_event": 12, "source_script": "Route25_EventScript_Man"} + { + "name": "beauty", + "coord": [49, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 11, + "source_script": "Route25_EventScript_Beauty" + }, + { + "name": "man", + "coord": [49, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 12, + "source_script": "Route25_EventScript_Man" + } ], "items": [ { "name": "item_ball", "coord": [26, 2], "source_event": 9, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE25_TM43", "source_script": "Route25_EventScript_ItemTM43", "item": "tm43" diff --git a/data/games/frlg/maps/base/Route25_SeaCottage.json b/data/games/frlg/maps/base/Route25_SeaCottage.json index 922124e..589ed49 100644 --- a/data/games/frlg/maps/base/Route25_SeaCottage.json +++ b/data/games/frlg/maps/base/Route25_SeaCottage.json @@ -33,6 +33,7 @@ { "name": "bill", "coord": [7, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE", "source_event": 0, "source_script": "Route25_SeaCottage_EventScript_Bill", @@ -41,6 +42,7 @@ { "name": "clefairy", "coord": [10, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_BILL_CLEFAIRY", "source_event": 1, "source_script": "Route25_SeaCottage_EventScript_Bill", diff --git a/data/games/frlg/maps/base/Route2_EastBuilding.json b/data/games/frlg/maps/base/Route2_EastBuilding.json index 8c69fe2..07fa5fd 100644 --- a/data/games/frlg/maps/base/Route2_EastBuilding.json +++ b/data/games/frlg/maps/base/Route2_EastBuilding.json @@ -31,10 +31,17 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "scientist", "coord": [4, 6], "source_event": 0, "source_script": "Route2_EastBuilding_EventScript_Aide"}, + { + "name": "scientist", + "coord": [4, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 0, + "source_script": "Route2_EastBuilding_EventScript_Aide" + }, { "name": "rocker", "coord": [10, 3], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [2, 1]}, "wander": {"min": [8, 3], "max": [12, 3]}, "source_event": 1, "source_script": "Route2_EastBuilding_EventScript_Rocker" diff --git a/data/games/frlg/maps/base/Route2_ViridianForest_NorthEntrance.json b/data/games/frlg/maps/base/Route2_ViridianForest_NorthEntrance.json index c4025ad..fafb942 100644 --- a/data/games/frlg/maps/base/Route2_ViridianForest_NorthEntrance.json +++ b/data/games/frlg/maps/base/Route2_ViridianForest_NorthEntrance.json @@ -34,18 +34,21 @@ { "name": "youngster", "coord": [5, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 0, "source_script": "Route2_ViridianForest_NorthEntrance_EventScript_Youngster" }, { "name": "old_man_1", "coord": [4, 7], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 1, "source_script": "Route2_ViridianForest_NorthEntrance_EventScript_OldMan" }, { "name": "cooltrainer_f", "coord": [10, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 2, "source_script": "Route2_ViridianForest_NorthEntrance_EventScript_CooltrainerF" } diff --git a/data/games/frlg/maps/base/Route2_ViridianForest_SouthEntrance.json b/data/games/frlg/maps/base/Route2_ViridianForest_SouthEntrance.json index b9f087e..5754f66 100644 --- a/data/games/frlg/maps/base/Route2_ViridianForest_SouthEntrance.json +++ b/data/games/frlg/maps/base/Route2_ViridianForest_SouthEntrance.json @@ -34,12 +34,14 @@ { "name": "woman_2", "coord": [10, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 0, "source_script": "Route2_ViridianForest_SouthEntrance_EventScript_Woman1" }, { "name": "woman_1", "coord": [4, 7], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [3, 6], "max": [5, 8]}, "source_event": 1, "source_script": "Route2_ViridianForest_SouthEntrance_EventScript_Woman2" diff --git a/data/games/frlg/maps/base/Route3.json b/data/games/frlg/maps/base/Route3.json index 01e07b6..204f8c6 100644 --- a/data/games/frlg/maps/base/Route3.json +++ b/data/games/frlg/maps/base/Route3.json @@ -46,10 +46,17 @@ } ], "npcs": [ - {"name": "youngster", "coord": [70, 13], "source_event": 0, "source_script": "Route3_EventScript_Youngster"}, + { + "name": "youngster", + "coord": [70, 13], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 0, + "source_script": "Route3_EventScript_Youngster" + }, { "name": "lass", "coord": [40, 11], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [1, 1]}, "wander": {"min": [40, 10], "max": [40, 12]}, "trainer": {"sight": 3, "looks": ["north", "south"]}, "source_event": 1, @@ -58,6 +65,7 @@ { "name": "bug_catcher", "coord": [32, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 2, @@ -66,6 +74,7 @@ { "name": "lass", "coord": [30, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 5}, "source_event": 3, @@ -74,6 +83,7 @@ { "name": "bug_catcher", "coord": [25, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 4, @@ -82,6 +92,7 @@ { "name": "youngster", "coord": [29, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 5}, "source_event": 5, @@ -90,6 +101,7 @@ { "name": "lass", "coord": [19, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 5}, "source_event": 6, @@ -98,6 +110,7 @@ { "name": "bug_catcher", "coord": [12, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 3}, "source_event": 7, @@ -106,6 +119,7 @@ { "name": "youngster", "coord": [17, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 8, diff --git a/data/games/frlg/maps/base/Route4.json b/data/games/frlg/maps/base/Route4.json index d63e02c..434232b 100644 --- a/data/games/frlg/maps/base/Route4.json +++ b/data/games/frlg/maps/base/Route4.json @@ -100,6 +100,7 @@ { "name": "woman_1", "coord": [9, 8], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [8, 7], "max": [10, 9]}, "source_event": 0, "source_script": "Route4_EventScript_Woman" @@ -107,6 +108,7 @@ { "name": "lass", "coord": [75, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 1, @@ -115,18 +117,32 @@ { "name": "boy", "coord": [15, 14], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [14, 14], "max": [16, 14]}, "source_event": 3, "source_script": "Route4_EventScript_Boy" }, - {"name": "black_belt", "coord": [47, 3], "source_event": 4, "source_script": "Route4_EventScript_MegaPunchTutor"}, - {"name": "black_belt", "coord": [50, 3], "source_event": 5, "source_script": "Route4_EventScript_MegaKickTutor"} + { + "name": "black_belt", + "coord": [47, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 4, + "source_script": "Route4_EventScript_MegaPunchTutor" + }, + { + "name": "black_belt", + "coord": [50, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 5, + "source_script": "Route4_EventScript_MegaKickTutor" + } ], "items": [ { "name": "item_ball", "coord": [67, 5], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE4_TM05", "source_script": "Route4_EventScript_ItemTM05", "item": "tm05" diff --git a/data/games/frlg/maps/base/Route4_PokemonCenter_1F.json b/data/games/frlg/maps/base/Route4_PokemonCenter_1F.json index 08382b7..c0a26d5 100644 --- a/data/games/frlg/maps/base/Route4_PokemonCenter_1F.json +++ b/data/games/frlg/maps/base/Route4_PokemonCenter_1F.json @@ -44,6 +44,7 @@ { "name": "nurse", "coord": [7, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "Route4_PokemonCenter_1F_EventScript_Nurse", "source_local_id": "LOCALID_ROUTE4_NURSE" @@ -51,18 +52,21 @@ { "name": "balding_man", "coord": [1, 3], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 1, "source_script": "Route4_PokemonCenter_1F_EventScript_MagikarpSalesman" }, { "name": "gentleman", "coord": [12, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 2, "source_script": "Route4_PokemonCenter_1F_EventScript_Gentleman" }, { "name": "boy", "coord": [5, 4], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [4, 3], "max": [6, 5]}, "source_event": 3, "source_script": "Route4_PokemonCenter_1F_EventScript_Boy" @@ -70,12 +74,14 @@ { "name": "youngster", "coord": [14, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 4, "source_script": "Route4_PokemonCenter_1F_EventScript_Youngster" }, { "name": "clipboard", "coord": [12, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 5, "source_script": "Route4_PokemonCenter_1F_EventScript_Newspaper" } diff --git a/data/games/frlg/maps/base/Route5_SouthEntrance.json b/data/games/frlg/maps/base/Route5_SouthEntrance.json index 5c61f5f..cddef01 100644 --- a/data/games/frlg/maps/base/Route5_SouthEntrance.json +++ b/data/games/frlg/maps/base/Route5_SouthEntrance.json @@ -30,6 +30,12 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "policeman", "coord": [1, 5], "source_event": 0, "source_script": "Route5_SouthEntrance_EventScript_Guard"} + { + "name": "policeman", + "coord": [1, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 0, + "source_script": "Route5_SouthEntrance_EventScript_Guard" + } ] } diff --git a/data/games/frlg/maps/base/Route6.json b/data/games/frlg/maps/base/Route6.json index a3c8ff3..e990498 100644 --- a/data/games/frlg/maps/base/Route6.json +++ b/data/games/frlg/maps/base/Route6.json @@ -121,16 +121,30 @@ { "name": "bug_catcher", "coord": [3, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 5}, "source_event": 0, "source_script": "Route6_EventScript_Keigo" }, - {"name": "camper", "coord": [12, 21], "source_event": 1, "source_script": "Route6_EventScript_Ricky"}, - {"name": "picnicker", "coord": [13, 21], "source_event": 2, "source_script": "Route6_EventScript_Nancy"}, + { + "name": "camper", + "coord": [12, 21], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 1, + "source_script": "Route6_EventScript_Ricky" + }, + { + "name": "picnicker", + "coord": [13, 21], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 2, + "source_script": "Route6_EventScript_Nancy" + }, { "name": "bug_catcher", "coord": [20, 25], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 3, @@ -139,6 +153,7 @@ { "name": "picnicker", "coord": [13, 32], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 4, @@ -147,6 +162,7 @@ { "name": "camper", "coord": [13, 33], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 5, diff --git a/data/games/frlg/maps/base/Route6_NorthEntrance.json b/data/games/frlg/maps/base/Route6_NorthEntrance.json index df3ec56..c2888b8 100644 --- a/data/games/frlg/maps/base/Route6_NorthEntrance.json +++ b/data/games/frlg/maps/base/Route6_NorthEntrance.json @@ -30,6 +30,12 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "policeman", "coord": [7, 5], "source_event": 0, "source_script": "Route6_NorthEntrance_EventScript_Guard"} + { + "name": "policeman", + "coord": [7, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 0, + "source_script": "Route6_NorthEntrance_EventScript_Guard" + } ] } diff --git a/data/games/frlg/maps/base/Route7_EastEntrance.json b/data/games/frlg/maps/base/Route7_EastEntrance.json index a56d211..7025bb9 100644 --- a/data/games/frlg/maps/base/Route7_EastEntrance.json +++ b/data/games/frlg/maps/base/Route7_EastEntrance.json @@ -28,6 +28,12 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "policeman", "coord": [6, 2], "source_event": 0, "source_script": "Route7_EastEntrance_EventScript_Guard"} + { + "name": "policeman", + "coord": [6, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 0, + "source_script": "Route7_EastEntrance_EventScript_Guard" + } ] } diff --git a/data/games/frlg/maps/base/Route8.json b/data/games/frlg/maps/base/Route8.json index ee3eeb4..1e3c3cc 100644 --- a/data/games/frlg/maps/base/Route8.json +++ b/data/games/frlg/maps/base/Route8.json @@ -66,6 +66,7 @@ { "name": "lass", "coord": [62, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 6}, "source_event": 0, @@ -74,6 +75,7 @@ { "name": "old_man_1", "coord": [55, 15], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 1, @@ -82,6 +84,7 @@ { "name": "scientist", "coord": [51, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["north", "east", "south", "west"]}, "source_event": 2, "source_script": "Route8_EventScript_Glenn" @@ -89,6 +92,7 @@ { "name": "lass", "coord": [29, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 3, @@ -97,6 +101,7 @@ { "name": "scientist", "coord": [29, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 6}, "source_event": 4, @@ -105,6 +110,7 @@ { "name": "lass", "coord": [29, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 5, @@ -113,6 +119,7 @@ { "name": "lass", "coord": [29, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 6}, "source_event": 6, @@ -121,6 +128,7 @@ { "name": "old_man_1", "coord": [21, 3], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 7, "source_script": "Route8_EventScript_Stan" @@ -128,6 +136,7 @@ { "name": "scientist", "coord": [9, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 8, @@ -136,6 +145,7 @@ { "name": "cut_tree", "coord": [33, 15], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 9, "source_script": "EventScript_CutTree" @@ -143,6 +153,7 @@ { "name": "cut_tree", "coord": [47, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 10, "source_script": "EventScript_CutTree" @@ -150,6 +161,7 @@ { "name": "little_girl", "coord": [40, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 11, @@ -158,6 +170,7 @@ { "name": "little_girl", "coord": [41, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 12, @@ -166,6 +179,8 @@ { "name": "biker", "coord": [14, 16], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "range": [5, 2]}, + "wander": {"min": [9, 14], "max": [19, 18]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 13, "source_script": "Route8_EventScript_Ricardo" @@ -173,6 +188,8 @@ { "name": "biker", "coord": [24, 17], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT", "range": [5, 5]}, + "wander": {"min": [19, 12], "max": [29, 19]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 14, "source_script": "Route8_EventScript_Jaren" diff --git a/data/games/frlg/maps/base/Route8_WestEntrance.json b/data/games/frlg/maps/base/Route8_WestEntrance.json index 717be95..8560a47 100644 --- a/data/games/frlg/maps/base/Route8_WestEntrance.json +++ b/data/games/frlg/maps/base/Route8_WestEntrance.json @@ -28,6 +28,12 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "policeman", "coord": [6, 2], "source_event": 0, "source_script": "Route8_WestEntrance_EventScript_Guard"} + { + "name": "policeman", + "coord": [6, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 0, + "source_script": "Route8_WestEntrance_EventScript_Guard" + } ] } diff --git a/data/games/frlg/maps/base/Route9.json b/data/games/frlg/maps/base/Route9.json index 0f8d796..ecf1f2a 100644 --- a/data/games/frlg/maps/base/Route9.json +++ b/data/games/frlg/maps/base/Route9.json @@ -69,6 +69,7 @@ { "name": "picnicker", "coord": [14, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 0, @@ -77,6 +78,7 @@ { "name": "hiker", "coord": [20, 17], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["north", "west"]}, "source_event": 1, "source_script": "Route9_EventScript_Jeremy" @@ -84,6 +86,7 @@ { "name": "hiker", "coord": [61, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 2, @@ -92,6 +95,7 @@ { "name": "camper", "coord": [26, 7], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["north", "east", "south", "west"]}, "source_event": 3, "source_script": "Route9_EventScript_Chris" @@ -99,6 +103,7 @@ { "name": "bug_catcher", "coord": [26, 1], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 4, @@ -107,6 +112,7 @@ { "name": "bug_catcher", "coord": [49, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 3}, "source_event": 5, @@ -115,6 +121,7 @@ { "name": "hiker", "coord": [53, 2], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [3, 1]}, "wander": {"min": [50, 2], "max": [56, 2]}, "trainer": {"sight": 1, "looks": ["west", "east"]}, "source_event": 6, @@ -123,6 +130,7 @@ { "name": "picnicker", "coord": [60, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 7, @@ -131,6 +139,7 @@ { "name": "camper", "coord": [36, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 5}, "source_event": 8, @@ -139,6 +148,7 @@ { "name": "cut_tree", "coord": [2, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 9, "source_script": "EventScript_CutTree", @@ -150,6 +160,7 @@ "name": "item_ball", "coord": [12, 17], "source_event": 10, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE9_TM40", "source_script": "Route9_EventScript_ItemTM40", "item": "tm40" @@ -158,6 +169,7 @@ "name": "item_ball", "coord": [65, 17], "source_event": 11, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE9_BURN_HEAL", "source_script": "Route9_EventScript_ItemBurnHeal", "item": "burn_heal" diff --git a/data/games/frlg/maps/base/SSAnne_1F_Corridor.json b/data/games/frlg/maps/base/SSAnne_1F_Corridor.json index 654257b..6dc7def 100644 --- a/data/games/frlg/maps/base/SSAnne_1F_Corridor.json +++ b/data/games/frlg/maps/base/SSAnne_1F_Corridor.json @@ -62,7 +62,19 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "sailor", "coord": [18, 8], "source_event": 0, "source_script": "SSAnne_1F_Corridor_EventScript_Sailor"}, - {"name": "worker_m", "coord": [12, 9], "source_event": 1, "source_script": "SSAnne_1F_Corridor_EventScript_WorkerM"} + { + "name": "sailor", + "coord": [18, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 0, + "source_script": "SSAnne_1F_Corridor_EventScript_Sailor" + }, + { + "name": "worker_m", + "coord": [12, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 1, + "source_script": "SSAnne_1F_Corridor_EventScript_WorkerM" + } ] } diff --git a/data/games/frlg/maps/base/SSAnne_1F_Room6.json b/data/games/frlg/maps/base/SSAnne_1F_Room6.json index 5e73614..38310de 100644 --- a/data/games/frlg/maps/base/SSAnne_1F_Room6.json +++ b/data/games/frlg/maps/base/SSAnne_1F_Room6.json @@ -13,6 +13,12 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "woman_2", "coord": [3, 5], "source_event": 0, "source_script": "SSAnne_1F_Room6_EventScript_Woman"} + { + "name": "woman_2", + "coord": [3, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 0, + "source_script": "SSAnne_1F_Room6_EventScript_Woman" + } ] } diff --git a/data/games/frlg/maps/base/SSAnne_2F_Corridor.json b/data/games/frlg/maps/base/SSAnne_2F_Corridor.json index e0a81ca..321a5bf 100644 --- a/data/games/frlg/maps/base/SSAnne_2F_Corridor.json +++ b/data/games/frlg/maps/base/SSAnne_2F_Corridor.json @@ -53,6 +53,7 @@ { "name": "blue", "coord": [30, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SS_ANNE_RIVAL", "source_event": 0, "source_script": "0x0", @@ -61,6 +62,7 @@ { "name": "sailor", "coord": [2, 7], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [1, 2]}, "wander": {"min": [2, 5], "max": [2, 9]}, "source_event": 1, "source_script": "SSAnne_2F_Corridor_EventScript_Sailor" diff --git a/data/games/frlg/maps/base/SSAnne_CaptainsOffice.json b/data/games/frlg/maps/base/SSAnne_CaptainsOffice.json index c7f657e..1476b4a 100644 --- a/data/games/frlg/maps/base/SSAnne_CaptainsOffice.json +++ b/data/games/frlg/maps/base/SSAnne_CaptainsOffice.json @@ -27,6 +27,7 @@ { "name": "captain", "coord": [5, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 0, "source_script": "SSAnne_CaptainsOffice_EventScript_Captain", "source_local_id": "LOCALID_SS_ANNE_CAPTAIN" diff --git a/data/games/frlg/maps/base/SSAnne_Exterior.json b/data/games/frlg/maps/base/SSAnne_Exterior.json index 63b8bcc..e3c61d2 100644 --- a/data/games/frlg/maps/base/SSAnne_Exterior.json +++ b/data/games/frlg/maps/base/SSAnne_Exterior.json @@ -97,6 +97,7 @@ { "name": "ss_anne", "coord": [30, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SS_ANNE", "source_event": 0, "source_script": "0x0", diff --git a/data/games/frlg/maps/base/SafariZone_Center.json b/data/games/frlg/maps/base/SafariZone_Center.json index f8c5b7b..fde02c2 100644 --- a/data/games/frlg/maps/base/SafariZone_Center.json +++ b/data/games/frlg/maps/base/SafariZone_Center.json @@ -138,6 +138,7 @@ "name": "item_ball", "coord": [24, 15], "source_event": 0, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_CENTER_NUGGET", "source_script": "SafariZone_Center_EventScript_ItemNugget", "item": "nugget" diff --git a/data/games/frlg/maps/base/SafariZone_East.json b/data/games/frlg/maps/base/SafariZone_East.json index 5d343a3..3796cf1 100644 --- a/data/games/frlg/maps/base/SafariZone_East.json +++ b/data/games/frlg/maps/base/SafariZone_East.json @@ -117,6 +117,7 @@ "name": "item_ball", "coord": [13, 12], "source_event": 0, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_EAST_MAX_POTION", "source_script": "SafariZone_East_EventScript_ItemMaxPotion", "item": "max_potion" @@ -125,6 +126,7 @@ "name": "item_ball", "coord": [37, 15], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_EAST_FULL_RESTORE", "source_script": "SafariZone_East_EventScript_ItemFullRestore", "item": "full_restore" @@ -133,6 +135,7 @@ "name": "item_ball", "coord": [31, 18], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_EAST_TM11", "source_script": "SafariZone_East_EventScript_ItemTM11", "item": "tm11" @@ -141,6 +144,7 @@ "name": "item_ball", "coord": [36, 17], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_EAST_LEAF_STONE", "source_script": "SafariZone_East_EventScript_ItemLeafStone", "item": "leaf_stone" diff --git a/data/games/frlg/maps/base/SafariZone_North.json b/data/games/frlg/maps/base/SafariZone_North.json index 5791380..0e0f315 100644 --- a/data/games/frlg/maps/base/SafariZone_North.json +++ b/data/games/frlg/maps/base/SafariZone_North.json @@ -139,6 +139,7 @@ "name": "item_ball", "coord": [33, 5], "source_event": 0, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_PROTEIN", "source_script": "SafariZone_North_EventScript_ItemProtein", "item": "protein" @@ -147,6 +148,7 @@ "name": "item_ball", "coord": [28, 9], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_TM47", "source_script": "SafariZone_North_EventScript_ItemTM47", "item": "tm47" @@ -155,6 +157,7 @@ "name": "item_ball", "coord": [29, 17], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_QUICK_CLAW", "source_script": "SafariZone_North_EventScript_ItemQuickClaw", "item": "quick_claw" diff --git a/data/games/frlg/maps/base/SafariZone_SecretHouse.json b/data/games/frlg/maps/base/SafariZone_SecretHouse.json index e659a82..9e21460 100644 --- a/data/games/frlg/maps/base/SafariZone_SecretHouse.json +++ b/data/games/frlg/maps/base/SafariZone_SecretHouse.json @@ -33,6 +33,7 @@ { "name": "worker_m", "coord": [6, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "SafariZone_SecretHouse_EventScript_Attendant" } diff --git a/data/games/frlg/maps/base/SafariZone_West.json b/data/games/frlg/maps/base/SafariZone_West.json index daed713..66f4578 100644 --- a/data/games/frlg/maps/base/SafariZone_West.json +++ b/data/games/frlg/maps/base/SafariZone_West.json @@ -136,6 +136,7 @@ "name": "item_ball", "coord": [28, 14], "source_event": 0, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH", "source_script": "SafariZone_West_EventScript_ItemGoldTeeth", "item": "gold_teeth" @@ -144,6 +145,7 @@ "name": "item_ball", "coord": [17, 13], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_WEST_TM32", "source_script": "SafariZone_West_EventScript_ItemTM32", "item": "tm32" @@ -152,6 +154,7 @@ "name": "item_ball", "coord": [16, 27], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_POTION", "source_script": "SafariZone_West_EventScript_ItemMaxPotion", "item": "max_potion" @@ -160,6 +163,7 @@ "name": "item_ball", "coord": [27, 24], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_REVIVE", "source_script": "SafariZone_West_EventScript_ItemMaxRevive", "item": "max_revive" diff --git a/data/games/frlg/maps/base/SaffronCity.json b/data/games/frlg/maps/base/SaffronCity.json index b1485bc..0cc683c 100644 --- a/data/games/frlg/maps/base/SaffronCity.json +++ b/data/games/frlg/maps/base/SaffronCity.json @@ -107,6 +107,7 @@ { "name": "rocket_m", "coord": [22, 15], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFFRON_ROCKETS", "source_event": 0, "source_script": "SaffronCity_EventScript_RocketGrunt1" @@ -114,6 +115,7 @@ { "name": "rocket_m", "coord": [26, 16], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [4, 1]}, "wander": {"min": [22, 16], "max": [30, 16]}, "hide_flag": "FLAG_HIDE_SAFFRON_ROCKETS", "source_event": 1, @@ -122,6 +124,7 @@ { "name": "rocket_m", "coord": [46, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFFRON_ROCKETS", "source_event": 2, "source_script": "SaffronCity_EventScript_RocketGrunt3" @@ -129,6 +132,7 @@ { "name": "rocket_m", "coord": [27, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFFRON_ROCKETS", "source_event": 3, "source_script": "SaffronCity_EventScript_RocketGrunt4" @@ -136,6 +140,7 @@ { "name": "rocket_m", "coord": [25, 33], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [7, 1]}, "wander": {"min": [18, 33], "max": [32, 33]}, "hide_flag": "FLAG_HIDE_SAFFRON_ROCKETS", "source_event": 4, @@ -144,6 +149,7 @@ { "name": "rocket_m", "coord": [34, 31], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFFRON_ROCKETS", "source_event": 5, "source_script": "SaffronCity_EventScript_DoorGuardGrunt", @@ -152,6 +158,7 @@ { "name": "rocket_m", "coord": [30, 39], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [5, 1]}, "wander": {"min": [25, 39], "max": [35, 39]}, "hide_flag": "FLAG_HIDE_SAFFRON_ROCKETS", "source_event": 6, @@ -160,6 +167,7 @@ { "name": "rocket_m", "coord": [48, 24], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [4, 1]}, "wander": {"min": [44, 24], "max": [52, 24]}, "hide_flag": "FLAG_HIDE_SAFFRON_ROCKETS", "source_event": 7, @@ -168,6 +176,7 @@ { "name": "youngster", "coord": [37, 32], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFFRON_CIVILIANS", "source_event": 8, "source_script": "SaffronCity_EventScript_Youngster" @@ -175,6 +184,7 @@ { "name": "worker_m", "coord": [21, 23], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [20, 22], "max": [22, 24]}, "hide_flag": "FLAG_HIDE_SAFFRON_CIVILIANS", "source_event": 9, @@ -183,6 +193,7 @@ { "name": "man", "coord": [39, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFFRON_CIVILIANS", "source_event": 10, "source_script": "SaffronCity_EventScript_Man" @@ -190,6 +201,7 @@ { "name": "boy", "coord": [44, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFFRON_CIVILIANS", "source_event": 11, "source_script": "SaffronCity_EventScript_Boy" @@ -197,6 +209,7 @@ { "name": "pidgeot", "coord": [45, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFFRON_CIVILIANS", "source_event": 12, "source_script": "SaffronCity_EventScript_Pidgeot" @@ -204,6 +217,7 @@ { "name": "lass", "coord": [32, 39], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [5, 1]}, "wander": {"min": [27, 39], "max": [37, 39]}, "hide_flag": "FLAG_HIDE_SAFFRON_CIVILIANS", "source_event": 13, @@ -212,6 +226,7 @@ { "name": "crush_girl", "coord": [47, 24], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [46, 24], "max": [48, 24]}, "hide_flag": "FLAG_HIDE_POSTGAME_GOSSIPERS", "source_event": 14, diff --git a/data/games/frlg/maps/base/SaffronCity_Gym.json b/data/games/frlg/maps/base/SaffronCity_Gym.json index 920b812..8deed09 100644 --- a/data/games/frlg/maps/base/SaffronCity_Gym.json +++ b/data/games/frlg/maps/base/SaffronCity_Gym.json @@ -109,6 +109,7 @@ { "name": "cooltrainer_m", "coord": [24, 18], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 0, @@ -117,6 +118,7 @@ { "name": "cooltrainer_m", "coord": [24, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 1, @@ -125,6 +127,7 @@ { "name": "cooltrainer_m", "coord": [4, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 2, @@ -133,6 +136,7 @@ { "name": "channeler", "coord": [14, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 3, @@ -141,6 +145,7 @@ { "name": "channeler", "coord": [4, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 4, @@ -149,20 +154,34 @@ { "name": "channeler", "coord": [4, 18], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 5, "source_script": "SaffronCity_Gym_EventScript_Tasha" }, - {"name": "sabrina", "coord": [14, 11], "source_event": 6, "source_script": "SaffronCity_Gym_EventScript_Sabrina"}, + { + "name": "sabrina", + "coord": [14, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 6, + "source_script": "SaffronCity_Gym_EventScript_Sabrina" + }, { "name": "cooltrainer_m", "coord": [24, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 7, "source_script": "SaffronCity_Gym_EventScript_Tyron" }, - {"name": "gym_guy", "coord": [15, 20], "source_event": 8, "source_script": "SaffronCity_Gym_EventScript_GymGuy"} + { + "name": "gym_guy", + "coord": [15, 20], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 8, + "source_script": "SaffronCity_Gym_EventScript_GymGuy" + } ] } diff --git a/data/games/frlg/maps/base/SaffronCity_Mart.json b/data/games/frlg/maps/base/SaffronCity_Mart.json index 2a14fea..c466779 100644 --- a/data/games/frlg/maps/base/SaffronCity_Mart.json +++ b/data/games/frlg/maps/base/SaffronCity_Mart.json @@ -28,11 +28,24 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "clerk", "coord": [2, 3], "source_event": 0, "source_script": "SaffronCity_Mart_EventScript_Clerk"}, - {"name": "youngster", "coord": [1, 7], "source_event": 1, "source_script": "SaffronCity_Mart_EventScript_Youngster"}, + { + "name": "clerk", + "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 0, + "source_script": "SaffronCity_Mart_EventScript_Clerk" + }, + { + "name": "youngster", + "coord": [1, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 1, + "source_script": "SaffronCity_Mart_EventScript_Youngster" + }, { "name": "lass", "coord": [9, 5], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [1, 1]}, "wander": {"min": [9, 4], "max": [9, 6]}, "source_event": 2, "source_script": "SaffronCity_Mart_EventScript_Lass" diff --git a/data/games/frlg/maps/base/SilphCo_10F.json b/data/games/frlg/maps/base/SilphCo_10F.json index 432ee28..3574d89 100644 --- a/data/games/frlg/maps/base/SilphCo_10F.json +++ b/data/games/frlg/maps/base/SilphCo_10F.json @@ -73,16 +73,24 @@ { "name": "scientist", "coord": [2, 7], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 2]}, "wander": {"min": [0, 5], "max": [4, 9]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 0, "source_script": "SilphCo_10F_EventScript_Travis" }, - {"name": "worker_f", "coord": [10, 17], "source_event": 1, "source_script": "SilphCo_10F_EventScript_WorkerF"}, + { + "name": "worker_f", + "coord": [10, 17], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 1, + "source_script": "SilphCo_10F_EventScript_WorkerF" + }, { "name": "rocket_m", "coord": [0, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -95,6 +103,7 @@ "name": "item_ball", "coord": [5, 15], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_10F_CARBOS", "source_script": "SilphCo_10F_EventScript_ItemCarbos", "item": "carbos" @@ -103,6 +112,7 @@ "name": "item_ball", "coord": [2, 15], "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_10F_ULTRA_BALL", "source_script": "SilphCo_10F_EventScript_ItemUltraBall", "item": "ultra_ball" @@ -111,6 +121,7 @@ "name": "item_ball", "coord": [3, 17], "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_10F_RARE_CANDY", "source_script": "SilphCo_10F_EventScript_ItemRareCandy", "item": "rare_candy" diff --git a/data/games/frlg/maps/base/SilphCo_11F.json b/data/games/frlg/maps/base/SilphCo_11F.json index 5920a43..923d2a3 100644 --- a/data/games/frlg/maps/base/SilphCo_11F.json +++ b/data/games/frlg/maps/base/SilphCo_11F.json @@ -68,11 +68,24 @@ } ], "npcs": [ - {"name": "old_man_2", "coord": [9, 9], "source_event": 0, "source_script": "SilphCo_11F_EventScript_President"}, - {"name": "worker_f", "coord": [11, 9], "source_event": 1, "source_script": "SilphCo_11F_EventScript_Secretary"}, + { + "name": "old_man_2", + "coord": [9, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 0, + "source_script": "SilphCo_11F_EventScript_President" + }, + { + "name": "worker_f", + "coord": [11, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 1, + "source_script": "SilphCo_11F_EventScript_Secretary" + }, { "name": "giovanni", "coord": [6, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 2, "source_script": "0x0", @@ -81,6 +94,7 @@ { "name": "rocket_m", "coord": [16, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 5}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -91,6 +105,7 @@ { "name": "rocket_m", "coord": [2, 19], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 5}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -104,6 +119,7 @@ "name": "item_ball", "coord": [16, 18], "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_11F_ZINC", "source_script": "SilphCo_11F_EventScript_ItemZinc", "item": "zinc" diff --git a/data/games/frlg/maps/base/SilphCo_1F.json b/data/games/frlg/maps/base/SilphCo_1F.json index d34bf4f..dedce13 100644 --- a/data/games/frlg/maps/base/SilphCo_1F.json +++ b/data/games/frlg/maps/base/SilphCo_1F.json @@ -45,6 +45,7 @@ { "name": "worker_f", "coord": [3, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFFRON_CIVILIANS", "source_event": 0, "source_script": "SilphCo_1F_EventScript_Receptionist" diff --git a/data/games/frlg/maps/base/SilphCo_2F.json b/data/games/frlg/maps/base/SilphCo_2F.json index cbc131c..59ed6c4 100644 --- a/data/games/frlg/maps/base/SilphCo_2F.json +++ b/data/games/frlg/maps/base/SilphCo_2F.json @@ -79,6 +79,7 @@ { "name": "rocket_m", "coord": [29, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 5}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -88,6 +89,7 @@ { "name": "scientist", "coord": [28, 18], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["north", "west"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 1, @@ -96,6 +98,7 @@ { "name": "rocket_m", "coord": [20, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["south", "north"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 2, @@ -104,10 +107,17 @@ { "name": "scientist", "coord": [5, 19], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 3, "source_script": "SilphCo_2F_EventScript_Connor" }, - {"name": "woman_2", "coord": [10, 4], "source_event": 4, "source_script": "SilphCo_2F_EventScript_ThunderWaveTutor"} + { + "name": "woman_2", + "coord": [10, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 4, + "source_script": "SilphCo_2F_EventScript_ThunderWaveTutor" + } ] } diff --git a/data/games/frlg/maps/base/SilphCo_3F.json b/data/games/frlg/maps/base/SilphCo_3F.json index c622b61..dd2bcb3 100644 --- a/data/games/frlg/maps/base/SilphCo_3F.json +++ b/data/games/frlg/maps/base/SilphCo_3F.json @@ -97,16 +97,24 @@ { "name": "rocket_m", "coord": [25, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 0, "source_script": "SilphCo_3F_EventScript_Grunt" }, - {"name": "worker_m", "coord": [31, 13], "source_event": 1, "source_script": "SilphCo_3F_EventScript_WorkerM"}, + { + "name": "worker_m", + "coord": [31, 13], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 1, + "source_script": "SilphCo_3F_EventScript_WorkerM" + }, { "name": "scientist", "coord": [4, 12], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 2, "source_script": "SilphCo_3F_EventScript_Jose" @@ -117,6 +125,7 @@ "name": "item_ball", "coord": [8, 10], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_3F_HYPER_POTION", "source_script": "SilphCo_3F_EventScript_ItemHyperPotion", "item": "hyper_potion" diff --git a/data/games/frlg/maps/base/SilphCo_4F.json b/data/games/frlg/maps/base/SilphCo_4F.json index 127860a..67031fd 100644 --- a/data/games/frlg/maps/base/SilphCo_4F.json +++ b/data/games/frlg/maps/base/SilphCo_4F.json @@ -91,6 +91,7 @@ { "name": "rocket_m", "coord": [33, 16], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [32, 15], "max": [34, 17]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -100,6 +101,7 @@ { "name": "rocket_m", "coord": [10, 19], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 5}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -109,18 +111,26 @@ { "name": "scientist", "coord": [14, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["south", "west"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 2, "source_script": "SilphCo_4F_EventScript_Rodney" }, - {"name": "worker_m", "coord": [5, 5], "source_event": 3, "source_script": "SilphCo_4F_EventScript_WorkerM"} + { + "name": "worker_m", + "coord": [5, 5], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 3, + "source_script": "SilphCo_4F_EventScript_WorkerM" + } ], "items": [ { "name": "item_ball", "coord": [3, 11], "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_4F_MAX_REVIVE", "source_script": "SilphCo_4F_EventScript_ItemMaxRevive", "item": "max_revive" @@ -129,6 +139,7 @@ "name": "item_ball", "coord": [4, 12], "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_4F_ESCAPE_ROPE", "source_script": "SilphCo_4F_EventScript_ItemEscapeRope", "item": "escape_rope" @@ -137,6 +148,7 @@ "name": "item_ball", "coord": [2, 13], "source_event": 6, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_4F_FULL_HEAL", "source_script": "SilphCo_4F_EventScript_ItemFullHeal", "item": "full_heal" @@ -145,6 +157,7 @@ "name": "item_ball", "coord": [30, 18], "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_4F_TM41", "source_script": "SilphCo_4F_EventScript_ItemTM41", "item": "tm41" diff --git a/data/games/frlg/maps/base/SilphCo_5F.json b/data/games/frlg/maps/base/SilphCo_5F.json index 467b8c3..f350c17 100644 --- a/data/games/frlg/maps/base/SilphCo_5F.json +++ b/data/games/frlg/maps/base/SilphCo_5F.json @@ -105,6 +105,7 @@ { "name": "rocket_m", "coord": [35, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 2}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -114,15 +115,23 @@ { "name": "rocker", "coord": [23, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["south", "north"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 1, "source_script": "SilphCo_5F_EventScript_Dalton" }, - {"name": "worker_m", "coord": [16, 13], "source_event": 2, "source_script": "SilphCo_5F_EventScript_WorkerM"}, + { + "name": "worker_m", + "coord": [16, 13], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 2, + "source_script": "SilphCo_5F_EventScript_WorkerM" + }, { "name": "scientist", "coord": [11, 6], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [10, 5], "max": [12, 7]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -132,18 +141,27 @@ { "name": "rocket_m", "coord": [9, 21], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["north", "east"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 4, "source_script": "SilphCo_5F_EventScript_Grunt1" }, - {"name": "scientist", "coord": [2, 7], "source_event": 8, "source_script": "SilphCo_5F_EventScript_Scientist"} + { + "name": "scientist", + "coord": [2, 7], + "movement": {"type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "range": [2, 1]}, + "wander": {"min": [0, 7], "max": [4, 7]}, + "source_event": 8, + "source_script": "SilphCo_5F_EventScript_Scientist" + } ], "items": [ { "name": "item_ball", "coord": [4, 9], "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_5F_PROTEIN", "source_script": "SilphCo_5F_EventScript_ItemProtein", "item": "protein" @@ -152,6 +170,7 @@ "name": "item_ball", "coord": [1, 18], "source_event": 6, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_5F_TM01", "source_script": "SilphCo_5F_EventScript_ItemTM01", "item": "tm01" @@ -160,6 +179,7 @@ "name": "item_ball", "coord": [22, 21], "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_5F_CARD_KEY", "source_script": "SilphCo_5F_EventScript_ItemCardKey", "item": "card_key" diff --git a/data/games/frlg/maps/base/SilphCo_6F.json b/data/games/frlg/maps/base/SilphCo_6F.json index 99eb4ad..c6bb1a3 100644 --- a/data/games/frlg/maps/base/SilphCo_6F.json +++ b/data/games/frlg/maps/base/SilphCo_6F.json @@ -72,20 +72,52 @@ { "name": "rocket_m", "coord": [21, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 0, "source_script": "SilphCo_6F_EventScript_Grunt1" }, - {"name": "worker_m", "coord": [23, 9], "source_event": 1, "source_script": "SilphCo_6F_EventScript_WorkerM1"}, - {"name": "worker_f", "coord": [24, 9], "source_event": 2, "source_script": "SilphCo_6F_EventScript_WorkerF1"}, - {"name": "worker_m", "coord": [22, 13], "source_event": 3, "source_script": "SilphCo_6F_EventScript_WorkerM2"}, - {"name": "worker_m", "coord": [14, 9], "source_event": 4, "source_script": "SilphCo_6F_EventScript_WorkerM3"}, - {"name": "worker_f", "coord": [16, 12], "source_event": 5, "source_script": "SilphCo_6F_EventScript_WorkerF2"}, + { + "name": "worker_m", + "coord": [23, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 1, + "source_script": "SilphCo_6F_EventScript_WorkerM1" + }, + { + "name": "worker_f", + "coord": [24, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 2, + "source_script": "SilphCo_6F_EventScript_WorkerF1" + }, + { + "name": "worker_m", + "coord": [22, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 3, + "source_script": "SilphCo_6F_EventScript_WorkerM2" + }, + { + "name": "worker_m", + "coord": [14, 9], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 4, + "source_script": "SilphCo_6F_EventScript_WorkerM3" + }, + { + "name": "worker_f", + "coord": [16, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 5, + "source_script": "SilphCo_6F_EventScript_WorkerF2" + }, { "name": "scientist", "coord": [9, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -95,6 +127,7 @@ { "name": "rocket_m", "coord": [18, 17], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 2}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -107,6 +140,7 @@ "name": "item_ball", "coord": [2, 14], "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_6F_HP_UP", "source_script": "SilphCo_6F_EventScript_ItemHPUp", "item": "hp_up" @@ -115,6 +149,7 @@ "name": "item_ball", "coord": [1, 17], "source_event": 8, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_6F_X_SPECIAL", "source_script": "SilphCo_6F_EventScript_ItemXSpecial", "item": "x_special" diff --git a/data/games/frlg/maps/base/SilphCo_7F.json b/data/games/frlg/maps/base/SilphCo_7F.json index de8c022..9cffd8d 100644 --- a/data/games/frlg/maps/base/SilphCo_7F.json +++ b/data/games/frlg/maps/base/SilphCo_7F.json @@ -87,15 +87,23 @@ { "name": "blue", "coord": [2, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_RIVAL", "source_event": 0, "source_script": "0x0", "source_local_id": "LOCALID_SILPH_CO_RIVAL" }, - {"name": "worker_m", "coord": [0, 7], "source_event": 1, "source_script": "SilphCo_7F_EventScript_LaprasGuy"}, + { + "name": "worker_m", + "coord": [0, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 1, + "source_script": "SilphCo_7F_EventScript_LaprasGuy" + }, { "name": "rocket_m", "coord": [24, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -105,6 +113,7 @@ { "name": "rocket_m", "coord": [24, 15], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -114,17 +123,32 @@ { "name": "rocket_m", "coord": [13, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 4, "source_script": "SilphCo_7F_EventScript_Grunt3" }, - {"name": "worker_f", "coord": [10, 10], "source_event": 5, "source_script": "SilphCo_7F_EventScript_WorkerF"}, - {"name": "worker_m", "coord": [13, 14], "source_event": 6, "source_script": "SilphCo_7F_EventScript_WorkerM1"}, + { + "name": "worker_f", + "coord": [10, 10], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 5, + "source_script": "SilphCo_7F_EventScript_WorkerF" + }, + { + "name": "worker_m", + "coord": [13, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 6, + "source_script": "SilphCo_7F_EventScript_WorkerM1" + }, { "name": "worker_m", "coord": [9, 14], + "movement": {"type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "range": [1, 1]}, + "wander": {"min": [8, 14], "max": [10, 14]}, "source_event": 7, "source_script": "SilphCo_7F_EventScript_WorkerM2", "source_local_id": "LOCALID_SILPH_CO_7F_WORKER_M2" @@ -132,6 +156,7 @@ { "name": "scientist", "coord": [3, 13], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [2, 1]}, "wander": {"min": [1, 13], "max": [5, 13]}, "trainer": {"sight": 1, "looks": ["west", "east"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -144,6 +169,7 @@ "name": "item_ball", "coord": [0, 12], "source_event": 9, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_7F_CALCIUM", "source_script": "SilphCo_7F_EventScript_ItemCalcium", "item": "calcium" @@ -152,6 +178,7 @@ "name": "item_ball", "coord": [30, 11], "source_event": 10, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_7F_TM08", "source_script": "SilphCo_7F_EventScript_ItemTM08", "item": "tm08" diff --git a/data/games/frlg/maps/base/SilphCo_8F.json b/data/games/frlg/maps/base/SilphCo_8F.json index b3caf31..505c9da 100644 --- a/data/games/frlg/maps/base/SilphCo_8F.json +++ b/data/games/frlg/maps/base/SilphCo_8F.json @@ -101,6 +101,7 @@ { "name": "rocket_m", "coord": [28, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -110,6 +111,7 @@ { "name": "rocket_m", "coord": [10, 17], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 5}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -119,6 +121,7 @@ { "name": "scientist", "coord": [9, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -128,17 +131,25 @@ { "name": "worker_m", "coord": [2, 5], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [1, 5], "max": [3, 5]}, "source_event": 3, "source_script": "SilphCo_8F_EventScript_WorkerM" }, - {"name": "scientist", "coord": [29, 9], "source_event": 5, "source_script": "SilphCo_8F_EventScript_Scientist"} + { + "name": "scientist", + "coord": [29, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 5, + "source_script": "SilphCo_8F_EventScript_Scientist" + } ], "items": [ { "name": "item_ball", "coord": [24, 8], "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_8F_IRON", "source_script": "SilphCo_8F_EventScript_ItemIron", "item": "iron" diff --git a/data/games/frlg/maps/base/SilphCo_9F.json b/data/games/frlg/maps/base/SilphCo_9F.json index a73272f..af7d7d7 100644 --- a/data/games/frlg/maps/base/SilphCo_9F.json +++ b/data/games/frlg/maps/base/SilphCo_9F.json @@ -108,6 +108,7 @@ { "name": "scientist", "coord": [26, 16], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [1, 1]}, "wander": {"min": [26, 15], "max": [26, 17]}, "trainer": {"sight": 2, "looks": ["north", "south"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -117,16 +118,24 @@ { "name": "rocket_m", "coord": [15, 18], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 3}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 1, "source_script": "SilphCo_9F_EventScript_Grunt2" }, - {"name": "woman_2", "coord": [2, 16], "source_event": 2, "source_script": "SilphCo_9F_EventScript_HealWoman"}, + { + "name": "woman_2", + "coord": [2, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 2, + "source_script": "SilphCo_9F_EventScript_HealWoman" + }, { "name": "rocket_m", "coord": [1, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 5}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", diff --git a/data/games/frlg/maps/base/UndergroundPath_EastEntrance.json b/data/games/frlg/maps/base/UndergroundPath_EastEntrance.json index 9573677..08f3f14 100644 --- a/data/games/frlg/maps/base/UndergroundPath_EastEntrance.json +++ b/data/games/frlg/maps/base/UndergroundPath_EastEntrance.json @@ -32,6 +32,7 @@ { "name": "woman_2", "coord": [5, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 0, "source_script": "UndergroundPath_EastEntrance_EventScript_Woman" } diff --git a/data/games/frlg/maps/base/UndergroundPath_NorthEntrance.json b/data/games/frlg/maps/base/UndergroundPath_NorthEntrance.json index 0c57df2..3de9d50 100644 --- a/data/games/frlg/maps/base/UndergroundPath_NorthEntrance.json +++ b/data/games/frlg/maps/base/UndergroundPath_NorthEntrance.json @@ -32,6 +32,7 @@ { "name": "little_girl", "coord": [5, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "UndergroundPath_NorthEntrance_EventScript_Saige" } diff --git a/data/games/frlg/maps/base/UndergroundPath_SouthEntrance.json b/data/games/frlg/maps/base/UndergroundPath_SouthEntrance.json index fffe5ca..016733f 100644 --- a/data/games/frlg/maps/base/UndergroundPath_SouthEntrance.json +++ b/data/games/frlg/maps/base/UndergroundPath_SouthEntrance.json @@ -32,6 +32,7 @@ { "name": "woman_2", "coord": [5, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 0, "source_script": "UndergroundPath_SouthEntrance_EventScript_Woman" } diff --git a/data/games/frlg/maps/base/UndergroundPath_WestEntrance.json b/data/games/frlg/maps/base/UndergroundPath_WestEntrance.json index 96f2578..243a0a5 100644 --- a/data/games/frlg/maps/base/UndergroundPath_WestEntrance.json +++ b/data/games/frlg/maps/base/UndergroundPath_WestEntrance.json @@ -32,6 +32,7 @@ { "name": "balding_man", "coord": [5, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 0, "source_script": "UndergroundPath_WestEntrance_EventScript_BaldingMan" } diff --git a/data/games/frlg/maps/base/VermilionCity.json b/data/games/frlg/maps/base/VermilionCity.json index f7b0789..83a1e06 100644 --- a/data/games/frlg/maps/base/VermilionCity.json +++ b/data/games/frlg/maps/base/VermilionCity.json @@ -132,15 +132,29 @@ { "name": "woman_1", "coord": [22, 11], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [4, 1]}, "wander": {"min": [18, 11], "max": [26, 11]}, "source_event": 0, "source_script": "VermilionCity_EventScript_Woman" }, - {"name": "old_man_1", "coord": [17, 9], "source_event": 1, "source_script": "VermilionCity_EventScript_OldMan1"}, - {"name": "old_man_2", "coord": [36, 10], "source_event": 2, "source_script": "VermilionCity_EventScript_OldMan2"}, + { + "name": "old_man_1", + "coord": [17, 9], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 1, + "source_script": "VermilionCity_EventScript_OldMan1" + }, + { + "name": "old_man_2", + "coord": [36, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "range": [1, 1]}, + "source_event": 2, + "source_script": "VermilionCity_EventScript_OldMan2" + }, { "name": "machop", "coord": [35, 11], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 2]}, "wander": {"min": [33, 9], "max": [37, 13]}, "source_event": 3, "source_script": "VermilionCity_EventScript_Machop" @@ -148,6 +162,7 @@ { "name": "sailor", "coord": [31, 30], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [4, 1]}, "wander": {"min": [27, 30], "max": [35, 30]}, "source_event": 4, "source_script": "VermilionCity_EventScript_Sailor" @@ -155,6 +170,7 @@ { "name": "sailor", "coord": [24, 33], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 5, "source_script": "VermilionCity_EventScript_FerrySailor", "source_local_id": "LOCALID_VERMILION_FERRY_SAILOR" @@ -162,6 +178,7 @@ { "name": "cut_tree", "coord": [19, 24], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 6, "source_script": "EventScript_CutTree" @@ -169,6 +186,7 @@ { "name": "scientist", "coord": [25, 7], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [4, 1]}, "hide_flag": "FLAG_HIDE_VERMILION_CITY_OAKS_AIDE", "source_event": 7, "source_script": "VermilionCity_EventScript_OaksAide" diff --git a/data/games/frlg/maps/base/VermilionCity_Gym.json b/data/games/frlg/maps/base/VermilionCity_Gym.json index 9389f2f..620b59d 100644 --- a/data/games/frlg/maps/base/VermilionCity_Gym.json +++ b/data/games/frlg/maps/base/VermilionCity_Gym.json @@ -40,10 +40,17 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "lt_surge", "coord": [5, 2], "source_event": 0, "source_script": "VermilionCity_Gym_EventScript_LtSurge"}, + { + "name": "lt_surge", + "coord": [5, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 0, + "source_script": "VermilionCity_Gym_EventScript_LtSurge" + }, { "name": "balding_man", "coord": [2, 11], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["north", "east", "south", "west"]}, "source_event": 1, "source_script": "VermilionCity_Gym_EventScript_Baily" @@ -51,14 +58,22 @@ { "name": "sailor", "coord": [8, 13], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["north", "east", "south", "west"]}, "source_event": 2, "source_script": "VermilionCity_Gym_EventScript_Dwayne" }, - {"name": "gym_guy", "coord": [4, 17], "source_event": 3, "source_script": "VermilionCity_Gym_EventScript_GymGuy"}, + { + "name": "gym_guy", + "coord": [4, 17], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 3, + "source_script": "VermilionCity_Gym_EventScript_GymGuy" + }, { "name": "gentleman", "coord": [7, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 4, diff --git a/data/games/frlg/maps/base/VermilionCity_Mart.json b/data/games/frlg/maps/base/VermilionCity_Mart.json index 30a8953..966dcde 100644 --- a/data/games/frlg/maps/base/VermilionCity_Mart.json +++ b/data/games/frlg/maps/base/VermilionCity_Mart.json @@ -28,16 +28,24 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "clerk", "coord": [2, 3], "source_event": 0, "source_script": "VermilionCity_Mart_EventScript_Clerk"}, + { + "name": "clerk", + "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 0, + "source_script": "VermilionCity_Mart_EventScript_Clerk" + }, { "name": "cooltrainer_f", "coord": [4, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 1, "source_script": "VermilionCity_Mart_EventScript_CooltrainerF" }, { "name": "balding_man", "coord": [9, 4], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 2]}, "wander": {"min": [8, 2], "max": [10, 6]}, "source_event": 2, "source_script": "VermilionCity_Mart_EventScript_BaldingMan" diff --git a/data/games/frlg/maps/base/VermilionCity_PokemonCenter_1F.json b/data/games/frlg/maps/base/VermilionCity_PokemonCenter_1F.json index 84f0fa1..2f0c013 100644 --- a/data/games/frlg/maps/base/VermilionCity_PokemonCenter_1F.json +++ b/data/games/frlg/maps/base/VermilionCity_PokemonCenter_1F.json @@ -44,6 +44,7 @@ { "name": "nurse", "coord": [7, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "VermilionCity_PokemonCenter_1F_EventScript_Nurse", "source_local_id": "LOCALID_VERMILION_NURSE" @@ -51,6 +52,7 @@ { "name": "man", "coord": [4, 8], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [3, 8], "max": [5, 8]}, "source_event": 1, "source_script": "VermilionCity_PokemonCenter_1F_EventScript_Man" @@ -58,12 +60,14 @@ { "name": "hiker", "coord": [12, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 2, "source_script": "VermilionCity_PokemonCenter_1F_EventScript_Hiker" }, { "name": "youngster", "coord": [14, 4], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [1, 1]}, "wander": {"min": [14, 3], "max": [14, 5]}, "source_event": 3, "source_script": "VermilionCity_PokemonCenter_1F_EventScript_Youngster" @@ -71,12 +75,14 @@ { "name": "cooltrainer_f", "coord": [6, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 4, "source_script": "VermilionCity_PokemonCenter_1F_EventScript_VSSeekerWoman" }, { "name": "0", "coord": [2, 1], + "movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL", "source_event": 5, "source_script": "VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge" @@ -84,6 +90,7 @@ { "name": "0", "coord": [3, 1], + "movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL", "source_event": 6, "source_script": "VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge" diff --git a/data/games/frlg/maps/base/VermilionCity_PokemonFanClub.json b/data/games/frlg/maps/base/VermilionCity_PokemonFanClub.json index a555561..ef2f757 100644 --- a/data/games/frlg/maps/base/VermilionCity_PokemonFanClub.json +++ b/data/games/frlg/maps/base/VermilionCity_PokemonFanClub.json @@ -47,30 +47,35 @@ { "name": "gentleman", "coord": [5, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "VermilionCity_PokemonFanClub_EventScript_Chairman" }, { "name": "worker_f", "coord": [6, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 1, "source_script": "VermilionCity_PokemonFanClub_EventScript_WorkerF" }, { "name": "pikachu", "coord": [7, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 2, "source_script": "VermilionCity_PokemonFanClub_EventScript_Pikachu" }, { "name": "seel", "coord": [4, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 3, "source_script": "VermilionCity_PokemonFanClub_EventScript_Seel" }, { "name": "woman_1", "coord": [4, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 4, "source_script": "VermilionCity_PokemonFanClub_EventScript_Woman", "source_local_id": "LOCALID_POKEMON_FAN_CLUB_WOMAN" @@ -78,6 +83,7 @@ { "name": "fat_man", "coord": [7, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 5, "source_script": "VermilionCity_PokemonFanClub_EventScript_FatMan", "source_local_id": "LOCALID_POKEMON_FAN_CLUB_FAT_MAN" diff --git a/data/games/frlg/maps/base/VictoryRoad_1F.json b/data/games/frlg/maps/base/VictoryRoad_1F.json index 35ef49d..42eef83 100644 --- a/data/games/frlg/maps/base/VictoryRoad_1F.json +++ b/data/games/frlg/maps/base/VictoryRoad_1F.json @@ -143,6 +143,7 @@ { "name": "cooltrainer_m", "coord": [5, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 0, @@ -151,6 +152,7 @@ { "name": "cooltrainer_f", "coord": [14, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 1, @@ -159,18 +161,32 @@ { "name": "pushable_boulder", "coord": [7, 18], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, "source_event": 4, "source_script": "EventScript_StrengthBoulder", "source_local_id": "LOCALID_VICTORY_ROAD_1F_BOULDER" }, - {"name": "pushable_boulder", "coord": [4, 12], "source_event": 5, "source_script": "EventScript_StrengthBoulder"}, - {"name": "pushable_boulder", "coord": [16, 3], "source_event": 6, "source_script": "EventScript_StrengthBoulder"} + { + "name": "pushable_boulder", + "coord": [4, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, + "source_event": 5, + "source_script": "EventScript_StrengthBoulder" + }, + { + "name": "pushable_boulder", + "coord": [16, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, + "source_event": 6, + "source_script": "EventScript_StrengthBoulder" + } ], "items": [ { "name": "item_ball", "coord": [12, 3], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_1F_RARE_CANDY", "source_script": "VictoryRoad_1F_EventScript_ItemRareCandy", "item": "rare_candy" @@ -179,6 +195,7 @@ "name": "item_ball", "coord": [14, 1], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02", "source_script": "VictoryRoad_1F_EventScript_ItemTM02", "item": "tm02" diff --git a/data/games/frlg/maps/base/VictoryRoad_2F.json b/data/games/frlg/maps/base/VictoryRoad_2F.json index ffc53c1..17f2264 100644 --- a/data/games/frlg/maps/base/VictoryRoad_2F.json +++ b/data/games/frlg/maps/base/VictoryRoad_2F.json @@ -173,6 +173,7 @@ { "name": "poke_maniac", "coord": [7, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 0, @@ -181,6 +182,7 @@ { "name": "black_belt", "coord": [20, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["south", "west"]}, "source_event": 1, "source_script": "VictoryRoad_2F_EventScript_Daisuke" @@ -188,6 +190,7 @@ { "name": "rocker", "coord": [31, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 4}, "source_event": 2, @@ -196,6 +199,8 @@ { "name": "man", "coord": [26, 6], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP", "range": [4, 4]}, + "wander": {"min": [22, 2], "max": [30, 10]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 3, "source_script": "VictoryRoad_2F_EventScript_Vincent" @@ -203,15 +208,23 @@ { "name": "rocker", "coord": [36, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 3}, "source_event": 4, "source_script": "VictoryRoad_2F_EventScript_Gregory" }, - {"name": "pushable_boulder", "coord": [8, 7], "source_event": 9, "source_script": "EventScript_StrengthBoulder"}, + { + "name": "pushable_boulder", + "coord": [8, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, + "source_event": 9, + "source_script": "EventScript_StrengthBoulder" + }, { "name": "pushable_boulder", "coord": [6, 17], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, "source_event": 10, "source_script": "EventScript_StrengthBoulder", "source_local_id": "LOCALID_VICTORY_ROAD_2F_BOULDER1" @@ -219,6 +232,7 @@ { "name": "pushable_boulder", "coord": [33, 19], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_2F_BOULDER", "source_event": 11, "source_script": "EventScript_StrengthBoulder", @@ -227,6 +241,7 @@ { "name": "cooltrainer_m", "coord": [40, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 12, "source_script": "VictoryRoad_2F_EventScript_DoubleEdgeTutor" } @@ -236,6 +251,7 @@ "name": "item_ball", "coord": [17, 6], "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_2F_GUARD_SPEC", "source_script": "VictoryRoad_2F_EventScript_ItemGuardSpec", "item": "guard_spec" @@ -244,6 +260,7 @@ "name": "item_ball", "coord": [40, 7], "source_event": 6, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM07", "source_script": "VictoryRoad_2F_EventScript_ItemTM07", "item": "tm07" @@ -252,6 +269,7 @@ "name": "item_ball", "coord": [25, 13], "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_2F_FULL_HEAL", "source_script": "VictoryRoad_2F_EventScript_ItemFullHeal", "item": "full_heal" @@ -260,6 +278,7 @@ "name": "item_ball", "coord": [14, 13], "source_event": 8, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM37", "source_script": "VictoryRoad_2F_EventScript_ItemTM37", "item": "tm37" diff --git a/data/games/frlg/maps/base/VictoryRoad_3F.json b/data/games/frlg/maps/base/VictoryRoad_3F.json index 3d659da..d42312f 100644 --- a/data/games/frlg/maps/base/VictoryRoad_3F.json +++ b/data/games/frlg/maps/base/VictoryRoad_3F.json @@ -135,6 +135,7 @@ { "name": "cooltrainer_m", "coord": [40, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 1}, "source_event": 0, @@ -143,6 +144,7 @@ { "name": "cooltrainer_f", "coord": [21, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 1, @@ -151,6 +153,7 @@ { "name": "cooltrainer_m", "coord": [10, 17], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 5}, "source_event": 2, @@ -159,6 +162,7 @@ { "name": "cooltrainer_f", "coord": [11, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 5}, "source_event": 3, @@ -167,6 +171,7 @@ { "name": "pushable_boulder", "coord": [19, 15], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, "source_event": 6, "source_script": "EventScript_StrengthBoulder", "source_local_id": "LOCALID_VICTORY_ROAD_3F_BOULDER1" @@ -174,14 +179,22 @@ { "name": "pushable_boulder", "coord": [33, 18], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_3F_BOULDER", "source_event": 7, "source_script": "EventScript_StrengthBoulder" }, - {"name": "pushable_boulder", "coord": [35, 13], "source_event": 8, "source_script": "EventScript_StrengthBoulder"}, + { + "name": "pushable_boulder", + "coord": [35, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, + "source_event": 8, + "source_script": "EventScript_StrengthBoulder" + }, { "name": "pushable_boulder", "coord": [32, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, "source_event": 9, "source_script": "EventScript_StrengthBoulder", "source_local_id": "LOCALID_VICTORY_ROAD_3F_BOULDER2" @@ -189,6 +202,7 @@ { "name": "cooltrainer_m", "coord": [38, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 10, @@ -197,6 +211,7 @@ { "name": "cooltrainer_f", "coord": [39, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 11, @@ -208,6 +223,7 @@ "name": "item_ball", "coord": [38, 7], "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_3F_MAX_REVIVE", "source_script": "VictoryRoad_3F_EventScript_ItemMaxRevive", "item": "max_revive" @@ -216,6 +232,7 @@ "name": "item_ball", "coord": [12, 9], "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50", "source_script": "VictoryRoad_3F_EventScript_ItemTM50", "item": "tm50" diff --git a/data/games/frlg/maps/base/ViridianCity.json b/data/games/frlg/maps/base/ViridianCity.json index 01c9081..400b39b 100644 --- a/data/games/frlg/maps/base/ViridianCity.json +++ b/data/games/frlg/maps/base/ViridianCity.json @@ -120,12 +120,14 @@ { "name": "fat_man", "coord": [8, 26], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, "source_event": 0, "source_script": "ViridianCity_EventScript_DreamEaterTutor" }, { "name": "cut_tree", "coord": [11, 24], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_11", "source_event": 1, "source_script": "EventScript_CutTree" @@ -133,6 +135,7 @@ { "name": "old_man_1", "coord": [34, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [0, 0]}, "source_event": 2, "source_script": "ViridianCity_EventScript_OldMan", "source_local_id": "LOCALID_VIRIDIAN_OLD_MAN" @@ -140,6 +143,7 @@ { "name": "var_0", "coord": [21, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [2, 3]}, "source_event": 3, "source_script": "ViridianCity_EventScript_TutorialOldMan", "source_local_id": "LOCALID_TUTORIAL_MAN" @@ -147,6 +151,7 @@ { "name": "woman_3", "coord": [20, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 3]}, "source_event": 4, "source_script": "ViridianCity_EventScript_Woman", "source_local_id": "LOCALID_VIRIDIAN_WOMAN" @@ -154,6 +159,7 @@ { "name": "youngster", "coord": [33, 26], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [0, 2]}, "wander": {"min": [33, 24], "max": [33, 28]}, "source_event": 5, "source_script": "ViridianCity_EventScript_Youngster" @@ -161,6 +167,7 @@ { "name": "boy", "coord": [16, 22], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 2]}, "wander": {"min": [15, 20], "max": [17, 24]}, "source_event": 6, "source_script": "ViridianCity_EventScript_Boy" @@ -168,6 +175,7 @@ { "name": "cut_tree", "coord": [18, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 7, "source_script": "EventScript_CutTree", @@ -179,6 +187,7 @@ "name": "item_ball", "coord": [17, 5], "source_event": 8, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VIRIDIAN_CITY_POTION", "source_script": "ViridianCity_EventScript_ItemPotion", "item": "potion" diff --git a/data/games/frlg/maps/base/ViridianCity_Gym.json b/data/games/frlg/maps/base/ViridianCity_Gym.json index c26539c..8b4c241 100644 --- a/data/games/frlg/maps/base/ViridianCity_Gym.json +++ b/data/games/frlg/maps/base/ViridianCity_Gym.json @@ -56,6 +56,7 @@ { "name": "black_belt", "coord": [10, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 0, @@ -64,6 +65,7 @@ { "name": "cooltrainer_m", "coord": [12, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 1, @@ -72,6 +74,7 @@ { "name": "black_belt", "coord": [11, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 3}, "source_event": 2, @@ -80,6 +83,7 @@ { "name": "man", "coord": [10, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 3, @@ -88,6 +92,7 @@ { "name": "man", "coord": [2, 21], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 4, @@ -96,6 +101,7 @@ { "name": "black_belt", "coord": [3, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 2}, "source_event": 5, @@ -104,6 +110,7 @@ { "name": "cooltrainer_m", "coord": [6, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 6, @@ -112,6 +119,7 @@ { "name": "giovanni", "coord": [2, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VIRIDIAN_GIOVANNI", "source_event": 7, "source_script": "ViridianCity_Gym_EventScript_Giovanni", @@ -120,11 +128,18 @@ { "name": "cooltrainer_m", "coord": [13, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 3}, "source_event": 8, "source_script": "ViridianCity_Gym_EventScript_Warren" }, - {"name": "gym_guy", "coord": [16, 20], "source_event": 9, "source_script": "ViridianCity_Gym_EventScript_GymGuy"} + { + "name": "gym_guy", + "coord": [16, 20], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 9, + "source_script": "ViridianCity_Gym_EventScript_GymGuy" + } ] } diff --git a/data/games/frlg/maps/base/ViridianCity_Mart.json b/data/games/frlg/maps/base/ViridianCity_Mart.json index b424782..c71a49e 100644 --- a/data/games/frlg/maps/base/ViridianCity_Mart.json +++ b/data/games/frlg/maps/base/ViridianCity_Mart.json @@ -31,6 +31,7 @@ { "name": "clerk", "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 0, "source_script": "ViridianCity_Mart_EventScript_Clerk", "source_local_id": "LOCALID_VIRIDIAN_MART_CLERK" @@ -38,6 +39,7 @@ { "name": "youngster", "coord": [6, 2], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [5, 1], "max": [7, 3]}, "source_event": 1, "source_script": "ViridianCity_Mart_EventScript_Youngster" @@ -45,6 +47,7 @@ { "name": "woman_1", "coord": [9, 5], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [1, 1]}, "wander": {"min": [9, 4], "max": [9, 6]}, "source_event": 2, "source_script": "ViridianCity_Mart_EventScript_Woman" diff --git a/data/games/frlg/maps/base/ViridianCity_PokemonCenter_1F.json b/data/games/frlg/maps/base/ViridianCity_PokemonCenter_1F.json index f037cb3..4e3cf63 100644 --- a/data/games/frlg/maps/base/ViridianCity_PokemonCenter_1F.json +++ b/data/games/frlg/maps/base/ViridianCity_PokemonCenter_1F.json @@ -44,6 +44,7 @@ { "name": "nurse", "coord": [7, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "ViridianCity_PokemonCenter_1F_EventScript_Nurse", "source_local_id": "LOCALID_VIRIDIAN_NURSE" @@ -51,18 +52,21 @@ { "name": "gentleman", "coord": [12, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 1, "source_script": "ViridianCity_PokemonCenter_1F_EventScript_Gentleman" }, { "name": "boy", "coord": [4, 7], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 2, "source_script": "ViridianCity_PokemonCenter_1F_EventScript_Boy" }, { "name": "youngster", "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [1, 2], "max": [3, 4]}, "source_event": 3, "source_script": "ViridianCity_PokemonCenter_1F_EventScript_Youngster" diff --git a/data/games/frlg/maps/base/ViridianForest.json b/data/games/frlg/maps/base/ViridianForest.json index 2b34a5e..56565d1 100644 --- a/data/games/frlg/maps/base/ViridianForest.json +++ b/data/games/frlg/maps/base/ViridianForest.json @@ -118,11 +118,24 @@ } ], "npcs": [ - {"name": "youngster", "coord": [29, 58], "source_event": 0, "source_script": "ViridianForest_EventScript_Youngster"}, - {"name": "boy", "coord": [45, 58], "source_event": 1, "source_script": "ViridianForest_EventScript_Boy"}, + { + "name": "youngster", + "coord": [29, 58], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 0, + "source_script": "ViridianForest_EventScript_Youngster" + }, + { + "name": "boy", + "coord": [45, 58], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 1, + "source_script": "ViridianForest_EventScript_Boy" + }, { "name": "bug_catcher", "coord": [47, 45], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 5}, "source_event": 2, @@ -131,6 +144,7 @@ { "name": "bug_catcher", "coord": [47, 29], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 4}, "source_event": 3, @@ -139,6 +153,7 @@ { "name": "bug_catcher", "coord": [7, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 4}, "source_event": 4, @@ -147,6 +162,7 @@ { "name": "bug_catcher", "coord": [43, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["south", "north"]}, "source_event": 8, "source_script": "ViridianForest_EventScript_Anthony" @@ -154,6 +170,7 @@ { "name": "bug_catcher", "coord": [16, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 1}, "source_event": 9, @@ -165,6 +182,7 @@ "name": "item_ball", "coord": [5, 41], "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VIRIDIAN_FOREST_POKE_BALL", "source_script": "ViridianForest_EventScript_ItemPokeBall", "item": "poke_ball" @@ -173,6 +191,7 @@ "name": "item_ball", "coord": [40, 21], "source_event": 6, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VIRIDIAN_FOREST_ANTIDOTE", "source_script": "ViridianForest_EventScript_ItemAntidote", "item": "antidote" @@ -181,6 +200,7 @@ "name": "item_ball", "coord": [21, 34], "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION", "source_script": "ViridianForest_EventScript_ItemPotion", "item": "potion" @@ -189,6 +209,7 @@ "name": "item_ball", "coord": [49, 60], "source_event": 10, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION_2", "source_script": "ViridianForest_EventScript_ItemPotion2", "item": "potion" diff --git a/data/games/frlg/maps/runtime/CeladonCity.json b/data/games/frlg/maps/runtime/CeladonCity.json index 4ed53fc..1d81ce3 100644 --- a/data/games/frlg/maps/runtime/CeladonCity.json +++ b/data/games/frlg/maps/runtime/CeladonCity.json @@ -148,6 +148,7 @@ { "name": "rocket_m", "coord": [48, 15], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [4, 1]}, "wander": {"min": [44, 15], "max": [52, 15]}, "hide_flag": "FLAG_HIDE_CELADON_ROCKETS", "source_event": 0, @@ -156,6 +157,7 @@ { "name": "fat_man", "coord": [38, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 1, "source_script": "CeladonCity_EventScript_FatMan", "source_local_id": "LOCALID_CELADON_FAT_MAN" @@ -163,37 +165,61 @@ { "name": "poliwrath", "coord": [36, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 2, "source_script": "CeladonCity_EventScript_Poliwrath", "source_local_id": "LOCALID_CELADON_POLIWRATH" }, - {"name": "little_girl", "coord": [11, 18], "source_event": 3, "source_script": "CeladonCity_EventScript_LittleGirl"}, + { + "name": "little_girl", + "coord": [11, 18], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "range": [4, 4]}, + "wander": {"min": [7, 14], "max": [15, 22]}, + "source_event": 3, + "source_script": "CeladonCity_EventScript_LittleGirl" + }, { "name": "woman_2", "coord": [18, 22], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 5]}, "wander": {"min": [16, 17], "max": [20, 27]}, "source_event": 4, "source_script": "CeladonCity_EventScript_Woman" }, - {"name": "old_man_1", "coord": [30, 24], "source_event": 5, "source_script": "CeladonCity_EventScript_OldMan2"}, + { + "name": "old_man_1", + "coord": [30, 24], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 5, + "source_script": "CeladonCity_EventScript_OldMan2" + }, { "name": "old_man_2", "coord": [26, 19], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 6, "source_script": "CeladonCity_EventScript_SoftboiledTutor" }, { "name": "rocket_m", "coord": [38, 31], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [5, 1]}, "wander": {"min": [33, 31], "max": [43, 31]}, "hide_flag": "FLAG_HIDE_CELADON_ROCKETS", "source_event": 7, "source_script": "CeladonCity_EventScript_RocketGrunt2" }, - {"name": "old_man_1", "coord": [9, 30], "source_event": 8, "source_script": "CeladonCity_EventScript_OldMan1"}, + { + "name": "old_man_1", + "coord": [9, 30], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 8, + "source_script": "CeladonCity_EventScript_OldMan1" + }, { "name": "cut_tree", "coord": [52, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 9, "source_script": "EventScript_CutTree", @@ -202,14 +228,22 @@ { "name": "cut_tree", "coord": [40, 35], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 10, "source_script": "EventScript_CutTree" }, - {"name": "boy", "coord": [25, 10], "source_event": 11, "source_script": "CeladonCity_EventScript_Boy"}, + { + "name": "boy", + "coord": [25, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 11, + "source_script": "CeladonCity_EventScript_Boy" + }, { "name": "scientist", "coord": [47, 24], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CELADON_ROCKETS", "source_event": 14, "source_script": "CeladonCity_EventScript_SilphCoScientist" @@ -220,6 +254,7 @@ "name": "item_ball", "coord": [5, 3], "source_event": 13, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CELADON_CITY_ETHER", "source_script": "CeladonCity_EventScript_ItemEther", "item": "ether" diff --git a/data/games/frlg/maps/runtime/CeladonCity_Condominiums_1F.json b/data/games/frlg/maps/runtime/CeladonCity_Condominiums_1F.json index 3afc216..5c35db8 100644 --- a/data/games/frlg/maps/runtime/CeladonCity_Condominiums_1F.json +++ b/data/games/frlg/maps/runtime/CeladonCity_Condominiums_1F.json @@ -45,12 +45,14 @@ { "name": "meowth", "coord": [1, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 0, "source_script": "CeladonCity_Condominiums_1F_EventScript_Meowth" }, { "name": "clefairy", "coord": [5, 13], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [4, 13], "max": [6, 13]}, "source_event": 1, "source_script": "CeladonCity_Condominiums_1F_EventScript_Clefairy" @@ -58,6 +60,7 @@ { "name": "nidoran_f", "coord": [5, 8], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 1]}, "wander": {"min": [3, 7], "max": [7, 9]}, "source_event": 2, "source_script": "CeladonCity_Condominiums_1F_EventScript_Nidoran" @@ -65,6 +68,7 @@ { "name": "old_woman", "coord": [2, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 3, "source_script": "CeladonCity_Condominiums_1F_EventScript_TeaWoman" } diff --git a/data/games/frlg/maps/runtime/CeladonCity_Condominiums_2F.json b/data/games/frlg/maps/runtime/CeladonCity_Condominiums_2F.json index 5124195..a227c23 100644 --- a/data/games/frlg/maps/runtime/CeladonCity_Condominiums_2F.json +++ b/data/games/frlg/maps/runtime/CeladonCity_Condominiums_2F.json @@ -43,6 +43,7 @@ { "name": "0", "coord": [6, 6], + "movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS", "source_event": 0, "source_script": "CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika" @@ -50,6 +51,7 @@ { "name": "0", "coord": [5, 6], + "movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS", "source_event": 1, "source_script": "CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika" diff --git a/data/games/frlg/maps/runtime/CeladonCity_Condominiums_3F.json b/data/games/frlg/maps/runtime/CeladonCity_Condominiums_3F.json index 887f2ad..cb6977f 100644 --- a/data/games/frlg/maps/runtime/CeladonCity_Condominiums_3F.json +++ b/data/games/frlg/maps/runtime/CeladonCity_Condominiums_3F.json @@ -43,24 +43,28 @@ { "name": "rocker", "coord": [0, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 0, "source_script": "CeladonCity_Condominiums_3F_EventScript_Programmer" }, { "name": "man", "coord": [3, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 1, "source_script": "CeladonCity_Condominiums_3F_EventScript_Designer" }, { "name": "poke_maniac", "coord": [4, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 2, "source_script": "CeladonCity_Condominiums_3F_EventScript_GraphicArtist" }, { "name": "fat_man", "coord": [0, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 3, "source_script": "CeladonCity_Condominiums_3F_EventScript_Writer" } diff --git a/data/games/frlg/maps/runtime/CeladonCity_Condominiums_RoofRoom.json b/data/games/frlg/maps/runtime/CeladonCity_Condominiums_RoofRoom.json index 8e678ed..d3f7293 100644 --- a/data/games/frlg/maps/runtime/CeladonCity_Condominiums_RoofRoom.json +++ b/data/games/frlg/maps/runtime/CeladonCity_Condominiums_RoofRoom.json @@ -43,6 +43,7 @@ { "name": "black_belt", "coord": [3, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "CeladonCity_Condominiums_RoofRoom_EventScript_BlackBelt" } @@ -52,6 +53,7 @@ "name": "item_ball", "coord": [7, 3], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_EEVEE_BALL", "source_script": "CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall", "source_local_id": "LOCALID_EEVEE_POKEBALL", diff --git a/data/games/frlg/maps/runtime/CeladonCity_DepartmentStore_1F.json b/data/games/frlg/maps/runtime/CeladonCity_DepartmentStore_1F.json index b9a7e8f..83ca62e 100644 --- a/data/games/frlg/maps/runtime/CeladonCity_DepartmentStore_1F.json +++ b/data/games/frlg/maps/runtime/CeladonCity_DepartmentStore_1F.json @@ -43,6 +43,7 @@ { "name": "worker_f", "coord": [6, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "CeladonCity_DepartmentStore_1F_EventScript_Receptionist" } diff --git a/data/games/frlg/maps/runtime/CeladonCity_DepartmentStore_5F.json b/data/games/frlg/maps/runtime/CeladonCity_DepartmentStore_5F.json index 81900af..79162ea 100644 --- a/data/games/frlg/maps/runtime/CeladonCity_DepartmentStore_5F.json +++ b/data/games/frlg/maps/runtime/CeladonCity_DepartmentStore_5F.json @@ -37,6 +37,7 @@ { "name": "gentleman", "coord": [11, 6], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [10, 6], "max": [12, 6]}, "source_event": 0, "source_script": "CeladonCity_DepartmentStore_5F_EventScript_Gentleman" @@ -44,6 +45,7 @@ { "name": "sailor", "coord": [6, 8], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [5, 7], "max": [7, 9]}, "source_event": 1, "source_script": "CeladonCity_DepartmentStore_5F_EventScript_Sailor" @@ -51,12 +53,14 @@ { "name": "clerk", "coord": [1, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [2, 1]}, "source_event": 2, "source_script": "CeladonCity_DepartmentStore_5F_EventScript_ClerkXItems" }, { "name": "clerk", "coord": [1, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [2, 1]}, "source_event": 3, "source_script": "CeladonCity_DepartmentStore_5F_EventScript_ClerkVitamins" } diff --git a/data/games/frlg/maps/runtime/CeladonCity_GameCorner.json b/data/games/frlg/maps/runtime/CeladonCity_GameCorner.json index 8ca924a..5500118 100644 --- a/data/games/frlg/maps/runtime/CeladonCity_GameCorner.json +++ b/data/games/frlg/maps/runtime/CeladonCity_GameCorner.json @@ -124,61 +124,77 @@ { "name": "worker_f", "coord": [4, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "CeladonCity_GameCorner_EventScript_InfoClerk" }, { "name": "worker_m", "coord": [6, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 1, "source_script": "CeladonCity_GameCorner_EventScript_CoinsClerk" }, { "name": "balding_man", "coord": [1, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 2, "source_script": "CeladonCity_GameCorner_EventScript_BaldingMan" }, { "name": "woman_2", "coord": [1, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 3, "source_script": "CeladonCity_GameCorner_EventScript_Woman1" }, - {"name": "fisher", "coord": [4, 7], "source_event": 4, "source_script": "CeladonCity_GameCorner_EventScript_Fisher"}, + { + "name": "fisher", + "coord": [4, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 4, + "source_script": "CeladonCity_GameCorner_EventScript_Fisher" + }, { "name": "gym_guy", "coord": [7, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 5, "source_script": "CeladonCity_GameCorner_EventScript_GymGuy" }, { "name": "woman_1", "coord": [7, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 6, "source_script": "CeladonCity_GameCorner_EventScript_Woman2" }, { "name": "old_man_2", "coord": [10, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 7, "source_script": "CeladonCity_GameCorner_EventScript_OldMan" }, { "name": "scientist", "coord": [13, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 8, "source_script": "CeladonCity_GameCorner_EventScript_Scientist" }, { "name": "gentleman", "coord": [16, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 9, "source_script": "CeladonCity_GameCorner_EventScript_Gentleman" }, { "name": "rocket_m", "coord": [11, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_GAME_CORNER_ROCKET", "source_event": 10, "source_script": "CeladonCity_GameCorner_EventScript_RocketGrunt", diff --git a/data/games/frlg/maps/runtime/CeladonCity_Gym.json b/data/games/frlg/maps/runtime/CeladonCity_Gym.json index ca39cb5..43a6eed 100644 --- a/data/games/frlg/maps/runtime/CeladonCity_Gym.json +++ b/data/games/frlg/maps/runtime/CeladonCity_Gym.json @@ -42,6 +42,7 @@ { "name": "lass", "coord": [3, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 3}, "source_event": 0, @@ -50,6 +51,7 @@ { "name": "beauty", "coord": [9, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 1, @@ -58,6 +60,7 @@ { "name": "picnicker", "coord": [10, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 2, @@ -66,6 +69,7 @@ { "name": "beauty", "coord": [2, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 3, @@ -74,6 +78,7 @@ { "name": "beauty", "coord": [5, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 4, @@ -82,15 +87,23 @@ { "name": "lass", "coord": [7, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 5, "source_script": "CeladonCity_Gym_EventScript_Lisa" }, - {"name": "erika", "coord": [6, 4], "source_event": 6, "source_script": "CeladonCity_Gym_EventScript_Erika"}, + { + "name": "erika", + "coord": [6, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 6, + "source_script": "CeladonCity_Gym_EventScript_Erika" + }, { "name": "cooltrainer_f", "coord": [8, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 2}, "source_event": 7, @@ -99,6 +112,7 @@ { "name": "cut_tree", "coord": [6, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 8, "source_script": "EventScript_CutTree" @@ -106,6 +120,7 @@ { "name": "cut_tree", "coord": [3, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 9, "source_script": "EventScript_CutTree" @@ -113,6 +128,7 @@ { "name": "cut_tree", "coord": [9, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 10, "source_script": "EventScript_CutTree" diff --git a/data/games/frlg/maps/runtime/CeruleanCave_1F.json b/data/games/frlg/maps/runtime/CeruleanCave_1F.json index 07a8e66..a259ce8 100644 --- a/data/games/frlg/maps/runtime/CeruleanCave_1F.json +++ b/data/games/frlg/maps/runtime/CeruleanCave_1F.json @@ -104,6 +104,7 @@ { "name": "rock_smash_rock", "coord": [7, 21], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 3, "source_script": "EventScript_RockSmash" @@ -111,6 +112,7 @@ { "name": "rock_smash_rock", "coord": [13, 21], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 4, "source_script": "EventScript_RockSmash" @@ -118,6 +120,7 @@ { "name": "rock_smash_rock", "coord": [5, 20], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 5, "source_script": "EventScript_RockSmash" @@ -125,6 +128,7 @@ { "name": "rock_smash_rock", "coord": [14, 20], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_15", "source_event": 6, "source_script": "EventScript_RockSmash" @@ -132,6 +136,7 @@ { "name": "rock_smash_rock", "coord": [11, 21], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_16", "source_event": 7, "source_script": "EventScript_RockSmash" @@ -139,6 +144,7 @@ { "name": "rock_smash_rock", "coord": [9, 18], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_17", "source_event": 8, "source_script": "EventScript_RockSmash" @@ -149,6 +155,7 @@ "name": "item_ball", "coord": [7, 3], "source_event": 0, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET", "source_script": "CeruleanCave_1F_EventScript_ItemNugget", "item": "nugget" @@ -157,6 +164,7 @@ "name": "item_ball", "coord": [11, 16], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE", "source_script": "CeruleanCave_1F_EventScript_ItemFullRestore", "item": "full_restore" @@ -165,6 +173,7 @@ "name": "item_ball", "coord": [25, 5], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR", "source_script": "CeruleanCave_1F_EventScript_ItemMaxElixir", "item": "max_elixir" diff --git a/data/games/frlg/maps/runtime/CeruleanCave_2F.json b/data/games/frlg/maps/runtime/CeruleanCave_2F.json index 3868eb6..33066d4 100644 --- a/data/games/frlg/maps/runtime/CeruleanCave_2F.json +++ b/data/games/frlg/maps/runtime/CeruleanCave_2F.json @@ -66,6 +66,7 @@ { "name": "rock_smash_rock", "coord": [33, 10], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 3, "source_script": "EventScript_RockSmash" @@ -73,6 +74,7 @@ { "name": "rock_smash_rock", "coord": [33, 9], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 4, "source_script": "EventScript_RockSmash" @@ -80,6 +82,7 @@ { "name": "rock_smash_rock", "coord": [25, 11], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 5, "source_script": "EventScript_RockSmash" @@ -87,6 +90,7 @@ { "name": "rock_smash_rock", "coord": [28, 20], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_15", "source_event": 6, "source_script": "EventScript_RockSmash" @@ -94,6 +98,7 @@ { "name": "rock_smash_rock", "coord": [30, 20], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_16", "source_event": 7, "source_script": "EventScript_RockSmash" @@ -101,6 +106,7 @@ { "name": "rock_smash_rock", "coord": [9, 13], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_17", "source_event": 8, "source_script": "EventScript_RockSmash" @@ -108,6 +114,7 @@ { "name": "rock_smash_rock", "coord": [23, 16], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_18", "source_event": 9, "source_script": "EventScript_RockSmash" @@ -115,6 +122,7 @@ { "name": "rock_smash_rock", "coord": [13, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_19", "source_event": 10, "source_script": "EventScript_RockSmash" @@ -122,6 +130,7 @@ { "name": "rock_smash_rock", "coord": [4, 12], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_1A", "source_event": 11, "source_script": "EventScript_RockSmash" @@ -129,6 +138,7 @@ { "name": "rock_smash_rock", "coord": [10, 20], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_1B", "source_event": 12, "source_script": "EventScript_RockSmash" @@ -139,6 +149,7 @@ "name": "item_ball", "coord": [9, 18], "source_event": 0, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP", "source_script": "CeruleanCave_2F_EventScript_ItemPPUp", "item": "pp_up" @@ -147,6 +158,7 @@ "name": "item_ball", "coord": [29, 16], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL", "source_script": "CeruleanCave_2F_EventScript_ItemUltraBall", "item": "ultra_ball" @@ -155,6 +167,7 @@ "name": "item_ball", "coord": [33, 12], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE", "source_script": "CeruleanCave_2F_EventScript_ItemFullRestore", "item": "full_restore" diff --git a/data/games/frlg/maps/runtime/CeruleanCave_B1F.json b/data/games/frlg/maps/runtime/CeruleanCave_B1F.json index c1165ae..007c3ae 100644 --- a/data/games/frlg/maps/runtime/CeruleanCave_B1F.json +++ b/data/games/frlg/maps/runtime/CeruleanCave_B1F.json @@ -76,6 +76,7 @@ { "name": "mewtwo", "coord": [7, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MEWTWO", "source_event": 2, "source_script": "CeruleanCave_B1F_EventScript_Mewtwo" @@ -83,6 +84,7 @@ { "name": "rock_smash_rock", "coord": [37, 1], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 3, "source_script": "EventScript_RockSmash" @@ -90,6 +92,7 @@ { "name": "rock_smash_rock", "coord": [38, 2], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 4, "source_script": "EventScript_RockSmash" @@ -97,6 +100,7 @@ { "name": "rock_smash_rock", "coord": [35, 1], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 5, "source_script": "EventScript_RockSmash" @@ -104,6 +108,7 @@ { "name": "rock_smash_rock", "coord": [37, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_15", "source_event": 6, "source_script": "EventScript_RockSmash" @@ -111,6 +116,7 @@ { "name": "rock_smash_rock", "coord": [35, 5], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_16", "source_event": 7, "source_script": "EventScript_RockSmash" @@ -118,6 +124,7 @@ { "name": "rock_smash_rock", "coord": [2, 2], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_17", "source_event": 8, "source_script": "EventScript_RockSmash" @@ -125,6 +132,7 @@ { "name": "rock_smash_rock", "coord": [4, 1], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_18", "source_event": 9, "source_script": "EventScript_RockSmash" @@ -132,6 +140,7 @@ { "name": "rock_smash_rock", "coord": [6, 1], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_19", "source_event": 10, "source_script": "EventScript_RockSmash" @@ -139,6 +148,7 @@ { "name": "rock_smash_rock", "coord": [3, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_1A", "source_event": 11, "source_script": "EventScript_RockSmash" @@ -149,6 +159,7 @@ "name": "item_ball", "coord": [31, 9], "source_event": 0, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL", "source_script": "CeruleanCave_B1F_EventScript_ItemUltraBall", "item": "ultra_ball" @@ -157,6 +168,7 @@ "name": "item_ball", "coord": [32, 2], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE", "source_script": "CeruleanCave_B1F_EventScript_ItemMaxRevive", "item": "max_revive" diff --git a/data/games/frlg/maps/runtime/CeruleanCity.json b/data/games/frlg/maps/runtime/CeruleanCity.json index e13aa82..fd05390 100644 --- a/data/games/frlg/maps/runtime/CeruleanCity.json +++ b/data/games/frlg/maps/runtime/CeruleanCity.json @@ -142,6 +142,7 @@ { "name": "policeman", "coord": [31, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "CeruleanCity_EventScript_Policeman", "source_local_id": "LOCALID_CERULEAN_POLICEMAN" @@ -149,6 +150,7 @@ { "name": "rocket_m", "coord": [33, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_ROCKET", "source_event": 1, "source_script": "CeruleanCity_EventScript_Grunt", @@ -157,6 +159,7 @@ { "name": "little_boy", "coord": [16, 21], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [1, 3]}, "wander": {"min": [16, 18], "max": [16, 24]}, "source_event": 2, "source_script": "CeruleanCity_EventScript_LittleBoy" @@ -164,6 +167,7 @@ { "name": "balding_man", "coord": [9, 23], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [8, 22], "max": [10, 24]}, "source_event": 3, "source_script": "CeruleanCity_EventScript_BaldingMan" @@ -171,6 +175,7 @@ { "name": "slowbro", "coord": [32, 29], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 4, "source_script": "CeruleanCity_EventScript_Slowbro", "source_local_id": "LOCALID_CERULEAN_SLOWBRO" @@ -178,14 +183,22 @@ { "name": "lass", "coord": [33, 29], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 5, "source_script": "CeruleanCity_EventScript_Lass", "source_local_id": "LOCALID_CERULEAN_LASS" }, - {"name": "youngster", "coord": [34, 22], "source_event": 6, "source_script": "CeruleanCity_EventScript_Youngster"}, + { + "name": "youngster", + "coord": [34, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 6, + "source_script": "CeruleanCity_EventScript_Youngster" + }, { "name": "blue", "coord": [22, 0], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_RIVAL", "source_event": 7, "source_script": "0x0", @@ -194,6 +207,7 @@ { "name": "cut_tree", "coord": [26, 32], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 8, "source_script": "EventScript_CutTree" @@ -201,6 +215,7 @@ { "name": "woman_1", "coord": [12, 30], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 10, "source_script": "CeruleanCity_EventScript_Woman", "source_local_id": "LOCALID_CERULEAN_WOMAN" @@ -208,6 +223,7 @@ { "name": "cooltrainer_m", "coord": [1, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CERULEAN_CAVE_GUARD", "source_event": 11, "source_script": "CeruleanCity_EventScript_CeruleanCaveGuard", diff --git a/data/games/frlg/maps/runtime/CeruleanCity_BikeShop.json b/data/games/frlg/maps/runtime/CeruleanCity_BikeShop.json index 0d4d239..3c0e72c 100644 --- a/data/games/frlg/maps/runtime/CeruleanCity_BikeShop.json +++ b/data/games/frlg/maps/runtime/CeruleanCity_BikeShop.json @@ -29,14 +29,27 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "man", "coord": [9, 3], "source_event": 0, "source_script": "CeruleanCity_BikeShop_EventScript_Clerk"}, + { + "name": "man", + "coord": [9, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 0, + "source_script": "CeruleanCity_BikeShop_EventScript_Clerk" + }, { "name": "youngster", "coord": [9, 7], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [8, 6], "max": [10, 8]}, "source_event": 1, "source_script": "CeruleanCity_BikeShop_EventScript_Youngster" }, - {"name": "woman_2", "coord": [5, 5], "source_event": 2, "source_script": "CeruleanCity_BikeShop_EventScript_Woman"} + { + "name": "woman_2", + "coord": [5, 5], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 2, + "source_script": "CeruleanCity_BikeShop_EventScript_Woman" + } ] } diff --git a/data/games/frlg/maps/runtime/CeruleanCity_Gym.json b/data/games/frlg/maps/runtime/CeruleanCity_Gym.json index 1c1b64e..4557075 100644 --- a/data/games/frlg/maps/runtime/CeruleanCity_Gym.json +++ b/data/games/frlg/maps/runtime/CeruleanCity_Gym.json @@ -63,6 +63,7 @@ { "name": "swimmer_m_water", "coord": [10, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 1}, "source_event": 0, @@ -71,12 +72,25 @@ { "name": "picnicker", "coord": [4, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 1, "source_script": "CeruleanCity_Gym_EventScript_Diana" }, - {"name": "misty", "coord": [8, 6], "source_event": 2, "source_script": "CeruleanCity_Gym_EventScript_Misty"}, - {"name": "gym_guy", "coord": [7, 16], "source_event": 3, "source_script": "CeruleanCity_Gym_EventScript_GymGuy"} + { + "name": "misty", + "coord": [8, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 2, + "source_script": "CeruleanCity_Gym_EventScript_Misty" + }, + { + "name": "gym_guy", + "coord": [7, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 3, + "source_script": "CeruleanCity_Gym_EventScript_GymGuy" + } ] } diff --git a/data/games/frlg/maps/runtime/CeruleanCity_House1.json b/data/games/frlg/maps/runtime/CeruleanCity_House1.json index 18fb648..cd1c710 100644 --- a/data/games/frlg/maps/runtime/CeruleanCity_House1.json +++ b/data/games/frlg/maps/runtime/CeruleanCity_House1.json @@ -33,6 +33,7 @@ { "name": "gentleman", "coord": [6, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 0, "source_script": "CeruleanCity_House1_EventScript_BadgeGuy" } diff --git a/data/games/frlg/maps/runtime/CeruleanCity_House2.json b/data/games/frlg/maps/runtime/CeruleanCity_House2.json index 43b29c9..7807abc 100644 --- a/data/games/frlg/maps/runtime/CeruleanCity_House2.json +++ b/data/games/frlg/maps/runtime/CeruleanCity_House2.json @@ -29,10 +29,17 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "hiker", "coord": [1, 2], "source_event": 0, "source_script": "CeruleanCity_House2_EventScript_Hiker"}, + { + "name": "hiker", + "coord": [1, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 0, + "source_script": "CeruleanCity_House2_EventScript_Hiker" + }, { "name": "lass", "coord": [7, 6], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [6, 5], "max": [8, 7]}, "source_event": 1, "source_script": "CeruleanCity_House2_EventScript_Lass" diff --git a/data/games/frlg/maps/runtime/CeruleanCity_Mart.json b/data/games/frlg/maps/runtime/CeruleanCity_Mart.json index 66b432d..b6a8bb5 100644 --- a/data/games/frlg/maps/runtime/CeruleanCity_Mart.json +++ b/data/games/frlg/maps/runtime/CeruleanCity_Mart.json @@ -28,10 +28,17 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "clerk", "coord": [2, 3], "source_event": 0, "source_script": "CeruleanCity_Mart_EventScript_Clerk"}, + { + "name": "clerk", + "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 0, + "source_script": "CeruleanCity_Mart_EventScript_Clerk" + }, { "name": "woman_1", "coord": [9, 2], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [4, 1]}, "wander": {"min": [5, 2], "max": [10, 2]}, "source_event": 1, "source_script": "CeruleanCity_Mart_EventScript_Woman" @@ -39,6 +46,7 @@ { "name": "youngster", "coord": [1, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 2, "source_script": "CeruleanCity_Mart_EventScript_Youngster" } diff --git a/data/games/frlg/maps/runtime/CeruleanCity_PokemonCenter_1F.json b/data/games/frlg/maps/runtime/CeruleanCity_PokemonCenter_1F.json index 3947a92..6a5c3cb 100644 --- a/data/games/frlg/maps/runtime/CeruleanCity_PokemonCenter_1F.json +++ b/data/games/frlg/maps/runtime/CeruleanCity_PokemonCenter_1F.json @@ -44,6 +44,7 @@ { "name": "nurse", "coord": [7, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "CeruleanCity_PokemonCenter_1F_EventScript_Nurse", "source_local_id": "LOCALID_CERULEAN_NURSE" @@ -51,12 +52,14 @@ { "name": "gentleman", "coord": [12, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 1, "source_script": "CeruleanCity_PokemonCenter_1F_EventScript_Gentleman" }, { "name": "rocker", "coord": [5, 4], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [4, 4], "max": [6, 4]}, "source_event": 2, "source_script": "CeruleanCity_PokemonCenter_1F_EventScript_Rocker" @@ -64,6 +67,7 @@ { "name": "youngster", "coord": [4, 8], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [3, 8], "max": [5, 8]}, "source_event": 3, "source_script": "CeruleanCity_PokemonCenter_1F_EventScript_Youngster" @@ -71,12 +75,14 @@ { "name": "lass", "coord": [3, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 4, "source_script": "CeruleanCity_PokemonCenter_1F_EventScript_Lass" }, { "name": "0", "coord": [2, 1], + "movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POSTGAME_GOSSIPERS", "source_event": 5, "source_script": "CeruleanCity_PokemonCenter_1F_EventScript_PokemonJournalMisty" @@ -84,6 +90,7 @@ { "name": "0", "coord": [3, 1], + "movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POSTGAME_GOSSIPERS", "source_event": 6, "source_script": "CeruleanCity_PokemonCenter_1F_EventScript_PokemonJournalMisty" diff --git a/data/games/frlg/maps/runtime/CinnabarIsland.json b/data/games/frlg/maps/runtime/CinnabarIsland.json index ce510cb..cff77ab 100644 --- a/data/games/frlg/maps/runtime/CinnabarIsland.json +++ b/data/games/frlg/maps/runtime/CinnabarIsland.json @@ -67,14 +67,22 @@ { "name": "woman_2", "coord": [14, 6], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [13, 6], "max": [15, 6]}, "source_event": 0, "source_script": "CinnabarIsland_EventScript_Woman" }, - {"name": "old_man_1", "coord": [11, 11], "source_event": 1, "source_script": "CinnabarIsland_EventScript_OldMan"}, + { + "name": "old_man_1", + "coord": [11, 11], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 1, + "source_script": "CinnabarIsland_EventScript_OldMan" + }, { "name": "bill", "coord": [20, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CINNABAR_BILL", "source_event": 2, "source_script": "0x0", @@ -83,6 +91,7 @@ { "name": "seagallop", "coord": [23, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CINNABAR_SEAGALLOP", "source_event": 3, "source_script": "0x0", diff --git a/data/games/frlg/maps/runtime/CinnabarIsland_Gym.json b/data/games/frlg/maps/runtime/CinnabarIsland_Gym.json index d1b31f6..5e55ec7 100644 --- a/data/games/frlg/maps/runtime/CinnabarIsland_Gym.json +++ b/data/games/frlg/maps/runtime/CinnabarIsland_Gym.json @@ -47,14 +47,22 @@ { "name": "poke_maniac", "coord": [25, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "CinnabarIsland_Gym_EventScript_Quinn", "source_local_id": "LOCALID_QUINN" }, - {"name": "scientist", "coord": [25, 4], "source_event": 1, "source_script": "CinnabarIsland_Gym_EventScript_Erik"}, + { + "name": "scientist", + "coord": [25, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 1, + "source_script": "CinnabarIsland_Gym_EventScript_Erik" + }, { "name": "scientist", "coord": [17, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 2, "source_script": "CinnabarIsland_Gym_EventScript_Avery", "source_local_id": "LOCALID_AVERY" @@ -62,6 +70,7 @@ { "name": "poke_maniac", "coord": [16, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 3, "source_script": "CinnabarIsland_Gym_EventScript_Ramon", "source_local_id": "LOCALID_RAMON" @@ -69,6 +78,7 @@ { "name": "scientist", "coord": [16, 18], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 4, "source_script": "CinnabarIsland_Gym_EventScript_Derek", "source_local_id": "LOCALID_DEREK" @@ -76,6 +86,7 @@ { "name": "poke_maniac", "coord": [4, 19], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 5, "source_script": "CinnabarIsland_Gym_EventScript_Dusty", "source_local_id": "LOCALID_DUSTY" @@ -83,11 +94,24 @@ { "name": "scientist", "coord": [4, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 6, "source_script": "CinnabarIsland_Gym_EventScript_Zac", "source_local_id": "LOCALID_ZAC" }, - {"name": "blaine", "coord": [5, 4], "source_event": 7, "source_script": "CinnabarIsland_Gym_EventScript_Blaine"}, - {"name": "gym_guy", "coord": [24, 20], "source_event": 8, "source_script": "CinnabarIsland_Gym_EventScript_GymGuy"} + { + "name": "blaine", + "coord": [5, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 7, + "source_script": "CinnabarIsland_Gym_EventScript_Blaine" + }, + { + "name": "gym_guy", + "coord": [24, 20], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 8, + "source_script": "CinnabarIsland_Gym_EventScript_GymGuy" + } ] } diff --git a/data/games/frlg/maps/runtime/CinnabarIsland_Mart.json b/data/games/frlg/maps/runtime/CinnabarIsland_Mart.json index 1bc4eae..24c1c36 100644 --- a/data/games/frlg/maps/runtime/CinnabarIsland_Mart.json +++ b/data/games/frlg/maps/runtime/CinnabarIsland_Mart.json @@ -28,11 +28,24 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "clerk", "coord": [2, 3], "source_event": 0, "source_script": "CinnabarIsland_Mart_EventScript_Clerk"}, - {"name": "woman_2", "coord": [6, 2], "source_event": 1, "source_script": "CinnabarIsland_Mart_EventScript_Woman"}, + { + "name": "clerk", + "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 0, + "source_script": "CinnabarIsland_Mart_EventScript_Clerk" + }, + { + "name": "woman_2", + "coord": [6, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 1, + "source_script": "CinnabarIsland_Mart_EventScript_Woman" + }, { "name": "scientist", "coord": [8, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 2, "source_script": "CinnabarIsland_Mart_EventScript_Scientist" } diff --git a/data/games/frlg/maps/runtime/FuchsiaCity.json b/data/games/frlg/maps/runtime/FuchsiaCity.json index 0f6b240..f38b436 100644 --- a/data/games/frlg/maps/runtime/FuchsiaCity.json +++ b/data/games/frlg/maps/runtime/FuchsiaCity.json @@ -131,19 +131,39 @@ } ], "npcs": [ - {"name": "fat_man", "coord": [37, 17], "source_event": 0, "source_script": "FuchsiaCity_EventScript_Erik"}, + { + "name": "fat_man", + "coord": [37, 17], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 0, + "source_script": "FuchsiaCity_EventScript_Erik" + }, { "name": "slowpoke", "coord": [36, 15], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND_SLOWER", "range": [4, 1]}, "wander": {"min": [32, 14], "max": [40, 16]}, "source_event": 1, "source_script": "0x0" }, - {"name": "voltorb", "coord": [33, 8], "source_event": 2, "source_script": "0x0"}, - {"name": "youngster", "coord": [33, 11], "source_event": 3, "source_script": "FuchsiaCity_EventScript_Youngster"}, + { + "name": "voltorb", + "coord": [33, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 2, + "source_script": "0x0" + }, + { + "name": "youngster", + "coord": [33, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 3, + "source_script": "FuchsiaCity_EventScript_Youngster" + }, { "name": "chansey", "coord": [39, 8], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [3, 1]}, "wander": {"min": [36, 7], "max": [42, 9]}, "source_event": 4, "source_script": "0x0" @@ -151,6 +171,7 @@ { "name": "little_boy", "coord": [14, 15], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [3, 1]}, "wander": {"min": [11, 15], "max": [17, 15]}, "source_event": 5, "source_script": "FuchsiaCity_EventScript_LittleBoy" @@ -158,6 +179,7 @@ { "name": "lapras", "coord": [12, 20], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 1]}, "wander": {"min": [10, 19], "max": [14, 21]}, "source_event": 6, "source_script": "0x0" @@ -165,14 +187,22 @@ { "name": "old_man_1", "coord": [36, 20], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [4, 1]}, "wander": {"min": [32, 20], "max": [40, 20]}, "source_event": 7, "source_script": "FuchsiaCity_EventScript_OldMan" }, - {"name": "var_0", "coord": [8, 8], "source_event": 8, "source_script": "0x0"}, + { + "name": "var_0", + "coord": [8, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 8, + "source_script": "0x0" + }, { "name": "kangaskhan", "coord": [16, 9], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [4, 1]}, "wander": {"min": [12, 8], "max": [20, 10]}, "source_event": 9, "source_script": "0x0" @@ -180,6 +210,7 @@ { "name": "cut_tree", "coord": [30, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 10, "source_script": "EventScript_CutTree" @@ -187,6 +218,7 @@ { "name": "cut_tree", "coord": [21, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 11, "source_script": "EventScript_CutTree" @@ -194,6 +226,7 @@ { "name": "cut_tree", "coord": [32, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 12, "source_script": "EventScript_CutTree" @@ -201,6 +234,7 @@ { "name": "cut_tree", "coord": [24, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_15", "source_event": 13, "source_script": "EventScript_CutTree" @@ -208,12 +242,14 @@ { "name": "bug_catcher", "coord": [15, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 14, "source_script": "FuchsiaCity_EventScript_SubstituteTutor" }, { "name": "lass", "coord": [40, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POSTGAME_GOSSIPERS", "source_event": 15, "source_script": "FuchsiaCity_EventScript_Lass" diff --git a/data/games/frlg/maps/runtime/FuchsiaCity_Gym.json b/data/games/frlg/maps/runtime/FuchsiaCity_Gym.json index ed7ab70..9c52ae3 100644 --- a/data/games/frlg/maps/runtime/FuchsiaCity_Gym.json +++ b/data/games/frlg/maps/runtime/FuchsiaCity_Gym.json @@ -45,6 +45,7 @@ { "name": "rocker", "coord": [12, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["south", "east"]}, "source_event": 0, "source_script": "FuchsiaCity_Gym_EventScript_Kayden" @@ -52,6 +53,7 @@ { "name": "rocker", "coord": [2, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 1}, "source_event": 1, @@ -60,6 +62,7 @@ { "name": "rocker", "coord": [11, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 3}, "source_event": 2, @@ -68,6 +71,7 @@ { "name": "man", "coord": [13, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "source_event": 3, "source_script": "FuchsiaCity_Gym_EventScript_Edgar" @@ -75,6 +79,7 @@ { "name": "man", "coord": [4, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "source_event": 4, "source_script": "FuchsiaCity_Gym_EventScript_Phil" @@ -82,12 +87,25 @@ { "name": "rocker", "coord": [2, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 5, "source_script": "FuchsiaCity_Gym_EventScript_Nate" }, - {"name": "koga", "coord": [7, 13], "source_event": 6, "source_script": "FuchsiaCity_Gym_EventScript_Koga"}, - {"name": "gym_guy", "coord": [11, 19], "source_event": 7, "source_script": "FuchsiaCity_Gym_EventScript_GymGuy"} + { + "name": "koga", + "coord": [7, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 6, + "source_script": "FuchsiaCity_Gym_EventScript_Koga" + }, + { + "name": "gym_guy", + "coord": [11, 19], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 7, + "source_script": "FuchsiaCity_Gym_EventScript_GymGuy" + } ] } diff --git a/data/games/frlg/maps/runtime/FuchsiaCity_Mart.json b/data/games/frlg/maps/runtime/FuchsiaCity_Mart.json index 1c1fdd4..b3abbdf 100644 --- a/data/games/frlg/maps/runtime/FuchsiaCity_Mart.json +++ b/data/games/frlg/maps/runtime/FuchsiaCity_Mart.json @@ -28,11 +28,24 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "clerk", "coord": [2, 3], "source_event": 0, "source_script": "FuchsiaCity_Mart_EventScript_Clerk"}, - {"name": "gentleman", "coord": [6, 3], "source_event": 1, "source_script": "FuchsiaCity_Mart_EventScript_Gentleman"}, + { + "name": "clerk", + "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 0, + "source_script": "FuchsiaCity_Mart_EventScript_Clerk" + }, + { + "name": "gentleman", + "coord": [6, 3], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 1, + "source_script": "FuchsiaCity_Mart_EventScript_Gentleman" + }, { "name": "cooltrainer_f", "coord": [9, 5], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [8, 4], "max": [10, 6]}, "source_event": 2, "source_script": "FuchsiaCity_Mart_EventScript_CooltrainerF" diff --git a/data/games/frlg/maps/runtime/FuchsiaCity_SafariZone_Entrance.json b/data/games/frlg/maps/runtime/FuchsiaCity_SafariZone_Entrance.json index 43a807a..6e9ef85 100644 --- a/data/games/frlg/maps/runtime/FuchsiaCity_SafariZone_Entrance.json +++ b/data/games/frlg/maps/runtime/FuchsiaCity_SafariZone_Entrance.json @@ -29,10 +29,17 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "worker_m", "coord": [7, 3], "source_event": 0, "source_script": "0x0"}, + { + "name": "worker_m", + "coord": [7, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 0, + "source_script": "0x0" + }, { "name": "worker_m", "coord": [1, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 1, "source_script": "FuchsiaCity_SafariZone_Entrance_EventScript_InfoAttendant" } diff --git a/data/games/frlg/maps/runtime/FuchsiaCity_WardensHouse.json b/data/games/frlg/maps/runtime/FuchsiaCity_WardensHouse.json index c267736..01b0e09 100644 --- a/data/games/frlg/maps/runtime/FuchsiaCity_WardensHouse.json +++ b/data/games/frlg/maps/runtime/FuchsiaCity_WardensHouse.json @@ -45,13 +45,21 @@ { "name": "old_man_2", "coord": [3, 5], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 0, "source_script": "FuchsiaCity_WardensHouse_EventScript_Warden" }, - {"name": "pushable_boulder", "coord": [11, 6], "source_event": 1, "source_script": "EventScript_StrengthBoulder"}, + { + "name": "pushable_boulder", + "coord": [11, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, + "source_event": 1, + "source_script": "EventScript_StrengthBoulder" + }, { "name": "0", "coord": [4, 1], + "movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_FAME_CHECKER_KOGA_JOURNAL", "source_event": 3, "source_script": "FuchsiaCity_WardensHouse_EventScript_PokemonJournalKoga" @@ -62,6 +70,7 @@ "name": "item_ball", "coord": [11, 5], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_FUCHSIA_CITY_WARDENS_HOUSE_RARE_CANDY", "source_script": "FuchsiaCity_WardensHouse_EventScript_ItemRareCandy", "item": "rare_candy" diff --git a/data/games/frlg/maps/runtime/IndigoPlateau_Exterior.json b/data/games/frlg/maps/runtime/IndigoPlateau_Exterior.json index 11e99d1..a1444da 100644 --- a/data/games/frlg/maps/runtime/IndigoPlateau_Exterior.json +++ b/data/games/frlg/maps/runtime/IndigoPlateau_Exterior.json @@ -37,6 +37,7 @@ { "name": "blue", "coord": [11, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CREDITS_RIVAL", "source_event": 0, "source_script": "0x0", @@ -45,6 +46,7 @@ { "name": "prof_oak", "coord": [11, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CREDITS_OAK", "source_event": 1, "source_script": "0x0", diff --git a/data/games/frlg/maps/runtime/IndigoPlateau_PokemonCenter_1F.json b/data/games/frlg/maps/runtime/IndigoPlateau_PokemonCenter_1F.json index 20c64a9..6f18811 100644 --- a/data/games/frlg/maps/runtime/IndigoPlateau_PokemonCenter_1F.json +++ b/data/games/frlg/maps/runtime/IndigoPlateau_PokemonCenter_1F.json @@ -59,12 +59,14 @@ { "name": "clerk", "coord": [0, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 0, "source_script": "IndigoPlateau_PokemonCenter_1F_EventScript_Clerk" }, { "name": "nurse", "coord": [13, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 1, "source_script": "IndigoPlateau_PokemonCenter_1F_EventScript_Nurse", "source_local_id": "LOCALID_LEAGUE_NURSE" @@ -72,12 +74,14 @@ { "name": "gym_guy", "coord": [7, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 2, "source_script": "IndigoPlateau_PokemonCenter_1F_EventScript_GymGuy" }, { "name": "cooltrainer_f", "coord": [5, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 3, "source_script": "IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard", "source_local_id": "LOCALID_LEAGUE_DOOR_GUARD" @@ -85,6 +89,7 @@ { "name": "black_belt", "coord": [23, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POSTGAME_GOSSIPERS", "source_event": 4, "source_script": "IndigoPlateau_PokemonCenter_1F_EventScript_BlackBelt" @@ -92,6 +97,7 @@ { "name": "0", "coord": [22, 9], + "movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POSTGAME_GOSSIPERS", "source_event": 5, "source_script": "IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal" @@ -99,6 +105,7 @@ { "name": "cooltrainer_m", "coord": [16, 15], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [15, 14], "max": [17, 16]}, "hide_flag": "FLAG_HIDE_POSTGAME_GOSSIPERS", "source_event": 6, @@ -107,6 +114,7 @@ { "name": "0", "coord": [23, 9], + "movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POSTGAME_GOSSIPERS", "source_event": 7, "source_script": "IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal" diff --git a/data/games/frlg/maps/runtime/LavenderTown.json b/data/games/frlg/maps/runtime/LavenderTown.json index 099006c..8bca02d 100644 --- a/data/games/frlg/maps/runtime/LavenderTown.json +++ b/data/games/frlg/maps/runtime/LavenderTown.json @@ -55,11 +55,24 @@ { "name": "little_girl", "coord": [19, 10], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 1]}, "wander": {"min": [17, 9], "max": [21, 11]}, "source_event": 0, "source_script": "LavenderTown_EventScript_LittleGirl" }, - {"name": "worker_m", "coord": [12, 12], "source_event": 1, "source_script": "LavenderTown_EventScript_WorkerM"}, - {"name": "boy", "coord": [10, 7], "source_event": 2, "source_script": "LavenderTown_EventScript_Boy"} + { + "name": "worker_m", + "coord": [12, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 1, + "source_script": "LavenderTown_EventScript_WorkerM" + }, + { + "name": "boy", + "coord": [10, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "range": [1, 1]}, + "source_event": 2, + "source_script": "LavenderTown_EventScript_Boy" + } ] } diff --git a/data/games/frlg/maps/runtime/LavenderTown_Mart.json b/data/games/frlg/maps/runtime/LavenderTown_Mart.json index 0240ff7..70ff67c 100644 --- a/data/games/frlg/maps/runtime/LavenderTown_Mart.json +++ b/data/games/frlg/maps/runtime/LavenderTown_Mart.json @@ -28,17 +28,31 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "clerk", "coord": [2, 3], "source_event": 0, "source_script": "LavenderTown_Mart_EventScript_Clerk"}, + { + "name": "clerk", + "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 0, + "source_script": "LavenderTown_Mart_EventScript_Clerk" + }, { "name": "balding_man", "coord": [6, 2], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 1, "source_script": "LavenderTown_Mart_EventScript_BaldingMan" }, - {"name": "rocker", "coord": [9, 2], "source_event": 2, "source_script": "LavenderTown_Mart_EventScript_Rocker"}, + { + "name": "rocker", + "coord": [9, 2], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 2, + "source_script": "LavenderTown_Mart_EventScript_Rocker" + }, { "name": "youngster", "coord": [9, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "range": [1, 1]}, "source_event": 3, "source_script": "LavenderTown_Mart_EventScript_Youngster" } diff --git a/data/games/frlg/maps/runtime/LavenderTown_PokemonCenter_1F.json b/data/games/frlg/maps/runtime/LavenderTown_PokemonCenter_1F.json index f8b771b..d84aea5 100644 --- a/data/games/frlg/maps/runtime/LavenderTown_PokemonCenter_1F.json +++ b/data/games/frlg/maps/runtime/LavenderTown_PokemonCenter_1F.json @@ -44,6 +44,7 @@ { "name": "nurse", "coord": [7, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "LavenderTown_PokemonCenter_1F_EventScript_Nurse", "source_local_id": "LOCALID_LAVENDER_NURSE" @@ -51,12 +52,14 @@ { "name": "gentleman", "coord": [9, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 1, "source_script": "LavenderTown_PokemonCenter_1F_EventScript_Gentleman" }, { "name": "lass", "coord": [5, 6], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [1, 2]}, "wander": {"min": [5, 4], "max": [5, 8]}, "source_event": 2, "source_script": "LavenderTown_PokemonCenter_1F_EventScript_Lass" @@ -64,6 +67,7 @@ { "name": "youngster", "coord": [2, 2], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [1, 1], "max": [3, 3]}, "source_event": 3, "source_script": "LavenderTown_PokemonCenter_1F_EventScript_Youngster" @@ -71,6 +75,7 @@ { "name": "balding_man", "coord": [14, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POSTGAME_GOSSIPERS", "source_event": 4, "source_script": "LavenderTown_PokemonCenter_1F_EventScript_BaldingMan" diff --git a/data/games/frlg/maps/runtime/LavenderTown_VolunteerPokemonHouse.json b/data/games/frlg/maps/runtime/LavenderTown_VolunteerPokemonHouse.json index 299365e..d9ec576 100644 --- a/data/games/frlg/maps/runtime/LavenderTown_VolunteerPokemonHouse.json +++ b/data/games/frlg/maps/runtime/LavenderTown_VolunteerPokemonHouse.json @@ -31,6 +31,7 @@ { "name": "mr_fuji", "coord": [3, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEHOUSE_FUJI", "source_event": 0, "source_script": "LavenderTown_VolunteerPokemonHouse_EventScript_MrFuji" @@ -38,30 +39,35 @@ { "name": "nidorino", "coord": [1, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 1, "source_script": "LavenderTown_VolunteerPokemonHouse_EventScript_Nidorino" }, { "name": "psyduck", "coord": [9, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 2, "source_script": "LavenderTown_VolunteerPokemonHouse_EventScript_Psyduck" }, { "name": "little_boy", "coord": [9, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 3, "source_script": "LavenderTown_VolunteerPokemonHouse_EventScript_LittleBoy" }, { "name": "youngster", "coord": [3, 5], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 4, "source_script": "LavenderTown_VolunteerPokemonHouse_EventScript_Youngster" }, { "name": "little_girl", "coord": [7, 2], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 5, "source_script": "LavenderTown_VolunteerPokemonHouse_EventScript_LittleGirl" } diff --git a/data/games/frlg/maps/runtime/MtMoon_1F.json b/data/games/frlg/maps/runtime/MtMoon_1F.json index 26204e9..7a08d04 100644 --- a/data/games/frlg/maps/runtime/MtMoon_1F.json +++ b/data/games/frlg/maps/runtime/MtMoon_1F.json @@ -74,6 +74,7 @@ { "name": "lass", "coord": [20, 26], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 0, @@ -82,6 +83,7 @@ { "name": "bug_catcher", "coord": [36, 30], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 1, @@ -90,6 +92,7 @@ { "name": "scientist", "coord": [30, 35], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["north", "east", "south", "west"]}, "source_event": 2, "source_script": "MtMoon_1F_EventScript_Jovan" @@ -97,6 +100,8 @@ { "name": "lass", "coord": [33, 4], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP", "range": [5, 3]}, + "wander": {"min": [28, 1], "max": [38, 7]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "source_event": 3, "source_script": "MtMoon_1F_EventScript_Miriam" @@ -104,6 +109,7 @@ { "name": "bug_catcher", "coord": [7, 26], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 4, @@ -112,6 +118,7 @@ { "name": "youngster", "coord": [13, 17], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 5, @@ -120,18 +127,26 @@ { "name": "hiker", "coord": [7, 10], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 2]}, "wander": {"min": [5, 8], "max": [9, 12]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 6, "source_script": "MtMoon_1F_EventScript_Marcos" }, - {"name": "balding_man", "coord": [42, 7], "source_event": 13, "source_script": "MtMoon_1F_EventScript_BaldingMan"} + { + "name": "balding_man", + "coord": [42, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "range": [1, 1]}, + "source_event": 13, + "source_script": "MtMoon_1F_EventScript_BaldingMan" + } ], "items": [ { "name": "item_ball", "coord": [2, 22], "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_1F_PARALYZE_HEAL", "source_script": "MtMoon_1F_EventScript_ItemParalyzeHeal", "item": "paralyze_heal" @@ -140,6 +155,7 @@ "name": "item_ball", "coord": [11, 35], "source_event": 8, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_1F_TM09", "source_script": "MtMoon_1F_EventScript_ItemTM09", "item": "tm09" @@ -148,6 +164,7 @@ "name": "item_ball", "coord": [26, 32], "source_event": 9, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_1F_POTION", "source_script": "MtMoon_1F_EventScript_ItemPotion", "item": "potion" @@ -156,6 +173,7 @@ "name": "item_ball", "coord": [42, 35], "source_event": 10, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_1F_RARE_CANDY", "source_script": "MtMoon_1F_EventScript_ItemRareCandy", "item": "rare_candy" @@ -164,6 +182,7 @@ "name": "item_ball", "coord": [44, 21], "source_event": 11, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_1F_ESCAPE_ROPE", "source_script": "MtMoon_1F_EventScript_ItemEscapeRope", "item": "escape_rope" @@ -172,6 +191,7 @@ "name": "item_ball", "coord": [3, 2], "source_event": 12, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_1F_MOON_STONE", "source_script": "MtMoon_1F_EventScript_ItemMoonStone", "item": "moon_stone" diff --git a/data/games/frlg/maps/runtime/MtMoon_B2F.json b/data/games/frlg/maps/runtime/MtMoon_B2F.json index c5da403..ed6a9aa 100644 --- a/data/games/frlg/maps/runtime/MtMoon_B2F.json +++ b/data/games/frlg/maps/runtime/MtMoon_B2F.json @@ -121,6 +121,7 @@ { "name": "fossil", "coord": [13, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_DOME_FOSSIL", "source_event": 0, "source_script": "MtMoon_B2F_EventScript_DomeFossil", @@ -129,6 +130,7 @@ { "name": "fossil", "coord": [14, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_HELIX_FOSSIL", "source_event": 1, "source_script": "MtMoon_B2F_EventScript_HelixFossil", @@ -137,6 +139,7 @@ { "name": "scientist", "coord": [13, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 2, "source_script": "MtMoon_B2F_EventScript_Miguel", "source_local_id": "LOCALID_MIGUEL" @@ -144,6 +147,7 @@ { "name": "rocket_m", "coord": [37, 21], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["north", "east", "south", "west"]}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", "source_event": 3, @@ -152,6 +156,7 @@ { "name": "rocket_m", "coord": [12, 20], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -161,6 +166,7 @@ { "name": "rocket_m", "coord": [35, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -170,6 +176,7 @@ { "name": "rocket_m", "coord": [18, 27], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -182,6 +189,7 @@ "name": "item_ball", "coord": [30, 26], "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_B2F_STAR_PIECE", "source_script": "MtMoon_B2F_EventScript_ItemStarPiece", "item": "star_piece" @@ -190,6 +198,7 @@ "name": "item_ball", "coord": [35, 5], "source_event": 8, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_B2F_TM46", "source_script": "MtMoon_B2F_EventScript_ItemTM46", "item": "tm46" @@ -198,6 +207,7 @@ "name": "item_ball", "coord": [24, 6], "source_event": 9, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_B2F_REVIVE", "source_script": "MtMoon_B2F_EventScript_ItemRevive", "item": "revive" @@ -206,6 +216,7 @@ "name": "item_ball", "coord": [3, 11], "source_event": 10, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MT_MOON_B2F_ANTIDOTE", "source_script": "MtMoon_B2F_EventScript_ItemAntidote", "item": "antidote" diff --git a/data/games/frlg/maps/runtime/PalletTown.json b/data/games/frlg/maps/runtime/PalletTown.json index 54e740d..197d9a7 100644 --- a/data/games/frlg/maps/runtime/PalletTown.json +++ b/data/games/frlg/maps/runtime/PalletTown.json @@ -65,6 +65,7 @@ { "name": "woman_1", "coord": [3, 10], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 4]}, "wander": {"min": [2, 6], "max": [4, 14]}, "source_event": 0, "source_script": "PalletTown_EventScript_SignLady", @@ -73,6 +74,7 @@ { "name": "fat_man", "coord": [13, 17], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [6, 2]}, "wander": {"min": [7, 15], "max": [19, 19]}, "source_event": 1, "source_script": "PalletTown_EventScript_FatMan", @@ -81,6 +83,7 @@ { "name": "prof_oak", "coord": [10, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_OAK_IN_PALLET_TOWN", "source_event": 2, "source_script": "0x0", diff --git a/data/games/frlg/maps/runtime/PalletTown_PlayersHouse_1F.json b/data/games/frlg/maps/runtime/PalletTown_PlayersHouse_1F.json index 3719282..3af48bf 100644 --- a/data/games/frlg/maps/runtime/PalletTown_PlayersHouse_1F.json +++ b/data/games/frlg/maps/runtime/PalletTown_PlayersHouse_1F.json @@ -33,6 +33,7 @@ { "name": "mom", "coord": [8, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [0, 0]}, "source_event": 0, "source_script": "PalletTown_PlayersHouse_1F_EventScript_Mom", "source_local_id": "LOCALID_MOM" diff --git a/data/games/frlg/maps/runtime/PalletTown_ProfessorOaksLab.json b/data/games/frlg/maps/runtime/PalletTown_ProfessorOaksLab.json index 55e69f7..860fdae 100644 --- a/data/games/frlg/maps/runtime/PalletTown_ProfessorOaksLab.json +++ b/data/games/frlg/maps/runtime/PalletTown_ProfessorOaksLab.json @@ -48,12 +48,14 @@ { "name": "scientist", "coord": [3, 11], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [0, 0]}, "source_event": 0, "source_script": "PalletTown_ProfessorOaksLab_EventScript_Aide1" }, { "name": "worker_f", "coord": [2, 10], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [0, 4]}, "wander": {"min": [2, 6], "max": [2, 13]}, "source_event": 1, "source_script": "PalletTown_ProfessorOaksLab_EventScript_Aide3" @@ -61,12 +63,14 @@ { "name": "scientist", "coord": [11, 10], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [0, 0]}, "source_event": 2, "source_script": "PalletTown_ProfessorOaksLab_EventScript_Aide2" }, { "name": "prof_oak", "coord": [6, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_OAK_IN_HIS_LAB", "source_event": 3, "source_script": "PalletTown_ProfessorOaksLab_EventScript_ProfOak", @@ -75,6 +79,7 @@ { "name": "blue", "coord": [5, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_RIVAL_IN_LAB", "source_event": 7, "source_script": "PalletTown_ProfessorOaksLab_EventScript_Rival", @@ -83,6 +88,7 @@ { "name": "pokedex", "coord": [4, 1], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEDEX", "source_event": 8, "source_script": "PalletTown_ProfessorOaksLab_EventScript_Pokedex", @@ -91,6 +97,7 @@ { "name": "pokedex", "coord": [5, 1], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEDEX", "source_event": 9, "source_script": "PalletTown_ProfessorOaksLab_EventScript_Pokedex", @@ -102,6 +109,7 @@ "name": "item_ball", "coord": [8, 4], "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_BULBASAUR_BALL", "source_script": "PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall", "source_local_id": "LOCALID_BULBASAUR_BALL", @@ -111,6 +119,7 @@ "name": "item_ball", "coord": [9, 4], "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SQUIRTLE_BALL", "source_script": "PalletTown_ProfessorOaksLab_EventScript_SquirtleBall", "source_local_id": "LOCALID_SQUIRTLE_BALL", @@ -120,6 +129,7 @@ "name": "item_ball", "coord": [10, 4], "source_event": 6, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_CHARMANDER_BALL", "source_script": "PalletTown_ProfessorOaksLab_EventScript_CharmanderBall", "source_local_id": "LOCALID_CHARMANDER_BALL", diff --git a/data/games/frlg/maps/runtime/PalletTown_RivalsHouse.json b/data/games/frlg/maps/runtime/PalletTown_RivalsHouse.json index cd9fa22..ce9fdcd 100644 --- a/data/games/frlg/maps/runtime/PalletTown_RivalsHouse.json +++ b/data/games/frlg/maps/runtime/PalletTown_RivalsHouse.json @@ -32,6 +32,7 @@ { "name": "daisy", "coord": [10, 6], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 3]}, "wander": {"min": [9, 3], "max": [11, 9]}, "source_event": 0, "source_script": "PalletTown_RivalsHouse_EventScript_Daisy", @@ -40,6 +41,7 @@ { "name": "town_map", "coord": [6, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_TOWN_MAP", "source_event": 1, "source_script": "PalletTown_RivalsHouse_EventScript_TownMap", diff --git a/data/games/frlg/maps/runtime/PewterCity.json b/data/games/frlg/maps/runtime/PewterCity.json index 2992faa..96d685f 100644 --- a/data/games/frlg/maps/runtime/PewterCity.json +++ b/data/games/frlg/maps/runtime/PewterCity.json @@ -83,19 +83,33 @@ } ], "npcs": [ - {"name": "lass", "coord": [6, 15], "source_event": 0, "source_script": "PewterCity_EventScript_Lass"}, + { + "name": "lass", + "coord": [6, 15], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 0, + "source_script": "PewterCity_EventScript_Lass" + }, { "name": "man", "coord": [33, 17], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_PEWTER_MUSEUM_GUIDE", "source_event": 1, "source_script": "PewterCity_EventScript_MuseumGuide", "source_local_id": "LOCALID_PEWTER_MUSEUM_GUIDE" }, - {"name": "fat_man", "coord": [21, 28], "source_event": 2, "source_script": "PewterCity_EventScript_FatMan"}, + { + "name": "fat_man", + "coord": [21, 28], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 2, + "source_script": "PewterCity_EventScript_FatMan" + }, { "name": "bug_catcher", "coord": [33, 27], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [2, 1]}, "wander": {"min": [31, 27], "max": [35, 27]}, "source_event": 3, "source_script": "PewterCity_EventScript_BugCatcher" @@ -103,6 +117,7 @@ { "name": "boy", "coord": [42, 20], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_PEWTER_CITY_GYM_GUIDE", "source_event": 4, "source_script": "PewterCity_EventScript_GymGuide", @@ -111,6 +126,7 @@ { "name": "cut_tree", "coord": [30, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 5, "source_script": "EventScript_CutTree" @@ -118,6 +134,7 @@ { "name": "scientist", "coord": [46, 20], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_PEWTER_CITY_RUNNING_SHOES_GUY", "source_event": 6, "source_script": "PewterCity_EventScript_RunningShoesAide", diff --git a/data/games/frlg/maps/runtime/PewterCity_Gym.json b/data/games/frlg/maps/runtime/PewterCity_Gym.json index 288fc61..8a60df0 100644 --- a/data/games/frlg/maps/runtime/PewterCity_Gym.json +++ b/data/games/frlg/maps/runtime/PewterCity_Gym.json @@ -35,15 +35,28 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "brock", "coord": [6, 5], "source_event": 0, "source_script": "PewterCity_Gym_EventScript_Brock"}, + { + "name": "brock", + "coord": [6, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 0, + "source_script": "PewterCity_Gym_EventScript_Brock" + }, { "name": "camper", "coord": [3, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 1, "source_script": "PewterCity_Gym_EventScript_Liam" }, - {"name": "gym_guy", "coord": [7, 12], "source_event": 2, "source_script": "PewterCity_Gym_EventScript_GymGuy"} + { + "name": "gym_guy", + "coord": [7, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 2, + "source_script": "PewterCity_Gym_EventScript_GymGuy" + } ] } diff --git a/data/games/frlg/maps/runtime/PewterCity_Mart.json b/data/games/frlg/maps/runtime/PewterCity_Mart.json index 633e19a..51e9f56 100644 --- a/data/games/frlg/maps/runtime/PewterCity_Mart.json +++ b/data/games/frlg/maps/runtime/PewterCity_Mart.json @@ -28,8 +28,26 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "youngster", "coord": [8, 2], "source_event": 0, "source_script": "PewterCity_Mart_EventScript_Youngster"}, - {"name": "boy", "coord": [6, 4], "source_event": 1, "source_script": "PewterCity_Mart_EventScript_Boy"}, - {"name": "clerk", "coord": [2, 3], "source_event": 2, "source_script": "PewterCity_Mart_EventScript_Clerk"} + { + "name": "youngster", + "coord": [8, 2], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 0, + "source_script": "PewterCity_Mart_EventScript_Youngster" + }, + { + "name": "boy", + "coord": [6, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 1, + "source_script": "PewterCity_Mart_EventScript_Boy" + }, + { + "name": "clerk", + "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 2, + "source_script": "PewterCity_Mart_EventScript_Clerk" + } ] } diff --git a/data/games/frlg/maps/runtime/PewterCity_Museum_1F.json b/data/games/frlg/maps/runtime/PewterCity_Museum_1F.json index 1af401a..e23c697 100644 --- a/data/games/frlg/maps/runtime/PewterCity_Museum_1F.json +++ b/data/games/frlg/maps/runtime/PewterCity_Museum_1F.json @@ -36,6 +36,7 @@ { "name": "worker_m", "coord": [16, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 0, "source_script": "PewterCity_Museum_1F_EventScript_Scientist1", "source_local_id": "LOCALID_MUSEUM_SCIENTIST1" @@ -43,18 +44,21 @@ { "name": "old_man_1", "coord": [2, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 1, "source_script": "PewterCity_Museum_1F_EventScript_OldMan" }, { "name": "scientist", "coord": [21, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 2, "source_script": "PewterCity_Museum_1F_EventScript_OldAmberScientist" }, { "name": "old_amber", "coord": [22, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_OLD_AMBER", "source_event": 3, "source_script": "PewterCity_Museum_1F_EventScript_OldAmber", @@ -63,12 +67,14 @@ { "name": "scientist", "coord": [26, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 4, "source_script": "PewterCity_Museum_1F_EventScript_Scientist2" }, { "name": "scientist", "coord": [26, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 5, "source_script": "PewterCity_Museum_1F_EventScript_SeismicTossTutor" } diff --git a/data/games/frlg/maps/runtime/PewterCity_PokemonCenter_1F.json b/data/games/frlg/maps/runtime/PewterCity_PokemonCenter_1F.json index e8f4f73..b36a4df 100644 --- a/data/games/frlg/maps/runtime/PewterCity_PokemonCenter_1F.json +++ b/data/games/frlg/maps/runtime/PewterCity_PokemonCenter_1F.json @@ -44,18 +44,21 @@ { "name": "jigglypuff", "coord": [2, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "PewterCity_PokemonCenter_1F_EventScript_Jigglypuff" }, { "name": "gentleman", "coord": [4, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "range": [1, 1]}, "source_event": 1, "source_script": "PewterCity_PokemonCenter_1F_EventScript_Gentleman" }, { "name": "nurse", "coord": [7, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 2, "source_script": "PewterCity_PokemonCenter_1F_EventScript_Nurse", "source_local_id": "LOCALID_PEWTER_NURSE" @@ -63,19 +66,28 @@ { "name": "youngster", "coord": [1, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 3, "source_script": "PewterCity_PokemonCenter_1F_EventScript_Youngster" }, - {"name": "woman_1", "coord": [13, 2], "source_event": 4, "source_script": "MysteryEventClub_EventScript_Woman"}, + { + "name": "woman_1", + "coord": [13, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 4, + "source_script": "MysteryEventClub_EventScript_Woman" + }, { "name": "gba_kid", "coord": [10, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 5, "source_script": "PewterCity_PokemonCenter_1F_EventScript_GBAKid1" }, { "name": "gba_kid", "coord": [14, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 6, "source_script": "PewterCity_PokemonCenter_1F_EventScript_GBAKid2" } diff --git a/data/games/frlg/maps/runtime/PokemonLeague_AgathasRoom.json b/data/games/frlg/maps/runtime/PokemonLeague_AgathasRoom.json index 026a6de..3e1825f 100644 --- a/data/games/frlg/maps/runtime/PokemonLeague_AgathasRoom.json +++ b/data/games/frlg/maps/runtime/PokemonLeague_AgathasRoom.json @@ -34,6 +34,7 @@ { "name": "agatha", "coord": [6, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "PokemonLeague_AgathasRoom_EventScript_Agatha" } diff --git a/data/games/frlg/maps/runtime/PokemonLeague_BrunosRoom.json b/data/games/frlg/maps/runtime/PokemonLeague_BrunosRoom.json index e9e4bc7..bf5cf2f 100644 --- a/data/games/frlg/maps/runtime/PokemonLeague_BrunosRoom.json +++ b/data/games/frlg/maps/runtime/PokemonLeague_BrunosRoom.json @@ -34,6 +34,7 @@ { "name": "bruno", "coord": [6, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "PokemonLeague_BrunosRoom_EventScript_Bruno", "source_local_id": "LOCALID_BRUNO" diff --git a/data/games/frlg/maps/runtime/PokemonLeague_ChampionsRoom.json b/data/games/frlg/maps/runtime/PokemonLeague_ChampionsRoom.json index 9e9cac6..b408b7a 100644 --- a/data/games/frlg/maps/runtime/PokemonLeague_ChampionsRoom.json +++ b/data/games/frlg/maps/runtime/PokemonLeague_ChampionsRoom.json @@ -62,6 +62,7 @@ { "name": "blue", "coord": [6, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "0x0", "source_local_id": "LOCALID_CHAMPIONS_ROOM_RIVAL" @@ -69,6 +70,7 @@ { "name": "prof_oak", "coord": [6, 15], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_OAK_IN_CHAMP_ROOM", "source_event": 1, "source_script": "0x0", diff --git a/data/games/frlg/maps/runtime/PokemonLeague_HallOfFame.json b/data/games/frlg/maps/runtime/PokemonLeague_HallOfFame.json index d451cb4..940521b 100644 --- a/data/games/frlg/maps/runtime/PokemonLeague_HallOfFame.json +++ b/data/games/frlg/maps/runtime/PokemonLeague_HallOfFame.json @@ -31,6 +31,7 @@ { "name": "prof_oak", "coord": [6, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "0x0", "source_local_id": "LOCALID_HALL_OF_FAME_PROF_OAK" diff --git a/data/games/frlg/maps/runtime/PokemonLeague_LancesRoom.json b/data/games/frlg/maps/runtime/PokemonLeague_LancesRoom.json index 3c1041f..5c9cdfe 100644 --- a/data/games/frlg/maps/runtime/PokemonLeague_LancesRoom.json +++ b/data/games/frlg/maps/runtime/PokemonLeague_LancesRoom.json @@ -45,6 +45,7 @@ { "name": "lance", "coord": [6, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "PokemonLeague_LancesRoom_EventScript_Lance", "source_local_id": "LOCALID_LANCE" diff --git a/data/games/frlg/maps/runtime/PokemonLeague_LoreleisRoom.json b/data/games/frlg/maps/runtime/PokemonLeague_LoreleisRoom.json index d9ae0e6..edbd8dd 100644 --- a/data/games/frlg/maps/runtime/PokemonLeague_LoreleisRoom.json +++ b/data/games/frlg/maps/runtime/PokemonLeague_LoreleisRoom.json @@ -34,6 +34,7 @@ { "name": "lorelei", "coord": [6, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "PokemonLeague_LoreleisRoom_EventScript_Lorelei" } diff --git a/data/games/frlg/maps/runtime/PokemonMansion_1F.json b/data/games/frlg/maps/runtime/PokemonMansion_1F.json index 715ec61..6790cf9 100644 --- a/data/games/frlg/maps/runtime/PokemonMansion_1F.json +++ b/data/games/frlg/maps/runtime/PokemonMansion_1F.json @@ -122,6 +122,7 @@ "npcs": [ { "name": "scientist", + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 4}, "source_event": 0, @@ -130,6 +131,7 @@ }, { "name": "youngster", + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [2, 1]}, "wander": {"min": [6, 8], "max": [10, 8]}, "trainer": {"sight": 1, "looks": ["west", "east"]}, "source_event": 4, @@ -141,6 +143,7 @@ { "name": "item_ball", "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_1F_CARBOS", "source_script": "PokemonMansion_1F_EventScript_ItemCarbos", "item": "carbos", @@ -149,6 +152,7 @@ { "name": "item_ball", "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_1F_ESCAPE_ROPE", "source_script": "PokemonMansion_1F_EventScript_ItemEscapeRope", "item": "escape_rope", @@ -157,6 +161,7 @@ { "name": "item_ball", "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_1F_PROTEIN", "source_script": "PokemonMansion_1F_EventScript_ItemProtein", "item": "protein", diff --git a/data/games/frlg/maps/runtime/PokemonMansion_2F.json b/data/games/frlg/maps/runtime/PokemonMansion_2F.json index e32f668..a96f7ea 100644 --- a/data/games/frlg/maps/runtime/PokemonMansion_2F.json +++ b/data/games/frlg/maps/runtime/PokemonMansion_2F.json @@ -104,6 +104,7 @@ "npcs": [ { "name": "poke_maniac", + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 0, "source_script": "PokemonMansion_2F_EventScript_Arnie", @@ -114,6 +115,7 @@ { "name": "item_ball", "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_2F_CALCIUM", "source_script": "PokemonMansion_2F_EventScript_ItemCalcium", "item": "calcium", @@ -122,6 +124,7 @@ { "name": "item_ball", "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_2F_ZINC", "source_script": "PokemonMansion_2F_EventScript_ItemZinc", "item": "zinc", @@ -130,6 +133,7 @@ { "name": "item_ball", "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_2F_HP_UP", "source_script": "PokemonMansion_2F_EventScript_ItemHPUp", "item": "hp_up", diff --git a/data/games/frlg/maps/runtime/PokemonMansion_3F.json b/data/games/frlg/maps/runtime/PokemonMansion_3F.json index 3c8dc9c..a2fb32c 100644 --- a/data/games/frlg/maps/runtime/PokemonMansion_3F.json +++ b/data/games/frlg/maps/runtime/PokemonMansion_3F.json @@ -113,6 +113,7 @@ "npcs": [ { "name": "poke_maniac", + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [6, 12], "max": [8, 14]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 0, @@ -121,6 +122,7 @@ }, { "name": "scientist", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 1, @@ -132,6 +134,7 @@ { "name": "item_ball", "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_3F_MAX_POTION", "source_script": "PokemonMansion_3F_EventScript_ItemMaxPotion", "item": "max_potion", @@ -140,6 +143,7 @@ { "name": "item_ball", "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_3F_IRON", "source_script": "PokemonMansion_3F_EventScript_ItemIron", "item": "iron", diff --git a/data/games/frlg/maps/runtime/PokemonMansion_B1F.json b/data/games/frlg/maps/runtime/PokemonMansion_B1F.json index 644e248..e5a5eca 100644 --- a/data/games/frlg/maps/runtime/PokemonMansion_B1F.json +++ b/data/games/frlg/maps/runtime/PokemonMansion_B1F.json @@ -114,6 +114,7 @@ "npcs": [ { "name": "poke_maniac", + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [19, 24], "max": [21, 26]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 1, @@ -122,6 +123,7 @@ }, { "name": "scientist", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 6}, "source_event": 2, @@ -133,6 +135,7 @@ { "name": "item_ball", "source_event": 0, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM22", "source_script": "PokemonMansion_B1F_EventScript_ItemTM22", "item": "tm22", @@ -141,6 +144,7 @@ { "name": "item_ball", "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM14", "source_script": "PokemonMansion_B1F_EventScript_ItemTM14", "item": "tm14", @@ -149,6 +153,7 @@ { "name": "item_ball", "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_B1F_FULL_RESTORE", "source_script": "PokemonMansion_B1F_EventScript_ItemFullRestore", "item": "full_restore", @@ -157,6 +162,7 @@ { "name": "item_ball", "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY", "source_script": "PokemonMansion_B1F_EventScript_ItemSecretKey", "item": "secret_key", diff --git a/data/games/frlg/maps/runtime/PokemonTower_1F.json b/data/games/frlg/maps/runtime/PokemonTower_1F.json index 644ee00..76bb656 100644 --- a/data/games/frlg/maps/runtime/PokemonTower_1F.json +++ b/data/games/frlg/maps/runtime/PokemonTower_1F.json @@ -40,12 +40,31 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "worker_f", "coord": [18, 13], "source_event": 0, "source_script": "PokemonTower_1F_EventScript_WorkerF"}, - {"name": "channeler", "coord": [18, 7], "source_event": 1, "source_script": "PokemonTower_1F_EventScript_Channeler"}, - {"name": "woman_2", "coord": [15, 6], "source_event": 2, "source_script": "PokemonTower_1F_EventScript_Woman1"}, + { + "name": "worker_f", + "coord": [18, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 0, + "source_script": "PokemonTower_1F_EventScript_WorkerF" + }, + { + "name": "channeler", + "coord": [18, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 1, + "source_script": "PokemonTower_1F_EventScript_Channeler" + }, + { + "name": "woman_2", + "coord": [15, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 2, + "source_script": "PokemonTower_1F_EventScript_Woman1" + }, { "name": "woman_3", "coord": [7, 8], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [6, 7], "max": [8, 9]}, "source_event": 3, "source_script": "PokemonTower_1F_EventScript_Woman2" @@ -53,6 +72,7 @@ { "name": "balding_man", "coord": [8, 12], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 2]}, "wander": {"min": [6, 10], "max": [10, 14]}, "source_event": 4, "source_script": "PokemonTower_1F_EventScript_BaldingMan" diff --git a/data/games/frlg/maps/runtime/PokemonTower_2F.json b/data/games/frlg/maps/runtime/PokemonTower_2F.json index 0797963..035f421 100644 --- a/data/games/frlg/maps/runtime/PokemonTower_2F.json +++ b/data/games/frlg/maps/runtime/PokemonTower_2F.json @@ -41,11 +41,18 @@ { "name": "blue", "coord": [16, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_TOWER_RIVAL", "source_event": 0, "source_script": "0x0", "source_local_id": "LOCALID_POKEMON_TOWER_RIVAL" }, - {"name": "channeler", "coord": [3, 7], "source_event": 1, "source_script": "PokemonTower_2F_EventScript_Channeler"} + { + "name": "channeler", + "coord": [3, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 1, + "source_script": "PokemonTower_2F_EventScript_Channeler" + } ] } diff --git a/data/games/frlg/maps/runtime/PokemonTower_3F.json b/data/games/frlg/maps/runtime/PokemonTower_3F.json index 02764e0..20ca840 100644 --- a/data/games/frlg/maps/runtime/PokemonTower_3F.json +++ b/data/games/frlg/maps/runtime/PokemonTower_3F.json @@ -53,6 +53,7 @@ { "name": "channeler", "coord": [10, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 0, @@ -61,6 +62,7 @@ { "name": "channeler", "coord": [9, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 1, @@ -69,6 +71,7 @@ { "name": "channeler", "coord": [12, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["south", "north"]}, "source_event": 2, "source_script": "PokemonTower_3F_EventScript_Hope" @@ -79,6 +82,7 @@ "name": "item_ball", "coord": [13, 2], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_TOWER_3F_ESCAPE_ROPE", "source_script": "PokemonTower_3F_EventScript_ItemEscapeRope", "item": "escape_rope" diff --git a/data/games/frlg/maps/runtime/PokemonTower_4F.json b/data/games/frlg/maps/runtime/PokemonTower_4F.json index 5715dbd..7ed721f 100644 --- a/data/games/frlg/maps/runtime/PokemonTower_4F.json +++ b/data/games/frlg/maps/runtime/PokemonTower_4F.json @@ -53,6 +53,7 @@ { "name": "channeler", "coord": [17, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 0, @@ -61,6 +62,7 @@ { "name": "channeler", "coord": [15, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 5}, "source_event": 1, @@ -69,6 +71,7 @@ { "name": "channeler", "coord": [4, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 2, @@ -80,6 +83,7 @@ "name": "item_ball", "coord": [12, 11], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_TOWER_4F_ELIXIR", "source_script": "PokemonTower_4F_EventScript_ItemElixir", "item": "elixir" @@ -88,6 +92,7 @@ "name": "item_ball", "coord": [8, 11], "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_TOWER_4F_AWAKENING", "source_script": "PokemonTower_4F_EventScript_ItemAwakening", "item": "awakening" @@ -96,6 +101,7 @@ "name": "item_ball", "coord": [11, 16], "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_TOWER_4F_GREAT_BALL", "source_script": "PokemonTower_4F_EventScript_ItemGreatBall", "item": "great_ball" diff --git a/data/games/frlg/maps/runtime/PokemonTower_5F.json b/data/games/frlg/maps/runtime/PokemonTower_5F.json index f83c279..edef3f0 100644 --- a/data/games/frlg/maps/runtime/PokemonTower_5F.json +++ b/data/games/frlg/maps/runtime/PokemonTower_5F.json @@ -62,6 +62,7 @@ { "name": "channeler", "coord": [11, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "source_event": 0, "source_script": "PokemonTower_5F_EventScript_Ruth" @@ -69,6 +70,7 @@ { "name": "channeler", "coord": [19, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 1, @@ -77,6 +79,7 @@ { "name": "channeler", "coord": [7, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 2, @@ -85,17 +88,25 @@ { "name": "channeler", "coord": [11, 16], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "source_event": 3, "source_script": "PokemonTower_5F_EventScript_Janae" }, - {"name": "channeler", "coord": [12, 8], "source_event": 4, "source_script": "PokemonTower_5F_EventScript_Channeler"} + { + "name": "channeler", + "coord": [12, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 4, + "source_script": "PokemonTower_5F_EventScript_Channeler" + } ], "items": [ { "name": "item_ball", "coord": [6, 16], "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_TOWER_5F_NUGGET", "source_script": "PokemonTower_5F_EventScript_ItemNugget", "item": "nugget" @@ -104,6 +115,7 @@ "name": "item_ball", "coord": [11, 9], "source_event": 6, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_TOWER_5F_CLEANSE_TAG", "source_script": "PokemonTower_5F_EventScript_ItemCleanseTag", "item": "cleanse_tag" diff --git a/data/games/frlg/maps/runtime/PokemonTower_6F.json b/data/games/frlg/maps/runtime/PokemonTower_6F.json index 89b9a37..a0a86a1 100644 --- a/data/games/frlg/maps/runtime/PokemonTower_6F.json +++ b/data/games/frlg/maps/runtime/PokemonTower_6F.json @@ -53,6 +53,7 @@ { "name": "channeler", "coord": [13, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 3}, "source_event": 0, @@ -61,6 +62,7 @@ { "name": "channeler", "coord": [18, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 1, @@ -69,6 +71,7 @@ { "name": "channeler", "coord": [9, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 2, @@ -80,6 +83,7 @@ "name": "item_ball", "coord": [5, 15], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_TOWER_6F_RARE_CANDY", "source_script": "PokemonTower_6F_EventScript_ItemRareCandy", "item": "rare_candy" @@ -88,6 +92,7 @@ "name": "item_ball", "coord": [15, 15], "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_POKEMON_TOWER_6F_X_ACCURACY", "source_script": "PokemonTower_6F_EventScript_ItemXAccuracy", "item": "x_accuracy" diff --git a/data/games/frlg/maps/runtime/PokemonTower_7F.json b/data/games/frlg/maps/runtime/PokemonTower_7F.json index 3be1601..40bb016 100644 --- a/data/games/frlg/maps/runtime/PokemonTower_7F.json +++ b/data/games/frlg/maps/runtime/PokemonTower_7F.json @@ -48,6 +48,7 @@ { "name": "mr_fuji", "coord": [11, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_TOWER_FUJI", "source_event": 0, "source_script": "PokemonTower_7F_EventScript_MrFuji" @@ -55,6 +56,7 @@ { "name": "rocket_m", "coord": [9, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_TOWER_ROCKET_1", @@ -65,6 +67,7 @@ { "name": "rocket_m", "coord": [13, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_TOWER_ROCKET_2", @@ -75,6 +78,7 @@ { "name": "rocket_m", "coord": [9, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_TOWER_ROCKET_3", diff --git a/data/games/frlg/maps/runtime/RockTunnel_1F.json b/data/games/frlg/maps/runtime/RockTunnel_1F.json index de54d57..7aad41d 100644 --- a/data/games/frlg/maps/runtime/RockTunnel_1F.json +++ b/data/games/frlg/maps/runtime/RockTunnel_1F.json @@ -83,6 +83,7 @@ { "name": "picnicker", "coord": [26, 28], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 0, @@ -91,6 +92,7 @@ { "name": "picnicker", "coord": [39, 27], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 1, @@ -99,6 +101,7 @@ { "name": "picnicker", "coord": [45, 24], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 5}, "source_event": 2, @@ -107,6 +110,7 @@ { "name": "hiker", "coord": [20, 17], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 4}, "source_event": 3, @@ -115,6 +119,7 @@ { "name": "hiker", "coord": [5, 20], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 4, @@ -123,6 +128,7 @@ { "name": "hiker", "coord": [7, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 5, @@ -131,6 +137,7 @@ { "name": "poke_maniac", "coord": [27, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 6, @@ -142,6 +149,7 @@ "name": "item_ball", "coord": [37, 5], "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCK_TUNNEL_1F_REPEL", "source_script": "RockTunnel_1F_EventScript_ItemRepel", "item": "repel" @@ -150,6 +158,7 @@ "name": "item_ball", "coord": [33, 22], "source_event": 8, + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCK_TUNNEL_1F_PEARL", "source_script": "RockTunnel_1F_EventScript_ItemPearl", "item": "pearl" @@ -158,6 +167,7 @@ "name": "item_ball", "coord": [22, 22], "source_event": 9, + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCK_TUNNEL_1F_ESCAPE_ROPE", "source_script": "RockTunnel_1F_EventScript_ItemEscapeRope", "item": "escape_rope" diff --git a/data/games/frlg/maps/runtime/RockTunnel_B1F.json b/data/games/frlg/maps/runtime/RockTunnel_B1F.json index ff7105b..8beba76 100644 --- a/data/games/frlg/maps/runtime/RockTunnel_B1F.json +++ b/data/games/frlg/maps/runtime/RockTunnel_B1F.json @@ -74,6 +74,7 @@ { "name": "poke_maniac", "coord": [2, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "source_event": 0, "source_script": "RockTunnel_B1F_EventScript_Cooper" @@ -81,6 +82,7 @@ { "name": "hiker", "coord": [5, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 1, @@ -89,6 +91,7 @@ { "name": "picnicker", "coord": [11, 15], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 2, @@ -97,6 +100,7 @@ { "name": "hiker", "coord": [36, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 3, @@ -105,6 +109,7 @@ { "name": "hiker", "coord": [41, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 3}, "source_event": 4, @@ -113,6 +118,7 @@ { "name": "poke_maniac", "coord": [23, 23], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 5, @@ -121,6 +127,7 @@ { "name": "picnicker", "coord": [15, 33], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 6, @@ -129,6 +136,7 @@ { "name": "poke_maniac", "coord": [29, 35], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 7, @@ -137,12 +145,14 @@ { "name": "youngster", "coord": [2, 29], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 8, "source_script": "RockTunnel_B1F_EventScript_RockSlideTutor" }, { "name": "rock_smash_rock", "coord": [1, 20], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 11, "source_script": "EventScript_RockSmash" @@ -150,6 +160,7 @@ { "name": "rock_smash_rock", "coord": [1, 22], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 12, "source_script": "EventScript_RockSmash" @@ -157,6 +168,7 @@ { "name": "rock_smash_rock", "coord": [4, 23], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 13, "source_script": "EventScript_RockSmash" @@ -164,6 +176,7 @@ { "name": "rock_smash_rock", "coord": [2, 23], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_15", "source_event": 14, "source_script": "EventScript_RockSmash" @@ -171,6 +184,7 @@ { "name": "rock_smash_rock", "coord": [39, 26], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_16", "source_event": 15, "source_script": "EventScript_RockSmash" @@ -178,6 +192,7 @@ { "name": "rock_smash_rock", "coord": [42, 26], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_17", "source_event": 16, "source_script": "EventScript_RockSmash" @@ -185,6 +200,7 @@ { "name": "rock_smash_rock", "coord": [43, 28], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_18", "source_event": 17, "source_script": "EventScript_RockSmash" @@ -192,6 +208,7 @@ { "name": "rock_smash_rock", "coord": [45, 30], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_19", "source_event": 18, "source_script": "EventScript_RockSmash" @@ -199,6 +216,7 @@ { "name": "rock_smash_rock", "coord": [45, 33], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_1A", "source_event": 19, "source_script": "EventScript_RockSmash" @@ -206,6 +224,7 @@ { "name": "rock_smash_rock", "coord": [25, 1], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_1B", "source_event": 20, "source_script": "EventScript_RockSmash" @@ -213,6 +232,7 @@ { "name": "rock_smash_rock", "coord": [27, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_1C", "source_event": 21, "source_script": "EventScript_RockSmash" @@ -220,6 +240,7 @@ { "name": "rock_smash_rock", "coord": [23, 2], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_1D", "source_event": 22, "source_script": "EventScript_RockSmash" @@ -227,6 +248,7 @@ { "name": "rock_smash_rock", "coord": [26, 2], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_1E", "source_event": 23, "source_script": "EventScript_RockSmash" @@ -234,6 +256,7 @@ { "name": "rock_smash_rock", "coord": [24, 7], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_1F", "source_event": 24, "source_script": "EventScript_RockSmash" @@ -241,6 +264,7 @@ { "name": "rock_smash_rock", "coord": [27, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_11", "source_event": 25, "source_script": "EventScript_RockSmash" @@ -251,6 +275,7 @@ "name": "item_ball", "coord": [2, 37], "source_event": 9, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_REVIVE", "source_script": "RockTunnel_B1F_EventScript_ItemRevive", "item": "revive" @@ -259,6 +284,7 @@ "name": "item_ball", "coord": [9, 2], "source_event": 10, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_MAX_ETHER", "source_script": "RockTunnel_B1F_EventScript_ItemMaxEther", "item": "max_ether" diff --git a/data/games/frlg/maps/runtime/RocketHideout_B1F.json b/data/games/frlg/maps/runtime/RocketHideout_B1F.json index 0dc8016..f4afc2c 100644 --- a/data/games/frlg/maps/runtime/RocketHideout_B1F.json +++ b/data/games/frlg/maps/runtime/RocketHideout_B1F.json @@ -79,6 +79,7 @@ { "name": "rocket_m", "coord": [4, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 5}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -88,6 +89,7 @@ { "name": "rocket_m", "coord": [24, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 2}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -97,6 +99,7 @@ { "name": "rocket_m", "coord": [6, 32], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -106,6 +109,7 @@ { "name": "rocket_m", "coord": [10, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -115,6 +119,7 @@ { "name": "rocket_m", "coord": [21, 27], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["north", "east"]}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", "source_event": 4, @@ -126,6 +131,7 @@ "name": "item_ball", "coord": [5, 16], "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_ESCAPE_ROPE", "source_script": "RocketHideout_B1F_EventScript_ItemEscapeRope", "item": "escape_rope" @@ -134,6 +140,7 @@ "name": "item_ball", "coord": [1, 22], "source_event": 6, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_HYPER_POTION", "source_script": "RocketHideout_B1F_EventScript_ItemHyperPotion", "item": "hyper_potion" diff --git a/data/games/frlg/maps/runtime/RocketHideout_B2F.json b/data/games/frlg/maps/runtime/RocketHideout_B2F.json index 85b14e3..4bf31b4 100644 --- a/data/games/frlg/maps/runtime/RocketHideout_B2F.json +++ b/data/games/frlg/maps/runtime/RocketHideout_B2F.json @@ -57,6 +57,7 @@ { "name": "rocket_m", "coord": [20, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", "source_event": 0, @@ -68,6 +69,7 @@ "name": "item_ball", "coord": [15, 3], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_X_SPEED", "source_script": "RocketHideout_B2F_EventScript_ItemXSpeed", "item": "x_speed" @@ -76,6 +78,7 @@ "name": "item_ball", "coord": [2, 5], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_MOON_STONE", "source_script": "RocketHideout_B2F_EventScript_ItemMoonStone", "item": "moon_stone" @@ -84,6 +87,7 @@ "name": "item_ball", "coord": [5, 7], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_TM12", "source_script": "RocketHideout_B2F_EventScript_ItemTM12", "item": "tm12" @@ -92,6 +96,7 @@ "name": "item_ball", "coord": [0, 14], "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_SUPER_POTION", "source_script": "RocketHideout_B2F_EventScript_ItemSuperPotion", "item": "super_potion" diff --git a/data/games/frlg/maps/runtime/RocketHideout_B3F.json b/data/games/frlg/maps/runtime/RocketHideout_B3F.json index 14aaaca..6766e39 100644 --- a/data/games/frlg/maps/runtime/RocketHideout_B3F.json +++ b/data/games/frlg/maps/runtime/RocketHideout_B3F.json @@ -68,6 +68,7 @@ { "name": "rocket_m", "coord": [19, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -77,6 +78,7 @@ { "name": "rocket_m", "coord": [2, 20], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -89,6 +91,7 @@ "name": "item_ball", "coord": [12, 12], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_RARE_CANDY", "source_script": "RocketHideout_B3F_EventScript_ItemRareCandy", "item": "rare_candy" @@ -97,6 +100,7 @@ "name": "item_ball", "coord": [19, 14], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_TM21", "source_script": "RocketHideout_B3F_EventScript_ItemTM21", "item": "tm21" @@ -105,6 +109,7 @@ "name": "item_ball", "coord": [14, 24], "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_BLACK_GLASSES", "source_script": "RocketHideout_B3F_EventScript_ItemBlackGlasses", "item": "black_glasses" diff --git a/data/games/frlg/maps/runtime/RocketHideout_B4F.json b/data/games/frlg/maps/runtime/RocketHideout_B4F.json index 4924cab..0c46d72 100644 --- a/data/games/frlg/maps/runtime/RocketHideout_B4F.json +++ b/data/games/frlg/maps/runtime/RocketHideout_B4F.json @@ -75,6 +75,7 @@ { "name": "giovanni", "coord": [19, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_HIDEOUT_GIOVANNI", "source_event": 0, "source_script": "RocketHideout_B4F_EventScript_Giovanni", @@ -83,6 +84,7 @@ { "name": "rocket_m", "coord": [4, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", @@ -92,6 +94,7 @@ { "name": "rocket_m", "coord": [19, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", "source_event": 4, "source_script": "RocketHideout_B4F_EventScript_Grunt3" @@ -99,6 +102,7 @@ { "name": "rocket_m", "coord": [16, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_MISC_KANTO_ROCKETS", "source_event": 5, "source_script": "RocketHideout_B4F_EventScript_Grunt2" @@ -109,6 +113,7 @@ "name": "item_ball", "coord": [20, 5], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_SCOPE", "source_script": "RocketHideout_B4F_EventScript_SilphScope", "source_local_id": "LOCALID_SILPH_SCOPE", @@ -118,6 +123,7 @@ "name": "item_ball", "coord": [3, 2], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_LIFT_KEY", "source_script": "RocketHideout_B4F_EventScript_LiftKey", "source_local_id": "LOCALID_LIFT_KEY", @@ -127,6 +133,7 @@ "name": "item_ball", "coord": [1, 6], "source_event": 6, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_TM49", "source_script": "RocketHideout_B4F_EventScript_ItemTM49", "item": "tm49" @@ -135,6 +142,7 @@ "name": "item_ball", "coord": [4, 14], "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_MAX_ETHER", "source_script": "RocketHideout_B4F_EventScript_ItemMaxEther", "item": "max_ether" @@ -143,6 +151,7 @@ "name": "item_ball", "coord": [6, 23], "source_event": 8, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_CALCIUM", "source_script": "RocketHideout_B4F_EventScript_ItemCalcium", "item": "calcium" diff --git a/data/games/frlg/maps/runtime/Route1.json b/data/games/frlg/maps/runtime/Route1.json index bf307f7..3cfb1c7 100644 --- a/data/games/frlg/maps/runtime/Route1.json +++ b/data/games/frlg/maps/runtime/Route1.json @@ -60,6 +60,7 @@ { "name": "clerk", "coord": [6, 28], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [1, 1]}, "wander": {"min": [6, 27], "max": [6, 29]}, "source_event": 0, "source_script": "Route1_EventScript_MartClerk" @@ -67,6 +68,7 @@ { "name": "boy", "coord": [19, 16], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 3]}, "wander": {"min": [18, 16], "max": [20, 16]}, "source_event": 1, "source_script": "Route1_EventScript_Boy" diff --git a/data/games/frlg/maps/runtime/Route10.json b/data/games/frlg/maps/runtime/Route10.json index 198801e..594520e 100644 --- a/data/games/frlg/maps/runtime/Route10.json +++ b/data/games/frlg/maps/runtime/Route10.json @@ -224,6 +224,7 @@ { "name": "picnicker", "coord": [7, 60], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "source_event": 0, "source_script": "Route10_EventScript_Carol" @@ -231,6 +232,7 @@ { "name": "hiker", "coord": [4, 62], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 1, "source_script": "Route10_EventScript_Clark" @@ -238,6 +240,7 @@ { "name": "poke_maniac", "coord": [15, 70], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [2, 1]}, "wander": {"min": [13, 70], "max": [17, 70]}, "trainer": {"sight": 2, "looks": ["west", "east"]}, "source_event": 2, @@ -246,6 +249,7 @@ { "name": "hiker", "coord": [4, 68], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 2}, "source_event": 3, @@ -254,6 +258,7 @@ { "name": "poke_maniac", "coord": [13, 44], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 5}, "source_event": 4, @@ -262,6 +267,7 @@ { "name": "picnicker", "coord": [9, 27], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 5, @@ -270,6 +276,7 @@ { "name": "cut_tree", "coord": [10, 20], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 6, "source_script": "EventScript_CutTree" @@ -277,6 +284,7 @@ { "name": "cut_tree", "coord": [10, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 7, "source_script": "EventScript_CutTree" @@ -284,6 +292,7 @@ { "name": "cut_tree", "coord": [10, 24], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 8, "source_script": "EventScript_CutTree" @@ -291,6 +300,7 @@ { "name": "cut_tree", "coord": [10, 26], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_15", "source_event": 9, "source_script": "EventScript_CutTree" diff --git a/data/games/frlg/maps/runtime/Route10_PokemonCenter_1F.json b/data/games/frlg/maps/runtime/Route10_PokemonCenter_1F.json index a95568a..c54b009 100644 --- a/data/games/frlg/maps/runtime/Route10_PokemonCenter_1F.json +++ b/data/games/frlg/maps/runtime/Route10_PokemonCenter_1F.json @@ -44,6 +44,7 @@ { "name": "nurse", "coord": [7, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "Route10_PokemonCenter_1F_EventScript_Nurse", "source_local_id": "LOCALID_ROUTE10_NURSE" @@ -51,6 +52,7 @@ { "name": "gentleman", "coord": [9, 4], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [8, 4], "max": [10, 4]}, "source_event": 1, "source_script": "Route10_PokemonCenter_1F_EventScript_Gentleman" @@ -58,6 +60,7 @@ { "name": "fat_man", "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [1, 3], "max": [3, 3]}, "source_event": 2, "source_script": "Route10_PokemonCenter_1F_EventScript_FatMan" @@ -65,12 +68,14 @@ { "name": "youngster", "coord": [14, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 3, "source_script": "Route10_PokemonCenter_1F_EventScript_Youngster" }, { "name": "scientist", "coord": [12, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 4, "source_script": "Route10_PokemonCenter_1F_EventScript_Aide" } diff --git a/data/games/frlg/maps/runtime/Route11.json b/data/games/frlg/maps/runtime/Route11.json index 2a96466..66636f0 100644 --- a/data/games/frlg/maps/runtime/Route11.json +++ b/data/games/frlg/maps/runtime/Route11.json @@ -86,6 +86,7 @@ { "name": "youngster", "coord": [19, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["south", "west"]}, "source_event": 0, "source_script": "Route11_EventScript_Eddie" @@ -93,6 +94,7 @@ { "name": "old_man_1", "coord": [16, 17], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 1, "source_script": "Route11_EventScript_Hugo" @@ -100,6 +102,7 @@ { "name": "youngster", "coord": [31, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["north", "west"]}, "source_event": 2, "source_script": "Route11_EventScript_Dillon" @@ -107,6 +110,8 @@ { "name": "youngster", "coord": [28, 10], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP", "range": [8, 4]}, + "wander": {"min": [20, 6], "max": [36, 14]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 3, "source_script": "Route11_EventScript_Dave" @@ -114,6 +119,7 @@ { "name": "old_man_1", "coord": [38, 15], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 4, "source_script": "Route11_EventScript_Jasper" @@ -121,6 +127,7 @@ { "name": "old_man_1", "coord": [50, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 5, "source_script": "Route11_EventScript_Darian" @@ -128,6 +135,7 @@ { "name": "balding_man", "coord": [42, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["west", "east"]}, "source_event": 6, "source_script": "Route11_EventScript_Braxton" @@ -135,6 +143,8 @@ { "name": "youngster", "coord": [50, 14], + "movement": {"type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "range": [1, 4]}, + "wander": {"min": [50, 10], "max": [50, 18]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 7, "source_script": "Route11_EventScript_Yasu" @@ -142,6 +152,7 @@ { "name": "old_man_1", "coord": [57, 16], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 8, "source_script": "Route11_EventScript_Dirk" @@ -149,6 +160,7 @@ { "name": "balding_man", "coord": [32, 18], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 6, "looks": ["west", "east"]}, "source_event": 9, "source_script": "Route11_EventScript_Bernie" @@ -159,6 +171,7 @@ "name": "item_ball", "coord": [42, 12], "source_event": 10, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE11_X_DEFEND", "source_script": "Route11_EventScript_ItemXDefend", "item": "x_defend" @@ -167,6 +180,7 @@ "name": "item_ball", "coord": [63, 13], "source_event": 11, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE11_GREAT_BALL", "source_script": "Route11_EventScript_ItemGreatBall", "item": "great_ball" @@ -175,6 +189,7 @@ "name": "item_ball", "coord": [13, 3], "source_event": 12, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE11_AWAKENING", "source_script": "Route11_EventScript_ItemAwakening", "item": "awakening" diff --git a/data/games/frlg/maps/runtime/Route11_EastEntrance_1F.json b/data/games/frlg/maps/runtime/Route11_EastEntrance_1F.json index 53d7b4a..acccc9d 100644 --- a/data/games/frlg/maps/runtime/Route11_EastEntrance_1F.json +++ b/data/games/frlg/maps/runtime/Route11_EastEntrance_1F.json @@ -35,12 +35,14 @@ { "name": "policeman", "coord": [6, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "Route11_EastEntrance_1F_EventScript_TopGuard" }, { "name": "policeman", "coord": [4, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 1, "source_script": "Route11_EastEntrance_1F_EventScript_BottomGuard" } diff --git a/data/games/frlg/maps/runtime/Route12.json b/data/games/frlg/maps/runtime/Route12.json index 839f89b..f6a905b 100644 --- a/data/games/frlg/maps/runtime/Route12.json +++ b/data/games/frlg/maps/runtime/Route12.json @@ -303,6 +303,7 @@ { "name": "fisher", "coord": [17, 32], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["south", "north"]}, "source_event": 0, "source_script": "Route12_EventScript_Ned" @@ -310,6 +311,7 @@ { "name": "fisher", "coord": [9, 40], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["west", "east"]}, "source_event": 1, "source_script": "Route12_EventScript_Chip" @@ -317,6 +319,7 @@ { "name": "fisher", "coord": [16, 47], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["south", "west"]}, "source_event": 2, "source_script": "Route12_EventScript_Hank" @@ -324,6 +327,7 @@ { "name": "fisher", "coord": [13, 59], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["south", "north"]}, "source_event": 3, "source_script": "Route12_EventScript_Elliot" @@ -331,6 +335,7 @@ { "name": "snorlax", "coord": [14, 70], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE_12_SNORLAX", "source_event": 4, "source_script": "Route12_EventScript_Snorlax" @@ -338,6 +343,8 @@ { "name": "rocker", "coord": [13, 92], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT", "range": [4, 4]}, + "wander": {"min": [9, 88], "max": [17, 96]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 5, "source_script": "Route12_EventScript_Luca" @@ -345,6 +352,7 @@ { "name": "camper", "coord": [10, 99], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 6, @@ -353,6 +361,7 @@ { "name": "fisher", "coord": [18, 108], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["west", "east"]}, "source_event": 7, "source_script": "Route12_EventScript_Andrew" @@ -360,15 +369,29 @@ { "name": "cut_tree", "coord": [11, 100], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 8, "source_script": "EventScript_CutTree" }, - {"name": "beauty", "coord": [19, 64], "source_event": 11, "source_script": "Route12_EventScript_Gia"}, - {"name": "man", "coord": [19, 63], "source_event": 12, "source_script": "Route12_EventScript_Jes"}, + { + "name": "beauty", + "coord": [19, 64], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 11, + "source_script": "Route12_EventScript_Gia" + }, + { + "name": "man", + "coord": [19, 63], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 12, + "source_script": "Route12_EventScript_Jes" + }, { "name": "cut_tree", "coord": [12, 111], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 13, "source_script": "EventScript_CutTree" @@ -379,6 +402,7 @@ "name": "item_ball", "coord": [18, 36], "source_event": 9, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE12_TM48", "source_script": "Route12_EventScript_ItemTM48", "item": "tm48" @@ -387,6 +411,7 @@ "name": "item_ball", "coord": [9, 101], "source_event": 10, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE12_IRON", "source_script": "Route12_EventScript_ItemIron", "item": "iron" diff --git a/data/games/frlg/maps/runtime/Route12_NorthEntrance_1F.json b/data/games/frlg/maps/runtime/Route12_NorthEntrance_1F.json index 0dff864..d593b20 100644 --- a/data/games/frlg/maps/runtime/Route12_NorthEntrance_1F.json +++ b/data/games/frlg/maps/runtime/Route12_NorthEntrance_1F.json @@ -36,6 +36,7 @@ { "name": "policeman", "coord": [1, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 0, "source_script": "Route12_NorthEntrance_1F_EventScript_Guard" } diff --git a/data/games/frlg/maps/runtime/Route13.json b/data/games/frlg/maps/runtime/Route13.json index 79f676e..02f2f46 100644 --- a/data/games/frlg/maps/runtime/Route13.json +++ b/data/games/frlg/maps/runtime/Route13.json @@ -64,6 +64,7 @@ { "name": "picnicker", "coord": [62, 6], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [61, 5], "max": [63, 7]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 0, @@ -72,6 +73,7 @@ { "name": "rocker", "coord": [63, 12], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [62, 11], "max": [64, 13]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 1, @@ -80,6 +82,7 @@ { "name": "picnicker", "coord": [54, 11], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [53, 10], "max": [55, 12]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 2, @@ -88,6 +91,7 @@ { "name": "beauty", "coord": [42, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 3, @@ -96,6 +100,7 @@ { "name": "beauty", "coord": [43, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 4, @@ -104,6 +109,7 @@ { "name": "picnicker", "coord": [35, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 5, @@ -112,6 +118,7 @@ { "name": "picnicker", "coord": [29, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 6, @@ -120,6 +127,7 @@ { "name": "rocker", "coord": [9, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 3}, "source_event": 7, @@ -128,6 +136,7 @@ { "name": "rocker", "coord": [16, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 3}, "source_event": 8, @@ -136,6 +145,7 @@ { "name": "biker", "coord": [14, 8], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 9, "source_script": "Route13_EventScript_Jared" @@ -143,6 +153,7 @@ { "name": "cut_tree", "coord": [44, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 10, "source_script": "EventScript_CutTree" diff --git a/data/games/frlg/maps/runtime/Route14.json b/data/games/frlg/maps/runtime/Route14.json index 185fb44..4721ae1 100644 --- a/data/games/frlg/maps/runtime/Route14.json +++ b/data/games/frlg/maps/runtime/Route14.json @@ -151,6 +151,7 @@ { "name": "biker", "coord": [7, 37], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 0, @@ -159,6 +160,7 @@ { "name": "rocker", "coord": [18, 35], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 2]}, "wander": {"min": [16, 33], "max": [20, 37]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 1, @@ -167,6 +169,7 @@ { "name": "rocker", "coord": [10, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 2, @@ -175,6 +178,7 @@ { "name": "rocker", "coord": [16, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 3}, "source_event": 3, @@ -183,6 +187,7 @@ { "name": "biker", "coord": [7, 31], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 4, @@ -191,6 +196,7 @@ { "name": "biker", "coord": [7, 34], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 5, @@ -199,6 +205,7 @@ { "name": "rocker", "coord": [8, 9], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [7, 9], "max": [9, 9]}, "trainer": {"sight": 1, "looks": ["west", "east"]}, "source_event": 6, @@ -207,6 +214,7 @@ { "name": "rocker", "coord": [7, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 1}, "source_event": 7, @@ -215,6 +223,8 @@ { "name": "biker", "coord": [10, 37], + "movement": {"type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "range": [1, 6]}, + "wander": {"min": [10, 31], "max": [10, 43]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 8, "source_script": "Route14_EventScript_Lukas" @@ -222,6 +232,7 @@ { "name": "rocker", "coord": [18, 47], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 2]}, "wander": {"min": [16, 45], "max": [20, 49]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 9, @@ -230,6 +241,7 @@ { "name": "cut_tree", "coord": [7, 26], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 10, "source_script": "EventScript_CutTree" @@ -237,6 +249,7 @@ { "name": "cut_tree", "coord": [12, 35], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 11, "source_script": "EventScript_CutTree" @@ -244,6 +257,7 @@ { "name": "cut_tree", "coord": [1, 47], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 12, "source_script": "EventScript_CutTree", @@ -252,6 +266,7 @@ { "name": "little_girl", "coord": [13, 51], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 13, @@ -260,6 +275,7 @@ { "name": "little_girl", "coord": [12, 51], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 14, diff --git a/data/games/frlg/maps/runtime/Route15.json b/data/games/frlg/maps/runtime/Route15.json index abb6368..5a18703 100644 --- a/data/games/frlg/maps/runtime/Route15.json +++ b/data/games/frlg/maps/runtime/Route15.json @@ -55,6 +55,7 @@ { "name": "picnicker", "coord": [22, 13], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [21, 12], "max": [23, 14]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 0, @@ -63,6 +64,7 @@ { "name": "rocker", "coord": [31, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 5}, "source_event": 1, @@ -71,6 +73,7 @@ { "name": "rocker", "coord": [37, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 2}, "source_event": 2, @@ -79,6 +82,7 @@ { "name": "picnicker", "coord": [44, 13], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [43, 12], "max": [45, 14]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 3, @@ -87,6 +91,7 @@ { "name": "beauty", "coord": [50, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 4, @@ -95,6 +100,7 @@ { "name": "biker", "coord": [59, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["south", "east"]}, "source_event": 5, "source_script": "Route15_EventScript_Alex" @@ -102,6 +108,7 @@ { "name": "biker", "coord": [63, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["south", "north"]}, "source_event": 6, "source_script": "Route15_EventScript_Ernest" @@ -109,6 +116,7 @@ { "name": "picnicker", "coord": [52, 8], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 4]}, "wander": {"min": [50, 4], "max": [54, 12]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 7, @@ -117,6 +125,7 @@ { "name": "beauty", "coord": [54, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 8, @@ -125,6 +134,7 @@ { "name": "picnicker", "coord": [28, 6], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 4]}, "wander": {"min": [26, 2], "max": [30, 10]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 9, @@ -133,6 +143,7 @@ { "name": "black_belt", "coord": [39, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 11, @@ -141,6 +152,7 @@ { "name": "crush_girl", "coord": [40, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 12, @@ -152,6 +164,7 @@ "name": "item_ball", "coord": [20, 6], "source_event": 10, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE15_TM18", "source_script": "Route15_EventScript_ItemTM18", "item": "tm18" diff --git a/data/games/frlg/maps/runtime/Route15_WestEntrance_1F.json b/data/games/frlg/maps/runtime/Route15_WestEntrance_1F.json index 86eeafe..8345642 100644 --- a/data/games/frlg/maps/runtime/Route15_WestEntrance_1F.json +++ b/data/games/frlg/maps/runtime/Route15_WestEntrance_1F.json @@ -35,6 +35,7 @@ { "name": "policeman", "coord": [6, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "Route15_WestEntrance_1F_EventScript_Guard" } diff --git a/data/games/frlg/maps/runtime/Route16.json b/data/games/frlg/maps/runtime/Route16.json index ba778b5..19a5585 100644 --- a/data/games/frlg/maps/runtime/Route16.json +++ b/data/games/frlg/maps/runtime/Route16.json @@ -77,6 +77,7 @@ { "name": "biker", "coord": [16, 12], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 0, "source_script": "Route16_EventScript_Lao" @@ -84,6 +85,7 @@ { "name": "biker", "coord": [14, 14], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 1, "source_script": "Route16_EventScript_Koji" @@ -91,6 +93,7 @@ { "name": "biker", "coord": [12, 12], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 2, "source_script": "Route16_EventScript_Luke" @@ -98,6 +101,7 @@ { "name": "biker", "coord": [8, 12], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 3, "source_script": "Route16_EventScript_Ruben" @@ -105,6 +109,7 @@ { "name": "biker", "coord": [10, 14], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 4, "source_script": "Route16_EventScript_Hideo" @@ -112,6 +117,7 @@ { "name": "biker", "coord": [6, 14], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 5, "source_script": "Route16_EventScript_Camron" @@ -119,6 +125,7 @@ { "name": "cut_tree", "coord": [41, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 6, "source_script": "EventScript_CutTree", @@ -127,6 +134,7 @@ { "name": "beauty", "coord": [30, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 7, @@ -135,6 +143,7 @@ { "name": "man", "coord": [31, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 8, @@ -143,6 +152,7 @@ { "name": "snorlax", "coord": [31, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE_16_SNORLAX", "source_event": 9, "source_script": "Route16_EventScript_Snorlax" diff --git a/data/games/frlg/maps/runtime/Route16_House.json b/data/games/frlg/maps/runtime/Route16_House.json index 7ff0b74..a8d1cdb 100644 --- a/data/games/frlg/maps/runtime/Route16_House.json +++ b/data/games/frlg/maps/runtime/Route16_House.json @@ -31,6 +31,7 @@ { "name": "woman_1", "coord": [4, 2], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [3, 1], "max": [5, 3]}, "source_event": 0, "source_script": "Route16_House_EventScript_Woman" @@ -38,6 +39,7 @@ { "name": "fearow", "coord": [9, 3], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [8, 2], "max": [10, 4]}, "source_event": 1, "source_script": "Route16_House_EventScript_Fearow" diff --git a/data/games/frlg/maps/runtime/Route16_NorthEntrance_1F.json b/data/games/frlg/maps/runtime/Route16_NorthEntrance_1F.json index f714263..16ba486 100644 --- a/data/games/frlg/maps/runtime/Route16_NorthEntrance_1F.json +++ b/data/games/frlg/maps/runtime/Route16_NorthEntrance_1F.json @@ -41,12 +41,14 @@ { "name": "policeman", "coord": [6, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "Route16_NorthEntrance_1F_EventScript_Guard" }, { "name": "old_man_1", "coord": [7, 4], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [6, 4], "max": [8, 4]}, "source_event": 1, "source_script": "Route16_NorthEntrance_1F_EventScript_OldMan" diff --git a/data/games/frlg/maps/runtime/Route18.json b/data/games/frlg/maps/runtime/Route18.json index 37d19f3..62a472a 100644 --- a/data/games/frlg/maps/runtime/Route18.json +++ b/data/games/frlg/maps/runtime/Route18.json @@ -64,6 +64,7 @@ { "name": "rocker", "coord": [46, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 4}, "source_event": 0, @@ -72,6 +73,7 @@ { "name": "rocker", "coord": [41, 15], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 1, "source_script": "Route18_EventScript_Ramiro" @@ -79,6 +81,7 @@ { "name": "rocker", "coord": [39, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 6}, "source_event": 2, diff --git a/data/games/frlg/maps/runtime/Route18_EastEntrance_1F.json b/data/games/frlg/maps/runtime/Route18_EastEntrance_1F.json index a656b36..2c4ee28 100644 --- a/data/games/frlg/maps/runtime/Route18_EastEntrance_1F.json +++ b/data/games/frlg/maps/runtime/Route18_EastEntrance_1F.json @@ -33,6 +33,7 @@ { "name": "policeman", "coord": [6, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "Route18_EastEntrance_1F_EventScript_Guard" } diff --git a/data/games/frlg/maps/runtime/Route19.json b/data/games/frlg/maps/runtime/Route19.json index 3285510..ecfd49d 100644 --- a/data/games/frlg/maps/runtime/Route19.json +++ b/data/games/frlg/maps/runtime/Route19.json @@ -141,6 +141,7 @@ { "name": "swimmer_m_land", "coord": [15, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [6, 3]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 0, @@ -149,6 +150,7 @@ { "name": "swimmer_m_land", "coord": [10, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 3}, "source_event": 1, @@ -157,6 +159,7 @@ { "name": "swimmer_m_water", "coord": [12, 17], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["north", "east", "south", "west"]}, "source_event": 2, "source_script": "Route19_EventScript_Tony" @@ -164,6 +167,8 @@ { "name": "swimmer_m_water", "coord": [18, 33], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "range": [5, 3]}, + "wander": {"min": [13, 30], "max": [23, 36]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 3, "source_script": "Route19_EventScript_Matthew" @@ -171,6 +176,7 @@ { "name": "swimmer_m_water", "coord": [8, 27], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 2]}, "wander": {"min": [6, 25], "max": [10, 29]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 4, @@ -179,6 +185,7 @@ { "name": "swimmer_m_water", "coord": [16, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 6, "looks": ["west", "east"]}, "source_event": 5, "source_script": "Route19_EventScript_David" @@ -186,6 +193,7 @@ { "name": "swimmer_m_water", "coord": [11, 47], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 6, "source_script": "Route19_EventScript_Axle" @@ -193,6 +201,7 @@ { "name": "swimmer_f_water", "coord": [14, 48], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 7, "source_script": "Route19_EventScript_Alice" @@ -200,6 +209,7 @@ { "name": "swimmer_f_water", "coord": [12, 49], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 8, "source_script": "Route19_EventScript_Connie" @@ -207,6 +217,7 @@ { "name": "swimmer_f_water", "coord": [9, 48], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 9, "source_script": "Route19_EventScript_Anya" @@ -214,6 +225,7 @@ { "name": "swimmer_f_water", "coord": [8, 41], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 10, @@ -222,6 +234,7 @@ { "name": "tuber_m_water", "coord": [9, 41], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 11, diff --git a/data/games/frlg/maps/runtime/Route2.json b/data/games/frlg/maps/runtime/Route2.json index 7b34b3c..75ef459 100644 --- a/data/games/frlg/maps/runtime/Route2.json +++ b/data/games/frlg/maps/runtime/Route2.json @@ -130,6 +130,7 @@ { "name": "cut_tree", "coord": [16, 62], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_14", "source_event": 0, "source_script": "EventScript_CutTree" @@ -137,6 +138,7 @@ { "name": "cut_tree", "coord": [15, 69], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 1, "source_script": "EventScript_CutTree" @@ -144,6 +146,7 @@ { "name": "cut_tree", "coord": [11, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_15", "source_event": 2, "source_script": "EventScript_CutTree" @@ -151,6 +154,7 @@ { "name": "cut_tree", "coord": [18, 26], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_16", "source_event": 3, "source_script": "EventScript_CutTree" @@ -161,6 +165,7 @@ "name": "item_ball", "coord": [17, 54], "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE2_ETHER", "source_script": "Route2_EventScript_ItemEther", "item": "ether" @@ -169,6 +174,7 @@ "name": "item_ball", "coord": [17, 64], "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE2_PARALYZE_HEAL", "source_script": "Route2_EventScript_ItemParalyzeHeal", "item": "paralyze_heal" diff --git a/data/games/frlg/maps/runtime/Route20.json b/data/games/frlg/maps/runtime/Route20.json index e73c851..4943ddf 100644 --- a/data/games/frlg/maps/runtime/Route20.json +++ b/data/games/frlg/maps/runtime/Route20.json @@ -73,6 +73,7 @@ { "name": "swimmer_f_water", "coord": [8, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["south", "north"]}, "source_event": 0, "source_script": "Route20_EventScript_Melissa" @@ -80,6 +81,7 @@ { "name": "picnicker", "coord": [16, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 1, @@ -88,6 +90,7 @@ { "name": "swimmer_f_water", "coord": [34, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 2, @@ -96,6 +99,7 @@ { "name": "rocker", "coord": [43, 9], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [42, 8], "max": [44, 10]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 3, @@ -104,6 +108,8 @@ { "name": "swimmer_m_water", "coord": [23, 10], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "range": [5, 4]}, + "wander": {"min": [18, 6], "max": [28, 14]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 4, "source_script": "Route20_EventScript_Dean" @@ -111,6 +117,7 @@ { "name": "picnicker", "coord": [73, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 2}, "source_event": 5, @@ -119,6 +126,8 @@ { "name": "swimmer_m_water", "coord": [111, 9], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", "range": [5, 3]}, + "wander": {"min": [106, 6], "max": [116, 12]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 6, "source_script": "Route20_EventScript_Barry" @@ -126,6 +135,8 @@ { "name": "swimmer_m_water", "coord": [106, 11], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "range": [5, 3]}, + "wander": {"min": [101, 8], "max": [111, 14]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 7, "source_script": "Route20_EventScript_Darrin" @@ -133,6 +144,7 @@ { "name": "swimmer_f_water", "coord": [93, 10], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 5, "looks": ["north", "east", "south", "west"]}, "source_event": 8, "source_script": "Route20_EventScript_Shirley" @@ -140,6 +152,7 @@ { "name": "swimmer_f_water", "coord": [54, 11], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 9, "source_script": "Route20_EventScript_Tiffany" @@ -147,6 +160,7 @@ { "name": "camper", "coord": [69, 3], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [2, 1]}, "wander": {"min": [67, 3], "max": [71, 3]}, "source_event": 10, "source_script": "Route20_EventScript_Camper" diff --git a/data/games/frlg/maps/runtime/Route21_North.json b/data/games/frlg/maps/runtime/Route21_North.json index 99260bd..6c26bc6 100644 --- a/data/games/frlg/maps/runtime/Route21_North.json +++ b/data/games/frlg/maps/runtime/Route21_North.json @@ -127,11 +127,25 @@ } ], "npcs": [ - {"name": "fisher", "coord": [7, 27], "source_event": 0, "source_script": "Route21_North_EventScript_Ronald"}, - {"name": "fisher", "coord": [16, 26], "source_event": 1, "source_script": "Route21_North_EventScript_Wade"}, + { + "name": "fisher", + "coord": [7, 27], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 0, + "source_script": "Route21_North_EventScript_Ronald" + }, + { + "name": "fisher", + "coord": [16, 26], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 1, + "source_script": "Route21_North_EventScript_Wade" + }, { "name": "swimmer_m_water", "coord": [12, 44], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "range": [4, 2]}, + "wander": {"min": [8, 42], "max": [16, 46]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 2, "source_script": "Route21_North_EventScript_Spencer" @@ -139,6 +153,7 @@ { "name": "swimmer_f_water", "coord": [14, 35], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 3, @@ -147,6 +162,7 @@ { "name": "tuber_m_water", "coord": [15, 35], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 4, diff --git a/data/games/frlg/maps/runtime/Route21_South.json b/data/games/frlg/maps/runtime/Route21_South.json index 6ce7c43..d309b56 100644 --- a/data/games/frlg/maps/runtime/Route21_South.json +++ b/data/games/frlg/maps/runtime/Route21_South.json @@ -118,11 +118,24 @@ {"side": "south", "to_map": "CinnabarIsland", "offset": 0} ], "npcs": [ - {"name": "fisher", "coord": [11, 8], "source_event": 0, "source_script": "Route21_South_EventScript_Claude"}, - {"name": "fisher", "coord": [14, 15], "source_event": 1, "source_script": "Route21_South_EventScript_Nolan"}, + { + "name": "fisher", + "coord": [11, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 0, + "source_script": "Route21_South_EventScript_Claude" + }, + { + "name": "fisher", + "coord": [14, 15], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 1, + "source_script": "Route21_South_EventScript_Nolan" + }, { "name": "swimmer_m_water", "coord": [15, 24], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["west", "east"]}, "source_event": 2, "source_script": "Route21_South_EventScript_Jack" @@ -130,6 +143,7 @@ { "name": "swimmer_m_water", "coord": [15, 38], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 3, @@ -138,6 +152,7 @@ { "name": "swimmer_m_water", "coord": [10, 29], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 2]}, "wander": {"min": [8, 27], "max": [12, 31]}, "trainer": {"sight": 4, "looks": ["north", "east", "south", "west"]}, "source_event": 4, diff --git a/data/games/frlg/maps/runtime/Route22.json b/data/games/frlg/maps/runtime/Route22.json index af9c6e8..1934bfb 100644 --- a/data/games/frlg/maps/runtime/Route22.json +++ b/data/games/frlg/maps/runtime/Route22.json @@ -72,6 +72,7 @@ { "name": "blue", "coord": [25, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE_22_RIVAL", "source_event": 0, "source_script": "0x0", diff --git a/data/games/frlg/maps/runtime/Route22_NorthEntrance.json b/data/games/frlg/maps/runtime/Route22_NorthEntrance.json index a37d579..cc805c0 100644 --- a/data/games/frlg/maps/runtime/Route22_NorthEntrance.json +++ b/data/games/frlg/maps/runtime/Route22_NorthEntrance.json @@ -35,6 +35,7 @@ { "name": "policeman", "coord": [8, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "Route22_NorthEntrance_EventScript_BoulderBadgeGuard" } diff --git a/data/games/frlg/maps/runtime/Route23.json b/data/games/frlg/maps/runtime/Route23.json index 6a63c31..26c4c29 100644 --- a/data/games/frlg/maps/runtime/Route23.json +++ b/data/games/frlg/maps/runtime/Route23.json @@ -404,6 +404,7 @@ { "name": "policeman", "coord": [15, 149], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "Route23_EventScript_CascadeBadgeGuard", "source_local_id": "LOCALID_CASCADE_BADGE_GUARD" @@ -411,6 +412,7 @@ { "name": "policeman", "coord": [8, 140], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 1, "source_script": "Route23_EventScript_ThunderBadgeGuard", "source_local_id": "LOCALID_THUNDER_BADGE_GUARD" @@ -418,6 +420,7 @@ { "name": "policeman", "coord": [14, 123], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 2, "source_script": "Route23_EventScript_RainbowBadgeGuard", "source_local_id": "LOCALID_RAINBOW_BADGE_GUARD" @@ -425,6 +428,7 @@ { "name": "policeman", "coord": [16, 112], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 3, "source_script": "Route23_EventScript_SoulBadgeGuard", "source_local_id": "LOCALID_SOUL_BADGE_GUARD" @@ -432,6 +436,7 @@ { "name": "policeman", "coord": [10, 94], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 4, "source_script": "Route23_EventScript_MarshBadgeGuard", "source_local_id": "LOCALID_MARSH_BADGE_GUARD" @@ -439,6 +444,7 @@ { "name": "policeman", "coord": [14, 61], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 5, "source_script": "Route23_EventScript_VolcanoBadgeGuard", "source_local_id": "LOCALID_VOLCANO_BADGE_GUARD" @@ -446,6 +452,7 @@ { "name": "policeman", "coord": [6, 35], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 6, "source_script": "Route23_EventScript_EarthBadgeGuard", "source_local_id": "LOCALID_EARTH_BADGE_GUARD" diff --git a/data/games/frlg/maps/runtime/Route24.json b/data/games/frlg/maps/runtime/Route24.json index d2465d6..48caa49 100644 --- a/data/games/frlg/maps/runtime/Route24.json +++ b/data/games/frlg/maps/runtime/Route24.json @@ -122,6 +122,7 @@ { "name": "man", "coord": [12, 15], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_NUGGET_BRIDGE_ROCKET", "source_event": 0, "source_script": "Route24_EventScript_Rocket", @@ -130,6 +131,7 @@ { "name": "camper", "coord": [12, 19], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 2}, "source_event": 1, @@ -138,6 +140,7 @@ { "name": "lass", "coord": [10, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 2, @@ -146,6 +149,7 @@ { "name": "youngster", "coord": [12, 25], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 2}, "source_event": 3, @@ -154,6 +158,7 @@ { "name": "lass", "coord": [10, 28], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 4, @@ -162,6 +167,7 @@ { "name": "bug_catcher", "coord": [12, 31], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 2}, "source_event": 5, @@ -170,6 +176,7 @@ { "name": "camper", "coord": [5, 21], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 5}, "source_event": 6, @@ -181,6 +188,7 @@ "name": "item_ball", "coord": [11, 4], "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE24_TM45", "source_script": "Route24_EventScript_ItemTM45", "item": "tm45" diff --git a/data/games/frlg/maps/runtime/Route25.json b/data/games/frlg/maps/runtime/Route25.json index b2a31f0..de08096 100644 --- a/data/games/frlg/maps/runtime/Route25.json +++ b/data/games/frlg/maps/runtime/Route25.json @@ -88,6 +88,7 @@ { "name": "hiker", "coord": [11, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 0, @@ -96,6 +97,7 @@ { "name": "youngster", "coord": [18, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 1, @@ -104,6 +106,7 @@ { "name": "hiker", "coord": [17, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 2, @@ -112,6 +115,7 @@ { "name": "youngster", "coord": [22, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "source_event": 3, "source_script": "Route25_EventScript_Dan" @@ -119,6 +123,7 @@ { "name": "picnicker", "coord": [22, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 4, @@ -127,6 +132,7 @@ { "name": "hiker", "coord": [27, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 3}, "source_event": 5, @@ -135,6 +141,7 @@ { "name": "camper", "coord": [28, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 6, @@ -143,6 +150,8 @@ { "name": "youngster", "coord": [36, 4], + "movement": {"type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "range": [1, 3]}, + "wander": {"min": [36, 1], "max": [36, 7]}, "trainer": {"sight": 2, "looks": ["north", "east", "south", "west"]}, "source_event": 7, "source_script": "Route25_EventScript_Chad" @@ -150,6 +159,7 @@ { "name": "lass", "coord": [42, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 8, @@ -158,18 +168,32 @@ { "name": "cut_tree", "coord": [30, 3], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 10, "source_script": "EventScript_CutTree" }, - {"name": "beauty", "coord": [49, 10], "source_event": 11, "source_script": "Route25_EventScript_Beauty"}, - {"name": "man", "coord": [49, 11], "source_event": 12, "source_script": "Route25_EventScript_Man"} + { + "name": "beauty", + "coord": [49, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 11, + "source_script": "Route25_EventScript_Beauty" + }, + { + "name": "man", + "coord": [49, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 12, + "source_script": "Route25_EventScript_Man" + } ], "items": [ { "name": "item_ball", "coord": [26, 2], "source_event": 9, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE25_TM43", "source_script": "Route25_EventScript_ItemTM43", "item": "tm43" diff --git a/data/games/frlg/maps/runtime/Route25_SeaCottage.json b/data/games/frlg/maps/runtime/Route25_SeaCottage.json index 922124e..589ed49 100644 --- a/data/games/frlg/maps/runtime/Route25_SeaCottage.json +++ b/data/games/frlg/maps/runtime/Route25_SeaCottage.json @@ -33,6 +33,7 @@ { "name": "bill", "coord": [7, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE", "source_event": 0, "source_script": "Route25_SeaCottage_EventScript_Bill", @@ -41,6 +42,7 @@ { "name": "clefairy", "coord": [10, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_BILL_CLEFAIRY", "source_event": 1, "source_script": "Route25_SeaCottage_EventScript_Bill", diff --git a/data/games/frlg/maps/runtime/Route2_EastBuilding.json b/data/games/frlg/maps/runtime/Route2_EastBuilding.json index 8c69fe2..07fa5fd 100644 --- a/data/games/frlg/maps/runtime/Route2_EastBuilding.json +++ b/data/games/frlg/maps/runtime/Route2_EastBuilding.json @@ -31,10 +31,17 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "scientist", "coord": [4, 6], "source_event": 0, "source_script": "Route2_EastBuilding_EventScript_Aide"}, + { + "name": "scientist", + "coord": [4, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 0, + "source_script": "Route2_EastBuilding_EventScript_Aide" + }, { "name": "rocker", "coord": [10, 3], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [2, 1]}, "wander": {"min": [8, 3], "max": [12, 3]}, "source_event": 1, "source_script": "Route2_EastBuilding_EventScript_Rocker" diff --git a/data/games/frlg/maps/runtime/Route2_ViridianForest_NorthEntrance.json b/data/games/frlg/maps/runtime/Route2_ViridianForest_NorthEntrance.json index c4025ad..fafb942 100644 --- a/data/games/frlg/maps/runtime/Route2_ViridianForest_NorthEntrance.json +++ b/data/games/frlg/maps/runtime/Route2_ViridianForest_NorthEntrance.json @@ -34,18 +34,21 @@ { "name": "youngster", "coord": [5, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 0, "source_script": "Route2_ViridianForest_NorthEntrance_EventScript_Youngster" }, { "name": "old_man_1", "coord": [4, 7], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 1, "source_script": "Route2_ViridianForest_NorthEntrance_EventScript_OldMan" }, { "name": "cooltrainer_f", "coord": [10, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 2, "source_script": "Route2_ViridianForest_NorthEntrance_EventScript_CooltrainerF" } diff --git a/data/games/frlg/maps/runtime/Route2_ViridianForest_SouthEntrance.json b/data/games/frlg/maps/runtime/Route2_ViridianForest_SouthEntrance.json index b9f087e..5754f66 100644 --- a/data/games/frlg/maps/runtime/Route2_ViridianForest_SouthEntrance.json +++ b/data/games/frlg/maps/runtime/Route2_ViridianForest_SouthEntrance.json @@ -34,12 +34,14 @@ { "name": "woman_2", "coord": [10, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 0, "source_script": "Route2_ViridianForest_SouthEntrance_EventScript_Woman1" }, { "name": "woman_1", "coord": [4, 7], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [3, 6], "max": [5, 8]}, "source_event": 1, "source_script": "Route2_ViridianForest_SouthEntrance_EventScript_Woman2" diff --git a/data/games/frlg/maps/runtime/Route3.json b/data/games/frlg/maps/runtime/Route3.json index 01e07b6..204f8c6 100644 --- a/data/games/frlg/maps/runtime/Route3.json +++ b/data/games/frlg/maps/runtime/Route3.json @@ -46,10 +46,17 @@ } ], "npcs": [ - {"name": "youngster", "coord": [70, 13], "source_event": 0, "source_script": "Route3_EventScript_Youngster"}, + { + "name": "youngster", + "coord": [70, 13], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 0, + "source_script": "Route3_EventScript_Youngster" + }, { "name": "lass", "coord": [40, 11], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [1, 1]}, "wander": {"min": [40, 10], "max": [40, 12]}, "trainer": {"sight": 3, "looks": ["north", "south"]}, "source_event": 1, @@ -58,6 +65,7 @@ { "name": "bug_catcher", "coord": [32, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 2, @@ -66,6 +74,7 @@ { "name": "lass", "coord": [30, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 5}, "source_event": 3, @@ -74,6 +83,7 @@ { "name": "bug_catcher", "coord": [25, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 4, @@ -82,6 +92,7 @@ { "name": "youngster", "coord": [29, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 5}, "source_event": 5, @@ -90,6 +101,7 @@ { "name": "lass", "coord": [19, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 5}, "source_event": 6, @@ -98,6 +110,7 @@ { "name": "bug_catcher", "coord": [12, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 3}, "source_event": 7, @@ -106,6 +119,7 @@ { "name": "youngster", "coord": [17, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 8, diff --git a/data/games/frlg/maps/runtime/Route4.json b/data/games/frlg/maps/runtime/Route4.json index d63e02c..434232b 100644 --- a/data/games/frlg/maps/runtime/Route4.json +++ b/data/games/frlg/maps/runtime/Route4.json @@ -100,6 +100,7 @@ { "name": "woman_1", "coord": [9, 8], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [8, 7], "max": [10, 9]}, "source_event": 0, "source_script": "Route4_EventScript_Woman" @@ -107,6 +108,7 @@ { "name": "lass", "coord": [75, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 1, @@ -115,18 +117,32 @@ { "name": "boy", "coord": [15, 14], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [14, 14], "max": [16, 14]}, "source_event": 3, "source_script": "Route4_EventScript_Boy" }, - {"name": "black_belt", "coord": [47, 3], "source_event": 4, "source_script": "Route4_EventScript_MegaPunchTutor"}, - {"name": "black_belt", "coord": [50, 3], "source_event": 5, "source_script": "Route4_EventScript_MegaKickTutor"} + { + "name": "black_belt", + "coord": [47, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 4, + "source_script": "Route4_EventScript_MegaPunchTutor" + }, + { + "name": "black_belt", + "coord": [50, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 5, + "source_script": "Route4_EventScript_MegaKickTutor" + } ], "items": [ { "name": "item_ball", "coord": [67, 5], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE4_TM05", "source_script": "Route4_EventScript_ItemTM05", "item": "tm05" diff --git a/data/games/frlg/maps/runtime/Route4_PokemonCenter_1F.json b/data/games/frlg/maps/runtime/Route4_PokemonCenter_1F.json index 08382b7..c0a26d5 100644 --- a/data/games/frlg/maps/runtime/Route4_PokemonCenter_1F.json +++ b/data/games/frlg/maps/runtime/Route4_PokemonCenter_1F.json @@ -44,6 +44,7 @@ { "name": "nurse", "coord": [7, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "Route4_PokemonCenter_1F_EventScript_Nurse", "source_local_id": "LOCALID_ROUTE4_NURSE" @@ -51,18 +52,21 @@ { "name": "balding_man", "coord": [1, 3], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 1, "source_script": "Route4_PokemonCenter_1F_EventScript_MagikarpSalesman" }, { "name": "gentleman", "coord": [12, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 2, "source_script": "Route4_PokemonCenter_1F_EventScript_Gentleman" }, { "name": "boy", "coord": [5, 4], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [4, 3], "max": [6, 5]}, "source_event": 3, "source_script": "Route4_PokemonCenter_1F_EventScript_Boy" @@ -70,12 +74,14 @@ { "name": "youngster", "coord": [14, 4], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 4, "source_script": "Route4_PokemonCenter_1F_EventScript_Youngster" }, { "name": "clipboard", "coord": [12, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 5, "source_script": "Route4_PokemonCenter_1F_EventScript_Newspaper" } diff --git a/data/games/frlg/maps/runtime/Route5_SouthEntrance.json b/data/games/frlg/maps/runtime/Route5_SouthEntrance.json index 5c61f5f..cddef01 100644 --- a/data/games/frlg/maps/runtime/Route5_SouthEntrance.json +++ b/data/games/frlg/maps/runtime/Route5_SouthEntrance.json @@ -30,6 +30,12 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "policeman", "coord": [1, 5], "source_event": 0, "source_script": "Route5_SouthEntrance_EventScript_Guard"} + { + "name": "policeman", + "coord": [1, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 0, + "source_script": "Route5_SouthEntrance_EventScript_Guard" + } ] } diff --git a/data/games/frlg/maps/runtime/Route6.json b/data/games/frlg/maps/runtime/Route6.json index a3c8ff3..e990498 100644 --- a/data/games/frlg/maps/runtime/Route6.json +++ b/data/games/frlg/maps/runtime/Route6.json @@ -121,16 +121,30 @@ { "name": "bug_catcher", "coord": [3, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 5}, "source_event": 0, "source_script": "Route6_EventScript_Keigo" }, - {"name": "camper", "coord": [12, 21], "source_event": 1, "source_script": "Route6_EventScript_Ricky"}, - {"name": "picnicker", "coord": [13, 21], "source_event": 2, "source_script": "Route6_EventScript_Nancy"}, + { + "name": "camper", + "coord": [12, 21], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 1, + "source_script": "Route6_EventScript_Ricky" + }, + { + "name": "picnicker", + "coord": [13, 21], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 2, + "source_script": "Route6_EventScript_Nancy" + }, { "name": "bug_catcher", "coord": [20, 25], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 3, @@ -139,6 +153,7 @@ { "name": "picnicker", "coord": [13, 32], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 4, @@ -147,6 +162,7 @@ { "name": "camper", "coord": [13, 33], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 5, diff --git a/data/games/frlg/maps/runtime/Route6_NorthEntrance.json b/data/games/frlg/maps/runtime/Route6_NorthEntrance.json index df3ec56..c2888b8 100644 --- a/data/games/frlg/maps/runtime/Route6_NorthEntrance.json +++ b/data/games/frlg/maps/runtime/Route6_NorthEntrance.json @@ -30,6 +30,12 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "policeman", "coord": [7, 5], "source_event": 0, "source_script": "Route6_NorthEntrance_EventScript_Guard"} + { + "name": "policeman", + "coord": [7, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 0, + "source_script": "Route6_NorthEntrance_EventScript_Guard" + } ] } diff --git a/data/games/frlg/maps/runtime/Route7_EastEntrance.json b/data/games/frlg/maps/runtime/Route7_EastEntrance.json index a56d211..7025bb9 100644 --- a/data/games/frlg/maps/runtime/Route7_EastEntrance.json +++ b/data/games/frlg/maps/runtime/Route7_EastEntrance.json @@ -28,6 +28,12 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "policeman", "coord": [6, 2], "source_event": 0, "source_script": "Route7_EastEntrance_EventScript_Guard"} + { + "name": "policeman", + "coord": [6, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 0, + "source_script": "Route7_EastEntrance_EventScript_Guard" + } ] } diff --git a/data/games/frlg/maps/runtime/Route8.json b/data/games/frlg/maps/runtime/Route8.json index ee3eeb4..1e3c3cc 100644 --- a/data/games/frlg/maps/runtime/Route8.json +++ b/data/games/frlg/maps/runtime/Route8.json @@ -66,6 +66,7 @@ { "name": "lass", "coord": [62, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 6}, "source_event": 0, @@ -74,6 +75,7 @@ { "name": "old_man_1", "coord": [55, 15], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 1, @@ -82,6 +84,7 @@ { "name": "scientist", "coord": [51, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["north", "east", "south", "west"]}, "source_event": 2, "source_script": "Route8_EventScript_Glenn" @@ -89,6 +92,7 @@ { "name": "lass", "coord": [29, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 3, @@ -97,6 +101,7 @@ { "name": "scientist", "coord": [29, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 6}, "source_event": 4, @@ -105,6 +110,7 @@ { "name": "lass", "coord": [29, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 5, @@ -113,6 +119,7 @@ { "name": "lass", "coord": [29, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 6}, "source_event": 6, @@ -121,6 +128,7 @@ { "name": "old_man_1", "coord": [21, 3], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 7, "source_script": "Route8_EventScript_Stan" @@ -128,6 +136,7 @@ { "name": "scientist", "coord": [9, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 8, @@ -136,6 +145,7 @@ { "name": "cut_tree", "coord": [33, 15], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 9, "source_script": "EventScript_CutTree" @@ -143,6 +153,7 @@ { "name": "cut_tree", "coord": [47, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_13", "source_event": 10, "source_script": "EventScript_CutTree" @@ -150,6 +161,7 @@ { "name": "little_girl", "coord": [40, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 11, @@ -158,6 +170,7 @@ { "name": "little_girl", "coord": [41, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 12, @@ -166,6 +179,8 @@ { "name": "biker", "coord": [14, 16], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "range": [5, 2]}, + "wander": {"min": [9, 14], "max": [19, 18]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 13, "source_script": "Route8_EventScript_Ricardo" @@ -173,6 +188,8 @@ { "name": "biker", "coord": [24, 17], + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT", "range": [5, 5]}, + "wander": {"min": [19, 12], "max": [29, 19]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 14, "source_script": "Route8_EventScript_Jaren" diff --git a/data/games/frlg/maps/runtime/Route8_WestEntrance.json b/data/games/frlg/maps/runtime/Route8_WestEntrance.json index 717be95..8560a47 100644 --- a/data/games/frlg/maps/runtime/Route8_WestEntrance.json +++ b/data/games/frlg/maps/runtime/Route8_WestEntrance.json @@ -28,6 +28,12 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "policeman", "coord": [6, 2], "source_event": 0, "source_script": "Route8_WestEntrance_EventScript_Guard"} + { + "name": "policeman", + "coord": [6, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 0, + "source_script": "Route8_WestEntrance_EventScript_Guard" + } ] } diff --git a/data/games/frlg/maps/runtime/Route9.json b/data/games/frlg/maps/runtime/Route9.json index 0f8d796..ecf1f2a 100644 --- a/data/games/frlg/maps/runtime/Route9.json +++ b/data/games/frlg/maps/runtime/Route9.json @@ -69,6 +69,7 @@ { "name": "picnicker", "coord": [14, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 0, @@ -77,6 +78,7 @@ { "name": "hiker", "coord": [20, 17], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["north", "west"]}, "source_event": 1, "source_script": "Route9_EventScript_Jeremy" @@ -84,6 +86,7 @@ { "name": "hiker", "coord": [61, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 2, @@ -92,6 +95,7 @@ { "name": "camper", "coord": [26, 7], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["north", "east", "south", "west"]}, "source_event": 3, "source_script": "Route9_EventScript_Chris" @@ -99,6 +103,7 @@ { "name": "bug_catcher", "coord": [26, 1], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "source_event": 4, @@ -107,6 +112,7 @@ { "name": "bug_catcher", "coord": [49, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 3}, "source_event": 5, @@ -115,6 +121,7 @@ { "name": "hiker", "coord": [53, 2], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [3, 1]}, "wander": {"min": [50, 2], "max": [56, 2]}, "trainer": {"sight": 1, "looks": ["west", "east"]}, "source_event": 6, @@ -123,6 +130,7 @@ { "name": "picnicker", "coord": [60, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 7, @@ -131,6 +139,7 @@ { "name": "camper", "coord": [36, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 5}, "source_event": 8, @@ -139,6 +148,7 @@ { "name": "cut_tree", "coord": [2, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 9, "source_script": "EventScript_CutTree", @@ -150,6 +160,7 @@ "name": "item_ball", "coord": [12, 17], "source_event": 10, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE9_TM40", "source_script": "Route9_EventScript_ItemTM40", "item": "tm40" @@ -158,6 +169,7 @@ "name": "item_ball", "coord": [65, 17], "source_event": 11, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_ROUTE9_BURN_HEAL", "source_script": "Route9_EventScript_ItemBurnHeal", "item": "burn_heal" diff --git a/data/games/frlg/maps/runtime/SSAnne_1F_Corridor.json b/data/games/frlg/maps/runtime/SSAnne_1F_Corridor.json index 654257b..6dc7def 100644 --- a/data/games/frlg/maps/runtime/SSAnne_1F_Corridor.json +++ b/data/games/frlg/maps/runtime/SSAnne_1F_Corridor.json @@ -62,7 +62,19 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "sailor", "coord": [18, 8], "source_event": 0, "source_script": "SSAnne_1F_Corridor_EventScript_Sailor"}, - {"name": "worker_m", "coord": [12, 9], "source_event": 1, "source_script": "SSAnne_1F_Corridor_EventScript_WorkerM"} + { + "name": "sailor", + "coord": [18, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 0, + "source_script": "SSAnne_1F_Corridor_EventScript_Sailor" + }, + { + "name": "worker_m", + "coord": [12, 9], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 1, + "source_script": "SSAnne_1F_Corridor_EventScript_WorkerM" + } ] } diff --git a/data/games/frlg/maps/runtime/SSAnne_1F_Room6.json b/data/games/frlg/maps/runtime/SSAnne_1F_Room6.json index 5e73614..38310de 100644 --- a/data/games/frlg/maps/runtime/SSAnne_1F_Room6.json +++ b/data/games/frlg/maps/runtime/SSAnne_1F_Room6.json @@ -13,6 +13,12 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "woman_2", "coord": [3, 5], "source_event": 0, "source_script": "SSAnne_1F_Room6_EventScript_Woman"} + { + "name": "woman_2", + "coord": [3, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 0, + "source_script": "SSAnne_1F_Room6_EventScript_Woman" + } ] } diff --git a/data/games/frlg/maps/runtime/SSAnne_2F_Corridor.json b/data/games/frlg/maps/runtime/SSAnne_2F_Corridor.json index e0a81ca..321a5bf 100644 --- a/data/games/frlg/maps/runtime/SSAnne_2F_Corridor.json +++ b/data/games/frlg/maps/runtime/SSAnne_2F_Corridor.json @@ -53,6 +53,7 @@ { "name": "blue", "coord": [30, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SS_ANNE_RIVAL", "source_event": 0, "source_script": "0x0", @@ -61,6 +62,7 @@ { "name": "sailor", "coord": [2, 7], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [1, 2]}, "wander": {"min": [2, 5], "max": [2, 9]}, "source_event": 1, "source_script": "SSAnne_2F_Corridor_EventScript_Sailor" diff --git a/data/games/frlg/maps/runtime/SSAnne_CaptainsOffice.json b/data/games/frlg/maps/runtime/SSAnne_CaptainsOffice.json index c7f657e..1476b4a 100644 --- a/data/games/frlg/maps/runtime/SSAnne_CaptainsOffice.json +++ b/data/games/frlg/maps/runtime/SSAnne_CaptainsOffice.json @@ -27,6 +27,7 @@ { "name": "captain", "coord": [5, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 0, "source_script": "SSAnne_CaptainsOffice_EventScript_Captain", "source_local_id": "LOCALID_SS_ANNE_CAPTAIN" diff --git a/data/games/frlg/maps/runtime/SSAnne_Exterior.json b/data/games/frlg/maps/runtime/SSAnne_Exterior.json index 63b8bcc..e3c61d2 100644 --- a/data/games/frlg/maps/runtime/SSAnne_Exterior.json +++ b/data/games/frlg/maps/runtime/SSAnne_Exterior.json @@ -97,6 +97,7 @@ { "name": "ss_anne", "coord": [30, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SS_ANNE", "source_event": 0, "source_script": "0x0", diff --git a/data/games/frlg/maps/runtime/SafariZone_Center.json b/data/games/frlg/maps/runtime/SafariZone_Center.json index f8c5b7b..fde02c2 100644 --- a/data/games/frlg/maps/runtime/SafariZone_Center.json +++ b/data/games/frlg/maps/runtime/SafariZone_Center.json @@ -138,6 +138,7 @@ "name": "item_ball", "coord": [24, 15], "source_event": 0, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_CENTER_NUGGET", "source_script": "SafariZone_Center_EventScript_ItemNugget", "item": "nugget" diff --git a/data/games/frlg/maps/runtime/SafariZone_East.json b/data/games/frlg/maps/runtime/SafariZone_East.json index 5d343a3..3796cf1 100644 --- a/data/games/frlg/maps/runtime/SafariZone_East.json +++ b/data/games/frlg/maps/runtime/SafariZone_East.json @@ -117,6 +117,7 @@ "name": "item_ball", "coord": [13, 12], "source_event": 0, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_EAST_MAX_POTION", "source_script": "SafariZone_East_EventScript_ItemMaxPotion", "item": "max_potion" @@ -125,6 +126,7 @@ "name": "item_ball", "coord": [37, 15], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_EAST_FULL_RESTORE", "source_script": "SafariZone_East_EventScript_ItemFullRestore", "item": "full_restore" @@ -133,6 +135,7 @@ "name": "item_ball", "coord": [31, 18], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_EAST_TM11", "source_script": "SafariZone_East_EventScript_ItemTM11", "item": "tm11" @@ -141,6 +144,7 @@ "name": "item_ball", "coord": [36, 17], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_EAST_LEAF_STONE", "source_script": "SafariZone_East_EventScript_ItemLeafStone", "item": "leaf_stone" diff --git a/data/games/frlg/maps/runtime/SafariZone_North.json b/data/games/frlg/maps/runtime/SafariZone_North.json index 5791380..0e0f315 100644 --- a/data/games/frlg/maps/runtime/SafariZone_North.json +++ b/data/games/frlg/maps/runtime/SafariZone_North.json @@ -139,6 +139,7 @@ "name": "item_ball", "coord": [33, 5], "source_event": 0, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_PROTEIN", "source_script": "SafariZone_North_EventScript_ItemProtein", "item": "protein" @@ -147,6 +148,7 @@ "name": "item_ball", "coord": [28, 9], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_TM47", "source_script": "SafariZone_North_EventScript_ItemTM47", "item": "tm47" @@ -155,6 +157,7 @@ "name": "item_ball", "coord": [29, 17], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_QUICK_CLAW", "source_script": "SafariZone_North_EventScript_ItemQuickClaw", "item": "quick_claw" diff --git a/data/games/frlg/maps/runtime/SafariZone_SecretHouse.json b/data/games/frlg/maps/runtime/SafariZone_SecretHouse.json index e659a82..9e21460 100644 --- a/data/games/frlg/maps/runtime/SafariZone_SecretHouse.json +++ b/data/games/frlg/maps/runtime/SafariZone_SecretHouse.json @@ -33,6 +33,7 @@ { "name": "worker_m", "coord": [6, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "SafariZone_SecretHouse_EventScript_Attendant" } diff --git a/data/games/frlg/maps/runtime/SafariZone_West.json b/data/games/frlg/maps/runtime/SafariZone_West.json index daed713..66f4578 100644 --- a/data/games/frlg/maps/runtime/SafariZone_West.json +++ b/data/games/frlg/maps/runtime/SafariZone_West.json @@ -136,6 +136,7 @@ "name": "item_ball", "coord": [28, 14], "source_event": 0, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH", "source_script": "SafariZone_West_EventScript_ItemGoldTeeth", "item": "gold_teeth" @@ -144,6 +145,7 @@ "name": "item_ball", "coord": [17, 13], "source_event": 1, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_WEST_TM32", "source_script": "SafariZone_West_EventScript_ItemTM32", "item": "tm32" @@ -152,6 +154,7 @@ "name": "item_ball", "coord": [16, 27], "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_POTION", "source_script": "SafariZone_West_EventScript_ItemMaxPotion", "item": "max_potion" @@ -160,6 +163,7 @@ "name": "item_ball", "coord": [27, 24], "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_REVIVE", "source_script": "SafariZone_West_EventScript_ItemMaxRevive", "item": "max_revive" diff --git a/data/games/frlg/maps/runtime/SaffronCity.json b/data/games/frlg/maps/runtime/SaffronCity.json index b1485bc..0cc683c 100644 --- a/data/games/frlg/maps/runtime/SaffronCity.json +++ b/data/games/frlg/maps/runtime/SaffronCity.json @@ -107,6 +107,7 @@ { "name": "rocket_m", "coord": [22, 15], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFFRON_ROCKETS", "source_event": 0, "source_script": "SaffronCity_EventScript_RocketGrunt1" @@ -114,6 +115,7 @@ { "name": "rocket_m", "coord": [26, 16], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [4, 1]}, "wander": {"min": [22, 16], "max": [30, 16]}, "hide_flag": "FLAG_HIDE_SAFFRON_ROCKETS", "source_event": 1, @@ -122,6 +124,7 @@ { "name": "rocket_m", "coord": [46, 13], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFFRON_ROCKETS", "source_event": 2, "source_script": "SaffronCity_EventScript_RocketGrunt3" @@ -129,6 +132,7 @@ { "name": "rocket_m", "coord": [27, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFFRON_ROCKETS", "source_event": 3, "source_script": "SaffronCity_EventScript_RocketGrunt4" @@ -136,6 +140,7 @@ { "name": "rocket_m", "coord": [25, 33], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [7, 1]}, "wander": {"min": [18, 33], "max": [32, 33]}, "hide_flag": "FLAG_HIDE_SAFFRON_ROCKETS", "source_event": 4, @@ -144,6 +149,7 @@ { "name": "rocket_m", "coord": [34, 31], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFFRON_ROCKETS", "source_event": 5, "source_script": "SaffronCity_EventScript_DoorGuardGrunt", @@ -152,6 +158,7 @@ { "name": "rocket_m", "coord": [30, 39], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [5, 1]}, "wander": {"min": [25, 39], "max": [35, 39]}, "hide_flag": "FLAG_HIDE_SAFFRON_ROCKETS", "source_event": 6, @@ -160,6 +167,7 @@ { "name": "rocket_m", "coord": [48, 24], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [4, 1]}, "wander": {"min": [44, 24], "max": [52, 24]}, "hide_flag": "FLAG_HIDE_SAFFRON_ROCKETS", "source_event": 7, @@ -168,6 +176,7 @@ { "name": "youngster", "coord": [37, 32], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFFRON_CIVILIANS", "source_event": 8, "source_script": "SaffronCity_EventScript_Youngster" @@ -175,6 +184,7 @@ { "name": "worker_m", "coord": [21, 23], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [20, 22], "max": [22, 24]}, "hide_flag": "FLAG_HIDE_SAFFRON_CIVILIANS", "source_event": 9, @@ -183,6 +193,7 @@ { "name": "man", "coord": [39, 16], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFFRON_CIVILIANS", "source_event": 10, "source_script": "SaffronCity_EventScript_Man" @@ -190,6 +201,7 @@ { "name": "boy", "coord": [44, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFFRON_CIVILIANS", "source_event": 11, "source_script": "SaffronCity_EventScript_Boy" @@ -197,6 +209,7 @@ { "name": "pidgeot", "coord": [45, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFFRON_CIVILIANS", "source_event": 12, "source_script": "SaffronCity_EventScript_Pidgeot" @@ -204,6 +217,7 @@ { "name": "lass", "coord": [32, 39], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [5, 1]}, "wander": {"min": [27, 39], "max": [37, 39]}, "hide_flag": "FLAG_HIDE_SAFFRON_CIVILIANS", "source_event": 13, @@ -212,6 +226,7 @@ { "name": "crush_girl", "coord": [47, 24], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [46, 24], "max": [48, 24]}, "hide_flag": "FLAG_HIDE_POSTGAME_GOSSIPERS", "source_event": 14, diff --git a/data/games/frlg/maps/runtime/SaffronCity_Gym.json b/data/games/frlg/maps/runtime/SaffronCity_Gym.json index 920b812..8deed09 100644 --- a/data/games/frlg/maps/runtime/SaffronCity_Gym.json +++ b/data/games/frlg/maps/runtime/SaffronCity_Gym.json @@ -109,6 +109,7 @@ { "name": "cooltrainer_m", "coord": [24, 18], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 0, @@ -117,6 +118,7 @@ { "name": "cooltrainer_m", "coord": [24, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 1, @@ -125,6 +127,7 @@ { "name": "cooltrainer_m", "coord": [4, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 2, @@ -133,6 +136,7 @@ { "name": "channeler", "coord": [14, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 3, @@ -141,6 +145,7 @@ { "name": "channeler", "coord": [4, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 4, @@ -149,20 +154,34 @@ { "name": "channeler", "coord": [4, 18], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 5, "source_script": "SaffronCity_Gym_EventScript_Tasha" }, - {"name": "sabrina", "coord": [14, 11], "source_event": 6, "source_script": "SaffronCity_Gym_EventScript_Sabrina"}, + { + "name": "sabrina", + "coord": [14, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 6, + "source_script": "SaffronCity_Gym_EventScript_Sabrina" + }, { "name": "cooltrainer_m", "coord": [24, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 7, "source_script": "SaffronCity_Gym_EventScript_Tyron" }, - {"name": "gym_guy", "coord": [15, 20], "source_event": 8, "source_script": "SaffronCity_Gym_EventScript_GymGuy"} + { + "name": "gym_guy", + "coord": [15, 20], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 8, + "source_script": "SaffronCity_Gym_EventScript_GymGuy" + } ] } diff --git a/data/games/frlg/maps/runtime/SaffronCity_Mart.json b/data/games/frlg/maps/runtime/SaffronCity_Mart.json index 2a14fea..c466779 100644 --- a/data/games/frlg/maps/runtime/SaffronCity_Mart.json +++ b/data/games/frlg/maps/runtime/SaffronCity_Mart.json @@ -28,11 +28,24 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "clerk", "coord": [2, 3], "source_event": 0, "source_script": "SaffronCity_Mart_EventScript_Clerk"}, - {"name": "youngster", "coord": [1, 7], "source_event": 1, "source_script": "SaffronCity_Mart_EventScript_Youngster"}, + { + "name": "clerk", + "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 0, + "source_script": "SaffronCity_Mart_EventScript_Clerk" + }, + { + "name": "youngster", + "coord": [1, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 1, + "source_script": "SaffronCity_Mart_EventScript_Youngster" + }, { "name": "lass", "coord": [9, 5], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [1, 1]}, "wander": {"min": [9, 4], "max": [9, 6]}, "source_event": 2, "source_script": "SaffronCity_Mart_EventScript_Lass" diff --git a/data/games/frlg/maps/runtime/SilphCo_10F.json b/data/games/frlg/maps/runtime/SilphCo_10F.json index be3bcb8..ec0bd51 100644 --- a/data/games/frlg/maps/runtime/SilphCo_10F.json +++ b/data/games/frlg/maps/runtime/SilphCo_10F.json @@ -73,6 +73,7 @@ "npcs": [ { "name": "scientist", + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 2]}, "wander": {"min": [0, 5], "max": [4, 9]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -80,9 +81,16 @@ "source_script": "SilphCo_10F_EventScript_Travis", "coord": [2, 7] }, - {"name": "worker_f", "source_event": 1, "source_script": "SilphCo_10F_EventScript_WorkerF", "coord": [10, 17]}, + { + "name": "worker_f", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 1, + "source_script": "SilphCo_10F_EventScript_WorkerF", + "coord": [10, 17] + }, { "name": "rocket_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -95,6 +103,7 @@ { "name": "item_ball", "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_10F_CARBOS", "source_script": "SilphCo_10F_EventScript_ItemCarbos", "item": "carbos", @@ -103,6 +112,7 @@ { "name": "item_ball", "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_10F_ULTRA_BALL", "source_script": "SilphCo_10F_EventScript_ItemUltraBall", "item": "ultra_ball", @@ -111,6 +121,7 @@ { "name": "item_ball", "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_10F_RARE_CANDY", "source_script": "SilphCo_10F_EventScript_ItemRareCandy", "item": "rare_candy", diff --git a/data/games/frlg/maps/runtime/SilphCo_11F.json b/data/games/frlg/maps/runtime/SilphCo_11F.json index 53f4cfb..c8caefe 100644 --- a/data/games/frlg/maps/runtime/SilphCo_11F.json +++ b/data/games/frlg/maps/runtime/SilphCo_11F.json @@ -69,10 +69,23 @@ } ], "npcs": [ - {"name": "old_man_2", "source_event": 0, "source_script": "SilphCo_11F_EventScript_President", "coord": [9, 9]}, - {"name": "worker_f", "source_event": 1, "source_script": "SilphCo_11F_EventScript_Secretary", "coord": [11, 9]}, + { + "name": "old_man_2", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 0, + "source_script": "SilphCo_11F_EventScript_President", + "coord": [9, 9] + }, + { + "name": "worker_f", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 1, + "source_script": "SilphCo_11F_EventScript_Secretary", + "coord": [11, 9] + }, { "name": "giovanni", + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 2, "source_script": "0x0", @@ -81,6 +94,7 @@ }, { "name": "rocket_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 5}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -91,6 +105,7 @@ }, { "name": "rocket_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 5}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -104,6 +119,7 @@ { "name": "item_ball", "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_11F_ZINC", "source_script": "SilphCo_11F_EventScript_ItemZinc", "item": "zinc", diff --git a/data/games/frlg/maps/runtime/SilphCo_1F.json b/data/games/frlg/maps/runtime/SilphCo_1F.json index d34bf4f..dedce13 100644 --- a/data/games/frlg/maps/runtime/SilphCo_1F.json +++ b/data/games/frlg/maps/runtime/SilphCo_1F.json @@ -45,6 +45,7 @@ { "name": "worker_f", "coord": [3, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SAFFRON_CIVILIANS", "source_event": 0, "source_script": "SilphCo_1F_EventScript_Receptionist" diff --git a/data/games/frlg/maps/runtime/SilphCo_2F.json b/data/games/frlg/maps/runtime/SilphCo_2F.json index c8f22a3..80c3529 100644 --- a/data/games/frlg/maps/runtime/SilphCo_2F.json +++ b/data/games/frlg/maps/runtime/SilphCo_2F.json @@ -79,6 +79,7 @@ "npcs": [ { "name": "rocket_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 5}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -88,6 +89,7 @@ }, { "name": "scientist", + "movement": {"type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["north", "west"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 1, @@ -96,6 +98,7 @@ }, { "name": "rocket_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["south", "north"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 2, @@ -104,11 +107,18 @@ }, { "name": "scientist", + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 3, "source_script": "SilphCo_2F_EventScript_Connor", "coord": [5, 19] }, - {"name": "woman_2", "source_event": 4, "source_script": "SilphCo_2F_EventScript_ThunderWaveTutor", "coord": [10, 4]} + { + "name": "woman_2", + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 4, + "source_script": "SilphCo_2F_EventScript_ThunderWaveTutor", + "coord": [10, 4] + } ] } diff --git a/data/games/frlg/maps/runtime/SilphCo_3F.json b/data/games/frlg/maps/runtime/SilphCo_3F.json index 5b7b296..06e972b 100644 --- a/data/games/frlg/maps/runtime/SilphCo_3F.json +++ b/data/games/frlg/maps/runtime/SilphCo_3F.json @@ -97,6 +97,7 @@ "npcs": [ { "name": "rocket_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -104,9 +105,16 @@ "source_script": "SilphCo_3F_EventScript_Grunt", "coord": [25, 9] }, - {"name": "worker_m", "source_event": 1, "source_script": "SilphCo_3F_EventScript_WorkerM", "coord": [31, 13]}, + { + "name": "worker_m", + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 1, + "source_script": "SilphCo_3F_EventScript_WorkerM", + "coord": [31, 13] + }, { "name": "scientist", + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 2, "source_script": "SilphCo_3F_EventScript_Jose", @@ -117,6 +125,7 @@ { "name": "item_ball", "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_3F_HYPER_POTION", "source_script": "SilphCo_3F_EventScript_ItemHyperPotion", "item": "hyper_potion", diff --git a/data/games/frlg/maps/runtime/SilphCo_4F.json b/data/games/frlg/maps/runtime/SilphCo_4F.json index 5aca71d..7d5148e 100644 --- a/data/games/frlg/maps/runtime/SilphCo_4F.json +++ b/data/games/frlg/maps/runtime/SilphCo_4F.json @@ -91,6 +91,7 @@ "npcs": [ { "name": "rocket_m", + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [32, 15], "max": [34, 17]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -100,6 +101,7 @@ }, { "name": "rocket_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 5}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -109,18 +111,26 @@ }, { "name": "scientist", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "range": [1, 1]}, "trainer": {"sight": 2, "looks": ["south", "west"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 2, "source_script": "SilphCo_4F_EventScript_Rodney", "coord": [14, 8] }, - {"name": "worker_m", "source_event": 3, "source_script": "SilphCo_4F_EventScript_WorkerM", "coord": [5, 5]} + { + "name": "worker_m", + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 3, + "source_script": "SilphCo_4F_EventScript_WorkerM", + "coord": [5, 5] + } ], "items": [ { "name": "item_ball", "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_4F_MAX_REVIVE", "source_script": "SilphCo_4F_EventScript_ItemMaxRevive", "item": "max_revive", @@ -129,6 +139,7 @@ { "name": "item_ball", "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_4F_ESCAPE_ROPE", "source_script": "SilphCo_4F_EventScript_ItemEscapeRope", "item": "escape_rope", @@ -137,6 +148,7 @@ { "name": "item_ball", "source_event": 6, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_4F_FULL_HEAL", "source_script": "SilphCo_4F_EventScript_ItemFullHeal", "item": "full_heal", @@ -145,6 +157,7 @@ { "name": "item_ball", "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_4F_TM41", "source_script": "SilphCo_4F_EventScript_ItemTM41", "item": "tm41", diff --git a/data/games/frlg/maps/runtime/SilphCo_5F.json b/data/games/frlg/maps/runtime/SilphCo_5F.json index 28fb2d6..e419463 100644 --- a/data/games/frlg/maps/runtime/SilphCo_5F.json +++ b/data/games/frlg/maps/runtime/SilphCo_5F.json @@ -105,6 +105,7 @@ "npcs": [ { "name": "rocket_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 2}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -114,15 +115,23 @@ }, { "name": "rocker", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["south", "north"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 1, "source_script": "SilphCo_5F_EventScript_Dalton", "coord": [23, 13] }, - {"name": "worker_m", "source_event": 2, "source_script": "SilphCo_5F_EventScript_WorkerM", "coord": [16, 13]}, + { + "name": "worker_m", + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 2, + "source_script": "SilphCo_5F_EventScript_WorkerM", + "coord": [16, 13] + }, { "name": "scientist", + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [10, 5], "max": [12, 7]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -132,18 +141,27 @@ }, { "name": "rocket_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["north", "east"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", "source_event": 4, "source_script": "SilphCo_5F_EventScript_Grunt1", "coord": [9, 21] }, - {"name": "scientist", "source_event": 8, "source_script": "SilphCo_5F_EventScript_Scientist", "coord": [2, 7]} + { + "name": "scientist", + "movement": {"type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "range": [2, 1]}, + "wander": {"min": [0, 7], "max": [4, 7]}, + "source_event": 8, + "source_script": "SilphCo_5F_EventScript_Scientist", + "coord": [2, 7] + } ], "items": [ { "name": "item_ball", "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_5F_PROTEIN", "source_script": "SilphCo_5F_EventScript_ItemProtein", "item": "protein", @@ -152,6 +170,7 @@ { "name": "item_ball", "source_event": 6, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_5F_TM01", "source_script": "SilphCo_5F_EventScript_ItemTM01", "item": "tm01", @@ -160,6 +179,7 @@ { "name": "item_ball", "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_5F_CARD_KEY", "source_script": "SilphCo_5F_EventScript_ItemCardKey", "item": "card_key", diff --git a/data/games/frlg/maps/runtime/SilphCo_6F.json b/data/games/frlg/maps/runtime/SilphCo_6F.json index ad51a73..9869db8 100644 --- a/data/games/frlg/maps/runtime/SilphCo_6F.json +++ b/data/games/frlg/maps/runtime/SilphCo_6F.json @@ -72,6 +72,7 @@ "npcs": [ { "name": "rocket_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -79,13 +80,44 @@ "source_script": "SilphCo_6F_EventScript_Grunt1", "coord": [21, 5] }, - {"name": "worker_m", "source_event": 1, "source_script": "SilphCo_6F_EventScript_WorkerM1", "coord": [23, 9]}, - {"name": "worker_f", "source_event": 2, "source_script": "SilphCo_6F_EventScript_WorkerF1", "coord": [24, 9]}, - {"name": "worker_m", "source_event": 3, "source_script": "SilphCo_6F_EventScript_WorkerM2", "coord": [22, 13]}, - {"name": "worker_m", "source_event": 4, "source_script": "SilphCo_6F_EventScript_WorkerM3", "coord": [14, 9]}, - {"name": "worker_f", "source_event": 5, "source_script": "SilphCo_6F_EventScript_WorkerF2", "coord": [16, 12]}, + { + "name": "worker_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 1, + "source_script": "SilphCo_6F_EventScript_WorkerM1", + "coord": [23, 9] + }, + { + "name": "worker_f", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 2, + "source_script": "SilphCo_6F_EventScript_WorkerF1", + "coord": [24, 9] + }, + { + "name": "worker_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 3, + "source_script": "SilphCo_6F_EventScript_WorkerM2", + "coord": [22, 13] + }, + { + "name": "worker_m", + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 4, + "source_script": "SilphCo_6F_EventScript_WorkerM3", + "coord": [14, 9] + }, + { + "name": "worker_f", + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 5, + "source_script": "SilphCo_6F_EventScript_WorkerF2", + "coord": [16, 12] + }, { "name": "scientist", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -95,6 +127,7 @@ }, { "name": "rocket_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 2}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -107,6 +140,7 @@ { "name": "item_ball", "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_6F_HP_UP", "source_script": "SilphCo_6F_EventScript_ItemHPUp", "item": "hp_up", @@ -115,6 +149,7 @@ { "name": "item_ball", "source_event": 8, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_6F_X_SPECIAL", "source_script": "SilphCo_6F_EventScript_ItemXSpecial", "item": "x_special", diff --git a/data/games/frlg/maps/runtime/SilphCo_7F.json b/data/games/frlg/maps/runtime/SilphCo_7F.json index f8fbe3b..501b928 100644 --- a/data/games/frlg/maps/runtime/SilphCo_7F.json +++ b/data/games/frlg/maps/runtime/SilphCo_7F.json @@ -87,15 +87,23 @@ "npcs": [ { "name": "blue", + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_RIVAL", "source_event": 0, "source_script": "0x0", "source_local_id": "LOCALID_SILPH_CO_RIVAL", "coord": [2, 6] }, - {"name": "worker_m", "source_event": 1, "source_script": "SilphCo_7F_EventScript_LaprasGuy", "coord": [0, 7]}, + { + "name": "worker_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 1, + "source_script": "SilphCo_7F_EventScript_LaprasGuy", + "coord": [0, 7] + }, { "name": "rocket_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -105,6 +113,7 @@ }, { "name": "rocket_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -114,6 +123,7 @@ }, { "name": "rocket_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -121,10 +131,24 @@ "source_script": "SilphCo_7F_EventScript_Grunt3", "coord": [13, 4] }, - {"name": "worker_f", "source_event": 5, "source_script": "SilphCo_7F_EventScript_WorkerF", "coord": [10, 10]}, - {"name": "worker_m", "source_event": 6, "source_script": "SilphCo_7F_EventScript_WorkerM1", "coord": [13, 14]}, + { + "name": "worker_f", + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 5, + "source_script": "SilphCo_7F_EventScript_WorkerF", + "coord": [10, 10] + }, + { + "name": "worker_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 6, + "source_script": "SilphCo_7F_EventScript_WorkerM1", + "coord": [13, 14] + }, { "name": "worker_m", + "movement": {"type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "range": [1, 1]}, + "wander": {"min": [8, 14], "max": [10, 14]}, "source_event": 7, "source_script": "SilphCo_7F_EventScript_WorkerM2", "source_local_id": "LOCALID_SILPH_CO_7F_WORKER_M2", @@ -132,6 +156,7 @@ }, { "name": "scientist", + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [2, 1]}, "wander": {"min": [1, 13], "max": [5, 13]}, "trainer": {"sight": 1, "looks": ["west", "east"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -144,6 +169,7 @@ { "name": "item_ball", "source_event": 9, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_7F_CALCIUM", "source_script": "SilphCo_7F_EventScript_ItemCalcium", "item": "calcium", @@ -152,6 +178,7 @@ { "name": "item_ball", "source_event": 10, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_7F_TM08", "source_script": "SilphCo_7F_EventScript_ItemTM08", "item": "tm08", diff --git a/data/games/frlg/maps/runtime/SilphCo_8F.json b/data/games/frlg/maps/runtime/SilphCo_8F.json index e38f511..4f913cc 100644 --- a/data/games/frlg/maps/runtime/SilphCo_8F.json +++ b/data/games/frlg/maps/runtime/SilphCo_8F.json @@ -101,6 +101,7 @@ "npcs": [ { "name": "rocket_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 4}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -110,6 +111,7 @@ }, { "name": "rocket_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 5}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -119,6 +121,7 @@ }, { "name": "scientist", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 2}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -128,17 +131,25 @@ }, { "name": "worker_m", + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [1, 5], "max": [3, 5]}, "source_event": 3, "source_script": "SilphCo_8F_EventScript_WorkerM", "coord": [2, 5] }, - {"name": "scientist", "source_event": 5, "source_script": "SilphCo_8F_EventScript_Scientist", "coord": [29, 9]} + { + "name": "scientist", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 5, + "source_script": "SilphCo_8F_EventScript_Scientist", + "coord": [29, 9] + } ], "items": [ { "name": "item_ball", "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_SILPH_CO_8F_IRON", "source_script": "SilphCo_8F_EventScript_ItemIron", "item": "iron", diff --git a/data/games/frlg/maps/runtime/SilphCo_9F.json b/data/games/frlg/maps/runtime/SilphCo_9F.json index 00ea106..be030ed 100644 --- a/data/games/frlg/maps/runtime/SilphCo_9F.json +++ b/data/games/frlg/maps/runtime/SilphCo_9F.json @@ -108,6 +108,7 @@ "npcs": [ { "name": "scientist", + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [1, 1]}, "wander": {"min": [26, 15], "max": [26, 17]}, "trainer": {"sight": 2, "looks": ["north", "south"]}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -117,6 +118,7 @@ }, { "name": "rocket_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 3}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", @@ -124,9 +126,16 @@ "source_script": "SilphCo_9F_EventScript_Grunt2", "coord": [15, 18] }, - {"name": "woman_2", "source_event": 2, "source_script": "SilphCo_9F_EventScript_HealWoman", "coord": [2, 16]}, + { + "name": "woman_2", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 2, + "source_script": "SilphCo_9F_EventScript_HealWoman", + "coord": [2, 16] + }, { "name": "rocket_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 5}, "hide_flag": "FLAG_HIDE_SILPH_ROCKETS", diff --git a/data/games/frlg/maps/runtime/UndergroundPath_EastEntrance.json b/data/games/frlg/maps/runtime/UndergroundPath_EastEntrance.json index 9573677..08f3f14 100644 --- a/data/games/frlg/maps/runtime/UndergroundPath_EastEntrance.json +++ b/data/games/frlg/maps/runtime/UndergroundPath_EastEntrance.json @@ -32,6 +32,7 @@ { "name": "woman_2", "coord": [5, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 0, "source_script": "UndergroundPath_EastEntrance_EventScript_Woman" } diff --git a/data/games/frlg/maps/runtime/UndergroundPath_NorthEntrance.json b/data/games/frlg/maps/runtime/UndergroundPath_NorthEntrance.json index 0c57df2..3de9d50 100644 --- a/data/games/frlg/maps/runtime/UndergroundPath_NorthEntrance.json +++ b/data/games/frlg/maps/runtime/UndergroundPath_NorthEntrance.json @@ -32,6 +32,7 @@ { "name": "little_girl", "coord": [5, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "UndergroundPath_NorthEntrance_EventScript_Saige" } diff --git a/data/games/frlg/maps/runtime/UndergroundPath_SouthEntrance.json b/data/games/frlg/maps/runtime/UndergroundPath_SouthEntrance.json index fffe5ca..016733f 100644 --- a/data/games/frlg/maps/runtime/UndergroundPath_SouthEntrance.json +++ b/data/games/frlg/maps/runtime/UndergroundPath_SouthEntrance.json @@ -32,6 +32,7 @@ { "name": "woman_2", "coord": [5, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 0, "source_script": "UndergroundPath_SouthEntrance_EventScript_Woman" } diff --git a/data/games/frlg/maps/runtime/UndergroundPath_WestEntrance.json b/data/games/frlg/maps/runtime/UndergroundPath_WestEntrance.json index 96f2578..243a0a5 100644 --- a/data/games/frlg/maps/runtime/UndergroundPath_WestEntrance.json +++ b/data/games/frlg/maps/runtime/UndergroundPath_WestEntrance.json @@ -32,6 +32,7 @@ { "name": "balding_man", "coord": [5, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 0, "source_script": "UndergroundPath_WestEntrance_EventScript_BaldingMan" } diff --git a/data/games/frlg/maps/runtime/VermilionCity.json b/data/games/frlg/maps/runtime/VermilionCity.json index f7b0789..83a1e06 100644 --- a/data/games/frlg/maps/runtime/VermilionCity.json +++ b/data/games/frlg/maps/runtime/VermilionCity.json @@ -132,15 +132,29 @@ { "name": "woman_1", "coord": [22, 11], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [4, 1]}, "wander": {"min": [18, 11], "max": [26, 11]}, "source_event": 0, "source_script": "VermilionCity_EventScript_Woman" }, - {"name": "old_man_1", "coord": [17, 9], "source_event": 1, "source_script": "VermilionCity_EventScript_OldMan1"}, - {"name": "old_man_2", "coord": [36, 10], "source_event": 2, "source_script": "VermilionCity_EventScript_OldMan2"}, + { + "name": "old_man_1", + "coord": [17, 9], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, + "source_event": 1, + "source_script": "VermilionCity_EventScript_OldMan1" + }, + { + "name": "old_man_2", + "coord": [36, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "range": [1, 1]}, + "source_event": 2, + "source_script": "VermilionCity_EventScript_OldMan2" + }, { "name": "machop", "coord": [35, 11], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [2, 2]}, "wander": {"min": [33, 9], "max": [37, 13]}, "source_event": 3, "source_script": "VermilionCity_EventScript_Machop" @@ -148,6 +162,7 @@ { "name": "sailor", "coord": [31, 30], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [4, 1]}, "wander": {"min": [27, 30], "max": [35, 30]}, "source_event": 4, "source_script": "VermilionCity_EventScript_Sailor" @@ -155,6 +170,7 @@ { "name": "sailor", "coord": [24, 33], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "source_event": 5, "source_script": "VermilionCity_EventScript_FerrySailor", "source_local_id": "LOCALID_VERMILION_FERRY_SAILOR" @@ -162,6 +178,7 @@ { "name": "cut_tree", "coord": [19, 24], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 6, "source_script": "EventScript_CutTree" @@ -169,6 +186,7 @@ { "name": "scientist", "coord": [25, 7], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [4, 1]}, "hide_flag": "FLAG_HIDE_VERMILION_CITY_OAKS_AIDE", "source_event": 7, "source_script": "VermilionCity_EventScript_OaksAide" diff --git a/data/games/frlg/maps/runtime/VermilionCity_Gym.json b/data/games/frlg/maps/runtime/VermilionCity_Gym.json index 24ee6d5..5479181 100644 --- a/data/games/frlg/maps/runtime/VermilionCity_Gym.json +++ b/data/games/frlg/maps/runtime/VermilionCity_Gym.json @@ -41,9 +41,16 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "lt_surge", "source_event": 0, "source_script": "VermilionCity_Gym_EventScript_LtSurge", "coord": [5, 2]}, + { + "name": "lt_surge", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 0, + "source_script": "VermilionCity_Gym_EventScript_LtSurge", + "coord": [5, 2] + }, { "name": "balding_man", + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["north", "east", "south", "west"]}, "source_event": 1, "source_script": "VermilionCity_Gym_EventScript_Baily", @@ -51,14 +58,22 @@ }, { "name": "sailor", + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "trainer": {"sight": 3, "looks": ["north", "east", "south", "west"]}, "source_event": 2, "source_script": "VermilionCity_Gym_EventScript_Dwayne", "coord": [8, 13] }, - {"name": "gym_guy", "source_event": 3, "source_script": "VermilionCity_Gym_EventScript_GymGuy", "coord": [4, 17]}, + { + "name": "gym_guy", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 3, + "source_script": "VermilionCity_Gym_EventScript_GymGuy", + "coord": [4, 17] + }, { "name": "gentleman", + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 3}, "source_event": 4, diff --git a/data/games/frlg/maps/runtime/VermilionCity_Mart.json b/data/games/frlg/maps/runtime/VermilionCity_Mart.json index 30a8953..966dcde 100644 --- a/data/games/frlg/maps/runtime/VermilionCity_Mart.json +++ b/data/games/frlg/maps/runtime/VermilionCity_Mart.json @@ -28,16 +28,24 @@ "flag_sets": {}, "connections": [], "npcs": [ - {"name": "clerk", "coord": [2, 3], "source_event": 0, "source_script": "VermilionCity_Mart_EventScript_Clerk"}, + { + "name": "clerk", + "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, + "source_event": 0, + "source_script": "VermilionCity_Mart_EventScript_Clerk" + }, { "name": "cooltrainer_f", "coord": [4, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "source_event": 1, "source_script": "VermilionCity_Mart_EventScript_CooltrainerF" }, { "name": "balding_man", "coord": [9, 4], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 2]}, "wander": {"min": [8, 2], "max": [10, 6]}, "source_event": 2, "source_script": "VermilionCity_Mart_EventScript_BaldingMan" diff --git a/data/games/frlg/maps/runtime/VermilionCity_PokemonCenter_1F.json b/data/games/frlg/maps/runtime/VermilionCity_PokemonCenter_1F.json index 84f0fa1..2f0c013 100644 --- a/data/games/frlg/maps/runtime/VermilionCity_PokemonCenter_1F.json +++ b/data/games/frlg/maps/runtime/VermilionCity_PokemonCenter_1F.json @@ -44,6 +44,7 @@ { "name": "nurse", "coord": [7, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "VermilionCity_PokemonCenter_1F_EventScript_Nurse", "source_local_id": "LOCALID_VERMILION_NURSE" @@ -51,6 +52,7 @@ { "name": "man", "coord": [4, 8], + "movement": {"type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "range": [1, 1]}, "wander": {"min": [3, 8], "max": [5, 8]}, "source_event": 1, "source_script": "VermilionCity_PokemonCenter_1F_EventScript_Man" @@ -58,12 +60,14 @@ { "name": "hiker", "coord": [12, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 2, "source_script": "VermilionCity_PokemonCenter_1F_EventScript_Hiker" }, { "name": "youngster", "coord": [14, 4], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [1, 1]}, "wander": {"min": [14, 3], "max": [14, 5]}, "source_event": 3, "source_script": "VermilionCity_PokemonCenter_1F_EventScript_Youngster" @@ -71,12 +75,14 @@ { "name": "cooltrainer_f", "coord": [6, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 4, "source_script": "VermilionCity_PokemonCenter_1F_EventScript_VSSeekerWoman" }, { "name": "0", "coord": [2, 1], + "movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL", "source_event": 5, "source_script": "VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge" @@ -84,6 +90,7 @@ { "name": "0", "coord": [3, 1], + "movement": {"type": "MOVEMENT_TYPE_INVISIBLE", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL", "source_event": 6, "source_script": "VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge" diff --git a/data/games/frlg/maps/runtime/VermilionCity_PokemonFanClub.json b/data/games/frlg/maps/runtime/VermilionCity_PokemonFanClub.json index a555561..ef2f757 100644 --- a/data/games/frlg/maps/runtime/VermilionCity_PokemonFanClub.json +++ b/data/games/frlg/maps/runtime/VermilionCity_PokemonFanClub.json @@ -47,30 +47,35 @@ { "name": "gentleman", "coord": [5, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "VermilionCity_PokemonFanClub_EventScript_Chairman" }, { "name": "worker_f", "coord": [6, 4], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 1, "source_script": "VermilionCity_PokemonFanClub_EventScript_WorkerF" }, { "name": "pikachu", "coord": [7, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 2, "source_script": "VermilionCity_PokemonFanClub_EventScript_Pikachu" }, { "name": "seel", "coord": [4, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 3, "source_script": "VermilionCity_PokemonFanClub_EventScript_Seel" }, { "name": "woman_1", "coord": [4, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 4, "source_script": "VermilionCity_PokemonFanClub_EventScript_Woman", "source_local_id": "LOCALID_POKEMON_FAN_CLUB_WOMAN" @@ -78,6 +83,7 @@ { "name": "fat_man", "coord": [7, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 5, "source_script": "VermilionCity_PokemonFanClub_EventScript_FatMan", "source_local_id": "LOCALID_POKEMON_FAN_CLUB_FAT_MAN" diff --git a/data/games/frlg/maps/runtime/VictoryRoad_1F.json b/data/games/frlg/maps/runtime/VictoryRoad_1F.json index b9417bf..bd9759d 100644 --- a/data/games/frlg/maps/runtime/VictoryRoad_1F.json +++ b/data/games/frlg/maps/runtime/VictoryRoad_1F.json @@ -143,6 +143,7 @@ "npcs": [ { "name": "cooltrainer_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 0, @@ -151,6 +152,7 @@ }, { "name": "cooltrainer_f", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 4}, "source_event": 1, @@ -159,18 +161,32 @@ }, { "name": "pushable_boulder", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, "source_event": 4, "source_script": "EventScript_StrengthBoulder", "source_local_id": "LOCALID_VICTORY_ROAD_1F_BOULDER", "coord": [7, 18] }, - {"name": "pushable_boulder", "source_event": 5, "source_script": "EventScript_StrengthBoulder", "coord": [4, 12]}, - {"name": "pushable_boulder", "source_event": 6, "source_script": "EventScript_StrengthBoulder", "coord": [16, 3]} + { + "name": "pushable_boulder", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, + "source_event": 5, + "source_script": "EventScript_StrengthBoulder", + "coord": [4, 12] + }, + { + "name": "pushable_boulder", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, + "source_event": 6, + "source_script": "EventScript_StrengthBoulder", + "coord": [16, 3] + } ], "items": [ { "name": "item_ball", "source_event": 2, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_1F_RARE_CANDY", "source_script": "VictoryRoad_1F_EventScript_ItemRareCandy", "item": "rare_candy", @@ -179,6 +195,7 @@ { "name": "item_ball", "source_event": 3, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02", "source_script": "VictoryRoad_1F_EventScript_ItemTM02", "item": "tm02", diff --git a/data/games/frlg/maps/runtime/VictoryRoad_2F.json b/data/games/frlg/maps/runtime/VictoryRoad_2F.json index 984aa95..1a34be6 100644 --- a/data/games/frlg/maps/runtime/VictoryRoad_2F.json +++ b/data/games/frlg/maps/runtime/VictoryRoad_2F.json @@ -173,6 +173,7 @@ "npcs": [ { "name": "poke_maniac", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 0, @@ -181,6 +182,7 @@ }, { "name": "black_belt", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "range": [1, 1]}, "trainer": {"sight": 4, "looks": ["south", "west"]}, "source_event": 1, "source_script": "VictoryRoad_2F_EventScript_Daisuke", @@ -188,6 +190,7 @@ }, { "name": "rocker", + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 4}, "source_event": 2, @@ -196,6 +199,8 @@ }, { "name": "man", + "movement": {"type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP", "range": [4, 4]}, + "wander": {"min": [22, 2], "max": [30, 10]}, "trainer": {"sight": 1, "looks": ["north", "east", "south", "west"]}, "source_event": 3, "source_script": "VictoryRoad_2F_EventScript_Vincent", @@ -203,15 +208,23 @@ }, { "name": "rocker", + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 3}, "source_event": 4, "source_script": "VictoryRoad_2F_EventScript_Gregory", "coord": [36, 5] }, - {"name": "pushable_boulder", "source_event": 9, "source_script": "EventScript_StrengthBoulder", "coord": [8, 7]}, { "name": "pushable_boulder", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, + "source_event": 9, + "source_script": "EventScript_StrengthBoulder", + "coord": [8, 7] + }, + { + "name": "pushable_boulder", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, "source_event": 10, "source_script": "EventScript_StrengthBoulder", "source_local_id": "LOCALID_VICTORY_ROAD_2F_BOULDER1", @@ -219,6 +232,7 @@ }, { "name": "pushable_boulder", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_2F_BOULDER", "source_event": 11, "source_script": "EventScript_StrengthBoulder", @@ -227,6 +241,7 @@ }, { "name": "cooltrainer_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 12, "source_script": "VictoryRoad_2F_EventScript_DoubleEdgeTutor", "coord": [40, 9] @@ -236,6 +251,7 @@ { "name": "item_ball", "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_2F_GUARD_SPEC", "source_script": "VictoryRoad_2F_EventScript_ItemGuardSpec", "item": "guard_spec", @@ -244,6 +260,7 @@ { "name": "item_ball", "source_event": 6, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM07", "source_script": "VictoryRoad_2F_EventScript_ItemTM07", "item": "tm07", @@ -252,6 +269,7 @@ { "name": "item_ball", "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_2F_FULL_HEAL", "source_script": "VictoryRoad_2F_EventScript_ItemFullHeal", "item": "full_heal", @@ -260,6 +278,7 @@ { "name": "item_ball", "source_event": 8, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM37", "source_script": "VictoryRoad_2F_EventScript_ItemTM37", "item": "tm37", diff --git a/data/games/frlg/maps/runtime/VictoryRoad_3F.json b/data/games/frlg/maps/runtime/VictoryRoad_3F.json index cc92347..e7226bb 100644 --- a/data/games/frlg/maps/runtime/VictoryRoad_3F.json +++ b/data/games/frlg/maps/runtime/VictoryRoad_3F.json @@ -135,6 +135,7 @@ "npcs": [ { "name": "cooltrainer_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 1}, "source_event": 0, @@ -143,6 +144,7 @@ }, { "name": "cooltrainer_f", + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 4}, "source_event": 1, @@ -151,6 +153,7 @@ }, { "name": "cooltrainer_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 5}, "source_event": 2, @@ -159,6 +162,7 @@ }, { "name": "cooltrainer_f", + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 5}, "source_event": 3, @@ -167,6 +171,7 @@ }, { "name": "pushable_boulder", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, "source_event": 6, "source_script": "EventScript_StrengthBoulder", "source_local_id": "LOCALID_VICTORY_ROAD_3F_BOULDER1", @@ -174,14 +179,22 @@ }, { "name": "pushable_boulder", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_3F_BOULDER", "source_event": 7, "source_script": "EventScript_StrengthBoulder", "coord": [33, 18] }, - {"name": "pushable_boulder", "source_event": 8, "source_script": "EventScript_StrengthBoulder", "coord": [35, 13]}, { "name": "pushable_boulder", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, + "source_event": 8, + "source_script": "EventScript_StrengthBoulder", + "coord": [35, 13] + }, + { + "name": "pushable_boulder", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, "source_event": 9, "source_script": "EventScript_StrengthBoulder", "source_local_id": "LOCALID_VICTORY_ROAD_3F_BOULDER2", @@ -189,6 +202,7 @@ }, { "name": "cooltrainer_m", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 10, @@ -197,6 +211,7 @@ }, { "name": "cooltrainer_f", + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 1}, "source_event": 11, @@ -208,6 +223,7 @@ { "name": "item_ball", "source_event": 4, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_3F_MAX_REVIVE", "source_script": "VictoryRoad_3F_EventScript_ItemMaxRevive", "item": "max_revive", @@ -216,6 +232,7 @@ { "name": "item_ball", "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50", "source_script": "VictoryRoad_3F_EventScript_ItemTM50", "item": "tm50", diff --git a/data/games/frlg/maps/runtime/ViridianCity.json b/data/games/frlg/maps/runtime/ViridianCity.json index 01c9081..400b39b 100644 --- a/data/games/frlg/maps/runtime/ViridianCity.json +++ b/data/games/frlg/maps/runtime/ViridianCity.json @@ -120,12 +120,14 @@ { "name": "fat_man", "coord": [8, 26], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [0, 0]}, "source_event": 0, "source_script": "ViridianCity_EventScript_DreamEaterTutor" }, { "name": "cut_tree", "coord": [11, 24], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_11", "source_event": 1, "source_script": "EventScript_CutTree" @@ -133,6 +135,7 @@ { "name": "old_man_1", "coord": [34, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [0, 0]}, "source_event": 2, "source_script": "ViridianCity_EventScript_OldMan", "source_local_id": "LOCALID_VIRIDIAN_OLD_MAN" @@ -140,6 +143,7 @@ { "name": "var_0", "coord": [21, 6], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [2, 3]}, "source_event": 3, "source_script": "ViridianCity_EventScript_TutorialOldMan", "source_local_id": "LOCALID_TUTORIAL_MAN" @@ -147,6 +151,7 @@ { "name": "woman_3", "coord": [20, 12], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 3]}, "source_event": 4, "source_script": "ViridianCity_EventScript_Woman", "source_local_id": "LOCALID_VIRIDIAN_WOMAN" @@ -154,6 +159,7 @@ { "name": "youngster", "coord": [33, 26], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [0, 2]}, "wander": {"min": [33, 24], "max": [33, 28]}, "source_event": 5, "source_script": "ViridianCity_EventScript_Youngster" @@ -161,6 +167,7 @@ { "name": "boy", "coord": [16, 22], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 2]}, "wander": {"min": [15, 20], "max": [17, 24]}, "source_event": 6, "source_script": "ViridianCity_EventScript_Boy" @@ -168,6 +175,7 @@ { "name": "cut_tree", "coord": [18, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_TEMP_12", "source_event": 7, "source_script": "EventScript_CutTree", @@ -179,6 +187,7 @@ "name": "item_ball", "coord": [17, 5], "source_event": 8, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VIRIDIAN_CITY_POTION", "source_script": "ViridianCity_EventScript_ItemPotion", "item": "potion" diff --git a/data/games/frlg/maps/runtime/ViridianCity_Gym.json b/data/games/frlg/maps/runtime/ViridianCity_Gym.json index c26539c..8b4c241 100644 --- a/data/games/frlg/maps/runtime/ViridianCity_Gym.json +++ b/data/games/frlg/maps/runtime/ViridianCity_Gym.json @@ -56,6 +56,7 @@ { "name": "black_belt", "coord": [10, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 0, @@ -64,6 +65,7 @@ { "name": "cooltrainer_m", "coord": [12, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 1, @@ -72,6 +74,7 @@ { "name": "black_belt", "coord": [11, 14], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 3}, "source_event": 2, @@ -80,6 +83,7 @@ { "name": "man", "coord": [10, 10], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 3, @@ -88,6 +92,7 @@ { "name": "man", "coord": [2, 21], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 2}, "source_event": 4, @@ -96,6 +101,7 @@ { "name": "black_belt", "coord": [3, 11], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 2}, "source_event": 5, @@ -104,6 +110,7 @@ { "name": "cooltrainer_m", "coord": [6, 8], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "facing": "south", "trainer": {"sight": 3}, "source_event": 6, @@ -112,6 +119,7 @@ { "name": "giovanni", "coord": [2, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VIRIDIAN_GIOVANNI", "source_event": 7, "source_script": "ViridianCity_Gym_EventScript_Giovanni", @@ -120,11 +128,18 @@ { "name": "cooltrainer_m", "coord": [13, 7], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "facing": "east", "trainer": {"sight": 3}, "source_event": 8, "source_script": "ViridianCity_Gym_EventScript_Warren" }, - {"name": "gym_guy", "coord": [16, 20], "source_event": 9, "source_script": "ViridianCity_Gym_EventScript_GymGuy"} + { + "name": "gym_guy", + "coord": [16, 20], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, + "source_event": 9, + "source_script": "ViridianCity_Gym_EventScript_GymGuy" + } ] } diff --git a/data/games/frlg/maps/runtime/ViridianCity_Mart.json b/data/games/frlg/maps/runtime/ViridianCity_Mart.json index b424782..c71a49e 100644 --- a/data/games/frlg/maps/runtime/ViridianCity_Mart.json +++ b/data/games/frlg/maps/runtime/ViridianCity_Mart.json @@ -31,6 +31,7 @@ { "name": "clerk", "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_FACE_RIGHT", "range": [1, 1]}, "source_event": 0, "source_script": "ViridianCity_Mart_EventScript_Clerk", "source_local_id": "LOCALID_VIRIDIAN_MART_CLERK" @@ -38,6 +39,7 @@ { "name": "youngster", "coord": [6, 2], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [5, 1], "max": [7, 3]}, "source_event": 1, "source_script": "ViridianCity_Mart_EventScript_Youngster" @@ -45,6 +47,7 @@ { "name": "woman_1", "coord": [9, 5], + "movement": {"type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "range": [1, 1]}, "wander": {"min": [9, 4], "max": [9, 6]}, "source_event": 2, "source_script": "ViridianCity_Mart_EventScript_Woman" diff --git a/data/games/frlg/maps/runtime/ViridianCity_PokemonCenter_1F.json b/data/games/frlg/maps/runtime/ViridianCity_PokemonCenter_1F.json index f037cb3..4e3cf63 100644 --- a/data/games/frlg/maps/runtime/ViridianCity_PokemonCenter_1F.json +++ b/data/games/frlg/maps/runtime/ViridianCity_PokemonCenter_1F.json @@ -44,6 +44,7 @@ { "name": "nurse", "coord": [7, 2], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 0, "source_script": "ViridianCity_PokemonCenter_1F_EventScript_Nurse", "source_local_id": "LOCALID_VIRIDIAN_NURSE" @@ -51,18 +52,21 @@ { "name": "gentleman", "coord": [12, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "source_event": 1, "source_script": "ViridianCity_PokemonCenter_1F_EventScript_Gentleman" }, { "name": "boy", "coord": [4, 7], + "movement": {"type": "MOVEMENT_TYPE_LOOK_AROUND", "range": [1, 1]}, "source_event": 2, "source_script": "ViridianCity_PokemonCenter_1F_EventScript_Boy" }, { "name": "youngster", "coord": [2, 3], + "movement": {"type": "MOVEMENT_TYPE_WANDER_AROUND", "range": [1, 1]}, "wander": {"min": [1, 2], "max": [3, 4]}, "source_event": 3, "source_script": "ViridianCity_PokemonCenter_1F_EventScript_Youngster" diff --git a/data/games/frlg/maps/runtime/ViridianForest.json b/data/games/frlg/maps/runtime/ViridianForest.json index 2b34a5e..56565d1 100644 --- a/data/games/frlg/maps/runtime/ViridianForest.json +++ b/data/games/frlg/maps/runtime/ViridianForest.json @@ -118,11 +118,24 @@ } ], "npcs": [ - {"name": "youngster", "coord": [29, 58], "source_event": 0, "source_script": "ViridianForest_EventScript_Youngster"}, - {"name": "boy", "coord": [45, 58], "source_event": 1, "source_script": "ViridianForest_EventScript_Boy"}, + { + "name": "youngster", + "coord": [29, 58], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, + "source_event": 0, + "source_script": "ViridianForest_EventScript_Youngster" + }, + { + "name": "boy", + "coord": [45, 58], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, + "source_event": 1, + "source_script": "ViridianForest_EventScript_Boy" + }, { "name": "bug_catcher", "coord": [47, 45], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 5}, "source_event": 2, @@ -131,6 +144,7 @@ { "name": "bug_catcher", "coord": [47, 29], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 4}, "source_event": 3, @@ -139,6 +153,7 @@ { "name": "bug_catcher", "coord": [7, 22], + "movement": {"type": "MOVEMENT_TYPE_FACE_LEFT", "range": [1, 1]}, "facing": "west", "trainer": {"sight": 4}, "source_event": 4, @@ -147,6 +162,7 @@ { "name": "bug_catcher", "coord": [43, 6], + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "range": [1, 1]}, "trainer": {"sight": 1, "looks": ["south", "north"]}, "source_event": 8, "source_script": "ViridianForest_EventScript_Anthony" @@ -154,6 +170,7 @@ { "name": "bug_catcher", "coord": [16, 5], + "movement": {"type": "MOVEMENT_TYPE_FACE_UP", "range": [1, 1]}, "facing": "north", "trainer": {"sight": 1}, "source_event": 9, @@ -165,6 +182,7 @@ "name": "item_ball", "coord": [5, 41], "source_event": 5, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VIRIDIAN_FOREST_POKE_BALL", "source_script": "ViridianForest_EventScript_ItemPokeBall", "item": "poke_ball" @@ -173,6 +191,7 @@ "name": "item_ball", "coord": [40, 21], "source_event": 6, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VIRIDIAN_FOREST_ANTIDOTE", "source_script": "ViridianForest_EventScript_ItemAntidote", "item": "antidote" @@ -181,6 +200,7 @@ "name": "item_ball", "coord": [21, 34], "source_event": 7, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION", "source_script": "ViridianForest_EventScript_ItemPotion", "item": "potion" @@ -189,6 +209,7 @@ "name": "item_ball", "coord": [49, 60], "source_event": 10, + "movement": {"type": "MOVEMENT_TYPE_FACE_DOWN", "range": [1, 1]}, "hide_flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION_2", "source_script": "ViridianForest_EventScript_ItemPotion2", "item": "potion" diff --git a/data/maps/runtime-manifest.json b/data/maps/runtime-manifest.json index 99396d3..7158d85 100644 --- a/data/maps/runtime-manifest.json +++ b/data/maps/runtime-manifest.json @@ -9,7 +9,7 @@ { "name": "CeladonCity", "file": "data/games/frlg/maps/runtime/CeladonCity.json", - "sha256": "6633a14ec03259b9585e7dc5c1f0b6498edf7b7cc9187e755e8c357b0edcab34", + "sha256": "56355954a83d79af48c2405b24b39fc1e3d08c8236b780ab5b421e8363e796fa", "source": { "decomp_file": "data/maps/CeladonCity/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -49,13 +49,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/CeladonCity.json", - "sha256": "6633a14ec03259b9585e7dc5c1f0b6498edf7b7cc9187e755e8c357b0edcab34" + "sha256": "56355954a83d79af48c2405b24b39fc1e3d08c8236b780ab5b421e8363e796fa" } }, { "name": "CeladonCity_Condominiums_1F", "file": "data/games/frlg/maps/runtime/CeladonCity_Condominiums_1F.json", - "sha256": "27cf1036870fe6c1a4b3e64fd6c3ac8ed759251489d3292e394297721e0d3dac", + "sha256": "75cc97819501b4463901ee490cfcfbf3d3485e542e88899302daa3c9b274283d", "source": { "decomp_file": "data/maps/CeladonCity_Condominiums_1F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -84,13 +84,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/CeladonCity_Condominiums_1F.json", - "sha256": "27cf1036870fe6c1a4b3e64fd6c3ac8ed759251489d3292e394297721e0d3dac" + "sha256": "75cc97819501b4463901ee490cfcfbf3d3485e542e88899302daa3c9b274283d" } }, { "name": "CeladonCity_Condominiums_2F", "file": "data/games/frlg/maps/runtime/CeladonCity_Condominiums_2F.json", - "sha256": "0e13f1e9d52cd71480084a4f5fb9ed556b4495f1871b3152c905bedd5f1b721a", + "sha256": "6642a20d109905b2a0c2a3c7b767a1173d6f9670105c2d86c1d4e68ef0368b88", "source": { "decomp_file": "data/maps/CeladonCity_Condominiums_2F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -119,13 +119,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/CeladonCity_Condominiums_2F.json", - "sha256": "0e13f1e9d52cd71480084a4f5fb9ed556b4495f1871b3152c905bedd5f1b721a" + "sha256": "6642a20d109905b2a0c2a3c7b767a1173d6f9670105c2d86c1d4e68ef0368b88" } }, { "name": "CeladonCity_Condominiums_3F", "file": "data/games/frlg/maps/runtime/CeladonCity_Condominiums_3F.json", - "sha256": "1f392547d95f3630cc7d0b2a98c2b5c472ce252d940563a9d5679e1175a9bd57", + "sha256": "31fe9cc9ddb3c72a5c9cb8455771363eb891086d30c9d9368ed7908f7ab0562d", "source": { "decomp_file": "data/maps/CeladonCity_Condominiums_3F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -154,7 +154,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/CeladonCity_Condominiums_3F.json", - "sha256": "1f392547d95f3630cc7d0b2a98c2b5c472ce252d940563a9d5679e1175a9bd57" + "sha256": "31fe9cc9ddb3c72a5c9cb8455771363eb891086d30c9d9368ed7908f7ab0562d" } }, { @@ -195,7 +195,7 @@ { "name": "CeladonCity_Condominiums_RoofRoom", "file": "data/games/frlg/maps/runtime/CeladonCity_Condominiums_RoofRoom.json", - "sha256": "92d1dd5a3c20a6bea7904f9092569dfae0a1cd41e0551993d18fcf434828e234", + "sha256": "eb2289450ac8bd70f3cce30d4b83a20bf9523523f7a44c22180eeeb1fd023c19", "source": { "decomp_file": "data/maps/CeladonCity_Condominiums_RoofRoom/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -236,13 +236,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/CeladonCity_Condominiums_RoofRoom.json", - "sha256": "92d1dd5a3c20a6bea7904f9092569dfae0a1cd41e0551993d18fcf434828e234" + "sha256": "eb2289450ac8bd70f3cce30d4b83a20bf9523523f7a44c22180eeeb1fd023c19" } }, { "name": "CeladonCity_DepartmentStore_1F", "file": "data/games/frlg/maps/runtime/CeladonCity_DepartmentStore_1F.json", - "sha256": "2960b6f2d187b8ecc088164b15b2613b148fc2fc14de8ee4bb9cf055382c9611", + "sha256": "66310c3316011bd6c08f232ccb26325707ec325920fd6cbaae913a1734f25788", "source": { "decomp_file": "data/maps/CeladonCity_DepartmentStore_1F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -271,13 +271,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/CeladonCity_DepartmentStore_1F.json", - "sha256": "2960b6f2d187b8ecc088164b15b2613b148fc2fc14de8ee4bb9cf055382c9611" + "sha256": "66310c3316011bd6c08f232ccb26325707ec325920fd6cbaae913a1734f25788" } }, { "name": "CeladonCity_DepartmentStore_5F", "file": "data/games/frlg/maps/runtime/CeladonCity_DepartmentStore_5F.json", - "sha256": "1b3377d76190c0893f36d04744e9dbeb74e93832ab5aebca11758b33479b0c91", + "sha256": "455a301907301a4dfd23f01c59bde3c35986042ea7fff9f047abf66df0daffde", "source": { "decomp_file": "data/maps/CeladonCity_DepartmentStore_5F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -306,13 +306,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/CeladonCity_DepartmentStore_5F.json", - "sha256": "1b3377d76190c0893f36d04744e9dbeb74e93832ab5aebca11758b33479b0c91" + "sha256": "455a301907301a4dfd23f01c59bde3c35986042ea7fff9f047abf66df0daffde" } }, { "name": "CeladonCity_GameCorner", "file": "data/games/frlg/maps/runtime/CeladonCity_GameCorner.json", - "sha256": "7e74e119a5b91728fdb7030591117cf6f5c21f3bb6914c3dd0bd068ee0c2ab53", + "sha256": "60c6cfd0b26cd26bcc95c7d516a90b01d008869776d12ac2372badc8e4e953a8", "source": { "decomp_file": "data/maps/CeladonCity_GameCorner/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -341,13 +341,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/CeladonCity_GameCorner.json", - "sha256": "7e74e119a5b91728fdb7030591117cf6f5c21f3bb6914c3dd0bd068ee0c2ab53" + "sha256": "60c6cfd0b26cd26bcc95c7d516a90b01d008869776d12ac2372badc8e4e953a8" } }, { "name": "CeladonCity_Gym", "file": "data/games/frlg/maps/runtime/CeladonCity_Gym.json", - "sha256": "b94dfdd80f91dd5e365cc2958c5d74a52910a9cc1bf4953ae8b3051ced299cff", + "sha256": "99ffcfe8251c9aff23022eb4842344e99d3a911ca40c9273a18423f0b02982b3", "source": { "decomp_file": "data/maps/CeladonCity_Gym/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -376,13 +376,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/CeladonCity_Gym.json", - "sha256": "b94dfdd80f91dd5e365cc2958c5d74a52910a9cc1bf4953ae8b3051ced299cff" + "sha256": "99ffcfe8251c9aff23022eb4842344e99d3a911ca40c9273a18423f0b02982b3" } }, { "name": "CeruleanCave_1F", "file": "data/games/frlg/maps/runtime/CeruleanCave_1F.json", - "sha256": "7458c386e4a1db5f212c3890b0e688afb2bd861970fe57873b6919846fe1d15f", + "sha256": "3e5703332f968549e500bc81fe2752f9a48d014da784207acdc2e969725ce6fd", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/CeruleanCave_1F.json", "source": { "decomp_file": "data/maps/CeruleanCave_1F/map.json", @@ -428,13 +428,13 @@ }, "base": { "file": "data/games/frlg/maps/base/CeruleanCave_1F.json", - "sha256": "7458c386e4a1db5f212c3890b0e688afb2bd861970fe57873b6919846fe1d15f" + "sha256": "3e5703332f968549e500bc81fe2752f9a48d014da784207acdc2e969725ce6fd" } }, { "name": "CeruleanCave_2F", "file": "data/games/frlg/maps/runtime/CeruleanCave_2F.json", - "sha256": "53d682b34860b98423ebd5260e5efb112f28cf38024f5976f33be6dbb6372881", + "sha256": "1e25716fc104a37c6a79fa28f3627142586e8be37857fb94d1eddf9d92e9241f", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/CeruleanCave_2F.json", "source": { "decomp_file": "data/maps/CeruleanCave_2F/map.json", @@ -481,13 +481,13 @@ }, "base": { "file": "data/games/frlg/maps/base/CeruleanCave_2F.json", - "sha256": "53d682b34860b98423ebd5260e5efb112f28cf38024f5976f33be6dbb6372881" + "sha256": "1e25716fc104a37c6a79fa28f3627142586e8be37857fb94d1eddf9d92e9241f" } }, { "name": "CeruleanCave_B1F", "file": "data/games/frlg/maps/runtime/CeruleanCave_B1F.json", - "sha256": "e04a375efed05ff5524e19cfde2f3fdfdc7b9c56f56347188cba710185245910", + "sha256": "ac9868c56f95b000985721283e899c298f9520770eb7edb33a04b57a6f377d52", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/CeruleanCave_B1F.json", "source": { "decomp_file": "data/maps/CeruleanCave_B1F/map.json", @@ -533,13 +533,13 @@ }, "base": { "file": "data/games/frlg/maps/base/CeruleanCave_B1F.json", - "sha256": "e04a375efed05ff5524e19cfde2f3fdfdc7b9c56f56347188cba710185245910" + "sha256": "ac9868c56f95b000985721283e899c298f9520770eb7edb33a04b57a6f377d52" } }, { "name": "CeruleanCity", "file": "data/games/frlg/maps/runtime/CeruleanCity.json", - "sha256": "426d07f97caf3709fc3540f39aacd15dad45a41cb1c7f361f08a51863bc87aa0", + "sha256": "4e0057d1b42dccceac77017b299066d5caab7880c149d22260b52fb935ee7a26", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/CeruleanCity.json", "source": { "decomp_file": "data/maps/CeruleanCity/map.json", @@ -573,13 +573,13 @@ }, "base": { "file": "data/games/frlg/maps/base/CeruleanCity.json", - "sha256": "426d07f97caf3709fc3540f39aacd15dad45a41cb1c7f361f08a51863bc87aa0" + "sha256": "4e0057d1b42dccceac77017b299066d5caab7880c149d22260b52fb935ee7a26" } }, { "name": "CeruleanCity_BikeShop", "file": "data/games/frlg/maps/runtime/CeruleanCity_BikeShop.json", - "sha256": "1ddbe0458bcce714ba8f265be33cc2596aab09962aad7da5e85ad20d635e14e7", + "sha256": "9d97d1ecdbfc23c70f1a1b3cab270922c53aaf054b67d503b195c80baaf27965", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/CeruleanCity_BikeShop.json", "source": { "decomp_file": "data/maps/CeruleanCity_BikeShop/map.json", @@ -614,13 +614,13 @@ }, "base": { "file": "data/games/frlg/maps/base/CeruleanCity_BikeShop.json", - "sha256": "1ddbe0458bcce714ba8f265be33cc2596aab09962aad7da5e85ad20d635e14e7" + "sha256": "9d97d1ecdbfc23c70f1a1b3cab270922c53aaf054b67d503b195c80baaf27965" } }, { "name": "CeruleanCity_Gym", "file": "data/games/frlg/maps/runtime/CeruleanCity_Gym.json", - "sha256": "a04376525f838de605be2488e410e4dfcf6e9bc129ac512388227b4e8c5a0183", + "sha256": "4a08debae6c7785f9a514a2dffc5731db9a287fff941ea77ae358a7fad5cdb2e", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/CeruleanCity_Gym.json", "source": { "decomp_file": "data/maps/CeruleanCity_Gym/map.json", @@ -654,13 +654,13 @@ }, "base": { "file": "data/games/frlg/maps/base/CeruleanCity_Gym.json", - "sha256": "a04376525f838de605be2488e410e4dfcf6e9bc129ac512388227b4e8c5a0183" + "sha256": "4a08debae6c7785f9a514a2dffc5731db9a287fff941ea77ae358a7fad5cdb2e" } }, { "name": "CeruleanCity_House1", "file": "data/games/frlg/maps/runtime/CeruleanCity_House1.json", - "sha256": "1428173a46069914e2a47502c0cc034b0a8d0cff3e073f0a91b98b49fd66c8dd", + "sha256": "cd48aef69786e8aa453d86d5cf2ef5432f95028ac2b9251ad38eaba3cb86bbbc", "source": { "decomp_file": "data/maps/CeruleanCity_House1/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -689,13 +689,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/CeruleanCity_House1.json", - "sha256": "1428173a46069914e2a47502c0cc034b0a8d0cff3e073f0a91b98b49fd66c8dd" + "sha256": "cd48aef69786e8aa453d86d5cf2ef5432f95028ac2b9251ad38eaba3cb86bbbc" } }, { "name": "CeruleanCity_House2", "file": "data/games/frlg/maps/runtime/CeruleanCity_House2.json", - "sha256": "4d1ab5d52b598960ac4d691dfa54b58977ac052de6f4c4e3024d124ed5546337", + "sha256": "0d57df4dcbb827d37318039d39a09c4e5426cc4ef6c48b59bb76cfe95229af41", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/CeruleanCity_House2.json", "source": { "decomp_file": "data/maps/CeruleanCity_House2/map.json", @@ -730,13 +730,13 @@ }, "base": { "file": "data/games/frlg/maps/base/CeruleanCity_House2.json", - "sha256": "4d1ab5d52b598960ac4d691dfa54b58977ac052de6f4c4e3024d124ed5546337" + "sha256": "0d57df4dcbb827d37318039d39a09c4e5426cc4ef6c48b59bb76cfe95229af41" } }, { "name": "CeruleanCity_Mart", "file": "data/games/frlg/maps/runtime/CeruleanCity_Mart.json", - "sha256": "0f1d45ea676df7088d00512181ca7d52aaada5e40cd9f2c0efcd572117e29338", + "sha256": "ff77ed21b5ae5286efc31f4caf7af171c101c1386e5b0b37abccc1c0755ef2a8", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/CeruleanCity_Mart.json", "source": { "decomp_file": "data/maps/CeruleanCity_Mart/map.json", @@ -771,13 +771,13 @@ }, "base": { "file": "data/games/frlg/maps/base/CeruleanCity_Mart.json", - "sha256": "0f1d45ea676df7088d00512181ca7d52aaada5e40cd9f2c0efcd572117e29338" + "sha256": "ff77ed21b5ae5286efc31f4caf7af171c101c1386e5b0b37abccc1c0755ef2a8" } }, { "name": "CeruleanCity_PokemonCenter_1F", "file": "data/games/frlg/maps/runtime/CeruleanCity_PokemonCenter_1F.json", - "sha256": "c5dbc18ec00081b9697bbcaf3fde23742e36f4970f461c2a4f1822401a3e32c2", + "sha256": "74898a865b1a34d93539a40fb470eacdac701c44a44a97e3c814555ce41cbe67", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/CeruleanCity_PokemonCenter_1F.json", "source": { "decomp_file": "data/maps/CeruleanCity_PokemonCenter_1F/map.json", @@ -811,13 +811,13 @@ }, "base": { "file": "data/games/frlg/maps/base/CeruleanCity_PokemonCenter_1F.json", - "sha256": "c5dbc18ec00081b9697bbcaf3fde23742e36f4970f461c2a4f1822401a3e32c2" + "sha256": "74898a865b1a34d93539a40fb470eacdac701c44a44a97e3c814555ce41cbe67" } }, { "name": "CinnabarIsland", "file": "data/games/frlg/maps/runtime/CinnabarIsland.json", - "sha256": "d53e78ce8e662a8a7973eec3557680c7ff8ab795e5b0af1a528e7c6e70706a3e", + "sha256": "5e2ea901726f75eb3f5360765ed6a17defe8d5812af9cfa9fa0335c990dee95d", "source": { "decomp_file": "data/maps/CinnabarIsland/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -845,13 +845,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/CinnabarIsland.json", - "sha256": "d53e78ce8e662a8a7973eec3557680c7ff8ab795e5b0af1a528e7c6e70706a3e" + "sha256": "5e2ea901726f75eb3f5360765ed6a17defe8d5812af9cfa9fa0335c990dee95d" } }, { "name": "CinnabarIsland_Gym", "file": "data/games/frlg/maps/runtime/CinnabarIsland_Gym.json", - "sha256": "42c2a70ae464043641ad3a7a79e0ab73c6b0d7dc09190137dd886f0e2630d4b7", + "sha256": "cf41dfa9e058c2293e61dd83ec8274377dbf4ab152fe6b15228915cd35ab8e6e", "source": { "decomp_file": "data/maps/CinnabarIsland_Gym/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -880,13 +880,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/CinnabarIsland_Gym.json", - "sha256": "42c2a70ae464043641ad3a7a79e0ab73c6b0d7dc09190137dd886f0e2630d4b7" + "sha256": "cf41dfa9e058c2293e61dd83ec8274377dbf4ab152fe6b15228915cd35ab8e6e" } }, { "name": "CinnabarIsland_Mart", "file": "data/games/frlg/maps/runtime/CinnabarIsland_Mart.json", - "sha256": "31921270f1eab70946eb5703aeef771e4535d1635d233d352285773622a28c57", + "sha256": "b6b4cafee4e9190ff457c93d85fbd48196269d6f56ebb81c3e02358014b74dcd", "source": { "decomp_file": "data/maps/CinnabarIsland_Mart/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -915,13 +915,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/CinnabarIsland_Mart.json", - "sha256": "31921270f1eab70946eb5703aeef771e4535d1635d233d352285773622a28c57" + "sha256": "b6b4cafee4e9190ff457c93d85fbd48196269d6f56ebb81c3e02358014b74dcd" } }, { "name": "FuchsiaCity", "file": "data/games/frlg/maps/runtime/FuchsiaCity.json", - "sha256": "7e12993a8b23f0d3e1ed50f3faab10997915db0e36cfd77e29cafa13cf6a18a5", + "sha256": "c947ce9ceffc7f39c5abeaff86a016f0ae8d217fc023d7447936124717f4cff6", "source": { "decomp_file": "data/maps/FuchsiaCity/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -949,13 +949,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/FuchsiaCity.json", - "sha256": "7e12993a8b23f0d3e1ed50f3faab10997915db0e36cfd77e29cafa13cf6a18a5" + "sha256": "c947ce9ceffc7f39c5abeaff86a016f0ae8d217fc023d7447936124717f4cff6" } }, { "name": "FuchsiaCity_Gym", "file": "data/games/frlg/maps/runtime/FuchsiaCity_Gym.json", - "sha256": "063136ce3937c79c65cd4c1c5673209dad08a75da68d7b6972ebb9246a92a861", + "sha256": "e5dd2d1947ff8c95f79113c2b6278bd979bd5cb59a10711f57662801aa25abe0", "source": { "decomp_file": "data/maps/FuchsiaCity_Gym/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -984,13 +984,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/FuchsiaCity_Gym.json", - "sha256": "063136ce3937c79c65cd4c1c5673209dad08a75da68d7b6972ebb9246a92a861" + "sha256": "e5dd2d1947ff8c95f79113c2b6278bd979bd5cb59a10711f57662801aa25abe0" } }, { "name": "FuchsiaCity_Mart", "file": "data/games/frlg/maps/runtime/FuchsiaCity_Mart.json", - "sha256": "fc525197ac4b11110ad9a9819e2ad96436b19dbdd91a347d18517ad4b3cd4586", + "sha256": "2c13ae15376665efa1d54c2ff8cc1eba0e678ca6967bea89abe247467b3bfd2e", "source": { "decomp_file": "data/maps/FuchsiaCity_Mart/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -1019,13 +1019,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/FuchsiaCity_Mart.json", - "sha256": "fc525197ac4b11110ad9a9819e2ad96436b19dbdd91a347d18517ad4b3cd4586" + "sha256": "2c13ae15376665efa1d54c2ff8cc1eba0e678ca6967bea89abe247467b3bfd2e" } }, { "name": "FuchsiaCity_SafariZone_Entrance", "file": "data/games/frlg/maps/runtime/FuchsiaCity_SafariZone_Entrance.json", - "sha256": "c8ac9c445d950dc87907d479b3eb26ea6941d62e49b3c7ac5b73b15e6dfc40d3", + "sha256": "aa614c1621dad45b3b84730c33ca9aca86f459f05091a5a5c0913b149b08ecce", "source": { "decomp_file": "data/maps/FuchsiaCity_SafariZone_Entrance/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -1054,13 +1054,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/FuchsiaCity_SafariZone_Entrance.json", - "sha256": "c8ac9c445d950dc87907d479b3eb26ea6941d62e49b3c7ac5b73b15e6dfc40d3" + "sha256": "aa614c1621dad45b3b84730c33ca9aca86f459f05091a5a5c0913b149b08ecce" } }, { "name": "FuchsiaCity_WardensHouse", "file": "data/games/frlg/maps/runtime/FuchsiaCity_WardensHouse.json", - "sha256": "f4f9962f296bc91933dafa281c4cfe7319b7e1909a89cee7b2419acc0d478b0a", + "sha256": "46759a431e1b29af108f4a666798c2032def02cd6acda643434e7b309c05ec7a", "source": { "decomp_file": "data/maps/FuchsiaCity_WardensHouse/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -1101,13 +1101,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/FuchsiaCity_WardensHouse.json", - "sha256": "f4f9962f296bc91933dafa281c4cfe7319b7e1909a89cee7b2419acc0d478b0a" + "sha256": "46759a431e1b29af108f4a666798c2032def02cd6acda643434e7b309c05ec7a" } }, { "name": "IndigoPlateau_Exterior", "file": "data/games/frlg/maps/runtime/IndigoPlateau_Exterior.json", - "sha256": "00273f4bbf17bb6090358ab51243c40a390c1933208063d093c3959f9390988f", + "sha256": "c4408a2af5aa8af30f51ff916ae420b7f70fd0ee4f7615ad8c36da355319e811", "source": { "decomp_file": "data/maps/IndigoPlateau_Exterior/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -1136,13 +1136,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/IndigoPlateau_Exterior.json", - "sha256": "00273f4bbf17bb6090358ab51243c40a390c1933208063d093c3959f9390988f" + "sha256": "c4408a2af5aa8af30f51ff916ae420b7f70fd0ee4f7615ad8c36da355319e811" } }, { "name": "IndigoPlateau_PokemonCenter_1F", "file": "data/games/frlg/maps/runtime/IndigoPlateau_PokemonCenter_1F.json", - "sha256": "930c40e59297aae14ac19b61c17e8bdd02ecdf273b822630155acc8a50361e57", + "sha256": "4cc89ce521a2cb1de5c55139397fe3fb4efb339c7ae7bf857b19d1e14f2cb0ed", "source": { "decomp_file": "data/maps/IndigoPlateau_PokemonCenter_1F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -1170,13 +1170,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/IndigoPlateau_PokemonCenter_1F.json", - "sha256": "930c40e59297aae14ac19b61c17e8bdd02ecdf273b822630155acc8a50361e57" + "sha256": "4cc89ce521a2cb1de5c55139397fe3fb4efb339c7ae7bf857b19d1e14f2cb0ed" } }, { "name": "LavenderTown", "file": "data/games/frlg/maps/runtime/LavenderTown.json", - "sha256": "157f5943208f84ae9edfefc1e1bcfa9e80f16a582b4c6d15fd578d78196c4e1c", + "sha256": "79aba329e62df803ecea1f90ee2028ec1198d880c6223a82ebb2f590e6e47275", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/LavenderTown.json", "source": { "decomp_file": "data/maps/LavenderTown/map.json", @@ -1211,13 +1211,13 @@ }, "base": { "file": "data/games/frlg/maps/base/LavenderTown.json", - "sha256": "157f5943208f84ae9edfefc1e1bcfa9e80f16a582b4c6d15fd578d78196c4e1c" + "sha256": "79aba329e62df803ecea1f90ee2028ec1198d880c6223a82ebb2f590e6e47275" } }, { "name": "LavenderTown_Mart", "file": "data/games/frlg/maps/runtime/LavenderTown_Mart.json", - "sha256": "6243727ca1e6fc823c0f1be2cbbc010a3f505f1ecfcbd4347fd7a4d1c40a606d", + "sha256": "aa039cb1faadc53396486921249256727826a64e2d83bbc502051863122c6779", "source": { "decomp_file": "data/maps/LavenderTown_Mart/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -1246,13 +1246,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/LavenderTown_Mart.json", - "sha256": "6243727ca1e6fc823c0f1be2cbbc010a3f505f1ecfcbd4347fd7a4d1c40a606d" + "sha256": "aa039cb1faadc53396486921249256727826a64e2d83bbc502051863122c6779" } }, { "name": "LavenderTown_PokemonCenter_1F", "file": "data/games/frlg/maps/runtime/LavenderTown_PokemonCenter_1F.json", - "sha256": "c3be8d90b2331b9facdb7e0daf146c337c2c803c0d97e4a2cbcf054533afae26", + "sha256": "557f347f3789754285501a65fc523634ebe324f1cfe84f6ddc3047e942722b6d", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/LavenderTown_PokemonCenter_1F.json", "source": { "decomp_file": "data/maps/LavenderTown_PokemonCenter_1F/map.json", @@ -1286,13 +1286,13 @@ }, "base": { "file": "data/games/frlg/maps/base/LavenderTown_PokemonCenter_1F.json", - "sha256": "c3be8d90b2331b9facdb7e0daf146c337c2c803c0d97e4a2cbcf054533afae26" + "sha256": "557f347f3789754285501a65fc523634ebe324f1cfe84f6ddc3047e942722b6d" } }, { "name": "LavenderTown_VolunteerPokemonHouse", "file": "data/games/frlg/maps/runtime/LavenderTown_VolunteerPokemonHouse.json", - "sha256": "98a17ed3538e311728fa5a70ea12de8fa6f4b9c3f7c6f3531cc5c7972626236e", + "sha256": "f35d27712c23adad73db8b33fc1dda63126d12b89ede03cdb9f0c508116948b2", "source": { "decomp_file": "data/maps/LavenderTown_VolunteerPokemonHouse/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -1321,13 +1321,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/LavenderTown_VolunteerPokemonHouse.json", - "sha256": "98a17ed3538e311728fa5a70ea12de8fa6f4b9c3f7c6f3531cc5c7972626236e" + "sha256": "f35d27712c23adad73db8b33fc1dda63126d12b89ede03cdb9f0c508116948b2" } }, { "name": "MtMoon_1F", "file": "data/games/frlg/maps/runtime/MtMoon_1F.json", - "sha256": "809cd258e150853f8f0affbd792d586c8576a66629f5511552ebb5c5b00d3a4d", + "sha256": "76db795560c1a43139d8214f778ea7663cbefca0d9a72537707c35b1a52970e1", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/MtMoon_1F.json", "source": { "decomp_file": "data/maps/MtMoon_1F/map.json", @@ -1374,7 +1374,7 @@ }, "base": { "file": "data/games/frlg/maps/base/MtMoon_1F.json", - "sha256": "809cd258e150853f8f0affbd792d586c8576a66629f5511552ebb5c5b00d3a4d" + "sha256": "76db795560c1a43139d8214f778ea7663cbefca0d9a72537707c35b1a52970e1" } }, { @@ -1421,7 +1421,7 @@ { "name": "MtMoon_B2F", "file": "data/games/frlg/maps/runtime/MtMoon_B2F.json", - "sha256": "436871222dbbc510050074d924debe977f9fa45bfde04a521d0ad8228c2dfafa", + "sha256": "e751e842c553d20f1cf37bdcee0882e5a04e635f5791e9d7ee672fd006eb180a", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/MtMoon_B2F.json", "source": { "decomp_file": "data/maps/MtMoon_B2F/map.json", @@ -1468,13 +1468,13 @@ }, "base": { "file": "data/games/frlg/maps/base/MtMoon_B2F.json", - "sha256": "436871222dbbc510050074d924debe977f9fa45bfde04a521d0ad8228c2dfafa" + "sha256": "e751e842c553d20f1cf37bdcee0882e5a04e635f5791e9d7ee672fd006eb180a" } }, { "name": "PalletTown", "file": "data/games/frlg/maps/runtime/PalletTown.json", - "sha256": "92ebe424c07773ba087b8fc8d2b8251876dd3b97b9aea47a1fee8d36abd6ab0c", + "sha256": "b9cfbceeb2d3eb01fd794b6e291a13b3519c60ba4e6e4bd95814da448e18f7dc", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/PalletTown.json", "source": { "decomp_file": "data/maps/PalletTown/map.json", @@ -1508,13 +1508,13 @@ }, "base": { "file": "data/games/frlg/maps/base/PalletTown.json", - "sha256": "92ebe424c07773ba087b8fc8d2b8251876dd3b97b9aea47a1fee8d36abd6ab0c" + "sha256": "b9cfbceeb2d3eb01fd794b6e291a13b3519c60ba4e6e4bd95814da448e18f7dc" } }, { "name": "PalletTown_PlayersHouse_1F", "file": "data/games/frlg/maps/runtime/PalletTown_PlayersHouse_1F.json", - "sha256": "6c170c4fa645009d8de13a2c7ce7e858d76678b298721a786dc7d94fa2d579a4", + "sha256": "36211f926fb2ea713cb28044e6b330236271337aa9ba6c438dcccb05b0bdc0d8", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/PalletTown_PlayersHouse_1F.json", "source": { "decomp_file": "data/maps/PalletTown_PlayersHouse_1F/map.json", @@ -1549,7 +1549,7 @@ }, "base": { "file": "data/games/frlg/maps/base/PalletTown_PlayersHouse_1F.json", - "sha256": "6c170c4fa645009d8de13a2c7ce7e858d76678b298721a786dc7d94fa2d579a4" + "sha256": "36211f926fb2ea713cb28044e6b330236271337aa9ba6c438dcccb05b0bdc0d8" } }, { @@ -1595,7 +1595,7 @@ { "name": "PalletTown_ProfessorOaksLab", "file": "data/games/frlg/maps/runtime/PalletTown_ProfessorOaksLab.json", - "sha256": "53d1c2b022cfadd2463fe405a60fb179562b2cc487ab4c5202f63cbc758d5109", + "sha256": "b0cd8da318f947e12f1943c3b81974857d600002b3f7c8f0a506c0b977cf3fd0", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/PalletTown_ProfessorOaksLab.json", "source": { "decomp_file": "data/maps/PalletTown_ProfessorOaksLab/map.json", @@ -1642,13 +1642,13 @@ }, "base": { "file": "data/games/frlg/maps/base/PalletTown_ProfessorOaksLab.json", - "sha256": "53d1c2b022cfadd2463fe405a60fb179562b2cc487ab4c5202f63cbc758d5109" + "sha256": "b0cd8da318f947e12f1943c3b81974857d600002b3f7c8f0a506c0b977cf3fd0" } }, { "name": "PalletTown_RivalsHouse", "file": "data/games/frlg/maps/runtime/PalletTown_RivalsHouse.json", - "sha256": "3e99b4c9f53ad68779d2a37d9134b4bcb3f229b5db23abb6d5db8e845c55dfad", + "sha256": "f5db4362ee0ec83beeb2ed24d1fe00dab48222ca8e60c6cb5cda427f8b903b88", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/PalletTown_RivalsHouse.json", "source": { "decomp_file": "data/maps/PalletTown_RivalsHouse/map.json", @@ -1683,13 +1683,13 @@ }, "base": { "file": "data/games/frlg/maps/base/PalletTown_RivalsHouse.json", - "sha256": "3e99b4c9f53ad68779d2a37d9134b4bcb3f229b5db23abb6d5db8e845c55dfad" + "sha256": "f5db4362ee0ec83beeb2ed24d1fe00dab48222ca8e60c6cb5cda427f8b903b88" } }, { "name": "PewterCity", "file": "data/games/frlg/maps/runtime/PewterCity.json", - "sha256": "3da486c09b14463a00a07f98b0280f62fc88f04b67acc583db456310735327df", + "sha256": "f3ea054fb9425857c1ff0885a498072a710ef3bf6c1a82f7de26710d74850531", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/PewterCity.json", "source": { "decomp_file": "data/maps/PewterCity/map.json", @@ -1724,13 +1724,13 @@ }, "base": { "file": "data/games/frlg/maps/base/PewterCity.json", - "sha256": "3da486c09b14463a00a07f98b0280f62fc88f04b67acc583db456310735327df" + "sha256": "f3ea054fb9425857c1ff0885a498072a710ef3bf6c1a82f7de26710d74850531" } }, { "name": "PewterCity_Gym", "file": "data/games/frlg/maps/runtime/PewterCity_Gym.json", - "sha256": "acb4e04dff1f09f3334a175eaccd0f1d9e8d2a7d87a4b1d4f45d113b6f315be5", + "sha256": "0b04d5faf188aba6af570bc273142aed28296d4d18b8ce1264f446e45bba0897", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/PewterCity_Gym.json", "source": { "decomp_file": "data/maps/PewterCity_Gym/map.json", @@ -1765,13 +1765,13 @@ }, "base": { "file": "data/games/frlg/maps/base/PewterCity_Gym.json", - "sha256": "acb4e04dff1f09f3334a175eaccd0f1d9e8d2a7d87a4b1d4f45d113b6f315be5" + "sha256": "0b04d5faf188aba6af570bc273142aed28296d4d18b8ce1264f446e45bba0897" } }, { "name": "PewterCity_Mart", "file": "data/games/frlg/maps/runtime/PewterCity_Mart.json", - "sha256": "5a1deabf67963d7b6701bd80d3b642a31867b9ac82ad456170edeca4ac69fb34", + "sha256": "b9b43b8b0d227e764c90637ae19ad5783dceccacd8bd6d961f38f4d58f999595", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/PewterCity_Mart.json", "source": { "decomp_file": "data/maps/PewterCity_Mart/map.json", @@ -1806,13 +1806,13 @@ }, "base": { "file": "data/games/frlg/maps/base/PewterCity_Mart.json", - "sha256": "5a1deabf67963d7b6701bd80d3b642a31867b9ac82ad456170edeca4ac69fb34" + "sha256": "b9b43b8b0d227e764c90637ae19ad5783dceccacd8bd6d961f38f4d58f999595" } }, { "name": "PewterCity_Museum_1F", "file": "data/games/frlg/maps/runtime/PewterCity_Museum_1F.json", - "sha256": "b8dc747a6c1002f6de4a601e08515d2e011edc36fa286f277323e5e9603b0a86", + "sha256": "58297dc8f897bab71bcbd61b19fc77bf1a11f8525c7d23b891531d053a45b5c7", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/PewterCity_Museum_1F.json", "source": { "decomp_file": "data/maps/PewterCity_Museum_1F/map.json", @@ -1847,13 +1847,13 @@ }, "base": { "file": "data/games/frlg/maps/base/PewterCity_Museum_1F.json", - "sha256": "b8dc747a6c1002f6de4a601e08515d2e011edc36fa286f277323e5e9603b0a86" + "sha256": "58297dc8f897bab71bcbd61b19fc77bf1a11f8525c7d23b891531d053a45b5c7" } }, { "name": "PewterCity_PokemonCenter_1F", "file": "data/games/frlg/maps/runtime/PewterCity_PokemonCenter_1F.json", - "sha256": "0349e424425ef32979f07c933d2e57dbb358b6ebb4d347ca101441d0ff4b9849", + "sha256": "0984a40b6e24be41b878f2bfd4dee690ebb016f1cfa3e7e34b5153b1e40a80be", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/PewterCity_PokemonCenter_1F.json", "source": { "decomp_file": "data/maps/PewterCity_PokemonCenter_1F/map.json", @@ -1887,13 +1887,13 @@ }, "base": { "file": "data/games/frlg/maps/base/PewterCity_PokemonCenter_1F.json", - "sha256": "0349e424425ef32979f07c933d2e57dbb358b6ebb4d347ca101441d0ff4b9849" + "sha256": "0984a40b6e24be41b878f2bfd4dee690ebb016f1cfa3e7e34b5153b1e40a80be" } }, { "name": "PokemonLeague_AgathasRoom", "file": "data/games/frlg/maps/runtime/PokemonLeague_AgathasRoom.json", - "sha256": "dd3d675f8899b63aa7c7a9d938e55f71e953cd02e0286e233fecf86aa71f38d8", + "sha256": "e924947aed9b01c3a8ebcf93fb8b309382edb3d8f474e3df212ed6a5231c6583", "source": { "decomp_file": "data/maps/PokemonLeague_AgathasRoom/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -1922,13 +1922,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/PokemonLeague_AgathasRoom.json", - "sha256": "dd3d675f8899b63aa7c7a9d938e55f71e953cd02e0286e233fecf86aa71f38d8" + "sha256": "e924947aed9b01c3a8ebcf93fb8b309382edb3d8f474e3df212ed6a5231c6583" } }, { "name": "PokemonLeague_BrunosRoom", "file": "data/games/frlg/maps/runtime/PokemonLeague_BrunosRoom.json", - "sha256": "d784093bbc7c3f8d3ffccc7d105d1875d0aed372278e8bf49c3941fe73abb0b6", + "sha256": "f272502d15f4cb3ad16bc5b2cccf362bf33b36fc656d1c9962e3f1b846c35d32", "source": { "decomp_file": "data/maps/PokemonLeague_BrunosRoom/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -1957,13 +1957,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/PokemonLeague_BrunosRoom.json", - "sha256": "d784093bbc7c3f8d3ffccc7d105d1875d0aed372278e8bf49c3941fe73abb0b6" + "sha256": "f272502d15f4cb3ad16bc5b2cccf362bf33b36fc656d1c9962e3f1b846c35d32" } }, { "name": "PokemonLeague_ChampionsRoom", "file": "data/games/frlg/maps/runtime/PokemonLeague_ChampionsRoom.json", - "sha256": "760494eabba1d0dae1c70da9d7c272040fbe8e40d9ad5a465ce94a45f150a407", + "sha256": "81c53ccc2888768ea3268fbd741235e48d6c0a9891587b17db51c0b4ea5f0350", "source": { "decomp_file": "data/maps/PokemonLeague_ChampionsRoom/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -1991,13 +1991,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/PokemonLeague_ChampionsRoom.json", - "sha256": "760494eabba1d0dae1c70da9d7c272040fbe8e40d9ad5a465ce94a45f150a407" + "sha256": "81c53ccc2888768ea3268fbd741235e48d6c0a9891587b17db51c0b4ea5f0350" } }, { "name": "PokemonLeague_HallOfFame", "file": "data/games/frlg/maps/runtime/PokemonLeague_HallOfFame.json", - "sha256": "14f0fcfbea0d84ebc008fa467621e4f30e09e26d477864b057c6d9ac79ba1e31", + "sha256": "d3fb0b9be80b7deb61e21ca0ef5773ef9fa975eae6af727e602f84cfe4c66f8f", "source": { "decomp_file": "data/maps/PokemonLeague_HallOfFame/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -2026,13 +2026,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/PokemonLeague_HallOfFame.json", - "sha256": "14f0fcfbea0d84ebc008fa467621e4f30e09e26d477864b057c6d9ac79ba1e31" + "sha256": "d3fb0b9be80b7deb61e21ca0ef5773ef9fa975eae6af727e602f84cfe4c66f8f" } }, { "name": "PokemonLeague_LancesRoom", "file": "data/games/frlg/maps/runtime/PokemonLeague_LancesRoom.json", - "sha256": "80bb156d2e5337b2dcd94ec8293330b6096c2bfeae88226dba68d4fdea5d4e07", + "sha256": "abb8f4ca1677a2e610047214d7f4fc1bc4e1f81bca69c439e4ccfeff54116819", "source": { "decomp_file": "data/maps/PokemonLeague_LancesRoom/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -2061,13 +2061,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/PokemonLeague_LancesRoom.json", - "sha256": "80bb156d2e5337b2dcd94ec8293330b6096c2bfeae88226dba68d4fdea5d4e07" + "sha256": "abb8f4ca1677a2e610047214d7f4fc1bc4e1f81bca69c439e4ccfeff54116819" } }, { "name": "PokemonLeague_LoreleisRoom", "file": "data/games/frlg/maps/runtime/PokemonLeague_LoreleisRoom.json", - "sha256": "4ff19c68a4886814af3b6dece6da0a576e3c41d987542cf56e74b69fa1ea78be", + "sha256": "03ea360be160e4f455a6d7d4ed83475694ec88101deaf092fa3002ecccd7a8bb", "source": { "decomp_file": "data/maps/PokemonLeague_LoreleisRoom/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -2096,13 +2096,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/PokemonLeague_LoreleisRoom.json", - "sha256": "4ff19c68a4886814af3b6dece6da0a576e3c41d987542cf56e74b69fa1ea78be" + "sha256": "03ea360be160e4f455a6d7d4ed83475694ec88101deaf092fa3002ecccd7a8bb" } }, { "name": "PokemonMansion_1F", "file": "data/games/frlg/maps/runtime/PokemonMansion_1F.json", - "sha256": "d49428ab398404e3d71bf98d01fa4576eae988fa0fe0679aca993d95717eba3f", + "sha256": "69e4a2aef029ac7a02dae7b9634bbdde0fe653726fa4fadb7fe82a5c62f4e697", "source": { "decomp_file": "data/maps/PokemonMansion_1F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -2147,7 +2147,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/PokemonMansion_1F.json", - "sha256": "f03de20f697471cf627598444282e8e4e1e9cb03da7b2442bb1ec2c049dd735f" + "sha256": "98313c0c3f1e83e6305c57bc8307d3578dfc0ca929676011781aae14e1f8bbfa" }, "overlay": { "file": "data/games/frlg/maps/overlays/PokemonMansion_1F.json", @@ -2157,7 +2157,7 @@ { "name": "PokemonMansion_2F", "file": "data/games/frlg/maps/runtime/PokemonMansion_2F.json", - "sha256": "4f64797ec1c16e5850d536cbbff9e401cb36d9c9ea01fc12e64d675817903fa7", + "sha256": "1d4f65ae60818c03ae4d3a81cbddba78628112ab871cf53df060bab7790baa29", "source": { "decomp_file": "data/maps/PokemonMansion_2F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -2202,7 +2202,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/PokemonMansion_2F.json", - "sha256": "633a0701a9102b2e1dd3785de7874d30175797dc154d2b64624d57c3465e8c0e" + "sha256": "210cb9b4846c30cc3dcc3d50014a057fdc0fa65aa04e5bf5d3b1a979243d4837" }, "overlay": { "file": "data/games/frlg/maps/overlays/PokemonMansion_2F.json", @@ -2212,7 +2212,7 @@ { "name": "PokemonMansion_3F", "file": "data/games/frlg/maps/runtime/PokemonMansion_3F.json", - "sha256": "606545e09c97059bd993ee921243cc124736f7e7fbcd2c0a35c83f079c89364e", + "sha256": "24b1fbfce72c581b96c23133bab5fb840f344f27d28528123413a00fcdf047fc", "source": { "decomp_file": "data/maps/PokemonMansion_3F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -2257,7 +2257,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/PokemonMansion_3F.json", - "sha256": "9ea38d900a3449643f8066f4259ba386010e0b9ae91ae4997caa7701fe369d03" + "sha256": "c323ae2f135bbd27d55acf5241db775a48753bca431ce1626d1680410caa285e" }, "overlay": { "file": "data/games/frlg/maps/overlays/PokemonMansion_3F.json", @@ -2267,7 +2267,7 @@ { "name": "PokemonMansion_B1F", "file": "data/games/frlg/maps/runtime/PokemonMansion_B1F.json", - "sha256": "7ac5f8e8eaefbea9c737acee5e8824ca748eebb74221ee535aaef746bfcc2564", + "sha256": "0ae3b3891de8212be3d4953bbf2dc4fa13aed5728150a74312bb948b8d74c2c5", "source": { "decomp_file": "data/maps/PokemonMansion_B1F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -2312,7 +2312,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/PokemonMansion_B1F.json", - "sha256": "32b896edd7dfc5e6e82bfd3511b41462710d53e33ade7adcc759617712f67bbd" + "sha256": "61d993f0646da769fe402642cd0afa39929dc2538dd58a688a025403c6fca943" }, "overlay": { "file": "data/games/frlg/maps/overlays/PokemonMansion_B1F.json", @@ -2322,7 +2322,7 @@ { "name": "PokemonTower_1F", "file": "data/games/frlg/maps/runtime/PokemonTower_1F.json", - "sha256": "78f21d8c2c91c68cab8a86780be6defa2cab0f2ebf2c5d7144963b78bfc7068f", + "sha256": "9bb5682546ad4cbe8ecacd55e74d535df176f91d8acd869b06f08b86e401c9df", "source": { "decomp_file": "data/maps/PokemonTower_1F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -2351,13 +2351,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/PokemonTower_1F.json", - "sha256": "78f21d8c2c91c68cab8a86780be6defa2cab0f2ebf2c5d7144963b78bfc7068f" + "sha256": "9bb5682546ad4cbe8ecacd55e74d535df176f91d8acd869b06f08b86e401c9df" } }, { "name": "PokemonTower_2F", "file": "data/games/frlg/maps/runtime/PokemonTower_2F.json", - "sha256": "6e3dd2d839290824e26980b6562e6187a498c4dee27ca4cfff8d6b4ce453083e", + "sha256": "fa7470a5c8167910454ffab7f92ac6bb1c9a53157d841c023e8f4c04b51daea4", "source": { "decomp_file": "data/maps/PokemonTower_2F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -2386,13 +2386,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/PokemonTower_2F.json", - "sha256": "6e3dd2d839290824e26980b6562e6187a498c4dee27ca4cfff8d6b4ce453083e" + "sha256": "fa7470a5c8167910454ffab7f92ac6bb1c9a53157d841c023e8f4c04b51daea4" } }, { "name": "PokemonTower_3F", "file": "data/games/frlg/maps/runtime/PokemonTower_3F.json", - "sha256": "113d590d8aac5fcd4b729067ba675be7c7f2c8cbf96c87bc53c44344c55f3ff3", + "sha256": "3cf856d676d4d005d33259d75d43f836f6136f2ae4f8f4a7f931d38c7ac0ccae", "source": { "decomp_file": "data/maps/PokemonTower_3F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -2433,13 +2433,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/PokemonTower_3F.json", - "sha256": "113d590d8aac5fcd4b729067ba675be7c7f2c8cbf96c87bc53c44344c55f3ff3" + "sha256": "3cf856d676d4d005d33259d75d43f836f6136f2ae4f8f4a7f931d38c7ac0ccae" } }, { "name": "PokemonTower_4F", "file": "data/games/frlg/maps/runtime/PokemonTower_4F.json", - "sha256": "090c8b1ac05c1bda1903392cd5152780b799650d057538b456c0ef43aa515e15", + "sha256": "ac8ac70ad58e4328f0f56e8c62b966633ad68599d938fa500ce0a10dd017e16f", "source": { "decomp_file": "data/maps/PokemonTower_4F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -2480,13 +2480,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/PokemonTower_4F.json", - "sha256": "090c8b1ac05c1bda1903392cd5152780b799650d057538b456c0ef43aa515e15" + "sha256": "ac8ac70ad58e4328f0f56e8c62b966633ad68599d938fa500ce0a10dd017e16f" } }, { "name": "PokemonTower_5F", "file": "data/games/frlg/maps/runtime/PokemonTower_5F.json", - "sha256": "8098291f9d1650ea9d7e60c3efd00af762c7a238b0bb05f4a7ba9155f756e1e7", + "sha256": "42c809684be8564bba4de8867fe75ffb9c99caf47eeddff9f7a708db489f5474", "source": { "decomp_file": "data/maps/PokemonTower_5F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -2527,13 +2527,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/PokemonTower_5F.json", - "sha256": "8098291f9d1650ea9d7e60c3efd00af762c7a238b0bb05f4a7ba9155f756e1e7" + "sha256": "42c809684be8564bba4de8867fe75ffb9c99caf47eeddff9f7a708db489f5474" } }, { "name": "PokemonTower_6F", "file": "data/games/frlg/maps/runtime/PokemonTower_6F.json", - "sha256": "9ac73990f3bc64b831a471981a8e58e24561333e8e5c971cb6b3f425acd087dc", + "sha256": "5b67c8d86e69e8347c2666fb1a7da262d6ca06316d625c0a871991891291b249", "source": { "decomp_file": "data/maps/PokemonTower_6F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -2574,13 +2574,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/PokemonTower_6F.json", - "sha256": "9ac73990f3bc64b831a471981a8e58e24561333e8e5c971cb6b3f425acd087dc" + "sha256": "5b67c8d86e69e8347c2666fb1a7da262d6ca06316d625c0a871991891291b249" } }, { "name": "PokemonTower_7F", "file": "data/games/frlg/maps/runtime/PokemonTower_7F.json", - "sha256": "55c20692690c392dea1d1fc900849b6ab592646b7877d8690108f4cf4adb4a84", + "sha256": "b75780c00ed5049bc60f65056c97f43615054e7255afebcd57d602dada1f990b", "source": { "decomp_file": "data/maps/PokemonTower_7F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -2609,13 +2609,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/PokemonTower_7F.json", - "sha256": "55c20692690c392dea1d1fc900849b6ab592646b7877d8690108f4cf4adb4a84" + "sha256": "b75780c00ed5049bc60f65056c97f43615054e7255afebcd57d602dada1f990b" } }, { "name": "RockTunnel_1F", "file": "data/games/frlg/maps/runtime/RockTunnel_1F.json", - "sha256": "298dd5a725f26795089826dec1532a09707c91b254727db37e1775a35f07922b", + "sha256": "f7c63a0f24d39b6e5956b9184e2ca366e0771ec356003531eabb25d52f57c7d7", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/RockTunnel_1F.json", "source": { "decomp_file": "data/maps/RockTunnel_1F/map.json", @@ -2662,13 +2662,13 @@ }, "base": { "file": "data/games/frlg/maps/base/RockTunnel_1F.json", - "sha256": "298dd5a725f26795089826dec1532a09707c91b254727db37e1775a35f07922b" + "sha256": "f7c63a0f24d39b6e5956b9184e2ca366e0771ec356003531eabb25d52f57c7d7" } }, { "name": "RockTunnel_B1F", "file": "data/games/frlg/maps/runtime/RockTunnel_B1F.json", - "sha256": "d8a4f463d0d7f179a8df25358b8b46c1557ac04ba9b1d51d797090f41e940631", + "sha256": "da921a9ae83220569bca328d4ce835a1b778a086d01cf1052b6cbf089f771a98", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/RockTunnel_B1F.json", "source": { "decomp_file": "data/maps/RockTunnel_B1F/map.json", @@ -2715,13 +2715,13 @@ }, "base": { "file": "data/games/frlg/maps/base/RockTunnel_B1F.json", - "sha256": "d8a4f463d0d7f179a8df25358b8b46c1557ac04ba9b1d51d797090f41e940631" + "sha256": "da921a9ae83220569bca328d4ce835a1b778a086d01cf1052b6cbf089f771a98" } }, { "name": "RocketHideout_B1F", "file": "data/games/frlg/maps/runtime/RocketHideout_B1F.json", - "sha256": "5efa59c439056d4378ae0144feeb5409befc5a303a2a1274af3c8226e8a69b5a", + "sha256": "e35faeebc0492690f6397deaa423084869a47c62b650e750109a7233acf75776", "source": { "decomp_file": "data/maps/RocketHideout_B1F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -2762,13 +2762,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/RocketHideout_B1F.json", - "sha256": "5efa59c439056d4378ae0144feeb5409befc5a303a2a1274af3c8226e8a69b5a" + "sha256": "e35faeebc0492690f6397deaa423084869a47c62b650e750109a7233acf75776" } }, { "name": "RocketHideout_B2F", "file": "data/games/frlg/maps/runtime/RocketHideout_B2F.json", - "sha256": "70a63825b8e2f3ba83822eb525ae9d7d22a7ce2599e23b8c5749a33db52fef8b", + "sha256": "edff0999afd837a5f18463ad2c4409777530b956dcbaa146814731b3781e593c", "source": { "decomp_file": "data/maps/RocketHideout_B2F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -2809,13 +2809,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/RocketHideout_B2F.json", - "sha256": "70a63825b8e2f3ba83822eb525ae9d7d22a7ce2599e23b8c5749a33db52fef8b" + "sha256": "edff0999afd837a5f18463ad2c4409777530b956dcbaa146814731b3781e593c" } }, { "name": "RocketHideout_B3F", "file": "data/games/frlg/maps/runtime/RocketHideout_B3F.json", - "sha256": "359ae7b7d54540ec8bd236b742517eeffc2dbf762f7b9c155097dccca577bbbb", + "sha256": "1b18db6206de4c5c1792a34090b0909259f15bba09c226e1a87834f399b59b78", "source": { "decomp_file": "data/maps/RocketHideout_B3F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -2856,13 +2856,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/RocketHideout_B3F.json", - "sha256": "359ae7b7d54540ec8bd236b742517eeffc2dbf762f7b9c155097dccca577bbbb" + "sha256": "1b18db6206de4c5c1792a34090b0909259f15bba09c226e1a87834f399b59b78" } }, { "name": "RocketHideout_B4F", "file": "data/games/frlg/maps/runtime/RocketHideout_B4F.json", - "sha256": "a7446111428a83b09fdc76d090074e8a9a9ad24adf9909ebacba46dc29fb4048", + "sha256": "4cd7820fff4553fa9574ef41130f29bfbd1370807576f45035cc8480715efac6", "source": { "decomp_file": "data/maps/RocketHideout_B4F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -2903,13 +2903,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/RocketHideout_B4F.json", - "sha256": "a7446111428a83b09fdc76d090074e8a9a9ad24adf9909ebacba46dc29fb4048" + "sha256": "4cd7820fff4553fa9574ef41130f29bfbd1370807576f45035cc8480715efac6" } }, { "name": "Route1", "file": "data/games/frlg/maps/runtime/Route1.json", - "sha256": "26ba91c2ecfdf0af8ccbdca9f21a522b68f93565594386c09af1011485de7781", + "sha256": "4fcaa89ccb0a39eefd4f703bfff16e0b6db9ab347a96795cd3f138878945e519", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/Route1.json", "source": { "decomp_file": "data/maps/Route1/map.json", @@ -2944,13 +2944,13 @@ }, "base": { "file": "data/games/frlg/maps/base/Route1.json", - "sha256": "26ba91c2ecfdf0af8ccbdca9f21a522b68f93565594386c09af1011485de7781" + "sha256": "4fcaa89ccb0a39eefd4f703bfff16e0b6db9ab347a96795cd3f138878945e519" } }, { "name": "Route10", "file": "data/games/frlg/maps/runtime/Route10.json", - "sha256": "af453e3bd0656a54e973328781e28e6ce3db53f4671cd334f4c66ef33d655983", + "sha256": "7ad5f75224e33f8a2887faffd5f822a7e83bfdeeeda904317e4f150f453cedf4", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/Route10.json", "source": { "decomp_file": "data/maps/Route10/map.json", @@ -2984,13 +2984,13 @@ }, "base": { "file": "data/games/frlg/maps/base/Route10.json", - "sha256": "af453e3bd0656a54e973328781e28e6ce3db53f4671cd334f4c66ef33d655983" + "sha256": "7ad5f75224e33f8a2887faffd5f822a7e83bfdeeeda904317e4f150f453cedf4" } }, { "name": "Route10_PokemonCenter_1F", "file": "data/games/frlg/maps/runtime/Route10_PokemonCenter_1F.json", - "sha256": "104cf48339dd7062cc1afc3f3ea216157ed23afc2320d0a7d1ace66e069b05b0", + "sha256": "8a2a3dd24f50b3d33bbd197ff7fa09ccf2e18270c86c8b0f0df0974d0024b47a", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/Route10_PokemonCenter_1F.json", "source": { "decomp_file": "data/maps/Route10_PokemonCenter_1F/map.json", @@ -3024,13 +3024,13 @@ }, "base": { "file": "data/games/frlg/maps/base/Route10_PokemonCenter_1F.json", - "sha256": "104cf48339dd7062cc1afc3f3ea216157ed23afc2320d0a7d1ace66e069b05b0" + "sha256": "8a2a3dd24f50b3d33bbd197ff7fa09ccf2e18270c86c8b0f0df0974d0024b47a" } }, { "name": "Route11", "file": "data/games/frlg/maps/runtime/Route11.json", - "sha256": "8985056f969c0686850ad7c18e8f8bb2320b1785fc85aa1d2f273f134b69410e", + "sha256": "59d01bfbb6dd61a452089f2d06469d85fa06e5c52da8f763bbc1469babb45fc8", "source": { "decomp_file": "data/maps/Route11/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3070,13 +3070,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route11.json", - "sha256": "8985056f969c0686850ad7c18e8f8bb2320b1785fc85aa1d2f273f134b69410e" + "sha256": "59d01bfbb6dd61a452089f2d06469d85fa06e5c52da8f763bbc1469babb45fc8" } }, { "name": "Route11_EastEntrance_1F", "file": "data/games/frlg/maps/runtime/Route11_EastEntrance_1F.json", - "sha256": "0f91f56e2344b005f43eb2cc1eb62ce5a73d20aaf046889b6bb32e87b3b27adb", + "sha256": "8b480d52589f29d597da5555ff8f8ea58e6086419936179a76c40669416dc913", "source": { "decomp_file": "data/maps/Route11_EastEntrance_1F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3105,13 +3105,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route11_EastEntrance_1F.json", - "sha256": "0f91f56e2344b005f43eb2cc1eb62ce5a73d20aaf046889b6bb32e87b3b27adb" + "sha256": "8b480d52589f29d597da5555ff8f8ea58e6086419936179a76c40669416dc913" } }, { "name": "Route12", "file": "data/games/frlg/maps/runtime/Route12.json", - "sha256": "14d442d97d709d0a40be1622476c6828b33c97d33a00ece9ee3fcd9eb2895804", + "sha256": "58a5b4b13def953cad095e7443f15289a70cc40353e2e271d48ed1c2b6376b39", "source": { "decomp_file": "data/maps/Route12/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3151,13 +3151,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route12.json", - "sha256": "14d442d97d709d0a40be1622476c6828b33c97d33a00ece9ee3fcd9eb2895804" + "sha256": "58a5b4b13def953cad095e7443f15289a70cc40353e2e271d48ed1c2b6376b39" } }, { "name": "Route12_NorthEntrance_1F", "file": "data/games/frlg/maps/runtime/Route12_NorthEntrance_1F.json", - "sha256": "d7952e73d60a33eefe9f2613b43eead09e10099b8a3c3f56eed31f2a4f8adf9c", + "sha256": "32875357e1e8d3fae92ed61a83e637b8e9d589713eb77b297f63cca240eaf24d", "source": { "decomp_file": "data/maps/Route12_NorthEntrance_1F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3186,13 +3186,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route12_NorthEntrance_1F.json", - "sha256": "d7952e73d60a33eefe9f2613b43eead09e10099b8a3c3f56eed31f2a4f8adf9c" + "sha256": "32875357e1e8d3fae92ed61a83e637b8e9d589713eb77b297f63cca240eaf24d" } }, { "name": "Route13", "file": "data/games/frlg/maps/runtime/Route13.json", - "sha256": "0ab17830586baa895708f6c290eb5e4ded94753ed1b278a55b4bbe34434c3209", + "sha256": "d97205ea260ae2514219e27f879a64858bd13833935c7389268c86b0ec0c3ccb", "source": { "decomp_file": "data/maps/Route13/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3220,13 +3220,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route13.json", - "sha256": "0ab17830586baa895708f6c290eb5e4ded94753ed1b278a55b4bbe34434c3209" + "sha256": "d97205ea260ae2514219e27f879a64858bd13833935c7389268c86b0ec0c3ccb" } }, { "name": "Route14", "file": "data/games/frlg/maps/runtime/Route14.json", - "sha256": "2c7a2ca34580235a380e02fa981ea4fe4f281393df916b2871b60634cff52b07", + "sha256": "3853c8e988bf5dcc2c7b25215ed365a6b04260f6b72167dae92554d51ce6b708", "source": { "decomp_file": "data/maps/Route14/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3254,13 +3254,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route14.json", - "sha256": "2c7a2ca34580235a380e02fa981ea4fe4f281393df916b2871b60634cff52b07" + "sha256": "3853c8e988bf5dcc2c7b25215ed365a6b04260f6b72167dae92554d51ce6b708" } }, { "name": "Route15", "file": "data/games/frlg/maps/runtime/Route15.json", - "sha256": "58fb4669653f07fe3e9ab4a98c302de2e617b11abb8f017d5a0a932cfd186995", + "sha256": "7f116e0f08bac2ffa1743a5281f4584e8c34b5488c6767a145a7ea1d88ed9118", "source": { "decomp_file": "data/maps/Route15/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3301,13 +3301,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route15.json", - "sha256": "58fb4669653f07fe3e9ab4a98c302de2e617b11abb8f017d5a0a932cfd186995" + "sha256": "7f116e0f08bac2ffa1743a5281f4584e8c34b5488c6767a145a7ea1d88ed9118" } }, { "name": "Route15_WestEntrance_1F", "file": "data/games/frlg/maps/runtime/Route15_WestEntrance_1F.json", - "sha256": "83fcaf6618300ac0cdc89a1ca0f24dda920e5586e55941048db40d66e564b540", + "sha256": "d241dcd7f657b0ac918b5c4d0a720fab179ec2b85f1a95ea1a38621390f7e083", "source": { "decomp_file": "data/maps/Route15_WestEntrance_1F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3336,13 +3336,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route15_WestEntrance_1F.json", - "sha256": "83fcaf6618300ac0cdc89a1ca0f24dda920e5586e55941048db40d66e564b540" + "sha256": "d241dcd7f657b0ac918b5c4d0a720fab179ec2b85f1a95ea1a38621390f7e083" } }, { "name": "Route16", "file": "data/games/frlg/maps/runtime/Route16.json", - "sha256": "642273d4824f60c6c78953691c398b2f6522c8a15f91cdd9f0b745e5ecf9d563", + "sha256": "280f30cf75a25e59a42a516166ac595f0391bd377f1746a81575d108b9d4c8d8", "source": { "decomp_file": "data/maps/Route16/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3370,13 +3370,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route16.json", - "sha256": "642273d4824f60c6c78953691c398b2f6522c8a15f91cdd9f0b745e5ecf9d563" + "sha256": "280f30cf75a25e59a42a516166ac595f0391bd377f1746a81575d108b9d4c8d8" } }, { "name": "Route16_House", "file": "data/games/frlg/maps/runtime/Route16_House.json", - "sha256": "b3dd44d35e994ffa35663851a651d7e859580edccd8fb5b40b3ad38bc9afa6f0", + "sha256": "5adcc30ff7f87d5eda6d68d80cc2707b65ea9e24c53830e8e686e6cff8da3707", "source": { "decomp_file": "data/maps/Route16_House/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3405,13 +3405,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route16_House.json", - "sha256": "b3dd44d35e994ffa35663851a651d7e859580edccd8fb5b40b3ad38bc9afa6f0" + "sha256": "5adcc30ff7f87d5eda6d68d80cc2707b65ea9e24c53830e8e686e6cff8da3707" } }, { "name": "Route16_NorthEntrance_1F", "file": "data/games/frlg/maps/runtime/Route16_NorthEntrance_1F.json", - "sha256": "46627f2ed9059e94ca0830d5e36524fe6202452249261130fc413d1f9729ce93", + "sha256": "ee75630ad8ca5c1ec19cb541c6a85a239a9a8f4f815066708d2411a117250354", "source": { "decomp_file": "data/maps/Route16_NorthEntrance_1F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3440,13 +3440,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route16_NorthEntrance_1F.json", - "sha256": "46627f2ed9059e94ca0830d5e36524fe6202452249261130fc413d1f9729ce93" + "sha256": "ee75630ad8ca5c1ec19cb541c6a85a239a9a8f4f815066708d2411a117250354" } }, { "name": "Route18", "file": "data/games/frlg/maps/runtime/Route18.json", - "sha256": "f2cc9b5b671e89771c16d1afe009747eee4df9bf190f72b182c4f2e08d3dff48", + "sha256": "86bf0352e0c8cac8495396174040c08de85a2aa00ff7c5684caff04a5f44035f", "source": { "decomp_file": "data/maps/Route18/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3474,13 +3474,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route18.json", - "sha256": "f2cc9b5b671e89771c16d1afe009747eee4df9bf190f72b182c4f2e08d3dff48" + "sha256": "86bf0352e0c8cac8495396174040c08de85a2aa00ff7c5684caff04a5f44035f" } }, { "name": "Route18_EastEntrance_1F", "file": "data/games/frlg/maps/runtime/Route18_EastEntrance_1F.json", - "sha256": "3279c34f5c27c8c4e49891757b96a163fd3ba71b2f2e4fb38b188fa5308aa0fd", + "sha256": "ec3192a9ed56f12de21ee2da7ba488d411f4fbd358a8d3eea0f86c3125f97f5d", "source": { "decomp_file": "data/maps/Route18_EastEntrance_1F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3509,13 +3509,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route18_EastEntrance_1F.json", - "sha256": "3279c34f5c27c8c4e49891757b96a163fd3ba71b2f2e4fb38b188fa5308aa0fd" + "sha256": "ec3192a9ed56f12de21ee2da7ba488d411f4fbd358a8d3eea0f86c3125f97f5d" } }, { "name": "Route19", "file": "data/games/frlg/maps/runtime/Route19.json", - "sha256": "32334780c5e81e03842354b7b6fbf0fb9fcfee8225bae4216c006d3617096a09", + "sha256": "b96730856f8d1738ae044e6fe13da8e3f26994616c75c7d2be500d177de1d101", "source": { "decomp_file": "data/maps/Route19/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3543,13 +3543,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route19.json", - "sha256": "32334780c5e81e03842354b7b6fbf0fb9fcfee8225bae4216c006d3617096a09" + "sha256": "b96730856f8d1738ae044e6fe13da8e3f26994616c75c7d2be500d177de1d101" } }, { "name": "Route2", "file": "data/games/frlg/maps/runtime/Route2.json", - "sha256": "791f723a806c664b6892b101a866208745c4ed58f9e44dacbbc892780a62cc26", + "sha256": "738834cab9c394db08feb685adcc19813310a11ae931679576e09c939399c170", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/Route2.json", "source": { "decomp_file": "data/maps/Route2/map.json", @@ -3596,13 +3596,13 @@ }, "base": { "file": "data/games/frlg/maps/base/Route2.json", - "sha256": "791f723a806c664b6892b101a866208745c4ed58f9e44dacbbc892780a62cc26" + "sha256": "738834cab9c394db08feb685adcc19813310a11ae931679576e09c939399c170" } }, { "name": "Route20", "file": "data/games/frlg/maps/runtime/Route20.json", - "sha256": "813ef18147a184416137408aedb46cae313d5dbe9b5d190115a2aaa07274c645", + "sha256": "8ac2a8e165b648f8d2b1275edfc35329850777c80b20ef7c043572ecc082ca54", "source": { "decomp_file": "data/maps/Route20/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3630,13 +3630,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route20.json", - "sha256": "813ef18147a184416137408aedb46cae313d5dbe9b5d190115a2aaa07274c645" + "sha256": "8ac2a8e165b648f8d2b1275edfc35329850777c80b20ef7c043572ecc082ca54" } }, { "name": "Route21_North", "file": "data/games/frlg/maps/runtime/Route21_North.json", - "sha256": "083f789200e275429cffa470c9322878d61b7d9fcdbf42980abd47d2d813c2f4", + "sha256": "5717ff5c07317c7e681aaba2c27caf77ffddec992fca980e9aeb3de43be6f4a9", "source": { "decomp_file": "data/maps/Route21_North/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3664,13 +3664,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route21_North.json", - "sha256": "083f789200e275429cffa470c9322878d61b7d9fcdbf42980abd47d2d813c2f4" + "sha256": "5717ff5c07317c7e681aaba2c27caf77ffddec992fca980e9aeb3de43be6f4a9" } }, { "name": "Route21_South", "file": "data/games/frlg/maps/runtime/Route21_South.json", - "sha256": "b56e942575a45f8db54011fbc4d2cdba3b211183207ef62745de05cc786f2f7c", + "sha256": "e913525ab55e2255de907a643ab2934e81783b03bc4602f0183e2f8d0bc1c5fc", "source": { "decomp_file": "data/maps/Route21_South/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3698,13 +3698,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route21_South.json", - "sha256": "b56e942575a45f8db54011fbc4d2cdba3b211183207ef62745de05cc786f2f7c" + "sha256": "e913525ab55e2255de907a643ab2934e81783b03bc4602f0183e2f8d0bc1c5fc" } }, { "name": "Route22", "file": "data/games/frlg/maps/runtime/Route22.json", - "sha256": "1c7eafcae2b76adea9ba626f6ffc23233eae8866766e72e286f21c144eabf157", + "sha256": "6e4f224651ffb317e829f16870b48f06e8f857f5ebb07ecef38daf109ed7b8f9", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/Route22.json", "source": { "decomp_file": "data/maps/Route22/map.json", @@ -3738,13 +3738,13 @@ }, "base": { "file": "data/games/frlg/maps/base/Route22.json", - "sha256": "1c7eafcae2b76adea9ba626f6ffc23233eae8866766e72e286f21c144eabf157" + "sha256": "6e4f224651ffb317e829f16870b48f06e8f857f5ebb07ecef38daf109ed7b8f9" } }, { "name": "Route22_NorthEntrance", "file": "data/games/frlg/maps/runtime/Route22_NorthEntrance.json", - "sha256": "bbacfdf31ed8deb5e36d74f57091afabd165c7dbb776c50a955c0bf0302ddccd", + "sha256": "28e8ab065378c5f32b47a39e0b7be5a6f64541158091bf4f4edaa84cd34b3133", "source": { "decomp_file": "data/maps/Route22_NorthEntrance/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3773,13 +3773,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route22_NorthEntrance.json", - "sha256": "bbacfdf31ed8deb5e36d74f57091afabd165c7dbb776c50a955c0bf0302ddccd" + "sha256": "28e8ab065378c5f32b47a39e0b7be5a6f64541158091bf4f4edaa84cd34b3133" } }, { "name": "Route23", "file": "data/games/frlg/maps/runtime/Route23.json", - "sha256": "c9635cab3f2dbadb942ed2c46738a2f73679de8555bb653ee8ff17fe9177e43a", + "sha256": "62972e19f9418f5631121a574bc62c909d89829371a10f8d035ff5c2b878a071", "source": { "decomp_file": "data/maps/Route23/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3807,13 +3807,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route23.json", - "sha256": "c9635cab3f2dbadb942ed2c46738a2f73679de8555bb653ee8ff17fe9177e43a" + "sha256": "62972e19f9418f5631121a574bc62c909d89829371a10f8d035ff5c2b878a071" } }, { "name": "Route24", "file": "data/games/frlg/maps/runtime/Route24.json", - "sha256": "e21b18485d4228270dded4a5a87db82237ad8b2ea14eb26171e6861af70dc211", + "sha256": "c734671f34a5551be45d0965c4166e4c6bdc5f0039e903021a3952b838381b1b", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/Route24.json", "source": { "decomp_file": "data/maps/Route24/map.json", @@ -3859,13 +3859,13 @@ }, "base": { "file": "data/games/frlg/maps/base/Route24.json", - "sha256": "e21b18485d4228270dded4a5a87db82237ad8b2ea14eb26171e6861af70dc211" + "sha256": "c734671f34a5551be45d0965c4166e4c6bdc5f0039e903021a3952b838381b1b" } }, { "name": "Route25", "file": "data/games/frlg/maps/runtime/Route25.json", - "sha256": "41a94d698a61e9dfb65f4dec050117fcb0bb9c07a497e8fdc14921672a48091c", + "sha256": "637910f3bb5e8b2089664cf8eaef7da7a32b2be329375aedcfaf0a20df059ff5", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/Route25.json", "source": { "decomp_file": "data/maps/Route25/map.json", @@ -3911,13 +3911,13 @@ }, "base": { "file": "data/games/frlg/maps/base/Route25.json", - "sha256": "41a94d698a61e9dfb65f4dec050117fcb0bb9c07a497e8fdc14921672a48091c" + "sha256": "637910f3bb5e8b2089664cf8eaef7da7a32b2be329375aedcfaf0a20df059ff5" } }, { "name": "Route25_SeaCottage", "file": "data/games/frlg/maps/runtime/Route25_SeaCottage.json", - "sha256": "fc57abf1eb0645f65f8c1c8814269f7315fcd5a417491ad9d18af1026d073a3c", + "sha256": "3edb3bce9d4ef9eb4d2b2a867f7a4e97c363352acdc75f5eac5caf786d08556c", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/Route25_SeaCottage.json", "source": { "decomp_file": "data/maps/Route25_SeaCottage/map.json", @@ -3952,13 +3952,13 @@ }, "base": { "file": "data/games/frlg/maps/base/Route25_SeaCottage.json", - "sha256": "fc57abf1eb0645f65f8c1c8814269f7315fcd5a417491ad9d18af1026d073a3c" + "sha256": "3edb3bce9d4ef9eb4d2b2a867f7a4e97c363352acdc75f5eac5caf786d08556c" } }, { "name": "Route2_EastBuilding", "file": "data/games/frlg/maps/runtime/Route2_EastBuilding.json", - "sha256": "1e03b3dfca61e82a9b0c537039eb7c3b62f261162e9340af9b90733a9dde4cad", + "sha256": "a4cf5acde79d9f813ac1ee24565e45b97b4ce430aad9d003111758099c39df55", "source": { "decomp_file": "data/maps/Route2_EastBuilding/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -3987,13 +3987,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route2_EastBuilding.json", - "sha256": "1e03b3dfca61e82a9b0c537039eb7c3b62f261162e9340af9b90733a9dde4cad" + "sha256": "a4cf5acde79d9f813ac1ee24565e45b97b4ce430aad9d003111758099c39df55" } }, { "name": "Route2_ViridianForest_NorthEntrance", "file": "data/games/frlg/maps/runtime/Route2_ViridianForest_NorthEntrance.json", - "sha256": "20e5c25f9a59298eba9bbdfdf05ab1a8c6b531d3599fd23d4634aa52ca08614d", + "sha256": "642dee1c11505c826ea394b1fd83dd5626b4dced1d5bd74c81086b92f45bf550", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/Route2_ViridianForest_NorthEntrance.json", "source": { "decomp_file": "data/maps/Route2_ViridianForest_NorthEntrance/map.json", @@ -4028,13 +4028,13 @@ }, "base": { "file": "data/games/frlg/maps/base/Route2_ViridianForest_NorthEntrance.json", - "sha256": "20e5c25f9a59298eba9bbdfdf05ab1a8c6b531d3599fd23d4634aa52ca08614d" + "sha256": "642dee1c11505c826ea394b1fd83dd5626b4dced1d5bd74c81086b92f45bf550" } }, { "name": "Route2_ViridianForest_SouthEntrance", "file": "data/games/frlg/maps/runtime/Route2_ViridianForest_SouthEntrance.json", - "sha256": "2d2eb32a228f4cb5be085a6e71d78795ddb5bf04561abe2d89a1a75d0396bd48", + "sha256": "29b13b4fa92dd90edb1023ed790d413714652d18efa0343cff7d033604ba82f8", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/Route2_ViridianForest_SouthEntrance.json", "source": { "decomp_file": "data/maps/Route2_ViridianForest_SouthEntrance/map.json", @@ -4069,13 +4069,13 @@ }, "base": { "file": "data/games/frlg/maps/base/Route2_ViridianForest_SouthEntrance.json", - "sha256": "2d2eb32a228f4cb5be085a6e71d78795ddb5bf04561abe2d89a1a75d0396bd48" + "sha256": "29b13b4fa92dd90edb1023ed790d413714652d18efa0343cff7d033604ba82f8" } }, { "name": "Route3", "file": "data/games/frlg/maps/runtime/Route3.json", - "sha256": "8ce68fdb7cbcb30dd60c671c3e9f409f8b1479a5f39d859cdd1913ee83e19aa3", + "sha256": "9499f795a679ba40beebc936b54512bc1e248be4ab4d26fc2402d45de36edc36", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/Route3.json", "source": { "decomp_file": "data/maps/Route3/map.json", @@ -4110,13 +4110,13 @@ }, "base": { "file": "data/games/frlg/maps/base/Route3.json", - "sha256": "8ce68fdb7cbcb30dd60c671c3e9f409f8b1479a5f39d859cdd1913ee83e19aa3" + "sha256": "9499f795a679ba40beebc936b54512bc1e248be4ab4d26fc2402d45de36edc36" } }, { "name": "Route4", "file": "data/games/frlg/maps/runtime/Route4.json", - "sha256": "0ec479fa8542b6da3af790d42d778df6b185806cf15efe9d7232019b7b180ded", + "sha256": "0a9da7700b0d0ffeb5068a327412ff59703025fb30896955738f928023d864cc", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/Route4.json", "source": { "decomp_file": "data/maps/Route4/map.json", @@ -4162,13 +4162,13 @@ }, "base": { "file": "data/games/frlg/maps/base/Route4.json", - "sha256": "0ec479fa8542b6da3af790d42d778df6b185806cf15efe9d7232019b7b180ded" + "sha256": "0a9da7700b0d0ffeb5068a327412ff59703025fb30896955738f928023d864cc" } }, { "name": "Route4_PokemonCenter_1F", "file": "data/games/frlg/maps/runtime/Route4_PokemonCenter_1F.json", - "sha256": "0a1faa7a9f0d20c5d1f5f31b737435f19923f851485de2646ff1a0dbd56294b6", + "sha256": "5c929b930661f412b6a1e9ebf69e4d7bfe0a49935d5f29bf00c742a7ac6c6728", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/Route4_PokemonCenter_1F.json", "source": { "decomp_file": "data/maps/Route4_PokemonCenter_1F/map.json", @@ -4202,7 +4202,7 @@ }, "base": { "file": "data/games/frlg/maps/base/Route4_PokemonCenter_1F.json", - "sha256": "0a1faa7a9f0d20c5d1f5f31b737435f19923f851485de2646ff1a0dbd56294b6" + "sha256": "5c929b930661f412b6a1e9ebf69e4d7bfe0a49935d5f29bf00c742a7ac6c6728" } }, { @@ -4249,7 +4249,7 @@ { "name": "Route5_SouthEntrance", "file": "data/games/frlg/maps/runtime/Route5_SouthEntrance.json", - "sha256": "a3d6b9df455410df5e752ed038eaf84211c01b625e7489cf01d375f8c966f721", + "sha256": "9833ac2edf31c8093a2d2df34da7b576923582ef72867c5d2000d2f3de9061e5", "source": { "decomp_file": "data/maps/Route5_SouthEntrance/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -4278,13 +4278,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route5_SouthEntrance.json", - "sha256": "a3d6b9df455410df5e752ed038eaf84211c01b625e7489cf01d375f8c966f721" + "sha256": "9833ac2edf31c8093a2d2df34da7b576923582ef72867c5d2000d2f3de9061e5" } }, { "name": "Route6", "file": "data/games/frlg/maps/runtime/Route6.json", - "sha256": "b0a250b98c319cd9ed328c0057d2cb4d742b783a1d7296c11aaa2777a8bf1628", + "sha256": "853b1dede367ac8c42851bc08957a386f9a471cd8580a02adb29867f35785856", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/Route6.json", "source": { "decomp_file": "data/maps/Route6/map.json", @@ -4318,13 +4318,13 @@ }, "base": { "file": "data/games/frlg/maps/base/Route6.json", - "sha256": "b0a250b98c319cd9ed328c0057d2cb4d742b783a1d7296c11aaa2777a8bf1628" + "sha256": "853b1dede367ac8c42851bc08957a386f9a471cd8580a02adb29867f35785856" } }, { "name": "Route6_NorthEntrance", "file": "data/games/frlg/maps/runtime/Route6_NorthEntrance.json", - "sha256": "1938c83c169392ff710cb3ffc2efedfde1d730f1536a01cf38f6f91aa7dbaf4a", + "sha256": "c781baf818dd9f4a34021acf33c2abfe91f8f32717ee02ebcad6109fbe164c94", "source": { "decomp_file": "data/maps/Route6_NorthEntrance/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -4353,7 +4353,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route6_NorthEntrance.json", - "sha256": "1938c83c169392ff710cb3ffc2efedfde1d730f1536a01cf38f6f91aa7dbaf4a" + "sha256": "c781baf818dd9f4a34021acf33c2abfe91f8f32717ee02ebcad6109fbe164c94" } }, { @@ -4394,7 +4394,7 @@ { "name": "Route7_EastEntrance", "file": "data/games/frlg/maps/runtime/Route7_EastEntrance.json", - "sha256": "d1073d52636707c03882d34e05d0a11a5c3934e2396432144a76e3e8fba8bf8b", + "sha256": "3c1816dad02df11dd8b46d63cb2ff11bc55315f0f4a429c81db5a6974d319cf8", "source": { "decomp_file": "data/maps/Route7_EastEntrance/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -4423,13 +4423,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route7_EastEntrance.json", - "sha256": "d1073d52636707c03882d34e05d0a11a5c3934e2396432144a76e3e8fba8bf8b" + "sha256": "3c1816dad02df11dd8b46d63cb2ff11bc55315f0f4a429c81db5a6974d319cf8" } }, { "name": "Route8", "file": "data/games/frlg/maps/runtime/Route8.json", - "sha256": "bf715f82fb2edb389e4fbc1cf5ccb542629ef05d9762fd08bb1dc877af90dd98", + "sha256": "1dd232adff8dab5fda8a593a4beee6d5da40b3edd35e5a0056808679e202d633", "source": { "decomp_file": "data/maps/Route8/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -4458,13 +4458,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route8.json", - "sha256": "bf715f82fb2edb389e4fbc1cf5ccb542629ef05d9762fd08bb1dc877af90dd98" + "sha256": "1dd232adff8dab5fda8a593a4beee6d5da40b3edd35e5a0056808679e202d633" } }, { "name": "Route8_WestEntrance", "file": "data/games/frlg/maps/runtime/Route8_WestEntrance.json", - "sha256": "55d6cec8853e8c81007f324b0bcdb0c1170ad21f7a79e12a4ca783a78bdf2cf1", + "sha256": "b196cfb1c5b597d6627c78f7df4bd04b3051e695dc309993c166ac1a5d9624d9", "source": { "decomp_file": "data/maps/Route8_WestEntrance/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -4493,13 +4493,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/Route8_WestEntrance.json", - "sha256": "55d6cec8853e8c81007f324b0bcdb0c1170ad21f7a79e12a4ca783a78bdf2cf1" + "sha256": "b196cfb1c5b597d6627c78f7df4bd04b3051e695dc309993c166ac1a5d9624d9" } }, { "name": "Route9", "file": "data/games/frlg/maps/runtime/Route9.json", - "sha256": "19d388a37d42126b5069e341b75c3b86a37a86b4b927c88a25b22dc37b57ed33", + "sha256": "db5402c5b421e162152a9b75b3bbceb0320176a2e5daa69962573d07445a595e", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/Route9.json", "source": { "decomp_file": "data/maps/Route9/map.json", @@ -4546,13 +4546,13 @@ }, "base": { "file": "data/games/frlg/maps/base/Route9.json", - "sha256": "19d388a37d42126b5069e341b75c3b86a37a86b4b927c88a25b22dc37b57ed33" + "sha256": "db5402c5b421e162152a9b75b3bbceb0320176a2e5daa69962573d07445a595e" } }, { "name": "SSAnne_1F_Corridor", "file": "data/games/frlg/maps/runtime/SSAnne_1F_Corridor.json", - "sha256": "671d80ebbbd40ca59803a1c2236c3af8f2886ac942ac671fb02f257e70d60d6c", + "sha256": "385a3b932b1b29f88b719e20a9273f4255e375146145956d50eefc873cf99952", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/SSAnne_1F_Corridor.json", "source": { "decomp_file": "data/maps/SSAnne_1F_Corridor/map.json", @@ -4587,13 +4587,13 @@ }, "base": { "file": "data/games/frlg/maps/base/SSAnne_1F_Corridor.json", - "sha256": "671d80ebbbd40ca59803a1c2236c3af8f2886ac942ac671fb02f257e70d60d6c" + "sha256": "385a3b932b1b29f88b719e20a9273f4255e375146145956d50eefc873cf99952" } }, { "name": "SSAnne_1F_Room6", "file": "data/games/frlg/maps/runtime/SSAnne_1F_Room6.json", - "sha256": "b1cb332de36333a516c29456353b19f20db0b239665ae9db7e1b636a6e8a33c3", + "sha256": "7fb500cf8569cde33e55c9dcae1ae40a9216e6874026418d057d4b1fb58d884a", "source": { "decomp_file": "data/maps/SSAnne_1F_Room6/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -4622,13 +4622,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SSAnne_1F_Room6.json", - "sha256": "b1cb332de36333a516c29456353b19f20db0b239665ae9db7e1b636a6e8a33c3" + "sha256": "7fb500cf8569cde33e55c9dcae1ae40a9216e6874026418d057d4b1fb58d884a" } }, { "name": "SSAnne_2F_Corridor", "file": "data/games/frlg/maps/runtime/SSAnne_2F_Corridor.json", - "sha256": "d6416a46e6cf4246eb6601949b1c65a4178eed0c2439bd5f0f15477b15b3ab28", + "sha256": "19ed83211377a49c335d22fc62d0df0da06dd67072d6d9672b83dd6476d859d0", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/SSAnne_2F_Corridor.json", "source": { "decomp_file": "data/maps/SSAnne_2F_Corridor/map.json", @@ -4663,13 +4663,13 @@ }, "base": { "file": "data/games/frlg/maps/base/SSAnne_2F_Corridor.json", - "sha256": "d6416a46e6cf4246eb6601949b1c65a4178eed0c2439bd5f0f15477b15b3ab28" + "sha256": "19ed83211377a49c335d22fc62d0df0da06dd67072d6d9672b83dd6476d859d0" } }, { "name": "SSAnne_CaptainsOffice", "file": "data/games/frlg/maps/runtime/SSAnne_CaptainsOffice.json", - "sha256": "9361655ac2467290720ecc93a9dce28837e7fc1e24bbf4ec0b99ac5d72cde91e", + "sha256": "cf4bbb105d73090a85ef433a129bd56b1171371e882339f87820826027e45128", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/SSAnne_CaptainsOffice.json", "source": { "decomp_file": "data/maps/SSAnne_CaptainsOffice/map.json", @@ -4704,13 +4704,13 @@ }, "base": { "file": "data/games/frlg/maps/base/SSAnne_CaptainsOffice.json", - "sha256": "9361655ac2467290720ecc93a9dce28837e7fc1e24bbf4ec0b99ac5d72cde91e" + "sha256": "cf4bbb105d73090a85ef433a129bd56b1171371e882339f87820826027e45128" } }, { "name": "SSAnne_Exterior", "file": "data/games/frlg/maps/runtime/SSAnne_Exterior.json", - "sha256": "a5352a0bda8dd01e8d105c00bf95ecb694fe5906b013514a3b1ad5c8a0010a53", + "sha256": "47023e6dddb55e0537f914b1b6774572e8d624bf6f4fd8c8c6b78ea5a55663f9", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/SSAnne_Exterior.json", "source": { "decomp_file": "data/maps/SSAnne_Exterior/map.json", @@ -4744,13 +4744,13 @@ }, "base": { "file": "data/games/frlg/maps/base/SSAnne_Exterior.json", - "sha256": "a5352a0bda8dd01e8d105c00bf95ecb694fe5906b013514a3b1ad5c8a0010a53" + "sha256": "47023e6dddb55e0537f914b1b6774572e8d624bf6f4fd8c8c6b78ea5a55663f9" } }, { "name": "SafariZone_Center", "file": "data/games/frlg/maps/runtime/SafariZone_Center.json", - "sha256": "75ad570841fe2df3648207e07c8ec05f96efff64293a4640450afafa975e8df9", + "sha256": "c09d96342f39d7195d4b84897f36191e1ed2712cabfc056a7005f1db58298065", "source": { "decomp_file": "data/maps/SafariZone_Center/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -4790,13 +4790,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SafariZone_Center.json", - "sha256": "75ad570841fe2df3648207e07c8ec05f96efff64293a4640450afafa975e8df9" + "sha256": "c09d96342f39d7195d4b84897f36191e1ed2712cabfc056a7005f1db58298065" } }, { "name": "SafariZone_East", "file": "data/games/frlg/maps/runtime/SafariZone_East.json", - "sha256": "22af9e8f3756fed93e5d83cb230a630472ca900dc96a652da964768d9ea2ef69", + "sha256": "c50e6fe8ac9cab3263d291e65327c27b6d245acece61cefae27bd90b98d549d6", "source": { "decomp_file": "data/maps/SafariZone_East/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -4836,13 +4836,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SafariZone_East.json", - "sha256": "22af9e8f3756fed93e5d83cb230a630472ca900dc96a652da964768d9ea2ef69" + "sha256": "c50e6fe8ac9cab3263d291e65327c27b6d245acece61cefae27bd90b98d549d6" } }, { "name": "SafariZone_North", "file": "data/games/frlg/maps/runtime/SafariZone_North.json", - "sha256": "0681ec6efd7a9b500c742d6a141f7deff710c428c7cb3a3f330b96e740ac9497", + "sha256": "6a8f28ef57edfb6d9b1fa286f464bc365d02ff6a1714eb66e8f9cae0eb7da0ea", "source": { "decomp_file": "data/maps/SafariZone_North/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -4882,13 +4882,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SafariZone_North.json", - "sha256": "0681ec6efd7a9b500c742d6a141f7deff710c428c7cb3a3f330b96e740ac9497" + "sha256": "6a8f28ef57edfb6d9b1fa286f464bc365d02ff6a1714eb66e8f9cae0eb7da0ea" } }, { "name": "SafariZone_SecretHouse", "file": "data/games/frlg/maps/runtime/SafariZone_SecretHouse.json", - "sha256": "52928753db01353c63bcb47ee9185e30d50955df129a7b626d7b176eedcb493e", + "sha256": "c6a5436d1e77f53a801407ddd76d4dda8104e9d27dc23059d79877199f7486dc", "source": { "decomp_file": "data/maps/SafariZone_SecretHouse/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -4917,13 +4917,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SafariZone_SecretHouse.json", - "sha256": "52928753db01353c63bcb47ee9185e30d50955df129a7b626d7b176eedcb493e" + "sha256": "c6a5436d1e77f53a801407ddd76d4dda8104e9d27dc23059d79877199f7486dc" } }, { "name": "SafariZone_West", "file": "data/games/frlg/maps/runtime/SafariZone_West.json", - "sha256": "2ca760fc952fbcc4649bae18d556a693d1a0602103192be348ccf08c96233100", + "sha256": "db9de6d1697959c558c311da436e376cf8a296d6a46a6160386e7f3219095cf0", "source": { "decomp_file": "data/maps/SafariZone_West/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -4963,13 +4963,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SafariZone_West.json", - "sha256": "2ca760fc952fbcc4649bae18d556a693d1a0602103192be348ccf08c96233100" + "sha256": "db9de6d1697959c558c311da436e376cf8a296d6a46a6160386e7f3219095cf0" } }, { "name": "SaffronCity", "file": "data/games/frlg/maps/runtime/SaffronCity.json", - "sha256": "7e237be77238490ff14788abe8ba38e5f031e708d57fb1836cdb090b219f424b", + "sha256": "8c0148f67f8dce444a18314e4bd0ced67321d61979f8ebb4ac4dacf47c79110f", "source": { "decomp_file": "data/maps/SaffronCity/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -4998,7 +4998,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SaffronCity.json", - "sha256": "7e237be77238490ff14788abe8ba38e5f031e708d57fb1836cdb090b219f424b" + "sha256": "8c0148f67f8dce444a18314e4bd0ced67321d61979f8ebb4ac4dacf47c79110f" } }, { @@ -5039,7 +5039,7 @@ { "name": "SaffronCity_Gym", "file": "data/games/frlg/maps/runtime/SaffronCity_Gym.json", - "sha256": "0c6bfc660f94ef3eee01b35276b3a04d09aae4e99de9c756c11b1d8e1df12c18", + "sha256": "a20a86eb45f8f07f01b472b6bf97fdba3f824bcba051bc120e54c32ab7c27e92", "source": { "decomp_file": "data/maps/SaffronCity_Gym/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -5068,13 +5068,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SaffronCity_Gym.json", - "sha256": "0c6bfc660f94ef3eee01b35276b3a04d09aae4e99de9c756c11b1d8e1df12c18" + "sha256": "a20a86eb45f8f07f01b472b6bf97fdba3f824bcba051bc120e54c32ab7c27e92" } }, { "name": "SaffronCity_Mart", "file": "data/games/frlg/maps/runtime/SaffronCity_Mart.json", - "sha256": "1cedc27430b3ca1987909af1d2eeefdc209ce7ee7df5026a23e875246cb94c86", + "sha256": "ee98946f3a40bfa61697c6837cdccf3d083b7b1f96d90670c62578f63c9a2f94", "source": { "decomp_file": "data/maps/SaffronCity_Mart/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -5103,13 +5103,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SaffronCity_Mart.json", - "sha256": "1cedc27430b3ca1987909af1d2eeefdc209ce7ee7df5026a23e875246cb94c86" + "sha256": "ee98946f3a40bfa61697c6837cdccf3d083b7b1f96d90670c62578f63c9a2f94" } }, { "name": "SilphCo_10F", "file": "data/games/frlg/maps/runtime/SilphCo_10F.json", - "sha256": "ff8f54f0a5fe22bd979f28af43087c9bd669cb620d9d8f942572974961dcb483", + "sha256": "254d8057255b69357feb52b75276d438c839f03770692a14abd700b1884e0607", "source": { "decomp_file": "data/maps/SilphCo_10F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -5154,7 +5154,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SilphCo_10F.json", - "sha256": "9c37e03975f3c18364a8f9f89ffec91fb8fac496cf04cec735196fddba504452" + "sha256": "6a29d411017a65e245b4ddcb8b64a1b7774a59c5bd34bb69a6a92d474767d180" }, "overlay": { "file": "data/games/frlg/maps/overlays/SilphCo_10F.json", @@ -5164,7 +5164,7 @@ { "name": "SilphCo_11F", "file": "data/games/frlg/maps/runtime/SilphCo_11F.json", - "sha256": "359ca6f8fbce3ecbfd71be43a3666d05e967fb4e02cf03d4afd4c0e5bff5df92", + "sha256": "9adba4f7b9b4c0cf72b1ba526fd63de689992a03dce27b20632def3f6065a4ad", "source": { "decomp_file": "data/maps/SilphCo_11F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -5209,7 +5209,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SilphCo_11F.json", - "sha256": "9fee54396635e6c33f09789397eb0f502e7b63d2685ed6150746b0a7f76a53d1" + "sha256": "238f288925755ab61ca5f1cbbf15ff913e898e7b49d452f1a6aa89e48b6d522e" }, "overlay": { "file": "data/games/frlg/maps/overlays/SilphCo_11F.json", @@ -5219,7 +5219,7 @@ { "name": "SilphCo_1F", "file": "data/games/frlg/maps/runtime/SilphCo_1F.json", - "sha256": "85b07612e7a5cda4a87e535ef9f8e9c61dea8d1d61a8c5126b05820a8c37582b", + "sha256": "cdb4137de21ec883db295af6a1f6de0ecf4dc5d977413f55d01217dc41f3a3ae", "source": { "decomp_file": "data/maps/SilphCo_1F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -5248,13 +5248,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SilphCo_1F.json", - "sha256": "85b07612e7a5cda4a87e535ef9f8e9c61dea8d1d61a8c5126b05820a8c37582b" + "sha256": "cdb4137de21ec883db295af6a1f6de0ecf4dc5d977413f55d01217dc41f3a3ae" } }, { "name": "SilphCo_2F", "file": "data/games/frlg/maps/runtime/SilphCo_2F.json", - "sha256": "12f7755b6e97b26dbe4a30c56bfa3f6487f42a6cc4a231d7363e5cbca9f7a6ab", + "sha256": "9cbe2229565769fa40a86987e906ce271778ec9332a5163ad513ff701168afc9", "source": { "decomp_file": "data/maps/SilphCo_2F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -5287,7 +5287,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SilphCo_2F.json", - "sha256": "c9ad714d2712433df60219eca8b64f55705149e1f974d16c69d4b60b4a931b62" + "sha256": "55e77011d5d01c4be980af91e415dcb59bedfad9775496f5334da4c2ebc15780" }, "overlay": { "file": "data/games/frlg/maps/overlays/SilphCo_2F.json", @@ -5297,7 +5297,7 @@ { "name": "SilphCo_3F", "file": "data/games/frlg/maps/runtime/SilphCo_3F.json", - "sha256": "05a9cf1d08436c1b4b45f9e23cbc89aa8eed582b03d3ca6ace4bf5a46558d528", + "sha256": "1f09280e287c49f1985cbd5648261740fccdd23a3b33a0f7fe69c2584e52bf1d", "source": { "decomp_file": "data/maps/SilphCo_3F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -5342,7 +5342,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SilphCo_3F.json", - "sha256": "95f0b3c4f997c7bafe4bd5b3c202f91d1772cd4c7b0b9fc9a249951c621b778a" + "sha256": "e1aafe0324e174936a16cbc166285d97db18379f4e60a6380ede64ee9fa37410" }, "overlay": { "file": "data/games/frlg/maps/overlays/SilphCo_3F.json", @@ -5352,7 +5352,7 @@ { "name": "SilphCo_4F", "file": "data/games/frlg/maps/runtime/SilphCo_4F.json", - "sha256": "5c9b346932ec49b595ddfba10fcddff922fccbd0433a206c2106cb34b4705787", + "sha256": "2796996cdb4e9b48f8c791c6be027afa9c82ff494fbf40af35f5f310ca54d032", "source": { "decomp_file": "data/maps/SilphCo_4F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -5397,7 +5397,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SilphCo_4F.json", - "sha256": "dcd6c2a9c2e5aa8dbe9ed3b31a016e0eb9a4b2271f1320b2210f65a048b4f7fc" + "sha256": "2cc91dd75cfc4569fd7f697114debacb31737e0859b5edb0b59affbeee92bfad" }, "overlay": { "file": "data/games/frlg/maps/overlays/SilphCo_4F.json", @@ -5407,7 +5407,7 @@ { "name": "SilphCo_5F", "file": "data/games/frlg/maps/runtime/SilphCo_5F.json", - "sha256": "d44c6fafc5779cea7425be540958eac7432152ec3bba44ccc5ec17d52600f6b4", + "sha256": "2022dbb6f9853a8bdba5a8215df05eb7e2dece5cde2bf93f8c1d655885921612", "source": { "decomp_file": "data/maps/SilphCo_5F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -5452,7 +5452,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SilphCo_5F.json", - "sha256": "ce43b0df2f2260a0348cdb3ce89d26ab01d0f88dd0d4eddb2e4c3f9373eedca3" + "sha256": "5f34bc093be14261cb3583270b90bcee1acb9387a7cdcc6498f71fea8a92e369" }, "overlay": { "file": "data/games/frlg/maps/overlays/SilphCo_5F.json", @@ -5462,7 +5462,7 @@ { "name": "SilphCo_6F", "file": "data/games/frlg/maps/runtime/SilphCo_6F.json", - "sha256": "4f0a73675051d9df87fe7e7986da15708ca17199ff974e6970fdac2bd1c87974", + "sha256": "d2c781d852b90154d31290b5cd9adcba198ca84138dcedb644ac9960a65eb9b6", "source": { "decomp_file": "data/maps/SilphCo_6F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -5507,7 +5507,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SilphCo_6F.json", - "sha256": "38350cca192cc3ceb6814aa5ebaedac3a9c96dee0f718521048ddfe59ac5e916" + "sha256": "4bb67b2d6118292944fb8f83f96c70846c332211cc3d0faf599b065a2b257471" }, "overlay": { "file": "data/games/frlg/maps/overlays/SilphCo_6F.json", @@ -5517,7 +5517,7 @@ { "name": "SilphCo_7F", "file": "data/games/frlg/maps/runtime/SilphCo_7F.json", - "sha256": "add2ebf8c19c13e7d1e216b635df68374bef32cf3434b2d47d15c9b0bcb58d36", + "sha256": "9324a7fa4036afbf60533a4ba296e545ce7e0dbc9b471b8ee7dd4bcc4728408b", "source": { "decomp_file": "data/maps/SilphCo_7F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -5562,7 +5562,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SilphCo_7F.json", - "sha256": "9a22e5dac1b0c36338c9ef60bce85951459ca732675e65bd120586d18d70c6a7" + "sha256": "4f0dad128ab080ea61e0add422531aae05e75b2613ecf950ee9df4dd82d715d9" }, "overlay": { "file": "data/games/frlg/maps/overlays/SilphCo_7F.json", @@ -5572,7 +5572,7 @@ { "name": "SilphCo_8F", "file": "data/games/frlg/maps/runtime/SilphCo_8F.json", - "sha256": "128ccec41d9637b0cf3c3bf097884335dfe5b9167e90978395de62c092036f89", + "sha256": "57a11c11ada293426b28b32b46116047c692bc7ce54973832787b67417f8c773", "source": { "decomp_file": "data/maps/SilphCo_8F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -5616,7 +5616,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SilphCo_8F.json", - "sha256": "c322f056980fa5ceaf08fde86bfd996529cdd1e6cbc45352ab3626d6105b6832" + "sha256": "d3510569b2f0070c84c90bf6c07414d758e8a50c8994affb05486e9585aacd71" }, "overlay": { "file": "data/games/frlg/maps/overlays/SilphCo_8F.json", @@ -5626,7 +5626,7 @@ { "name": "SilphCo_9F", "file": "data/games/frlg/maps/runtime/SilphCo_9F.json", - "sha256": "43ef692081d85e95ec17a0dc488f4b06791b03a25df2ea415c6d0647efd959c3", + "sha256": "dbcb284a4458512c025219e03908cc239ea4efa55660d1ba48948641a8832f94", "source": { "decomp_file": "data/maps/SilphCo_9F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -5658,7 +5658,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/SilphCo_9F.json", - "sha256": "a1c7f82b8839beaace4d0b242035b76fa6e63f5052d49cf9c5bd1a46fad7ad36" + "sha256": "d45c921bfd326ac5349be840ffdb3a7075ba928ad472e519b42df8c7e5e98ae8" }, "overlay": { "file": "data/games/frlg/maps/overlays/SilphCo_9F.json", @@ -5668,7 +5668,7 @@ { "name": "UndergroundPath_EastEntrance", "file": "data/games/frlg/maps/runtime/UndergroundPath_EastEntrance.json", - "sha256": "bb3a41f1bd2a3fa38669e70b37117f5845f99ff1fbb4c61bfbf4f10cee75214b", + "sha256": "d98fbc132d4344186854bc2337ff3ef77deb9a40bf63b76a4d103d49d97ce18c", "source": { "decomp_file": "data/maps/UndergroundPath_EastEntrance/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -5697,7 +5697,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/UndergroundPath_EastEntrance.json", - "sha256": "bb3a41f1bd2a3fa38669e70b37117f5845f99ff1fbb4c61bfbf4f10cee75214b" + "sha256": "d98fbc132d4344186854bc2337ff3ef77deb9a40bf63b76a4d103d49d97ce18c" } }, { @@ -5738,7 +5738,7 @@ { "name": "UndergroundPath_NorthEntrance", "file": "data/games/frlg/maps/runtime/UndergroundPath_NorthEntrance.json", - "sha256": "0f4af63db3f3071073f90153c66c411c770c256b04bb19f70800dd14a901fe08", + "sha256": "945be220abf7e0a0f110d999efc088d2b995cc6f1356166369e8f31fc73d9fba", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/UndergroundPath_NorthEntrance.json", "source": { "decomp_file": "data/maps/UndergroundPath_NorthEntrance/map.json", @@ -5773,7 +5773,7 @@ }, "base": { "file": "data/games/frlg/maps/base/UndergroundPath_NorthEntrance.json", - "sha256": "0f4af63db3f3071073f90153c66c411c770c256b04bb19f70800dd14a901fe08" + "sha256": "945be220abf7e0a0f110d999efc088d2b995cc6f1356166369e8f31fc73d9fba" } }, { @@ -5820,7 +5820,7 @@ { "name": "UndergroundPath_SouthEntrance", "file": "data/games/frlg/maps/runtime/UndergroundPath_SouthEntrance.json", - "sha256": "6bfe8cab934c0a05e0ca8d27aeabf9c06e5b4aac36c09da36c0c5efe480eb0a0", + "sha256": "d73f4caa9bba7e5705ad78b7ebdcfed1650ee56daea7ac66a4cab56af6780ffd", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/UndergroundPath_SouthEntrance.json", "source": { "decomp_file": "data/maps/UndergroundPath_SouthEntrance/map.json", @@ -5855,13 +5855,13 @@ }, "base": { "file": "data/games/frlg/maps/base/UndergroundPath_SouthEntrance.json", - "sha256": "6bfe8cab934c0a05e0ca8d27aeabf9c06e5b4aac36c09da36c0c5efe480eb0a0" + "sha256": "d73f4caa9bba7e5705ad78b7ebdcfed1650ee56daea7ac66a4cab56af6780ffd" } }, { "name": "UndergroundPath_WestEntrance", "file": "data/games/frlg/maps/runtime/UndergroundPath_WestEntrance.json", - "sha256": "abdd24732ddeac193cc0e4535cfed24bba604a5a12803976bd6e3b668703b973", + "sha256": "8be83bec719ed547d5c1dde39b21c0d16195e653a7b89a4ab687a8f6f685e318", "source": { "decomp_file": "data/maps/UndergroundPath_WestEntrance/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -5890,13 +5890,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/UndergroundPath_WestEntrance.json", - "sha256": "abdd24732ddeac193cc0e4535cfed24bba604a5a12803976bd6e3b668703b973" + "sha256": "8be83bec719ed547d5c1dde39b21c0d16195e653a7b89a4ab687a8f6f685e318" } }, { "name": "VermilionCity", "file": "data/games/frlg/maps/runtime/VermilionCity.json", - "sha256": "6a1ba2482cee579265508ff6f837fca8bea0fcfeba02e1ea9351b8a0bb58a077", + "sha256": "ce5fafc0ccd94c7c94238b4ea0be0b6ecaae8a258b12e9f4d5a68bf3c82dc0fe", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/VermilionCity.json", "source": { "decomp_file": "data/maps/VermilionCity/map.json", @@ -5930,13 +5930,13 @@ }, "base": { "file": "data/games/frlg/maps/base/VermilionCity.json", - "sha256": "6a1ba2482cee579265508ff6f837fca8bea0fcfeba02e1ea9351b8a0bb58a077" + "sha256": "ce5fafc0ccd94c7c94238b4ea0be0b6ecaae8a258b12e9f4d5a68bf3c82dc0fe" } }, { "name": "VermilionCity_Gym", "file": "data/games/frlg/maps/runtime/VermilionCity_Gym.json", - "sha256": "e117ce6e4c508bf60916e685c267f3448d575920240249642807e9ba2dae3ede", + "sha256": "4ccb0c661938fc9982efe61863867be6c1687f0263d4f8b7e7a64b97333ffe40", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/VermilionCity_Gym.json", "source": { "decomp_file": "data/maps/VermilionCity_Gym/map.json", @@ -5977,7 +5977,7 @@ }, "base": { "file": "data/games/frlg/maps/base/VermilionCity_Gym.json", - "sha256": "773c6d7b692ae9ea1026b6e626fdd10356ed19f8021b28dc610dd93398c3da6c" + "sha256": "dfa77ae396bcb85d6ea254ef31190266710894dc2a6c8b3bad02ad34f455c013" }, "overlay": { "file": "data/games/frlg/maps/overlays/VermilionCity_Gym.json", @@ -5987,7 +5987,7 @@ { "name": "VermilionCity_Mart", "file": "data/games/frlg/maps/runtime/VermilionCity_Mart.json", - "sha256": "b8ea7082ed1adb1b10167c1ff50a4af68457cbbc12340a072f54505f5ce49c46", + "sha256": "f6bfda5d81a8f3a2298b63582d6cae973fb5e004802414aa3c1a08c1777d911e", "source": { "decomp_file": "data/maps/VermilionCity_Mart/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -6016,13 +6016,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/VermilionCity_Mart.json", - "sha256": "b8ea7082ed1adb1b10167c1ff50a4af68457cbbc12340a072f54505f5ce49c46" + "sha256": "f6bfda5d81a8f3a2298b63582d6cae973fb5e004802414aa3c1a08c1777d911e" } }, { "name": "VermilionCity_PokemonCenter_1F", "file": "data/games/frlg/maps/runtime/VermilionCity_PokemonCenter_1F.json", - "sha256": "bbcf23517cc763cf39372eb56254828f789189ad8bdfc0c89cb717ef8239158c", + "sha256": "abb3271ca4a240b9deb34c8d32e25b7f2a6c51c35f44d998fb42b9030b6063a8", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/VermilionCity_PokemonCenter_1F.json", "source": { "decomp_file": "data/maps/VermilionCity_PokemonCenter_1F/map.json", @@ -6056,13 +6056,13 @@ }, "base": { "file": "data/games/frlg/maps/base/VermilionCity_PokemonCenter_1F.json", - "sha256": "bbcf23517cc763cf39372eb56254828f789189ad8bdfc0c89cb717ef8239158c" + "sha256": "abb3271ca4a240b9deb34c8d32e25b7f2a6c51c35f44d998fb42b9030b6063a8" } }, { "name": "VermilionCity_PokemonFanClub", "file": "data/games/frlg/maps/runtime/VermilionCity_PokemonFanClub.json", - "sha256": "01d5650bcff496a61c2f26710ec339ff4802afac16d7b66732b46933e9667bc4", + "sha256": "33e34d604154d913f4446a4d11d91ff41968034b45a830059ba129f61673d852", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/VermilionCity_PokemonFanClub.json", "source": { "decomp_file": "data/maps/VermilionCity_PokemonFanClub/map.json", @@ -6096,13 +6096,13 @@ }, "base": { "file": "data/games/frlg/maps/base/VermilionCity_PokemonFanClub.json", - "sha256": "01d5650bcff496a61c2f26710ec339ff4802afac16d7b66732b46933e9667bc4" + "sha256": "33e34d604154d913f4446a4d11d91ff41968034b45a830059ba129f61673d852" } }, { "name": "VictoryRoad_1F", "file": "data/games/frlg/maps/runtime/VictoryRoad_1F.json", - "sha256": "540d8b003c29f339956f3c0b5903dd4d49d05e8cd11adff7217bd3a28adeb3b6", + "sha256": "01e46def487a2ace21d7df416d05c0b5c1cfef001682601696faf0b1bcf38929", "source": { "decomp_file": "data/maps/VictoryRoad_1F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -6146,7 +6146,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/VictoryRoad_1F.json", - "sha256": "e7decdf2108ca0d369c3af30106b3932ff3eac268f56581d63180243444a3daa" + "sha256": "4e1385a2a1b16e59ae01589bd085408797460590a243bbad909d6b29248c4fab" }, "overlay": { "file": "data/games/frlg/maps/overlays/VictoryRoad_1F.json", @@ -6156,7 +6156,7 @@ { "name": "VictoryRoad_2F", "file": "data/games/frlg/maps/runtime/VictoryRoad_2F.json", - "sha256": "a8fea35e8a9c15a34aeee10604e42e711bcfb9f769636c18238f287d8b5cd565", + "sha256": "c20e27c8c61baa741c927e5d9cb3ce573b526b3111a1cc18c89aa8f6b53e3928", "source": { "decomp_file": "data/maps/VictoryRoad_2F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -6200,7 +6200,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/VictoryRoad_2F.json", - "sha256": "0ef4254d9ed8e2f6dab103ad5c00cc9eb4c8c9598f877b1534fc92bae8315195" + "sha256": "b3681942f38a5b159e1b7ccb6d861fecc3352be06a7ae17e20aaaf58d29d69ed" }, "overlay": { "file": "data/games/frlg/maps/overlays/VictoryRoad_2F.json", @@ -6210,7 +6210,7 @@ { "name": "VictoryRoad_3F", "file": "data/games/frlg/maps/runtime/VictoryRoad_3F.json", - "sha256": "a6235387c1e16954ddae4c2d24687533e207109a8cd7e9e57e6eaf09308a5ee4", + "sha256": "d30d19d811ba5e164e3a386da1541acb1ce80424460d357058573a1a7d2c2ddd", "source": { "decomp_file": "data/maps/VictoryRoad_3F/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -6254,7 +6254,7 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/VictoryRoad_3F.json", - "sha256": "83d34c7f44e48b2cca263aca95793e6a9bf9f649e2a02405098bcfe6f542b8b1" + "sha256": "847a5fdc7177baee817021d69eb839a1a42313baeee9cab8414105b13495a130" }, "overlay": { "file": "data/games/frlg/maps/overlays/VictoryRoad_3F.json", @@ -6264,7 +6264,7 @@ { "name": "ViridianCity", "file": "data/games/frlg/maps/runtime/ViridianCity.json", - "sha256": "c18f797d9fe5edf8fceb86f5e439778b44f78cf4397cd6b566f3ff7246c2d8cb", + "sha256": "e240e257f18373a0c47ad9aa5572e65c96bf479ea72258187d529abb1839eafc", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/ViridianCity.json", "source": { "decomp_file": "data/maps/ViridianCity/map.json", @@ -6310,13 +6310,13 @@ }, "base": { "file": "data/games/frlg/maps/base/ViridianCity.json", - "sha256": "c18f797d9fe5edf8fceb86f5e439778b44f78cf4397cd6b566f3ff7246c2d8cb" + "sha256": "e240e257f18373a0c47ad9aa5572e65c96bf479ea72258187d529abb1839eafc" } }, { "name": "ViridianCity_Gym", "file": "data/games/frlg/maps/runtime/ViridianCity_Gym.json", - "sha256": "339eb8ab2ebf2bc8e0504ebe8d4a3d0b391e937a2f9656b5e47e58132a0a97ba", + "sha256": "2f7b8ff87eef51bacc8fc0cfa1bc024c9ab46922f5909517468c362bcdaaa3b4", "source": { "decomp_file": "data/maps/ViridianCity_Gym/map.json", "revision": "ce6406d8c2eaf46d543c8a2606de0c3cb1951982", @@ -6345,13 +6345,13 @@ "status": "candidate", "base": { "file": "data/games/frlg/maps/base/ViridianCity_Gym.json", - "sha256": "339eb8ab2ebf2bc8e0504ebe8d4a3d0b391e937a2f9656b5e47e58132a0a97ba" + "sha256": "2f7b8ff87eef51bacc8fc0cfa1bc024c9ab46922f5909517468c362bcdaaa3b4" } }, { "name": "ViridianCity_Mart", "file": "data/games/frlg/maps/runtime/ViridianCity_Mart.json", - "sha256": "5e14587080521d433626347fa37024eb1ee36b4fe07a164e19e72714b1b755e8", + "sha256": "77c91e1cb5c3e6ff5441a01f732a1bb02bd572928e3dd2b17c6e9b57948803b9", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/ViridianCity_Mart.json", "source": { "decomp_file": "data/maps/ViridianCity_Mart/map.json", @@ -6386,13 +6386,13 @@ }, "base": { "file": "data/games/frlg/maps/base/ViridianCity_Mart.json", - "sha256": "5e14587080521d433626347fa37024eb1ee36b4fe07a164e19e72714b1b755e8" + "sha256": "77c91e1cb5c3e6ff5441a01f732a1bb02bd572928e3dd2b17c6e9b57948803b9" } }, { "name": "ViridianCity_PokemonCenter_1F", "file": "data/games/frlg/maps/runtime/ViridianCity_PokemonCenter_1F.json", - "sha256": "e5e5692ebb964cb14a7ab5049ef8bdc55354914491e4bdbc0a617ad119a7acbb", + "sha256": "eeb896e25559243221b9c85c9f3a947cdf31b140f9c716df47976be7d56fb1e3", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/ViridianCity_PokemonCenter_1F.json", "source": { "decomp_file": "data/maps/ViridianCity_PokemonCenter_1F/map.json", @@ -6426,13 +6426,13 @@ }, "base": { "file": "data/games/frlg/maps/base/ViridianCity_PokemonCenter_1F.json", - "sha256": "e5e5692ebb964cb14a7ab5049ef8bdc55354914491e4bdbc0a617ad119a7acbb" + "sha256": "eeb896e25559243221b9c85c9f3a947cdf31b140f9c716df47976be7d56fb1e3" } }, { "name": "ViridianForest", "file": "data/games/frlg/maps/runtime/ViridianForest.json", - "sha256": "6da82d435cb16fced6d5582e4be80f09a95ddf015487554835fdfddfeb9d1a03", + "sha256": "af6f100c0f20c84c0206d212e3ff9e8ae32dbced0171243d9a89b9c38b3b5812", "upstream_path": "SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/Maps/ViridianForest.json", "source": { "decomp_file": "data/maps/ViridianForest/map.json", @@ -6479,7 +6479,7 @@ }, "base": { "file": "data/games/frlg/maps/base/ViridianForest.json", - "sha256": "6da82d435cb16fced6d5582e4be80f09a95ddf015487554835fdfddfeb9d1a03" + "sha256": "af6f100c0f20c84c0206d212e3ff9e8ae32dbced0171243d9a89b9c38b3b5812" } } ] diff --git a/docs/maps/runtime-maps.md b/docs/maps/runtime-maps.md index 9004281..f9ac0ad 100644 --- a/docs/maps/runtime-maps.md +++ b/docs/maps/runtime-maps.md @@ -61,7 +61,7 @@ and navigation fields and preserves unknown extensions. | `points`, `regions` | Named `[x,y]` tiles and named lists of tiles. BDSP also encodes regions as numbered points. | | `warps` | `coord: [x,y]`, optional `enter` (default `walk_into`), paired `to_map,to_point` when resolved, optional `one_way: true` for a drop (a hole, tile `H`: the landing has no warp back; required on every warp on an `H` tile). | | `connections` | `side,to_map,offset` for connected map edges. | -| `npcs`, `items`, `signs`, `interactables` | Typed arrays of `name,coord` (identified pickups may derive `name` from `source_event` and default `quantity` to 1), optional facing, inclusive `wander` box (`min`, `max`), trainer sight/looks and hide flag. Section supplies kind; non-item interactions use `interactables` when enriched. | +| `npcs`, `items`, `signs`, `interactables` | Typed arrays of `name,coord` (identified pickups may derive `name` from `source_event` and default `quantity` to 1), optional facing, inclusive `wander` box (`min`, `max`: the tiles a person who wanders or walks on their own may stand on), `movement` (FRLG: the source `type` and `range`), trainer sight/looks and hide flag. Section supplies kind; non-item interactions use `interactables` when enriched. | | `triggers`, `flag_sets` | Named story trigger boxes/conditions; named sets of game flags. Preserve game semantics. | | `coord_events` | BDSP extension: named `coord,width,length,var,value,source` scene triggers. | | `gates`, `switches` | FRLG story barriers. `gates`: id -> `tiles`, `open_glyph` (`.` or `~`), `new_game` (`open`/`closed`) and what moves it: a Card Key door has `opens_by: card_key_face_a` and `flag`; a switch gate has `switch` (id in `switches`) and `open_when` (`on`/`off`). `switches`: id -> shared `flag`, `toggle`, `floors` (maps that share the state), `statues` (`coord`, `face_from`, `facing`). A Strength-button switch (Victory Road) has `toggle: false`, a `VAR_` as `flag`, `set_value`, `pressed_by: strength_boulder` and `buttons` (`coord`, tile `B`); `open_glyph` may also be `2/4/6/8`. See the FRLG map README. | diff --git a/schemas/runtime-map-v2.schema.json b/schemas/runtime-map-v2.schema.json index ff26590..9732926 100644 --- a/schemas/runtime-map-v2.schema.json +++ b/schemas/runtime-map-v2.schema.json @@ -33,6 +33,7 @@ "hide_flag": {"type": "string"}, "source_event": {"type": "integer", "minimum": 0, "maximum": 2147483647}, "wander": {"$ref": "#/$defs/wander"}, + "movement": {"$ref": "#/$defs/movement"}, "item": {"type": "string", "minLength": 1}, "quantity": {"type": "integer", "minimum": 1, "maximum": 9223372036854775807} }, @@ -253,6 +254,16 @@ "required": ["min", "max"], "additionalProperties": true }, + "movement": { + "description": "The source object event's movement type and its movement_range_x/y (pret map.json).", + "type": "object", + "properties": { + "type": {"type": "string", "minLength": 1}, + "range": {"type": "array", "items": {"type": "integer", "minimum": 0}, "minItems": 2, "maxItems": 2} + }, + "required": ["type"], + "additionalProperties": true + }, "npc": { "type": "object", "properties": { @@ -261,7 +272,8 @@ "facing": {"$ref": "#/$defs/direction"}, "hide_flag": {"type": "string"}, "source_event": {"type": "integer", "minimum": 0, "maximum": 2147483647}, - "wander": {"$ref": "#/$defs/wander"} + "wander": {"$ref": "#/$defs/wander"}, + "movement": {"$ref": "#/$defs/movement"} }, "required": ["coord", "name"], "additionalProperties": true, diff --git a/src/pokesim/maps/frlg_decomp_map_builder.py b/src/pokesim/maps/frlg_decomp_map_builder.py index 87e785d..a4b4f40 100644 --- a/src/pokesim/maps/frlg_decomp_map_builder.py +++ b/src/pokesim/maps/frlg_decomp_map_builder.py @@ -107,6 +107,9 @@ 'MB_POND_WATER', 'MB_FAST_WATER', 'MB_DEEP_WATER', 'MB_WATERFALL', 'MB_OCEAN_WATER', 'MB_UNUSED_WATER', 'MB_CYCLING_ROAD_WATER', 'MB_EASTWARD_CURRENT', 'MB_WESTWARD_CURRENT', 'MB_NORTHWARD_CURRENT', 'MB_SOUTHWARD_CURRENT'}) +# Tiles drawn as water: the surfable ones, and the seabed under them (Dive, +# which FRLG doesn't have). +WATER = SURFABLE_WATER | {'MB_UNDERWATER_BLOCKED_ABOVE'} # A metatile's encounter type (METATILE_ATTRIBUTE_ENCOUNTER_TYPE in # include/fieldmap.h): on a map with land encounters, a step onto a LAND # tile may start a wild battle, as on every floor tile of a cave. @@ -473,7 +476,7 @@ def tile_glyph(behavior, collision, unhandled, sign_event=False): return '.', WARP_ENTRIES[behavior] if behavior in TERRAIN: return TERRAIN[behavior], 'step_on' if behavior == 'MB_FALL_WARP' else None - if 'WATER' in behavior and behavior not in FLOOR: + if behavior in WATER: return 'w', None if behavior not in FLOOR: unhandled[behavior] = unhandled.get(behavior, 0) + 1 @@ -522,8 +525,6 @@ def grid(decomp, layout, names, unhandled, signs=frozenset(), land_encounters=Fa if unresolved is not None and unhandled.get(behavior, 0) > before: glyph = ' ' # Unknown cells are blocked by the shared movement model. unresolved.setdefault(behavior, []).append([x, y]) - if unresolved is not None and behavior in SURFABLE_WATER and not collision: - glyph = 'w' if land_encounters and entry is None: glyph = encounter_glyph(glyph, attributes) if wild_edge(glyph, attributes): @@ -537,14 +538,24 @@ def grid(decomp, layout, names, unhandled, signs=frozenset(), land_encounters=Fa return tiles, elevation, entries, wild_edges +# Movement types that walk on their own: wandering, walking back and forth +# and walking a sequence of directions all stay within initial +- range +# (IsCoordOutsideObjectEventMovementRange() in src/event_object_movement.c). +# The pairs move along one axis only. +MOVING = ('MOVEMENT_TYPE_WANDER_', 'MOVEMENT_TYPE_WALK_SEQUENCE_', 'MOVEMENT_TYPE_WALK_UP_AND_DOWN', + 'MOVEMENT_TYPE_WALK_DOWN_AND_UP', 'MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT', 'MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT') +VERTICAL = ('UP_AND_DOWN', 'DOWN_AND_UP') +HORIZONTAL = ('LEFT_AND_RIGHT', 'RIGHT_AND_LEFT') + + def wander_box(obj, tiles): - """The tiles a wandering person may stand on, kept inside the map, or None - if they stand still.""" + """The tiles a person who walks on their own may stand on, kept inside the + map, or None if they stand still.""" movement = obj.get('movement_type', '') - if 'WANDER' not in movement: + if not movement.startswith(MOVING): return None - x = 0 if 'UP_AND_DOWN' in movement else int(obj.get('movement_range_x') or 0) - y = 0 if 'LEFT_AND_RIGHT' in movement else int(obj.get('movement_range_y') or 0) + x = 0 if movement.endswith(VERTICAL) else int(obj.get('movement_range_x') or 0) + y = 0 if movement.endswith(HORIZONTAL) else int(obj.get('movement_range_y') or 0) if x == 0 and y == 0: return None return { @@ -594,6 +605,9 @@ def map_object(obj, tiles, event_index=None): if value is not None} if reference: data['source_event'] = reference + if obj.get('movement_type'): + data['movement'] = {'type': obj['movement_type'], + 'range': [int(obj.get('movement_range_x') or 0), int(obj.get('movement_range_y') or 0)]} box = wander_box(obj, tiles) if box: data['wander'] = box diff --git a/src/pokesim/maps/goldens/frlg-fan-club.json b/src/pokesim/maps/goldens/frlg-fan-club.json index 6dcf5f6..7ee8b56 100644 --- a/src/pokesim/maps/goldens/frlg-fan-club.json +++ b/src/pokesim/maps/goldens/frlg-fan-club.json @@ -2,7 +2,7 @@ "format": "pokesim-route-golden/1", "game": "frlg", "map": "VermilionCity_PokemonFanClub", - "map_sha256": "01d5650bcff496a61c2f26710ec339ff4802afac16d7b66732b46933e9667bc4", + "map_sha256": "33e34d604154d913f4446a4d11d91ff41968034b45a830059ba129f61673d852", "coordinate_frame": { "kind": "local tiles", "origin": [ diff --git a/src/pokesim/maps/goldens/frlg-pallet-town.json b/src/pokesim/maps/goldens/frlg-pallet-town.json index d1e7659..dec8a73 100644 --- a/src/pokesim/maps/goldens/frlg-pallet-town.json +++ b/src/pokesim/maps/goldens/frlg-pallet-town.json @@ -2,7 +2,7 @@ "format": "pokesim-route-golden/1", "game": "frlg", "map": "PalletTown", - "map_sha256": "92ebe424c07773ba087b8fc8d2b8251876dd3b97b9aea47a1fee8d36abd6ab0c", + "map_sha256": "b9cfbceeb2d3eb01fd794b6e291a13b3519c60ba4e6e4bd95814da448e18f7dc", "coordinate_frame": { "kind": "local tiles", "origin": [ diff --git a/src/pokesim/maps/test_frlg_decomp_map_builder.py b/src/pokesim/maps/test_frlg_decomp_map_builder.py index 3223648..41d1df5 100644 --- a/src/pokesim/maps/test_frlg_decomp_map_builder.py +++ b/src/pokesim/maps/test_frlg_decomp_map_builder.py @@ -41,6 +41,59 @@ def test_others_are_no_trainers(self): self.assertNotIn('facing', data) +class MovementTest(unittest.TestCase): + def test_every_object_keeps_its_movement_type_and_range(self): + data = frlg_maps.map_object(event(movement_range_x=4, movement_range_y=2), TILES) + self.assertEqual(data['movement'], {'type': 'MOVEMENT_TYPE_FACE_RIGHT', 'range': [4, 2]}) + + def test_a_walk_sequence_has_the_box_of_its_range(self): + # It walks each way until it leaves initial +- range (IsCoordOutsideObjectEventMovementRange()). + data = frlg_maps.map_object(event(movement_type='MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN', + movement_range_x=1, movement_range_y=2), TILES) + self.assertEqual(data['wander'], {'x0': 1, 'y0': 0, 'x1': 3, 'y1': 4}) + + def test_walking_back_and_forth_keeps_to_its_axis(self): + for movement, box in (('MOVEMENT_TYPE_WALK_UP_AND_DOWN', {'x0': 2, 'y0': 1, 'x1': 2, 'y1': 3}), + ('MOVEMENT_TYPE_WALK_DOWN_AND_UP', {'x0': 2, 'y0': 1, 'x1': 2, 'y1': 3}), + ('MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT', {'x0': 1, 'y0': 2, 'x1': 3, 'y1': 2}), + ('MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT', {'x0': 1, 'y0': 2, 'x1': 3, 'y1': 2})): + with self.subTest(movement=movement): + self.assertEqual(frlg_maps.map_object(event(movement_type=movement), TILES)['wander'], box) + + def test_people_who_stand_have_no_box(self): + for movement in ('MOVEMENT_TYPE_FACE_DOWN', 'MOVEMENT_TYPE_LOOK_AROUND', 'MOVEMENT_TYPE_WALK_IN_PLACE_DOWN'): + with self.subTest(movement=movement): + self.assertNotIn('wander', frlg_maps.map_object(event(movement_type=movement), TILES)) + + +class MovingPeopleInThePackTest(unittest.TestCase): + """Moving people in the published maps, from pret map.json.""" + def objects(self, name): + return load(ROOT / 'data/games/frlg/maps/runtime' / (name + '.json'))['objects'] + + def person(self, name, x, y): + [person] = [o for o in self.objects(name) if (o['x'], o['y']) == (x, y)] + return person + + def test_swimmer_spencer_walks_his_range(self): + # Object event 2: MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, range 4 x 2. + spencer = self.person('Route21_North', 12, 44) + self.assertEqual(spencer['wander'], {'x0': 8, 'y0': 42, 'x1': 16, 'y1': 46}) + self.assertEqual(spencer['movement'], {'type': 'MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN', 'range': [4, 2]}) + self.assertEqual(spencer['trainer']['sight'], 1) + + def test_cinnabar_woman_wanders_left_and_right(self): + woman = self.person('CinnabarIsland', 14, 6) + self.assertEqual(woman['wander'], {'x0': 13, 'y0': 6, 'x1': 15, 'y1': 6}) + self.assertEqual(woman['movement'], {'type': 'MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT', 'range': [1, 1]}) + + def test_a_trainer_who_faces_one_way_has_no_box(self): + lil = self.person('Route21_North', 14, 35) + self.assertNotIn('wander', lil) + self.assertEqual(lil['movement'], {'type': 'MOVEMENT_TYPE_FACE_DOWN', 'range': [1, 1]}) + self.assertEqual(lil['trainer'], {'sight': 1}) + + class DoorScriptTest(unittest.TestCase): SCRIPTS = ( 'EventScript_Close5FDoor1:: @ comment\n' @@ -350,6 +403,17 @@ def test_water_with_collision_is_a_rock(self): self.assertEqual(self.grid('MB_POND_WATER', 1, unresolved={}), ['#']) self.assertEqual(self.grid('MB_OCEAN_WATER', 1), ['#']) + def test_currents_are_water(self): + # Currents are surfable (sBehaviorSurfable), though their names don't say water. + for behavior in ('MB_EASTWARD_CURRENT', 'MB_WESTWARD_CURRENT', 'MB_NORTHWARD_CURRENT', 'MB_SOUTHWARD_CURRENT'): + with self.subTest(behavior=behavior): + self.assertEqual(self.grid(behavior, 0), ['w']) + + def test_only_listed_behaviors_are_water(self): + unhandled = {} + self.assertEqual(frlg_maps.tile_glyph('MB_NOT_REALLY_WATER', 0, unhandled), ('.', None)) + self.assertEqual(unhandled, {'MB_NOT_REALLY_WATER': 1}) + def test_shallow_water_is_walked_on(self): # MB_SHALLOW_WATER is not surfable (sBehaviorSurfable); the player walks on it. unresolved = {} diff --git a/src/pokesim/maps/test_runtime_map_publication.py b/src/pokesim/maps/test_runtime_map_publication.py index 575c18b..c0c0265 100644 --- a/src/pokesim/maps/test_runtime_map_publication.py +++ b/src/pokesim/maps/test_runtime_map_publication.py @@ -66,6 +66,19 @@ def undo_added_people(game, data): data['objects'] = [o for o in data.get('objects', []) if o['name'] not in names] +# Object movement published after the v1 baseline: every FRLG object's +# `movement` (pret movement_type and range), and the box of each person who +# walks on their own without wandering (walk sequences and back-and-forth +# walkers: Route21_North's swimmer Spencer, 12.03). Both are undone before digesting. +def undo_movement(game, data): + if game != 'frlg': + return + for obj in data.get('objects', []): + movement = obj.pop('movement', None) + if movement and not movement['type'].startswith('MOVEMENT_TYPE_WANDER_'): + obj.pop('wander', None) + + def undo_added_links(game, data): if (game, data['name']) not in ADDED_LINKS: return @@ -156,6 +169,7 @@ def test_all_published_values_match_reviewed_v1_baseline_and_stable_formatter(se undo_story_flags_and_wander(game, baseline_data) undo_added_links(game, baseline_data) undo_added_people(game, baseline_data) + undo_movement(game, baseline_data) digest = hashlib.sha256(json.dumps(compact_map(baseline_data), sort_keys=True).encode()).hexdigest() self.assertEqual(digest, baseline['games'][game][entry['name']]) if game != 'frlg': # FRLG runtime files are base + overlays in the contract format.