maptrigger macro

2016-01-05 08:46:37 -05:00
parent 27be0bfe05
commit 80aba7fc13
47 changed files with 345 additions and 343 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"