summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
authorFontbane <fontbane@gmail.com>2019-04-03 14:13:11 -0400
committerhuderlem <huderlem@gmail.com>2019-04-04 19:34:35 -0500
commit90e32f4ec57f6597dc02b11dcae54b14e9d4ceaa (patch)
tree6fba8384d56f670dbef9a837639215af95558618 /data/maps
parent704f025a00e32a910b6fd70a54511844e755663f (diff)
Document landmark setting and item balls
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/AbandonedShip_CaptainsOffice/map.json2
-rw-r--r--data/maps/AbandonedShip_Deck/scripts.inc4
-rw-r--r--data/maps/AbandonedShip_HiddenFloorRooms/map.json8
-rw-r--r--data/maps/AbandonedShip_Room_B1F/map.json2
-rw-r--r--data/maps/AbandonedShip_Rooms2_1F/map.json2
-rw-r--r--data/maps/AbandonedShip_Rooms2_B1F/map.json2
-rw-r--r--data/maps/AbandonedShip_Rooms_1F/map.json2
-rw-r--r--data/maps/AbandonedShip_Rooms_B1F/map.json2
-rw-r--r--data/maps/AlteringCave/scripts.inc4
-rw-r--r--data/maps/AquaHideout_B1F/map.json6
-rw-r--r--data/maps/AquaHideout_B2F/map.json2
-rw-r--r--data/maps/ArtisanCave_1F/map.json2
-rw-r--r--data/maps/ArtisanCave_B1F/map.json2
-rw-r--r--data/maps/ArtisanCave_B1F/scripts.inc4
-rw-r--r--data/maps/BattleFrontier_ReceptionGate/scripts.inc4
-rw-r--r--data/maps/DesertUnderpass/scripts.inc4
-rw-r--r--data/maps/FieryPath/map.json4
-rw-r--r--data/maps/GraniteCave_1F/map.json2
-rw-r--r--data/maps/GraniteCave_B1F/map.json2
-rw-r--r--data/maps/GraniteCave_B2F/map.json4
-rw-r--r--data/maps/JaggedPass/map.json2
-rw-r--r--data/maps/LilycoveCity/map.json2
-rw-r--r--data/maps/MagmaHideout_1F/map.json2
-rw-r--r--data/maps/MagmaHideout_2F_2R/map.json4
-rw-r--r--data/maps/MagmaHideout_3F_1R/map.json2
-rw-r--r--data/maps/MagmaHideout_3F_2R/map.json2
-rw-r--r--data/maps/MagmaHideout_3F_3R/map.json2
-rw-r--r--data/maps/MagmaHideout_4F/map.json2
-rw-r--r--data/maps/MauvilleCity/map.json2
-rw-r--r--data/maps/MeteorFalls_1F_1R/map.json8
-rw-r--r--data/maps/MeteorFalls_B1F_2R/map.json2
-rw-r--r--data/maps/MossdeepCity/map.json2
-rw-r--r--data/maps/MtPyre_2F/map.json2
-rw-r--r--data/maps/MtPyre_3F/map.json2
-rw-r--r--data/maps/MtPyre_4F/map.json2
-rw-r--r--data/maps/MtPyre_5F/map.json2
-rw-r--r--data/maps/MtPyre_6F/map.json2
-rw-r--r--data/maps/MtPyre_Exterior/map.json4
-rw-r--r--data/maps/NewMauville_Entrance/scripts.inc4
-rw-r--r--data/maps/NewMauville_Inside/map.json10
-rw-r--r--data/maps/PetalburgCity/map.json4
-rw-r--r--data/maps/PetalburgWoods/map.json8
-rw-r--r--data/maps/Route102/map.json2
-rw-r--r--data/maps/Route103/map.json4
-rw-r--r--data/maps/Route104/map.json8
-rw-r--r--data/maps/Route105/map.json2
-rw-r--r--data/maps/Route106/map.json2
-rw-r--r--data/maps/Route108/map.json2
-rw-r--r--data/maps/Route109/map.json4
-rw-r--r--data/maps/Route109_SeashoreHouse/scripts.inc4
-rw-r--r--data/maps/Route110/map.json6
-rw-r--r--data/maps/Route110_TrickHousePuzzle1/map.json2
-rw-r--r--data/maps/Route110_TrickHousePuzzle2/map.json4
-rw-r--r--data/maps/Route110_TrickHousePuzzle3/map.json4
-rw-r--r--data/maps/Route110_TrickHousePuzzle4/map.json2
-rw-r--r--data/maps/Route110_TrickHousePuzzle6/map.json2
-rw-r--r--data/maps/Route110_TrickHousePuzzle7/map.json2
-rw-r--r--data/maps/Route110_TrickHousePuzzle8/map.json2
-rw-r--r--data/maps/Route111/map.json8
-rw-r--r--data/maps/Route111_OldLadysRestStop/scripts.inc4
-rw-r--r--data/maps/Route112/map.json2
-rw-r--r--data/maps/Route113/map.json6
-rw-r--r--data/maps/Route114/map.json6
-rw-r--r--data/maps/Route114_FossilManiacsHouse/scripts.inc4
-rw-r--r--data/maps/Route114_LanettesHouse/scripts.inc4
-rw-r--r--data/maps/Route115/map.json12
-rw-r--r--data/maps/Route116/map.json10
-rw-r--r--data/maps/Route116_TunnelersRestHouse/scripts.inc4
-rw-r--r--data/maps/Route117/map.json4
-rw-r--r--data/maps/Route117_PokemonDayCare/scripts.inc4
-rw-r--r--data/maps/Route118/map.json2
-rw-r--r--data/maps/Route119/map.json18
-rw-r--r--data/maps/Route120/map.json10
-rw-r--r--data/maps/Route121/map.json6
-rw-r--r--data/maps/Route123/map.json10
-rw-r--r--data/maps/Route123_BerryMastersHouse/scripts.inc4
-rw-r--r--data/maps/Route124/map.json6
-rw-r--r--data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc4
-rw-r--r--data/maps/Route125/map.json2
-rw-r--r--data/maps/Route126/map.json2
-rw-r--r--data/maps/Route127/map.json6
-rw-r--r--data/maps/Route132/map.json4
-rw-r--r--data/maps/Route133/map.json6
-rw-r--r--data/maps/Route134/map.json4
-rw-r--r--data/maps/RustboroCity/map.json2
-rw-r--r--data/maps/RusturfTunnel/map.json4
-rw-r--r--data/maps/SafariZone_North/map.json2
-rw-r--r--data/maps/SafariZone_Northeast/map.json2
-rw-r--r--data/maps/SafariZone_Northwest/map.json2
-rw-r--r--data/maps/SafariZone_Southeast/map.json2
-rw-r--r--data/maps/SafariZone_Southwest/map.json2
-rw-r--r--data/maps/ScorchedSlab/map.json2
-rw-r--r--data/maps/ScorchedSlab/scripts.inc4
-rw-r--r--data/maps/SeafloorCavern_Room9/map.json2
-rw-r--r--data/maps/SealedChamber_OuterRoom/scripts.inc4
-rw-r--r--data/maps/ShoalCave_LowTideEntranceRoom/map.json2
-rw-r--r--data/maps/ShoalCave_LowTideIceRoom/map.json4
-rw-r--r--data/maps/ShoalCave_LowTideInnerRoom/map.json2
-rw-r--r--data/maps/ShoalCave_LowTideStairsRoom/map.json2
-rw-r--r--data/maps/SkyPillar_Entrance/scripts.inc4
-rw-r--r--data/maps/SouthernIsland_Exterior/scripts.inc4
-rw-r--r--data/maps/VictoryRoad_1F/map.json4
-rw-r--r--data/maps/VictoryRoad_B1F/map.json4
-rw-r--r--data/maps/VictoryRoad_B2F/map.json2
104 files changed, 198 insertions, 198 deletions
diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json
index a78d433b6..b876ad849 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/map.json
+++ b/data/maps/AbandonedShip_CaptainsOffice/map.json
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "AbandonedShip_CaptainsOffice_EventScript_29126E",
+ "script": "AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey",
"flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY"
}
],
diff --git a/data/maps/AbandonedShip_Deck/scripts.inc b/data/maps/AbandonedShip_Deck/scripts.inc
index 041c54593..f256fe521 100644
--- a/data/maps/AbandonedShip_Deck/scripts.inc
+++ b/data/maps/AbandonedShip_Deck/scripts.inc
@@ -1,8 +1,8 @@
AbandonedShip_Deck_MapScripts:: @ 823799A
- map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_MapScript1_2379A0
+ map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_MapScript1_SetLandmark
.byte 0
-AbandonedShip_Deck_MapScript1_2379A0: @ 82379A0
+AbandonedShip_Deck_MapScript1_SetLandmark: @ 82379A0
setflag FLAG_LANDMARK_ABANDONED_SHIP
end
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json
index f71ad8eb3..fdfb8a187 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "AbandonedShip_HiddenFloorRooms_EventScript_29127B",
+ "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "AbandonedShip_HiddenFloorRooms_EventScript_291288",
+ "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "AbandonedShip_HiddenFloorRooms_EventScript_2912A2",
+ "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "AbandonedShip_HiddenFloorRooms_EventScript_291295",
+ "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE"
}
],
diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json
index 60dd5e1b3..b8e2a71da 100644
--- a/data/maps/AbandonedShip_Room_B1F/map.json
+++ b/data/maps/AbandonedShip_Room_B1F/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "AbandonedShip_Room_B1F_EventScript_291254",
+ "script": "AbandonedShip_Room_B1F_EventScript_ItemTM13",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13"
}
],
diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json
index 49a4c2da0..35b029f7f 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/map.json
+++ b/data/maps/AbandonedShip_Rooms2_1F/map.json
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "AbandonedShip_Rooms2_1F_EventScript_291261",
+ "script": "AbandonedShip_Rooms2_1F_EventScript_ItemRevive",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE"
},
{
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json
index 3f56bf6cd..621b80bb1 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/map.json
+++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "AbandonedShip_Rooms2_B1F_EventScript_291247",
+ "script": "AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL"
}
],
diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json
index e97c74fcf..af25a3994 100644
--- a/data/maps/AbandonedShip_Rooms_1F/map.json
+++ b/data/maps/AbandonedShip_Rooms_1F/map.json
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "AbandonedShip_Rooms_1F_EventScript_29122D",
+ "script": "AbandonedShip_Rooms_1F_EventScript_ItemHarborMail",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL"
},
{
diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json
index 65b5fb9cf..2e836f3a1 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/map.json
+++ b/data/maps/AbandonedShip_Rooms_B1F/map.json
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "AbandonedShip_Rooms_B1F_EventScript_29123A",
+ "script": "AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE"
}
],
diff --git a/data/maps/AlteringCave/scripts.inc b/data/maps/AlteringCave/scripts.inc
index 185466c80..19fd1fb0b 100644
--- a/data/maps/AlteringCave/scripts.inc
+++ b/data/maps/AlteringCave/scripts.inc
@@ -1,8 +1,8 @@
AlteringCave_MapScripts:: @ 823B177
- map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_MapScript1_23B17D
+ map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_MapScript1_SetLandmark
.byte 0
-AlteringCave_MapScript1_23B17D: @ 823B17D
+AlteringCave_MapScript1_SetLandmark: @ 823B17D
setflag FLAG_LANDMARK_ALTERING_CAVE
end
diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json
index 5b6beee11..8cdc901ec 100644
--- a/data/maps/AquaHideout_B1F/map.json
+++ b/data/maps/AquaHideout_B1F/map.json
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "AquaHideout_B1F_EventScript_291372",
+ "script": "AquaHideout_B1F_EventScript_ItemMaxElixir",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "AquaHideout_B1F_EventScript_291358",
+ "script": "AquaHideout_B1F_EventScript_ItemMasterBall",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "AquaHideout_B1F_EventScript_291365",
+ "script": "AquaHideout_B1F_EventScript_ItemNugget",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET"
},
{
diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json
index 64c6eddff..b286872af 100644
--- a/data/maps/AquaHideout_B2F/map.json
+++ b/data/maps/AquaHideout_B2F/map.json
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "AquaHideout_B2F_EventScript_29137F",
+ "script": "AquaHideout_B2F_EventScript_ItemNestBall",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL"
},
{
diff --git a/data/maps/ArtisanCave_1F/map.json b/data/maps/ArtisanCave_1F/map.json
index 2092ca7ea..dc7792d8a 100644
--- a/data/maps/ArtisanCave_1F/map.json
+++ b/data/maps/ArtisanCave_1F/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "ArtisanCave_1F_EventScript_2914D1",
+ "script": "ArtisanCave_1F_EventScript_ItemCarbos",
"flag": "FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS"
}
],
diff --git a/data/maps/ArtisanCave_B1F/map.json b/data/maps/ArtisanCave_B1F/map.json
index 32174cd44..2fec826cd 100644
--- a/data/maps/ArtisanCave_B1F/map.json
+++ b/data/maps/ArtisanCave_B1F/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "ArtisanCave_B1F_EventScript_2914C4",
+ "script": "ArtisanCave_B1F_EventScript_ItemHPUp",
"flag": "FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP"
}
],
diff --git a/data/maps/ArtisanCave_B1F/scripts.inc b/data/maps/ArtisanCave_B1F/scripts.inc
index 433991bea..a64fe4ab9 100644
--- a/data/maps/ArtisanCave_B1F/scripts.inc
+++ b/data/maps/ArtisanCave_B1F/scripts.inc
@@ -1,8 +1,8 @@
ArtisanCave_B1F_MapScripts:: @ 823AFAD
- map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_MapScript1_23AFB3
+ map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_MapScript1_SetLandmark
.byte 0
-ArtisanCave_B1F_MapScript1_23AFB3: @ 823AFB3
+ArtisanCave_B1F_MapScript1_SetLandmark: @ 823AFB3
setflag FLAG_LANDMARK_ARTISAN_CAVE
end
diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
index 8ce438d75..369c30aca 100644
--- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
@@ -1,9 +1,9 @@
BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_MapScript2_2661E9
- map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_MapScript1_2661E5
+ map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_MapScript1_SetLandmark
.byte 0
-BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5
+BattleFrontier_ReceptionGate_MapScript1_SetLandmark: @ 82661E5
setflag FLAG_LANDMARK_BATTLE_FRONTIER
end
diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc
index 9c5e83180..1b8324d8a 100644
--- a/data/maps/DesertUnderpass/scripts.inc
+++ b/data/maps/DesertUnderpass/scripts.inc
@@ -1,8 +1,8 @@
DesertUnderpass_MapScripts:: @ 823AF37
- map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_MapScript1_23AF3D
+ map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_MapScript1_SetLandmark
.byte 0
-DesertUnderpass_MapScript1_23AF3D: @ 823AF3D
+DesertUnderpass_MapScript1_SetLandmark: @ 823AF3D
setflag FLAG_LANDMARK_DESERT_UNDERPASS
end
diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json
index 61324a8ff..9bb09fe5a 100644
--- a/data/maps/FieryPath/map.json
+++ b/data/maps/FieryPath/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FieryPath_EventScript_29119E",
+ "script": "FieryPath_EventScript_ItemTM06",
"flag": "FLAG_ITEM_FIERY_PATH_TM06"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FieryPath_EventScript_291191",
+ "script": "FieryPath_EventScript_ItemFireStone",
"flag": "FLAG_ITEM_FIERY_PATH_FIRE_STONE"
}
],
diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json
index 67f2e8000..2413a023d 100644
--- a/data/maps/GraniteCave_1F/map.json
+++ b/data/maps/GraniteCave_1F/map.json
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "GraniteCave_1F_EventScript_291150",
+ "script": "GraniteCave_1F_EventScript_ItemEscapeRope",
"flag": "FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE"
}
],
diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json
index b33e751e5..5a4548164 100644
--- a/data/maps/GraniteCave_B1F/map.json
+++ b/data/maps/GraniteCave_B1F/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "GraniteCave_B1F_EventScript_29115D",
+ "script": "GraniteCave_B1F_EventScript_ItemPokeBall",
"flag": "FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL"
}
],
diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json
index 48de00180..73a13d6d2 100644
--- a/data/maps/GraniteCave_B2F/map.json
+++ b/data/maps/GraniteCave_B2F/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "GraniteCave_B2F_EventScript_29116A",
+ "script": "GraniteCave_B2F_EventScript_ItemRepel",
"flag": "FLAG_ITEM_GRANITE_CAVE_B2F_REPEL"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "GraniteCave_B2F_EventScript_291177",
+ "script": "GraniteCave_B2F_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY"
},
{
diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json
index 3ec89fce6..e695c826c 100644
--- a/data/maps/JaggedPass/map.json
+++ b/data/maps/JaggedPass/map.json
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "JaggedPass_EventScript_291184",
+ "script": "JaggedPass_EventScript_ItemBurnHeal",
"flag": "FLAG_ITEM_JAGGED_PASS_BURN_HEAL"
},
{
diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json
index ea771c3b5..26f0ad36d 100644
--- a/data/maps/LilycoveCity/map.json
+++ b/data/maps/LilycoveCity/map.json
@@ -165,7 +165,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_EventScript_2910E8",
+ "script": "LilycoveCity_EventScript_ItemMaxRepel",
"flag": "FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL"
},
{
diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json
index 8eb3e23b5..2bbcf77a0 100644
--- a/data/maps/MagmaHideout_1F/map.json
+++ b/data/maps/MagmaHideout_1F/map.json
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MagmaHideout_1F_EventScript_2914DE",
+ "script": "MagmaHideout_1F_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY"
},
{
diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json
index ef7086bbf..b52d34212 100644
--- a/data/maps/MagmaHideout_2F_2R/map.json
+++ b/data/maps/MagmaHideout_2F_2R/map.json
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MagmaHideout_2F_2R_EventScript_2914EB",
+ "script": "MagmaHideout_2F_2R_EventScript_MaxElixir",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MagmaHideout_2F_2R_EventScript_2914F8",
+ "script": "MagmaHideout_2F_2R_EventScript_ItemFullRestore",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE"
}
],
diff --git a/data/maps/MagmaHideout_3F_1R/map.json b/data/maps/MagmaHideout_3F_1R/map.json
index 67202e748..e3c1bac70 100644
--- a/data/maps/MagmaHideout_3F_1R/map.json
+++ b/data/maps/MagmaHideout_3F_1R/map.json
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MagmaHideout_3F_1R_EventScript_291505",
+ "script": "MagmaHideout_3F_1R_EventScript_ItemNugget",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET"
}
],
diff --git a/data/maps/MagmaHideout_3F_2R/map.json b/data/maps/MagmaHideout_3F_2R/map.json
index bc67b15e5..e4b267858 100644
--- a/data/maps/MagmaHideout_3F_2R/map.json
+++ b/data/maps/MagmaHideout_3F_2R/map.json
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MagmaHideout_3F_2R_EventScript_291512",
+ "script": "MagmaHideout_3F_2R_EventScript_ItemPPMax",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX"
}
],
diff --git a/data/maps/MagmaHideout_3F_3R/map.json b/data/maps/MagmaHideout_3F_3R/map.json
index 00fc5a46c..6ec900c31 100644
--- a/data/maps/MagmaHideout_3F_3R/map.json
+++ b/data/maps/MagmaHideout_3F_3R/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MagmaHideout_3F_3R_EventScript_29152C",
+ "script": "MagmaHideout_3F_3R_EventScript_ItemEscapeRope",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE"
}
],
diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json
index b627ae1ed..5eebc41d8 100644
--- a/data/maps/MagmaHideout_4F/map.json
+++ b/data/maps/MagmaHideout_4F/map.json
@@ -115,7 +115,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MagmaHideout_4F_EventScript_29151F",
+ "script": "MagmaHideout_4F_EventScript_MaxRevive",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE"
}
],
diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json
index e44bc78dd..4163f4d9d 100644
--- a/data/maps/MauvilleCity/map.json
+++ b/data/maps/MauvilleCity/map.json
@@ -149,7 +149,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MauvilleCity_EventScript_2910CE",
+ "script": "MauvilleCity_EventScript_ItemXSpeed",
"flag": "FLAG_ITEM_MAUVILLE_CITY_X_SPEED"
},
{
diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json
index 586de013f..200c03e86 100644
--- a/data/maps/MeteorFalls_1F_1R/map.json
+++ b/data/maps/MeteorFalls_1F_1R/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MeteorFalls_1F_1R_EventScript_2911AB",
+ "script": "MeteorFalls_1F_1R_EventScript_ItemTM23",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MeteorFalls_1F_1R_EventScript_2911C5",
+ "script": "MeteorFalls_1F_1R_EventScript_ItemMoonStone",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MeteorFalls_1F_1R_EventScript_2911B8",
+ "script": "MeteorFalls_1F_1R_EventScript_ItemFullHeal",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MeteorFalls_1F_1R_EventScript_2911D2",
+ "script": "MeteorFalls_1F_1R_EventScript_ItemPPUP",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP"
},
{
diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json
index 7c45bfdd0..8fd3eb4a2 100644
--- a/data/maps/MeteorFalls_B1F_2R/map.json
+++ b/data/maps/MeteorFalls_B1F_2R/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MeteorFalls_B1F_2R_EventScript_2911DF",
+ "script": "MeteorFalls_B1F_2R_EventScript_ItemTM02",
"flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02"
}
],
diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json
index 99d7ae01c..533183a35 100644
--- a/data/maps/MossdeepCity/map.json
+++ b/data/maps/MossdeepCity/map.json
@@ -105,7 +105,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MossdeepCity_EventScript_2910F5",
+ "script": "MossdeepCity_EventScript_ItemNetBall",
"flag": "FLAG_ITEM_MOSSDEEP_CITY_NET_BALL"
},
{
diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json
index 7a5c4d639..64657cb0d 100644
--- a/data/maps/MtPyre_2F/map.json
+++ b/data/maps/MtPyre_2F/map.json
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MtPyre_2F_EventScript_2912FD",
+ "script": "MtPyre_2F_EventScript_ItemUltraBall",
"flag": "FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL"
},
{
diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json
index b8684cff9..3e06adf8c 100644
--- a/data/maps/MtPyre_3F/map.json
+++ b/data/maps/MtPyre_3F/map.json
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MtPyre_3F_EventScript_29130A",
+ "script": "MtPyre_3F_EventScript_ItemSuperRepel",
"flag": "FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL"
},
{
diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json
index 59d4dd110..782a6221e 100644
--- a/data/maps/MtPyre_4F/map.json
+++ b/data/maps/MtPyre_4F/map.json
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MtPyre_4F_EventScript_291317",
+ "script": "MtPyre_4F_EventScript_ItemSeaIncense",
"flag": "FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE"
}
],
diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json
index 1c035bd4d..edd3544ca 100644
--- a/data/maps/MtPyre_5F/map.json
+++ b/data/maps/MtPyre_5F/map.json
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MtPyre_5F_EventScript_291324",
+ "script": "MtPyre_5F_EventScript_ItemLaxIncense",
"flag": "FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE"
}
],
diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json
index 8f7c4f30f..3c889a7e0 100644
--- a/data/maps/MtPyre_6F/map.json
+++ b/data/maps/MtPyre_6F/map.json
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MtPyre_6F_EventScript_291331",
+ "script": "MtPyre_6F_EventScript_ItemTM30",
"flag": "FLAG_ITEM_MT_PYRE_6F_TM_30"
},
{
diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json
index 2a8a5eaff..c7653bbd1 100644
--- a/data/maps/MtPyre_Exterior/map.json
+++ b/data/maps/MtPyre_Exterior/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MtPyre_Exterior_EventScript_29133E",
+ "script": "MtPyre_Exterior_EventScript_ItemMaxPotion",
"flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "MtPyre_Exterior_EventScript_29134B",
+ "script": "MtPyre_Exterior_EventScript_ItemTM48",
"flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48"
}
],
diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc
index c3ed930a5..1df4c53e4 100644
--- a/data/maps/NewMauville_Entrance/scripts.inc
+++ b/data/maps/NewMauville_Entrance/scripts.inc
@@ -1,6 +1,6 @@
NewMauville_Entrance_MapScripts:: @ 82372AD
map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_MapScript1_2372B8
- map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_MapScript1_2372FB
+ map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_MapScript1_SetLandmark
.byte 0
NewMauville_Entrance_MapScript1_2372B8: @ 82372B8
@@ -17,7 +17,7 @@ NewMauville_Entrance_EventScript_2372C4:: @ 82372C4
setmetatile 5, 1, 798, 1
return
-NewMauville_Entrance_MapScript1_2372FB: @ 82372FB
+NewMauville_Entrance_MapScript1_SetLandmark: @ 82372FB
setflag FLAG_LANDMARK_NEW_MAUVILLE
end
diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json
index b13d6059d..e58588a47 100644
--- a/data/maps/NewMauville_Inside/map.json
+++ b/data/maps/NewMauville_Inside/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "NewMauville_Inside_EventScript_2911EC",
+ "script": "NewMauville_Inside_EventScript_ItemUltraRope",
"flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "NewMauville_Inside_EventScript_2911F9",
+ "script": "NewMauville_Inside_EventScript_ItemEscapeRope",
"flag": "FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "NewMauville_Inside_EventScript_291206",
+ "script": "NewMauville_Inside_EventScript_ItemThunderStone",
"flag": "FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "NewMauville_Inside_EventScript_291213",
+ "script": "NewMauville_Inside_EventScript_ItemFullHeal",
"flag": "FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "NewMauville_Inside_EventScript_291220",
+ "script": "NewMauville_Inside_EventScript_ItemParalyzeHeal",
"flag": "FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL"
},
{
diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json
index 6a9a6b33d..00e89bfa0 100644
--- a/data/maps/PetalburgCity/map.json
+++ b/data/maps/PetalburgCity/map.json
@@ -100,7 +100,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "PetalburgCity_EventScript_2910B4",
+ "script": "PetalburgCity_EventScript_ItemMaxRevive",
"flag": "FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE"
},
{
@@ -113,7 +113,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "PetalburgCity_EventScript_2910C1",
+ "script": "PetalburgCity_EventScript_ItemEther",
"flag": "FLAG_ITEM_PETALBURG_CITY_ETHER"
},
{
diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json
index 4bca7bb5e..6d1bc22a5 100644
--- a/data/maps/PetalburgWoods/map.json
+++ b/data/maps/PetalburgWoods/map.json
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "PetalburgWoods_EventScript_29110F",
+ "script": "PetalburgWoods_EventScript_ItemGreatBall",
"flag": "FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "PetalburgWoods_EventScript_291102",
+ "script": "PetalburgWoods_EventScript_ItemXAttack",
"flag": "FLAG_ITEM_PETALBURG_WOODS_X_ATTACK"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "PetalburgWoods_EventScript_29111C",
+ "script": "PetalburgWoods_EventScript_ItemEther",
"flag": "FLAG_ITEM_PETALBURG_WOODS_ETHER"
},
{
@@ -167,7 +167,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "PetalburgWoods_EventScript_291129",
+ "script": "PetalburgWoods_EventScript_ItemParalyzeHeal",
"flag": "FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL"
},
{
diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json
index 7a6c6d963..323c4142b 100644
--- a/data/maps/Route102/map.json
+++ b/data/maps/Route102/map.json
@@ -100,7 +100,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route102_EventScript_290CD8",
+ "script": "Route102_EventScript_ItemPotion",
"flag": "FLAG_ITEM_ROUTE_102_POTION"
},
{
diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json
index 6516e99dc..91004d1ab 100644
--- a/data/maps/Route103/map.json
+++ b/data/maps/Route103/map.json
@@ -191,7 +191,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route103_EventScript_290CE5",
+ "script": "Route103_EventScript_ItemGuardSpec",
"flag": "FLAG_ITEM_ROUTE_103_GUARD_SPEC"
},
{
@@ -282,7 +282,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route103_EventScript_290CF2",
+ "script": "Route103_EventScript_ItemPPUp",
"flag": "FLAG_ITEM_ROUTE_103_PP_UP"
}
],
diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json
index e14a73c29..7bfe6e164 100644
--- a/data/maps/Route104/map.json
+++ b/data/maps/Route104/map.json
@@ -300,7 +300,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route104_EventScript_290CFF",
+ "script": "Route104_EventScript_ItemPPUp",
"flag": "FLAG_ITEM_ROUTE_104_PP_UP"
},
{
@@ -378,7 +378,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route104_EventScript_290D0C",
+ "script": "Route104_EventScript_ItemPokeBall",
"flag": "FLAG_ITEM_ROUTE_104_POKE_BALL"
},
{
@@ -404,7 +404,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route104_EventScript_290D19",
+ "script": "Route104_EventScript_ItemXAccuracy",
"flag": "FLAG_ITEM_ROUTE_104_X_ACCURACY"
},
{
@@ -430,7 +430,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route104_EventScript_290D26",
+ "script": "Route104_EventScript_ItemPotion",
"flag": "FLAG_ITEM_ROUTE_104_POTION"
},
{
diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json
index b42965229..4d447d4f8 100644
--- a/data/maps/Route105/map.json
+++ b/data/maps/Route105/map.json
@@ -92,7 +92,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route105_EventScript_290D33",
+ "script": "Route105_EventScript_ItemIron",
"flag": "FLAG_ITEM_ROUTE_105_IRON"
},
{
diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json
index 93e98078b..70558d26e 100644
--- a/data/maps/Route106/map.json
+++ b/data/maps/Route106/map.json
@@ -87,7 +87,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route106_EventScript_290D40",
+ "script": "Route106_EventScript_ItemProtein",
"flag": "FLAG_ITEM_ROUTE_106_PROTEIN"
}
],
diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json
index bb22c01e3..b8b188637 100644
--- a/data/maps/Route108/map.json
+++ b/data/maps/Route108/map.json
@@ -113,7 +113,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route108_EventScript_290D4D",
+ "script": "Route108_EventScript_ItemStarPiece",
"flag": "FLAG_ITEM_ROUTE_108_STAR_PIECE"
}
],
diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json
index 9bb4d21de..361467266 100644
--- a/data/maps/Route109/map.json
+++ b/data/maps/Route109/map.json
@@ -152,7 +152,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route109_EventScript_290D5A",
+ "script": "Route109_EventScript_ItemPPUp",
"flag": "FLAG_ITEM_ROUTE_109_PP_UP"
},
{
@@ -321,7 +321,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route109_EventScript_290D67",
+ "script": "Route109_EventScript_ItemPotion",
"flag": "FLAG_ITEM_ROUTE_109_POTION"
},
{
diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc
index ed27e32ff..d33113136 100644
--- a/data/maps/Route109_SeashoreHouse/scripts.inc
+++ b/data/maps/Route109_SeashoreHouse/scripts.inc
@@ -1,8 +1,8 @@
Route109_SeashoreHouse_MapScripts:: @ 82693F4
- map_script MAP_SCRIPT_ON_TRANSITION, Route109_SeashoreHouse_MapScript1_2693FA
+ map_script MAP_SCRIPT_ON_TRANSITION, Route109_SeashoreHouse_MapScript1_SetLandmark
.byte 0
-Route109_SeashoreHouse_MapScript1_2693FA: @ 82693FA
+Route109_SeashoreHouse_MapScript1_SetLandmark: @ 82693FA
setflag FLAG_LANDMARK_SEASHORE_HOUSE
end
diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json
index a9ac7796a..8cbc93af6 100644
--- a/data/maps/Route110/map.json
+++ b/data/maps/Route110/map.json
@@ -274,7 +274,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route110_EventScript_290D81",
+ "script": "Route110_EventScript_ItemDireHit",
"flag": "FLAG_ITEM_ROUTE_110_DIRE_HIT"
},
{
@@ -287,7 +287,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route110_EventScript_290D74",
+ "script": "Route110_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_ROUTE_109_RARE_CANDY"
},
{
@@ -482,7 +482,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route110_EventScript_290D8E",
+ "script": "Route110_EventScript_ItemElixir",
"flag": "FLAG_ITEM_ROUTE_110_ELIXIR"
},
{
diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json
index 849e74b62..c6609d103 100644
--- a/data/maps/Route110_TrickHousePuzzle1/map.json
+++ b/data/maps/Route110_TrickHousePuzzle1/map.json
@@ -180,7 +180,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route110_TrickHousePuzzle1_EventScript_29140E",
+ "script": "Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL"
},
{
diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json
index 9903231e7..3a9ed637d 100644
--- a/data/maps/Route110_TrickHousePuzzle2/map.json
+++ b/data/maps/Route110_TrickHousePuzzle2/map.json
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route110_TrickHousePuzzle2_EventScript_291428",
+ "script": "Route110_TrickHousePuzzle2_EventScript_ItemWaveMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route110_TrickHousePuzzle2_EventScript_29141B",
+ "script": "Route110_TrickHousePuzzle2_EventScript_ItemHarborMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL"
}
],
diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json
index 22807b80b..e69580793 100644
--- a/data/maps/Route110_TrickHousePuzzle3/map.json
+++ b/data/maps/Route110_TrickHousePuzzle3/map.json
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route110_TrickHousePuzzle3_EventScript_291442",
+ "script": "Route110_TrickHousePuzzle3_EventScript_ItemWoodMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route110_TrickHousePuzzle3_EventScript_291435",
+ "script": "Route110_TrickHousePuzzle3_EventScript_ItemShadowMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL"
},
{
diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json
index 542a67aec..47238a559 100644
--- a/data/maps/Route110_TrickHousePuzzle4/map.json
+++ b/data/maps/Route110_TrickHousePuzzle4/map.json
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route110_TrickHousePuzzle4_EventScript_29144F",
+ "script": "Route110_TrickHousePuzzle4_EventScript_ItemMechMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL"
},
{
diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json
index 144916353..aef182fbb 100644
--- a/data/maps/Route110_TrickHousePuzzle6/map.json
+++ b/data/maps/Route110_TrickHousePuzzle6/map.json
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route110_TrickHousePuzzle6_EventScript_29145C",
+ "script": "Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL"
}
],
diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json
index 0263e0848..09fdafbe2 100644
--- a/data/maps/Route110_TrickHousePuzzle7/map.json
+++ b/data/maps/Route110_TrickHousePuzzle7/map.json
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route110_TrickHousePuzzle7_EventScript_291469",
+ "script": "Route110_TrickHousePuzzle7_EventScript_ItemTropicMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL"
},
{
diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json
index f73e60337..b7a06abce 100644
--- a/data/maps/Route110_TrickHousePuzzle8/map.json
+++ b/data/maps/Route110_TrickHousePuzzle8/map.json
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route110_TrickHousePuzzle8_EventScript_291476",
+ "script": "Route110_TrickHousePuzzle8_EventScript_ItemBeadMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL"
}
],
diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json
index ef981272a..d3428f8c6 100644
--- a/data/maps/Route111/map.json
+++ b/data/maps/Route111/map.json
@@ -261,7 +261,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route111_EventScript_290D9B",
+ "script": "Route111_EventScript_ItemTM37",
"flag": "FLAG_ITEM_ROUTE_111_TM_37"
},
{
@@ -352,7 +352,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route111_EventScript_290DA8",
+ "script": "Route111_EventScript_ItemStardust",
"flag": "FLAG_ITEM_ROUTE_111_STARDUST"
},
{
@@ -365,7 +365,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route111_EventScript_290DB5",
+ "script": "Route111_EventScript_ItemHPUp",
"flag": "FLAG_ITEM_ROUTE_111_HP_UP"
},
{
@@ -573,7 +573,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route111_EventScript_290DC2",
+ "script": "Route111_EventScript_ItemElixir",
"flag": "FLAG_ITEM_ROUTE_111_ELIXIR"
},
{
diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc
index 9427e8692..9495c4539 100644
--- a/data/maps/Route111_OldLadysRestStop/scripts.inc
+++ b/data/maps/Route111_OldLadysRestStop/scripts.inc
@@ -1,8 +1,8 @@
Route111_OldLadysRestStop_MapScripts:: @ 822A916
- map_script MAP_SCRIPT_ON_TRANSITION, Route111_OldLadysRestStop_MapScript1_22A91C
+ map_script MAP_SCRIPT_ON_TRANSITION, Route111_OldLadysRestStop_MapScript1_SetLandmark
.byte 0
-Route111_OldLadysRestStop_MapScript1_22A91C: @ 822A91C
+Route111_OldLadysRestStop_MapScript1_SetLandmark: @ 822A91C
setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP
end
diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json
index 8839cc114..b963c6c48 100644
--- a/data/maps/Route112/map.json
+++ b/data/maps/Route112/map.json
@@ -183,7 +183,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route112_EventScript_290DCF",
+ "script": "Route112_EventScript_ItemNugget",
"flag": "FLAG_ITEM_ROUTE_112_NUGGET"
},
{
diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json
index 1ae33fda7..bcff99de4 100644
--- a/data/maps/Route113/map.json
+++ b/data/maps/Route113/map.json
@@ -105,7 +105,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route113_EventScript_290DDC",
+ "script": "Route113_EventScript_ItemMaxEther",
"flag": "FLAG_ITEM_ROUTE_113_MAX_ETHER"
},
{
@@ -118,7 +118,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route113_EventScript_290DE9",
+ "script": "Route113_EventScript_ItemSuperRepel",
"flag": "FLAG_ITEM_ROUTE_113_SUPER_REPEL"
},
{
@@ -183,7 +183,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route113_EventScript_290DF6",
+ "script": "Route113_EventScript_ItemHyperPotion",
"flag": "FLAG_ITEM_ROUTE_113_HYPER_POTION"
},
{
diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json
index 9d1002910..08f2996d2 100644
--- a/data/maps/Route114/map.json
+++ b/data/maps/Route114/map.json
@@ -139,7 +139,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route114_EventScript_290E03",
+ "script": "Route114_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_ROUTE_114_RARE_CANDY"
},
{
@@ -152,7 +152,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route114_EventScript_290E10",
+ "script": "Route114_EventScript_ItemProtein",
"flag": "FLAG_ITEM_ROUTE_114_PROTEIN"
},
{
@@ -360,7 +360,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route114_EventScript_290E1D",
+ "script": "Route114_EventScript_ItemEnergyPowder",
"flag": "FLAG_ITEM_ROUTE_114_ENERGY_POWDER"
},
{
diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc
index c6b63d8da..d41bc0dee 100644
--- a/data/maps/Route114_FossilManiacsHouse/scripts.inc
+++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc
@@ -1,8 +1,8 @@
Route114_FossilManiacsHouse_MapScripts:: @ 822AD30
- map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsHouse_MapScript1_22AD36
+ map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsHouse_MapScript1_SetLandmark
.byte 0
-Route114_FossilManiacsHouse_MapScript1_22AD36: @ 822AD36
+Route114_FossilManiacsHouse_MapScript1_SetLandmark: @ 822AD36
setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE
end
diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc
index 1cf7ffb47..5ea42a42a 100644
--- a/data/maps/Route114_LanettesHouse/scripts.inc
+++ b/data/maps/Route114_LanettesHouse/scripts.inc
@@ -1,8 +1,8 @@
Route114_LanettesHouse_MapScripts:: @ 822B2C8
- map_script MAP_SCRIPT_ON_TRANSITION, Route114_LanettesHouse_MapScript1_22B2CE
+ map_script MAP_SCRIPT_ON_TRANSITION, Route114_LanettesHouse_MapScript1_SetLandmark
.byte 0
-Route114_LanettesHouse_MapScript1_22B2CE: @ 822B2CE
+Route114_LanettesHouse_MapScript1_SetLandmark: @ 822B2CE
setflag FLAG_LANDMARK_LANETTES_HOUSE
end
diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json
index 1c7603b58..484699ec6 100644
--- a/data/maps/Route115/map.json
+++ b/data/maps/Route115/map.json
@@ -152,7 +152,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route115_EventScript_290E2A",
+ "script": "Route115_EventScript_ItemSuperPotion",
"flag": "FLAG_ITEM_ROUTE_115_SUPER_POTION"
},
{
@@ -165,7 +165,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route115_EventScript_290E37",
+ "script": "Route115_EventScript_ItemTM01",
"flag": "FLAG_ITEM_ROUTE_115_TM_01"
},
{
@@ -178,7 +178,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route115_EventScript_290E44",
+ "script": "Route115_EventScript_ItemIron",
"flag": "FLAG_ITEM_ROUTE_115_IRON"
},
{
@@ -230,7 +230,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route115_EventScript_290E51",
+ "script": "Route115_EventScript_ItemGreatBall",
"flag": "FLAG_ITEM_ROUTE_115_GREAT_BALL"
},
{
@@ -308,7 +308,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route115_EventScript_290E6B",
+ "script": "Route115_EventScript_ItemPPUp",
"flag": "FLAG_ITEM_ROUTE_115_PP_UP"
},
{
@@ -321,7 +321,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route115_EventScript_290E5E",
+ "script": "Route115_EventScript_ItemHealPowder",
"flag": "FLAG_ITEM_ROUTE_115_HEAL_POWDER"
}
],
diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json
index 27eb381d0..0745af08c 100644
--- a/data/maps/Route116/map.json
+++ b/data/maps/Route116/map.json
@@ -113,7 +113,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route116_EventScript_290E85",
+ "script": "Route116_EventScript_ItemEther",
"flag": "FLAG_ITEM_ROUTE_116_ETHER"
},
{
@@ -126,7 +126,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route116_EventScript_290E92",
+ "script": "Route116_EventScript_ItemRepel",
"flag": "FLAG_ITEM_ROUTE_116_REPEL"
},
{
@@ -217,7 +217,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route116_EventScript_290E9F",
+ "script": "Route116_EventScript_ItemHPUp",
"flag": "FLAG_ITEM_ROUTE_116_HP_UP"
},
{
@@ -282,7 +282,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route116_EventScript_290E78",
+ "script": "Route116_EventScript_ItemXSpecial",
"flag": "FLAG_ITEM_ROUTE_116_X_SPECIAL"
},
{
@@ -347,7 +347,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route116_EventScript_290EAC",
+ "script": "Route116_EventScript_ItemPotion",
"flag": "FLAG_ITEM_ROUTE_116_POTION"
},
{
diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc
index bdd22aadd..f9ebcc76a 100644
--- a/data/maps/Route116_TunnelersRestHouse/scripts.inc
+++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc
@@ -1,8 +1,8 @@
Route116_TunnelersRestHouse_MapScripts:: @ 822B850
- map_script MAP_SCRIPT_ON_TRANSITION, Route116_TunnelersRestHouse_MapScript1_22B856
+ map_script MAP_SCRIPT_ON_TRANSITION, Route116_TunnelersRestHouse_MapScript1_SetLandmark
.byte 0
-Route116_TunnelersRestHouse_MapScript1_22B856: @ 822B856
+Route116_TunnelersRestHouse_MapScript1_SetLandmark: @ 822B856
setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE
end
diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json
index c4cb4d5e5..efaad2802 100644
--- a/data/maps/Route117/map.json
+++ b/data/maps/Route117/map.json
@@ -204,7 +204,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route117_EventScript_290EB9",
+ "script": "Route117_EventScript_ItemGreatBall",
"flag": "FLAG_ITEM_ROUTE_117_GREAT_BALL"
},
{
@@ -230,7 +230,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route117_EventScript_290EC6",
+ "script": "Route117_EventScript_ItemRevive",
"flag": "FLAG_ITEM_ROUTE_117_REVIVE"
},
{
diff --git a/data/maps/Route117_PokemonDayCare/scripts.inc b/data/maps/Route117_PokemonDayCare/scripts.inc
index ea9894ffc..b9ddfaa5a 100644
--- a/data/maps/Route117_PokemonDayCare/scripts.inc
+++ b/data/maps/Route117_PokemonDayCare/scripts.inc
@@ -1,8 +1,8 @@
Route117_PokemonDayCare_MapScripts:: @ 822BBB1
- map_script MAP_SCRIPT_ON_TRANSITION, Route117_PokemonDayCare_MapScript1_22BBB7
+ map_script MAP_SCRIPT_ON_TRANSITION, Route117_PokemonDayCare_MapScript1_SetLandmark
.byte 0
-Route117_PokemonDayCare_MapScript1_22BBB7: @ 822BBB7
+Route117_PokemonDayCare_MapScript1_SetLandmark: @ 822BBB7
setflag FLAG_LANDMARK_POKEMON_DAYCARE
end
diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json
index 7fc1e45c7..0a3fee210 100644
--- a/data/maps/Route118/map.json
+++ b/data/maps/Route118/map.json
@@ -287,7 +287,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route118_EventScript_290ED3",
+ "script": "Route118_EventScript_ItemHyperPotion",
"flag": "FLAG_ITEM_ROUTE_118_HYPER_POTION"
},
{
diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json
index 2146d5ec7..c84ff9db1 100644
--- a/data/maps/Route119/map.json
+++ b/data/maps/Route119/map.json
@@ -243,7 +243,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route119_EventScript_290EE0",
+ "script": "Route119_EventScript_ItemSuperRepel",
"flag": "FLAG_ITEM_ROUTE_119_SUPER_REPEL"
},
{
@@ -256,7 +256,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route119_EventScript_290EED",
+ "script": "Route119_EventScript_ItemZinc",
"flag": "FLAG_ITEM_ROUTE_119_ZINC"
},
{
@@ -269,7 +269,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route119_EventScript_290EFA",
+ "script": "Route119_EventScript_ItemElixir",
"flag": "FLAG_ITEM_ROUTE_119_ELIXIR_1"
},
{
@@ -282,7 +282,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route119_EventScript_290F07",
+ "script": "Route119_EventScript_ItemLeafStone",
"flag": "FLAG_ITEM_ROUTE_119_LEAF_STONE"
},
{
@@ -295,7 +295,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route119_EventScript_290F14",
+ "script": "Route119_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_ROUTE_119_RARE_CANDY"
},
{
@@ -308,7 +308,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route119_EventScript_290F21",
+ "script": "Route119_EventScript_ItemHyperPotion",
"flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_1"
},
{
@@ -438,7 +438,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route119_EventScript_290F2E",
+ "script": "Route119_EventScript_ItemHyperPotion2",
"flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_2"
},
{
@@ -555,7 +555,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route119_EventScript_291399",
+ "script": "Route119_EventScript_ItemNugget",
"flag": "FLAG_ITEM_ROUTE_119_NUGGET"
},
{
@@ -568,7 +568,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route119_EventScript_290F3B",
+ "script": "Route119_EventScript_ItemElixir2",
"flag": "FLAG_ITEM_ROUTE_119_ELIXIR_2"
},
{
diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json
index 63585f86f..1bdbd0bca 100644
--- a/data/maps/Route120/map.json
+++ b/data/maps/Route120/map.json
@@ -230,7 +230,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route120_EventScript_290F48",
+ "script": "Route120_EventScript_ItemNugget",
"flag": "FLAG_ITEM_ROUTE_120_NUGGET"
},
{
@@ -308,7 +308,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route120_EventScript_290F55",
+ "script": "Route120_EventScript_ItemFullHeal",
"flag": "FLAG_ITEM_ROUTE_120_FULL_HEAL"
},
{
@@ -386,7 +386,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route120_EventScript_290F6F",
+ "script": "Route120_EventScript_ItemNestBall",
"flag": "FLAG_ITEM_ROUTE_120_NEST_BALL"
},
{
@@ -399,7 +399,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route120_EventScript_290F62",
+ "script": "Route120_EventScript_ItemHyperPotion",
"flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION"
},
{
@@ -594,7 +594,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route120_EventScript_290F7C",
+ "script": "Route120_EventScript_ItemRevive",
"flag": "FLAG_ITEM_ROUTE_120_REVIVE"
}
],
diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json
index 4339b149d..f1152b465 100644
--- a/data/maps/Route121/map.json
+++ b/data/maps/Route121/map.json
@@ -300,7 +300,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route121_EventScript_290F89",
+ "script": "Route121_EventScript_ItemCarbos",
"flag": "FLAG_ITEM_ROUTE_121_CARBOS"
},
{
@@ -391,7 +391,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route121_EventScript_290F96",
+ "script": "Route121_EventScript_ItemRevive",
"flag": "FLAG_ITEM_ROUTE_121_REVIVE"
},
{
@@ -404,7 +404,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route121_EventScript_290FA3",
+ "script": "Route121_EventScript_ItemZinc",
"flag": "FLAG_ITEM_ROUTE_121_ZINC"
}
],
diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json
index 6562fa7a9..1e562420d 100644
--- a/data/maps/Route123/map.json
+++ b/data/maps/Route123/map.json
@@ -295,7 +295,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route123_EventScript_290FB0",
+ "script": "Route123_EventScript_ItemCalcium",
"flag": "FLAG_ITEM_ROUTE_123_CALCIUM"
},
{
@@ -438,7 +438,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route123_EventScript_290FBD",
+ "script": "Route123_EventScript_ItemUltraBall",
"flag": "FLAG_ITEM_ROUTE_123_ULTRA_BALL"
},
{
@@ -451,7 +451,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route123_EventScript_290FCA",
+ "script": "Route123_EventScript_ItemElixir",
"flag": "FLAG_ITEM_ROUTE_123_ELIXIR"
},
{
@@ -542,7 +542,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route123_EventScript_290FD7",
+ "script": "Route123_EventScript_ItemPPUp",
"flag": "FLAG_ITEM_ROUTE_123_PP_UP"
},
{
@@ -581,7 +581,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route123_EventScript_290FE4",
+ "script": "Route123_EventScript_ItemRevivalHerb",
"flag": "FLAG_ITEM_ROUTE_123_REVIVAL_HERB"
}
],
diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc
index 31158782d..0f0326119 100644
--- a/data/maps/Route123_BerryMastersHouse/scripts.inc
+++ b/data/maps/Route123_BerryMastersHouse/scripts.inc
@@ -1,8 +1,8 @@
Route123_BerryMastersHouse_MapScripts:: @ 826F83B
- map_script MAP_SCRIPT_ON_TRANSITION, Route123_BerryMastersHouse_MapScript1_26F841
+ map_script MAP_SCRIPT_ON_TRANSITION, Route123_BerryMastersHouse_MapScript1_SetLandmark
.byte 0
-Route123_BerryMastersHouse_MapScript1_26F841: @ 826F841
+Route123_BerryMastersHouse_MapScript1_SetLandmark: @ 826F841
setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE
end
diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json
index c1a22a2d0..913208954 100644
--- a/data/maps/Route124/map.json
+++ b/data/maps/Route124/map.json
@@ -115,7 +115,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route124_EventScript_290FF1",
+ "script": "Route124_EventScript_ItemRedShard",
"flag": "FLAG_ITEM_ROUTE_124_RED_SHARD"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route124_EventScript_290FFE",
+ "script": "Route124_EventScript_ItemBlueShard",
"flag": "FLAG_ITEM_ROUTE_124_BLUE_SHARD"
},
{
@@ -141,7 +141,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route124_EventScript_29100B",
+ "script": "Route124_EventScript_ItemYellowShard",
"flag": "FLAG_ITEM_ROUTE_124_YELLOW_SHARD"
},
{
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
index 250a5ba51..a1b7527a1 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
@@ -1,8 +1,8 @@
Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8270A28
- map_script MAP_SCRIPT_ON_TRANSITION, Route124_DivingTreasureHuntersHouse_MapScript1_270A2E
+ map_script MAP_SCRIPT_ON_TRANSITION, Route124_DivingTreasureHuntersHouse_MapScript1_SetLandmark
.byte 0
-Route124_DivingTreasureHuntersHouse_MapScript1_270A2E: @ 8270A2E
+Route124_DivingTreasureHuntersHouse_MapScript1_SetLandmark: @ 8270A2E
setflag FLAG_LANDMARK_HUNTERS_HOUSE
end
diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json
index 0ce520fdd..27615a521 100644
--- a/data/maps/Route125/map.json
+++ b/data/maps/Route125/map.json
@@ -157,7 +157,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route125_EventScript_291018",
+ "script": "Route125_EventScript_ItemBigPearl",
"flag": "FLAG_ITEM_ROUTE_125_BIG_PEARL"
}
],
diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json
index ea63eb80d..b8359bd84 100644
--- a/data/maps/Route126/map.json
+++ b/data/maps/Route126/map.json
@@ -92,7 +92,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route126_EventScript_291025",
+ "script": "Route126_EventScript_ItemGreenShard",
"flag": "FLAG_ITEM_ROUTE_126_GREEN_SHARD"
},
{
diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json
index e4a68c3e1..08d39d971 100644
--- a/data/maps/Route127/map.json
+++ b/data/maps/Route127/map.json
@@ -71,7 +71,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route127_EventScript_291032",
+ "script": "Route127_EventScript_ItemZinc",
"flag": "FLAG_ITEM_ROUTE_127_ZINC"
},
{
@@ -84,7 +84,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route127_EventScript_29103F",
+ "script": "Route127_EventScript_ItemCarbos",
"flag": "FLAG_ITEM_ROUTE_127_CARBOS"
},
{
@@ -175,7 +175,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route127_EventScript_29104C",
+ "script": "Route127_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_ROUTE_127_RARE_CANDY"
}
],
diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json
index 15c0de83d..8a7597826 100644
--- a/data/maps/Route132/map.json
+++ b/data/maps/Route132/map.json
@@ -61,7 +61,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route132_EventScript_291059",
+ "script": "Route132_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_ROUTE_132_RARE_CANDY"
},
{
@@ -152,7 +152,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route132_EventScript_291066",
+ "script": "Route132_EventScript_ItemProtein",
"flag": "FLAG_ITEM_ROUTE_132_PROTEIN"
}
],
diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json
index eed30d7ee..8622515f0 100644
--- a/data/maps/Route133/map.json
+++ b/data/maps/Route133/map.json
@@ -74,7 +74,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route133_EventScript_291073",
+ "script": "Route133_EventScript_ItemBigPearl",
"flag": "FLAG_ITEM_ROUTE_133_BIG_PEARL"
},
{
@@ -87,7 +87,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route133_EventScript_291080",
+ "script": "Route133_EventScript_ItemStarPiece",
"flag": "FLAG_ITEM_ROUTE_133_STAR_PIECE"
},
{
@@ -152,7 +152,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route133_EventScript_29108D",
+ "script": "Route133_EventScript_ItemMaxRevive",
"flag": "FLAG_ITEM_ROUTE_133_MAX_REVIVE"
}
],
diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json
index 8b3a9518e..e45920576 100644
--- a/data/maps/Route134/map.json
+++ b/data/maps/Route134/map.json
@@ -152,7 +152,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route134_EventScript_29109A",
+ "script": "Route134_EventScript_ItemCarbos",
"flag": "FLAG_ITEM_ROUTE_134_CARBOS"
},
{
@@ -165,7 +165,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route134_EventScript_2910A7",
+ "script": "Route134_EventScript_ItemStarPiece",
"flag": "FLAG_ITEM_ROUTE_134_STAR_PIECE"
}
],
diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json
index 04c68baa3..94e22985b 100644
--- a/data/maps/RustboroCity/map.json
+++ b/data/maps/RustboroCity/map.json
@@ -183,7 +183,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_EventScript_2910DB",
+ "script": "RustboroCity_EventScript_ItemXDefend",
"flag": "FLAG_ITEM_RUSTBORO_CITY_X_DEFEND"
},
{
diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json
index b873c76c8..9fc378729 100644
--- a/data/maps/RusturfTunnel/map.json
+++ b/data/maps/RusturfTunnel/map.json
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RusturfTunnel_EventScript_291136",
+ "script": "RusturfTunnel_EventScript_ItemPokeBall",
"flag": "FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RusturfTunnel_EventScript_291143",
+ "script": "RusturfTunnel_EventScript_ItemMaxEther",
"flag": "FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER"
},
{
diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json
index 7c637f0ef..967e55f3e 100644
--- a/data/maps/SafariZone_North/map.json
+++ b/data/maps/SafariZone_North/map.json
@@ -144,7 +144,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "SafariZone_North_EventScript_2912C9",
+ "script": "SafariZone_North_EventScript_ItemCalcium",
"flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM"
}
],
diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json
index 8e3337f53..94c2c268f 100644
--- a/data/maps/SafariZone_Northeast/map.json
+++ b/data/maps/SafariZone_Northeast/map.json
@@ -139,7 +139,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "SafariZone_Northeast_EventScript_2912E3",
+ "script": "SafariZone_Northeast_EventScript_ItemNugget",
"flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET"
}
],
diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json
index 2d3a1fa49..6ead6d714 100644
--- a/data/maps/SafariZone_Northwest/map.json
+++ b/data/maps/SafariZone_Northwest/map.json
@@ -48,7 +48,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "SafariZone_Northwest_EventScript_2912BC",
+ "script": "SafariZone_Northwest_EventScript_ItemTM22",
"flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22"
}
],
diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json
index 3ace62488..cb293b149 100644
--- a/data/maps/SafariZone_Southeast/map.json
+++ b/data/maps/SafariZone_Southeast/map.json
@@ -74,7 +74,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "SafariZone_Southeast_EventScript_2912F0",
+ "script": "SafariZone_Southeast_EventScript_ItemBigPearl",
"flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL"
},
{
diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json
index 5e383a694..3784db801 100644
--- a/data/maps/SafariZone_Southwest/map.json
+++ b/data/maps/SafariZone_Southwest/map.json
@@ -48,7 +48,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "SafariZone_Southwest_EventScript_2912D6",
+ "script": "SafariZone_Southwest_EventScript_ItemMaxRevive",
"flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE"
}
],
diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json
index 304ebd676..5abcf9adf 100644
--- a/data/maps/ScorchedSlab/map.json
+++ b/data/maps/ScorchedSlab/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "ScorchedSlab_EventScript_2912AF",
+ "script": "ScorchedSlab_EventScript_ItemTM11",
"flag": "FLAG_ITEM_SCORCHED_SLAB_TM_11"
}
],
diff --git a/data/maps/ScorchedSlab/scripts.inc b/data/maps/ScorchedSlab/scripts.inc
index 62a546780..3d6aa1cfe 100644
--- a/data/maps/ScorchedSlab/scripts.inc
+++ b/data/maps/ScorchedSlab/scripts.inc
@@ -1,8 +1,8 @@
ScorchedSlab_MapScripts:: @ 8239291
- map_script MAP_SCRIPT_ON_TRANSITION, ScorchedSlab_MapScript1_239297
+ map_script MAP_SCRIPT_ON_TRANSITION, ScorchedSlab_MapScript1_SetLandmark
.byte 0
-ScorchedSlab_MapScript1_239297: @ 8239297
+ScorchedSlab_MapScript1_SetLandmark: @ 8239297
setflag FLAG_LANDMARK_SCORCHED_SLAB
end
diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json
index f4f7fd336..77dcdc169 100644
--- a/data/maps/SeafloorCavern_Room9/map.json
+++ b/data/maps/SeafloorCavern_Room9/map.json
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "SeafloorCavern_Room9_EventScript_291401",
+ "script": "SeafloorCavern_Room9_EventScript_ItemTM26",
"flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26"
},
{
diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc
index 71e6426fe..f0337548e 100644
--- a/data/maps/SealedChamber_OuterRoom/scripts.inc
+++ b/data/maps/SealedChamber_OuterRoom/scripts.inc
@@ -1,6 +1,6 @@
SealedChamber_OuterRoom_MapScripts:: @ 8239106
map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_MapScript1_239116
- map_script MAP_SCRIPT_ON_TRANSITION, SealedChamber_OuterRoom_MapScript1_239127
+ map_script MAP_SCRIPT_ON_TRANSITION, SealedChamber_OuterRoom_MapScript1_SetLandmark
map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_MapScript1_23912B
.byte 0
@@ -9,7 +9,7 @@ SealedChamber_OuterRoom_MapScript1_239116: @ 8239116
setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44
end
-SealedChamber_OuterRoom_MapScript1_239127: @ 8239127
+SealedChamber_OuterRoom_MapScript1_SetLandmark: @ 8239127
setflag FLAG_LANDMARK_SEALED_CHAMBER
end
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json
index 1ebb9f555..4b5d23110 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "ShoalCave_LowTideEntranceRoom_EventScript_2913C0",
+ "script": "ShoalCave_LowTideEntranceRoom_EventScript_ItemBigPearl",
"flag": "FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL"
},
{
diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json
index dffef7da9..d2f69b51f 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/map.json
+++ b/data/maps/ShoalCave_LowTideIceRoom/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "ShoalCave_LowTideIceRoom_EventScript_2913E7",
+ "script": "ShoalCave_LowTideIceRoom_EventScript_ItemTM07",
"flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "ShoalCave_LowTideIceRoom_EventScript_2913F4",
+ "script": "ShoalCave_LowTideIceRoom_EventScript_ItemNeverMeltIce",
"flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE"
}
],
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json
index 04e4ec67f..f9eec06c4 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/map.json
+++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "ShoalCave_LowTideInnerRoom_EventScript_2913CD",
+ "script": "ShoalCave_LowTideInnerRoom_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY"
}
],
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json
index 239effc74..4da33c163 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/map.json
+++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "ShoalCave_LowTideStairsRoom_EventScript_2913DA",
+ "script": "ShoalCave_LowTideStairsRoom_EventScript_ItemIceHeal",
"flag": "FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL"
}
],
diff --git a/data/maps/SkyPillar_Entrance/scripts.inc b/data/maps/SkyPillar_Entrance/scripts.inc
index 40d57a485..7b5434eff 100644
--- a/data/maps/SkyPillar_Entrance/scripts.inc
+++ b/data/maps/SkyPillar_Entrance/scripts.inc
@@ -1,8 +1,8 @@
SkyPillar_Entrance_MapScripts:: @ 823929E
- map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Entrance_MapScript1_2392A4
+ map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Entrance_MapScript1_SetLandmark
.byte 0
-SkyPillar_Entrance_MapScript1_2392A4: @ 82392A4
+SkyPillar_Entrance_MapScript1_SetLandmark: @ 82392A4
setflag FLAG_LANDMARK_SKY_PILLAR
end
diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc
index 618ce864a..84406d111 100644
--- a/data/maps/SouthernIsland_Exterior/scripts.inc
+++ b/data/maps/SouthernIsland_Exterior/scripts.inc
@@ -1,8 +1,8 @@
SouthernIsland_Exterior_MapScripts:: @ 82429C8
- map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Exterior_MapScript1_2429CE
+ map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Exterior_MapScript1_SetLandmark
.byte 0
-SouthernIsland_Exterior_MapScript1_2429CE: @ 82429CE
+SouthernIsland_Exterior_MapScript1_SetLandmark: @ 82429CE
setflag FLAG_LANDMARK_SOUTHERN_ISLAND
end
diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json
index 05eb2b795..8685f3341 100644
--- a/data/maps/VictoryRoad_1F/map.json
+++ b/data/maps/VictoryRoad_1F/map.json
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "VictoryRoad_1F_EventScript_291483",
+ "script": "VictoryRoad_1F_EventScript_ItemMaxElixir",
"flag": "FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "VictoryRoad_1F_EventScript_291490",
+ "script": "VictoryRoad_1F_EventScript_ItemPPUp",
"flag": "FLAG_ITEM_VICTORY_ROAD_1F_PP_UP"
},
{
diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json
index 2fde10090..74bd3dbf8 100644
--- a/data/maps/VictoryRoad_B1F/map.json
+++ b/data/maps/VictoryRoad_B1F/map.json
@@ -245,7 +245,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "VictoryRoad_B1F_EventScript_29149D",
+ "script": "VictoryRoad_B1F_EventScript_ItemTM29",
"flag": "FLAG_ITEM_VICTORY_ROAD_B1F_TM_29"
},
{
@@ -258,7 +258,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "VictoryRoad_B1F_EventScript_2914AA",
+ "script": "VictoryRoad_B1F_EventScript_ItemFullRestore",
"flag": "FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE"
},
{
diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json
index fd9195ed4..de10ef891 100644
--- a/data/maps/VictoryRoad_B2F/map.json
+++ b/data/maps/VictoryRoad_B2F/map.json
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "VictoryRoad_B2F_EventScript_2914B7",
+ "script": "VictoryRoad_B2F_EventScript_ItemFullHeal",
"flag": "FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL"
},
{