Person event constants for each map

maps/AzaleaGym.asm

@@ -1,3 +1,12 @@
+const_value set 2
+	const AZALEAGYM_BUGSY
+	const AZALEAGYM_BUG_CATCHER1
+	const AZALEAGYM_BUG_CATCHER2
+	const AZALEAGYM_BUG_CATCHER3
+	const AZALEAGYM_TWIN1
+	const AZALEAGYM_TWIN2
+	const AZALEAGYM_GYM_GUY
+
 AzaleaGym_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/AzaleaMart.asm

@@ -1,3 +1,8 @@
+const_value set 2
+	const AZALEAMART_CLERK
+	const AZALEAMART_COOLTRAINER_M
+	const AZALEAMART_BUG_CATCHER
+
 AzaleaMart_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/AzaleaPokeCenter1F.asm

@@ -1,3 +1,9 @@
+const_value set 2
+	const AZALEAPOKECENTER1F_NURSE
+	const AZALEAPOKECENTER1F_GENTLEMAN
+	const AZALEAPOKECENTER1F_FISHING_GURU
+	const AZALEAPOKECENTER1F_POKEFAN_F
+
 AzaleaPokeCenter1F_MapScriptHeader:
 .MapTriggers:
 	db 1

maps/AzaleaTown.asm

@@ -1,3 +1,17 @@
+const_value set 2
+	const AZALEATOWN_AZALEA_ROCKET1
+	const AZALEATOWN_GRAMPS
+	const AZALEATOWN_TEACHER
+	const AZALEATOWN_YOUNGSTER
+	const AZALEATOWN_SLOWPOKE1
+	const AZALEATOWN_SLOWPOKE2
+	const AZALEATOWN_SLOWPOKE3
+	const AZALEATOWN_SLOWPOKE4
+	const AZALEATOWN_FRUIT_TREE
+	const AZALEATOWN_AZALEA_ROCKET2
+	const AZALEATOWN_AZALEA_ROCKET3
+	const AZALEATOWN_KURT_OUTSIDE
+
 AzaleaTown_MapScriptHeader:
 .MapTriggers:
 	db 3
@@ -27,13 +41,13 @@ AzaleaTown_MapScriptHeader:
 	return
 
 UnknownScript_0x198018:
-	moveperson $b, $b, $b
+	moveperson AZALEATOWN_AZALEA_ROCKET2, $b, $b
 	spriteface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special Special_RotatePalettesRightMusic
 	pause 15
-	appear $b
+	appear AZALEATOWN_AZALEA_ROCKET2
-	applymovement $b, MovementData_0x198134
+	applymovement AZALEATOWN_AZALEA_ROCKET2, MovementData_0x198134
 	spriteface PLAYER, DOWN
 	jump UnknownScript_0x198049
 
@@ -42,8 +56,8 @@ UnknownScript_0x198034:
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special Special_RotatePalettesRightMusic
 	pause 15
-	appear $b
+	appear AZALEATOWN_AZALEA_ROCKET2
-	applymovement $b, MovementData_0x19813c
+	applymovement AZALEATOWN_AZALEA_ROCKET2, MovementData_0x19813c
 	spriteface PLAYER, UP
 UnknownScript_0x198049:
 	playmusic MUSIC_RIVAL_ENCOUNTER
@@ -89,9 +103,9 @@ UnknownScript_0x198091:
 	waitbutton
 	closetext
 	spriteface PLAYER, LEFT
-	applymovement $b, MovementData_0x198144
+	applymovement AZALEATOWN_AZALEA_ROCKET2, MovementData_0x198144
 	playsound SFX_EXIT_BUILDING
-	disappear $b
+	disappear AZALEATOWN_AZALEA_ROCKET2
 	dotrigger $0
 	waitsfx
 	playmapmusic
@@ -150,13 +164,13 @@ UnknownScript_0x1980e5:
 	loadfont
 	writetext UnknownText_0x1985df
 	keeptextopen
-	spriteface $d, RIGHT
+	spriteface AZALEATOWN_KURT_OUTSIDE, RIGHT
 	writetext UnknownText_0x19860b
 	keeptextopen
 	writetext UnknownText_0x198628
 	waitbutton
 	verbosegiveitem GS_BALL
-	spriteface $d, LEFT
+	spriteface AZALEATOWN_KURT_OUTSIDE, LEFT
 	setflag ENGINE_HAVE_EXAMINED_GS_BALL
 	clearevent EVENT_ILEX_FOREST_LASS
 	setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
@@ -169,7 +183,7 @@ KurtOutsideScript_0x19810c:
 	loadfont
 	writetext UnknownText_0x198628
 	waitbutton
-	spriteface $d, LEFT
+	spriteface AZALEATOWN_KURT_OUTSIDE, LEFT
 	closetext
 	end
 

maps/BattleTower1F.asm

@@ -1,3 +1,10 @@
+const_value set 2
+	const BATTLETOWER1F_RECEPTIONIST
+	const BATTLETOWER1F_YOUNGSTER
+	const BATTLETOWER1F_COOLTRAINER_F
+	const BATTLETOWER1F_BUG_CATCHER
+	const BATTLETOWER1F_GRANNY
+
 BattleTower1F_MapScriptHeader:
 .MapTriggers:
 	db 2
@@ -103,12 +110,12 @@ Script_WalkToBattleTowerElevator:
 	domaptrigger BATTLE_TOWER_BATTLE_ROOM, $0
 	domaptrigger BATTLE_TOWER_ELEVATOR, $0
 	domaptrigger BATTLE_TOWER_HALLWAY, $0
-	follow $2, PLAYER
+	follow BATTLETOWER1F_RECEPTIONIST, PLAYER
-	applymovement $2, MovementData_BattleTower1FWalkToElevator
+	applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator
 	writebyte BATTLETOWERACTION_0A
 	special BattleTowerAction
 	warpsound
-	disappear $2
+	disappear BATTLETOWER1F_RECEPTIONIST
 	stopfollow
 	applymovement PLAYER, MovementData_BattleTowerHallwayPlayerEntersBattleRoom
 	warpcheck
@@ -174,10 +181,10 @@ UnreferencedScript_0x9e4be:
 	if_equal $a, Script_Menu_ChallengeExplanationCancel
 	if_not_equal $0, UnknownScript_0x9e550
 	writetext Text_ReceivedAListOfLeadersOnTheHonorRoll
-	spriteface $2, LEFT
+	spriteface BATTLETOWER1F_RECEPTIONIST, LEFT
 	writetext Text_PleaseConfirmOnThisMonitor
 	waitbutton
-	spriteface $2, DOWN
+	spriteface BATTLETOWER1F_RECEPTIONIST, DOWN
 	closetext
 	end
 
@@ -248,7 +255,7 @@ YoungsterScript_0x9e55d:
 	writetext Text_BattleTowerYoungster
 	waitbutton
 	closetext
-	spriteface $3, RIGHT
+	spriteface BATTLETOWER1F_YOUNGSTER, RIGHT
 	end
 
 CooltrainerFScript_0x9e568:

maps/BattleTowerBattleRoom.asm

@@ -1,3 +1,7 @@
+const_value set 2
+	const BATTLETOWERBATTLEROOM_YOUNGSTER
+	const BATTLETOWERBATTLEROOM_RECEPTIONIST
+
 BattleTowerBattleRoom_MapScriptHeader:
 .MapTriggers:
 	db 2
@@ -10,7 +14,7 @@ BattleTowerBattleRoom_MapScriptHeader:
 	db 0
 
 .EnterBattleRoom: ; 0x9f419
-	disappear $2
+	disappear BATTLETOWERBATTLEROOM_YOUNGSTER
 	priorityjump Script_BattleRoom
 	dotrigger $1
 .DummyTrigger:
@@ -22,10 +26,10 @@ Script_BattleRoom: ; 0x9f421
 Script_BattleRoomLoop: ; 0x9f425
 	writebyte $2
 	special Function_LoadOpponentTrainerAndPokemonsWithOTSprite
-	appear $2
+	appear BATTLETOWERBATTLEROOM_YOUNGSTER
 	warpsound
 	waitsfx
-	applymovement $2, MovementData_BattleTowerBattleRoomOpponentWalksIn
+	applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksIn
 	loadfont
 	battletowertext 1
 	keeptextopen
@@ -36,10 +40,10 @@ Script_BattleRoomLoop: ; 0x9f425
 	if_not_equal $0, Script_FailedBattleTowerChallenge
 	copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64
 	if_equal BATTLETOWER_NROFTRAINERS, Script_BeatenAllTrainers
-	applymovement $2, MovementData_BattleTowerBattleRoomOpponentWalksOut
+	applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksOut
 	warpsound
-	disappear $2
+	disappear BATTLETOWERBATTLEROOM_YOUNGSTER
-	applymovement $3, MovementData_BattleTowerBattleRoomReceptionistWalksToPlayer
+	applymovement BATTLETOWERBATTLEROOM_RECEPTIONIST, MovementData_BattleTowerBattleRoomReceptionistWalksToPlayer
 	applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceReceptionist
 	loadfont
 	writetext Text_YourPkmnWillBeHealedToFullHealth
@@ -58,7 +62,7 @@ Script_BattleRoomLoop: ; 0x9f425
 Script_ContinueAndBattleNextOpponent: ; 0x9f477
 	closetext
 	applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceNextOpponent
-	applymovement $3, MovementData_BattleTowerBattleRoomReceptionistWalksAway
+	applymovement BATTLETOWERBATTLEROOM_RECEPTIONIST, MovementData_BattleTowerBattleRoomReceptionistWalksAway
 	jump Script_BattleRoomLoop
 
 Script_DontBattleNextOpponent: ; 0x9f483

maps/BattleTowerElevator.asm

@@ -1,3 +1,6 @@
+const_value set 2
+	const BATTLETOWERELEVATOR_RECEPTIONIST
+
 BattleTowerElevator_MapScriptHeader:
 .MapTriggers:
 	db 2
@@ -17,19 +20,19 @@ BattleTowerElevator_MapScriptHeader:
 	end
 
 .RideElevator:
-	follow $2, PLAYER
+	follow BATTLETOWERELEVATOR_RECEPTIONIST, PLAYER
-	applymovement $2, MovementData_BattleTowerElevatorReceptionistWalksIn
+	applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn
 	applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn
 	writebyte BATTLETOWERACTION_0A
 	special BattleTowerAction
 	playsound SFX_ELEVATOR
 	earthquake 60
 	waitsfx
-	follow $2, PLAYER
+	follow BATTLETOWERELEVATOR_RECEPTIONIST, PLAYER
-	applymovement $2, MovementData_BattleTowerElevatorExitElevator
+	applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorExitElevator
 	stopfollow
 	warpsound
-	disappear $2
+	disappear BATTLETOWERELEVATOR_RECEPTIONIST
 	applymovement PLAYER, MovementData_BattleTowerElevatorExitElevator
 	warpcheck
 	end

maps/BattleTowerHallway.asm

@@ -1,3 +1,6 @@
+const_value set 2
+	const BATTLETOWERHALLWAY_RECEPTIONIST
+
 BattleTowerHallway_MapScriptHeader:
 .MapTriggers:
 	db 2
@@ -16,7 +19,7 @@ BattleTowerHallway_MapScriptHeader:
 	end
 
 .ChooseBattleRoom:
-	follow $2, PLAYER
+	follow BATTLETOWERHALLWAY_RECEPTIONIST, PLAYER
 	callasm .asm_load_battle_room
 	jump .WalkToChosenBattleRoom
 
@@ -47,27 +50,27 @@ BattleTowerHallway_MapScriptHeader:
 	if_equal 8, .L70L80
 	if_equal 9, .L90L100
 	if_equal 10, .L90L100
-	applymovement $2, MovementData_BattleTowerHallwayWalkTo1020Room
+	applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo1020Room
 	jump .EnterBattleRoom
 
 .L30L40: ; 0x9f603
-	applymovement $2, MovementData_BattleTowerHallwayWalkTo3040Room
+	applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo3040Room
 	jump .EnterBattleRoom
 
 .L50L60: ; 0x9f60a
-	applymovement $2, MovementData_BattleTowerHallwayWalkTo5060Room
+	applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo5060Room
 	jump .EnterBattleRoom
 
 .L70L80: ; 0x9f611
-	applymovement $2, MovementData_BattleTowerHallwayWalkTo7080Room
+	applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo7080Room
 	jump .EnterBattleRoom
 
 .L90L100: ; 0x9f618
-	applymovement $2, MovementData_BattleTowerHallwayWalkTo90100Room
+	applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo90100Room
 	jump .EnterBattleRoom
 
 .EnterBattleRoom: ; 0x9f61f
-	faceperson PLAYER, $2
+	faceperson PLAYER, BATTLETOWERHALLWAY_RECEPTIONIST
 	loadfont
 	writetext Text_PleaseStepThisWay
 	waitbutton

maps/BattleTowerOutside.asm

@@ -1,3 +1,9 @@
+const_value set 2
+	const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER
+	const BATTLETOWEROUTSIDE_BUENA
+	const BATTLETOWEROUTSIDE_SAILOR
+	const BATTLETOWEROUTSIDE_LASS
+
 BattleTowerOutside_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/BillsHouse.asm

@@ -1,3 +1,6 @@
+const_value set 2
+	const BILLSHOUSE_GRAMPS
+
 BillsHouse_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/BlackthornCity.asm

@@ -1,3 +1,14 @@
+const_value set 2
+	const BLACKTHORNCITY_SUPER_NERD1
+	const BLACKTHORNCITY_SUPER_NERD2
+	const BLACKTHORNCITY_GRAMPS1
+	const BLACKTHORNCITY_GRAMPS2
+	const BLACKTHORNCITY_BLACK_BELT
+	const BLACKTHORNCITY_COOLTRAINER_F1
+	const BLACKTHORNCITY_YOUNGSTER1
+	const BLACKTHORNCITY_YOUNGSTER2
+	const BLACKTHORNCITY_COOLTRAINER_F2
+
 BlackthornCity_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -16,11 +27,11 @@ BlackthornCity_MapScriptHeader:
 .Santos
 	checkcode VAR_WEEKDAY
 	if_equal SATURDAY, .SantosAppears
-	disappear $9
+	disappear BLACKTHORNCITY_YOUNGSTER2
 	return
 
 .SantosAppears
-	appear $9
+	appear BLACKTHORNCITY_YOUNGSTER2
 	return
 
 SuperNerdScript_0x1a46e8:

maps/BlackthornDodrioTradeHouse.asm

@@ -1,3 +1,6 @@
+const_value set 2
+	const BLACKTHORNDODRIOTRADEHOUSE_LASS
+
 BlackthornDodrioTradeHouse_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/BlackthornDragonSpeechHouse.asm

@@ -1,3 +1,7 @@
+const_value set 2
+	const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY
+	const BLACKTHORNDRAGONSPEECHHOUSE_EKANS
+
 BlackthornDragonSpeechHouse_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/BlackthornGym1F.asm

@@ -1,3 +1,10 @@
+const_value set 2
+	const BLACKTHORNGYM1F_CLAIR
+	const BLACKTHORNGYM1F_COOLTRAINER_M1
+	const BLACKTHORNGYM1F_COOLTRAINER_M2
+	const BLACKTHORNGYM1F_COOLTRAINER_F
+	const BLACKTHORNGYM1F_GYM_GUY
+
 BlackthornGym1F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/BlackthornGym2F.asm

@@ -1,3 +1,13 @@
+const_value set 2
+	const BLACKTHORNGYM2F_COOLTRAINER_M
+	const BLACKTHORNGYM2F_COOLTRAINER_F
+	const BLACKTHORNGYM2F_BOULDER1
+	const BLACKTHORNGYM2F_BOULDER2
+	const BLACKTHORNGYM2F_BOULDER3
+	const BLACKTHORNGYM2F_BOULDER4
+	const BLACKTHORNGYM2F_BOULDER5
+	const BLACKTHORNGYM2F_BOULDER6
+
 BlackthornGym2F_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -29,15 +39,15 @@ BlackthornGym2F_MapScriptHeader:
 	db $ff ; end
 
 .Disappear4
-	disappear 4
+	disappear BLACKTHORNGYM2F_BOULDER1
 	jump .Fall
 
 .Disappear5
-	disappear 5
+	disappear BLACKTHORNGYM2F_BOULDER2
 	jump .Fall
 
 .Disappear6
-	disappear 6
+	disappear BLACKTHORNGYM2F_BOULDER3
 	jump .Fall
 
 .Fall

maps/BlackthornMart.asm

@@ -1,3 +1,8 @@
+const_value set 2
+	const BLACKTHORNMART_CLERK
+	const BLACKTHORNMART_COOLTRAINER_M
+	const BLACKTHORNMART_BLACK_BELT
+
 BlackthornMart_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/BlackthornPokeCenter1F.asm

@@ -1,3 +1,9 @@
+const_value set 2
+	const BLACKTHORNPOKECENTER1F_NURSE
+	const BLACKTHORNPOKECENTER1F_GENTLEMAN
+	const BLACKTHORNPOKECENTER1F_TWIN
+	const BLACKTHORNPOKECENTER1F_COOLTRAINER_M
+
 BlackthornPokeCenter1F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/BluesHouse.asm

@@ -1,3 +1,6 @@
+const_value set 2
+	const BLUESHOUSE_DAISY
+
 BluesHouse_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/BrunosRoom.asm

@@ -1,3 +1,6 @@
+const_value set 2
+	const BRUNOSROOM_BRUNO
+
 BrunosRoom_MapScriptHeader:
 .MapTriggers:
 	db 2

maps/BurnedTower1F.asm

@@ -1,3 +1,10 @@
+const_value set 2
+	const BURNEDTOWER1F_ROCK
+	const BURNEDTOWER1F_SUPER_NERD
+	const BURNEDTOWER1F_SILVER
+	const BURNEDTOWER1F_MORTY
+	const BURNEDTOWER1F_POKE_BALL
+
 BurnedTower1F_MapScriptHeader:
 .MapTriggers:
 	db 3
@@ -36,25 +43,25 @@ UnknownScript_0x185bf8:
 	return
 
 UnknownScript_0x185c0d:
-	spriteface $3, DOWN
+	spriteface BURNEDTOWER1F_SUPER_NERD, DOWN
-	showemote EMOTE_SHOCK, $3, 15
+	showemote EMOTE_SHOCK, BURNEDTOWER1F_SUPER_NERD, 15
-	applymovement $3, MovementData_0x185cd3
+	applymovement BURNEDTOWER1F_SUPER_NERD, MovementData_0x185cd3
 	loadfont
 	writetext UnknownText_0x185ecc
 	waitbutton
 	closetext
-	moveperson $3, $9, $e
+	moveperson BURNEDTOWER1F_SUPER_NERD, $9, $e
 	dotrigger $1
 	end
 
 UnknownScript_0x185c25:
-	showemote EMOTE_SHOCK, $4, 15
+	showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 15
 	special Special_RotatePalettesRightMusic
 	pause 15
-	spriteface $4, RIGHT
+	spriteface BURNEDTOWER1F_SILVER, RIGHT
 	pause 15
 	applymovement PLAYER, MovementData_0x185ccd
-	applymovement $4, MovementData_0x185ccf
+	applymovement BURNEDTOWER1F_SILVER, MovementData_0x185ccf
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	loadfont
 	writetext UnknownText_0x185cd9
@@ -109,7 +116,7 @@ UnknownScript_0x185c80:
 	pause 15
 	applymovement PLAYER, MovementData_0x185cd1
 	playsound SFX_KINESIS
-	showemote EMOTE_SHOCK, $4, 20
+	showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 20
 	loadfont
 	writetext UnknownText_0x185e75
 	waitbutton