diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-11 01:29:57 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-11 02:12:25 -0500 |
| commit | aa84a1d3a11c7cc6fd0e1021e1ed060e0c5683f2 (patch) | |
| tree | 7a8745203ad053322c72fcde0cf679ef1cac2af6 /data/maps | |
| parent | 6bcb508c3fd576bccbe589fee5bae31fb803841c (diff) | |
Name item ball scripts
Diffstat (limited to 'data/maps')
80 files changed, 172 insertions, 172 deletions
diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 75f6760d1..efca328f8 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -203,7 +203,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_1BEBC0", + "script": "CeladonCity_EventScript_ItemEther", "flag": "FLAG_HIDE_CELADON_CITY_ETHER" }, { diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index 8914af7e7..65e99c9d2 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_1F_EventScript_1BEA47", + "script": "CeruleanCave_1F_EventScript_ItemNugget", "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_1F_EventScript_1BEA54", + "script": "CeruleanCave_1F_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_1F_EventScript_1BEA3A", + "script": "CeruleanCave_1F_EventScript_ItemMaxElixir", "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR" }, { diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index 89438c4fb..e3fe97b91 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BEA6E", + "script": "CeruleanCave_2F_EventScript_ItemPPUp", "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BEA7B", + "script": "CeruleanCave_2F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BEA61", + "script": "CeruleanCave_2F_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE" }, { diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 87b278438..4245e8a07 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_B1F_EventScript_1BEA95", + "script": "CeruleanCave_B1F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_B1F_EventScript_1BEA88", + "script": "CeruleanCave_B1F_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE" }, { diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index 606513822..980df7a4b 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_LostCave_Room10_EventScript_1BEDBB", + "script": "FiveIsland_LostCave_Room10_EventScript_ItemSilkScarf", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM10_SILK_SCARF" } ], diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index 52b658dcb..3b08bf303 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_LostCave_Room11_EventScript_1BEDC8", + "script": "FiveIsland_LostCave_Room11_EventScript_ItemLaxIncense", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM11_LAX_INCENSE" } ], diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index 09392a2ca..67626feb7 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_LostCave_Room12_EventScript_1BEDD5", + "script": "FiveIsland_LostCave_Room12_EventScript_ItemSeaIncense", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM12_SEA_INCENSE" } ], diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index 028c7cea6..41b48cce9 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_LostCave_Room13_EventScript_1BEDE2", + "script": "FiveIsland_LostCave_Room13_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM13_MAX_REVIVE" } ], diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index f25b7ee72..17b9542f4 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_LostCave_Room14_EventScript_1BEDEF", + "script": "FiveIsland_LostCave_Room14_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM14_RARE_CANDY" } ], diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index 66ac71058..2b4630ca3 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_Meadow_EventScript_1BEC69", + "script": "FiveIsland_Meadow_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_MAX_POTION" }, { @@ -112,7 +112,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_Meadow_EventScript_1BEC76", + "script": "FiveIsland_Meadow_EventScript_ItemPPUp", "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_PP_UP" } ], diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 2054a0159..7aac310dc 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -81,7 +81,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_MemorialPillar_EventScript_1BEC83", + "script": "FiveIsland_MemorialPillar_EventScript_ItemMetalCoat", "flag": "FLAG_HIDE_FIVE_ISLAND_MEMORIAL_PILLAR_METAL_COAT" } ], diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index a89fe7b45..3bc0ee2c9 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_1BED87", + "script": "FiveIsland_RocketWarehouse_EventScript_ItemBigPearl", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_BIG_PEARL" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_1BED94", + "script": "FiveIsland_RocketWarehouse_EventScript_ItemTM36", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_TM36" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_1BEDA1", + "script": "FiveIsland_RocketWarehouse_EventScript_ItemPearl", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_PEARL" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_1BEDAE", + "script": "FiveIsland_RocketWarehouse_EventScript_ItemUpGrade", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_UP_GRADE" } ], diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 0e7b31ad7..4e8aab27c 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_EventScript_1BEC28", + "script": "FourIsland_EventScript_ItemStarPiece", "flag": "FLAG_HIDE_FOUR_ISLAND_STAR_PIECE" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_EventScript_1BEC35", + "script": "FourIsland_EventScript_ItemStardust", "flag": "FLAG_HIDE_FOUR_ISLAND_STARDUST" }, { diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index 575294c84..39aaec8e8 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_IcefallCave_1F_EventScript_1BED53", + "script": "FourIsland_IcefallCave_1F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_ULTRA_BALL" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_IcefallCave_1F_EventScript_1BED60", + "script": "FourIsland_IcefallCave_1F_EventScript_ItemHM07", "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_HM07" } ], diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index c6b9e866e..d8ba2545e 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_IcefallCave_B1F_EventScript_1BED6D", + "script": "FourIsland_IcefallCave_B1F_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_FULL_RESTORE" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_IcefallCave_B1F_EventScript_1BED7A", + "script": "FourIsland_IcefallCave_B1F_EventScript_ItemNeverMeltIce", "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_NEVER_MELT_ICE" } ], diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json index 8b91a19fa..b018a2b1e 100644 --- a/data/maps/FuchsiaCity_Building1/map.json +++ b/data/maps/FuchsiaCity_Building1/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_Building1_EventScript_1BEAA2", + "script": "FuchsiaCity_Building1_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_FUCHSIA_CITY_BUILDING1_RARE_CANDY" }, { diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 29d5f1af8..7e0cb8dad 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -244,7 +244,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BED2C", + "script": "MtEmber_Exterior_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ULTRA_BALL" }, { @@ -257,7 +257,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BED39", + "script": "MtEmber_Exterior_EventScript_ItemFireStone", "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_FIRE_STONE" }, { @@ -270,7 +270,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BED46", + "script": "MtEmber_Exterior_EventScript_ItemDireHit", "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_DIRE_HIT" } ], diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 432699237..1a1de5162 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1BE5CF", + "script": "MtMoon_1F_EventScript_ItemParalyzeHeal", "flag": "FLAG_HIDE_MT_MOON_1F_PARALYZE_HEAL" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1BE5DC", + "script": "MtMoon_1F_EventScript_ItemTM09", "flag": "FLAG_HIDE_MT_MOON_1F_TM09" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1BE5E9", + "script": "MtMoon_1F_EventScript_ItemPotion", "flag": "FLAG_HIDE_MT_MOON_1F_POTION" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1BE5F6", + "script": "MtMoon_1F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_MT_MOON_1F_RARE_CANDY" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1BE603", + "script": "MtMoon_1F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_MT_MOON_1F_ESCAPE_ROPE" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1BE610", + "script": "MtMoon_1F_EventScript_ItemMoonStone", "flag": "FLAG_HIDE_MT_MOON_1F_MOON_STONE" }, { diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 478a00f7d..deb0a6c79 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_1BE61D", + "script": "MtMoon_B2F_EventScript_ItemStarPiece", "flag": "FLAG_HIDE_MT_MOON_B2F_STAR_PIECE" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_1BE62A", + "script": "MtMoon_B2F_EventScript_ItemTM46", "flag": "FLAG_HIDE_MT_MOON_B2F_TM46" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_1BEAD6", + "script": "MtMoon_B2F_EventScript_ItemRevive", "flag": "FLAG_HIDE_MT_MOON_B2F_REVIVE" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_1BEAE3", + "script": "MtMoon_B2F_EventScript_ItemAntidote", "flag": "FLAG_HIDE_MT_MOON_B2F_ANTIDOTE" } ], diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 3520eaac0..7e12d3946 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -367,7 +367,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BEC42", + "script": "OneIsland_KindleRoad_EventScript_ItemEther", "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_ETHER" }, { @@ -380,7 +380,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BEC4F", + "script": "OneIsland_KindleRoad_EventScript_ItemMaxRepel", "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_MAX_REPEL" }, { @@ -393,7 +393,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BEC5C", + "script": "OneIsland_KindleRoad_EventScript_ItemCarbos", "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_CARBOS" } ], diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index 8f26c3d11..31b5155c4 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_1F_EventScript_1BE95D", + "script": "PokemonMansion_1F_EventScript_ItemCarbos", "flag": "FLAG_HIDE_POKEMON_MANSION_1F_CARBOS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_1F_EventScript_1BE96A", + "script": "PokemonMansion_1F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_POKEMON_MANSION_1F_ESCAPE_ROPE" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_1F_EventScript_1BEB65", + "script": "PokemonMansion_1F_EventScript_ItemProtein", "flag": "FLAG_HIDE_POKEMON_MANSION_1F_PROTEIN" }, { diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index b5bf6d6d3..e3d543e08 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_2F_EventScript_1BE977", + "script": "PokemonMansion_2F_EventScript_ItemCalcium", "flag": "FLAG_HIDE_POKEMON_MANSION_2F_CALCIUM" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_2F_EventScript_1BEB72", + "script": "PokemonMansion_2F_EventScript_ItemZinc", "flag": "FLAG_HIDE_POKEMON_MANSION_2F_ZINC" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_2F_EventScript_1BEB7F", + "script": "PokemonMansion_2F_EventScript_ItemHPUp", "flag": "FLAG_HIDE_POKEMON_MANSION_2F_HP_UP" } ], diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index 47ef76894..07bcf2dc3 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_3F_EventScript_1BE984", + "script": "PokemonMansion_3F_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_POKEMON_MANSION_3F_MAX_POTION" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_3F_EventScript_1BE991", + "script": "PokemonMansion_3F_EventScript_ItemIron", "flag": "FLAG_HIDE_POKEMON_MANSION_3F_IRON" } ], diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index 5a6b105ab..e72ff2a96 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_B1F_EventScript_1BE9B8", + "script": "PokemonMansion_B1F_EventScript_ItemTM22", "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM22" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_B1F_EventScript_1BE99E", + "script": "PokemonMansion_B1F_EventScript_ItemTM14", "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM14" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_B1F_EventScript_1BE9AB", + "script": "PokemonMansion_B1F_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_FULL_RESTORE" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonMansion_B1F_EventScript_1BE9C5", + "script": "PokemonMansion_B1F_EventScript_ItemSecretKey", "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY" } ], diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index 668f87e73..c71b75937 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_3F_EventScript_1BE755", + "script": "PokemonTower_3F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_POKEMON_TOWER_3F_ESCAPE_ROPE" } ], diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index e24927018..82088704a 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_4F_EventScript_1BE762", + "script": "PokemonTower_4F_EventScript_ItemElixir", "flag": "FLAG_HIDE_POKEMON_TOWER_4F_ELIXIR" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_4F_EventScript_1BE76F", + "script": "PokemonTower_4F_EventScript_ItemAwakening", "flag": "FLAG_HIDE_POKEMON_TOWER_4F_AWAKENING" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_4F_EventScript_1BE77C", + "script": "PokemonTower_4F_EventScript_ItemGreatBall", "flag": "FLAG_HIDE_POKEMON_TOWER_4F_GREAT_BALL" } ], diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index 37b0653e6..ec66551ae 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_5F_EventScript_1BE789", + "script": "PokemonTower_5F_EventScript_ItemNugget", "flag": "FLAG_HIDE_POKEMON_TOWER_5F_NUGGET" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_5F_EventScript_1BEBB3", + "script": "PokemonTower_5F_EventScript_ItemCleanseTag", "flag": "FLAG_HIDE_POKEMON_TOWER_5F_CLEANSE_TAG" } ], diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index 6c9e9aefb..f03a04402 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_6F_EventScript_1BE796", + "script": "PokemonTower_6F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_POKEMON_TOWER_6F_RARE_CANDY" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PokemonTower_6F_EventScript_1BE7A3", + "script": "PokemonTower_6F_EventScript_ItemXAccuracy", "flag": "FLAG_HIDE_POKEMON_TOWER_6F_X_ACCURACY" } ], diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 751b0448a..8fb90e3c7 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PowerPlant_EventScript_1BE91C", + "script": "PowerPlant_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_POWER_PLANT_MAX_POTION" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PowerPlant_EventScript_1BE929", + "script": "PowerPlant_EventScript_ItemTM17", "flag": "FLAG_HIDE_POWER_PLANT_TM17" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PowerPlant_EventScript_1BE936", + "script": "PowerPlant_EventScript_ItemTM25", "flag": "FLAG_HIDE_POWER_PLANT_TM25" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PowerPlant_EventScript_1BE943", + "script": "PowerPlant_EventScript_ItemThunderStone", "flag": "FLAG_HIDE_POWER_PLANT_THUNDER_STONE" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PowerPlant_EventScript_1BE950", + "script": "PowerPlant_EventScript_ItemElixir", "flag": "FLAG_HIDE_POWER_PLANT_ELIXIR" }, { diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index 381dc663b..2c16ae2df 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_1F_EventScript_1BEB0A", + "script": "RockTunnel_1F_EventScript_ItemRepel", "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_REPEL" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_1F_EventScript_1BEB17", + "script": "RockTunnel_1F_EventScript_ItemPearl", "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_PEARL" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_1F_EventScript_1BEB24", + "script": "RockTunnel_1F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_ESCAPE_ROPE" } ], diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index 3c1144c42..d95126744 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BEB31", + "script": "RockTunnel_B1F_EventScript_ItemRevive", "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_REVIVE" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BEB3E", + "script": "RockTunnel_B1F_EventScript_ItemMaxEther", "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_MAX_ETHER" }, { diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 1ae6a2b49..b761f7d2d 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B1F_EventScript_1BE6C6", + "script": "RocketHideout_B1F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_ESCAPE_ROPE" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B1F_EventScript_1BE6D3", + "script": "RocketHideout_B1F_EventScript_ItemHyperPotion", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_HYPER_POTION" } ], diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index 4bdde29e9..63a051e5d 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B2F_EventScript_1BE6E0", + "script": "RocketHideout_B2F_EventScript_ItemXSpeed", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_X_SPEED" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B2F_EventScript_1BE6ED", + "script": "RocketHideout_B2F_EventScript_ItemMoonStone", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_MOON_STONE" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B2F_EventScript_1BE6FA", + "script": "RocketHideout_B2F_EventScript_ItemTM12", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_TM12" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B2F_EventScript_1BE707", + "script": "RocketHideout_B2F_EventScript_ItemSuperPotion", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_SUPER_POTION" } ], diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index 40f6c205f..7be2fae4f 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B3F_EventScript_1BE714", + "script": "RocketHideout_B3F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_RARE_CANDY" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B3F_EventScript_1BE721", + "script": "RocketHideout_B3F_EventScript_ItemTM21", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_TM21" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B3F_EventScript_1BEBCD", + "script": "RocketHideout_B3F_EventScript_ItemBlackGlasses", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_BLACK_GLASSES" } ], diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 85113e7c6..06533ad54 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_161363", + "script": "RocketHideout_B4F_EventScript_SilphScope", "flag": "FLAG_HIDE_SILPH_SCOPE" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_1613AD", + "script": "RocketHideout_B4F_EventScript_LiftKey", "flag": "FLAG_HIDE_LIFT_KEY" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_1BE72E", + "script": "RocketHideout_B4F_EventScript_ItemTM49", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_TM49" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_1BE73B", + "script": "RocketHideout_B4F_EventScript_ItemMaxEther", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_MAX_ETHER" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_1BE748", + "script": "RocketHideout_B4F_EventScript_ItemCalcium", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_CALCIUM" } ], diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 4f75320b3..68671a7a8 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -35,7 +35,7 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317 release end -RocketHideout_B4F_EventScript_161363:: @ 8161363 +RocketHideout_B4F_EventScript_SilphScope:: @ 8161363 lock faceplayer removeobject 2 @@ -58,7 +58,7 @@ EventScript_16139D:: @ 816139D release end -RocketHideout_B4F_EventScript_1613AD:: @ 81613AD +RocketHideout_B4F_EventScript_LiftKey:: @ 81613AD lock faceplayer setflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index 854692035..7882673d1 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -164,7 +164,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route11_EventScript_1BEAF0", + "script": "Route11_EventScript_ItemXDefend", "flag": "FLAG_HIDE_ROUTE11_X_DEFEND" }, { @@ -177,7 +177,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route11_EventScript_1BEB99", + "script": "Route11_EventScript_ItemGreatBall", "flag": "FLAG_HIDE_ROUTE11_GREAT_BALL" }, { @@ -190,7 +190,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route11_EventScript_1BEBA6", + "script": "Route11_EventScript_ItemAwakening", "flag": "FLAG_HIDE_ROUTE11_AWAKENING" } ], diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index cfc684de8..75c992abe 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -156,7 +156,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_EventScript_1BE7B0", + "script": "Route12_EventScript_ItemTM48", "flag": "FLAG_HIDE_ROUTE12_TM48" }, { @@ -169,7 +169,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_EventScript_1BE7BD", + "script": "Route12_EventScript_ItemIron", "flag": "FLAG_HIDE_ROUTE12_IRON" }, { diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index 4c6fa5d47..19a33a867 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -164,7 +164,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route15_EventScript_1BE7CA", + "script": "Route15_EventScript_ItemTM18", "flag": "FLAG_HIDE_ROUTE15_TM18" }, { diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index aecf7a7de..d7cd6f16b 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BE58E", + "script": "Route2_EventScript_ItemEther", "flag": "FLAG_HIDE_ROUTE2_ETHER" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BE59B", + "script": "Route2_EventScript_ItemParalyzeHeal", "flag": "FLAG_HIDE_ROUTE2_PARALYZE_HEAL" }, { diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 9cf6bf74d..56edad166 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -125,7 +125,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route24_EventScript_1BE644", + "script": "Route24_EventScript_ItemTM45", "flag": "FLAG_HIDE_ROUTE24_TM45" } ], diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index d369225d3..c3f1520d5 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -146,7 +146,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route25_EventScript_1BE651", + "script": "Route25_EventScript_ItemTM43", "flag": "FLAG_HIDE_ROUTE25_TM43" }, { diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index e7392969c..1e1dba0c7 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_EventScript_1BE637", + "script": "Route4_EventScript_ItemTM05", "flag": "FLAG_HIDE_ROUTE4_TM05" }, { diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index b8e4aef83..c130136b9 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -164,7 +164,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route9_EventScript_1BE6B9", + "script": "Route9_EventScript_ItemTM40", "flag": "FLAG_HIDE_ROUTE9_TM40" }, { @@ -177,7 +177,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route9_EventScript_1BEAFD", + "script": "Route9_EventScript_ItemBurnHeal", "flag": "FLAG_HIDE_ROUTE9_BURN_HEAL" } ], diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index a9ec320be..05b54f33b 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_1F_Room2_EventScript_1BE65E", + "script": "SSAnne_1F_Room2_EventScript_ItemTM31", "flag": "FLAG_HIDE_SSANNE_1F_ROOM2_TM31" } ], diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index 1aeabe4d5..6875842e4 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_2F_Room2_EventScript_1BE66B", + "script": "SSAnne_2F_Room2_EventScript_ItemStardust", "flag": "FLAG_HIDE_SSANNE_2F_ROOM2_STARDUST" } ], diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index 8cba587e6..422d02458 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_2F_Room4_EventScript_1BE678", + "script": "SSAnne_2F_Room4_EventScript_ItemXAttack", "flag": "FLAG_HIDE_SSANNE_2F_ROOM4_X_ATTACK" } ], diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index 173d2149e..629043f6f 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_B1F_Room2_EventScript_1BE685", + "script": "SSAnne_B1F_Room2_EventScript_ItemTM44", "flag": "FLAG_HIDE_SSANNE_B1F_ROOM2_TM44" } ], diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index f1acb1d5a..0d4141a48 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_B1F_Room3_EventScript_1BE692", + "script": "SSAnne_B1F_Room3_EventScript_ItemEther", "flag": "FLAG_HIDE_SSANNE_B1F_ROOM3_ETHER" } ], diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index 6313e108a..835107344 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_B1F_Room5_EventScript_1BE69F", + "script": "SSAnne_B1F_Room5_EventScript_ItemSuperPotion", "flag": "FLAG_HIDE_SSANNE_B1F_ROOM5_SUPER_POTION" } ], diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 968d87938..cb062a8fd 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_Kitchen_EventScript_1BE6AC", + "script": "SSAnne_Kitchen_EventScript_ItemGreatBall", "flag": "FLAG_HIDE_SSANNE_KITCHEN_GREAT_BALL" } ], diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index e40c94cee..5e592724f 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_Center_EventScript_1BE7D7", + "script": "SafariZone_Center_EventScript_ItemNugget", "flag": "FLAG_HIDE_SAFARI_ZONE_CENTER_NUGGET" } ], diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index 17f951070..59e9da99c 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_East_EventScript_1BE7E4", + "script": "SafariZone_East_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_MAX_POTION" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_East_EventScript_1BE7F1", + "script": "SafariZone_East_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_FULL_RESTORE" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_East_EventScript_1BE7FE", + "script": "SafariZone_East_EventScript_ItemTM11", "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_TM11" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_East_EventScript_1BE80B", + "script": "SafariZone_East_EventScript_ItemLeafStone", "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_LEAF_STONE" } ], diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 0e47573f6..df7ce163a 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_North_EventScript_1BE818", + "script": "SafariZone_North_EventScript_ItemProtein", "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_PROTEIN" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_North_EventScript_1BE825", + "script": "SafariZone_North_EventScript_ItemTM47", "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_TM47" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_North_EventScript_1BEBDA", + "script": "SafariZone_North_EventScript_ItemQuickClaw", "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_QUICK_CLAW" } ], diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index cdccbbe45..02c576e4b 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_West_EventScript_1BE83F", + "script": "SafariZone_West_EventScript_ItemGoldTeeth", "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_West_EventScript_1BE832", + "script": "SafariZone_West_EventScript_ItemTM32", "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_TM32" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_West_EventScript_1BE84C", + "script": "SafariZone_West_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_POTION" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SafariZone_West_EventScript_1BE859", + "script": "SafariZone_West_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_REVIVE" } ], diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index ac46adf1f..49986cd0f 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_1F_EventScript_1BEBE7", + "script": "SeafoamIslands_1F_EventScript_ItemIceHeal", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_1F_ICE_HEAL" } ], diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index 113bfe865..1444996be 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B1F_EventScript_1BEBF4", + "script": "SeafoamIslands_B1F_EventScript_ItemWaterStone", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B1F_WATER_STONE" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B1F_EventScript_1BEC01", + "script": "SeafoamIslands_B1F_EventScript_ItemRevive", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B1F_REVIVE" } ], diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index f1a234d05..b24e1ae17 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B2F_EventScript_1BEC0E", + "script": "SeafoamIslands_B2F_EventScript_ItemBigPearl", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B2F_BIG_PEARL" } ], diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index edd644634..08001aa58 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B4F_EventScript_1BEC1B", + "script": "SeafoamIslands_B4F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B4F_ULTRA_BALL" } ], diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 350cb0060..50884dd2a 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -242,7 +242,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BECDE", + "script": "SevenIsland_SevaultCanyon_EventScript_ItemKingsRock", "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_KINGS_ROCK" }, { @@ -255,7 +255,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BECEB", + "script": "SevenIsland_SevaultCanyon_EventScript_ItemMaxElixir", "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_MAX_ELIXIR" }, { @@ -268,7 +268,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BECF8", + "script": "SevenIsland_SevaultCanyon_EventScript_ItemNugget", "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_NUGGET" }, { diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index 09447abbf..3803d3200 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_House_EventScript_1BEDFC", + "script": "SevenIsland_SevaultCanyon_House_EventScript_ItemLuckyPunch", "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE_LUCKY_PUNCH" } ], diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index 7176da07c..da9f835e2 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_10F_EventScript_1BE8F5", + "script": "SilphCo_10F_EventScript_ItemCarbos", "flag": "FLAG_HIDE_SILPH_CO_10F_CARBOS" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_10F_EventScript_1BE902", + "script": "SilphCo_10F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_SILPH_CO_10F_ULTRA_BALL" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_10F_EventScript_1BE90F", + "script": "SilphCo_10F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_SILPH_CO_10F_RARE_CANDY" } ], diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 8d34641e8..ec99fdfe9 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_11F_EventScript_1BEB58", + "script": "SilphCo_11F_EventScript_ItemZinc", "flag": "FLAG_HIDE_SILPH_CO_11F_ZINC" }, { diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index e4daa7636..3f7e3590b 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_3F_EventScript_1BE866", + "script": "SilphCo_3F_EventScript_ItemHyperPotion", "flag": "FLAG_HIDE_SILPH_CO_3F_HYPER_POTION" } ], diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 813b7cfb6..6390f880b 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_4F_EventScript_1BE873", + "script": "SilphCo_4F_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_SILPH_CO_4F_MAX_REVIVE" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_4F_EventScript_1BE880", + "script": "SilphCo_4F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_SILPH_CO_4F_ESCAPE_ROPE" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_4F_EventScript_1BE88D", + "script": "SilphCo_4F_EventScript_ItemFullHeal", "flag": "FLAG_HIDE_SILPH_CO_4F_FULL_HEAL" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_4F_EventScript_1BEE09", + "script": "SilphCo_4F_EventScript_ItemTM41", "flag": "FLAG_HIDE_SILPH_CO_4F_TM41" } ], diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 656894ec2..be2d202e8 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_5F_EventScript_1BE89A", + "script": "SilphCo_5F_EventScript_ItemProtein", "flag": "FLAG_HIDE_SILPH_CO_5F_PROTEIN" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_5F_EventScript_1BE8A7", + "script": "SilphCo_5F_EventScript_ItemTM01", "flag": "FLAG_HIDE_SILPH_CO_5F_TM01" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_5F_EventScript_1BE8B4", + "script": "SilphCo_5F_EventScript_ItemCardKey", "flag": "FLAG_HIDE_SILPH_CO_5F_CARD_KEY" }, { diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index 4cc812918..d1a65f4f3 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_6F_EventScript_1BE8C1", + "script": "SilphCo_6F_EventScript_ItemHPUp", "flag": "FLAG_HIDE_SILPH_CO_6F_HP_UP" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_6F_EventScript_1BE8CE", + "script": "SilphCo_6F_EventScript_ItemXSpecial", "flag": "FLAG_HIDE_SILPH_CO_6F_X_SPECIAL" }, { diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index e470111f8..b0f6a8e12 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_7F_EventScript_1BE8DB", + "script": "SilphCo_7F_EventScript_ItemCalcium", "flag": "FLAG_HIDE_SILPH_CO_7F_CALCIUM" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_7F_EventScript_1BE8E8", + "script": "SilphCo_7F_EventScript_ItemTM08", "flag": "FLAG_HIDE_SILPH_CO_7F_TM08" } ], diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index 629519c25..aba6cfb3f 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_8F_EventScript_1BEB4B", + "script": "SilphCo_8F_EventScript_ItemIron", "flag": "FLAG_HIDE_SILPH_CO_8F_IRON" }, { diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index 0997aafc7..bc785bd6b 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -107,7 +107,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_OutcastIsland_EventScript_1BEC90", + "script": "SixIsland_OutcastIsland_EventScript_ItemPPUp", "flag": "FLAG_HIDE_SIX_ISLAND_OUTCAST_ISLAND_PP_UP" } ], diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index c3be304c9..26f0ccdf5 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -211,7 +211,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BECC4", + "script": "SixIsland_RuinValley_EventScript_ItemHPUp", "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_HP_UP" }, { @@ -224,7 +224,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BECB7", + "script": "SixIsland_RuinValley_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_FULL_RESTORE" }, { @@ -237,7 +237,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BECD1", + "script": "SixIsland_RuinValley_EventScript_ItemSunStone", "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_SUN_STONE" } ], diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index f1bd689c9..5a0f111c8 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -130,7 +130,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_WaterPath_EventScript_1BEC9D", + "script": "SixIsland_WaterPath_EventScript_ItemElixir", "flag": "FLAG_HIDE_SIX_ISLAND_WATER_PATH_ELIXIR" }, { @@ -143,7 +143,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_WaterPath_EventScript_1BECAA", + "script": "SixIsland_WaterPath_EventScript_ItemDragonScale", "flag": "FLAG_HIDE_SIX_ISLAND_WATER_PATH_DRAGON_SCALE" } ], diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index fc30c5a41..9607ba491 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -151,7 +151,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_1BEABC", + "script": "ThreeIsland_EventScript_ItemZinc", "flag": "FLAG_HIDE_THREE_ISLAND_ZINC" }, { diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index a9a72b4ae..502289c81 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BED05", + "script": "ThreeIsland_BerryForest_EventScript_ItemMaxEther", "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ETHER" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BED12", + "script": "ThreeIsland_BerryForest_EventScript_ItemFullHeal", "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_FULL_HEAL" }, { @@ -192,7 +192,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BED1F", + "script": "ThreeIsland_BerryForest_EventScript_ItemMaxElixir", "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ELIXIR" } ], diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 24db68596..34f5bbfce 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -107,7 +107,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_1BEAAF", + "script": "TwoIsland_EventScript_ItemRevive", "flag": "FLAG_HIDE_TWO_ISLAND_REVIVE" }, { diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 2f1147e86..906c2a3d7 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_1F_EventScript_1BE9D2", + "script": "VictoryRoad_1F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_VICTORY_ROAD_1F_RARE_CANDY" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_1F_EventScript_1BE9DF", + "script": "VictoryRoad_1F_EventScript_ItemTM02", "flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02" }, { diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index f52d46e71..454659d7e 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1BE9EC", + "script": "VictoryRoad_2F_EventScript_ItemGuardSpec", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_GUARD_SPEC" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1BE9F9", + "script": "VictoryRoad_2F_EventScript_ItemTM07", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM07" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1BEA06", + "script": "VictoryRoad_2F_EventScript_ItemFullHeal", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_FULL_HEAL" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1BEA13", + "script": "VictoryRoad_2F_EventScript_ItemTM37", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM37" }, { diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index f9bbe5bc2..f98654fe8 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_3F_EventScript_1BEA20", + "script": "VictoryRoad_3F_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_VICTORY_ROAD_3F_MAX_REVIVE" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_3F_EventScript_1BEA2D", + "script": "VictoryRoad_3F_EventScript_ItemTM50", "flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50" }, { diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 4f5b1e9f5..b984008d5 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -143,7 +143,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_EventScript_1BEB8C", + "script": "ViridianCity_EventScript_ItemPotion", "flag": "FLAG_HIDE_VIRIDIAN_CITY_POTION" } ], diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index af19f7f56..8dbe5c5a5 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianForest_EventScript_1BE5A8", + "script": "ViridianForest_EventScript_ItemPokeBall", "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POKE_BALL" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianForest_EventScript_1BE5B5", + "script": "ViridianForest_EventScript_ItemAntidote", "flag": "FLAG_HIDE_VIRIDIAN_FOREST_ANTIDOTE" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianForest_EventScript_1BE5C2", + "script": "ViridianForest_EventScript_ItemPotion", "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianForest_EventScript_1BEAC9", + "script": "ViridianForest_EventScript_ItemPotion2", "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION_2" } ], |