maptrigger macro

35 files changed, 93 insertions, 92 deletions

diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index 5921b1f0e..019c1f3fa 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -17,9 +17,9 @@ AzaleaTown_MapScriptHeader:
 	db 3
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
-	dw .Trigger2, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
+	maptrigger .Trigger2
 
 .MapCallbacks:
 	db 1
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index ba0bd1c33..ca10518fb 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -10,8 +10,8 @@ BattleTower1F_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 0
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
index 9a25e55a4..dbbce6f3d 100644
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -6,8 +6,8 @@ BattleTowerElevator_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 0
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
index f541da05d..6c4a45920 100644
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -6,8 +6,8 @@ BattleTowerHallway_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 0
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index 3adb8f2de..56df56768 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -10,9 +10,9 @@ BurnedTower1F_MapScriptHeader:
 	db 3
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
-	dw .Trigger2, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
+	maptrigger .Trigger2
 
 .MapCallbacks:
 	db 1
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index e3dc14c0a..20ae78fc1 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -10,8 +10,8 @@ CherrygroveCity_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 1
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index c05109db4..aa5ff3a02 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -17,8 +17,8 @@ CianwoodCity_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 1
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index b4383ac75..ef2e6c2b7 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -7,9 +7,9 @@ Colosseum_MapScriptHeader:
 	db 3
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
-	dw .Trigger2, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
+	maptrigger .Trigger2
 
 .MapCallbacks:
 	db 2
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index 942920874..a2fa23b7b 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -9,8 +9,8 @@ DragonShrine_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 0
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 5497bc90c..fbde11df1 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -14,8 +14,8 @@ DragonsDenB1F_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 1
diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm
index e8de95bc7..39649cd41 100644
--- a/maps/EcruteakHouse.asm
+++ b/maps/EcruteakHouse.asm
@@ -9,8 +9,8 @@ EcruteakHouse_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 1
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index f24586f31..02869d85b 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -11,12 +11,12 @@ ElmsLab_MapScriptHeader:
 	db 6
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
-	dw .Trigger2, 0
-	dw .Trigger3, 0
-	dw .Trigger4, 0
-	dw .Trigger5, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
+	maptrigger .Trigger2
+	maptrigger .Trigger3
+	maptrigger .Trigger4
+	maptrigger .Trigger5
 
 .MapCallbacks:
 	db 1
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index 40335d6df..dddc192cd 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -9,9 +9,9 @@ FastShip1F_MapScriptHeader:
 	db 3
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
-	dw .Trigger2, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
+	maptrigger .Trigger2
 
 .MapCallbacks:
 	db 0
diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm
index a8276d1cf..44b6d6247 100644
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -7,7 +7,7 @@ GoldenrodMagnetTrainStation_MapScriptHeader:
 	db 1
 
 	; triggers
-	dw .Trigger0, 0
+	maptrigger .Trigger0
 
 .MapCallbacks:
 	db 0
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index c8ee751a1..d0f59a861 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -6,8 +6,8 @@ HallOfFame_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 0
diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm
index 20f7c0997..fa54e6afe 100644
--- a/maps/LakeofRage.asm
+++ b/maps/LakeofRage.asm
@@ -17,8 +17,8 @@ LakeofRage_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 2
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index 4eeafd92c..7420f4bfc 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -9,8 +9,8 @@ MahoganyTown_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 1
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index 05e4c4b1d..678531b26 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -4,8 +4,8 @@ MobileBattleRoom_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 0
diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm
index e0eb4df2f..6a51ddbde 100644
--- a/maps/MobileTradeRoomMobile.asm
+++ b/maps/MobileTradeRoomMobile.asm
@@ -4,8 +4,8 @@ MobileTradeRoomMobile_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 0
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 5c1fdb985..b2ce702bb 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -6,8 +6,8 @@ MountMoon_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 0
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index cf25d1a18..11f582af5 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -8,8 +8,8 @@ NewBarkTown_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 1
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index 09c4a26c7..c93a32374 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -9,8 +9,8 @@ OlivineCity_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 1
diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm
index c285fc8c2..7989143c3 100644
--- a/maps/PokeCenter2F.asm
+++ b/maps/PokeCenter2F.asm
@@ -9,12 +9,12 @@ PokeCenter2F_MapScriptHeader:
 	db 6
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
-	dw .Trigger2, 0
-	dw .Trigger3, 0
-	dw .Trigger4, 0
-	dw .Trigger5, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
+	maptrigger .Trigger2
+	maptrigger .Trigger3
+	maptrigger .Trigger4
+	maptrigger .Trigger5
 
 .MapCallbacks:
 	db 0
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index eee02b34c..16447b2a6 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -10,9 +10,9 @@ RadioTower5F_MapScriptHeader:
 	db 3
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
-	dw .Trigger2, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
+	maptrigger .Trigger2
 
 .MapCallbacks:
 	db 0
diff --git a/maps/Route29.asm b/maps/Route29.asm
index cdd5fc426..b0cefef44 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -13,8 +13,8 @@ Route29_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 1
diff --git a/maps/Route32.asm b/maps/Route32.asm
index 63f29e81c..3081e9e26 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -19,9 +19,9 @@ Route32_MapScriptHeader:
 	db 3
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
-	dw .Trigger2, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
+	maptrigger .Trigger2
 
 .MapCallbacks:
 	db 1
diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm
index 0a93c0d98..6d4ecd450 100644
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -17,9 +17,9 @@ Route36NationalParkgate_MapScriptHeader:
 	db 3
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
-	dw .Trigger2, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
+	maptrigger .Trigger2
 
 .MapCallbacks:
 	db 2
diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm
index cce353350..14e3722a8 100644
--- a/maps/SaffronTrainStation.asm
+++ b/maps/SaffronTrainStation.asm
@@ -9,7 +9,7 @@ SaffronTrainStation_MapScriptHeader:
 	db 1
 
 	; triggers
-	dw .Trigger0, 0
+	maptrigger .Trigger0
 
 .MapCallbacks:
 	db 0
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index de9012ab0..ce4e59931 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -11,7 +11,7 @@ TeamRocketBaseB1F_MapScriptHeader:
 	db 1
 
 	; triggers
-	dw .Trigger0, 0
+	maptrigger .Trigger0
 
 .MapCallbacks:
 	db 1
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index a55e2c125..591a2b411 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -19,10 +19,10 @@ TeamRocketBaseB3F_MapScriptHeader:
 	db 4
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
-	dw .Trigger2, 0
-	dw .Trigger3, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
+	maptrigger .Trigger2
+	maptrigger .Trigger3
 
 .MapCallbacks:
 	db 1
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index e543c352f..6a5f4d0ae 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -7,8 +7,8 @@ TimeCapsule_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 1
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index 3abad85e7..0da64c429 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -7,8 +7,8 @@ TradeCenter_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 1
diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm
index 20a2a338d..3cfd5363e 100644
--- a/maps/UndergroundPathSwitchRoomEntrances.asm
+++ b/maps/UndergroundPathSwitchRoomEntrances.asm
@@ -48,8 +48,8 @@ UndergroundPathSwitchRoomEntrances_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 1
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 2e31531ce..e22774810 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -8,8 +8,8 @@ VermilionPort_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw .Trigger0, 0
-	dw .Trigger1, 0
+	maptrigger .Trigger0
+	maptrigger .Trigger1
 
 .MapCallbacks:
 	db 1
diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm
index b277f34b0..c97d0a180 100644
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -14,26 +14,26 @@ BlueScript_0x9aa26:
 	opentext
 	checkflag ENGINE_EARTHBADGE
 	iftrue .FightDone
-	writetext UnknownText_0x9aa7b
+	writetext LeaderBlueBeforeText
 	waitbutton
 	closetext
-	winlosstext UnknownText_0x9abae, 0
+	winlosstext LeaderBlueWinText, 0
 	loadtrainer BLUE, 1
 	startbattle
 	reloadmapafterbattle
 	setevent EVENT_BEAT_BLUE
 	opentext
-	writetext UnknownText_0x9ac0f
+	writetext Text_ReceivedEarthBadge
 	playsound SFX_GET_BADGE
 	waitsfx
 	setflag ENGINE_EARTHBADGE
-	writetext UnknownText_0x9ac27
+	writetext LeaderBlueAfterText
 	waitbutton
 	closetext
 	end
 
 .FightDone
-	writetext UnknownText_0x9acab
+	writetext LeaderBlueEpilogueText
 	waitbutton
 	closetext
 	end
@@ -58,11 +58,12 @@ ViridianGymStatue:
 	checkflag ENGINE_EARTHBADGE
 	iftrue .Beaten
 	jumpstd gymstatue1
+
 .Beaten
 	trainertotext BLUE, 1, $1
 	jumpstd gymstatue2
 
-UnknownText_0x9aa7b:
+LeaderBlueBeforeText:
 	text "BLUE: Yo! Finally"
 	line "got here, huh?"
 
@@ -95,7 +96,7 @@ UnknownText_0x9aa7b:
 	line "CHAMP?"
 	done
 
-UnknownText_0x9abae:
+LeaderBlueWinText:
 	text "BLUE: What?"
 
 	para "How the heck did I"
@@ -108,12 +109,12 @@ UnknownText_0x9abae:
 	cont "it's EARTHBADGE."
 	done
 
-UnknownText_0x9ac0f:
+Text_ReceivedEarthBadge:
 	text "<PLAYER> received"
 	line "EARTHBADGE."
 	done
 
-UnknownText_0x9ac27:
+LeaderBlueAfterText:
 	text "BLUE: …"
 
 	para "All right, I was"
@@ -129,7 +130,7 @@ UnknownText_0x9ac27:
 	line "it!"
 	done
 
-UnknownText_0x9acab:
+LeaderBlueEpilogueText:
 	text "BLUE: Listen, you."
 
 	para "You'd better not"