Split/extract/port landmark

2017-12-26 21:20:29 -06:00
parent ba130d469d
commit f9a9391ff3
43 changed files with 971 additions and 652 deletions
--- a/data/scripts/maps/AbandonedShip_Deck.inc
+++ b/data/scripts/maps/AbandonedShip_Deck.inc
@@ -3,6 +3,6 @@ AbandonedShip_Deck_MapScripts:: @ 823799A
 	.byte 0

 AbandonedShip_Deck_MapScript1_2379A0: @ 82379A0
-	setflag FLAG_0x89E
+	setflag FLAG_LANDMARK_ABANDONED_SHIP
 	end

--- a/data/scripts/maps/AlteringCave.inc
+++ b/data/scripts/maps/AlteringCave.inc
@@ -3,6 +3,6 @@ AlteringCave_MapScripts:: @ 823B177
 	.byte 0

 AlteringCave_MapScript1_23B17D: @ 823B17D
-	setflag FLAG_0x8DD
+	setflag FLAG_LANDMARK_ALTERING_CAVE
 	end

--- a/data/scripts/maps/AncientTomb.inc
+++ b/data/scripts/maps/AncientTomb.inc
@@ -17,7 +17,7 @@ AncientTomb_EventScript_238FCD:: @ 8238FCD
 	return

 AncientTomb_MapScript1_238FE1: @ 8238FE1
-	setflag FLAG_0x8B9
+	setflag FLAG_LANDMARK_ANCIENT_TOMB
 	checkflag FLAG_0x1BD
 	call_if 0, AncientTomb_EventScript_238FEE
 	end
--- a/data/scripts/maps/BattleFrontier_ReceptionGate.inc
+++ b/data/scripts/maps/BattleFrontier_ReceptionGate.inc
@@ -4,7 +4,7 @@ BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA
 	.byte 0

 BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5
-	setflag FLAG_UNLOCK_BATTLE_FRONTIER
+	setflag FLAG_LANDMARK_BATTLE_FRONTIER
 	end

 BattleFrontier_ReceptionGate_MapScript2_2661E9: @ 82661E9
--- a/data/scripts/maps/DesertRuins.inc
+++ b/data/scripts/maps/DesertRuins.inc
@@ -31,7 +31,7 @@ DesertRuins_EventScript_22D993:: @ 822D993
 	return

 DesertRuins_MapScript1_22D9CA: @ 822D9CA
-	setflag FLAG_0x8B6
+	setflag FLAG_LANDMARK_DESERT_RUINS
 	checkflag FLAG_0x1BB
 	call_if 0, DesertRuins_EventScript_22D9D7
 	end
--- a/data/scripts/maps/DesertUnderpass.inc
+++ b/data/scripts/maps/DesertUnderpass.inc
@@ -3,7 +3,7 @@ DesertUnderpass_MapScripts:: @ 823AF37
 	.byte 0

 DesertUnderpass_MapScript1_23AF3D: @ 823AF3D
-	setflag FLAG_0x8DE
+	setflag FLAG_LANDMARK_DESERT_UNDERPASS
 	end

 DesertUnderpass_EventScript_23AF41:: @ 823AF41
--- a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc
+++ b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc
@@ -5,7 +5,7 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2

 EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD
 	setrespawn 20
-	setflag FLAG_SYS_POKEMON_LEAGUE_FLY
+	setflag FLAG_LANDMARK_POKEMON_LEAGUE
 	checkflag FLAG_0x107
 	call_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED
 	end
--- a/data/scripts/maps/FieryPath.inc
+++ b/data/scripts/maps/FieryPath.inc
@@ -3,9 +3,9 @@ FieryPath_MapScripts:: @ 8230F24
 	.byte 0

 FieryPath_MapScript1_230F2A: @ 8230F2A
-	checkflag FLAG_0x8AA
+	checkflag FLAG_LANDMARK_FIERY_PATH
 	call_if 0, FieryPath_EventScript_230F37
-	setflag FLAG_0x8AA
+	setflag FLAG_LANDMARK_FIERY_PATH
 	end

 FieryPath_EventScript_230F37:: @ 8230F37
--- a/data/scripts/maps/IslandCave.inc
+++ b/data/scripts/maps/IslandCave.inc
@@ -31,7 +31,7 @@ IslandCave_EventScript_238E62:: @ 8238E62
 	return

 IslandCave_MapScript1_238E99: @ 8238E99
-	setflag FLAG_0x8B5
+	setflag FLAG_LANDMARK_ISLAND_CAVE
 	call IslandCave_EventScript_238F45
 	checkflag FLAG_0x1BC
 	call_if 0, IslandCave_EventScript_238EAB
--- a/data/scripts/maps/MirageTower_1F.inc
+++ b/data/scripts/maps/MirageTower_1F.inc
@@ -5,6 +5,6 @@ MirageTower_1F_MapScripts:: @ 823AD01
 MirageTower_1F_MapScript1_23AD07: @ 823AD07
 	setflag FLAG_0x8DC
 	setflag FLAG_0x09D
-	setflag FLAG_0x078
+	setflag FLAG_LANDMARK_MIRAGE_TOWER
 	end

--- a/data/scripts/maps/MirageTower_4F.inc
+++ b/data/scripts/maps/MirageTower_4F.inc
@@ -53,7 +53,7 @@ MirageTower_4F_EventScript_23ADCA:: @ 823ADCA
 	special sub_81BE994
 	waitstate
 	setvar VAR_0x40CB, 1
-	clearflag FLAG_0x078
+	clearflag FLAG_LANDMARK_MIRAGE_TOWER
 	warp ROUTE_111, 255, 19, 59
 	waitstate
 	release
--- a/data/scripts/maps/NewMauville_Entrance.inc
+++ b/data/scripts/maps/NewMauville_Entrance.inc
@@ -18,7 +18,7 @@ NewMauville_Entrance_EventScript_2372C4:: @ 82372C4
 	return

 NewMauville_Entrance_MapScript1_2372FB: @ 82372FB
-	setflag FLAG_0x8A0
+	setflag FLAG_LANDMARK_NEW_MAUVILLE
 	end

 NewMauville_Entrance_EventScript_2372FF:: @ 82372FF
--- a/data/scripts/maps/Route104_MrBrineysHouse.inc
+++ b/data/scripts/maps/Route104_MrBrineysHouse.inc
@@ -3,7 +3,7 @@ Route104_MrBrineysHouse_MapScripts:: @ 8229D2E
 	.byte 0

 Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34
-	setflag FLAG_0x89D
+	setflag FLAG_LANDMARK_MR_BRINEY_HOUSE
 	compare VAR_0x4090, 1
 	call_if 1, Route104_MrBrineysHouse_EventScript_229D50
 	checkflag FLAG_0x0BC
--- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
+++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
@@ -3,7 +3,7 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C
 	.byte 0

 Route104_PrettyPetalFlowerShop_MapScript1_22A352: @ 822A352
-	setflag FLAG_0x89C
+	setflag FLAG_LANDMARK_FLOWER_SHOP
 	checkflag FLAG_0x07F
 	goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A36B
 	checkflag FLAG_BADGE03_GET
--- a/data/scripts/maps/Route109_SeashoreHouse.inc
+++ b/data/scripts/maps/Route109_SeashoreHouse.inc
@@ -3,7 +3,7 @@ Route109_SeashoreHouse_MapScripts:: @ 82693F4
 	.byte 0

 Route109_SeashoreHouse_MapScript1_2693FA: @ 82693FA
-	setflag FLAG_0x89F
+	setflag FLAG_LANDMARK_SEASHORE_HOUSE
 	end

 Route109_SeashoreHouse_EventScript_2693FE:: @ 82693FE
--- a/data/scripts/maps/Route110_TrickHouseEntrance.inc
+++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc
@@ -5,7 +5,7 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8269A50
 	.byte 0

 Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60
-	setflag FLAG_0x8A2
+	setflag FLAG_LANDMARK_TRICK_HOUSE
 	compare VAR_0x40B5, 1
 	goto_eq Route110_TrickHouseEntrance_EventScript_269AF3
 	compare VAR_0x40C1, 1
--- a/data/scripts/maps/Route111.inc
+++ b/data/scripts/maps/Route111.inc
@@ -278,7 +278,7 @@ Route111_EventScript_1F0FBD:: @ 81F0FBD
 Route111_EventScript_1F0FC5:: @ 81F0FC5
 	lock
 	faceplayer
-	setflag FLAG_0x8A3
+	setflag FLAG_LANDMARK_WINSTRATE_FAMILY
 	msgbox Route111_Text_1F1475, 5
 	compare VAR_RESULT, 1
 	goto_eq Route111_EventScript_1F0FE7
--- a/data/scripts/maps/Route111_OldLadysRestStop.inc
+++ b/data/scripts/maps/Route111_OldLadysRestStop.inc
@@ -3,7 +3,7 @@ Route111_OldLadysRestStop_MapScripts:: @ 822A916
 	.byte 0

 Route111_OldLadysRestStop_MapScript1_22A91C: @ 822A91C
-	setflag FLAG_0x8A1
+	setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP
 	end

 Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920
--- a/data/scripts/maps/Route113_GlassWorkshop.inc
+++ b/data/scripts/maps/Route113_GlassWorkshop.inc
@@ -3,7 +3,7 @@ Route113_GlassWorkshop_MapScripts:: @ 826ED03
 	.byte 0

 Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09
-	setflag FLAG_0x8A4
+	setflag FLAG_LANDMARK_GLASS_WORKSHOP
 	compare VAR_0x40BE, 1
 	call_if 1, Route113_GlassWorkshop_EventScript_26ED18
 	end
--- a/data/scripts/maps/Route114_FossilManiacsHouse.inc
+++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc
@@ -3,7 +3,7 @@ Route114_FossilManiacsHouse_MapScripts:: @ 822AD30
 	.byte 0

 Route114_FossilManiacsHouse_MapScript1_22AD36: @ 822AD36
-	setflag FLAG_0x8B7
+	setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE
 	end

 Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A
--- a/data/scripts/maps/Route114_LanettesHouse.inc
+++ b/data/scripts/maps/Route114_LanettesHouse.inc
@@ -3,7 +3,7 @@ Route114_LanettesHouse_MapScripts:: @ 822B2C8
 	.byte 0

 Route114_LanettesHouse_MapScript1_22B2CE: @ 822B2CE
-	setflag FLAG_0x8A5
+	setflag FLAG_LANDMARK_LANETTES_HOUSE
 	end

 Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2
--- a/data/scripts/maps/Route116_TunnelersRestHouse.inc
+++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc
@@ -3,7 +3,7 @@ Route116_TunnelersRestHouse_MapScripts:: @ 822B850
 	.byte 0

 Route116_TunnelersRestHouse_MapScript1_22B856: @ 822B856
-	setflag FLAG_0x8BA
+	setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE
 	end

 Route116_TunnelersRestHouse_EventScript_22B85A:: @ 822B85A
--- a/data/scripts/maps/Route117_PokemonDayCare.inc
+++ b/data/scripts/maps/Route117_PokemonDayCare.inc
@@ -3,6 +3,6 @@ Route117_PokemonDayCare_MapScripts:: @ 822BBB1
 	.byte 0

 Route117_PokemonDayCare_MapScript1_22BBB7: @ 822BBB7
-	setflag FLAG_0x8A6
+	setflag FLAG_LANDMARK_POKEMON_DAYCARE
 	end

--- a/data/scripts/maps/Route123_BerryMastersHouse.inc
+++ b/data/scripts/maps/Route123_BerryMastersHouse.inc
@@ -3,7 +3,7 @@ Route123_BerryMastersHouse_MapScripts:: @ 826F83B
 	.byte 0

 Route123_BerryMastersHouse_MapScript1_26F841: @ 826F841
-	setflag FLAG_0x8C3
+	setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE
 	end

 Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845
--- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
+++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
@@ -3,7 +3,7 @@ Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8270A28
 	.byte 0

 Route124_DivingTreasureHuntersHouse_MapScript1_270A2E: @ 8270A2E
-	setflag FLAG_0x8BB
+	setflag FLAG_LANDMARK_HUNTERS_HOUSE
 	end

 Route124_DivingTreasureHuntersHouse_EventScript_270A32:: @ 8270A32
--- a/data/scripts/maps/ScorchedSlab.inc
+++ b/data/scripts/maps/ScorchedSlab.inc
@@ -3,6 +3,6 @@ ScorchedSlab_MapScripts:: @ 8239291
 	.byte 0

 ScorchedSlab_MapScript1_239297: @ 8239297
-	setflag FLAG_0x8B8
+	setflag FLAG_LANDMARK_SCORCHED_SLAB
 	end

--- a/data/scripts/maps/SealedChamber_OuterRoom.inc
+++ b/data/scripts/maps/SealedChamber_OuterRoom.inc
@@ -10,7 +10,7 @@ SealedChamber_OuterRoom_MapScript1_239116: @ 8239116
 	end

 SealedChamber_OuterRoom_MapScript1_239127: @ 8239127
-	setflag FLAG_0x8BC
+	setflag FLAG_LANDMARK_SEALED_CHAMBER
 	end

 SealedChamber_OuterRoom_MapScript1_23912B: @ 823912B
--- a/data/scripts/maps/SkyPillar_Entrance.inc
+++ b/data/scripts/maps/SkyPillar_Entrance.inc
@@ -3,6 +3,6 @@ SkyPillar_Entrance_MapScripts:: @ 823929E
 	.byte 0

 SkyPillar_Entrance_MapScript1_2392A4: @ 82392A4
-	setflag FLAG_0x8BE
+	setflag FLAG_LANDMARK_SKY_PILLAR
 	end

--- a/data/scripts/maps/SouthernIsland_Exterior.inc
+++ b/data/scripts/maps/SouthernIsland_Exterior.inc
@@ -3,7 +3,7 @@ SouthernIsland_Exterior_MapScripts:: @ 82429C8
 	.byte 0

 SouthernIsland_Exterior_MapScript1_2429CE: @ 82429CE
-	setflag FLAG_UNLOCK_SOUTHERN_ISLAND
+	setflag FLAG_LANDMARK_SOUTHERN_ISLAND
 	end

 SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2
--- a/data/scripts/maps/TrainerHill_Entrance.inc
+++ b/data/scripts/maps/TrainerHill_Entrance.inc
@@ -7,7 +7,7 @@ TrainerHill_Entrance_MapScripts:: @ 82680AC
 	.byte 0

 TrainerHill_Entrance_MapScript1_2680C6: @ 82680C6
-	setflag FLAG_0x8E2
+	setflag FLAG_LANDMARK_TRAINER_HILL
 	getplayerxy VAR_0x400D, VAR_RESULT
 	end

--- a/data/scripts/maps/Underwater_SeafloorCavern.inc
+++ b/data/scripts/maps/Underwater_SeafloorCavern.inc
@@ -5,7 +5,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 823433B
 	.byte 0

 Underwater_SeafloorCavern_MapScript1_23434B: @ 823434B
-	setflag FLAG_0x8A7
+	setflag FLAG_LANDMARK_SEAFLOOR_CAVERN
 	checkflag FLAG_0x081
 	goto_eq Underwater_SeafloorCavern_EventScript_234358
 	end