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

maps/BurnedTowerB1F.asm

@@ -1,3 +1,14 @@
+const_value set 2
+	const BURNEDTOWERB1F_BOULDER
+	const BURNEDTOWERB1F_RAIKOU1
+	const BURNEDTOWERB1F_ENTEI1
+	const BURNEDTOWERB1F_SUICUNE1
+	const BURNEDTOWERB1F_RAIKOU2
+	const BURNEDTOWERB1F_ENTEI2
+	const BURNEDTOWERB1F_SUICUNE2
+	const BURNEDTOWERB1F_POKE_BALL
+	const BURNEDTOWERB1F_SUPER_NERD
+
 BurnedTowerB1F_MapScriptHeader:
 .MapTriggers:
 	db 2
@@ -29,50 +40,50 @@ UnknownScript_0x18616a:
 UnknownScript_0x18616b:
 	playmusic MUSIC_NONE
 	pause 30
-	appear $3
+	appear BURNEDTOWERB1F_RAIKOU1
 	spriteface PLAYER, UP
 	pause 5
-	disappear $6
+	disappear BURNEDTOWERB1F_RAIKOU2
 	pause 15
 	cry RAIKOU
-	appear $4
+	appear BURNEDTOWERB1F_ENTEI1
 	spriteface PLAYER, UP
 	pause 5
-	disappear $7
+	disappear BURNEDTOWERB1F_ENTEI2
 	pause 15
 	cry ENTEI
-	appear $5
+	appear BURNEDTOWERB1F_SUICUNE1
 	spriteface PLAYER, UP
 	pause 5
-	disappear $8
+	disappear BURNEDTOWERB1F_SUICUNE2
 	pause 15
 	cry SUICUNE
 	pause 15
 	playsound SFX_WARP_FROM
 	spriteface PLAYER, LEFT
-	applymovement $3, MovementData_0x186236
+	applymovement BURNEDTOWERB1F_RAIKOU1, MovementData_0x186236
-	disappear $3
+	disappear BURNEDTOWERB1F_RAIKOU1
 	waitsfx
 	playsound SFX_WARP_FROM
 	spriteface PLAYER, RIGHT
-	applymovement $4, MovementData_0x18623b
+	applymovement BURNEDTOWERB1F_ENTEI1, MovementData_0x18623b
-	disappear $4
+	disappear BURNEDTOWERB1F_ENTEI1
 	waitsfx
 	pause 15
 	playsound SFX_WARP_FROM
 	spriteface PLAYER, UP
-	applymovement $5, MovementData_0x186241
+	applymovement BURNEDTOWERB1F_SUICUNE1, MovementData_0x186241
 	playsound SFX_WARP_FROM
 	spriteface PLAYER, DOWN
-	applymovement $5, MovementData_0x186248
+	applymovement BURNEDTOWERB1F_SUICUNE1, MovementData_0x186248
 	spriteface PLAYER, UP
 	pause 20
 	cry SUICUNE
 	pause 30
 	playsound SFX_WARP_FROM
-	applymovement $5, MovementData_0x186253
+	applymovement BURNEDTOWERB1F_SUICUNE1, MovementData_0x186253
 	spriteface PLAYER, DOWN
-	disappear $5
+	disappear BURNEDTOWERB1F_SUICUNE1
 	waitsfx
 	special RestartMapMusic
 	dotrigger $1
@@ -85,7 +96,7 @@ UnknownScript_0x18616b:
 	clearevent EVENT_ECRUTEAK_CITY_GRAMPS
 	setevent EVENT_BURNED_TOWER_MORTY
 	setevent EVENT_BURNED_TOWER_1F_EUSINE
-	appear $a
+	appear BURNEDTOWERB1F_SUPER_NERD
 	refreshscreen $0
 	changeblock $6, $e, $1b
 	reloadmappart
@@ -101,13 +112,13 @@ SuperNerdScript_0x186212:
 	closetext
 	checkcode VAR_FACING
 	if_equal $1, UnknownScript_0x186226
-	applymovement $a, MovementData_0x186263
+	applymovement BURNEDTOWERB1F_SUPER_NERD, MovementData_0x186263
 	jump UnknownScript_0x18622a
 
 UnknownScript_0x186226:
-	applymovement $a, MovementData_0x18625c
+	applymovement BURNEDTOWERB1F_SUPER_NERD, MovementData_0x18625c
 UnknownScript_0x18622a:
-	disappear $a
+	disappear BURNEDTOWERB1F_SUPER_NERD
 	playsound SFX_EXIT_BUILDING
 	waitsfx
 	end

maps/CeladonCafe.asm

@@ -1,3 +1,10 @@
+const_value set 2
+	const CELADONCAFE_SUPER_NERD
+	const CELADONCAFE_FISHER1
+	const CELADONCAFE_FISHER2
+	const CELADONCAFE_FISHER3
+	const CELADONCAFE_TEACHER
+
 CeladonCafe_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -23,7 +30,7 @@ FisherScript_0x73051:
 	writetext UnknownText_0x7313a
 	waitbutton
 	closetext
-	spriteface $3, LEFT
+	spriteface CELADONCAFE_FISHER1, LEFT
 	end
 
 FisherScript_0x73062:
@@ -36,7 +43,7 @@ FisherScript_0x73062:
 	writetext UnknownText_0x73178
 	waitbutton
 	closetext
-	spriteface $4, RIGHT
+	spriteface CELADONCAFE_FISHER2, RIGHT
 	end
 
 FisherScript_0x73073:
@@ -49,7 +56,7 @@ FisherScript_0x73073:
 	writetext UnknownText_0x731bd
 	waitbutton
 	closetext
-	spriteface $5, RIGHT
+	spriteface CELADONCAFE_FISHER3, RIGHT
 	end
 
 TeacherScript_0x73084:
@@ -64,7 +71,7 @@ TeacherScript_0x73084:
 	writetext UnknownText_0x73212
 	waitbutton
 	closetext
-	spriteface $6, LEFT
+	spriteface CELADONCAFE_TEACHER, LEFT
 	end
 
 UnknownScript_0x7309a:
@@ -72,12 +79,12 @@ UnknownScript_0x7309a:
 	writetext UnknownText_0x73254
 	waitbutton
 	closetext
-	spriteface $6, RIGHT
+	spriteface CELADONCAFE_TEACHER, RIGHT
 	loadfont
 	writetext UnknownText_0x73278
 	waitbutton
 	closetext
-	spriteface $6, LEFT
+	spriteface CELADONCAFE_TEACHER, LEFT
 	end
 
 EatathonContestPoster:

maps/CeladonCity.asm

@@ -1,3 +1,14 @@
+const_value set 2
+	const CELADONCITY_FISHER
+	const CELADONCITY_POLIWAG
+	const CELADONCITY_TEACHER1
+	const CELADONCITY_GRAMPS1
+	const CELADONCITY_GRAMPS2
+	const CELADONCITY_YOUNGSTER1
+	const CELADONCITY_YOUNGSTER2
+	const CELADONCITY_TEACHER2
+	const CELADONCITY_LASS
+
 CeladonCity_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeladonDeptStore1F.asm

@@ -1,3 +1,8 @@
+const_value set 2
+	const CELADONDEPTSTORE1F_RECEPTIONIST
+	const CELADONDEPTSTORE1F_GENTLEMAN
+	const CELADONDEPTSTORE1F_TEACHER
+
 CeladonDeptStore1F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeladonDeptStore2F.asm

@@ -1,3 +1,9 @@
+const_value set 2
+	const CELADONDEPTSTORE2F_CLERK1
+	const CELADONDEPTSTORE2F_CLERK2
+	const CELADONDEPTSTORE2F_POKEFAN_M
+	const CELADONDEPTSTORE2F_YOUNGSTER
+
 CeladonDeptStore2F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeladonDeptStore3F.asm

@@ -1,3 +1,10 @@
+const_value set 2
+	const CELADONDEPTSTORE3F_CLERK
+	const CELADONDEPTSTORE3F_YOUNGSTER
+	const CELADONDEPTSTORE3F_GAMEBOY_KID1
+	const CELADONDEPTSTORE3F_GAMEBOY_KID2
+	const CELADONDEPTSTORE3F_SUPER_NERD
+
 CeladonDeptStore3F_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -21,7 +28,7 @@ GameboyKidScript_0x70d34:
 	writetext UnknownText_0x70d86
 	waitbutton
 	closetext
-	spriteface $4, DOWN
+	spriteface CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN
 	end
 
 GameboyKidScript_0x70d3f:
@@ -30,7 +37,7 @@ GameboyKidScript_0x70d3f:
 	writetext UnknownText_0x70dc7
 	waitbutton
 	closetext
-	spriteface $5, DOWN
+	spriteface CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN
 	end
 
 SuperNerdScript_0x70d4a:

maps/CeladonDeptStore4F.asm

@@ -1,3 +1,8 @@
+const_value set 2
+	const CELADONDEPTSTORE4F_CLERK
+	const CELADONDEPTSTORE4F_SUPER_NERD
+	const CELADONDEPTSTORE4F_YOUNGSTER
+
 CeladonDeptStore4F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeladonDeptStore5F.asm

@@ -1,3 +1,10 @@
+const_value set 2
+	const CELADONDEPTSTORE5F_CLERK1
+	const CELADONDEPTSTORE5F_CLERK2
+	const CELADONDEPTSTORE5F_GENTLEMAN
+	const CELADONDEPTSTORE5F_SAILOR
+	const CELADONDEPTSTORE5F_TEACHER
+
 CeladonDeptStore5F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeladonDeptStore6F.asm

@@ -1,3 +1,7 @@
+const_value set 2
+	const CELADONDEPTSTORE6F_SUPER_NERD
+	const CELADONDEPTSTORE6F_YOUNGSTER
+
 CeladonDeptStore6F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeladonDeptStoreElevator.asm

@@ -1,3 +1,5 @@
+const_value set 2
+
 CeladonDeptStoreElevator_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeladonGameCorner.asm

@@ -1,3 +1,14 @@
+const_value set 2
+	const CELADONGAMECORNER_CLERK
+	const CELADONGAMECORNER_RECEPTIONIST
+	const CELADONGAMECORNER_POKEFAN_M
+	const CELADONGAMECORNER_TEACHER
+	const CELADONGAMECORNER_FISHING_GURU
+	const CELADONGAMECORNER_FISHER1
+	const CELADONGAMECORNER_FISHER2
+	const CELADONGAMECORNER_GYM_GUY
+	const CELADONGAMECORNER_GRAMPS
+
 CeladonGameCorner_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -17,7 +28,7 @@ PokefanMScript_0x72123:
 	writetext UnknownText_0x72215
 	waitbutton
 	closetext
-	spriteface $4, LEFT
+	spriteface CELADONGAMECORNER_POKEFAN_M, LEFT
 	end
 
 TeacherScript_0x7212e:
@@ -26,7 +37,7 @@ TeacherScript_0x7212e:
 	writetext UnknownText_0x72242
 	waitbutton
 	closetext
-	spriteface $5, RIGHT
+	spriteface CELADONGAMECORNER_TEACHER, RIGHT
 	end
 
 FishingGuruScript_0x72139:
@@ -35,7 +46,7 @@ FishingGuruScript_0x72139:
 	writetext UnknownText_0x72295
 	waitbutton
 	closetext
-	spriteface $6, RIGHT
+	spriteface CELADONGAMECORNER_FISHING_GURU, RIGHT
 	end
 
 FisherScript_0x72144:
@@ -90,7 +101,7 @@ GrampsScript_0x72190:
 	writetext UnknownText_0x724ad
 	waitbutton
 	closetext
-	spriteface $a, LEFT
+	spriteface CELADONGAMECORNER_GRAMPS, LEFT
 	end
 
 MapCeladonGameCornerSignpost36Script:

maps/CeladonGameCornerPrizeRoom.asm

@@ -1,3 +1,7 @@
+const_value set 2
+	const CELADONGAMECORNERPRIZEROOM_GENTLEMAN
+	const CELADONGAMECORNERPRIZEROOM_PHARMACIST
+
 CeladonGameCornerPrizeRoom_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeladonGym.asm

@@ -1,3 +1,11 @@
+const_value set 2
+	const CELADONGYM_ERIKA
+	const CELADONGYM_LASS1
+	const CELADONGYM_LASS2
+	const CELADONGYM_BUENA
+	const CELADONGYM_TWIN1
+	const CELADONGYM_TWIN2
+
 CeladonGym_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeladonMansion1F.asm

@@ -1,3 +1,9 @@
+const_value set 2
+	const CELADONMANSION1F_GRANNY
+	const CELADONMANSION1F_GROWLITHE1
+	const CELADONMANSION1F_CLEFAIRY
+	const CELADONMANSION1F_GROWLITHE2
+
 CeladonMansion1F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeladonMansion2F.asm

@@ -1,3 +1,5 @@
+const_value set 2
+
 CeladonMansion2F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeladonMansion3F.asm

@@ -1,3 +1,9 @@
+const_value set 2
+	const CELADONMANSION3F_COOLTRAINER_M
+	const CELADONMANSION3F_GYM_GUY
+	const CELADONMANSION3F_SUPER_NERD
+	const CELADONMANSION3F_FISHER
+
 CeladonMansion3F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeladonMansionRoof.asm

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

maps/CeladonMansionRoofHouse.asm

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

maps/CeladonPokeCenter1F.asm

@@ -1,3 +1,10 @@
+const_value set 2
+	const CELADONPOKECENTER1F_NURSE
+	const CELADONPOKECENTER1F_GENTLEMAN
+	const CELADONPOKECENTER1F_PHARMACIST
+	const CELADONPOKECENTER1F_COOLTRAINER_F
+	const CELADONPOKECENTER1F_SUPER_NERD
+
 CeladonPokeCenter1F_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -39,13 +46,13 @@ UnknownScript_0x71e48:
 	closetext
 	checkcode VAR_FACING
 	if_equal $1, UnknownScript_0x71e5a
-	applymovement $6, MovementData_0x71e6b
+	applymovement CELADONPOKECENTER1F_SUPER_NERD, MovementData_0x71e6b
 	jump UnknownScript_0x71e5e
 
 UnknownScript_0x71e5a:
-	applymovement $6, MovementData_0x71e65
+	applymovement CELADONPOKECENTER1F_SUPER_NERD, MovementData_0x71e65
 UnknownScript_0x71e5e:
-	disappear $6
+	disappear CELADONPOKECENTER1F_SUPER_NERD
 	playsound SFX_EXIT_BUILDING
 	waitsfx
 	end

maps/CeladonPokeCenter2FBeta.asm

@@ -1,3 +1,5 @@
+const_value set 2
+
 CeladonPokeCenter2FBeta_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeruleanCity.asm

@@ -1,3 +1,11 @@
+const_value set 2
+	const CERULEANCITY_COOLTRAINER_M
+	const CERULEANCITY_SUPER_NERD
+	const CERULEANCITY_SLOWPOKE
+	const CERULEANCITY_COOLTRAINER_F
+	const CERULEANCITY_FISHER
+	const CERULEANCITY_YOUNGSTER
+
 CeruleanCity_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -45,7 +53,7 @@ CooltrainerFScript_0x18402a:
 	writetext UnknownText_0x1841fa
 	waitbutton
 	closetext
-	spriteface $5, LEFT
+	spriteface CERULEANCITY_COOLTRAINER_F, LEFT
 	loadfont
 	writetext UnknownText_0x184229
 	waitbutton
@@ -108,8 +116,8 @@ UnknownScript_0x184072:
 	waitsfx
 	playsound SFX_TRANSACTION
 	waitsfx
-	showemote EMOTE_SHOCK, $7, 15
+	showemote EMOTE_SHOCK, CERULEANCITY_YOUNGSTER, 15
-	spriteface $7, LEFT
+	spriteface CERULEANCITY_YOUNGSTER, LEFT
 	loadfont
 	writetext UnknownText_0x1842ee
 	waitbutton

maps/CeruleanGym.asm

@@ -1,3 +1,11 @@
+const_value set 2
+	const CERULEANGYM_ROCKET
+	const CERULEANGYM_MISTY
+	const CERULEANGYM_SWIMMER_GIRL1
+	const CERULEANGYM_SWIMMER_GIRL2
+	const CERULEANGYM_SWIMMER_GUY
+	const CERULEANGYM_GYM_GUY
+
 CeruleanGym_MapScriptHeader:
 .MapTriggers:
 	db 2
@@ -17,28 +25,28 @@ UnknownScript_0x1883da:
 	end
 
 UnknownScript_0x1883de:
-	applymovement $2, MovementData_0x1884e3
+	applymovement CERULEANGYM_ROCKET, MovementData_0x1884e3
 	playsound SFX_TACKLE
-	applymovement $2, MovementData_0x1884eb
+	applymovement CERULEANGYM_ROCKET, MovementData_0x1884eb
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	loadfont
 	writetext UnknownText_0x1884fb
 	waitbutton
 	closetext
-	showemote EMOTE_SHOCK, $2, 15
+	showemote EMOTE_SHOCK, CERULEANGYM_ROCKET, 15
-	applymovement $2, MovementData_0x1884f7
+	applymovement CERULEANGYM_ROCKET, MovementData_0x1884f7
 	loadfont
 	writetext UnknownText_0x188574
 	waitbutton
 	closetext
-	applymovement $2, MovementData_0x1884f5
+	applymovement CERULEANGYM_ROCKET, MovementData_0x1884f5
 	loadfont
 	writetext UnknownText_0x1885a5
 	waitbutton
 	closetext
-	applymovement $2, MovementData_0x1884e8
+	applymovement CERULEANGYM_ROCKET, MovementData_0x1884e8
 	playsound SFX_EXIT_BUILDING
-	disappear $2
+	disappear CERULEANGYM_ROCKET
 	setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
 	clearevent EVENT_ROUTE_24_ROCKET
 	clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND

maps/CeruleanGymBadgeSpeechHouse.asm

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

maps/CeruleanMart.asm

@@ -1,3 +1,8 @@
+const_value set 2
+	const CERULEANMART_CLERK
+	const CERULEANMART_COOLTRAINER_M
+	const CERULEANMART_COOLTRAINER_F
+
 CeruleanMart_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeruleanPokeCenter1F.asm

@@ -1,3 +1,8 @@
+const_value set 2
+	const CERULEANPOKECENTER1F_NURSE
+	const CERULEANPOKECENTER1F_SUPER_NERD
+	const CERULEANPOKECENTER1F_GYM_GUY
+
 CeruleanPokeCenter1F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeruleanPokeCenter2FBeta.asm

@@ -1,3 +1,5 @@
+const_value set 2
+
 CeruleanPokeCenter2FBeta_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeruleanPoliceStation.asm

@@ -1,3 +1,8 @@
+const_value set 2
+	const CERULEANPOLICESTATION_FISHING_GURU
+	const CERULEANPOLICESTATION_POKEFAN_F
+	const CERULEANPOLICESTATION_DIGLETT
+
 CeruleanPoliceStation_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeruleanTradeSpeechHouse.asm

@@ -1,3 +1,9 @@
+const_value set 2
+	const CERULEANTRADESPEECHHOUSE_GRANNY
+	const CERULEANTRADESPEECHHOUSE_GRAMPS
+	const CERULEANTRADESPEECHHOUSE_RHYDON
+	const CERULEANTRADESPEECHHOUSE_ZUBAT
+
 CeruleanTradeSpeechHouse_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CharcoalKiln.asm

@@ -1,3 +1,8 @@
+const_value set 2
+	const CHARCOALKILN_BLACK_BELT
+	const CHARCOALKILN_YOUNGSTER
+	const CHARCOALKILN_MOLTRES
+
 CharcoalKiln_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CherrygroveCity.asm

@@ -1,3 +1,10 @@
+const_value set 2
+	const CHERRYGROVECITY_GRAMPS
+	const CHERRYGROVECITY_SILVER
+	const CHERRYGROVECITY_TEACHER
+	const CHERRYGROVECITY_YOUNGSTER
+	const CHERRYGROVECITY_FISHER
+
 CherrygroveCity_MapScriptHeader:
 .MapTriggers:
 	db 2
@@ -34,34 +41,34 @@ CherrygroveCityGuideGent:
 	waitbutton
 	closetext
 	playmusic MUSIC_SHOW_ME_AROUND
-	follow $2, PLAYER
+	follow CHERRYGROVECITY_GRAMPS, PLAYER
-	applymovement $2, MovementData_0x19c195
+	applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c195
 	loadfont
 	writetext GuideGentPokeCenterText
 	waitbutton
 	closetext
-	applymovement $2, MovementData_0x19c19b
+	applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c19b
 	spriteface PLAYER, UP
 	loadfont
 	writetext GuideGentMartText
 	waitbutton
 	closetext
-	applymovement $2, MovementData_0x19c1a3
+	applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c1a3
 	spriteface PLAYER, UP
 	loadfont
 	writetext GuideGentRoute30Text
 	waitbutton
 	closetext
-	applymovement $2, MovementData_0x19c1ac
+	applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c1ac
 	spriteface PLAYER, LEFT
 	loadfont
 	writetext GuideGentSeaText
 	waitbutton
 	closetext
-	applymovement $2, MovementData_0x19c1b6
+	applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c1b6
 	spriteface PLAYER, UP
 	pause 60
-	spriteface $2, LEFT
+	spriteface CHERRYGROVECITY_GRAMPS, LEFT
 	spriteface PLAYER, RIGHT
 	loadfont
 	writetext GuideGentGiftText
@@ -77,9 +84,9 @@ CherrygroveCityGuideGent:
 	stopfollow
 	special RestartMapMusic
 	spriteface PLAYER, UP
-	applymovement $2, MovementData_0x19c1cb
+	applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c1cb
 	playsound SFX_ENTER_DOOR
-	disappear $2
+	disappear CHERRYGROVECITY_GRAMPS
 	clearevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
 	waitsfx
 	end
@@ -98,15 +105,15 @@ CherrygroveCityGuideGent:
 	end
 
 UnknownScript_0x19c0aa:
-	moveperson $3, $27, $7
+	moveperson CHERRYGROVECITY_SILVER, $27, $7
 
 UnknownScript_0x19c0ae:
 	spriteface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special Special_RotatePalettesRightMusic
 	pause 15
-	appear $3
+	appear CHERRYGROVECITY_SILVER
-	applymovement $3, MovementData_0x19c1ce
+	applymovement CHERRYGROVECITY_SILVER, MovementData_0x19c1ce
 	spriteface PLAYER, RIGHT
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	loadfont
@@ -167,8 +174,8 @@ UnknownScript_0x19c12f:
 	playsound SFX_TACKLE
 	applymovement PLAYER, MovementData_0x19c1d4
 	spriteface PLAYER, LEFT
-	applymovement $3, MovementData_0x19c1da
+	applymovement CHERRYGROVECITY_SILVER, MovementData_0x19c1da
-	disappear $3
+	disappear CHERRYGROVECITY_SILVER
 	dotrigger $0
 	special HealParty
 	playmapmusic

maps/CherrygroveEvolutionSpeechHouse.asm

@@ -1,3 +1,7 @@
+const_value set 2
+	const CHERRYGROVEEVOLUTIONSPEECHHOUSE_LASS
+	const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER
+
 CherrygroveEvolutionSpeechHouse_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CherrygroveGymSpeechHouse.asm

@@ -1,3 +1,7 @@
+const_value set 2
+	const CHERRYGROVEGYMSPEECHHOUSE_POKEFAN_M
+	const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER
+
 CherrygroveGymSpeechHouse_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CherrygroveMart.asm

@@ -1,3 +1,8 @@
+const_value set 2
+	const CHERRYGROVEMART_CLERK
+	const CHERRYGROVEMART_COOLTRAINER_M
+	const CHERRYGROVEMART_YOUNGSTER
+
 CherrygroveMart_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CherrygrovePokeCenter1F.asm

@@ -1,3 +1,9 @@
+const_value set 2
+	const CHERRYGROVEPOKECENTER1F_NURSE
+	const CHERRYGROVEPOKECENTER1F_FISHER
+	const CHERRYGROVEPOKECENTER1F_GENTLEMAN
+	const CHERRYGROVEPOKECENTER1F_TEACHER
+
 CherrygrovePokeCenter1F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CianwoodCity.asm

@@ -1,3 +1,17 @@
+const_value set 2
+	const CIANWOODCITY_STANDING_YOUNGSTER
+	const CIANWOODCITY_POKEFAN_M
+	const CIANWOODCITY_LASS
+	const CIANWOODCITY_ROCK1
+	const CIANWOODCITY_ROCK2
+	const CIANWOODCITY_ROCK3
+	const CIANWOODCITY_ROCK4
+	const CIANWOODCITY_ROCK5
+	const CIANWOODCITY_ROCK6
+	const CIANWOODCITY_POKEFAN_F
+	const CIANWOODCITY_SUPER_NERD
+	const CIANWOODCITY_SUICUNE
+
 CianwoodCity_MapScriptHeader:
 .MapTriggers:
 	db 2
@@ -23,7 +37,7 @@ CianwoodCity_MapScriptHeader:
 	setevent EVENT_EUSINE_IN_BURNED_TOWER
 	checkevent EVENT_FOUGHT_EUSINE
 	iffalse UnknownScript_0x1a001d
-	disappear $c
+	disappear CIANWOODCITY_SUPER_NERD
 UnknownScript_0x1a001d:
 	return
 
@@ -32,12 +46,12 @@ UnknownScript_0x1a001e:
 	showemote EMOTE_SHOCK, PLAYER, 15
 	pause 15
 	playsound SFX_WARP_FROM
-	applymovement $d, MovementData_0x1a00da
+	applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00da
 	spriteface PLAYER, DOWN
 	pause 15
 	playsound SFX_WARP_FROM
-	applymovement $d, MovementData_0x1a00e0
+	applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0
-	disappear $d
+	disappear CIANWOODCITY_SUICUNE
 	pause 10
 	dotrigger $0
 	clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42
@@ -46,8 +60,8 @@ UnknownScript_0x1a001e:
 	iftrue .Done
 	setevent EVENT_FOUGHT_EUSINE
 	playmusic MUSIC_MYSTICALMAN_ENCOUNTER
-	appear $c
+	appear CIANWOODCITY_SUPER_NERD
-	applymovement $c, MovementData_0x1a00e7
+	applymovement CIANWOODCITY_SUPER_NERD, MovementData_0x1a00e7
 	loadfont
 	writetext UnknownText_0x1a0433
 	waitbutton
@@ -63,8 +77,8 @@ UnknownScript_0x1a001e:
 	writetext UnknownText_0x1a05c3
 	waitbutton
 	closetext
-	applymovement $c, MovementData_0x1a00ec
+	applymovement CIANWOODCITY_SUPER_NERD, MovementData_0x1a00ec
-	disappear $c
+	disappear CIANWOODCITY_SUPER_NERD
 	pause 20
 	special Special_RotatePalettesRightMusic
 	playmapmusic

maps/CianwoodCityPhotoStudio.asm

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

maps/CianwoodGym.asm

@@ -1,3 +1,14 @@
+const_value set 2
+	const CIANWOODGYM_CHUCK
+	const CIANWOODGYM_BLACK_BELT1
+	const CIANWOODGYM_BLACK_BELT2
+	const CIANWOODGYM_BLACK_BELT3
+	const CIANWOODGYM_BLACK_BELT4
+	const CIANWOODGYM_BOULDER1
+	const CIANWOODGYM_BOULDER2
+	const CIANWOODGYM_BOULDER3
+	const CIANWOODGYM_BOULDER4
+
 CianwoodGym_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -13,15 +24,15 @@ ChuckScript_0x9d60f:
 	writetext UnknownText_0x9d6f9
 	waitbutton
 	closetext
-	spriteface $2, RIGHT
+	spriteface CIANWOODGYM_CHUCK, RIGHT
 	loadfont
 	writetext UnknownText_0x9d76f
 	waitbutton
 	closetext
-	applymovement $7, MovementData_0x9d6f3
+	applymovement CIANWOODGYM_BOULDER1, MovementData_0x9d6f3
 	playsound SFX_STRENGTH
 	earthquake 80
-	disappear $7
+	disappear CIANWOODGYM_BOULDER1
 	pause 30
 	faceplayer
 	loadfont

maps/CianwoodLugiaSpeechHouse.asm

@@ -1,3 +1,8 @@
+const_value set 2
+	const CIANWOODLUGIASPEECHHOUSE_TEACHER
+	const CIANWOODLUGIASPEECHHOUSE_LASS
+	const CIANWOODLUGIASPEECHHOUSE_TWIN
+
 CianwoodLugiaSpeechHouse_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CianwoodPharmacy.asm

@@ -1,3 +1,6 @@
+const_value set 2
+	const CIANWOODPHARMACY_PHARMACIST
+
 CianwoodPharmacy_MapScriptHeader:
 .MapTriggers:
 	db 1

maps/CianwoodPokeCenter1F.asm

@@ -1,3 +1,9 @@
+const_value set 2
+	const CIANWOODPOKECENTER1F_NURSE
+	const CIANWOODPOKECENTER1F_LASS
+	const CIANWOODPOKECENTER1F_GYM_GUY
+	const CIANWOODPOKECENTER1F_SUPER_NERD
+
 CianwoodPokeCenter1F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CinnabarIsland.asm

@@ -1,3 +1,6 @@
+const_value set 2
+	const CINNABARISLAND_BLUE
+
 CinnabarIsland_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -19,8 +22,8 @@ CinnabarIslandBlue:
 	waitbutton
 	closetext
 	playsound SFX_WARP_TO
-	applymovement $2, CinnabarIslandBlueTeleport
+	applymovement CINNABARISLAND_BLUE, CinnabarIslandBlueTeleport
-	disappear $2
+	disappear CINNABARISLAND_BLUE
 	clearevent EVENT_VIRIDIAN_GYM_BLUE
 	end
 

maps/CinnabarPokeCenter1F.asm

@@ -1,3 +1,8 @@
+const_value set 2
+	const CINNABARPOKECENTER1F_NURSE
+	const CINNABARPOKECENTER1F_COOLTRAINER_F
+	const CINNABARPOKECENTER1F_FISHER
+
 CinnabarPokeCenter1F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CinnabarPokeCenter2FBeta.asm

@@ -1,3 +1,5 @@
+const_value set 2
+
 CinnabarPokeCenter2FBeta_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/Colosseum.asm

@@ -1,3 +1,7 @@
+const_value set 2
+	const COLOSSEUM_CHRIS1
+	const COLOSSEUM_CHRIS2
+
 Colosseum_MapScriptHeader:
 .MapTriggers:
 	db 3
@@ -29,13 +33,13 @@ Colosseum_MapScriptHeader:
 ColosseumScript_SetWhichChris:
 	special Special_CableClubCheckWhichChris
 	iffalse .Chris2
-	disappear $3
+	disappear COLOSSEUM_CHRIS2
-	appear $2
+	appear COLOSSEUM_CHRIS1
 	return
 
 .Chris2:
-	disappear $2
+	disappear COLOSSEUM_CHRIS1
-	appear $3
+	appear COLOSSEUM_CHRIS2
 	return
 
 ColosseumScript_InitializeCB:

maps/CopycatsHouse1F.asm

@@ -1,3 +1,8 @@
+const_value set 2
+	const COPYCATSHOUSE1F_POKEFAN_M
+	const COPYCATSHOUSE1F_POKEFAN_F
+	const COPYCATSHOUSE1F_CLEFAIRY
+
 CopycatsHouse1F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CopycatsHouse2F.asm

@@ -1,3 +1,11 @@
+const_value set 2
+	const COPYCATSHOUSE2F_COPYCAT1
+	const COPYCATSHOUSE2F_MOLTRES
+	const COPYCATSHOUSE2F_FAIRY
+	const COPYCATSHOUSE2F_MONSTER
+	const COPYCATSHOUSE2F_BIRD
+	const COPYCATSHOUSE2F_COPYCAT2
+
 CopycatsHouse2F_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -12,12 +20,12 @@ CopycatsHouse2F_MapScriptHeader:
 CopycatsHouse2FCallback:
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .Part1
-	disappear $7
+	disappear COPYCATSHOUSE2F_COPYCAT2
-	appear $2
+	appear COPYCATSHOUSE2F_COPYCAT1
 	jump .Done
 .Part1
-	disappear $2
+	disappear COPYCATSHOUSE2F_COPYCAT1
-	appear $7
+	appear COPYCATSHOUSE2F_COPYCAT2
 .Done
 	return
 
@@ -31,13 +39,13 @@ Copycat:
 	iftrue .Part12
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .Part1
-	applymovement $2, MovementData_0x18afd0
+	applymovement COPYCATSHOUSE2F_COPYCAT1, MovementData_0x18afd0
 	faceplayer
 	variablesprite SPRITE_COPYCAT, SPRITE_CHRIS
 	jump .Part2
 
 .Part1
-	applymovement $7, MovementData_0x18afd0
+	applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0
 	faceplayer
 	variablesprite SPRITE_COPYCAT, SPRITE_KRIS
 .Part2
@@ -57,11 +65,11 @@ Copycat:
 	closetext
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .Part5
-	applymovement $2, MovementData_0x18afd0
+	applymovement COPYCATSHOUSE2F_COPYCAT1, MovementData_0x18afd0
 	jump .Part6
 
 .Part5
-	applymovement $7, MovementData_0x18afd0
+	applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0
 .Part6
 	faceplayer
 	variablesprite SPRITE_COPYCAT, SPRITE_LASS
@@ -86,11 +94,11 @@ Copycat:
 	closetext
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .Part10
-	applymovement $2, MovementData_0x18afd0
+	applymovement COPYCATSHOUSE2F_COPYCAT1, MovementData_0x18afd0
 	jump .Part11
 
 .Part10
-	applymovement $7, MovementData_0x18afd0
+	applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0
 .Part11
 	faceplayer
 	variablesprite SPRITE_COPYCAT, SPRITE_LASS
@@ -127,13 +135,13 @@ Copycat:
 .Part15
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .Part16
-	applymovement $2, MovementData_0x18afd0
+	applymovement COPYCATSHOUSE2F_COPYCAT1, MovementData_0x18afd0
 	faceplayer
 	variablesprite SPRITE_COPYCAT, SPRITE_CHRIS
 	jump .Part17
 
 .Part16
-	applymovement $7, MovementData_0x18afd0
+	applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0
 	faceplayer
 	variablesprite SPRITE_COPYCAT, SPRITE_KRIS
 .Part17
@@ -151,11 +159,11 @@ Copycat:
 	closetext
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .Part20
-	applymovement $2, MovementData_0x18afd0
+	applymovement COPYCATSHOUSE2F_COPYCAT1, MovementData_0x18afd0
 	jump .Part21
 
 .Part20
-	applymovement $7, MovementData_0x18afd0
+	applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0
 .Part21
 	faceplayer
 	variablesprite SPRITE_COPYCAT, SPRITE_LASS

maps/DanceTheatre.asm

@@ -1,3 +1,14 @@
+const_value set 2
+	const DANCETHEATRE_KIMONO_GIRL1
+	const DANCETHEATRE_KIMONO_GIRL2
+	const DANCETHEATRE_KIMONO_GIRL3
+	const DANCETHEATRE_KIMONO_GIRL4
+	const DANCETHEATRE_KIMONO_GIRL5
+	const DANCETHEATRE_GENTLEMAN
+	const DANCETHEATRE_RHYDON
+	const DANCETHEATRE_COOLTRAINER_M
+	const DANCETHEATRE_GRANNY
+
 DanceTheatre_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/DarkCaveBlackthornEntrance.asm

@@ -1,3 +1,8 @@
+const_value set 2
+	const DARKCAVEBLACKTHORNENTRANCE_PHARMACIST
+	const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL1
+	const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2
+
 DarkCaveBlackthornEntrance_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/DarkCaveVioletEntrance.asm

@@ -1,3 +1,13 @@
+const_value set 2
+	const DARKCAVEVIOLETENTRANCE_POKE_BALL1
+	const DARKCAVEVIOLETENTRANCE_ROCK1
+	const DARKCAVEVIOLETENTRANCE_ROCK2
+	const DARKCAVEVIOLETENTRANCE_ROCK3
+	const DARKCAVEVIOLETENTRANCE_ROCK4
+	const DARKCAVEVIOLETENTRANCE_POKE_BALL2
+	const DARKCAVEVIOLETENTRANCE_POKE_BALL3
+	const DARKCAVEVIOLETENTRANCE_POKE_BALL4
+
 DarkCaveVioletEntrance_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/DayCare.asm

@@ -1,3 +1,7 @@
+const_value set 2
+	const DAYCARE_GRAMPS
+	const DAYCARE_GRANNY
+
 DayCare_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/DiglettsCave.asm

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

maps/DragonShrine.asm

@@ -1,3 +1,9 @@
+const_value set 2
+	const DRAGONSHRINE_ELDER1
+	const DRAGONSHRINE_ELDER2
+	const DRAGONSHRINE_ELDER3
+	const DRAGONSHRINE_CLAIR
+
 DragonShrine_MapScriptHeader:
 .MapTriggers:
 	db 2
@@ -18,7 +24,7 @@ DragonShrine_MapScriptHeader:
 
 DragonShrineTestScript:
 	applymovement PLAYER, MovementData_0x18d2bf
-	applymovement $2, MovementData_0x18d2c7
+	applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c7
 	loadfont
 	writetext UnknownText_0x18d2ea
 	keeptextopen
@@ -89,12 +95,12 @@ DragonShrineTestScript:
 	iftrue .Question2
 .WrongAnswer:
 	closetext
-	spriteface $2, LEFT
+	spriteface DRAGONSHRINE_ELDER1, LEFT
 	loadfont
 	writetext UnknownText_0x18d7f6
 	waitbutton
 	closetext
-	spriteface $2, DOWN
+	spriteface DRAGONSHRINE_ELDER1, DOWN
 	loadfont
 	writetext UnknownText_0x18d816
 	waitbutton
@@ -118,41 +124,41 @@ DragonShrineTestScript:
 	playsound SFX_ENTER_DOOR
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_CLAIR
-	appear $5
+	appear DRAGONSHRINE_CLAIR
 	waitsfx
 	spriteface PLAYER, DOWN
 	pause 30
-	applymovement $5, MovementData_0x18d2d4
+	applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2d4
-	spriteface $5, RIGHT
+	spriteface DRAGONSHRINE_CLAIR, RIGHT
 	spriteface PLAYER, LEFT
-	spriteface $2, LEFT
+	spriteface DRAGONSHRINE_ELDER1, LEFT
 	loadfont
 	writetext UnknownText_0x18d916
 	waitbutton
 	closetext
 	special Special_RotatePalettesRightMusic
-	applymovement $5, MovementData_0x18d2da
+	applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2da
 	loadfont
 	writetext UnknownText_0x18d974
 	waitbutton
 	closetext
-	applymovement $5, MovementData_0x18d2dd
+	applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2dd
 	loadfont
 	writetext UnknownText_0x18d983
 	waitbutton
 	closetext
-	applymovement $2, MovementData_0x18d2c9
+	applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c9
-	spriteface $5, UP
+	spriteface DRAGONSHRINE_CLAIR, UP
 	loadfont
 	writetext UnknownText_0x18d520
 	waitbutton
 	closetext
-	showemote EMOTE_SHOCK, $5, 15
+	showemote EMOTE_SHOCK, DRAGONSHRINE_CLAIR, 15
 	loadfont
 	writetext UnknownText_0x18d9ae
 	waitbutton
 	closetext
-	applymovement $5, MovementData_0x18d2e0
+	applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2e0
 	loadfont
 	writetext UnknownText_0x18d9bf
 	waitbutton
@@ -168,9 +174,9 @@ DragonShrineTestScript:
 	writetext UnknownText_0x18da0b
 	waitbutton
 	closetext
-	applymovement $2, MovementData_0x18d2ce
+	applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2ce
-	spriteface $5, UP
+	spriteface DRAGONSHRINE_CLAIR, UP
-	applymovement $2, MovementData_0x18d2d1
+	applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2d1
 	spriteface PLAYER, UP
 	loadfont
 	writetext UnknownText_0x18d5a3
@@ -180,9 +186,9 @@ DragonShrineTestScript:
 	writetext UnknownText_0x18dab4
 	waitbutton
 	closetext
-	applymovement $5, MovementData_0x18d2e3
+	applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2e3
 	playsound SFX_ENTER_DOOR
-	disappear $5
+	disappear DRAGONSHRINE_CLAIR
 	waitsfx
 	setevent EVENT_GAVE_KURT_APRICORNS
 	end

maps/DragonsDen1F.asm

@@ -1,3 +1,5 @@
+const_value set 2
+
 DragonsDen1F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/DragonsDenB1F.asm

@@ -1,3 +1,14 @@
+const_value set 2
+	const DRAGONSDENB1F_POKE_BALL1
+	const DRAGONSDENB1F_CLAIR
+	const DRAGONSDENB1F_SILVER
+	const DRAGONSDENB1F_COOLTRAINER_M
+	const DRAGONSDENB1F_COOLTRAINER_F
+	const DRAGONSDENB1F_TWIN1
+	const DRAGONSDENB1F_TWIN2
+	const DRAGONSDENB1F_POKE_BALL2
+	const DRAGONSDENB1F_POKE_BALL3
+
 DragonsDenB1F_MapScriptHeader:
 .MapTriggers:
 	db 2
@@ -22,22 +33,22 @@ UnknownScript_0x18c89e:
 UnknownScript_0x18c89f:
 	checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
 	iftrue UnknownScript_0x18c8a8
-	disappear $4
+	disappear DRAGONSDENB1F_SILVER
 	return
 
 UnknownScript_0x18c8a8:
 	checkcode VAR_WEEKDAY
 	if_equal TUESDAY, UnknownScript_0x18c8b5
 	if_equal THURSDAY, UnknownScript_0x18c8b5
-	disappear $4
+	disappear DRAGONSDENB1F_SILVER
 	return
 
 UnknownScript_0x18c8b5:
-	appear $4
+	appear DRAGONSDENB1F_SILVER
 	return
 
 UnknownScript_0x18c8b8:
-	appear $3
+	appear DRAGONSDENB1F_CLAIR
 	loadfont
 	writetext UnknownText_0x18c9b8
 	pause 30
@@ -45,7 +56,7 @@ UnknownScript_0x18c8b8:
 	showemote EMOTE_SHOCK, PLAYER, 15
 	spriteface PLAYER, LEFT
 	playmusic MUSIC_CLAIR
-	applymovement $3, MovementData_0x18c9ae
+	applymovement DRAGONSDENB1F_CLAIR, MovementData_0x18c9ae
 	loadfont
 	writetext UnknownText_0x18c9bf
 	keeptextopen
@@ -69,11 +80,11 @@ UnknownScript_0x18c8f4:
 	waitbutton
 	closetext
 UnknownScript_0x18c8f9:
-	applymovement $3, MovementData_0x18c9b3
+	applymovement DRAGONSDENB1F_CLAIR, MovementData_0x18c9b3
 	special Special_RotatePalettesRightMusic
 	pause 30
 	special RestartMapMusic
-	disappear $3
+	disappear DRAGONSDENB1F_CLAIR
 	dotrigger $0
 	end
 
@@ -124,7 +135,7 @@ TwinsLeaandpia2Script:
 PokeBallScript_0x18c95a:
 	giveitem DRAGON_FANG
 	iffalse UnknownScript_0x18c970
-	disappear $2
+	disappear DRAGONSDENB1F_POKE_BALL1
 	loadfont
 	itemtotext DRAGON_FANG, $0
 	writetext UnknownText_0x18cf41

maps/EarlsPokemonAcademy.asm

@@ -1,3 +1,11 @@
+const_value set 2
+	const EARLSPOKEMONACADEMY_FISHER
+	const EARLSPOKEMONACADEMY_YOUNGSTER1
+	const EARLSPOKEMONACADEMY_GAMEBOY_KID1
+	const EARLSPOKEMONACADEMY_GAMEBOY_KID2
+	const EARLSPOKEMONACADEMY_YOUNGSTER2
+	const EARLSPOKEMONACADEMY_POKEDEX
+
 EarlsPokemonAcademy_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -6,7 +14,7 @@ EarlsPokemonAcademy_MapScriptHeader:
 	db 0
 
 AcademyEarl:
-	applymovement $2, MovementData_0x68b2d
+	applymovement EARLSPOKEMONACADEMY_FISHER, MovementData_0x68b2d
 	faceplayer
 	loadfont
 	writetext UnknownText_0x68b3b
@@ -39,7 +47,7 @@ GameboyKidScript_0x68a86:
 	writetext UnknownText_0x68dda
 	waitbutton
 	closetext
-	spriteface $4, DOWN
+	spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN
 	end
 
 GameboyKidScript_0x68a91:
@@ -48,7 +56,7 @@ GameboyKidScript_0x68a91:
 	writetext UnknownText_0x68e07
 	waitbutton
 	closetext
-	spriteface $5, DOWN
+	spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN
 	end
 
 YoungsterScript_0x68a9c:

maps/EcruteakCity.asm

@@ -1,3 +1,12 @@
+const_value set 2
+	const ECRUTEAKCITY_GRAMPS1
+	const ECRUTEAKCITY_GRAMPS2
+	const ECRUTEAKCITY_LASS1
+	const ECRUTEAKCITY_LASS2
+	const ECRUTEAKCITY_FISHER
+	const ECRUTEAKCITY_YOUNGSTER
+	const ECRUTEAKCITY_GRAMPS3
+
 EcruteakCity_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/EcruteakGym.asm

@@ -1,3 +1,12 @@
+const_value set 2
+	const ECRUTEAKGYM_MORTY
+	const ECRUTEAKGYM_SAGE1
+	const ECRUTEAKGYM_SAGE2
+	const ECRUTEAKGYM_GRANNY1
+	const ECRUTEAKGYM_GRANNY2
+	const ECRUTEAKGYM_GYM_GUY
+	const ECRUTEAKGYM_GRAMPS
+
 EcruteakGym_MapScriptHeader:
 .MapTriggers:
 	db 2
@@ -76,12 +85,12 @@ EcruteakGymTriggerRockets:
 
 UnknownScript_0x99dc6:
 	applymovement PLAYER, MovementData_0x99e5d
-	applymovement $8, MovementData_0x99e63
+	applymovement ECRUTEAKGYM_GRAMPS, MovementData_0x99e63
 	loadfont
 	writetext UnknownText_0x9a49c
 	waitbutton
 	closetext
-	follow PLAYER, $8
+	follow PLAYER, ECRUTEAKGYM_GRAMPS
 	applymovement PLAYER, MovementData_0x99e5f
 	stopfollow
 	special FadeOutPalettes

maps/EcruteakHouse.asm

@@ -1,3 +1,9 @@
+const_value set 2
+	const ECRUTEAKHOUSE_SAGE1
+	const ECRUTEAKHOUSE_SAGE2
+	const ECRUTEAKHOUSE_SAGE3
+	const ECRUTEAKHOUSE_GRAMPS
+
 EcruteakHouse_MapScriptHeader:
 .MapTriggers:
 	db 2
@@ -45,21 +51,21 @@ EcruteakHouse_MapScriptHeader:
 EcruteakHouse_XYTrigger1:
 	checkevent EVENT_RANG_CLEAR_BELL_2
 	iftrue EcruteakHouse_XYTrigger_DontMove
-	applymovement $3, MovementData_0x980c7
+	applymovement ECRUTEAKHOUSE_SAGE2, MovementData_0x980c7
-	moveperson $2, $4, $6
+	moveperson ECRUTEAKHOUSE_SAGE1, $4, $6
-	appear $2
+	appear ECRUTEAKHOUSE_SAGE1
 	pause 5
-	disappear $3
+	disappear ECRUTEAKHOUSE_SAGE2
 	end
 
 EcruteakHouse_XYTrigger2:
 	checkevent EVENT_RANG_CLEAR_BELL_1
 	iftrue EcruteakHouse_XYTrigger_DontMove
-	applymovement $2, MovementData_0x980cc
+	applymovement ECRUTEAKHOUSE_SAGE1, MovementData_0x980cc
-	moveperson $3, $5, $6
+	moveperson ECRUTEAKHOUSE_SAGE2, $5, $6
-	appear $3
+	appear ECRUTEAKHOUSE_SAGE2
 	pause 5
-	disappear $2
+	disappear ECRUTEAKHOUSE_SAGE1
 	end
 
 EcruteakHouse_XYTrigger_DontMove:

maps/EcruteakItemfinderHouse.asm

@@ -1,3 +1,7 @@
+const_value set 2
+	const ECRUTEAKITEMFINDERHOUSE_COOLTRAINER_M
+	const ECRUTEAKITEMFINDERHOUSE_POKEDEX
+
 EcruteakItemfinderHouse_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/EcruteakLugiaSpeechHouse.asm

@@ -1,3 +1,7 @@
+const_value set 2
+	const ECRUTEAKLUGIASPEECHHOUSE_GRAMPS
+	const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER
+
 EcruteakLugiaSpeechHouse_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/EcruteakMart.asm

@@ -1,3 +1,8 @@
+const_value set 2
+	const ECRUTEAKMART_CLERK
+	const ECRUTEAKMART_SUPER_NERD
+	const ECRUTEAKMART_GRANNY
+
 EcruteakMart_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/EcruteakPokeCenter1F.asm

@@ -1,3 +1,10 @@
+const_value set 2
+	const ECRUTEAKPOKECENTER1F_NURSE
+	const ECRUTEAKPOKECENTER1F_POKEFAN_M
+	const ECRUTEAKPOKECENTER1F_COOLTRAINER_F
+	const ECRUTEAKPOKECENTER1F_GYM_GUY
+	const ECRUTEAKPOKECENTER1F_BILL
+
 EcruteakPokeCenter1F_MapScriptHeader:
 .MapTriggers:
 	db 2
@@ -19,19 +26,19 @@ UnknownScript_0x98e63:
 UnknownScript_0x98e64:
 	pause 30
 	playsound SFX_EXIT_BUILDING
-	appear $6
+	appear ECRUTEAKPOKECENTER1F_BILL
 	waitsfx
-	applymovement $6, MovementData_0x98ec5
+	applymovement ECRUTEAKPOKECENTER1F_BILL, MovementData_0x98ec5
 	applymovement PLAYER, MovementData_0x98ed4
-	spriteface $2, UP
+	spriteface ECRUTEAKPOKECENTER1F_NURSE, UP
 	pause 10
-	spriteface $2, DOWN
+	spriteface ECRUTEAKPOKECENTER1F_NURSE, DOWN
 	pause 30
-	spriteface $2, UP
+	spriteface ECRUTEAKPOKECENTER1F_NURSE, UP
 	pause 10
-	spriteface $2, DOWN
+	spriteface ECRUTEAKPOKECENTER1F_NURSE, DOWN
 	pause 20
-	spriteface $6, DOWN
+	spriteface ECRUTEAKPOKECENTER1F_BILL, DOWN
 	pause 10
 	loadfont
 	writetext UnknownText_0x98ed8
@@ -43,9 +50,9 @@ UnknownScript_0x98e95:
 	waitbutton
 	closetext
 	spriteface PLAYER, DOWN
-	applymovement $6, MovementData_0x98ece
+	applymovement ECRUTEAKPOKECENTER1F_BILL, MovementData_0x98ece
 	playsound SFX_EXIT_BUILDING
-	disappear $6
+	disappear ECRUTEAKPOKECENTER1F_BILL
 	clearevent EVENT_MET_BILL
 	setflag ENGINE_TIME_CAPSULE
 	dotrigger $1

maps/ElmsHouse.asm

@@ -1,3 +1,7 @@
+const_value set 2
+	const ELMSHOUSE_TEACHER
+	const ELMSHOUSE_BUG_CATCHER
+
 ElmsHouse_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/ElmsLab.asm

@@ -1,14 +1,22 @@
+const_value set 2
+	const ELMSLAB_ELM
+	const ELMSLAB_SCIENTIST
+	const ELMSLAB_POKE_BALL1
+	const ELMSLAB_POKE_BALL2
+	const ELMSLAB_POKE_BALL3
+	const ELMSLAB_OFFICER
+
 ElmsLab_MapScriptHeader:
 .MapTriggers:
 	db 6
 
 	; triggers
-	dw UnknownScript_0x78b7a, 0
+	dw .Trigger0, 0
-	dw UnknownScript_0x78b7e, 0
+	dw .Trigger1, 0
-	dw UnknownScript_0x78b7f, 0
+	dw .Trigger2, 0
-	dw UnknownScript_0x78b80, 0
+	dw .Trigger3, 0
-	dw UnknownScript_0x78b81, 0
+	dw .Trigger4, 0
-	dw UnknownScript_0x78b82, 0
+	dw .Trigger5, 0
 
 .MapCallbacks:
 	db 1
@@ -17,36 +25,36 @@ ElmsLab_MapScriptHeader:
 
 	dbw 2, ElmsLab_PutElmAtLaptop
 
-UnknownScript_0x78b7a:
+.Trigger0:
 	priorityjump ElmsLab_AutowalkUpToElm
 	end
 
-UnknownScript_0x78b7e:
+.Trigger1:
 	end
 
-UnknownScript_0x78b7f:
+.Trigger2:
 	end
 
-UnknownScript_0x78b80:
+.Trigger3:
 	end
 
-UnknownScript_0x78b81:
+.Trigger4:
 	end
 
-UnknownScript_0x78b82:
+.Trigger5:
 	end
 
 ElmsLab_PutElmAtLaptop:
 	checktriggers
 	iftrue .Skip
-	moveperson $2, $3, $4
+	moveperson ELMSLAB_ELM, $3, $4
 .Skip:
 	return
 
 ElmsLab_AutowalkUpToElm:
 	applymovement PLAYER, ElmsLab_WalkUpToElmMovement
-	showemote EMOTE_SHOCK, $2, 15
+	showemote EMOTE_SHOCK, ELMSLAB_ELM, 15
-	spriteface $2, RIGHT
+	spriteface ELMSLAB_ELM, RIGHT
 	loadfont
 	writetext ElmText_Intro
 ElmsLab_RefuseLoop:
@@ -63,20 +71,20 @@ ElmsLab_ElmGetsEmail:
 	closetext
 	playsound SFX_GLASS_TING
 	pause 30
-	showemote EMOTE_SHOCK, $2, 10
+	showemote EMOTE_SHOCK, ELMSLAB_ELM, 10
-	spriteface $2, DOWN
+	spriteface ELMSLAB_ELM, DOWN
 	loadfont
 	writetext ElmText_GotAnEmail
 	waitbutton
 	closetext
 	loadfont
-	spriteface $2, RIGHT
+	spriteface ELMSLAB_ELM, RIGHT
 	writetext ElmText_MissionFromMrPokemon
 	waitbutton
 	closetext
-	applymovement $2, ElmsLab_ElmToDefaultPositionMovement1
+	applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement1
 	spriteface PLAYER, UP
-	applymovement $2, ElmsLab_ElmToDefaultPositionMovement2
+	applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement2
 	spriteface PLAYER, RIGHT
 	loadfont
 	writetext ElmText_ChooseAPokemon
@@ -146,7 +154,7 @@ ElmCheckGotEggAgain:
 	end
 
 LabTryToLeaveScript:
-	spriteface $2, DOWN
+	spriteface ELMSLAB_ELM, DOWN
 	loadfont
 	writetext LabWhereGoingText
 	waitbutton
@@ -157,7 +165,7 @@ LabTryToLeaveScript:
 CyndaquilPokeBallScript:
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
 	iftrue LookAtElmPokeBallScript
-	spriteface $2, DOWN
+	spriteface ELMSLAB_ELM, DOWN
 	refreshscreen $0
 	pokepic CYNDAQUIL
 	cry CYNDAQUIL
@@ -167,7 +175,7 @@ CyndaquilPokeBallScript:
 	writetext TakeCyndaquilText
 	yesorno
 	iffalse DidntChooseStarterScript
-	disappear $4
+	disappear ELMSLAB_POKE_BALL1
 	setevent EVENT_GOT_CYNDAQUIL_FROM_ELM
 	writetext ChoseStarterText
 	keeptextopen
@@ -187,7 +195,7 @@ CyndaquilPokeBallScript:
 TotodilePokeBallScript:
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
 	iftrue LookAtElmPokeBallScript
-	spriteface $2, DOWN
+	spriteface ELMSLAB_ELM, DOWN
 	refreshscreen $0
 	pokepic TOTODILE
 	cry TOTODILE
@@ -197,7 +205,7 @@ TotodilePokeBallScript:
 	writetext TakeTotodileText
 	yesorno
 	iffalse DidntChooseStarterScript
-	disappear $5
+	disappear ELMSLAB_POKE_BALL2
 	setevent EVENT_GOT_TOTODILE_FROM_ELM
 	writetext ChoseStarterText
 	keeptextopen
@@ -215,7 +223,7 @@ TotodilePokeBallScript:
 ChikoritaPokeBallScript:
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
 	iftrue LookAtElmPokeBallScript
-	spriteface $2, DOWN
+	spriteface ELMSLAB_ELM, DOWN
 	refreshscreen $0
 	pokepic CHIKORITA
 	cry CHIKORITA
@@ -225,7 +233,7 @@ ChikoritaPokeBallScript:
 	writetext TakeChikoritaText
 	yesorno
 	iffalse DidntChooseStarterScript
-	disappear $6
+	disappear ELMSLAB_POKE_BALL3
 	setevent EVENT_GOT_CHIKORITA_FROM_ELM
 	writetext ChoseStarterText
 	keeptextopen
@@ -259,12 +267,12 @@ ElmDirectionsScript:
 	waitsfx
 	waitbutton
 	closetext
-	spriteface $2, LEFT
+	spriteface ELMSLAB_ELM, LEFT
 	loadfont
 	writetext ElmDirectionsText2
 	waitbutton
 	closetext
-	spriteface $2, DOWN
+	spriteface ELMSLAB_ELM, DOWN
 	loadfont
 	writetext ElmDirectionsText3
 	waitbutton
@@ -369,7 +377,7 @@ ShowElmTogepiScript:
 	writetext ShowElmTogepiText1
 	waitbutton
 	closetext
-	showemote EMOTE_SHOCK, $2, 15
+	showemote EMOTE_SHOCK, ELMSLAB_ELM, 15
 	setevent EVENT_SHOWED_TOGEPI_TO_ELM
 	loadfont
 	writetext ShowElmTogepiText2
@@ -435,37 +443,37 @@ ElmJumpBackScript2:
 	end
 
 ElmJumpUpScript:
-	applymovement $2, ElmJumpUpMovement
+	applymovement ELMSLAB_ELM, ElmJumpUpMovement
 	loadfont
 	end
 
 ElmJumpDownScript:
-	applymovement $2, ElmJumpDownMovement
+	applymovement ELMSLAB_ELM, ElmJumpDownMovement
 	loadfont
 	end
 
 ElmJumpLeftScript:
-	applymovement $2, ElmJumpLeftMovement
+	applymovement ELMSLAB_ELM, ElmJumpLeftMovement
 	loadfont
 	end
 
 ElmJumpRightScript:
-	applymovement $2, ElmJumpRightMovement
+	applymovement ELMSLAB_ELM, ElmJumpRightMovement
 	loadfont
 	end
 
 AideScript_WalkPotions1:
-	applymovement $3, AideWalksRight1
+	applymovement ELMSLAB_SCIENTIST, AideWalksRight1
 	spriteface PLAYER, DOWN
 	scall AideScript_GivePotions
-	applymovement $3, AideWalksLeft1
+	applymovement ELMSLAB_SCIENTIST, AideWalksLeft1
 	end
 
 AideScript_WalkPotions2:
-	applymovement $3, AideWalksRight2
+	applymovement ELMSLAB_SCIENTIST, AideWalksRight2
 	spriteface PLAYER, DOWN
 	scall AideScript_GivePotions
-	applymovement $3, AideWalksLeft2
+	applymovement ELMSLAB_SCIENTIST, AideWalksLeft2
 	end
 
 AideScript_GivePotions:
@@ -480,17 +488,17 @@ AideScript_GivePotions:
 	end
 
 AideScript_WalkBalls1:
-	applymovement $3, AideWalksRight1
+	applymovement ELMSLAB_SCIENTIST, AideWalksRight1
 	spriteface PLAYER, DOWN
 	scall AideScript_GiveYouBalls
-	applymovement $3, AideWalksLeft1
+	applymovement ELMSLAB_SCIENTIST, AideWalksLeft1
 	end
 
 AideScript_WalkBalls2:
-	applymovement $3, AideWalksRight2
+	applymovement ELMSLAB_SCIENTIST, AideWalksRight2
 	spriteface PLAYER, DOWN
 	scall AideScript_GiveYouBalls
-	applymovement $3, AideWalksLeft2
+	applymovement ELMSLAB_SCIENTIST, AideWalksLeft2
 	end
 
 AideScript_GiveYouBalls:
@@ -549,7 +557,7 @@ MeetCopScript2:
 MeetCopScript:
 	applymovement PLAYER, MeetCopScript_WalkUp
 CopScript:
-	spriteface $7, LEFT
+	spriteface ELMSLAB_OFFICER, LEFT
 	loadfont
 	writetext ElmsLabOfficerText1
 	keeptextopen
@@ -557,8 +565,8 @@ CopScript:
 	writetext ElmsLabOfficerText2
 	waitbutton
 	closetext
-	applymovement $7, OfficerLeavesMovement
+	applymovement ELMSLAB_OFFICER, OfficerLeavesMovement
-	disappear $7
+	disappear ELMSLAB_OFFICER
 	dotrigger $2
 	end
 

maps/FastShip1F.asm

@@ -1,3 +1,9 @@
+const_value set 2
+	const FASTSHIP1F_SAILOR1
+	const FASTSHIP1F_SAILOR2
+	const FASTSHIP1F_SAILOR3
+	const FASTSHIP1F_GENTLEMAN
+
 FastShip1F_MapScriptHeader:
 .MapTriggers:
 	db 3
@@ -21,9 +27,9 @@ FastShip1F_MapScriptHeader:
 	end
 
 .PriorityJump2:
-	applymovement $2, MovementData_0x7520e
+	applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e
 	applymovement PLAYER, MovementData_0x75217
-	applymovement $2, MovementData_0x75211
+	applymovement FASTSHIP1F_SAILOR1, MovementData_0x75211
 	pause 30
 	playsound SFX_BOAT
 	earthquake 30
@@ -87,12 +93,12 @@ SailorScript_0x75160:
 .LetThePlayerOut:
 	checkcode VAR_FACING
 	if_equal RIGHT, .YouAreFacingRight
-	applymovement $2, MovementData_0x7520e
+	applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e
 	applymovement PLAYER, MovementData_0x75235
 	end
 
 .YouAreFacingRight:
-	applymovement $2, MovementData_0x75214
+	applymovement FASTSHIP1F_SAILOR1, MovementData_0x75214
 	applymovement PLAYER, MovementData_0x75238
 	end
 
@@ -116,21 +122,21 @@ SailorScript_0x751e4:
 	jumptextfaceplayer UnknownText_0x753c0
 
 WorriedGrandpaTriggerRight:
-	moveperson $5, $14, $6
+	moveperson FASTSHIP1F_GENTLEMAN, $14, $6
 
 WorriedGrandpaTriggerLeft:
-	appear $5
+	appear FASTSHIP1F_GENTLEMAN
-	applymovement $5, MovementData_0x7521b
+	applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x7521b
 	playsound SFX_TACKLE
 	applymovement PLAYER, MovementData_0x7522e
-	applymovement $5, MovementData_0x75220
+	applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75220
 	loadfont
 	writetext UnknownText_0x75412
 	waitbutton
 	closetext
 	spriteface PLAYER, RIGHT
-	applymovement $5, MovementData_0x75222
+	applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222
-	disappear $5
+	disappear FASTSHIP1F_GENTLEMAN
 	dotrigger $0
 	end
 

maps/FastShipB1F.asm

@@ -1,3 +1,17 @@
+const_value set 2
+	const FASTSHIPB1F_SAILOR1
+	const FASTSHIPB1F_SAILOR2
+	const FASTSHIPB1F_SAILOR3
+	const FASTSHIPB1F_LASS
+	const FASTSHIPB1F_SUPER_NERD
+	const FASTSHIPB1F_SAILOR4
+	const FASTSHIPB1F_FISHER
+	const FASTSHIPB1F_BLACK_BELT
+	const FASTSHIPB1F_SAILOR5
+	const FASTSHIPB1F_TEACHER
+	const FASTSHIPB1F_YOUNGSTER1
+	const FASTSHIPB1F_YOUNGSTER2
+
 FastShipB1F_MapScriptHeader:
 .MapTriggers:
 	db 2
@@ -18,21 +32,21 @@ UnknownScript_0x7673b:
 UnknownScript_0x7673c:
 	checkevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
 	iftrue UnknownScript_0x76766
-	applymovement $3, MovementData_0x76876
+	applymovement FASTSHIPB1F_SAILOR2, MovementData_0x76876
-	moveperson $2, $1e, $6
+	moveperson FASTSHIPB1F_SAILOR1, $1e, $6
-	appear $2
+	appear FASTSHIPB1F_SAILOR1
 	pause 5
-	disappear $3
+	disappear FASTSHIPB1F_SAILOR2
 	end
 
 UnknownScript_0x76751:
 	checkevent EVENT_FAST_SHIP_B1F_SAILOR_LEFT
 	iftrue UnknownScript_0x76766
-	applymovement $2, MovementData_0x76871
+	applymovement FASTSHIPB1F_SAILOR1, MovementData_0x76871
-	moveperson $3, $1f, $6
+	moveperson FASTSHIPB1F_SAILOR2, $1f, $6
-	appear $3
+	appear FASTSHIPB1F_SAILOR2
 	pause 5
-	disappear $2
+	disappear FASTSHIPB1F_SAILOR1
 	end
 
 UnknownScript_0x76766:

maps/FastShipCabins_NNW_NNE_NE.asm

@@ -1,3 +1,12 @@
+const_value set 2
+	const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_M
+	const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_F
+	const FASTSHIPCABINS_NNW_NNE_NE_SUPER_NERD
+	const FASTSHIPCABINS_NNW_NNE_NE_POKEFAN_M
+	const FASTSHIPCABINS_NNW_NNE_NE_SAILOR
+	const FASTSHIPCABINS_NNW_NNE_NE_GENTLEMAN
+	const FASTSHIPCABINS_NNW_NNE_NE_PHARMACIST
+
 FastShipCabins_NNW_NNE_NE_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -92,16 +101,16 @@ SailorScript_0x755f1:
 	domaptrigger FAST_SHIP_B1F, $1
 	checkcode VAR_FACING
 	if_equal $3, UnknownScript_0x75629
-	applymovement $6, MovementData_0x75637
+	applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637
 	playsound SFX_EXIT_BUILDING
-	disappear $6
+	disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR
 	waitsfx
 	end
 
 UnknownScript_0x75629:
-	applymovement $6, MovementData_0x7563c
+	applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x7563c
 	playsound SFX_EXIT_BUILDING
-	disappear $6
+	disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR
 	waitsfx
 	end
 

maps/FastShipCabins_SE_SSE_CaptainsCabin.asm

@@ -1,3 +1,16 @@
+const_value set 2
+	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_CAPTAIN
+	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN
+	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1
+	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2
+	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_POKEFAN_M1
+	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN3
+	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN4
+	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD1
+	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_POKEFAN_M2
+	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_POKEFAN_F
+	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD2
+
 FastShipCabins_SE_SSE_CaptainsCabin_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -25,7 +38,7 @@ UnknownScript_0x75eb5:
 	end
 
 TwinScript_0x75ebb:
-	spriteface $5, RIGHT
+	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, RIGHT
 	loadfont
 	writetext UnknownText_0x761e0
 	waitbutton
@@ -37,17 +50,17 @@ TwinScript_0x75ebb:
 	closetext
 	special Special_FadeBlackQuickly
 	special Special_ReloadSpritesNoPalettes
-	disappear $5
+	disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2
 	applymovement PLAYER, MovementData_0x76004
-	moveperson $4, $3, $13
+	moveperson FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, $3, $13
-	appear $4
+	appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1
 	spriteface PLAYER, UP
-	spriteface $4, UP
+	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP
 	special Special_FadeInQuickly
-	spriteface $3, DOWN
+	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN
-	showemote EMOTE_SHOCK, $3, 15
+	showemote EMOTE_SHOCK, FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, 15
-	applymovement $4, MovementData_0x7600c
+	applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, MovementData_0x7600c
-	spriteface $3, RIGHT
+	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue UnknownScript_0x75f03
 	loadfont
@@ -62,8 +75,8 @@ UnknownScript_0x75f03:
 	waitbutton
 	closetext
 UnknownScript_0x75f09:
-	spriteface $5, DOWN
+	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN
-	applymovement $3, MovementData_0x76010
+	applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, MovementData_0x76010
 	loadfont
 	writetext UnknownText_0x76143
 	keeptextopen

maps/FastShipCabins_SW_SSW_NW.asm

@@ -1,3 +1,9 @@
+const_value set 2
+	const FASTSHIPCABINS_SW_SSW_NW_FISHER
+	const FASTSHIPCABINS_SW_SSW_NW_BUG_CATCHER
+	const FASTSHIPCABINS_SW_SSW_NW_BUENA
+	const FASTSHIPCABINS_SW_SSW_NW_ROCKER
+
 FastShipCabins_SW_SSW_NW_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/FightingDojo.asm

@@ -1,3 +1,7 @@
+const_value set 2
+	const FIGHTINGDOJO_BLACK_BELT
+	const FIGHTINGDOJO_POKE_BALL
+
 FightingDojo_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/FuchsiaBillSpeechHouse.asm

@@ -1,3 +1,7 @@
+const_value set 2
+	const FUCHSIABILLSPEECHHOUSE_POKEFAN_F
+	const FUCHSIABILLSPEECHHOUSE_YOUNGSTER
+
 FuchsiaBillSpeechHouse_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/FuchsiaCity.asm

@@ -1,3 +1,9 @@
+const_value set 2
+	const FUCHSIACITY_YOUNGSTER
+	const FUCHSIACITY_POKEFAN_M
+	const FUCHSIACITY_TEACHER
+	const FUCHSIACITY_FRUIT_TREE
+
 FuchsiaCity_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/FuchsiaGym.asm

@@ -1,3 +1,11 @@
+const_value set 2
+	const FUCHSIAGYM_JANINE
+	const FUCHSIAGYM_FUCHSIA_GYM_1
+	const FUCHSIAGYM_FUCHSIA_GYM_2
+	const FUCHSIAGYM_FUCHSIA_GYM_3
+	const FUCHSIAGYM_FUCHSIA_GYM_4
+	const FUCHSIAGYM_GYM_GUY
+
 FuchsiaGym_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -8,7 +16,7 @@ FuchsiaGym_MapScriptHeader:
 JanineScript_0x195db9:
 	checkflag ENGINE_SOULBADGE
 	iftrue .FightDone
-	applymovement $2, MovementData_0x195f27
+	applymovement FUCHSIAGYM_JANINE, MovementData_0x195f27
 	faceplayer
 	loadfont
 	writetext UnknownText_0x195f35
@@ -54,7 +62,7 @@ UnknownScript_0x195e15:
 FuschiaGym1Script_0x195e1b:
 	checkevent EVENT_BEAT_LASS_ALICE
 	iftrue UnknownScript_0x195e2c
-	applymovement $3, MovementData_0x195f27
+	applymovement FUCHSIAGYM_FUCHSIA_GYM_1, MovementData_0x195f27
 	faceplayer
 	variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS
 	special RunCallback_04
@@ -88,7 +96,7 @@ UnknownScript_0x195e4f:
 FuschiaGym2Script_0x195e55:
 	checkevent EVENT_BEAT_LASS_LINDA
 	iftrue UnknownScript_0x195e66
-	applymovement $4, MovementData_0x195f27
+	applymovement FUCHSIAGYM_FUCHSIA_GYM_2, MovementData_0x195f27
 	faceplayer
 	variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS
 	special RunCallback_04
@@ -122,7 +130,7 @@ UnknownScript_0x195e89:
 FuschiaGym3Script_0x195e8f:
 	checkevent EVENT_BEAT_PICNICKER_CINDY
 	iftrue UnknownScript_0x195ea0
-	applymovement $5, MovementData_0x195f27
+	applymovement FUCHSIAGYM_FUCHSIA_GYM_3, MovementData_0x195f27
 	faceplayer
 	variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS
 	special RunCallback_04
@@ -156,7 +164,7 @@ UnknownScript_0x195ec3:
 FuschiaGym4Script_0x195ec9:
 	checkevent EVENT_BEAT_CAMPER_BARRY
 	iftrue UnknownScript_0x195eda
-	applymovement $6, MovementData_0x195f27
+	applymovement FUCHSIAGYM_FUCHSIA_GYM_4, MovementData_0x195f27
 	faceplayer
 	variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER
 	special RunCallback_04

maps/FuchsiaMart.asm

@@ -1,3 +1,8 @@
+const_value set 2
+	const FUCHSIAMART_CLERK
+	const FUCHSIAMART_FISHER
+	const FUCHSIAMART_COOLTRAINER_F
+
 FuchsiaMart_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/FuchsiaPokeCenter1F.asm

@@ -1,3 +1,9 @@
+const_value set 2
+	const FUCHSIAPOKECENTER1F_NURSE
+	const FUCHSIAPOKECENTER1F_COOLTRAINER_M
+	const FUCHSIAPOKECENTER1F_COOLTRAINER_F
+	const FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR
+
 FuchsiaPokeCenter1F_MapScriptHeader:
 .MapTriggers:
 	db 1
@@ -26,7 +32,7 @@ JanineImpersonatorScript_0x196462:
 	writetext UnknownText_0x19652e
 	waitbutton
 	closetext
-	applymovement $5, MovementData_0x196486
+	applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486
 	faceplayer
 	variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE
 	special RunCallback_04
@@ -34,7 +40,7 @@ JanineImpersonatorScript_0x196462:
 	writetext UnknownText_0x19654e
 	waitbutton
 	closetext
-	applymovement $5, MovementData_0x196486
+	applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486
 	faceplayer
 	variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS
 	special RunCallback_04

maps/FuchsiaPokeCenter2FBeta.asm

@@ -1,3 +1,5 @@
+const_value set 2
+
 FuchsiaPokeCenter2FBeta_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/GoldenrodBikeShop.asm

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

maps/GoldenrodBillsHouse.asm

@@ -1,3 +1,8 @@
+const_value set 2
+	const GOLDENRODBILLSHOUSE_BILL
+	const GOLDENRODBILLSHOUSE_POKEFAN_F
+	const GOLDENRODBILLSHOUSE_TWIN
+
 GoldenrodBillsHouse_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/GoldenrodCity.asm

@@ -1,3 +1,20 @@
+const_value set 2
+	const GOLDENRODCITY_POKEFAN_M1
+	const GOLDENRODCITY_YOUNGSTER1
+	const GOLDENRODCITY_COOLTRAINER_F1
+	const GOLDENRODCITY_COOLTRAINER_F2
+	const GOLDENRODCITY_YOUNGSTER2
+	const GOLDENRODCITY_LASS
+	const GOLDENRODCITY_GRAMPS
+	const GOLDENRODCITY_ROCKET1
+	const GOLDENRODCITY_ROCKET2
+	const GOLDENRODCITY_ROCKET3
+	const GOLDENRODCITY_ROCKET4
+	const GOLDENRODCITY_ROCKET5
+	const GOLDENRODCITY_ROCKET6
+	const GOLDENRODCITY_ROCKET7
+	const GOLDENRODCITY_POKEFAN_M2
+
 GoldenrodCity_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -27,13 +44,13 @@ GoldenrodCity_MapScriptHeader:
 	if_equal WEDNESDAY, .MoveTutorAppear
 	if_equal SATURDAY, .MoveTutorAppear
 .MoveTutorDisappear
-	disappear $10
+	disappear GOLDENRODCITY_POKEFAN_M2
 	return
 
 .MoveTutorAppear
 	checkflag ENGINE_DAILY_MOVE_TUTOR
 	iftrue .MoveTutorDone
-	appear $10
+	appear GOLDENRODCITY_POKEFAN_M2
 .MoveTutorDone
 	return
 
@@ -120,14 +137,14 @@ MoveTutor:
 	closetext
 	checkcode VAR_FACING
 	if_equal $2, .WalkAroundPlayer
-	applymovement $10, MovementData_0x198a5f
+	applymovement GOLDENRODCITY_POKEFAN_M2, MovementData_0x198a5f
 	jump .GoInside
 
 .WalkAroundPlayer:
-	applymovement $10, MovementData_0x198a63
+	applymovement GOLDENRODCITY_POKEFAN_M2, MovementData_0x198a63
 .GoInside:
 	playsound SFX_ENTER_DOOR
-	disappear $10
+	disappear GOLDENRODCITY_POKEFAN_M2
 	clearevent EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR
 	setflag ENGINE_DAILY_MOVE_TUTOR
 	waitsfx
@@ -200,7 +217,7 @@ RocketScript_0x198a1a:
 	writetext UnknownText_0x198d2a
 	waitbutton
 	closetext
-	spriteface $9, UP
+	spriteface GOLDENRODCITY_ROCKET1, UP
 	end
 
 RocketScript_0x198a29:

maps/GoldenrodDeptStore1F.asm

@@ -1,3 +1,9 @@
+const_value set 2
+	const GOLDENRODDEPTSTORE1F_RECEPTIONIST
+	const GOLDENRODDEPTSTORE1F_POKEFAN_F
+	const GOLDENRODDEPTSTORE1F_BUG_CATCHER
+	const GOLDENRODDEPTSTORE1F_GENTLEMAN
+
 GoldenrodDeptStore1F_MapScriptHeader:
 .MapTriggers:
 	db 0