summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s2
-rw-r--r--data/map_events.s2
-rw-r--r--data/maps/BirthIsland_Exterior/map.json4
-rw-r--r--data/maps/BirthIsland_Exterior/scripts.inc2
-rw-r--r--data/maps/BirthIsland_Harbor/map.json4
-rw-r--r--data/maps/CeladonCity/map.json28
-rw-r--r--data/maps/CeladonCity_Condominiums_1F/map.json8
-rw-r--r--data/maps/CeladonCity_Condominiums_3F/map.json8
-rw-r--r--data/maps/CeladonCity_Condominiums_RoofRoom/map.json4
-rw-r--r--data/maps/CeladonCity_DepartmentStore_1F/map.json2
-rw-r--r--data/maps/CeladonCity_DepartmentStore_2F/map.json8
-rw-r--r--data/maps/CeladonCity_DepartmentStore_3F/map.json10
-rw-r--r--data/maps/CeladonCity_DepartmentStore_4F/map.json6
-rw-r--r--data/maps/CeladonCity_DepartmentStore_5F/map.json8
-rw-r--r--data/maps/CeladonCity_DepartmentStore_Roof/map.json4
-rw-r--r--data/maps/CeladonCity_GameCorner/map.json22
-rw-r--r--data/maps/CeladonCity_GameCorner_PrizeRoom/map.json10
-rw-r--r--data/maps/CeladonCity_Gym/map.json22
-rw-r--r--data/maps/CeladonCity_Hotel/map.json8
-rw-r--r--data/maps/CeladonCity_House1/map.json6
-rw-r--r--data/maps/CeladonCity_PokemonCenter_1F/map.json8
-rw-r--r--data/maps/CeladonCity_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/CeladonCity_Restaurant/map.json10
-rw-r--r--data/maps/CeruleanCave_1F/map.json18
-rw-r--r--data/maps/CeruleanCave_2F/map.json26
-rw-r--r--data/maps/CeruleanCave_B1F/map.json24
-rw-r--r--data/maps/CeruleanCity/map.json22
-rw-r--r--data/maps/CeruleanCity_BikeShop/map.json6
-rw-r--r--data/maps/CeruleanCity_Gym/map.json8
-rw-r--r--data/maps/CeruleanCity_House1/map.json2
-rw-r--r--data/maps/CeruleanCity_House2/map.json4
-rw-r--r--data/maps/CeruleanCity_House3/map.json4
-rw-r--r--data/maps/CeruleanCity_House4/map.json2
-rw-r--r--data/maps/CeruleanCity_House5/map.json2
-rw-r--r--data/maps/CeruleanCity_Mart/map.json6
-rw-r--r--data/maps/CeruleanCity_PokemonCenter_1F/map.json10
-rw-r--r--data/maps/CeruleanCity_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/CinnabarIsland/map.json8
-rw-r--r--data/maps/CinnabarIsland_Gym/map.json18
-rw-r--r--data/maps/CinnabarIsland_Mart/map.json6
-rw-r--r--data/maps/CinnabarIsland_PokemonCenter_1F/map.json10
-rw-r--r--data/maps/CinnabarIsland_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/CinnabarIsland_PokemonLab_Entrance/map.json2
-rw-r--r--data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json4
-rw-r--r--data/maps/CinnabarIsland_PokemonLab_Lounge/map.json6
-rw-r--r--data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json4
-rw-r--r--data/maps/DiglettsCave_NorthEntrance/map.json2
-rw-r--r--data/maps/DiglettsCave_SouthEntrance/map.json2
-rw-r--r--data/maps/FiveIsland/map.json4
-rw-r--r--data/maps/FiveIsland_Harbor/map.json4
-rw-r--r--data/maps/FiveIsland_House1/map.json2
-rw-r--r--data/maps/FiveIsland_House2/map.json2
-rw-r--r--data/maps/FiveIsland_LostCave_Room1/map.json2
-rw-r--r--data/maps/FiveIsland_LostCave_Room10/map.json4
-rw-r--r--data/maps/FiveIsland_LostCave_Room11/map.json2
-rw-r--r--data/maps/FiveIsland_LostCave_Room12/map.json2
-rw-r--r--data/maps/FiveIsland_LostCave_Room13/map.json2
-rw-r--r--data/maps/FiveIsland_LostCave_Room14/map.json2
-rw-r--r--data/maps/FiveIsland_LostCave_Room4/map.json2
-rw-r--r--data/maps/FiveIsland_Meadow/map.json14
-rw-r--r--data/maps/FiveIsland_MemorialPillar/map.json10
-rw-r--r--data/maps/FiveIsland_PokemonCenter_1F/map.json6
-rw-r--r--data/maps/FiveIsland_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/FiveIsland_ResortGorgeous/map.json16
-rw-r--r--data/maps/FiveIsland_ResortGorgeous_House/map.json4
-rw-r--r--data/maps/FiveIsland_RocketWarehouse/map.json20
-rw-r--r--data/maps/FiveIsland_WaterLabyrinth/map.json4
-rw-r--r--data/maps/FourIsland/map.json24
-rw-r--r--data/maps/FourIsland_Harbor/map.json4
-rw-r--r--data/maps/FourIsland_House1/map.json4
-rw-r--r--data/maps/FourIsland_House2/map.json2
-rw-r--r--data/maps/FourIsland_IcefallCave_1F/map.json4
-rw-r--r--data/maps/FourIsland_IcefallCave_B1F/map.json4
-rw-r--r--data/maps/FourIsland_IcefallCave_Back/map.json8
-rw-r--r--data/maps/FourIsland_LoreleisHouse/map.json30
-rw-r--r--data/maps/FourIsland_Mart/map.json6
-rw-r--r--data/maps/FourIsland_PokemonCenter_1F/map.json8
-rw-r--r--data/maps/FourIsland_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/FourIsland_PokemonDayCare/map.json2
-rw-r--r--data/maps/FuchsiaCity/map.json32
-rw-r--r--data/maps/FuchsiaCity/scripts.inc4
-rw-r--r--data/maps/FuchsiaCity_Building1/map.json6
-rw-r--r--data/maps/FuchsiaCity_Gym/map.json16
-rw-r--r--data/maps/FuchsiaCity_House1/map.json6
-rw-r--r--data/maps/FuchsiaCity_House2/map.json2
-rw-r--r--data/maps/FuchsiaCity_House3/map.json2
-rw-r--r--data/maps/FuchsiaCity_Mart/map.json6
-rw-r--r--data/maps/FuchsiaCity_PokemonCenter_1F/map.json8
-rw-r--r--data/maps/FuchsiaCity_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/FuchsiaCity_SafariZone_Entrance/map.json4
-rw-r--r--data/maps/FuchsiaCity_ZooBuilding/map.json8
-rw-r--r--data/maps/IndigoPlateau_Exterior/map.json4
-rw-r--r--data/maps/IndigoPlateau_PokemonCenter_1F/map.json12
-rw-r--r--data/maps/IndigoPlateau_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/LavenderTown/map.json6
-rw-r--r--data/maps/LavenderTown_House1/map.json4
-rw-r--r--data/maps/LavenderTown_House2/map.json2
-rw-r--r--data/maps/LavenderTown_Mart/map.json8
-rw-r--r--data/maps/LavenderTown_PokemonCenter_1F/map.json10
-rw-r--r--data/maps/LavenderTown_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/LavenderTown_VolunteerPokemonHouse/map.json12
-rw-r--r--data/maps/MtEmber_Exterior/map.json40
-rw-r--r--data/maps/MtEmber_RubyPath_1F/map.json10
-rw-r--r--data/maps/MtEmber_RubyPath_B1F/map.json8
-rw-r--r--data/maps/MtEmber_RubyPath_B1F_Stairs/map.json2
-rw-r--r--data/maps/MtEmber_RubyPath_B2F/map.json14
-rw-r--r--data/maps/MtEmber_RubyPath_B2F_Stairs/map.json4
-rw-r--r--data/maps/MtEmber_RubyPath_B3F/map.json20
-rw-r--r--data/maps/MtEmber_RubyPath_B5F/map.json2
-rw-r--r--data/maps/MtEmber_Summit/map.json10
-rw-r--r--data/maps/MtEmber_SummitPath_2F/map.json18
-rw-r--r--data/maps/MtMoon_1F/map.json28
-rw-r--r--data/maps/MtMoon_B2F/map.json22
-rw-r--r--data/maps/NavelRock_Base/map.json2
-rw-r--r--data/maps/NavelRock_Harbor/map.json4
-rw-r--r--data/maps/NavelRock_Summit/map.json2
-rw-r--r--data/maps/OneIsland/map.json6
-rw-r--r--data/maps/OneIsland_Harbor/map.json4
-rw-r--r--data/maps/OneIsland_House1/map.json4
-rw-r--r--data/maps/OneIsland_House2/map.json2
-rw-r--r--data/maps/OneIsland_KindleRoad/map.json58
-rw-r--r--data/maps/OneIsland_KindleRoad_EmberSpa/map.json12
-rw-r--r--data/maps/OneIsland_PokemonCenter_1F/map.json12
-rw-r--r--data/maps/OneIsland_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/OneIsland_TreasureBeach/map.json4
-rw-r--r--data/maps/PalletTown/map.json6
-rw-r--r--data/maps/PalletTown_GarysHouse/map.json4
-rw-r--r--data/maps/PalletTown_PlayersHouse_1F/map.json2
-rw-r--r--data/maps/PalletTown_ProfessorOaksLab/map.json20
-rw-r--r--data/maps/PewterCity/map.json14
-rw-r--r--data/maps/PewterCity_Gym/map.json6
-rw-r--r--data/maps/PewterCity_House1/map.json6
-rw-r--r--data/maps/PewterCity_House2/map.json4
-rw-r--r--data/maps/PewterCity_Mart/map.json6
-rw-r--r--data/maps/PewterCity_Museum_1F/map.json12
-rw-r--r--data/maps/PewterCity_Museum_2F/map.json10
-rw-r--r--data/maps/PewterCity_PokemonCenter_1F/map.json14
-rw-r--r--data/maps/PewterCity_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/PokemonLeague_AgathasRoom/map.json2
-rw-r--r--data/maps/PokemonLeague_BrunosRoom/map.json2
-rw-r--r--data/maps/PokemonLeague_ChampionsRoom/map.json4
-rw-r--r--data/maps/PokemonLeague_HallOfFame/map.json2
-rw-r--r--data/maps/PokemonLeague_LancesRoom/map.json2
-rw-r--r--data/maps/PokemonLeague_LoreleisRoom/map.json2
-rw-r--r--data/maps/PokemonMansion_1F/map.json10
-rw-r--r--data/maps/PokemonMansion_2F/map.json8
-rw-r--r--data/maps/PokemonMansion_3F/map.json8
-rw-r--r--data/maps/PokemonMansion_B1F/map.json12
-rw-r--r--data/maps/PokemonTower_1F/map.json10
-rw-r--r--data/maps/PokemonTower_2F/map.json4
-rw-r--r--data/maps/PokemonTower_3F/map.json8
-rw-r--r--data/maps/PokemonTower_4F/map.json12
-rw-r--r--data/maps/PokemonTower_5F/map.json14
-rw-r--r--data/maps/PokemonTower_6F/map.json10
-rw-r--r--data/maps/PokemonTower_7F/map.json8
-rw-r--r--data/maps/PowerPlant/map.json16
-rw-r--r--data/maps/RockTunnel_1F/map.json20
-rw-r--r--data/maps/RockTunnel_B1F/map.json52
-rw-r--r--data/maps/RocketHideout_B1F/map.json14
-rw-r--r--data/maps/RocketHideout_B2F/map.json10
-rw-r--r--data/maps/RocketHideout_B3F/map.json10
-rw-r--r--data/maps/RocketHideout_B4F/map.json18
-rw-r--r--data/maps/Route1/map.json4
-rw-r--r--data/maps/Route10/map.json20
-rw-r--r--data/maps/Route10_PokemonCenter_1F/map.json10
-rw-r--r--data/maps/Route10_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/Route11/map.json26
-rw-r--r--data/maps/Route11_EastEntrance_1F/map.json4
-rw-r--r--data/maps/Route11_EastEntrance_2F/map.json4
-rw-r--r--data/maps/Route12/map.json28
-rw-r--r--data/maps/Route12_FishingHouse/map.json2
-rw-r--r--data/maps/Route12_NorthEntrance_1F/map.json2
-rw-r--r--data/maps/Route12_NorthEntrance_2F/map.json2
-rw-r--r--data/maps/Route13/map.json22
-rw-r--r--data/maps/Route14/map.json30
-rw-r--r--data/maps/Route15/map.json26
-rw-r--r--data/maps/Route15_WestEntrance_1F/map.json2
-rw-r--r--data/maps/Route15_WestEntrance_2F/map.json2
-rw-r--r--data/maps/Route16/map.json20
-rw-r--r--data/maps/Route16_House/map.json4
-rw-r--r--data/maps/Route16_NorthEntrance_1F/map.json4
-rw-r--r--data/maps/Route16_NorthEntrance_2F/map.json6
-rw-r--r--data/maps/Route17/map.json20
-rw-r--r--data/maps/Route18/map.json6
-rw-r--r--data/maps/Route18_EastEntrance_1F/map.json2
-rw-r--r--data/maps/Route18_EastEntrance_2F/map.json2
-rw-r--r--data/maps/Route19/map.json24
-rw-r--r--data/maps/Route2/map.json12
-rw-r--r--data/maps/Route20/map.json22
-rw-r--r--data/maps/Route21_North/map.json10
-rw-r--r--data/maps/Route21_South/map.json10
-rw-r--r--data/maps/Route22/map.json2
-rw-r--r--data/maps/Route22_NorthEntrance/map.json2
-rw-r--r--data/maps/Route23/map.json14
-rw-r--r--data/maps/Route24/map.json16
-rw-r--r--data/maps/Route25/map.json26
-rw-r--r--data/maps/Route25_SeaCottage/map.json4
-rw-r--r--data/maps/Route2_EastBuilding/map.json4
-rw-r--r--data/maps/Route2_House/map.json4
-rw-r--r--data/maps/Route2_ViridianForest_NorthEntrance/map.json6
-rw-r--r--data/maps/Route2_ViridianForest_SouthEntrance/map.json4
-rw-r--r--data/maps/Route3/map.json18
-rw-r--r--data/maps/Route4/map.json12
-rw-r--r--data/maps/Route4_PokemonCenter_1F/map.json12
-rw-r--r--data/maps/Route4_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/Route5_PokemonDayCare/map.json2
-rw-r--r--data/maps/Route5_SouthEntrance/map.json2
-rw-r--r--data/maps/Route6/map.json12
-rw-r--r--data/maps/Route6_NorthEntrance/map.json2
-rw-r--r--data/maps/Route7_EastEntrance/map.json2
-rw-r--r--data/maps/Route8/map.json30
-rw-r--r--data/maps/Route8_WestEntrance/map.json2
-rw-r--r--data/maps/Route9/map.json24
-rw-r--r--data/maps/SSAnne_1F_Corridor/map.json4
-rw-r--r--data/maps/SSAnne_1F_Room1/map.json2
-rw-r--r--data/maps/SSAnne_1F_Room2/map.json8
-rw-r--r--data/maps/SSAnne_1F_Room3/map.json6
-rw-r--r--data/maps/SSAnne_1F_Room4/map.json2
-rw-r--r--data/maps/SSAnne_1F_Room5/map.json2
-rw-r--r--data/maps/SSAnne_1F_Room6/map.json2
-rw-r--r--data/maps/SSAnne_1F_Room7/map.json2
-rw-r--r--data/maps/SSAnne_2F_Corridor/map.json4
-rw-r--r--data/maps/SSAnne_2F_Room1/map.json2
-rw-r--r--data/maps/SSAnne_2F_Room2/map.json6
-rw-r--r--data/maps/SSAnne_2F_Room3/map.json4
-rw-r--r--data/maps/SSAnne_2F_Room4/map.json6
-rw-r--r--data/maps/SSAnne_2F_Room5/map.json4
-rw-r--r--data/maps/SSAnne_2F_Room6/map.json4
-rw-r--r--data/maps/SSAnne_3F_Corridor/map.json2
-rw-r--r--data/maps/SSAnne_B1F_Room1/map.json4
-rw-r--r--data/maps/SSAnne_B1F_Room2/map.json4
-rw-r--r--data/maps/SSAnne_B1F_Room3/map.json4
-rw-r--r--data/maps/SSAnne_B1F_Room4/map.json4
-rw-r--r--data/maps/SSAnne_B1F_Room5/map.json6
-rw-r--r--data/maps/SSAnne_CaptainsOffice/map.json2
-rw-r--r--data/maps/SSAnne_Deck/map.json10
-rw-r--r--data/maps/SSAnne_Exterior/map.json2
-rw-r--r--data/maps/SSAnne_Kitchen/map.json16
-rw-r--r--data/maps/SafariZone_Building1/map.json4
-rw-r--r--data/maps/SafariZone_Building2/map.json6
-rw-r--r--data/maps/SafariZone_Building3/map.json8
-rw-r--r--data/maps/SafariZone_Building4/map.json6
-rw-r--r--data/maps/SafariZone_Center/map.json2
-rw-r--r--data/maps/SafariZone_East/map.json8
-rw-r--r--data/maps/SafariZone_North/map.json6
-rw-r--r--data/maps/SafariZone_SecretHouse/map.json2
-rw-r--r--data/maps/SafariZone_West/map.json8
-rw-r--r--data/maps/SaffronCity/map.json30
-rw-r--r--data/maps/SaffronCity_Dojo/map.json14
-rw-r--r--data/maps/SaffronCity_Gym/map.json18
-rw-r--r--data/maps/SaffronCity_House1_1F/map.json6
-rw-r--r--data/maps/SaffronCity_House1_2F/map.json8
-rw-r--r--data/maps/SaffronCity_House2/map.json8
-rw-r--r--data/maps/SaffronCity_House3/map.json2
-rw-r--r--data/maps/SaffronCity_Mart/map.json6
-rw-r--r--data/maps/SaffronCity_PokemonCenter_1F/map.json8
-rw-r--r--data/maps/SaffronCity_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/SaffronCity_PokemonTrainerFanClub/map.json16
-rw-r--r--data/maps/SeafoamIslands_1F/map.json6
-rw-r--r--data/maps/SeafoamIslands_B1F/map.json8
-rw-r--r--data/maps/SeafoamIslands_B2F/map.json6
-rw-r--r--data/maps/SeafoamIslands_B3F/map.json12
-rw-r--r--data/maps/SeafoamIslands_B4F/map.json8
-rw-r--r--data/maps/SevenIsland/map.json6
-rw-r--r--data/maps/SevenIsland_Harbor/map.json4
-rw-r--r--data/maps/SevenIsland_House_Room1/map.json2
-rw-r--r--data/maps/SevenIsland_House_Room2/map.json2
-rw-r--r--data/maps/SevenIsland_Mart/map.json8
-rw-r--r--data/maps/SevenIsland_PokemonCenter_1F/map.json8
-rw-r--r--data/maps/SevenIsland_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/SevenIsland_SevaultCanyon/map.json40
-rw-r--r--data/maps/SevenIsland_SevaultCanyon_Entrance/map.json12
-rw-r--r--data/maps/SevenIsland_SevaultCanyon_House/map.json6
-rw-r--r--data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json14
-rw-r--r--data/maps/SevenIsland_TanobyRuins/map.json8
-rw-r--r--data/maps/SevenIsland_TrainerTower/map.json4
-rw-r--r--data/maps/SevenIsland_TrainerTower_1F/map.json10
-rw-r--r--data/maps/SevenIsland_TrainerTower_2F/map.json10
-rw-r--r--data/maps/SevenIsland_TrainerTower_3F/map.json10
-rw-r--r--data/maps/SevenIsland_TrainerTower_4F/map.json10
-rw-r--r--data/maps/SevenIsland_TrainerTower_5F/map.json10
-rw-r--r--data/maps/SevenIsland_TrainerTower_6F/map.json10
-rw-r--r--data/maps/SevenIsland_TrainerTower_7F/map.json10
-rw-r--r--data/maps/SevenIsland_TrainerTower_8F/map.json10
-rw-r--r--data/maps/SevenIsland_TrainerTower_Lobby/map.json10
-rw-r--r--data/maps/SevenIsland_TrainerTower_Roof/map.json2
-rw-r--r--data/maps/SilphCo_10F/map.json12
-rw-r--r--data/maps/SilphCo_11F/map.json12
-rw-r--r--data/maps/SilphCo_1F/map.json2
-rw-r--r--data/maps/SilphCo_2F/map.json10
-rw-r--r--data/maps/SilphCo_3F/map.json8
-rw-r--r--data/maps/SilphCo_4F/map.json16
-rw-r--r--data/maps/SilphCo_5F/map.json18
-rw-r--r--data/maps/SilphCo_6F/map.json20
-rw-r--r--data/maps/SilphCo_7F/map.json22
-rw-r--r--data/maps/SilphCo_8F/map.json12
-rw-r--r--data/maps/SilphCo_9F/map.json8
-rw-r--r--data/maps/SixIsland/map.json4
-rw-r--r--data/maps/SixIsland_DottedHole_SapphireRoom/map.json4
-rw-r--r--data/maps/SixIsland_GreenPath/map.json2
-rw-r--r--data/maps/SixIsland_Harbor/map.json4
-rw-r--r--data/maps/SixIsland_House/map.json2
-rw-r--r--data/maps/SixIsland_Mart/map.json6
-rw-r--r--data/maps/SixIsland_OutcastIsland/map.json14
-rw-r--r--data/maps/SixIsland_PatternBush/map.json24
-rw-r--r--data/maps/SixIsland_PokemonCenter_1F/map.json8
-rw-r--r--data/maps/SixIsland_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/SixIsland_RuinValley/map.json34
-rw-r--r--data/maps/SixIsland_WaterPath/map.json18
-rw-r--r--data/maps/SixIsland_WaterPath_House1/map.json2
-rw-r--r--data/maps/SixIsland_WaterPath_House2/map.json2
-rw-r--r--data/maps/ThreeIsland/map.json28
-rw-r--r--data/maps/ThreeIsland_BerryForest/map.json28
-rw-r--r--data/maps/ThreeIsland_BondBridge/map.json18
-rw-r--r--data/maps/ThreeIsland_DunsparceTunnel/map.json2
-rw-r--r--data/maps/ThreeIsland_Harbor/map.json4
-rw-r--r--data/maps/ThreeIsland_House1/map.json2
-rw-r--r--data/maps/ThreeIsland_House2/map.json4
-rw-r--r--data/maps/ThreeIsland_House3/map.json2
-rw-r--r--data/maps/ThreeIsland_House4/map.json4
-rw-r--r--data/maps/ThreeIsland_House5/map.json2
-rw-r--r--data/maps/ThreeIsland_Mart/map.json8
-rw-r--r--data/maps/ThreeIsland_PokemonCenter_1F/map.json8
-rw-r--r--data/maps/ThreeIsland_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/ThreeIsland_Port/map.json6
-rw-r--r--data/maps/TwoIsland/map.json18
-rw-r--r--data/maps/TwoIsland_CapeBrink_House/map.json2
-rw-r--r--data/maps/TwoIsland_Harbor/map.json4
-rw-r--r--data/maps/TwoIsland_House/map.json2
-rw-r--r--data/maps/TwoIsland_JoyfulGameCorner/map.json8
-rw-r--r--data/maps/TwoIsland_PokemonCenter_1F/map.json6
-rw-r--r--data/maps/TwoIsland_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/UndergroundPath_EastEntrance/map.json2
-rw-r--r--data/maps/UndergroundPath_NorthEntrance/map.json2
-rw-r--r--data/maps/UndergroundPath_SouthEntrance/map.json2
-rw-r--r--data/maps/UndergroundPath_WestEntrance/map.json2
-rw-r--r--data/maps/UnknownMap_00_00/map.json2
-rw-r--r--data/maps/UnknownMap_00_01/map.json2
-rw-r--r--data/maps/UnknownMap_00_02/map.json2
-rw-r--r--data/maps/UnknownMap_00_04/map.json18
-rw-r--r--data/maps/VermilionCity/map.json16
-rw-r--r--data/maps/VermilionCity_Gym/map.json10
-rw-r--r--data/maps/VermilionCity_House1/map.json2
-rw-r--r--data/maps/VermilionCity_House2/map.json2
-rw-r--r--data/maps/VermilionCity_House3/map.json8
-rw-r--r--data/maps/VermilionCity_Mart/map.json6
-rw-r--r--data/maps/VermilionCity_PokemonCenter_1F/map.json10
-rw-r--r--data/maps/VermilionCity_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/VermilionCity_PokemonFanClub/map.json12
-rw-r--r--data/maps/VictoryRoad_1F/map.json14
-rw-r--r--data/maps/VictoryRoad_2F/map.json26
-rw-r--r--data/maps/VictoryRoad_3F/map.json24
-rw-r--r--data/maps/ViridianCity/map.json18
-rw-r--r--data/maps/ViridianCity/scripts.inc6
-rw-r--r--data/maps/ViridianCity_Gym/map.json20
-rw-r--r--data/maps/ViridianCity_House1/map.json6
-rw-r--r--data/maps/ViridianCity_House2/map.json4
-rw-r--r--data/maps/ViridianCity_Mart/map.json6
-rw-r--r--data/maps/ViridianCity_PokemonCenter_1F/map.json8
-rw-r--r--data/maps/ViridianCity_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/ViridianForest/map.json22
361 files changed, 1628 insertions, 1628 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index c07f400a1..c2daa0031 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -12,7 +12,7 @@
#include "constants/spawn_points.h"
#include "constants/field_effects.h"
#include "constants/trainers.h"
-#include "constants/map_objects.h"
+#include "constants/object_events.h"
#include "constants/fame_checker.h"
#include "constants/seagallop.h"
#include "constants/game_stat.h"
diff --git a/data/map_events.s b/data/map_events.s
index a36cd149f..99b85e154 100644
--- a/data/map_events.s
+++ b/data/map_events.s
@@ -10,7 +10,7 @@
#include "constants/vars.h"
#include "constants/weather.h"
@#include "constants/trainer_hill.h"
-#include "constants/map_objects.h"
+#include "constants/object_events.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "constants/item_data_constants.inc"
diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json
index 8e78364f6..563f45333 100644
--- a/data/maps/BirthIsland_Exterior/map.json
+++ b/data/maps/BirthIsland_Exterior/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_METEORITE",
+ "graphics_id": "OBJECT_EVENT_GFX_METEORITE",
"x": 15,
"y": 12,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_0",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 15,
"y": 3,
"elevation": 3,
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index 0c20c59b8..0d7c001ee 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -10,7 +10,7 @@ BirthIsland_Exterior_MapScript3_165213:: @ 8165213
BirthIsland_Exterior_MapScript1_165217:: @ 8165217
setworldmapflag FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR
- setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_DEOXYS_N
+ setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_DEOXYS_N
setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0
setvar VAR_DEOXYS_INTERACTION_NUM, 0
checkflag FLAG_FOUGHT_DEOXYS
diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json
index eed07d984..f8c4be078 100644
--- a/data/maps/BirthIsland_Harbor/map.json
+++ b/data/maps/BirthIsland_Harbor/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
+ "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
"x": 8,
"y": 9,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 8,
"y": 6,
"elevation": 3,
diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json
index 0f323d993..d60b4da02 100644
--- a/data/maps/CeladonCity/map.json
+++ b/data/maps/CeladonCity/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 48,
"y": 15,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "FLAG_HIDE_CELADON_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
"x": 38,
"y": 14,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_POLIWRATH",
+ "graphics_id": "OBJECT_EVENT_GFX_POLIWRATH",
"x": 36,
"y": 14,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 11,
"y": 18,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 18,
"y": 22,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 30,
"y": 24,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
"x": 26,
"y": 19,
"elevation": 3,
@@ -116,7 +116,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 38,
"y": 31,
"elevation": 3,
@@ -129,7 +129,7 @@
"flag": "FLAG_HIDE_CELADON_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 9,
"y": 30,
"elevation": 3,
@@ -142,7 +142,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 52,
"y": 22,
"elevation": 3,
@@ -155,7 +155,7 @@
"flag": "FLAG_TEMP_14"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 40,
"y": 35,
"elevation": 0,
@@ -168,7 +168,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 25,
"y": 10,
"elevation": 3,
@@ -194,7 +194,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 5,
"y": 3,
"elevation": 3,
@@ -207,7 +207,7 @@
"flag": "FLAG_HIDE_CELADON_CITY_ETHER"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 47,
"y": 24,
"elevation": 3,
diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json
index eed6a38a6..b9d14c154 100644
--- a/data/maps/CeladonCity_Condominiums_1F/map.json
+++ b/data/maps/CeladonCity_Condominiums_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_MEOWTH",
+ "graphics_id": "OBJECT_EVENT_GFX_MEOWTH",
"x": 1,
"y": 9,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CLEFAIRY",
+ "graphics_id": "OBJECT_EVENT_GFX_CLEFAIRY",
"x": 5,
"y": 13,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_NIDORAN_F",
+ "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F",
"x": 5,
"y": 8,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
"x": 2,
"y": 9,
"elevation": 3,
diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json
index 41561f349..b468bf984 100644
--- a/data/maps/CeladonCity_Condominiums_3F/map.json
+++ b/data/maps/CeladonCity_Condominiums_3F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 0,
"y": 10,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 3,
"y": 8,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+ "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
"x": 4,
"y": 10,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
"x": 0,
"y": 13,
"elevation": 3,
diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
index b66f7bc8a..3b94da798 100644
--- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
+++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 3,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 7,
"y": 3,
"elevation": 0,
diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json
index f40f5c2fe..3db8fd602 100644
--- a/data/maps/CeladonCity_DepartmentStore_1F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
"x": 6,
"y": 10,
"elevation": 3,
diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json
index f5333e88a..566deb0a9 100644
--- a/data/maps/CeladonCity_DepartmentStore_2F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 5,
"y": 10,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 1,
"y": 8,
"elevation": 0,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 1,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 11,
"y": 6,
"elevation": 3,
diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json
index 3ac411820..c1cc95ac4 100644
--- a/data/maps/CeladonCity_DepartmentStore_3F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 10,
"y": 9,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GBA_KID",
+ "graphics_id": "OBJECT_EVENT_GFX_GBA_KID",
"x": 11,
"y": 6,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GBA_KID",
+ "graphics_id": "OBJECT_EVENT_GFX_GBA_KID",
"x": 4,
"y": 9,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GBA_KID",
+ "graphics_id": "OBJECT_EVENT_GFX_GBA_KID",
"x": 1,
"y": 9,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 9,
"y": 14,
"elevation": 3,
diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json
index e68119e01..8f13009f7 100644
--- a/data/maps/CeladonCity_DepartmentStore_4F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 6,
"y": 6,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 10,
"y": 11,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 3,
"y": 13,
"elevation": 0,
diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json
index 2c30cb8b5..4686cea40 100644
--- a/data/maps/CeladonCity_DepartmentStore_5F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 11,
"y": 6,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 6,
"y": 8,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 1,
"y": 7,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 1,
"y": 6,
"elevation": 3,
diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json
index 1d499c195..bde4fd50b 100644
--- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"x": 9,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 5,
"y": 4,
"elevation": 3,
diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json
index 31a03a047..3056f37d1 100644
--- a/data/maps/CeladonCity_GameCorner/map.json
+++ b/data/maps/CeladonCity_GameCorner/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
"x": 4,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 6,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 1,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 1,
"y": 8,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 4,
"y": 7,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GYM_GUY",
+ "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
"x": 7,
"y": 10,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 7,
"y": 8,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
"x": 10,
"y": 9,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 13,
"y": 7,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 16,
"y": 10,
"elevation": 3,
@@ -144,7 +144,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 11,
"y": 2,
"elevation": 3,
diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
index 658ec5bd4..15a8770af 100644
--- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
+++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 2,
"y": 6,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
"x": 6,
"y": 7,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 4,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 6,
"y": 2,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 2,
"y": 2,
"elevation": 3,
diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json
index 539f0cb0d..81b0a0954 100644
--- a/data/maps/CeladonCity_Gym/map.json
+++ b/data/maps/CeladonCity_Gym/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 3,
"y": 11,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+ "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
"x": 9,
"y": 10,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 10,
"y": 7,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+ "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
"x": 2,
"y": 6,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+ "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
"x": 5,
"y": 4,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 7,
"y": 4,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ERIKA",
+ "graphics_id": "OBJECT_EVENT_GFX_ERIKA",
"x": 6,
"y": 4,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
"x": 8,
"y": 7,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 6,
"y": 8,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 3,
"y": 5,
"elevation": 3,
@@ -144,7 +144,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 9,
"y": 6,
"elevation": 3,
diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json
index 4d1d99203..04c2602a4 100644
--- a/data/maps/CeladonCity_Hotel/map.json
+++ b/data/maps/CeladonCity_Hotel/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
"x": 5,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+ "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
"x": 3,
"y": 6,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 9,
"y": 7,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
"x": 2,
"y": 6,
"elevation": 3,
diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json
index ea37835d1..36ea4b0df 100644
--- a/data/maps/CeladonCity_House1/map.json
+++ b/data/maps/CeladonCity_House1/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
"x": 5,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 2,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 8,
"y": 4,
"elevation": 3,
diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json
index c29be0604..84b6c620c 100644
--- a/data/maps/CeladonCity_PokemonCenter_1F/map.json
+++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 4,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
"x": 10,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 12,
"y": 5,
"elevation": 3,
diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json
index e5bc26a2a..c0cac69eb 100644
--- a/data/maps/CeladonCity_PokemonCenter_2F/map.json
+++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json
index 1e96149ad..e64cc7298 100644
--- a/data/maps/CeladonCity_Restaurant/map.json
+++ b/data/maps/CeladonCity_Restaurant/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CHEF",
+ "graphics_id": "OBJECT_EVENT_GFX_CHEF",
"x": 12,
"y": 7,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 11,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
"x": 9,
"y": 4,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 1,
"y": 2,
"elevation": 0,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 3,
"y": 7,
"elevation": 0,
diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json
index a2373d45c..8914af7e7 100644
--- a/data/maps/CeruleanCave_1F/map.json
+++ b/data/maps/CeruleanCave_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 7,
"y": 3,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 11,
"y": 16,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 25,
"y": 5,
"elevation": 4,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 7,
"y": 21,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 13,
"y": 21,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 5,
"y": 20,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_TEMP_14"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 14,
"y": 20,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "FLAG_TEMP_15"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 11,
"y": 21,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "FLAG_TEMP_16"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 9,
"y": 18,
"elevation": 3,
diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json
index d52fa3da5..89438c4fb 100644
--- a/data/maps/CeruleanCave_2F/map.json
+++ b/data/maps/CeruleanCave_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 9,
"y": 18,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 29,
"y": 16,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 33,
"y": 12,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 33,
"y": 10,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 33,
"y": 9,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 25,
"y": 11,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_TEMP_14"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 28,
"y": 20,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "FLAG_TEMP_15"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 30,
"y": 20,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "FLAG_TEMP_16"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 9,
"y": 13,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "FLAG_TEMP_17"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 23,
"y": 16,
"elevation": 3,
@@ -144,7 +144,7 @@
"flag": "FLAG_TEMP_18"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 13,
"y": 6,
"elevation": 3,
@@ -157,7 +157,7 @@
"flag": "FLAG_TEMP_19"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 4,
"y": 12,
"elevation": 3,
@@ -170,7 +170,7 @@
"flag": "FLAG_TEMP_1A"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 10,
"y": 20,
"elevation": 3,
diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json
index 9f93a9557..87b278438 100644
--- a/data/maps/CeruleanCave_B1F/map.json
+++ b/data/maps/CeruleanCave_B1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 31,
"y": 9,
"elevation": 4,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 32,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE"
},
{
- "graphics_id": "MAP_OBJ_GFX_MEWTWO",
+ "graphics_id": "OBJECT_EVENT_GFX_MEWTWO",
"x": 7,
"y": 12,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_MEWTWO"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 37,
"y": 1,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 38,
"y": 2,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 35,
"y": 1,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_TEMP_14"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 37,
"y": 4,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "FLAG_TEMP_15"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 35,
"y": 5,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "FLAG_TEMP_16"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 2,
"y": 2,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "FLAG_TEMP_17"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 4,
"y": 1,
"elevation": 3,
@@ -144,7 +144,7 @@
"flag": "FLAG_TEMP_18"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 6,
"y": 1,
"elevation": 3,
@@ -157,7 +157,7 @@
"flag": "FLAG_TEMP_19"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 3,
"y": 4,
"elevation": 3,
diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json
index f3fcae4ab..87d7dd8bf 100644
--- a/data/maps/CeruleanCity/map.json
+++ b/data/maps/CeruleanCity/map.json
@@ -35,7 +35,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
"x": 31,
"y": 12,
"elevation": 3,
@@ -48,7 +48,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 33,
"y": 6,
"elevation": 3,
@@ -61,7 +61,7 @@
"flag": "FLAG_HIDE_CERULEAN_ROCKET"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
"x": 16,
"y": 21,
"elevation": 3,
@@ -74,7 +74,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 9,
"y": 23,
"elevation": 3,
@@ -87,7 +87,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SLOWBRO",
+ "graphics_id": "OBJECT_EVENT_GFX_SLOWBRO",
"x": 32,
"y": 29,
"elevation": 3,
@@ -100,7 +100,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 33,
"y": 29,
"elevation": 3,
@@ -113,7 +113,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 34,
"y": 22,
"elevation": 3,
@@ -126,7 +126,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLUE",
+ "graphics_id": "OBJECT_EVENT_GFX_BLUE",
"x": 22,
"y": 0,
"elevation": 3,
@@ -139,7 +139,7 @@
"flag": "FLAG_HIDE_CERULEAN_RIVAL"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 26,
"y": 32,
"elevation": 3,
@@ -165,7 +165,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 12,
"y": 30,
"elevation": 3,
@@ -178,7 +178,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"x": 1,
"y": 13,
"elevation": 3,
diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json
index 34b8b351a..0f3aec9c9 100644
--- a/data/maps/CeruleanCity_BikeShop/map.json
+++ b/data/maps/CeruleanCity_BikeShop/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 9,
"y": 3,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 9,
"y": 7,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 5,
"y": 5,
"elevation": 3,
diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json
index 6cf69cf3e..e707b7c3e 100644
--- a/data/maps/CeruleanCity_Gym/map.json
+++ b/data/maps/CeruleanCity_Gym/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
"x": 10,
"y": 12,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 4,
"y": 7,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MISTY",
+ "graphics_id": "OBJECT_EVENT_GFX_MISTY",
"x": 8,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GYM_GUY",
+ "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
"x": 7,
"y": 16,
"elevation": 3,
diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json
index 9326a9234..b2e5699ec 100644
--- a/data/maps/CeruleanCity_House1/map.json
+++ b/data/maps/CeruleanCity_House1/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 6,
"y": 5,
"elevation": 3,
diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json
index 44fcd2b45..aee9d5bbe 100644
--- a/data/maps/CeruleanCity_House2/map.json
+++ b/data/maps/CeruleanCity_House2/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 1,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 7,
"y": 6,
"elevation": 3,
diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json
index c1ce74bf3..8ada074dd 100644
--- a/data/maps/CeruleanCity_House3/map.json
+++ b/data/maps/CeruleanCity_House3/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 2,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
"x": 7,
"y": 5,
"elevation": 3,
diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json
index 13ef69f13..cfa2c4d36 100644
--- a/data/maps/CeruleanCity_House4/map.json
+++ b/data/maps/CeruleanCity_House4/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 5,
"y": 3,
"elevation": 3,
diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json
index 9feb1ced4..b1b38b2ff 100644
--- a/data/maps/CeruleanCity_House5/map.json
+++ b/data/maps/CeruleanCity_House5/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
"x": 7,
"y": 4,
"elevation": 3,
diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json
index 182e8ccf6..fcf185a81 100644
--- a/data/maps/CeruleanCity_Mart/map.json
+++ b/data/maps/CeruleanCity_Mart/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 2,
"y": 3,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 9,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 1,
"y": 7,
"elevation": 3,
diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json
index 85e02720a..976935818 100644
--- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json
+++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 12,
"y": 5,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 5,
"y": 4,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 4,
"y": 8,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 3,
"y": 3,
"elevation": 3,
diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json
index a5f191ced..e15dbda8e 100644
--- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json
+++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json
index f5ab2fb9f..ecc68bb6d 100644
--- a/data/maps/CinnabarIsland/map.json
+++ b/data/maps/CinnabarIsland/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 14,
"y": 6,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 11,
"y": 11,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BILL",
+ "graphics_id": "OBJECT_EVENT_GFX_BILL",
"x": 20,
"y": 7,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "FLAG_HIDE_CINNABAR_BILL"
},
{
- "graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
+ "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
"x": 23,
"y": 7,
"elevation": 1,
diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json
index f442fb26a..b67761ea8 100644
--- a/data/maps/CinnabarIsland_Gym/map.json
+++ b/data/maps/CinnabarIsland_Gym/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+ "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
"x": 25,
"y": 11,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 25,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 17,
"y": 5,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+ "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
"x": 16,
"y": 11,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 16,
"y": 18,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+ "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
"x": 4,
"y": 19,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 4,
"y": 11,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLAINE",
+ "graphics_id": "OBJECT_EVENT_GFX_BLAINE",
"x": 5,
"y": 4,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GYM_GUY",
+ "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
"x": 24,
"y": 20,
"elevation": 3,
diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json
index 59430b7ed..0febfbc73 100644
--- a/data/maps/CinnabarIsland_Mart/map.json
+++ b/data/maps/CinnabarIsland_Mart/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 2,
"y": 3,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 6,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 8,
"y": 2,
"elevation": 3,
diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json
index e45fcd735..7d2f4f416 100644
--- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json
+++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
"x": 2,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 9,
"y": 7,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 14,
"y": 6,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
- "graphics_id": "MAP_OBJ_GFX_BILL",
+ "graphics_id": "OBJECT_EVENT_GFX_BILL",
"x": 11,
"y": 5,
"elevation": 3,
diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json
index 527b4a67d..4bb297599 100644
--- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json
+++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json
index 1e35330d9..8db54fd38 100644
--- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json
+++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 2,
"y": 4,
"elevation": 3,
diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json
index a942a9ca8..fcc7c282d 100644
--- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json
+++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 11,
"y": 8,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 12,
"y": 3,
"elevation": 3,
diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json
index 6542e543c..1710cc88c 100644
--- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json
+++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 5,
"y": 3,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
"x": 4,
"y": 6,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 10,
"y": 5,
"elevation": 3,
diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
index 0402b218a..093cf61c7 100644
--- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
+++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+ "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
"x": 5,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 10,
"y": 3,
"elevation": 3,
diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json
index ac1360466..347f76e17 100644
--- a/data/maps/DiglettsCave_NorthEntrance/map.json
+++ b/data/maps/DiglettsCave_NorthEntrance/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 4,
"y": 4,
"elevation": 3,
diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json
index 9b1a1ce89..aef56bde7 100644
--- a/data/maps/DiglettsCave_SouthEntrance/map.json
+++ b/data/maps/DiglettsCave_SouthEntrance/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 4,
"y": 4,
"elevation": 3,
diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json
index ecb5fb9d9..fa6366c19 100644
--- a/data/maps/FiveIsland/map.json
+++ b/data/maps/FiveIsland/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 8,
"y": 5,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 16,
"y": 10,
"elevation": 3,
diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json
index d1220b637..fb35c7b47 100644
--- a/data/maps/FiveIsland_Harbor/map.json
+++ b/data/maps/FiveIsland_Harbor/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
+ "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
"x": 8,
"y": 9,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 8,
"y": 6,
"elevation": 3,
diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json
index 00af7faf1..9de0bb25c 100644
--- a/data/maps/FiveIsland_House1/map.json
+++ b/data/maps/FiveIsland_House1/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_3",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
"x": 10,
"y": 2,
"elevation": 3,
diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json
index b7e3229c8..c316f2bc6 100644
--- a/data/maps/FiveIsland_House2/map.json
+++ b/data/maps/FiveIsland_House2/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 2,
"y": 3,
"elevation": 3,
diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json
index 05d20f0d4..5f1389b26 100644
--- a/data/maps/FiveIsland_LostCave_Room1/map.json
+++ b/data/maps/FiveIsland_LostCave_Room1/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 5,
"y": 4,
"elevation": 3,
diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json
index 5626f8a64..606513822 100644
--- a/data/maps/FiveIsland_LostCave_Room10/map.json
+++ b/data/maps/FiveIsland_LostCave_Room10/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 5,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_LOST_CAVE_SELPHY"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 5,
"y": 2,
"elevation": 3,
diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json
index 82463cc38..52b658dcb 100644
--- a/data/maps/FiveIsland_LostCave_Room11/map.json
+++ b/data/maps/FiveIsland_LostCave_Room11/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 5,
"y": 5,
"elevation": 3,
diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json
index 6e3a0ffc7..09392a2ca 100644
--- a/data/maps/FiveIsland_LostCave_Room12/map.json
+++ b/data/maps/FiveIsland_LostCave_Room12/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 5,
"y": 5,
"elevation": 3,
diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json
index dc558c6b2..028c7cea6 100644
--- a/data/maps/FiveIsland_LostCave_Room13/map.json
+++ b/data/maps/FiveIsland_LostCave_Room13/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 5,
"y": 5,
"elevation": 3,
diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json
index 046685c55..f25b7ee72 100644
--- a/data/maps/FiveIsland_LostCave_Room14/map.json
+++ b/data/maps/FiveIsland_LostCave_Room14/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 5,
"y": 5,
"elevation": 3,
diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json
index 5a6782d59..24abad1d6 100644
--- a/data/maps/FiveIsland_LostCave_Room4/map.json
+++ b/data/maps/FiveIsland_LostCave_Room4/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 6,
"y": 4,
"elevation": 3,
diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json
index 1ac91ff3c..66ac71058 100644
--- a/data/maps/FiveIsland_Meadow/map.json
+++ b/data/maps/FiveIsland_Meadow/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_F",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F",
"x": 18,
"y": 18,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 17,
"y": 5,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 11,
"y": 27,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 8,
"y": 9,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 19,
"y": 12,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 12,
"y": 11,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_MAX_POTION"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 3,
"y": 22,
"elevation": 3,
diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json
index 33ee6f13c..2054a0159 100644
--- a/data/maps/FiveIsland_MemorialPillar/map.json
+++ b/data/maps/FiveIsland_MemorialPillar/map.json
@@ -20,7 +20,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 8,
"y": 44,
"elevation": 4,
@@ -33,7 +33,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 12,
"y": 6,
"elevation": 3,
@@ -46,7 +46,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 14,
"y": 17,
"elevation": 3,
@@ -59,7 +59,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 17,
"y": 31,
"elevation": 3,
@@ -72,7 +72,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 4,
"y": 47,
"elevation": 3,
diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json
index 053a14a62..82c5e2a44 100644
--- a/data/maps/FiveIsland_PokemonCenter_1F/map.json
+++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
"x": 9,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHEF",
+ "graphics_id": "OBJECT_EVENT_GFX_CHEF",
"x": 4,
"y": 8,
"elevation": 3,
diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json
index 8a64b44fa..dc97dcdc3 100644
--- a/data/maps/FiveIsland_PokemonCenter_2F/map.json
+++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json
index ba96caa5a..dba3d3d21 100644
--- a/data/maps/FiveIsland_ResortGorgeous/map.json
+++ b/data/maps/FiveIsland_ResortGorgeous/map.json
@@ -20,7 +20,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 44,
"y": 10,
"elevation": 3,
@@ -33,7 +33,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 33,
"y": 12,
"elevation": 3,
@@ -46,7 +46,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 12,
"y": 10,
"elevation": 3,
@@ -59,7 +59,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 23,
"y": 9,
"elevation": 3,
@@ -72,7 +72,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 33,
"y": 8,
"elevation": 3,
@@ -85,7 +85,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 33,
"y": 3,
"elevation": 3,
@@ -98,7 +98,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
"x": 56,
"y": 7,
"elevation": 1,
@@ -111,7 +111,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 39,
"y": 9,
"elevation": 3,
diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json
index cb950d16f..570c291b4 100644
--- a/data/maps/FiveIsland_ResortGorgeous_House/map.json
+++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 4,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY"
},
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 6,
"y": 2,
"elevation": 3,
diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json
index 7ac00f1cc..a89fe7b45 100644
--- a/data/maps/FiveIsland_RocketWarehouse/map.json
+++ b/data/maps/FiveIsland_RocketWarehouse/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 15,
"y": 11,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 17,
"y": 15,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_F",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F",
"x": 27,
"y": 16,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 25,
"y": 11,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_F",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F",
"x": 6,
"y": 6,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 27,
"y": 4,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 8,
"y": 25,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_BIG_PEARL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 17,
"y": 3,
"elevation": 0,
@@ -118,7 +118,7 @@
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_TM36"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 1,
"y": 16,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_PEARL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 4,
"y": 5,
"elevation": 3,
diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json
index e9f0eb16a..0dc66d822 100644
--- a/data/maps/FiveIsland_WaterLabyrinth/map.json
+++ b/data/maps/FiveIsland_WaterLabyrinth/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 14,
"y": 11,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 9,
"y": 7,
"elevation": 3,
diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json
index 54e4e9849..0e7b31ad7 100644
--- a/data/maps/FourIsland/map.json
+++ b/data/maps/FourIsland/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 16,
"y": 13,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_DODUO",
+ "graphics_id": "OBJECT_EVENT_GFX_DODUO",
"x": 12,
"y": 9,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_NIDORAN_F",
+ "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F",
"x": 13,
"y": 7,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_NIDORAN_M",
+ "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M",
"x": 14,
"y": 7,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PSYDUCK",
+ "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK",
"x": 17,
"y": 9,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
"x": 26,
"y": 19,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 5,
"y": 11,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 5,
"y": 6,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "FLAG_HIDE_FOUR_ISLAND_STAR_PIECE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 32,
"y": 19,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "FLAG_HIDE_FOUR_ISLAND_STARDUST"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLUE",
+ "graphics_id": "OBJECT_EVENT_GFX_BLUE",
"x": 8,
"y": 25,
"elevation": 3,
@@ -144,7 +144,7 @@
"flag": "FLAG_HIDE_FOUR_ISLAND_RIVAL"
},
{
- "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
"x": 36,
"y": 13,
"elevation": 3,
@@ -157,7 +157,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 31,
"y": 21,
"elevation": 3,
diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json
index 5b550da70..0b3ede231 100644
--- a/data/maps/FourIsland_Harbor/map.json
+++ b/data/maps/FourIsland_Harbor/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
+ "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
"x": 8,
"y": 9,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 8,
"y": 6,
"elevation": 3,
diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json
index c47859aff..0fd639d54 100644
--- a/data/maps/FourIsland_House1/map.json
+++ b/data/maps/FourIsland_House1/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
"x": 8,
"y": 3,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
"x": 9,
"y": 3,
"elevation": 3,
diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json
index a11437ab1..f9ef214bb 100644
--- a/data/maps/FourIsland_House2/map.json
+++ b/data/maps/FourIsland_House2/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 4,
"y": 4,
"elevation": 3,
diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json
index 995ac7728..575294c84 100644
--- a/data/maps/FourIsland_IcefallCave_1F/map.json
+++ b/data/maps/FourIsland_IcefallCave_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 11,
"y": 7,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_ULTRA_BALL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 12,
"y": 16,
"elevation": 3,
diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json
index 0fbf41a57..c6b9e866e 100644
--- a/data/maps/FourIsland_IcefallCave_B1F/map.json
+++ b/data/maps/FourIsland_IcefallCave_B1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 10,
"y": 14,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_FULL_RESTORE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 21,
"y": 7,
"elevation": 3,
diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json
index 12e4daece..ade705c51 100644
--- a/data/maps/FourIsland_IcefallCave_Back/map.json
+++ b/data/maps/FourIsland_IcefallCave_Back/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 11,
"y": 14,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 13,
"y": 14,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_LORELEI",
+ "graphics_id": "OBJECT_EVENT_GFX_LORELEI",
"x": 12,
"y": 16,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 10,
"y": 15,
"elevation": 3,
diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json
index b40738201..553467495 100644
--- a/data/maps/FourIsland_LoreleisHouse/map.json
+++ b/data/maps/FourIsland_LoreleisHouse/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LORELEI",
+ "graphics_id": "OBJECT_EVENT_GFX_LORELEI",
"x": 7,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_LORELEI_IN_HER_HOUSE"
},
{
- "graphics_id": "MAP_OBJ_GFX_WIGGLYTUFF",
+ "graphics_id": "OBJECT_EVENT_GFX_WIGGLYTUFF",
"x": 0,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SEEL",
+ "graphics_id": "OBJECT_EVENT_GFX_SEEL",
"x": 10,
"y": 3,
"elevation": 0,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PIKACHU",
+ "graphics_id": "OBJECT_EVENT_GFX_PIKACHU",
"x": 9,
"y": 3,
"elevation": 0,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SLOWPOKE",
+ "graphics_id": "OBJECT_EVENT_GFX_SLOWPOKE",
"x": 7,
"y": 2,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SLOWBRO",
+ "graphics_id": "OBJECT_EVENT_GFX_SLOWBRO",
"x": 6,
"y": 2,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PSYDUCK",
+ "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK",
"x": 6,
"y": 4,
"elevation": 0,
@@ -105,7 +105,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MEOWTH",
+ "graphics_id": "OBJECT_EVENT_GFX_MEOWTH",
"x": 9,
"y": 4,
"elevation": 0,
@@ -118,7 +118,7 @@
"flag": "FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHANSEY",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANSEY",
"x": 10,
"y": 4,
"elevation": 0,
@@ -131,7 +131,7 @@
"flag": "FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL"
},
{
- "graphics_id": "MAP_OBJ_GFX_JIGGLYPUFF",
+ "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF",
"x": 0,
"y": 3,
"elevation": 3,
@@ -144,7 +144,7 @@
"flag": "FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL"
},
{
- "graphics_id": "MAP_OBJ_GFX_NIDORAN_F",
+ "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F",
"x": 0,
"y": 5,
"elevation": 3,
@@ -157,7 +157,7 @@
"flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL"
},
{
- "graphics_id": "MAP_OBJ_GFX_NIDORAN_M",
+ "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M",
"x": 1,
"y": 5,
"elevation": 3,
@@ -170,7 +170,7 @@
"flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL"
},
{
- "graphics_id": "MAP_OBJ_GFX_PIDGEOT",
+ "graphics_id": "OBJECT_EVENT_GFX_PIDGEOT",
"x": 9,
"y": 0,
"elevation": 3,
@@ -183,7 +183,7 @@
"flag": "FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL"
},
{
- "graphics_id": "MAP_OBJ_GFX_FEAROW",
+ "graphics_id": "OBJECT_EVENT_GFX_FEAROW",
"x": 10,
"y": 0,
"elevation": 3,
@@ -196,7 +196,7 @@
"flag": "FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL"
},
{
- "graphics_id": "MAP_OBJ_GFX_LAPRAS_DOLL",
+ "graphics_id": "OBJECT_EVENT_GFX_LAPRAS_DOLL",
"x": 9,
"y": 6,
"elevation": 3,
diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json
index 5b9164382..11985d6a9 100644
--- a/data/maps/FourIsland_Mart/map.json
+++ b/data/maps/FourIsland_Mart/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 2,
"y": 3,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 6,
"y": 5,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CAMPER",
+ "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
"x": 8,
"y": 3,
"elevation": 3,
diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json
index f6db941e8..c41dd4742 100644
--- a/data/maps/FourIsland_PokemonCenter_1F/map.json
+++ b/data/maps/FourIsland_PokemonCenter_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 10,
"y": 6,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_3",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
"x": 5,
"y": 5,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 2,
"y": 2,
"elevation": 3,
diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json
index dbb6bb145..332a0efa7 100644
--- a/data/maps/FourIsland_PokemonCenter_2F/map.json
+++ b/data/maps/FourIsland_PokemonCenter_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json
index be2f8dc9d..27f280e43 100644
--- a/data/maps/FourIsland_PokemonDayCare/map.json
+++ b/data/maps/FourIsland_PokemonDayCare/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
"x": 2,
"y": 2,
"elevation": 3,
diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json
index 9b484daec..6c4b76320 100644
--- a/data/maps/FuchsiaCity/map.json
+++ b/data/maps/FuchsiaCity/map.json
@@ -30,7 +30,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
"x": 37,
"y": 17,
"elevation": 3,
@@ -43,7 +43,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SLOWPOKE",
+ "graphics_id": "OBJECT_EVENT_GFX_SLOWPOKE",
"x": 36,
"y": 15,
"elevation": 3,
@@ -56,7 +56,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_VOLTORB",
+ "graphics_id": "OBJECT_EVENT_GFX_VOLTORB",
"x": 33,
"y": 8,
"elevation": 3,
@@ -69,7 +69,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 33,
"y": 11,
"elevation": 3,
@@ -82,7 +82,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHANSEY",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANSEY",
"x": 39,
"y": 8,
"elevation": 3,
@@ -95,7 +95,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
"x": 14,
"y": 15,
"elevation": 3,
@@ -108,7 +108,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LAPRAS",
+ "graphics_id": "OBJECT_EVENT_GFX_LAPRAS",
"x": 12,
"y": 20,
"elevation": 1,
@@ -121,7 +121,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 36,
"y": 20,
"elevation": 3,
@@ -134,7 +134,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_0",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 8,
"y": 8,
"elevation": 1,
@@ -147,7 +147,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_KANGASKHAN",
+ "graphics_id": "OBJECT_EVENT_GFX_KANGASKHAN",
"x": 16,
"y": 9,
"elevation": 3,
@@ -160,7 +160,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 30,
"y": 10,
"elevation": 3,
@@ -173,7 +173,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 21,
"y": 13,
"elevation": 3,
@@ -186,7 +186,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 32,
"y": 16,
"elevation": 3,
@@ -199,7 +199,7 @@
"flag": "FLAG_TEMP_14"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 24,
"y": 22,
"elevation": 3,
@@ -212,7 +212,7 @@
"flag": "FLAG_TEMP_15"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 15,
"y": 11,
"elevation": 3,
@@ -225,7 +225,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 40,
"y": 6,
"elevation": 3,
diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc
index ea921b4d1..f66cf33e6 100644
--- a/data/maps/FuchsiaCity/scripts.inc
+++ b/data/maps/FuchsiaCity/scripts.inc
@@ -11,11 +11,11 @@ FuchsiaCity_MapScript1_166D7B:: @ 8166D7B
end
EventScript_166D91:: @ 8166D91
- setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_OMANYTE
+ setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OMANYTE
return
EventScript_166D97:: @ 8166D97
- setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_KABUTO
+ setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_KABUTO
return
FuchsiaCity_EventScript_166D9D:: @ 8166D9D
diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json
index 7fbd2870c..8b91a19fa 100644
--- a/data/maps/FuchsiaCity_Building1/map.json
+++ b/data/maps/FuchsiaCity_Building1/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
"x": 3,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 11,
"y": 6,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 11,
"y": 5,
"elevation": 3,
diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json
index 4ee96a265..cacf8a3ab 100644
--- a/data/maps/FuchsiaCity_Gym/map.json
+++ b/data/maps/FuchsiaCity_Gym/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 12,
"y": 16,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 2,
"y": 9,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 11,
"y": 11,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 13,
"y": 4,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 4,
"y": 6,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 2,
"y": 16,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_KOGA",
+ "graphics_id": "OBJECT_EVENT_GFX_KOGA",
"x": 7,
"y": 13,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GYM_GUY",
+ "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
"x": 11,
"y": 19,
"elevation": 3,
diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json
index a0b11d62e..d9cb2b507 100644
--- a/data/maps/FuchsiaCity_House1/map.json
+++ b/data/maps/FuchsiaCity_House1/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 7,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 1,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
"x": 2,
"y": 5,
"elevation": 3,
diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json
index 2f57e17fb..a3619a5ef 100644
--- a/data/maps/FuchsiaCity_House2/map.json
+++ b/data/maps/FuchsiaCity_House2/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 6,
"y": 5,
"elevation": 3,
diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json
index 4e47edc91..2c5f0837a 100644
--- a/data/maps/FuchsiaCity_House3/map.json
+++ b/data/maps/FuchsiaCity_House3/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 4,
"y": 4,
"elevation": 3,
diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json
index d8da727b1..357b824d5 100644
--- a/data/maps/FuchsiaCity_Mart/map.json
+++ b/data/maps/FuchsiaCity_Mart/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 2,
"y": 3,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 6,
"y": 3,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
"x": 9,
"y": 5,
"elevation": 3,
diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json
index 6246ddfb2..8684bc17e 100644
--- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json
+++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 12,
"y": 5,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
"x": 13,
"y": 3,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 4,
"y": 8,
"elevation": 3,
diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json
index c54ed2085..6e82de7a9 100644
--- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json
+++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json
index d0451f0aa..13f4ee261 100644
--- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json
+++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 7,
"y": 3,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 1,
"y": 6,
"elevation": 3,
diff --git a/data/maps/FuchsiaCity_ZooBuilding/map.json b/data/maps/FuchsiaCity_ZooBuilding/map.json
index 42e36142c..499deb4c9 100644
--- a/data/maps/FuchsiaCity_ZooBuilding/map.json
+++ b/data/maps/FuchsiaCity_ZooBuilding/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 2,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 12,
"y": 3,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 6,
"y": 4,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 10,
"y": 8,
"elevation": 3,
diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json
index 9a4761ba7..314a75275 100644
--- a/data/maps/IndigoPlateau_Exterior/map.json
+++ b/data/maps/IndigoPlateau_Exterior/map.json
@@ -20,7 +20,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BLUE",
+ "graphics_id": "OBJECT_EVENT_GFX_BLUE",
"x": 11,
"y": 6,
"elevation": 0,
@@ -33,7 +33,7 @@
"flag": "FLAG_HIDE_CREDITS_RIVAL"
},
{
- "graphics_id": "MAP_OBJ_GFX_PROF_OAK",
+ "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK",
"x": 11,
"y": 6,
"elevation": 0,
diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
index f86588559..4bc3abec2 100644
--- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
+++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 0,
"y": 7,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 13,
"y": 10,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GYM_GUY",
+ "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
"x": 7,
"y": 14,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
"x": 5,
"y": 3,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 23,
"y": 13,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"x": 16,
"y": 15,
"elevation": 3,
diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json
index 7da5e0706..81a413874 100644
--- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json
+++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json
index ff8bd94a4..cac78d8e1 100644
--- a/data/maps/LavenderTown/map.json
+++ b/data/maps/LavenderTown/map.json
@@ -30,7 +30,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 19,
"y": 10,
"elevation": 3,
@@ -43,7 +43,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 12,
"y": 12,
"elevation": 3,
@@ -56,7 +56,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 10,
"y": 7,
"elevation": 3,
diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json
index 8cd810223..e026daa1a 100644
--- a/data/maps/LavenderTown_House1/map.json
+++ b/data/maps/LavenderTown_House1/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
"x": 4,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUBONE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUBONE",
"x": 8,
"y": 6,
"elevation": 3,
diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json
index 5d754bc7c..109ea9cde 100644
--- a/data/maps/LavenderTown_House2/map.json
+++ b/data/maps/LavenderTown_House2/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 4,
"y": 4,
"elevation": 3,
diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json
index fab6c58ac..cccd65956 100644
--- a/data/maps/LavenderTown_Mart/map.json
+++ b/data/maps/LavenderTown_Mart/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 2,
"y": 3,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 6,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 9,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 9,
"y": 5,
"elevation": 3,
diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json
index 3c3062b4b..c8aef2900 100644
--- a/data/maps/LavenderTown_PokemonCenter_1F/map.json
+++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 9,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 5,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 2,
"y": 2,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 14,
"y": 6,
"elevation": 3,
diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json
index c99020e41..1880c2425 100644
--- a/data/maps/LavenderTown_PokemonCenter_2F/map.json
+++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json
index 617fae94b..95890a431 100644
--- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json
+++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_MR_FUJI",
+ "graphics_id": "OBJECT_EVENT_GFX_MR_FUJI",
"x": 3,
"y": 3,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_POKEHOUSE_FUJI"
},
{
- "graphics_id": "MAP_OBJ_GFX_NIDORINO",
+ "graphics_id": "OBJECT_EVENT_GFX_NIDORINO",
"x": 1,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PSYDUCK",
+ "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK",
"x": 9,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
"x": 9,
"y": 5,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 3,
"y": 5,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 7,
"y": 2,
"elevation": 3,
diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json
index 1b6927eb8..45fcd4703 100644
--- a/data/maps/MtEmber_Exterior/map.json
+++ b/data/maps/MtEmber_Exterior/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 29,
"y": 45,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 41,
"y": 40,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 42,
"y": 40,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
"x": 22,
"y": 35,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CAMPER",
+ "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
"x": 15,
"y": 28,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 14,
"y": 42,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 29,
"y": 41,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 30,
"y": 42,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 22,
"y": 45,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 17,
"y": 46,
"elevation": 3,
@@ -144,7 +144,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 36,
"y": 14,
"elevation": 3,
@@ -157,7 +157,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 34,
"y": 14,
"elevation": 3,
@@ -170,7 +170,7 @@
"flag": "FLAG_TEMP_14"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 36,
"y": 15,
"elevation": 3,
@@ -183,7 +183,7 @@
"flag": "FLAG_TEMP_15"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 35,
"y": 14,
"elevation": 3,
@@ -196,7 +196,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 35,
"y": 17,
"elevation": 3,
@@ -209,7 +209,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 18,
"y": 39,
"elevation": 3,
@@ -222,7 +222,7 @@
"flag": "FLAG_TEMP_16"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 19,
"y": 40,
"elevation": 3,
@@ -235,7 +235,7 @@
"flag": "FLAG_TEMP_17"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 13,
"y": 6,
"elevation": 3,
@@ -248,7 +248,7 @@
"flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ULTRA_BALL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 38,
"y": 10,
"elevation": 3,
@@ -261,7 +261,7 @@
"flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_FIRE_STONE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 48,
"y": 20,
"elevation": 3,
diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json
index b0d678752..c8e3cf79e 100644
--- a/data/maps/MtEmber_RubyPath_1F/map.json
+++ b/data/maps/MtEmber_RubyPath_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 18,
"y": 11,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 23,
"y": 16,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 20,
"y": 12,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_TEMP_14"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 19,
"y": 7,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_TEMP_15"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 21,
"y": 15,
"elevation": 3,
diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json
index b56e52770..965fdaa58 100644
--- a/data/maps/MtEmber_RubyPath_B1F/map.json
+++ b/data/maps/MtEmber_RubyPath_B1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 1,
"y": 8,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 1,
"y": 11,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 3,
"y": 12,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_TEMP_14"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 5,
"y": 14,
"elevation": 3,
diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json
index 76a7c17e2..645a76950 100644
--- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json
+++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 4,
"y": 2,
"elevation": 3,
diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json
index 5fd04b480..a1d6f74d4 100644
--- a/data/maps/MtEmber_RubyPath_B2F/map.json
+++ b/data/maps/MtEmber_RubyPath_B2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 9,
"y": 3,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 12,
"y": 5,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 12,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 4,
"y": 8,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 1,
"y": 8,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 4,
"y": 5,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_TEMP_14"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 5,
"y": 5,
"elevation": 3,
diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json
index 5b72aa5c3..85f9e084e 100644
--- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json
+++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 4,
"y": 3,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 6,
"y": 2,
"elevation": 3,
diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json
index ac41ffbcb..78e5824b8 100644
--- a/data/maps/MtEmber_RubyPath_B3F/map.json
+++ b/data/maps/MtEmber_RubyPath_B3F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 10,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 26,
"y": 12,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 28,
"y": 8,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 7,
"y": 2,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 4,
"y": 3,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 6,
"y": 6,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_TEMP_14"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 7,
"y": 6,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "FLAG_TEMP_15"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 4,
"y": 5,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "FLAG_TEMP_16"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 5,
"y": 2,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "FLAG_TEMP_17"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 15,
"y": 13,
"elevation": 3,
diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json
index ce5dbc269..dc8ab175e 100644
--- a/data/maps/MtEmber_RubyPath_B5F/map.json
+++ b/data/maps/MtEmber_RubyPath_B5F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_RUBY",
+ "graphics_id": "OBJECT_EVENT_GFX_RUBY",
"x": 7,
"y": 7,
"elevation": 0,
diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json
index 1715ccf58..e37d10962 100644
--- a/data/maps/MtEmber_Summit/map.json
+++ b/data/maps/MtEmber_Summit/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_MOLTRES",
+ "graphics_id": "OBJECT_EVENT_GFX_MOLTRES",
"x": 9,
"y": 6,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_MOLTRES"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 10,
"y": 12,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 9,
"y": 12,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 8,
"y": 11,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 8,
"y": 10,
"elevation": 3,
diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json
index 5712426b2..cd8f39c65 100644
--- a/data/maps/MtEmber_SummitPath_2F/map.json
+++ b/data/maps/MtEmber_SummitPath_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 40,
"y": 7,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 33,
"y": 5,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 15,
"y": 19,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_TEMP_14"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 13,
"y": 23,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_TEMP_15"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 13,
"y": 21,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_TEMP_16"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 7,
"y": 38,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_TEMP_17"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 9,
"y": 35,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "FLAG_TEMP_18"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 7,
"y": 34,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "FLAG_TEMP_19"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 15,
"y": 26,
"elevation": 3,
diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json
index 2701adad6..432699237 100644
--- a/data/maps/MtMoon_1F/map.json
+++ b/data/maps/MtMoon_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 20,
"y": 26,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 36,
"y": 30,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 30,
"y": 35,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 33,
"y": 4,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 7,
"y": 26,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 13,
"y": 17,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 7,
"y": 10,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 2,
"y": 22,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "FLAG_HIDE_MT_MOON_1F_PARALYZE_HEAL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 11,
"y": 35,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "FLAG_HIDE_MT_MOON_1F_TM09"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 26,
"y": 32,
"elevation": 3,
@@ -144,7 +144,7 @@
"flag": "FLAG_HIDE_MT_MOON_1F_POTION"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 42,
"y": 35,
"elevation": 3,
@@ -157,7 +157,7 @@
"flag": "FLAG_HIDE_MT_MOON_1F_RARE_CANDY"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 44,
"y": 21,
"elevation": 3,
@@ -170,7 +170,7 @@
"flag": "FLAG_HIDE_MT_MOON_1F_ESCAPE_ROPE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 3,
"y": 2,
"elevation": 3,
@@ -183,7 +183,7 @@
"flag": "FLAG_HIDE_MT_MOON_1F_MOON_STONE"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 42,
"y": 7,
"elevation": 3,
diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json
index 652a883b3..478a00f7d 100644
--- a/data/maps/MtMoon_B2F/map.json
+++ b/data/maps/MtMoon_B2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_FOSSIL",
+ "graphics_id": "OBJECT_EVENT_GFX_FOSSIL",
"x": 13,
"y": 7,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_DOME_FOSSIL"
},
{
- "graphics_id": "MAP_OBJ_GFX_FOSSIL",
+ "graphics_id": "OBJECT_EVENT_GFX_FOSSIL",
"x": 14,
"y": 7,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_HELIX_FOSSIL"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 13,
"y": 11,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 37,
"y": 21,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 12,
"y": 20,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 35,
"y": 12,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 18,
"y": 27,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 30,
"y": 26,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "FLAG_HIDE_MT_MOON_B2F_STAR_PIECE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 35,
"y": 5,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "FLAG_HIDE_MT_MOON_B2F_TM46"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 24,
"y": 6,
"elevation": 3,
@@ -144,7 +144,7 @@
"flag": "FLAG_HIDE_MT_MOON_B2F_REVIVE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 3,
"y": 11,
"elevation": 3,
diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json
index 0441624ed..f483a5f85 100644
--- a/data/maps/NavelRock_Base/map.json
+++ b/data/maps/NavelRock_Base/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LUGIA",
+ "graphics_id": "OBJECT_EVENT_GFX_LUGIA",
"x": 10,
"y": 15,
"elevation": 3,
diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json
index cdbf54da8..334886745 100644
--- a/data/maps/NavelRock_Harbor/map.json
+++ b/data/maps/NavelRock_Harbor/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
+ "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
"x": 8,
"y": 9,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 8,
"y": 6,
"elevation": 3,
diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json
index fe7c5dd8b..6baaa256f 100644
--- a/data/maps/NavelRock_Summit/map.json
+++ b/data/maps/NavelRock_Summit/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_HO_OH",
+ "graphics_id": "OBJECT_EVENT_GFX_HO_OH",
"x": 9,
"y": 6,
"elevation": 0,
diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json
index fb1e43775..e79709023 100644
--- a/data/maps/OneIsland/map.json
+++ b/data/maps/OneIsland/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BILL",
+ "graphics_id": "OBJECT_EVENT_GFX_BILL",
"x": 12,
"y": 16,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "FLAG_HIDE_ONE_ISLAND_BILL"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 16,
"y": 12,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 13,
"y": 9,
"elevation": 3,
diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json
index 861731295..66fda50c4 100644
--- a/data/maps/OneIsland_Harbor/map.json
+++ b/data/maps/OneIsland_Harbor/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
+ "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
"x": 8,
"y": 9,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 8,
"y": 6,
"elevation": 3,
diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json
index 216436861..b481baf9b 100644
--- a/data/maps/OneIsland_House1/map.json
+++ b/data/maps/OneIsland_House1/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 4,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
"x": 7,
"y": 5,
"elevation": 3,
diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json
index 06f7031e1..48ad4a077 100644
--- a/data/maps/OneIsland_House2/map.json
+++ b/data/maps/OneIsland_House2/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 9,
"y": 4,
"elevation": 3,
diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json
index b618253aa..3520eaac0 100644
--- a/data/maps/OneIsland_KindleRoad/map.json
+++ b/data/maps/OneIsland_KindleRoad/map.json
@@ -20,7 +20,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
"x": 11,
"y": 32,
"elevation": 1,
@@ -33,7 +33,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_LAND",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_LAND",
"x": 17,
"y": 132,
"elevation": 3,
@@ -46,7 +46,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
"x": 7,
"y": 39,
"elevation": 1,
@@ -59,7 +59,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_LAND",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND",
"x": 19,
"y": 79,
"elevation": 3,
@@ -72,7 +72,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 15,
"y": 25,
"elevation": 3,
@@ -85,7 +85,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
"x": 9,
"y": 53,
"elevation": 3,
@@ -98,7 +98,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
"x": 18,
"y": 105,
"elevation": 4,
@@ -111,7 +111,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 16,
"y": 64,
"elevation": 3,
@@ -124,7 +124,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 11,
"y": 64,
"elevation": 3,
@@ -137,7 +137,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CAMPER",
+ "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
"x": 11,
"y": 89,
"elevation": 3,
@@ -150,7 +150,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 9,
"y": 108,
"elevation": 3,
@@ -163,7 +163,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 8,
"y": 68,
"elevation": 3,
@@ -176,7 +176,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
"x": 9,
"y": 68,
"elevation": 3,
@@ -189,7 +189,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 8,
"y": 104,
"elevation": 3,
@@ -202,7 +202,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 11,
"y": 95,
"elevation": 3,
@@ -215,7 +215,7 @@
"flag": "FLAG_TEMP_15"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 12,
"y": 96,
"elevation": 3,
@@ -228,7 +228,7 @@
"flag": "FLAG_TEMP_16"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 10,
"y": 95,
"elevation": 3,
@@ -241,7 +241,7 @@
"flag": "FLAG_TEMP_17"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 9,
"y": 105,
"elevation": 3,
@@ -254,7 +254,7 @@
"flag": "FLAG_TEMP_18"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 15,
"y": 75,
"elevation": 3,
@@ -267,7 +267,7 @@
"flag": "FLAG_TEMP_19"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 9,
"y": 84,
"elevation": 3,
@@ -280,7 +280,7 @@
"flag": "FLAG_TEMP_1A"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 15,
"y": 74,
"elevation": 3,
@@ -293,7 +293,7 @@
"flag": "FLAG_TEMP_1B"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 15,
"y": 73,
"elevation": 3,
@@ -306,7 +306,7 @@
"flag": "FLAG_TEMP_1C"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 18,
"y": 111,
"elevation": 4,
@@ -319,7 +319,7 @@
"flag": "FLAG_TEMP_1D"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 10,
"y": 86,
"elevation": 3,
@@ -332,7 +332,7 @@
"flag": "FLAG_TEMP_1E"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 9,
"y": 110,
"elevation": 3,
@@ -345,7 +345,7 @@
"flag": "FLAG_TEMP_1F"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 18,
"y": 112,
"elevation": 4,
@@ -358,7 +358,7 @@
"flag": "FLAG_TEMP_11"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 15,
"y": 70,
"elevation": 3,
@@ -371,7 +371,7 @@
"flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_ETHER"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 17,
"y": 103,
"elevation": 3,
@@ -384,7 +384,7 @@
"flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_MAX_REPEL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 18,
"y": 114,
"elevation": 4,
diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json
index cefa0b75b..a04cfa085 100644
--- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json
+++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 11,
"y": 13,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 15,
"y": 11,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 6,
"y": 8,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
"x": 20,
"y": 7,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 10,
"y": 5,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 11,
"y": 20,
"elevation": 3,
diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json
index b5575d3fd..85352beb1 100644
--- a/data/maps/OneIsland_PokemonCenter_1F/map.json
+++ b/data/maps/OneIsland_PokemonCenter_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 5,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BILL",
+ "graphics_id": "OBJECT_EVENT_GFX_BILL",
"x": 14,
"y": 6,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL"
},
{
- "graphics_id": "MAP_OBJ_GFX_CELIO",
+ "graphics_id": "OBJECT_EVENT_GFX_CELIO",
"x": 15,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_CELIO"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
"x": 6,
"y": 8,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 3,
"y": 7,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
"x": 7,
"y": 4,
"elevation": 3,
diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json
index aacfae373..96d913b13 100644
--- a/data/maps/OneIsland_PokemonCenter_2F/map.json
+++ b/data/maps/OneIsland_PokemonCenter_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json
index 2d351ae47..2d5c09ac0 100644
--- a/data/maps/OneIsland_TreasureBeach/map.json
+++ b/data/maps/OneIsland_TreasureBeach/map.json
@@ -20,7 +20,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
"x": 8,
"y": 11,
"elevation": 1,
@@ -33,7 +33,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 13,
"y": 20,
"elevation": 3,
diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json
index 344d30be7..2b2c4330a 100644
--- a/data/maps/PalletTown/map.json
+++ b/data/maps/PalletTown/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 3,
"y": 10,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
"x": 13,
"y": 17,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PROF_OAK",
+ "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK",
"x": 10,
"y": 8,
"elevation": 3,
diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json
index c2c15b1b8..d53da31c1 100644
--- a/data/maps/PalletTown_GarysHouse/map.json
+++ b/data/maps/PalletTown_GarysHouse/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_DAISY",
+ "graphics_id": "OBJECT_EVENT_GFX_DAISY",
"x": 10,
"y": 6,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_TOWN_MAP",
+ "graphics_id": "OBJECT_EVENT_GFX_TOWN_MAP",
"x": 6,
"y": 4,
"elevation": 3,
diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json
index 4e281c43a..54b41dbf8 100644
--- a/data/maps/PalletTown_PlayersHouse_1F/map.json
+++ b/data/maps/PalletTown_PlayersHouse_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_MOM",
+ "graphics_id": "OBJECT_EVENT_GFX_MOM",
"x": 8,
"y": 4,
"elevation": 3,
diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json
index 9ff650466..3aefa7fa2 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/map.json
+++ b/data/maps/PalletTown_ProfessorOaksLab/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 3,
"y": 11,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
"x": 2,
"y": 10,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 11,
"y": 10,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PROF_OAK",
+ "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK",
"x": 6,
"y": 3,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_OAK_IN_HIS_LAB"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 8,
"y": 4,
"elevation": 0,
@@ -79,7 +79,7 @@
"flag": "FLAG_HIDE_BULBASAUR_BALL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 9,
"y": 4,
"elevation": 0,
@@ -92,7 +92,7 @@
"flag": "FLAG_HIDE_SQUIRTLE_BALL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 10,
"y": 4,
"elevation": 0,
@@ -105,7 +105,7 @@
"flag": "FLAG_HIDE_CHARMANDER_BALL"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLUE",
+ "graphics_id": "OBJECT_EVENT_GFX_BLUE",
"x": 5,
"y": 4,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "FLAG_HIDE_RIVAL_IN_LAB"
},
{
- "graphics_id": "MAP_OBJ_GFX_POKEDEX",
+ "graphics_id": "OBJECT_EVENT_GFX_POKEDEX",
"x": 4,
"y": 1,
"elevation": 0,
@@ -131,7 +131,7 @@
"flag": "FLAG_HIDE_POKEDEX"
},
{
- "graphics_id": "MAP_OBJ_GFX_POKEDEX",
+ "graphics_id": "OBJECT_EVENT_GFX_POKEDEX",
"x": 5,
"y": 1,
"elevation": 0,
diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json
index 2f51e7462..dbf624f2a 100644
--- a/data/maps/PewterCity/map.json
+++ b/data/maps/PewterCity/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 6,
"y": 15,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 33,
"y": 17,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "FLAG_HIDE_PEWTER_MUSEUM_GUIDE"
},
{
- "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
"x": 21,
"y": 28,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 33,
"y": 27,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 42,
"y": 20,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "FLAG_HIDE_PEWTER_CITY_GYM_GUIDE"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 30,
"y": 5,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 46,
"y": 20,
"elevation": 3,
diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json
index 16d0992be..adc0b397b 100644
--- a/data/maps/PewterCity_Gym/map.json
+++ b/data/maps/PewterCity_Gym/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_BROCK",
"x": 6,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CAMPER",
+ "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
"x": 3,
"y": 8,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GYM_GUY",
+ "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
"x": 7,
"y": 12,
"elevation": 3,
diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json
index 5f177362a..4478ca348 100644
--- a/data/maps/PewterCity_House1/map.json
+++ b/data/maps/PewterCity_House1/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 1,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
"x": 5,
"y": 3,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_NIDORAN_M",
+ "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M",
"x": 6,
"y": 3,
"elevation": 3,
diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json
index 83699d95f..677ae5cc0 100644
--- a/data/maps/PewterCity_House2/map.json
+++ b/data/maps/PewterCity_House2/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 3,
"y": 3,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
"x": 5,
"y": 3,
"elevation": 3,
diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json
index 08555943c..275478428 100644
--- a/data/maps/PewterCity_Mart/map.json
+++ b/data/maps/PewterCity_Mart/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 8,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 6,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 2,
"y": 3,
"elevation": 0,
diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json
index 7dcbbe776..76945d8ca 100644
--- a/data/maps/PewterCity_Museum_1F/map.json
+++ b/data/maps/PewterCity_Museum_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 16,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 2,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 21,
"y": 3,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_AMBER",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_AMBER",
"x": 22,
"y": 3,
"elevation": 0,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_OLD_AMBER"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 26,
"y": 4,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 26,
"y": 7,
"elevation": 3,
diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json
index 069f33249..12d797fe6 100644
--- a/data/maps/PewterCity_Museum_2F/map.json
+++ b/data/maps/PewterCity_Museum_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 10,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 4,
"y": 9,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
"x": 0,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 15,
"y": 8,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 16,
"y": 8,
"elevation": 3,
diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json
index a4a4bee9f..1a54e269b 100644
--- a/data/maps/PewterCity_PokemonCenter_1F/map.json
+++ b/data/maps/PewterCity_PokemonCenter_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_JIGGLYPUFF",
+ "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF",
"x": 2,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 4,
"y": 8,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 1,
"y": 2,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 13,
"y": 2,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GBA_KID",
+ "graphics_id": "OBJECT_EVENT_GFX_GBA_KID",
"x": 10,
"y": 7,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GBA_KID",
+ "graphics_id": "OBJECT_EVENT_GFX_GBA_KID",
"x": 14,
"y": 6,
"elevation": 3,
diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json
index 32a9afe45..f223ec1fc 100644
--- a/data/maps/PewterCity_PokemonCenter_2F/map.json
+++ b/data/maps/PewterCity_PokemonCenter_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json
index 30d6cc36c..357aef9a4 100644
--- a/data/maps/PokemonLeague_AgathasRoom/map.json
+++ b/data/maps/PokemonLeague_AgathasRoom/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_AGATHA",
+ "graphics_id": "OBJECT_EVENT_GFX_AGATHA",
"x": 6,
"y": 5,
"elevation": 3,
diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json
index b3ff9a6e6..699130e5f 100644
--- a/data/maps/PokemonLeague_BrunosRoom/map.json
+++ b/data/maps/PokemonLeague_BrunosRoom/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BRUNO",
+ "graphics_id": "OBJECT_EVENT_GFX_BRUNO",
"x": 6,
"y": 5,
"elevation": 3,
diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json
index 2154adc3a..ec8d5db18 100644
--- a/data/maps/PokemonLeague_ChampionsRoom/map.json
+++ b/data/maps/PokemonLeague_ChampionsRoom/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BLUE",
+ "graphics_id": "OBJECT_EVENT_GFX_BLUE",
"x": 6,
"y": 8,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PROF_OAK",
+ "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK",
"x": 6,
"y": 15,
"elevation": 0,
diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json
index cacd686ab..03029ea74 100644
--- a/data/maps/PokemonLeague_HallOfFame/map.json
+++ b/data/maps/PokemonLeague_HallOfFame/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_PROF_OAK",
+ "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK",
"x": 6,
"y": 4,
"elevation": 3,
diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json
index 0a995986e..fe17526ee 100644
--- a/data/maps/PokemonLeague_LancesRoom/map.json
+++ b/data/maps/PokemonLeague_LancesRoom/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LANCE",
+ "graphics_id": "OBJECT_EVENT_GFX_LANCE",
"x": 6,
"y": 8,
"elevation": 3,
diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json
index 1a8512901..b5dd7cf45 100644
--- a/data/maps/PokemonLeague_LoreleisRoom/map.json
+++ b/data/maps/PokemonLeague_LoreleisRoom/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LORELEI",
+ "graphics_id": "OBJECT_EVENT_GFX_LORELEI",
"x": 6,
"y": 5,
"elevation": 3,
diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json
index 3c015536e..8f26c3d11 100644
--- a/data/maps/PokemonMansion_1F/map.json
+++ b/data/maps/PokemonMansion_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 22,
"y": 24,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 29,
"y": 32,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_POKEMON_MANSION_1F_CARBOS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 22,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_POKEMON_MANSION_1F_ESCAPE_ROPE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 27,
"y": 15,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_POKEMON_MANSION_1F_PROTEIN"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 8,
"y": 8,
"elevation": 3,
diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json
index 4a618c86d..b5bf6d6d3 100644
--- a/data/maps/PokemonMansion_2F/map.json
+++ b/data/maps/PokemonMansion_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+ "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
"x": 5,
"y": 23,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 36,
"y": 8,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_POKEMON_MANSION_2F_CALCIUM"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 18,
"y": 23,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_POKEMON_MANSION_2F_ZINC"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 35,
"y": 17,
"elevation": 3,
diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json
index b76f6bb0b..47ef76894 100644
--- a/data/maps/PokemonMansion_3F/map.json
+++ b/data/maps/PokemonMansion_3F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+ "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
"x": 7,
"y": 13,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 22,
"y": 13,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 9,
"y": 19,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_POKEMON_MANSION_3F_MAX_POTION"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 32,
"y": 6,
"elevation": 3,
diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json
index cbbc3f9a2..5a6b105ab 100644
--- a/data/maps/PokemonMansion_B1F/map.json
+++ b/data/maps/PokemonMansion_B1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 6,
"y": 21,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM22"
},
{
- "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+ "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
"x": 20,
"y": 25,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 34,
"y": 13,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 23,
"y": 4,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM14"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 2,
"y": 29,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_HIDE_POKEMON_MANSION_B1F_FULL_RESTORE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 5,
"y": 7,
"elevation": 3,
diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json
index 5185ebec7..88446bcf4 100644
--- a/data/maps/PokemonTower_1F/map.json
+++ b/data/maps/PokemonTower_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
"x": 18,
"y": 13,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 18,
"y": 7,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 15,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_3",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
"x": 7,
"y": 8,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 8,
"y": 12,
"elevation": 3,
diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json
index a155ee492..de6a03ac6 100644
--- a/data/maps/PokemonTower_2F/map.json
+++ b/data/maps/PokemonTower_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BLUE",
+ "graphics_id": "OBJECT_EVENT_GFX_BLUE",
"x": 16,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_TOWER_RIVAL"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 3,
"y": 7,
"elevation": 0,
diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json
index 49ca729a0..668f87e73 100644
--- a/data/maps/PokemonTower_3F/map.json
+++ b/data/maps/PokemonTower_3F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 10,
"y": 14,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 9,
"y": 9,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 12,
"y": 4,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 13,
"y": 2,
"elevation": 3,
diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json
index 94832e3da..e24927018 100644
--- a/data/maps/PokemonTower_4F/map.json
+++ b/data/maps/PokemonTower_4F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 17,
"y": 7,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 15,
"y": 13,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 4,
"y": 12,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 12,
"y": 11,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_POKEMON_TOWER_4F_ELIXIR"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 8,
"y": 11,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_HIDE_POKEMON_TOWER_4F_AWAKENING"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 11,
"y": 16,
"elevation": 3,
diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json
index 7f06f059d..bd64e246e 100644
--- a/data/maps/PokemonTower_5F/map.json
+++ b/data/maps/PokemonTower_5F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 11,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 19,
"y": 7,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 7,
"y": 12,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 11,
"y": 16,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 12,
"y": 8,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 6,
"y": 16,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_HIDE_POKEMON_TOWER_5F_NUGGET"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 11,
"y": 9,
"elevation": 3,
diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json
index 4f1934e2c..6c9e9aefb 100644
--- a/data/maps/PokemonTower_6F/map.json
+++ b/data/maps/PokemonTower_6F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 13,
"y": 10,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 18,
"y": 6,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 9,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 5,
"y": 15,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_POKEMON_TOWER_6F_RARE_CANDY"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 15,
"y": 15,
"elevation": 3,
diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json
index bb49bbecd..3d8a1a5be 100644
--- a/data/maps/PokemonTower_7F/map.json
+++ b/data/maps/PokemonTower_7F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_MR_FUJI",
+ "graphics_id": "OBJECT_EVENT_GFX_MR_FUJI",
"x": 11,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_TOWER_FUJI"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 9,
"y": 10,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_TOWER_ROCKET_1"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 13,
"y": 8,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_TOWER_ROCKET_2"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 9,
"y": 6,
"elevation": 3,
diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json
index 7a8d2c1f2..751b0448a 100644
--- a/data/maps/PowerPlant/map.json
+++ b/data/maps/PowerPlant/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 7,
"y": 27,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_POWER_PLANT_MAX_POTION"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 40,
"y": 22,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_POWER_PLANT_TM17"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 46,
"y": 37,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_POWER_PLANT_TM25"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 45,
"y": 4,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_POWER_PLANT_THUNDER_STONE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 26,
"y": 22,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_HIDE_POWER_PLANT_ELIXIR"
},
{
- "graphics_id": "MAP_OBJ_GFX_ZAPDOS",
+ "graphics_id": "OBJECT_EVENT_GFX_ZAPDOS",
"x": 5,
"y": 11,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_HIDE_ZAPDOS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 36,
"y": 5,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "FLAG_HIDE_POWER_PLANT_ELECTRODE_2"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 30,
"y": 38,
"elevation": 3,
diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json
index ab85b27d2..381dc663b 100644
--- a/data/maps/RockTunnel_1F/map.json
+++ b/data/maps/RockTunnel_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 26,
"y": 28,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 39,
"y": 27,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 45,
"y": 24,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 20,
"y": 17,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 5,
"y": 20,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 7,
"y": 5,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+ "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
"x": 27,
"y": 10,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 37,
"y": 5,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "FLAG_HIDE_ROCK_TUNNEL_1F_REPEL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 33,
"y": 22,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "FLAG_HIDE_ROCK_TUNNEL_1F_PEARL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 22,
"y": 22,
"elevation": 3,
diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json
index c904e3b4b..1dd0f419e 100644
--- a/data/maps/RockTunnel_B1F/map.json
+++ b/data/maps/RockTunnel_B1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+ "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
"x": 2,
"y": 6,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 5,
"y": 11,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 11,
"y": 15,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 36,
"y": 11,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 41,
"y": 5,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+ "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
"x": 23,
"y": 23,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 15,
"y": 33,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+ "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
"x": 29,
"y": 35,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 2,
"y": 29,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 2,
"y": 37,
"elevation": 3,
@@ -144,7 +144,7 @@
"flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_REVIVE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 9,
"y": 2,
"elevation": 3,
@@ -157,7 +157,7 @@
"flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_MAX_ETHER"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 1,
"y": 20,
"elevation": 3,
@@ -170,7 +170,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 1,
"y": 22,
"elevation": 3,
@@ -183,7 +183,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 4,
"y": 23,
"elevation": 3,
@@ -196,7 +196,7 @@
"flag": "FLAG_TEMP_14"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 2,
"y": 23,
"elevation": 3,
@@ -209,7 +209,7 @@
"flag": "FLAG_TEMP_15"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 39,
"y": 26,
"elevation": 3,
@@ -222,7 +222,7 @@
"flag": "FLAG_TEMP_16"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 42,
"y": 26,
"elevation": 3,
@@ -235,7 +235,7 @@
"flag": "FLAG_TEMP_17"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 43,
"y": 28,
"elevation": 3,
@@ -248,7 +248,7 @@
"flag": "FLAG_TEMP_18"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 45,
"y": 30,
"elevation": 3,
@@ -261,7 +261,7 @@
"flag": "FLAG_TEMP_19"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 45,
"y": 33,
"elevation": 3,
@@ -274,7 +274,7 @@
"flag": "FLAG_TEMP_1A"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 25,
"y": 1,
"elevation": 3,
@@ -287,7 +287,7 @@
"flag": "FLAG_TEMP_1B"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 27,
"y": 4,
"elevation": 3,
@@ -300,7 +300,7 @@
"flag": "FLAG_TEMP_1C"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 23,
"y": 2,
"elevation": 3,
@@ -313,7 +313,7 @@
"flag": "FLAG_TEMP_1D"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 26,
"y": 2,
"elevation": 3,
@@ -326,7 +326,7 @@
"flag": "FLAG_TEMP_1E"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 24,
"y": 7,
"elevation": 3,
@@ -339,7 +339,7 @@
"flag": "FLAG_TEMP_1F"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 27,
"y": 6,
"elevation": 3,
diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json
index 5e1e205d8..1ae6a2b49 100644
--- a/data/maps/RocketHideout_B1F/map.json
+++ b/data/maps/RocketHideout_B1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 4,
"y": 9,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 24,
"y": 12,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 6,
"y": 32,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 10,
"y": 22,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 21,
"y": 27,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 5,
"y": 16,
"elevation": 0,
@@ -92,7 +92,7 @@
"flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_ESCAPE_ROPE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 1,
"y": 22,
"elevation": 3,
diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json
index c306907fd..4bdde29e9 100644
--- a/data/maps/RocketHideout_B2F/map.json
+++ b/data/maps/RocketHideout_B2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 20,
"y": 6,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 15,
"y": 3,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_X_SPEED"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 2,
"y": 5,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_MOON_STONE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 5,
"y": 7,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_TM12"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 0,
"y": 14,
"elevation": 3,
diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json
index 84326943e..40f6c205f 100644
--- a/data/maps/RocketHideout_B3F/map.json
+++ b/data/maps/RocketHideout_B3F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 19,
"y": 9,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 2,
"y": 20,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 12,
"y": 12,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_RARE_CANDY"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 19,
"y": 14,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_TM21"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 14,
"y": 24,
"elevation": 3,
diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json
index 6a88db1a7..85113e7c6 100644
--- a/data/maps/RocketHideout_B4F/map.json
+++ b/data/maps/RocketHideout_B4F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_GIOVANNI",
+ "graphics_id": "OBJECT_EVENT_GFX_GIOVANNI",
"x": 19,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_HIDEOUT_GIOVANNI"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 20,
"y": 5,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_SILPH_SCOPE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 4,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 3,
"y": 2,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_LIFT_KEY"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 19,
"y": 14,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 16,
"y": 14,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 1,
"y": 6,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_TM49"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 4,
"y": 14,
"elevation": 0,
@@ -118,7 +118,7 @@
"flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_MAX_ETHER"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 6,
"y": 23,
"elevation": 0,
diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json
index 265822796..e133094f3 100644
--- a/data/maps/Route1/map.json
+++ b/data/maps/Route1/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 6,
"y": 28,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 19,
"y": 16,
"elevation": 3,
diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json
index 04ea2bf57..a0339bf58 100644
--- a/data/maps/Route10/map.json
+++ b/data/maps/Route10/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 7,
"y": 60,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 4,
"y": 62,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+ "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
"x": 15,
"y": 70,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 4,
"y": 68,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+ "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
"x": 13,
"y": 44,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 9,
"y": 27,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 10,
"y": 20,
"elevation": 0,
@@ -116,7 +116,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 10,
"y": 22,
"elevation": 0,
@@ -129,7 +129,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 10,
"y": 24,
"elevation": 0,
@@ -142,7 +142,7 @@
"flag": "FLAG_TEMP_14"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 10,
"y": 26,
"elevation": 0,
diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json
index c6a6d57c6..ffa9b5483 100644
--- a/data/maps/Route10_PokemonCenter_1F/map.json
+++ b/data/maps/Route10_PokemonCenter_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 9,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
"x": 2,
"y": 3,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 14,
"y": 6,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 12,
"y": 5,
"elevation": 3,
diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json
index ba0d61e30..e815a98be 100644
--- a/data/maps/Route10_PokemonCenter_2F/map.json
+++ b/data/maps/Route10_PokemonCenter_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json
index a7cf69d51..854692035 100644
--- a/data/maps/Route11/map.json
+++ b/data/maps/Route11/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 19,
"y": 8,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 16,
"y": 17,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 31,
"y": 8,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 28,
"y": 10,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 38,
"y": 15,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 50,
"y": 4,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 42,
"y": 8,
"elevation": 3,
@@ -116,7 +116,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 50,
"y": 14,
"elevation": 3,
@@ -129,7 +129,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 57,
"y": 16,
"elevation": 3,
@@ -142,7 +142,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 32,
"y": 18,
"elevation": 3,
@@ -155,7 +155,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 42,
"y": 12,
"elevation": 3,
@@ -168,7 +168,7 @@
"flag": "FLAG_HIDE_ROUTE11_X_DEFEND"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 63,
"y": 13,
"elevation": 3,
@@ -181,7 +181,7 @@
"flag": "FLAG_HIDE_ROUTE11_GREAT_BALL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 13,
"y": 3,
"elevation": 3,
diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json
index 2806f681c..672ff606f 100644
--- a/data/maps/Route11_EastEntrance_1F/map.json
+++ b/data/maps/Route11_EastEntrance_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
"x": 4,
"y": 10,
"elevation": 0,
diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json
index dfe0c5030..86a3a8650 100644
--- a/data/maps/Route11_EastEntrance_2F/map.json
+++ b/data/maps/Route11_EastEntrance_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 7,
"y": 3,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 2,
"y": 6,
"elevation": 3,
diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json
index 9d660528e..cfc684de8 100644
--- a/data/maps/Route12/map.json
+++ b/data/maps/Route12/map.json
@@ -30,7 +30,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 17,
"y": 32,
"elevation": 3,
@@ -43,7 +43,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 9,
"y": 40,
"elevation": 3,
@@ -56,7 +56,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 16,
"y": 47,
"elevation": 3,
@@ -69,7 +69,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 13,
"y": 59,
"elevation": 3,
@@ -82,7 +82,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SNORLAX",
+ "graphics_id": "OBJECT_EVENT_GFX_SNORLAX",
"x": 14,
"y": 70,
"elevation": 3,
@@ -95,7 +95,7 @@
"flag": "FLAG_HIDE_ROUTE_12_SNORLAX"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 13,
"y": 92,
"elevation": 3,
@@ -108,7 +108,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CAMPER",
+ "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
"x": 10,
"y": 99,
"elevation": 3,
@@ -121,7 +121,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 18,
"y": 108,
"elevation": 3,
@@ -134,7 +134,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 11,
"y": 100,
"elevation": 3,
@@ -147,7 +147,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 18,
"y": 36,
"elevation": 3,
@@ -160,7 +160,7 @@
"flag": "FLAG_HIDE_ROUTE12_TM48"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 9,
"y": 101,
"elevation": 3,
@@ -173,7 +173,7 @@
"flag": "FLAG_HIDE_ROUTE12_IRON"
},
{
- "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+ "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
"x": 19,
"y": 64,
"elevation": 3,
@@ -186,7 +186,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 19,
"y": 63,
"elevation": 3,
@@ -199,7 +199,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 12,
"y": 111,
"elevation": 3,
diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json
index 366c3e2c7..bcb35b07f 100644
--- a/data/maps/Route12_FishingHouse/map.json
+++ b/data/maps/Route12_FishingHouse/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 4,
"y": 4,
"elevation": 3,
diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json
index a133ae23f..1f5ecbe0d 100644
--- a/data/maps/Route12_NorthEntrance_1F/map.json
+++ b/data/maps/Route12_NorthEntrance_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
"x": 1,
"y": 5,
"elevation": 3,
diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json
index 687ac9bf6..57d619ddb 100644
--- a/data/maps/Route12_NorthEntrance_2F/map.json
+++ b/data/maps/Route12_NorthEntrance_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 7,
"y": 5,
"elevation": 3,
diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json
index 86a682dfb..8905899b1 100644
--- a/data/maps/Route13/map.json
+++ b/data/maps/Route13/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 62,
"y": 6,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 63,
"y": 12,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 54,
"y": 11,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+ "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
"x": 42,
"y": 7,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+ "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
"x": 43,
"y": 7,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 35,
"y": 10,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 29,
"y": 11,
"elevation": 3,
@@ -116,7 +116,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 9,
"y": 14,
"elevation": 3,
@@ -129,7 +129,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 16,
"y": 5,
"elevation": 3,
@@ -142,7 +142,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 14,
"y": 8,
"elevation": 3,
@@ -155,7 +155,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 44,
"y": 5,
"elevation": 3,
diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json
index 831e178d6..cb71cd411 100644
--- a/data/maps/Route14/map.json
+++ b/data/maps/Route14/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 7,
"y": 37,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 18,
"y": 35,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 10,
"y": 14,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 16,
"y": 16,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 7,
"y": 31,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 7,
"y": 34,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 8,
"y": 9,
"elevation": 3,
@@ -116,7 +116,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 7,
"y": 6,
"elevation": 3,
@@ -129,7 +129,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 10,
"y": 37,
"elevation": 3,
@@ -142,7 +142,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 18,
"y": 47,
"elevation": 3,
@@ -155,7 +155,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 7,
"y": 26,
"elevation": 3,
@@ -168,7 +168,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 12,
"y": 35,
"elevation": 3,
@@ -181,7 +181,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 1,
"y": 47,
"elevation": 3,
@@ -194,7 +194,7 @@
"flag": "FLAG_TEMP_14"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 13,
"y": 51,
"elevation": 3,
@@ -207,7 +207,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 12,
"y": 51,
"elevation": 3,
diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json
index 6d33098a6..4c6fa5d47 100644
--- a/data/maps/Route15/map.json
+++ b/data/maps/Route15/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 22,
"y": 13,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 31,
"y": 12,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 37,
"y": 14,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 44,
"y": 13,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+ "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
"x": 50,
"y": 12,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 59,
"y": 12,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 63,
"y": 13,
"elevation": 3,
@@ -116,7 +116,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 52,
"y": 8,
"elevation": 3,
@@ -129,7 +129,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+ "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
"x": 54,
"y": 12,
"elevation": 3,
@@ -142,7 +142,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 28,
"y": 6,
"elevation": 3,
@@ -155,7 +155,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 20,
"y": 6,
"elevation": 3,
@@ -168,7 +168,7 @@
"flag": "FLAG_HIDE_ROUTE15_TM18"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 39,
"y": 7,
"elevation": 3,
@@ -181,7 +181,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
"x": 40,
"y": 7,
"elevation": 3,
diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json
index 745e9e2c2..af929b0e1 100644
--- a/data/maps/Route15_WestEntrance_1F/map.json
+++ b/data/maps/Route15_WestEntrance_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
"x": 6,
"y": 2,
"elevation": 3,
diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json
index fc6391217..43a338c6c 100644
--- a/data/maps/Route15_WestEntrance_2F/map.json
+++ b/data/maps/Route15_WestEntrance_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 5,
"y": 5,
"elevation": 3,
diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json
index f6dc03f3e..fba9847f1 100644
--- a/data/maps/Route16/map.json
+++ b/data/maps/Route16/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 16,
"y": 12,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 14,
"y": 14,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 12,
"y": 12,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 8,
"y": 12,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 10,
"y": 14,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 6,
"y": 14,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 41,
"y": 11,
"elevation": 3,
@@ -116,7 +116,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+ "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
"x": 30,
"y": 5,
"elevation": 3,
@@ -129,7 +129,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 31,
"y": 5,
"elevation": 3,
@@ -142,7 +142,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SNORLAX",
+ "graphics_id": "OBJECT_EVENT_GFX_SNORLAX",
"x": 31,
"y": 13,
"elevation": 3,
diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json
index eb7e79232..248a93f35 100644
--- a/data/maps/Route16_House/map.json
+++ b/data/maps/Route16_House/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 4,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_FEAROW",
+ "graphics_id": "OBJECT_EVENT_GFX_FEAROW",
"x": 9,
"y": 3,
"elevation": 3,
diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json
index 52272f873..6288d8418 100644
--- a/data/maps/Route16_NorthEntrance_1F/map.json
+++ b/data/maps/Route16_NorthEntrance_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
"x": 6,
"y": 8,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 7,
"y": 4,
"elevation": 3,
diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json
index adec1e6b3..3d1f285c6 100644
--- a/data/maps/Route16_NorthEntrance_2F/map.json
+++ b/data/maps/Route16_NorthEntrance_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
"x": 6,
"y": 3,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 4,
"y": 8,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 10,
"y": 6,
"elevation": 0,
diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json
index 7158ae516..4ec96dc6c 100644
--- a/data/maps/Route17/map.json
+++ b/data/maps/Route17/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 4,
"y": 18,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 11,
"y": 15,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 15,
"y": 24,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 18,
"y": 41,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 7,
"y": 38,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 2,
"y": 61,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 21,
"y": 61,
"elevation": 3,
@@ -116,7 +116,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 18,
"y": 94,
"elevation": 3,
@@ -129,7 +129,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 16,
"y": 134,
"elevation": 3,
@@ -142,7 +142,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 4,
"y": 116,
"elevation": 3,
diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json
index 9ced2a41f..636acc2a7 100644
--- a/data/maps/Route18/map.json
+++ b/data/maps/Route18/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 46,
"y": 14,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 41,
"y": 15,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 39,
"y": 12,
"elevation": 3,
diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json
index 803722807..6dfc516fd 100644
--- a/data/maps/Route18_EastEntrance_1F/map.json
+++ b/data/maps/Route18_EastEntrance_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
"x": 6,
"y": 2,
"elevation": 3,
diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json
index 5731ecd8c..37094e443 100644
--- a/data/maps/Route18_EastEntrance_2F/map.json
+++ b/data/maps/Route18_EastEntrance_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 5,
"y": 3,
"elevation": 3,
diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json
index 439c5f405..3280d8588 100644
--- a/data/maps/Route19/map.json
+++ b/data/maps/Route19/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_LAND",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND",
"x": 15,
"y": 10,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_LAND",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND",
"x": 10,
"y": 9,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
"x": 12,
"y": 17,
"elevation": 1,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
"x": 18,
"y": 33,
"elevation": 1,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
"x": 8,
"y": 27,
"elevation": 1,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
"x": 16,
"y": 22,
"elevation": 1,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
"x": 11,
"y": 47,
"elevation": 1,
@@ -116,7 +116,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
"x": 14,
"y": 48,
"elevation": 1,
@@ -129,7 +129,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
"x": 12,
"y": 49,
"elevation": 1,
@@ -142,7 +142,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
"x": 9,
"y": 48,
"elevation": 1,
@@ -155,7 +155,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
"x": 8,
"y": 41,
"elevation": 1,
@@ -168,7 +168,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_TUBER_M_1",
+ "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1",
"x": 9,
"y": 41,
"elevation": 1,
diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json
index c211c5b72..aecf7a7de 100644
--- a/data/maps/Route2/map.json
+++ b/data/maps/Route2/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 16,
"y": 62,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "FLAG_TEMP_14"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 15,
"y": 69,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 11,
"y": 13,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "FLAG_TEMP_15"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 18,
"y": 26,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "FLAG_TEMP_16"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 17,
"y": 54,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "FLAG_HIDE_ROUTE2_ETHER"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 17,
"y": 64,
"elevation": 3,
diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json
index 231efcf51..60b59fc66 100644
--- a/data/maps/Route20/map.json
+++ b/data/maps/Route20/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
"x": 8,
"y": 11,
"elevation": 1,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 16,
"y": 14,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
"x": 34,
"y": 7,
"elevation": 1,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 43,
"y": 9,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
"x": 23,
"y": 10,
"elevation": 1,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 73,
"y": 16,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
"x": 111,
"y": 9,
"elevation": 1,
@@ -116,7 +116,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
"x": 106,
"y": 11,
"elevation": 1,
@@ -129,7 +129,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
"x": 93,
"y": 10,
"elevation": 1,
@@ -142,7 +142,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
"x": 54,
"y": 11,
"elevation": 1,
@@ -155,7 +155,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CAMPER",
+ "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
"x": 69,
"y": 3,
"elevation": 3,
diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json
index 8d504c75c..ceda4c2db 100644
--- a/data/maps/Route21_North/map.json
+++ b/data/maps/Route21_North/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 7,
"y": 27,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 16,
"y": 26,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
"x": 12,
"y": 44,
"elevation": 1,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
"x": 14,
"y": 35,
"elevation": 1,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_TUBER_M_1",
+ "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1",
"x": 15,
"y": 35,
"elevation": 1,
diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json
index 0895e18f1..7a45953bf 100644
--- a/data/maps/Route21_South/map.json
+++ b/data/maps/Route21_South/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 11,
"y": 8,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 14,
"y": 15,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
"x": 15,
"y": 24,
"elevation": 1,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
"x": 15,
"y": 38,
"elevation": 1,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
"x": 10,
"y": 29,
"elevation": 1,
diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json
index 1b3e558b4..0772e9303 100644
--- a/data/maps/Route22/map.json
+++ b/data/maps/Route22/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BLUE",
+ "graphics_id": "OBJECT_EVENT_GFX_BLUE",
"x": 25,
"y": 4,
"elevation": 3,
diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json
index 1a034d844..ee3f73dcb 100644
--- a/data/maps/Route22_NorthEntrance/map.json
+++ b/data/maps/Route22_NorthEntrance/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
"x": 8,
"y": 2,
"elevation": 3,
diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json
index f9d0f142e..145e8cdd7 100644
--- a/data/maps/Route23/map.json
+++ b/data/maps/Route23/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
"x": 15,
"y": 149,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
"x": 8,
"y": 140,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
"x": 14,
"y": 123,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
"x": 16,
"y": 112,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
"x": 10,
"y": 94,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
"x": 14,
"y": 61,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
"x": 6,
"y": 35,
"elevation": 3,
diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json
index 9fe5db518..9cf6bf74d 100644
--- a/data/maps/Route24/map.json
+++ b/data/maps/Route24/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 12,
"y": 15,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "FLAG_HIDE_NUGGET_BRIDGE_ROCKET"
},
{
- "graphics_id": "MAP_OBJ_GFX_CAMPER",
+ "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
"x": 12,
"y": 19,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 10,
"y": 22,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 12,
"y": 25,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 10,
"y": 28,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 12,
"y": 31,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CAMPER",
+ "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
"x": 5,
"y": 21,
"elevation": 3,
@@ -116,7 +116,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 11,
"y": 4,
"elevation": 3,
diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json
index a17f32488..d369225d3 100644
--- a/data/maps/Route25/map.json
+++ b/data/maps/Route25/map.json
@@ -20,7 +20,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 11,
"y": 4,
"elevation": 3,
@@ -33,7 +33,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 18,
"y": 2,
"elevation": 3,
@@ -46,7 +46,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 17,
"y": 7,
"elevation": 3,
@@ -59,7 +59,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 22,
"y": 4,
"elevation": 3,
@@ -72,7 +72,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 22,
"y": 8,
"elevation": 3,
@@ -85,7 +85,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 27,
"y": 9,
"elevation": 3,
@@ -98,7 +98,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CAMPER",
+ "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
"x": 28,
"y": 4,
"elevation": 3,
@@ -111,7 +111,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 36,
"y": 4,
"elevation": 3,
@@ -124,7 +124,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 42,
"y": 5,
"elevation": 3,
@@ -137,7 +137,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 26,
"y": 2,
"elevation": 3,
@@ -150,7 +150,7 @@
"flag": "FLAG_HIDE_ROUTE25_TM43"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 30,
"y": 3,
"elevation": 3,
@@ -163,7 +163,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+ "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
"x": 49,
"y": 10,
"elevation": 3,
@@ -176,7 +176,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 49,
"y": 11,
"elevation": 3,
diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json
index ac63be354..d08181f06 100644
--- a/data/maps/Route25_SeaCottage/map.json
+++ b/data/maps/Route25_SeaCottage/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BILL",
+ "graphics_id": "OBJECT_EVENT_GFX_BILL",
"x": 7,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE"
},
{
- "graphics_id": "MAP_OBJ_GFX_CLEFAIRY",
+ "graphics_id": "OBJECT_EVENT_GFX_CLEFAIRY",
"x": 10,
"y": 6,
"elevation": 3,
diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json
index e895e6c89..708a8f5a8 100644
--- a/data/maps/Route2_EastBuilding/map.json
+++ b/data/maps/Route2_EastBuilding/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 4,
"y": 6,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 10,
"y": 3,
"elevation": 3,
diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json
index 9833021a2..a04e5c546 100644
--- a/data/maps/Route2_House/map.json
+++ b/data/maps/Route2_House/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 4,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GBA_KID",
+ "graphics_id": "OBJECT_EVENT_GFX_GBA_KID",
"x": 7,
"y": 2,
"elevation": 3,
diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json
index 1ee618faa..37c58ebbd 100644
--- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json
+++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 5,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 4,
"y": 7,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
"x": 10,
"y": 5,
"elevation": 3,
diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json
index 808232f30..841360fe0 100644
--- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json
+++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 10,
"y": 6,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 4,
"y": 7,
"elevation": 3,
diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json
index 837e483b8..0def5e68f 100644
--- a/data/maps/Route3/map.json
+++ b/data/maps/Route3/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 70,
"y": 13,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 40,
"y": 11,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 32,
"y": 6,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 30,
"y": 3,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 25,
"y": 4,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 29,
"y": 10,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 19,
"y": 9,
"elevation": 3,
@@ -116,7 +116,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 12,
"y": 6,
"elevation": 3,
@@ -129,7 +129,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 17,
"y": 4,
"elevation": 3,
diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json
index dc2f902d7..b628beefc 100644
--- a/data/maps/Route4/map.json
+++ b/data/maps/Route4/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 9,
"y": 8,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 75,
"y": 3,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 67,
"y": 5,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "FLAG_HIDE_ROUTE4_TM05"
},
{
- "graphics_id": "MAP_OBJ_GFX_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 15,
"y": 14,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 47,
"y": 3,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 50,
"y": 3,
"elevation": 3,
diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json
index 936900208..c9216ca84 100644
--- a/data/maps/Route4_PokemonCenter_1F/map.json
+++ b/data/maps/Route4_PokemonCenter_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 1,
"y": 3,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 12,
"y": 5,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 5,
"y": 4,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 14,
"y": 4,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CLIPBOARD",
+ "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD",
"x": 12,
"y": 6,
"elevation": 0,
diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json
index a4189df66..2501fc3f4 100644
--- a/data/maps/Route4_PokemonCenter_2F/map.json
+++ b/data/maps/Route4_PokemonCenter_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json
index efa1789d8..99f47dba4 100644
--- a/data/maps/Route5_PokemonDayCare/map.json
+++ b/data/maps/Route5_PokemonDayCare/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 4,
"y": 4,
"elevation": 3,
diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json
index 7cf88dbcb..f34ea88bf 100644
--- a/data/maps/Route5_SouthEntrance/map.json
+++ b/data/maps/Route5_SouthEntrance/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
"x": 1,
"y": 5,
"elevation": 3,
diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json
index b5f66bf88..c0e0968bb 100644
--- a/data/maps/Route6/map.json
+++ b/data/maps/Route6/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 3,
"y": 16,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CAMPER",
+ "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
"x": 12,
"y": 21,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 13,
"y": 21,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 20,
"y": 25,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 13,
"y": 32,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CAMPER",
+ "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
"x": 13,
"y": 33,
"elevation": 3,
diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json
index f354d825c..3ffcf414a 100644
--- a/data/maps/Route6_NorthEntrance/map.json
+++ b/data/maps/Route6_NorthEntrance/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
"x": 7,
"y": 5,
"elevation": 3,
diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json
index baf05fc78..e08a364f1 100644
--- a/data/maps/Route7_EastEntrance/map.json
+++ b/data/maps/Route7_EastEntrance/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
"x": 6,
"y": 2,
"elevation": 3,
diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json
index 9a15eca59..b1ff3747a 100644
--- a/data/maps/Route8/map.json
+++ b/data/maps/Route8/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 62,
"y": 14,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 55,
"y": 15,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 51,
"y": 6,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 29,
"y": 3,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 29,
"y": 4,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 29,
"y": 5,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 29,
"y": 6,
"elevation": 3,
@@ -116,7 +116,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 21,
"y": 3,
"elevation": 3,
@@ -129,7 +129,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 9,
"y": 6,
"elevation": 3,
@@ -142,7 +142,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 33,
"y": 15,
"elevation": 3,
@@ -155,7 +155,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 47,
"y": 12,
"elevation": 3,
@@ -168,7 +168,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 40,
"y": 3,
"elevation": 3,
@@ -181,7 +181,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 41,
"y": 3,
"elevation": 3,
@@ -194,7 +194,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 14,
"y": 16,
"elevation": 3,
@@ -207,7 +207,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 24,
"y": 17,
"elevation": 3,
diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json
index 9a8bd58ba..02365a2b4 100644
--- a/data/maps/Route8_WestEntrance/map.json
+++ b/data/maps/Route8_WestEntrance/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_POLICEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN",
"x": 6,
"y": 2,
"elevation": 3,
diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json
index e6fff0498..b8e4aef83 100644
--- a/data/maps/Route9/map.json
+++ b/data/maps/Route9/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 14,
"y": 10,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 20,
"y": 17,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 61,
"y": 16,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CAMPER",
+ "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
"x": 26,
"y": 7,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 26,
"y": 1,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 49,
"y": 7,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 53,
"y": 2,
"elevation": 3,
@@ -116,7 +116,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 60,
"y": 9,
"elevation": 3,
@@ -129,7 +129,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CAMPER",
+ "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
"x": 36,
"y": 6,
"elevation": 3,
@@ -142,7 +142,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 2,
"y": 8,
"elevation": 3,
@@ -155,7 +155,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 12,
"y": 17,
"elevation": 3,
@@ -168,7 +168,7 @@
"flag": "FLAG_HIDE_ROUTE9_TM40"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 65,
"y": 17,
"elevation": 3,
diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json
index fff50854a..ba206ecd0 100644
--- a/data/maps/SSAnne_1F_Corridor/map.json
+++ b/data/maps/SSAnne_1F_Corridor/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 18,
"y": 8,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 12,
"y": 9,
"elevation": 3,
diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json
index 784405a63..18ef8fc04 100644
--- a/data/maps/SSAnne_1F_Room1/map.json
+++ b/data/maps/SSAnne_1F_Room1/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 2,
"y": 5,
"elevation": 3,
diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json
index 1895ff07a..a9ec320be 100644
--- a/data/maps/SSAnne_1F_Room2/map.json
+++ b/data/maps/SSAnne_1F_Room2/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 5,
"y": 3,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 0,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 2,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 5,
"y": 7,
"elevation": 3,
diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json
index da0466b37..e5c78e2b6 100644
--- a/data/maps/SSAnne_1F_Room3/map.json
+++ b/data/maps/SSAnne_1F_Room3/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 3,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WIGGLYTUFF",
+ "graphics_id": "OBJECT_EVENT_GFX_WIGGLYTUFF",
"x": 4,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 0,
"y": 4,
"elevation": 3,
diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json
index 4f8d00d91..8011082b6 100644
--- a/data/maps/SSAnne_1F_Room4/map.json
+++ b/data/maps/SSAnne_1F_Room4/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 2,
"y": 4,
"elevation": 3,
diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json
index bd987f990..92f493357 100644
--- a/data/maps/SSAnne_1F_Room5/map.json
+++ b/data/maps/SSAnne_1F_Room5/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 2,
"y": 6,
"elevation": 3,
diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json
index 8eca10460..0d7dbf323 100644
--- a/data/maps/SSAnne_1F_Room6/map.json
+++ b/data/maps/SSAnne_1F_Room6/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 3,
"y": 5,
"elevation": 3,
diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json
index b93710fe4..d5ca318a5 100644
--- a/data/maps/SSAnne_1F_Room7/map.json
+++ b/data/maps/SSAnne_1F_Room7/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 4,
"y": 3,
"elevation": 3,
diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json
index b45106629..32aa20766 100644
--- a/data/maps/SSAnne_2F_Corridor/map.json
+++ b/data/maps/SSAnne_2F_Corridor/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BLUE",
+ "graphics_id": "OBJECT_EVENT_GFX_BLUE",
"x": 30,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_SS_ANNE_RIVAL"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 2,
"y": 7,
"elevation": 3,
diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json
index c590cad89..06830f6cc 100644
--- a/data/maps/SSAnne_2F_Room1/map.json
+++ b/data/maps/SSAnne_2F_Room1/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 1,
"y": 4,
"elevation": 3,
diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json
index 124f37b4f..1aeabe4d5 100644
--- a/data/maps/SSAnne_2F_Room2/map.json
+++ b/data/maps/SSAnne_2F_Room2/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 5,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 1,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 3,
"y": 3,
"elevation": 0,
diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json
index cec02b750..ee86853c8 100644
--- a/data/maps/SSAnne_2F_Room3/map.json
+++ b/data/maps/SSAnne_2F_Room3/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 2,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 3,
"y": 2,
"elevation": 3,
diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json
index 966b86cf6..8cba587e6 100644
--- a/data/maps/SSAnne_2F_Room4/map.json
+++ b/data/maps/SSAnne_2F_Room4/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 0,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 3,
"y": 3,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 2,
"y": 4,
"elevation": 3,
diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json
index 3759a810b..0583bd2a1 100644
--- a/data/maps/SSAnne_2F_Room5/map.json
+++ b/data/maps/SSAnne_2F_Room5/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 5,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
"x": 3,
"y": 5,
"elevation": 3,
diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json
index 4583c0fcb..b1a3c0f8f 100644
--- a/data/maps/SSAnne_2F_Room6/map.json
+++ b/data/maps/SSAnne_2F_Room6/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_3",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
"x": 1,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 4,
"y": 4,
"elevation": 3,
diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json
index 654973f7d..8933f6f60 100644
--- a/data/maps/SSAnne_3F_Corridor/map.json
+++ b/data/maps/SSAnne_3F_Corridor/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 10,
"y": 4,
"elevation": 3,
diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json
index 4a7460d85..a82071d9e 100644
--- a/data/maps/SSAnne_B1F_Room1/map.json
+++ b/data/maps/SSAnne_B1F_Room1/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 5,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 3,
"y": 2,
"elevation": 3,
diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json
index c69229610..173d2149e 100644
--- a/data/maps/SSAnne_B1F_Room2/map.json
+++ b/data/maps/SSAnne_B1F_Room2/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 3,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 3,
"y": 2,
"elevation": 3,
diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json
index d4f6b9c97..f1acb1d5a 100644
--- a/data/maps/SSAnne_B1F_Room3/map.json
+++ b/data/maps/SSAnne_B1F_Room3/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 4,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 1,
"y": 5,
"elevation": 3,
diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json
index 8fb8e9349..32f9351fb 100644
--- a/data/maps/SSAnne_B1F_Room4/map.json
+++ b/data/maps/SSAnne_B1F_Room4/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 3,
"y": 3,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 2,
"y": 6,
"elevation": 3,
diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json
index bd70e785b..6313e108a 100644
--- a/data/maps/SSAnne_B1F_Room5/map.json
+++ b/data/maps/SSAnne_B1F_Room5/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 3,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MACHOKE",
+ "graphics_id": "OBJECT_EVENT_GFX_MACHOKE",
"x": 2,
"y": 5,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 2,
"y": 2,
"elevation": 0,
diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json
index 3c5b166f4..b8f968c32 100644
--- a/data/maps/SSAnne_CaptainsOffice/map.json
+++ b/data/maps/SSAnne_CaptainsOffice/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CAPTAIN",
+ "graphics_id": "OBJECT_EVENT_GFX_CAPTAIN",
"x": 5,
"y": 4,
"elevation": 3,
diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json
index fcf2204fe..2ac95ca72 100644
--- a/data/maps/SSAnne_Deck/map.json
+++ b/data/maps/SSAnne_Deck/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 12,
"y": 10,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 14,
"y": 11,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 13,
"y": 13,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 6,
"y": 9,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 11,
"y": 5,
"elevation": 3,
diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json
index 65461e33a..7be9b5fb5 100644
--- a/data/maps/SSAnne_Exterior/map.json
+++ b/data/maps/SSAnne_Exterior/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SS_ANNE",
+ "graphics_id": "OBJECT_EVENT_GFX_SS_ANNE",
"x": 30,
"y": 16,
"elevation": 1,
diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json
index 45404e0cc..968d87938 100644
--- a/data/maps/SSAnne_Kitchen/map.json
+++ b/data/maps/SSAnne_Kitchen/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CHEF",
+ "graphics_id": "OBJECT_EVENT_GFX_CHEF",
"x": 1,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHEF",
+ "graphics_id": "OBJECT_EVENT_GFX_CHEF",
"x": 6,
"y": 6,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHEF",
+ "graphics_id": "OBJECT_EVENT_GFX_CHEF",
"x": 10,
"y": 4,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHEF",
+ "graphics_id": "OBJECT_EVENT_GFX_CHEF",
"x": 8,
"y": 9,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHEF",
+ "graphics_id": "OBJECT_EVENT_GFX_CHEF",
"x": 14,
"y": 5,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHEF",
+ "graphics_id": "OBJECT_EVENT_GFX_CHEF",
"x": 14,
"y": 7,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHEF",
+ "graphics_id": "OBJECT_EVENT_GFX_CHEF",
"x": 14,
"y": 9,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 1,
"y": 10,
"elevation": 3,
diff --git a/data/maps/SafariZone_Building1/map.json b/data/maps/SafariZone_Building1/map.json
index 700aa87d1..3a1d5491f 100644
--- a/data/maps/SafariZone_Building1/map.json
+++ b/data/maps/SafariZone_Building1/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 3,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 7,
"y": 3,
"elevation": 3,
diff --git a/data/maps/SafariZone_Building2/map.json b/data/maps/SafariZone_Building2/map.json
index 17b2fb57a..856b8b647 100644
--- a/data/maps/SafariZone_Building2/map.json
+++ b/data/maps/SafariZone_Building2/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 3,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 6,
"y": 3,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 7,
"y": 3,
"elevation": 3,
diff --git a/data/maps/SafariZone_Building3/map.json b/data/maps/SafariZone_Building3/map.json
index de59e1575..0dca9cb75 100644
--- a/data/maps/SafariZone_Building3/map.json
+++ b/data/maps/SafariZone_Building3/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 3,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 7,
"y": 5,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 6,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 11,
"y": 2,
"elevation": 3,
diff --git a/data/maps/SafariZone_Building4/map.json b/data/maps/SafariZone_Building4/map.json
index 09b1e09a7..2ca3a9a4f 100644
--- a/data/maps/SafariZone_Building4/map.json
+++ b/data/maps/SafariZone_Building4/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 3,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 2,
"y": 2,
"elevation": 0,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
"x": 7,
"y": 3,
"elevation": 3,
diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json
index 39b950060..e40c94cee 100644
--- a/data/maps/SafariZone_Center/map.json
+++ b/data/maps/SafariZone_Center/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 24,
"y": 15,
"elevation": 3,
diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json
index dae5d93f8..17f951070 100644
--- a/data/maps/SafariZone_East/map.json
+++ b/data/maps/SafariZone_East/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 13,
"y": 12,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_SAFARI_ZONE_EAST_MAX_POTION"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 37,
"y": 15,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_SAFARI_ZONE_EAST_FULL_RESTORE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 31,
"y": 18,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_SAFARI_ZONE_EAST_TM11"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 36,
"y": 17,
"elevation": 4,
diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json
index 5d15f61f9..0e47573f6 100644
--- a/data/maps/SafariZone_North/map.json
+++ b/data/maps/SafariZone_North/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 33,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_PROTEIN"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 28,
"y": 9,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_TM47"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 29,
"y": 17,
"elevation": 3,
diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json
index 88838d5ff..806455000 100644
--- a/data/maps/SafariZone_SecretHouse/map.json
+++ b/data/maps/SafariZone_SecretHouse/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 6,
"y": 5,
"elevation": 3,
diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json
index bad880c1b..cdccbbe45 100644
--- a/data/maps/SafariZone_West/map.json
+++ b/data/maps/SafariZone_West/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 28,
"y": 14,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 17,
"y": 13,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_SAFARI_ZONE_WEST_TM32"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 16,
"y": 27,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_POTION"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 27,
"y": 24,
"elevation": 3,
diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json
index b70aa83c1..cec8e2fca 100644
--- a/data/maps/SaffronCity/map.json
+++ b/data/maps/SaffronCity/map.json
@@ -36,7 +36,7 @@
"connections_no_include": true,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 22,
"y": 15,
"elevation": 3,
@@ -49,7 +49,7 @@
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 26,
"y": 16,
"elevation": 3,
@@ -62,7 +62,7 @@
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 46,
"y": 13,
"elevation": 3,
@@ -75,7 +75,7 @@
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 27,
"y": 22,
"elevation": 3,
@@ -88,7 +88,7 @@
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 25,
"y": 33,
"elevation": 3,
@@ -101,7 +101,7 @@
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 34,
"y": 31,
"elevation": 3,
@@ -114,7 +114,7 @@
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 30,
"y": 39,
"elevation": 3,
@@ -127,7 +127,7 @@
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 48,
"y": 24,
"elevation": 3,
@@ -140,7 +140,7 @@
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 37,
"y": 32,
"elevation": 3,
@@ -153,7 +153,7 @@
"flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 21,
"y": 23,
"elevation": 3,
@@ -166,7 +166,7 @@
"flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 39,
"y": 16,
"elevation": 3,
@@ -179,7 +179,7 @@
"flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
},
{
- "graphics_id": "MAP_OBJ_GFX_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 44,
"y": 22,
"elevation": 3,
@@ -192,7 +192,7 @@
"flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
},
{
- "graphics_id": "MAP_OBJ_GFX_PIDGEOT",
+ "graphics_id": "OBJECT_EVENT_GFX_PIDGEOT",
"x": 45,
"y": 22,
"elevation": 3,
@@ -205,7 +205,7 @@
"flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 32,
"y": 39,
"elevation": 3,
@@ -218,7 +218,7 @@
"flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
},
{
- "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
"x": 47,
"y": 24,
"elevation": 3,
diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json
index 91bf8e662..a0137ad22 100644
--- a/data/maps/SaffronCity_Dojo/map.json
+++ b/data/maps/SaffronCity_Dojo/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 11,
"y": 10,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 1,
"y": 10,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 11,
"y": 8,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 1,
"y": 8,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 6,
"y": 5,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 5,
"y": 3,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_HIDE_DOJO_HITMONLEE_BALL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 7,
"y": 3,
"elevation": 3,
diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json
index 4f6f13afc..407084933 100644
--- a/data/maps/SaffronCity_Gym/map.json
+++ b/data/maps/SaffronCity_Gym/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"x": 24,
"y": 18,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"x": 24,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"x": 4,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 14,
"y": 2,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 4,
"y": 10,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 4,
"y": 18,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SABRINA",
+ "graphics_id": "OBJECT_EVENT_GFX_SABRINA",
"x": 14,
"y": 11,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"x": 24,
"y": 10,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GYM_GUY",
+ "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
"x": 15,
"y": 20,
"elevation": 3,
diff --git a/data/maps/SaffronCity_House1_1F/map.json b/data/maps/SaffronCity_House1_1F/map.json
index 6a233f785..a6e09da5c 100644
--- a/data/maps/SaffronCity_House1_1F/map.json
+++ b/data/maps/SaffronCity_House1_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 8,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_3",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
"x": 3,
"y": 3,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHANSEY",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANSEY",
"x": 4,
"y": 4,
"elevation": 3,
diff --git a/data/maps/SaffronCity_House1_2F/map.json b/data/maps/SaffronCity_House1_2F/map.json
index 8598b129a..279ebff20 100644
--- a/data/maps/SaffronCity_House1_2F/map.json
+++ b/data/maps/SaffronCity_House1_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_DODUO",
+ "graphics_id": "OBJECT_EVENT_GFX_DODUO",
"x": 6,
"y": 8,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PIKACHU",
+ "graphics_id": "OBJECT_EVENT_GFX_PIKACHU",
"x": 4,
"y": 6,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_JIGGLYPUFF",
+ "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF",
"x": 7,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 9,
"y": 6,
"elevation": 3,
diff --git a/data/maps/SaffronCity_House2/map.json b/data/maps/SaffronCity_House2/map.json
index 4c6e64a1d..8f61b1054 100644
--- a/data/maps/SaffronCity_House2/map.json
+++ b/data/maps/SaffronCity_House2/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_PIDGEY",
+ "graphics_id": "OBJECT_EVENT_GFX_PIDGEY",
"x": 0,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 4,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 6,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CLIPBOARD",
+ "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD",
"x": 5,
"y": 4,
"elevation": 0,
diff --git a/data/maps/SaffronCity_House3/map.json b/data/maps/SaffronCity_House3/map.json
index 51f9c8294..858646db5 100644
--- a/data/maps/SaffronCity_House3/map.json
+++ b/data/maps/SaffronCity_House3/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 7,
"y": 4,
"elevation": 3,
diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json
index d4248d680..8e4b9ce60 100644
--- a/data/maps/SaffronCity_Mart/map.json
+++ b/data/maps/SaffronCity_Mart/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 2,
"y": 3,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 1,
"y": 7,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 9,
"y": 5,
"elevation": 3,
diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json
index 9fbefc7f3..a10d91a62 100644
--- a/data/maps/SaffronCity_PokemonCenter_1F/map.json
+++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 14,
"y": 6,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_3",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
"x": 4,
"y": 4,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 9,
"y": 6,
"elevation": 3,
diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json
index dd7076a54..fd1021732 100644
--- a/data/maps/SaffronCity_PokemonCenter_2F/map.json
+++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
index dbeccc674..9bb75dc81 100644
--- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
+++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
"x": 7,
"y": 13,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 6,
"y": 11,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 3,
"y": 13,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 3,
"y": 12,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_3",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
"x": 9,
"y": 11,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 7,
"y": 12,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER"
},
{
- "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+ "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
"x": 9,
"y": 12,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 5,
"y": 11,
"elevation": 3,
diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json
index 95261f368..ac46adf1f 100644
--- a/data/maps/SeafoamIslands_1F/map.json
+++ b/data/maps/SeafoamIslands_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 22,
"y": 12,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_1"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 32,
"y": 9,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_2"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 11,
"y": 8,
"elevation": 3,
diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json
index ded9935d2..113bfe865 100644
--- a/data/maps/SeafoamIslands_B1F/map.json
+++ b/data/maps/SeafoamIslands_B1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 22,
"y": 8,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_1"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 30,
"y": 8,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_2"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 19,
"y": 18,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B1F_WATER_STONE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 24,
"y": 14,
"elevation": 4,
diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json
index cc9d54955..f1a234d05 100644
--- a/data/maps/SeafoamIslands_B2F/map.json
+++ b/data/maps/SeafoamIslands_B2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 22,
"y": 8,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_1"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 30,
"y": 8,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_2"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 18,
"y": 15,
"elevation": 3,
diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json
index a1068f489..6201fb5ea 100644
--- a/data/maps/SeafoamIslands_B3F/map.json
+++ b/data/maps/SeafoamIslands_B3F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 23,
"y": 8,
"elevation": 1,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_1"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 24,
"y": 8,
"elevation": 1,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_2"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 12,
"y": 16,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_5"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 13,
"y": 16,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_6"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 9,
"y": 16,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_4"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 6,
"y": 17,
"elevation": 3,
diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json
index 8ef4ca3b2..edd644634 100644
--- a/data/maps/SeafoamIslands_B4F/map.json
+++ b/data/maps/SeafoamIslands_B4F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 8,
"y": 18,
"elevation": 1,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_1"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 9,
"y": 18,
"elevation": 1,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_2"
},
{
- "graphics_id": "MAP_OBJ_GFX_ARTICUNO",
+ "graphics_id": "OBJECT_EVENT_GFX_ARTICUNO",
"x": 9,
"y": 2,
"elevation": 4,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_ARTICUNO"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 22,
"y": 19,
"elevation": 4,
diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json
index c9fe0c17b..d83f81ed4 100644
--- a/data/maps/SevenIsland/map.json
+++ b/data/maps/SevenIsland/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"x": 7,
"y": 18,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
"x": 9,
"y": 7,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 15,
"y": 5,
"elevation": 3,
diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json
index cd88eae20..1e86aa88b 100644
--- a/data/maps/SevenIsland_Harbor/map.json
+++ b/data/maps/SevenIsland_Harbor/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
+ "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
"x": 8,
"y": 9,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 8,
"y": 6,
"elevation": 3,
diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json
index 066f3d18d..822cc960a 100644
--- a/data/maps/SevenIsland_House_Room1/map.json
+++ b/data/maps/SevenIsland_House_Room1/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
"x": 4,
"y": 4,
"elevation": 3,
diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json
index 2336916fa..219481590 100644
--- a/data/maps/SevenIsland_House_Room2/map.json
+++ b/data/maps/SevenIsland_House_Room2/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_VAR_0",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 6,
"y": 5,
"elevation": 0,
diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json
index 94f07f060..715183f88 100644
--- a/data/maps/SevenIsland_Mart/map.json
+++ b/data/maps/SevenIsland_Mart/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 2,
"y": 3,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 6,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 9,
"y": 5,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 5,
"y": 4,
"elevation": 3,
diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json
index 702c10d3b..dc68e4013 100644
--- a/data/maps/SevenIsland_PokemonCenter_1F/map.json
+++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 11,
"y": 5,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 14,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+ "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
"x": 4,
"y": 4,
"elevation": 3,
diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json
index 9817d6ff1..bcd215d25 100644
--- a/data/maps/SevenIsland_PokemonCenter_2F/map.json
+++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json
index cf4f14540..350cb0060 100644
--- a/data/maps/SevenIsland_SevaultCanyon/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL",
"x": 13,
"y": 43,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 13,
"y": 36,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CAMPER",
+ "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
"x": 3,
"y": 35,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 3,
"y": 36,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"x": 7,
"y": 56,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
"x": 11,
"y": 63,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"x": 14,
"y": 13,
"elevation": 3,
@@ -116,7 +116,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
"x": 14,
"y": 14,
"elevation": 3,
@@ -129,7 +129,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 3,
"y": 41,
"elevation": 3,
@@ -142,7 +142,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 13,
"y": 47,
"elevation": 3,
@@ -155,7 +155,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 7,
"y": 44,
"elevation": 3,
@@ -168,7 +168,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 12,
"y": 47,
"elevation": 3,
@@ -181,7 +181,7 @@
"flag": "FLAG_TEMP_15"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 15,
"y": 46,
"elevation": 3,
@@ -194,7 +194,7 @@
"flag": "FLAG_TEMP_16"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 16,
"y": 47,
"elevation": 3,
@@ -207,7 +207,7 @@
"flag": "FLAG_TEMP_17"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 17,
"y": 47,
"elevation": 3,
@@ -220,7 +220,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK",
"x": 11,
"y": 31,
"elevation": 3,
@@ -233,7 +233,7 @@
"flag": "FLAG_TEMP_1B"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 18,
"y": 45,
"elevation": 3,
@@ -246,7 +246,7 @@
"flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_KINGS_ROCK"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 7,
"y": 38,
"elevation": 3,
@@ -259,7 +259,7 @@
"flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_MAX_ELIXIR"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 17,
"y": 23,
"elevation": 3,
@@ -272,7 +272,7 @@
"flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_NUGGET"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 8,
"y": 26,
"elevation": 3,
diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json
index 90a26bff2..d0ad8bc08 100644
--- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 12,
"y": 6,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+ "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
"x": 3,
"y": 34,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 4,
"y": 34,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CAMPER",
+ "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
"x": 11,
"y": 26,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 10,
"y": 26,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 11,
"y": 17,
"elevation": 5,
diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json
index 8fa5f28fb..09447abbf 100644
--- a/data/maps/SevenIsland_SevaultCanyon_House/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 2,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CHANSEY",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANSEY",
"x": 4,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 6,
"y": 4,
"elevation": 0,
diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
index 4f492d72d..c1b70fd2d 100644
--- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 7,
"y": 6,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 8,
"y": 6,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 8,
"y": 9,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 6,
"y": 10,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 8,
"y": 10,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 6,
"y": 9,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 6,
"y": 6,
"elevation": 3,
diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json
index 812fa7fc3..619d30729 100644
--- a/data/maps/SevenIsland_TanobyRuins/map.json
+++ b/data/maps/SevenIsland_TanobyRuins/map.json
@@ -20,7 +20,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 35,
"y": 7,
"elevation": 3,
@@ -33,7 +33,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 121,
"y": 11,
"elevation": 3,
@@ -46,7 +46,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 85,
"y": 8,
"elevation": 3,
@@ -59,7 +59,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 85,
"y": 5,
"elevation": 3,
diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json
index 9d9244f89..9973bc923 100644
--- a/data/maps/SevenIsland_TrainerTower/map.json
+++ b/data/maps/SevenIsland_TrainerTower/map.json
@@ -20,7 +20,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 56,
"y": 26,
"elevation": 3,
@@ -33,7 +33,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 56,
"y": 29,
"elevation": 3,
diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json
index 8340ada47..524654792 100644
--- a/data/maps/SevenIsland_TrainerTower_1F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE",
+ "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
"x": 9,
"y": 7,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_TEMP_6"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_0",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 11,
"y": 10,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_TEMP_2"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_1",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
"x": 15,
"y": 13,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_TEMP_3"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_2",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
"x": 10,
"y": 16,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_TEMP_4"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_3",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
"x": 10,
"y": 10,
"elevation": 3,
diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json
index 3cab31165..dde2e99ac 100644
--- a/data/maps/SevenIsland_TrainerTower_2F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE",
+ "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
"x": 9,
"y": 7,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_TEMP_6"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_0",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 10,
"y": 10,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_TEMP_2"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_1",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
"x": 15,
"y": 13,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_TEMP_3"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_2",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
"x": 10,
"y": 16,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_TEMP_4"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_3",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
"x": 11,
"y": 10,
"elevation": 3,
diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json
index 32b53f781..ddc7e3009 100644
--- a/data/maps/SevenIsland_TrainerTower_3F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_3F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE",
+ "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
"x": 9,
"y": 7,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_TEMP_6"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_0",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 10,
"y": 10,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_TEMP_2"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_1",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
"x": 15,
"y": 13,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_TEMP_3"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_2",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
"x": 10,
"y": 16,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_TEMP_4"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_3",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
"x": 11,
"y": 10,
"elevation": 3,
diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json
index cfb7f97c7..010f213de 100644
--- a/data/maps/SevenIsland_TrainerTower_4F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_4F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE",
+ "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
"x": 9,
"y": 7,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_TEMP_6"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_0",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 10,
"y": 10,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_TEMP_2"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_1",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
"x": 15,
"y": 13,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_TEMP_3"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_2",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
"x": 10,
"y": 16,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_TEMP_4"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_3",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
"x": 11,
"y": 10,
"elevation": 3,
diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json
index 7aae856d4..933e07d80 100644
--- a/data/maps/SevenIsland_TrainerTower_5F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_5F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE",
+ "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
"x": 9,
"y": 7,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_TEMP_6"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_0",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 10,
"y": 10,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_TEMP_2"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_1",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
"x": 15,
"y": 13,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_TEMP_3"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_2",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
"x": 10,
"y": 16,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_TEMP_4"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_3",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
"x": 11,
"y": 10,
"elevation": 3,
diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json
index 6c9ab9fa5..522d796dd 100644
--- a/data/maps/SevenIsland_TrainerTower_6F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_6F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE",
+ "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
"x": 9,
"y": 7,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_TEMP_6"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_0",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 10,
"y": 10,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_TEMP_2"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_1",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
"x": 15,
"y": 13,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_TEMP_3"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_2",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
"x": 10,
"y": 16,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_TEMP_4"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_3",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
"x": 11,
"y": 10,
"elevation": 3,
diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json
index e3984966b..55ca3f1b7 100644
--- a/data/maps/SevenIsland_TrainerTower_7F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_7F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE",
+ "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
"x": 9,
"y": 7,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_TEMP_6"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_0",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 10,
"y": 10,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_TEMP_2"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_1",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
"x": 15,
"y": 13,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_TEMP_3"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_2",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
"x": 10,
"y": 16,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_TEMP_4"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_3",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
"x": 11,
"y": 10,
"elevation": 3,
diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json
index c83e9128b..78e1fe89d 100644
--- a/data/maps/SevenIsland_TrainerTower_8F/map.json
+++ b/data/maps/SevenIsland_TrainerTower_8F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE",
+ "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
"x": 9,
"y": 7,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_TEMP_6"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_0",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 10,
"y": 10,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_TEMP_2"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_1",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
"x": 15,
"y": 13,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_TEMP_3"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_2",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
"x": 10,
"y": 16,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_TEMP_4"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_3",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
"x": 11,
"y": 10,
"elevation": 3,
diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/map.json b/data/maps/SevenIsland_TrainerTower_Lobby/map.json
index 0b3bc2fc5..e4bbd291f 100644
--- a/data/maps/SevenIsland_TrainerTower_Lobby/map.json
+++ b/data/maps/SevenIsland_TrainerTower_Lobby/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 4,
"y": 9,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST",
"x": 14,
"y": 9,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST",
"x": 11,
"y": 7,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
"x": 12,
"y": 13,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 2,
"y": 12,
"elevation": 3,
diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/SevenIsland_TrainerTower_Roof/map.json
index 4fb265a15..cff922886 100644
--- a/data/maps/SevenIsland_TrainerTower_Roof/map.json
+++ b/data/maps/SevenIsland_TrainerTower_Roof/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE",
+ "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
"x": 9,
"y": 7,
"elevation": 3,
diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json
index 666d811f8..f3e5abafe 100644
--- a/data/maps/SilphCo_10F/map.json
+++ b/data/maps/SilphCo_10F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 2,
"y": 7,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
"x": 10,
"y": 17,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 0,
"y": 13,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 5,
"y": 15,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_SILPH_CO_10F_CARBOS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 2,
"y": 15,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_HIDE_SILPH_CO_10F_ULTRA_BALL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 3,
"y": 17,
"elevation": 3,
diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json
index 10f0bc778..bd9d83597 100644
--- a/data/maps/SilphCo_11F/map.json
+++ b/data/maps/SilphCo_11F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
"x": 9,
"y": 9,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
"x": 11,
"y": 9,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GIOVANNI",
+ "graphics_id": "OBJECT_EVENT_GFX_GIOVANNI",
"x": 6,
"y": 11,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 16,
"y": 12,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 16,
"y": 18,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_HIDE_SILPH_CO_11F_ZINC"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 2,
"y": 19,
"elevation": 3,
diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json
index 1adffa9bf..06a5b7ac0 100644
--- a/data/maps/SilphCo_1F/map.json
+++ b/data/maps/SilphCo_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
"x": 3,
"y": 7,
"elevation": 3,
diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json
index 8abb2ed86..a2d405b3a 100644
--- a/data/maps/SilphCo_2F/map.json
+++ b/data/maps/SilphCo_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 29,
"y": 12,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 28,
"y": 18,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 20,
"y": 14,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 5,
"y": 19,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 10,
"y": 4,
"elevation": 0,
diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json
index ced5b0efa..5581d6926 100644
--- a/data/maps/SilphCo_3F/map.json
+++ b/data/maps/SilphCo_3F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 25,
"y": 9,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 31,
"y": 13,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 4,
"y": 12,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 8,
"y": 10,
"elevation": 3,
diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json
index 37566a737..2bfb46286 100644
--- a/data/maps/SilphCo_4F/map.json
+++ b/data/maps/SilphCo_4F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 33,
"y": 16,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 10,
"y": 19,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 14,
"y": 8,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 5,
"y": 5,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 3,
"y": 11,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_HIDE_SILPH_CO_4F_MAX_REVIVE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 4,
"y": 12,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_HIDE_SILPH_CO_4F_ESCAPE_ROPE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 2,
"y": 13,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "FLAG_HIDE_SILPH_CO_4F_FULL_HEAL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 30,
"y": 18,
"elevation": 0,
diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json
index 0391f0718..a59f7836b 100644
--- a/data/maps/SilphCo_5F/map.json
+++ b/data/maps/SilphCo_5F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 35,
"y": 7,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 23,
"y": 13,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 16,
"y": 13,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 11,
"y": 6,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 9,
"y": 21,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 4,
"y": 9,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_HIDE_SILPH_CO_5F_PROTEIN"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 1,
"y": 18,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "FLAG_HIDE_SILPH_CO_5F_TM01"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 22,
"y": 21,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "FLAG_HIDE_SILPH_CO_5F_CARD_KEY"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 2,
"y": 7,
"elevation": 3,
diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json
index bdb8020b4..82eda6e92 100644
--- a/data/maps/SilphCo_6F/map.json
+++ b/data/maps/SilphCo_6F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 21,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 23,
"y": 9,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
"x": 24,
"y": 9,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 22,
"y": 13,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 14,
"y": 9,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
"x": 16,
"y": 12,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 9,
"y": 11,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 2,
"y": 14,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "FLAG_HIDE_SILPH_CO_6F_HP_UP"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 1,
"y": 17,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "FLAG_HIDE_SILPH_CO_6F_X_SPECIAL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 18,
"y": 17,
"elevation": 3,
diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json
index fcaeaef00..ec2735f05 100644
--- a/data/maps/SilphCo_7F/map.json
+++ b/data/maps/SilphCo_7F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BLUE",
+ "graphics_id": "OBJECT_EVENT_GFX_BLUE",
"x": 2,
"y": 6,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_SILPH_RIVAL"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 0,
"y": 7,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 24,
"y": 5,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 24,
"y": 15,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 13,
"y": 4,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
"x": 10,
"y": 10,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 13,
"y": 14,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 9,
"y": 14,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 3,
"y": 13,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 0,
"y": 12,
"elevation": 3,
@@ -144,7 +144,7 @@
"flag": "FLAG_HIDE_SILPH_CO_7F_CALCIUM"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 30,
"y": 11,
"elevation": 3,
diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json
index 05f29bbd3..7d1f410dc 100644
--- a/data/maps/SilphCo_8F/map.json
+++ b/data/maps/SilphCo_8F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 28,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 10,
"y": 17,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 9,
"y": 4,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_M",
"x": 2,
"y": 5,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 24,
"y": 8,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_HIDE_SILPH_CO_8F_IRON"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 29,
"y": 9,
"elevation": 3,
diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json
index 7d3227d08..b350f620c 100644
--- a/data/maps/SilphCo_9F/map.json
+++ b/data/maps/SilphCo_9F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 26,
"y": 16,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 15,
"y": 18,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_SILPH_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 2,
"y": 16,
"elevation": 0,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 1,
"y": 6,
"elevation": 3,
diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json
index 072d78313..86eb5ca6d 100644
--- a/data/maps/SixIsland/map.json
+++ b/data/maps/SixIsland/map.json
@@ -20,7 +20,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 10,
"y": 15,
"elevation": 3,
@@ -33,7 +33,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 15,
"y": 13,
"elevation": 3,
diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
index 9f1c986c9..6d0b3c957 100644
--- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
+++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SAPPHIRE",
+ "graphics_id": "OBJECT_EVENT_GFX_SAPPHIRE",
"x": 7,
"y": 7,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_SAPPHIRE"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 5,
"y": 9,
"elevation": 3,
diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json
index c104478d5..57be8be4a 100644
--- a/data/maps/SixIsland_GreenPath/map.json
+++ b/data/maps/SixIsland_GreenPath/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 11,
"y": 8,
"elevation": 3,
diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json
index 4469af84e..be77bd7eb 100644
--- a/data/maps/SixIsland_Harbor/map.json
+++ b/data/maps/SixIsland_Harbor/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
+ "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
"x": 8,
"y": 9,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 8,
"y": 6,
"elevation": 3,
diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json
index 447c0a10c..026d381e1 100644
--- a/data/maps/SixIsland_House/map.json
+++ b/data/maps/SixIsland_House/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 7,
"y": 5,
"elevation": 3,
diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json
index e0852cc49..988fddd5f 100644
--- a/data/maps/SixIsland_Mart/map.json
+++ b/data/maps/SixIsland_Mart/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 2,
"y": 3,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN",
"x": 8,
"y": 3,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 7,
"y": 7,
"elevation": 3,
diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json
index 47e361882..0997aafc7 100644
--- a/data/maps/SixIsland_OutcastIsland/map.json
+++ b/data/maps/SixIsland_OutcastIsland/map.json
@@ -20,7 +20,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCKET_M",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
"x": 9,
"y": 24,
"elevation": 3,
@@ -33,7 +33,7 @@
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 12,
"y": 15,
"elevation": 3,
@@ -46,7 +46,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
"x": 13,
"y": 34,
"elevation": 1,
@@ -59,7 +59,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
"x": 14,
"y": 61,
"elevation": 1,
@@ -72,7 +72,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
"x": 10,
"y": 44,
"elevation": 1,
@@ -85,7 +85,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_TUBER_M_1",
+ "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1",
"x": 11,
"y": 44,
"elevation": 1,
@@ -98,7 +98,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 11,
"y": 16,
"elevation": 3,
diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json
index 8763c72fa..733c0c958 100644
--- a/data/maps/SixIsland_PatternBush/map.json
+++ b/data/maps/SixIsland_PatternBush/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 48,
"y": 15,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 10,
"y": 5,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 51,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 12,
"y": 13,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 37,
"y": 23,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 32,
"y": 5,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 52,
"y": 20,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 8,
"y": 21,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 39,
"y": 6,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CAMPER",
+ "graphics_id": "OBJECT_EVENT_GFX_CAMPER",
"x": 3,
"y": 9,
"elevation": 3,
@@ -144,7 +144,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 19,
"y": 24,
"elevation": 3,
@@ -157,7 +157,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 30,
"y": 19,
"elevation": 3,
diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json
index eae20e595..2f3c4b610 100644
--- a/data/maps/SixIsland_PokemonCenter_1F/map.json
+++ b/data/maps/SixIsland_PokemonCenter_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLUE",
+ "graphics_id": "OBJECT_EVENT_GFX_BLUE",
"x": 5,
"y": 5,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 13,
"y": 3,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
"x": 12,
"y": 5,
"elevation": 3,
diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json
index bf48ee91c..2c1c53efb 100644
--- a/data/maps/SixIsland_PokemonCenter_2F/map.json
+++ b/data/maps/SixIsland_PokemonCenter_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json
index d31b0fe31..c3be304c9 100644
--- a/data/maps/SixIsland_RuinValley/map.json
+++ b/data/maps/SixIsland_RuinValley/map.json
@@ -20,7 +20,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 24,
"y": 25,
"elevation": 3,
@@ -33,7 +33,7 @@
"flag": "FLAG_HIDE_RUIN_VALLEY_SCIENTIST"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 32,
"y": 11,
"elevation": 5,
@@ -46,7 +46,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 33,
"y": 16,
"elevation": 5,
@@ -59,7 +59,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 31,
"y": 24,
"elevation": 5,
@@ -72,7 +72,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 14,
"y": 10,
"elevation": 5,
@@ -85,7 +85,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+ "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
"x": 21,
"y": 29,
"elevation": 5,
@@ -98,7 +98,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 17,
"y": 10,
"elevation": 5,
@@ -111,7 +111,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 17,
"y": 12,
"elevation": 5,
@@ -124,7 +124,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 18,
"y": 11,
"elevation": 5,
@@ -137,7 +137,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 6,
"y": 33,
"elevation": 3,
@@ -150,7 +150,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 6,
"y": 34,
"elevation": 3,
@@ -163,7 +163,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 41,
"y": 32,
"elevation": 3,
@@ -176,7 +176,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 41,
"y": 33,
"elevation": 3,
@@ -189,7 +189,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 42,
"y": 33,
"elevation": 3,
@@ -202,7 +202,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 5,
"y": 33,
"elevation": 3,
@@ -215,7 +215,7 @@
"flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_HP_UP"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 19,
"y": 11,
"elevation": 5,
@@ -228,7 +228,7 @@
"flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_FULL_RESTORE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 43,
"y": 32,
"elevation": 3,
diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json
index 470b708c5..f1bd689c9 100644
--- a/data/maps/SixIsland_WaterPath/map.json
+++ b/data/maps/SixIsland_WaterPath/map.json
@@ -30,7 +30,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 12,
"y": 13,
"elevation": 3,
@@ -43,7 +43,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 11,
"y": 52,
"elevation": 3,
@@ -56,7 +56,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER",
"x": 13,
"y": 35,
"elevation": 1,
@@ -69,7 +69,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
"x": 15,
"y": 45,
"elevation": 1,
@@ -82,7 +82,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 6,
"y": 21,
"elevation": 3,
@@ -95,7 +95,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 7,
"y": 21,
"elevation": 3,
@@ -108,7 +108,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 11,
"y": 76,
"elevation": 3,
@@ -121,7 +121,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 17,
"y": 19,
"elevation": 0,
@@ -134,7 +134,7 @@
"flag": "FLAG_HIDE_SIX_ISLAND_WATER_PATH_ELIXIR"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 17,
"y": 87,
"elevation": 3,
diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json
index c889d7a5a..6cc57af62 100644
--- a/data/maps/SixIsland_WaterPath_House1/map.json
+++ b/data/maps/SixIsland_WaterPath_House1/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+ "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
"x": 3,
"y": 4,
"elevation": 3,
diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json
index 818e179f4..cf4c1dad2 100644
--- a/data/maps/SixIsland_WaterPath_House2/map.json
+++ b/data/maps/SixIsland_WaterPath_House2/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 7,
"y": 4,
"elevation": 3,
diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json
index 49100e7a0..fc30c5a41 100644
--- a/data/maps/ThreeIsland/map.json
+++ b/data/maps/ThreeIsland/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 7,
"y": 24,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 8,
"y": 23,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 8,
"y": 24,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "FLAG_HIDE_THREE_ISLAND_LONE_BIKER"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 9,
"y": 23,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 9,
"y": 24,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 10,
"y": 22,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 10,
"y": 24,
"elevation": 3,
@@ -116,7 +116,7 @@
"flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 11,
"y": 23,
"elevation": 3,
@@ -129,7 +129,7 @@
"flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 20,
"y": 7,
"elevation": 3,
@@ -142,7 +142,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 18,
"y": 17,
"elevation": 3,
@@ -155,7 +155,7 @@
"flag": "FLAG_HIDE_THREE_ISLAND_ZINC"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 15,
"y": 7,
"elevation": 3,
@@ -168,7 +168,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
"x": 14,
"y": 14,
"elevation": 3,
@@ -181,7 +181,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_DODUO",
+ "graphics_id": "OBJECT_EVENT_GFX_DODUO",
"x": 15,
"y": 14,
"elevation": 3,
@@ -194,7 +194,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 15,
"y": 31,
"elevation": 3,
diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json
index 0e14592f6..a9a72b4ae 100644
--- a/data/maps/ThreeIsland_BerryForest/map.json
+++ b/data/maps/ThreeIsland_BerryForest/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 4,
"y": 8,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 12,
"y": 11,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 19,
"y": 7,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 23,
"y": 17,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_TEMP_14"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 38,
"y": 23,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_TEMP_15"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 44,
"y": 23,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_TEMP_16"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 44,
"y": 29,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "FLAG_TEMP_17"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 16,
"y": 43,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "FLAG_TEMP_18"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 17,
"y": 39,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "FLAG_TEMP_19"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 14,
"y": 39,
"elevation": 3,
@@ -144,7 +144,7 @@
"flag": "FLAG_TEMP_1A"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 11,
"y": 39,
"elevation": 3,
@@ -157,7 +157,7 @@
"flag": "FLAG_TEMP_1B"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 12,
"y": 5,
"elevation": 3,
@@ -170,7 +170,7 @@
"flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ETHER"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 27,
"y": 11,
"elevation": 3,
@@ -183,7 +183,7 @@
"flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_FULL_HEAL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 12,
"y": 43,
"elevation": 3,
diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json
index 02ac7426c..71dbfd64d 100644
--- a/data/maps/ThreeIsland_BondBridge/map.json
+++ b/data/maps/ThreeIsland_BondBridge/map.json
@@ -20,7 +20,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 27,
"y": 10,
"elevation": 3,
@@ -33,7 +33,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 68,
"y": 10,
"elevation": 3,
@@ -46,7 +46,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_TUBER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_TUBER_F",
"x": 33,
"y": 13,
"elevation": 3,
@@ -59,7 +59,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_TUBER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_TUBER_F",
"x": 50,
"y": 11,
"elevation": 3,
@@ -72,7 +72,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER",
+ "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER",
"x": 36,
"y": 4,
"elevation": 1,
@@ -85,7 +85,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 77,
"y": 5,
"elevation": 3,
@@ -98,7 +98,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 78,
"y": 5,
"elevation": 3,
@@ -111,7 +111,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 72,
"y": 8,
"elevation": 3,
@@ -124,7 +124,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 86,
"y": 13,
"elevation": 3,
diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json
index 317fb6580..18fddbfc1 100644
--- a/data/maps/ThreeIsland_DunsparceTunnel/map.json
+++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
"x": 23,
"y": 2,
"elevation": 3,
diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json
index dfce743a3..b11ac06db 100644
--- a/data/maps/ThreeIsland_Harbor/map.json
+++ b/data/maps/ThreeIsland_Harbor/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
+ "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
"x": 8,
"y": 9,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 8,
"y": 6,
"elevation": 3,
diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json
index e21901499..a8aa72fdf 100644
--- a/data/maps/ThreeIsland_House1/map.json
+++ b/data/maps/ThreeIsland_House1/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 3,
"y": 4,
"elevation": 0,
diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json
index 681380cc9..f692de547 100644
--- a/data/maps/ThreeIsland_House2/map.json
+++ b/data/maps/ThreeIsland_House2/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 4,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 7,
"y": 4,
"elevation": 3,
diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json
index df96d64eb..65e391a96 100644
--- a/data/maps/ThreeIsland_House3/map.json
+++ b/data/maps/ThreeIsland_House3/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+ "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
"x": 8,
"y": 2,
"elevation": 3,
diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json
index a518b76d8..1933aab5e 100644
--- a/data/maps/ThreeIsland_House4/map.json
+++ b/data/maps/ThreeIsland_House4/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 7,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
"x": 6,
"y": 3,
"elevation": 3,
diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json
index c5f567825..2a9a5665a 100644
--- a/data/maps/ThreeIsland_House5/map.json
+++ b/data/maps/ThreeIsland_House5/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 2,
"y": 5,
"elevation": 3,
diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json
index f27177490..c7db3c25c 100644
--- a/data/maps/ThreeIsland_Mart/map.json
+++ b/data/maps/ThreeIsland_Mart/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 2,
"y": 3,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PICNICKER",
+ "graphics_id": "OBJECT_EVENT_GFX_PICNICKER",
"x": 2,
"y": 7,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 7,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 6,
"y": 5,
"elevation": 3,
diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json
index 83fec9da8..7a6688bc6 100644
--- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json
+++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 12,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 3,
"y": 4,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 11,
"y": 5,
"elevation": 3,
diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json
index bb174d2f2..af562f042 100644
--- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json
+++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json
index e49bb1224..e7adfec0b 100644
--- a/data/maps/ThreeIsland_Port/map.json
+++ b/data/maps/ThreeIsland_Port/map.json
@@ -20,7 +20,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_3",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
"x": 14,
"y": 9,
"elevation": 3,
@@ -33,7 +33,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 8,
"y": 8,
"elevation": 3,
@@ -46,7 +46,7 @@
"flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 13,
"y": 10,
"elevation": 3,
diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json
index 64aba9d7f..24db68596 100644
--- a/data/maps/TwoIsland/map.json
+++ b/data/maps/TwoIsland/map.json
@@ -20,7 +20,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 28,
"y": 4,
"elevation": 3,
@@ -33,7 +33,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 31,
"y": 6,
"elevation": 3,
@@ -46,7 +46,7 @@
"flag": "FLAG_HIDE_TWO_ISLAND_WOMAN"
},
{
- "graphics_id": "MAP_OBJ_GFX_BEAUTY",
+ "graphics_id": "OBJECT_EVENT_GFX_BEAUTY",
"x": 30,
"y": 11,
"elevation": 3,
@@ -59,7 +59,7 @@
"flag": "FLAG_HIDE_TWO_ISLAND_BEAUTY"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 26,
"y": 5,
"elevation": 3,
@@ -72,7 +72,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+ "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
"x": 27,
"y": 6,
"elevation": 3,
@@ -85,7 +85,7 @@
"flag": "FLAG_HIDE_TWO_ISLAND_SUPER_NERD"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 30,
"y": 16,
"elevation": 3,
@@ -98,7 +98,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 39,
"y": 16,
"elevation": 3,
@@ -111,7 +111,7 @@
"flag": "FLAG_HIDE_TWO_ISLAND_REVIVE"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY",
"x": 37,
"y": 12,
"elevation": 3,
@@ -124,7 +124,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 24,
"y": 12,
"elevation": 3,
diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json
index 93538a4c9..4aa63fd0b 100644
--- a/data/maps/TwoIsland_CapeBrink_House/map.json
+++ b/data/maps/TwoIsland_CapeBrink_House/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CHANNELER",
+ "graphics_id": "OBJECT_EVENT_GFX_CHANNELER",
"x": 4,
"y": 4,
"elevation": 3,
diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json
index 0fb8e4f6b..6d992c355 100644
--- a/data/maps/TwoIsland_Harbor/map.json
+++ b/data/maps/TwoIsland_Harbor/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
+ "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP",
"x": 8,
"y": 9,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 8,
"y": 6,
"elevation": 3,
diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json
index 66f6aabed..684033ce5 100644
--- a/data/maps/TwoIsland_House/map.json
+++ b/data/maps/TwoIsland_House/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
"x": 7,
"y": 5,
"elevation": 3,
diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json
index fd3c9fac2..4caef4f41 100644
--- a/data/maps/TwoIsland_JoyfulGameCorner/map.json
+++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 5,
"y": 5,
"elevation": 1,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_BIKER",
"x": 5,
"y": 8,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 6,
"y": 5,
"elevation": 1,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 4,
"y": 2,
"elevation": 3,
diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json
index 4b227d7b7..4d3db31f6 100644
--- a/data/maps/TwoIsland_PokemonCenter_1F/map.json
+++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GBA_KID",
+ "graphics_id": "OBJECT_EVENT_GFX_GBA_KID",
"x": 11,
"y": 5,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 4,
"y": 4,
"elevation": 3,
diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json
index 43f5eb4ad..a9c4b0c27 100644
--- a/data/maps/TwoIsland_PokemonCenter_2F/map.json
+++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json
index 107b622f6..8ad44f032 100644
--- a/data/maps/UndergroundPath_EastEntrance/map.json
+++ b/data/maps/UndergroundPath_EastEntrance/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 5,
"y": 6,
"elevation": 3,
diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json
index a839da159..93aa45550 100644
--- a/data/maps/UndergroundPath_NorthEntrance/map.json
+++ b/data/maps/UndergroundPath_NorthEntrance/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 5,
"y": 6,
"elevation": 3,
diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json
index cce927999..fd06be101 100644
--- a/data/maps/UndergroundPath_SouthEntrance/map.json
+++ b/data/maps/UndergroundPath_SouthEntrance/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 5,
"y": 6,
"elevation": 3,
diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json
index dd73060a4..bc4e4f4aa 100644
--- a/data/maps/UndergroundPath_WestEntrance/map.json
+++ b/data/maps/UndergroundPath_WestEntrance/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 5,
"y": 6,
"elevation": 3,
diff --git a/data/maps/UnknownMap_00_00/map.json b/data/maps/UnknownMap_00_00/map.json
index dc4ac7d19..a4da32612 100644
--- a/data/maps/UnknownMap_00_00/map.json
+++ b/data/maps/UnknownMap_00_00/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST",
"x": 9,
"y": 3,
"elevation": 3,
diff --git a/data/maps/UnknownMap_00_01/map.json b/data/maps/UnknownMap_00_01/map.json
index 65c7875bb..a427bdc14 100644
--- a/data/maps/UnknownMap_00_01/map.json
+++ b/data/maps/UnknownMap_00_01/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST",
"x": 9,
"y": 6,
"elevation": 3,
diff --git a/data/maps/UnknownMap_00_02/map.json b/data/maps/UnknownMap_00_02/map.json
index de002c33f..611a3c092 100644
--- a/data/maps/UnknownMap_00_02/map.json
+++ b/data/maps/UnknownMap_00_02/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST",
"x": 10,
"y": 5,
"elevation": 0,
diff --git a/data/maps/UnknownMap_00_04/map.json b/data/maps/UnknownMap_00_04/map.json
index 3c0340f01..b18296b2c 100644
--- a/data/maps/UnknownMap_00_04/map.json
+++ b/data/maps/UnknownMap_00_04/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST",
"x": 3,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_3",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
"x": 1,
"y": 8,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "FLAG_HIDE_UNION_ROOM_4"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_7",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_7",
"x": 7,
"y": 8,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_UNION_ROOM_8"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_6",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_6",
"x": 1,
"y": 4,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_UNION_ROOM_7"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_5",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_5",
"x": 7,
"y": 4,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_HIDE_UNION_ROOM_6"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_4",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_4",
"x": 13,
"y": 4,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_HIDE_UNION_ROOM_5"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_2",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
"x": 10,
"y": 6,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "FLAG_HIDE_UNION_ROOM_3"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_1",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
"x": 13,
"y": 8,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "FLAG_HIDE_UNION_ROOM_2"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_0",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 4,
"y": 6,
"elevation": 3,
diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json
index e9d3a097d..216206ad1 100644
--- a/data/maps/VermilionCity/map.json
+++ b/data/maps/VermilionCity/map.json
@@ -25,7 +25,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 22,
"y": 11,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 17,
"y": 9,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2",
"x": 36,
"y": 10,
"elevation": 0,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MACHOP",
+ "graphics_id": "OBJECT_EVENT_GFX_MACHOP",
"x": 35,
"y": 11,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 31,
"y": 30,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 24,
"y": 33,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 19,
"y": 24,
"elevation": 3,
@@ -116,7 +116,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_SCIENTIST",
+ "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST",
"x": 25,
"y": 7,
"elevation": 3,
diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json
index c5a9d6d38..128b723d6 100644
--- a/data/maps/VermilionCity_Gym/map.json
+++ b/data/maps/VermilionCity_Gym/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LT_SURGE",
+ "graphics_id": "OBJECT_EVENT_GFX_LT_SURGE",
"x": 5,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 2,
"y": 11,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SAILOR",
+ "graphics_id": "OBJECT_EVENT_GFX_SAILOR",
"x": 8,
"y": 13,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GYM_GUY",
+ "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
"x": 4,
"y": 17,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 7,
"y": 8,
"elevation": 3,
diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json
index c45c3f65f..b712f5c9f 100644
--- a/data/maps/VermilionCity_House1/map.json
+++ b/data/maps/VermilionCity_House1/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_FISHER",
+ "graphics_id": "OBJECT_EVENT_GFX_FISHER",
"x": 4,
"y": 5,
"elevation": 3,
diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json
index 94cbf7c94..547e72ba9 100644
--- a/data/maps/VermilionCity_House2/map.json
+++ b/data/maps/VermilionCity_House2/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 4,
"y": 4,
"elevation": 3,
diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json
index d1a3688f0..aa5247c5d 100644
--- a/data/maps/VermilionCity_House3/map.json
+++ b/data/maps/VermilionCity_House3/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 7,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PIDGEY",
+ "graphics_id": "OBJECT_EVENT_GFX_PIDGEY",
"x": 2,
"y": 5,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CLIPBOARD",
+ "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD",
"x": 6,
"y": 4,
"elevation": 0,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 2,
"y": 4,
"elevation": 3,
diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json
index f53ba795a..754b3c81b 100644
--- a/data/maps/VermilionCity_Mart/map.json
+++ b/data/maps/VermilionCity_Mart/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 2,
"y": 3,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
"x": 4,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 9,
"y": 4,
"elevation": 3,
diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json
index aaf4bc861..b5b5467c8 100644
--- a/data/maps/VermilionCity_PokemonCenter_1F/map.json
+++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 4,
"y": 8,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_HIKER",
+ "graphics_id": "OBJECT_EVENT_GFX_HIKER",
"x": 12,
"y": 5,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 14,
"y": 4,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
"x": 6,
"y": 4,
"elevation": 3,
diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json
index 789cc891a..9edc3d8bf 100644
--- a/data/maps/VermilionCity_PokemonCenter_2F/map.json
+++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json
index f4ec8fe14..761fac2ab 100644
--- a/data/maps/VermilionCity_PokemonFanClub/map.json
+++ b/data/maps/VermilionCity_PokemonFanClub/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 5,
"y": 4,
"elevation": 4,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WORKER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_WORKER_F",
"x": 6,
"y": 4,
"elevation": 4,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_PIKACHU",
+ "graphics_id": "OBJECT_EVENT_GFX_PIKACHU",
"x": 7,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SEEL",
+ "graphics_id": "OBJECT_EVENT_GFX_SEEL",
"x": 4,
"y": 6,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 4,
"y": 5,
"elevation": 0,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
"x": 7,
"y": 5,
"elevation": 0,
diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json
index 4fb068476..2f1147e86 100644
--- a/data/maps/VictoryRoad_1F/map.json
+++ b/data/maps/VictoryRoad_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"x": 5,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
"x": 14,
"y": 6,
"elevation": 4,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 12,
"y": 3,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "FLAG_HIDE_VICTORY_ROAD_1F_RARE_CANDY"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 14,
"y": 1,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 7,
"y": 18,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 4,
"y": 12,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 16,
"y": 3,
"elevation": 3,
diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json
index dfbe906bd..02d2c8369 100644
--- a/data/maps/VictoryRoad_2F/map.json
+++ b/data/maps/VictoryRoad_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
+ "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD",
"x": 7,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 20,
"y": 11,
"elevation": 4,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 31,
"y": 16,
"elevation": 4,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 26,
"y": 6,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ROCKER",
+ "graphics_id": "OBJECT_EVENT_GFX_ROCKER",
"x": 36,
"y": 5,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 17,
"y": 6,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_HIDE_VICTORY_ROAD_2F_GUARD_SPEC"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 40,
"y": 7,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM07"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 25,
"y": 13,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "FLAG_HIDE_VICTORY_ROAD_2F_FULL_HEAL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 14,
"y": 13,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM37"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 8,
"y": 7,
"elevation": 3,
@@ -144,7 +144,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 6,
"y": 17,
"elevation": 3,
@@ -157,7 +157,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 33,
"y": 19,
"elevation": 3,
@@ -170,7 +170,7 @@
"flag": "FLAG_HIDE_VICTORY_ROAD_2F_BOULDER"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"x": 40,
"y": 9,
"elevation": 3,
diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json
index 13e9e1481..f9bbe5bc2 100644
--- a/data/maps/VictoryRoad_3F/map.json
+++ b/data/maps/VictoryRoad_3F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"x": 40,
"y": 7,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
"x": 21,
"y": 5,
"elevation": 4,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"x": 10,
"y": 17,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
"x": 11,
"y": 16,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 38,
"y": 7,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "FLAG_HIDE_VICTORY_ROAD_3F_MAX_REVIVE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 12,
"y": 9,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 19,
"y": 15,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 33,
"y": 18,
"elevation": 0,
@@ -118,7 +118,7 @@
"flag": "FLAG_HIDE_VICTORY_ROAD_3F_BOULDER"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 35,
"y": 13,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
+ "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER",
"x": 32,
"y": 5,
"elevation": 3,
@@ -144,7 +144,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"x": 38,
"y": 13,
"elevation": 3,
@@ -157,7 +157,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F",
"x": 39,
"y": 13,
"elevation": 3,
diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json
index 081e17e98..4e1b2cd0e 100644
--- a/data/maps/ViridianCity/map.json
+++ b/data/maps/ViridianCity/map.json
@@ -30,7 +30,7 @@
],
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_FAT_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN",
"x": 8,
"y": 26,
"elevation": 3,
@@ -43,7 +43,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 11,
"y": 24,
"elevation": 3,
@@ -56,7 +56,7 @@
"flag": "FLAG_TEMP_11"
},
{
- "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1",
"x": 34,
"y": 11,
"elevation": 3,
@@ -69,7 +69,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_VAR_0",
+ "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 21,
"y": 6,
"elevation": 3,
@@ -82,7 +82,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_3",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3",
"x": 20,
"y": 12,
"elevation": 3,
@@ -95,7 +95,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 33,
"y": 26,
"elevation": 3,
@@ -108,7 +108,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 16,
"y": 22,
"elevation": 3,
@@ -121,7 +121,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CUT_TREE",
+ "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE",
"x": 18,
"y": 5,
"elevation": 3,
@@ -134,7 +134,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 17,
"y": 5,
"elevation": 3,
diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc
index 24c38bfd7..070c162c6 100644
--- a/data/maps/ViridianCity/scripts.inc
+++ b/data/maps/ViridianCity/scripts.inc
@@ -15,17 +15,17 @@ ViridianCity_MapScript1_1658D9:: @ 81658D9
end
EventScript_165909:: @ 8165909
- setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_OLD_MAN_1
+ setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1
return
EventScript_16590F:: @ 816590F
- setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_OLD_MAN_1
+ setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1
setobjectxyperm 4, 21, 8
setobjectmovementtype 4, 1
return
EventScript_165920:: @ 8165920
- setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_VIRIDIAN_DRUNK
+ setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_VIRIDIAN_DRUNK
setobjectxyperm 4, 21, 11
setobjectmovementtype 4, 8
return
diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json
index 451a6a6e2..1361dfb46 100644
--- a/data/maps/ViridianCity_Gym/map.json
+++ b/data/maps/ViridianCity_Gym/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 10,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"x": 12,
"y": 10,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 11,
"y": 14,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 10,
"y": 10,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MAN",
"x": 2,
"y": 21,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BLACKBELT",
+ "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT",
"x": 3,
"y": 11,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"x": 6,
"y": 8,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GIOVANNI",
+ "graphics_id": "OBJECT_EVENT_GFX_GIOVANNI",
"x": 2,
"y": 2,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "FLAG_HIDE_VIRIDIAN_GIOVANNI"
},
{
- "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
+ "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M",
"x": 13,
"y": 7,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GYM_GUY",
+ "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY",
"x": 16,
"y": 20,
"elevation": 3,
diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json
index edc6072ab..668ae37da 100644
--- a/data/maps/ViridianCity_House1/map.json
+++ b/data/maps/ViridianCity_House1/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
+ "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
"x": 7,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
+ "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL",
"x": 2,
"y": 5,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_SPEAROW",
+ "graphics_id": "OBJECT_EVENT_GFX_SPEAROW",
"x": 6,
"y": 6,
"elevation": 3,
diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json
index a3abf9f9d..0f027934d 100644
--- a/data/maps/ViridianCity_House2/map.json
+++ b/data/maps/ViridianCity_House2/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_2",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_LASS",
+ "graphics_id": "OBJECT_EVENT_GFX_LASS",
"x": 4,
"y": 5,
"elevation": 3,
diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json
index 350ed4020..e4761721c 100644
--- a/data/maps/ViridianCity_Mart/map.json
+++ b/data/maps/ViridianCity_Mart/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CLERK",
+ "graphics_id": "OBJECT_EVENT_GFX_CLERK",
"x": 2,
"y": 3,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 6,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_WOMAN_1",
+ "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1",
"x": 9,
"y": 5,
"elevation": 3,
diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json
index 419e7b4ca..6dbd242bb 100644
--- a/data/maps/ViridianCity_PokemonCenter_1F/map.json
+++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_NURSE",
+ "graphics_id": "OBJECT_EVENT_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
"x": 12,
"y": 5,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 4,
"y": 7,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 2,
"y": 3,
"elevation": 3,
diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json
index 3711140e9..cf764b446 100644
--- a/data/maps/ViridianCity_PokemonCenter_2F/map.json
+++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
+ "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
+ "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json
index 7a17aca4c..af19f7f56 100644
--- a/data/maps/ViridianForest/map.json
+++ b/data/maps/ViridianForest/map.json
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
"x": 29,
"y": 58,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BOY",
+ "graphics_id": "OBJECT_EVENT_GFX_BOY",
"x": 45,
"y": 58,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 47,
"y": 45,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 47,
"y": 29,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 7,
"y": 22,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 5,
"y": 41,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "FLAG_HIDE_VIRIDIAN_FOREST_POKE_BALL"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 40,
"y": 21,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "FLAG_HIDE_VIRIDIAN_FOREST_ANTIDOTE"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 21,
"y": 34,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 43,
"y": 6,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
+ "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER",
"x": 16,
"y": 5,
"elevation": 3,
@@ -144,7 +144,7 @@
"flag": "0"
},
{
- "graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
"x": 49,
"y": 60,
"elevation": 3,