More enumeration of constants, more annotations of scripts.

author: PikalaxALT <PikalaxALT@gmail.com> 2015-07-15 15:48:44 -0400
committer: PikalaxALT <PikalaxALT@gmail.com> 2015-07-15 15:48:44 -0400
commit: 39524cdb766660a7bf6d60379040349652cecc04 (patch)
tree: e0657f37fbd8cbd7bf724025a4bb19e68e1e0254 /maps
parent: 67e56102ef56e91e9563a32f6fc68827219d2037 (diff)
56 files changed, 272 insertions, 272 deletions
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index 788c9bb9a..97a104ba5 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -29,7 +29,7 @@ AzaleaTown_MapScriptHeader:
 UnknownScript_0x198018:
 	moveperson $b, $b, $b
 	spriteface $0, RIGHT
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	special Functionc48f
 	pause 15
 	appear $b
@@ -39,7 +39,7 @@ UnknownScript_0x198018:
 
 UnknownScript_0x198034:
 	spriteface $0, RIGHT
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	special Functionc48f
 	pause 15
 	appear $b
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index b6a447a11..1d5765bd6 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -37,7 +37,7 @@ UnknownScript_0x185bf8:
 
 UnknownScript_0x185c0d:
 	spriteface $3, DOWN
-	showemote $0, $3, 15
+	showemote EMOTE_SHOCK, $3, 15
 	applymovement $3, MovementData_0x185cd3
 	loadfont
 	writetext UnknownText_0x185ecc
@@ -48,7 +48,7 @@ UnknownScript_0x185c0d:
 	end
 
 UnknownScript_0x185c25:
-	showemote $0, $4, 15
+	showemote EMOTE_SHOCK, $4, 15
 	special Functionc48f
 	pause 15
 	spriteface $4, RIGHT
@@ -101,7 +101,7 @@ UnknownScript_0x185c80:
 	special Functionc48f
 	pause 15
 	earthquake 50
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	playsound SFX_ENTER_DOOR
 	waitbutton
 	changeblock $a, $8, $25
@@ -109,7 +109,7 @@ UnknownScript_0x185c80:
 	pause 15
 	applymovement $0, MovementData_0x185cd1
 	playsound SFX_KINESIS
-	showemote $0, $4, 20
+	showemote EMOTE_SHOCK, $4, 20
 	loadfont
 	writetext UnknownText_0x185e75
 	closetext
diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
index 8c00721ec..24d67e23e 100644
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -108,7 +108,7 @@ UnknownScript_0x184072:
 	waitbutton
 	playsound SFX_TRANSACTION
 	waitbutton
-	showemote $0, $7, 15
+	showemote EMOTE_SHOCK, $7, 15
 	spriteface $7, LEFT
 	loadfont
 	writetext UnknownText_0x1842ee
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index aaada87fb..912d49b7f 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -25,7 +25,7 @@ UnknownScript_0x1883de:
 	writetext UnknownText_0x1884fb
 	closetext
 	loadmovesprites
-	showemote $0, $2, 15
+	showemote EMOTE_SHOCK, $2, 15
 	applymovement $2, MovementData_0x1884f7
 	loadfont
 	writetext UnknownText_0x188574
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index d10dbabea..1c0d24386 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -102,7 +102,7 @@ UnknownScript_0x19c0aa:
 
 UnknownScript_0x19c0ae:
 	spriteface $0, RIGHT
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	special Functionc48f
 	pause 15
 	appear $3
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index 4a75fdb8a..f9d444f9b 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -29,7 +29,7 @@ UnknownScript_0x1a001d:
 
 UnknownScript_0x1a001e:
 	spriteface $0, UP
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	pause 15
 	playsound SFX_WARP_FROM
 	applymovement $d, MovementData_0x1a00da
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index 5cde05b25..12b61b4ee 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -116,7 +116,7 @@ UnknownScript_0x18d100:
 	closetext
 	loadmovesprites
 	playsound SFX_ENTER_DOOR
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	playmusic MUSIC_CLAIR
 	appear $5
 	waitbutton
@@ -147,7 +147,7 @@ UnknownScript_0x18d100:
 	writetext UnknownText_0x18d520
 	closetext
 	loadmovesprites
-	showemote $0, $5, 15
+	showemote EMOTE_SHOCK, $5, 15
 	loadfont
 	writetext UnknownText_0x18d9ae
 	closetext
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 4261c1f97..fbbbdfb37 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -42,7 +42,7 @@ UnknownScript_0x18c8b8:
 	writetext UnknownText_0x18c9b8
 	pause 30
 	loadmovesprites
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	spriteface $0, LEFT
 	playmusic MUSIC_CLAIR
 	applymovement $3, MovementData_0x18c9ae
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index e2368ab0d..4760b403d 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -15,10 +15,10 @@ ElmsLab_MapScriptHeader:
 
 	; callbacks
 
-	dbw 2, UnknownScript_0x78b83
+	dbw 2, ElmsLab_PutElmAtLaptop
 
 UnknownScript_0x78b7a:
-	priorityjump UnknownScript_0x78b8c
+	priorityjump ElmsLab_AutowalkUpToElm
 	end
 
 UnknownScript_0x78b7e:
@@ -36,50 +36,50 @@ UnknownScript_0x78b81:
 UnknownScript_0x78b82:
 	end
 
-UnknownScript_0x78b83:
+ElmsLab_PutElmAtLaptop:
 	checktriggers
-	iftrue UnknownScript_0x78b8b
+	iftrue .Skip
 	moveperson $2, $3, $4
-UnknownScript_0x78b8b:
+.Skip:
 	return
 
-UnknownScript_0x78b8c:
-	applymovement $0, MovementData_0x78f67
-	showemote $0, $2, 15
+ElmsLab_AutowalkUpToElm:
+	applymovement $0, ElmsLab_WalkUpToElmMovement
+	showemote EMOTE_SHOCK, $2, 15
 	spriteface $2, RIGHT
 	loadfont
-	writetext UnknownText_0x78fb6
-UnknownScript_0x78b9b:
+	writetext ElmText_Intro
+ElmsLab_RefuseLoop:
 	yesorno
-	iftrue UnknownScript_0x78ba5
-	writetext UnknownText_0x7911a
-	jump UnknownScript_0x78b9b
+	iftrue ElmsLab_ElmGetsEmail
+	writetext ElmText_Refused
+	jump ElmsLab_RefuseLoop
 
-UnknownScript_0x78ba5:
-	writetext UnknownText_0x790fa
+ElmsLab_ElmGetsEmail:
+	writetext ElmText_Accepted
 	keeptextopen
-	writetext UnknownText_0x7913a
+	writetext ElmText_ResearchAmbitions
 	closetext
 	loadmovesprites
 	playsound SFX_GLASS_TING
 	pause 30
-	showemote $0, $2, 10
+	showemote EMOTE_SHOCK, $2, 10
 	spriteface $2, DOWN
 	loadfont
-	writetext UnknownText_0x791ae
+	writetext ElmText_GotAnEmail
 	closetext
 	loadmovesprites
 	loadfont
 	spriteface $2, RIGHT
-	writetext UnknownText_0x791df
+	writetext ElmText_MissionFromMrPokemon
 	closetext
 	loadmovesprites
-	applymovement $2, MovementData_0x78fa0
+	applymovement $2, ElmsLab_ElmToDefaultPositionMovement1
 	spriteface $0, UP
-	applymovement $2, MovementData_0x78fa2
+	applymovement $2, ElmsLab_ElmToDefaultPositionMovement2
 	spriteface $0, RIGHT
 	loadfont
-	writetext UnknownText_0x792ff
+	writetext ElmText_ChooseAPokemon
 	closetext
 	dotrigger $1
 	loadmovesprites
@@ -89,21 +89,21 @@ ProfElmScript:
 	faceplayer
 	loadfont
 	checkevent EVENT_GOT_SS_TICKET_FROM_ELM
-	iftrue UnknownScript_0x78bee
+	iftrue ElmCheckMasterBall
 	checkevent EVENT_BEAT_ELITE_FOUR
 	iftrue ElmGiveTicketScript
-UnknownScript_0x78bee:
+ElmCheckMasterBall:
 	checkevent EVENT_GOT_MASTER_BALL_FROM_ELM
-	iftrue UnknownScript_0x78bfa
+	iftrue ElmCheckEverstone
 	checkflag ENGINE_RISINGBADGE
 	iftrue ElmGiveMasterBallScript
-UnknownScript_0x78bfa:
+ElmCheckEverstone:
 	checkevent EVENT_GOT_EVERSTONE_FROM_ELM
-	iftrue UnknownScript_0x78e16
+	iftrue ElmScript_CallYou
 	checkevent EVENT_SHOWED_TOGEPI_TO_ELM
-	iftrue UnknownScript_0x78e03
+	iftrue ElmGiveEverstoneScript
 	checkevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE
-	iffalse UnknownScript_0x78c35
+	iffalse ElmCheckTogepiEgg
 	writebyte TOGEPI
 	special Functionc284
 	iftrue ShowElmTogepiScript
@@ -115,21 +115,21 @@ UnknownScript_0x78bfa:
 	loadmovesprites
 	end
 
-UnknownScript_0x78c22:
+ElmEggHatchedScript:
 	writebyte TOGEPI
 	special Functionc284
 	iftrue ShowElmTogepiScript
 	writebyte TOGETIC
 	special Functionc284
 	iftrue ShowElmTogepiScript
-	jump UnknownScript_0x78c41
+	jump ElmCheckGotEggAgain
 
-UnknownScript_0x78c35:
+ElmCheckTogepiEgg:
 	checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
-	iffalse UnknownScript_0x78c41
+	iffalse ElmCheckGotEggAgain
 	checkevent EVENT_TOGEPI_HATCHED
-	iftrue UnknownScript_0x78c22
-UnknownScript_0x78c41:
+	iftrue ElmEggHatchedScript
+ElmCheckGotEggAgain:
 	checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE ; why are we checking it again?
 	iftrue ElmWaitingEggHatchScript
 	checkflag ENGINE_ZEPHYRBADGE
@@ -140,7 +140,7 @@ UnknownScript_0x78c41:
 	iftrue ElmAfterTheftScript
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
 	iftrue ElmDescribesMrPokemonScript
-	writetext UnknownText_0x79375
+	writetext ElmText_LetYourMonBattleIt
 	closetext
 	loadmovesprites
 	end
@@ -300,15 +300,15 @@ ElmsLabHealingMachine:
 .CanHeal
 	writetext ElmsLabHealingMachineText2
 	yesorno
-	iftrue UnknownScript_0x78d8a
+	iftrue ElmsLabHealingMachine_HealParty
 	loadmovesprites
 	end
 
-UnknownScript_0x78d8a:
-	special Function1060a2
+ElmsLabHealingMachine_HealParty:
+	special Mobile_HealParty
 	special HealParty
 	playmusic MUSIC_NONE
-	writebyte $1
+	writebyte 1 ; Machine is in Elm's Lab
 	special HealMachineAnim
 	pause 30
 	special RestartMapMusic
@@ -369,28 +369,28 @@ ShowElmTogepiScript:
 	writetext ShowElmTogepiText1
 	closetext
 	loadmovesprites
-	showemote $0, $2, 15
+	showemote EMOTE_SHOCK, $2, 15
 	setevent EVENT_SHOWED_TOGEPI_TO_ELM
 	loadfont
 	writetext ShowElmTogepiText2
 	keeptextopen
 	writetext ShowElmTogepiText3
 	keeptextopen
-UnknownScript_0x78e03:
+ElmGiveEverstoneScript:
 	writetext ElmGiveEverstoneText1
 	keeptextopen
 	verbosegiveitem EVERSTONE, 1
-	iffalse UnknownScript_0x78e1a
+	iffalse ElmScript_NoRoomForEverstone
 	writetext ElmGiveEverstoneText2
 	closetext
 	loadmovesprites
 	setevent EVENT_GOT_EVERSTONE_FROM_ELM
 	end
 
-UnknownScript_0x78e16:
-	writetext UnknownText_0x79c37
+ElmScript_CallYou:
+	writetext ElmText_CallYou
 	closetext
-UnknownScript_0x78e1a:
+ElmScript_NoRoomForEverstone:
 	loadmovesprites
 	end
 
@@ -419,95 +419,95 @@ ElmGiveTicketScript:
 ElmJumpBackScript1:
 	loadmovesprites
 	checkcode VAR_FACING
-	if_equal $0, UnknownScript_0x78e6d
-	if_equal $1, UnknownScript_0x78e67
-	if_equal $2, UnknownScript_0x78e73
-	if_equal $3, UnknownScript_0x78e79
+	if_equal DOWN, ElmJumpDownScript
+	if_equal UP, ElmJumpUpScript
+	if_equal LEFT, ElmJumpLeftScript
+	if_equal RIGHT, ElmJumpRightScript
 	end
 
 ElmJumpBackScript2:
 	loadmovesprites
 	checkcode VAR_FACING
-	if_equal $0, UnknownScript_0x78e67
-	if_equal $1, UnknownScript_0x78e6d
-	if_equal $2, UnknownScript_0x78e79
-	if_equal $3, UnknownScript_0x78e73
+	if_equal DOWN, ElmJumpUpScript
+	if_equal UP, ElmJumpDownScript
+	if_equal LEFT, ElmJumpRightScript
+	if_equal RIGHT, ElmJumpLeftScript
 	end
 
-UnknownScript_0x78e67:
-	applymovement $2, MovementData_0x78f90
+ElmJumpUpScript:
+	applymovement $2, ElmJumpUpMovement
 	loadfont
 	end
 
-UnknownScript_0x78e6d:
-	applymovement $2, MovementData_0x78f94
+ElmJumpDownScript:
+	applymovement $2, ElmJumpDownMovement
 	loadfont
 	end
 
-UnknownScript_0x78e73:
-	applymovement $2, MovementData_0x78f98
+ElmJumpLeftScript:
+	applymovement $2, ElmJumpLeftMovement
 	loadfont
 	end
 
-UnknownScript_0x78e79:
-	applymovement $2, MovementData_0x78f9c
+ElmJumpRightScript:
+	applymovement $2, ElmJumpRightMovement
 	loadfont
 	end
 
-UnknownScript_0x78e7f:
-	applymovement $3, MovementData_0x78f7e
+AideScript_WalkPotions1:
+	applymovement $3, AideWalksRight1
 	spriteface $0, DOWN
-	scall UnknownScript_0x78e9d
-	applymovement $3, MovementData_0x78f87
+	scall AideScript_GivePotions
+	applymovement $3, AideWalksLeft1
 	end
 
-UnknownScript_0x78e8e:
-	applymovement $3, MovementData_0x78f82
+AideScript_WalkPotions2:
+	applymovement $3, AideWalksRight2
 	spriteface $0, DOWN
-	scall UnknownScript_0x78e9d
-	applymovement $3, MovementData_0x78f8b
+	scall AideScript_GivePotions
+	applymovement $3, AideWalksLeft2
 	end
 
-UnknownScript_0x78e9d:
+AideScript_GivePotions:
 	loadfont
-	writetext UnknownText_0x79f38
+	writetext AideText_GiveYouPotions
 	keeptextopen
 	verbosegiveitem POTION, 1
-	writetext UnknownText_0x79f65
+	writetext AideText_AlwaysBusy
 	closetext
 	loadmovesprites
 	dotrigger $2
 	end
 
-UnknownScript_0x78ead:
-	applymovement $3, MovementData_0x78f7e
+AideScript_WalkBalls1:
+	applymovement $3, AideWalksRight1
 	spriteface $0, DOWN
-	scall UnknownScript_0x78ecb
-	applymovement $3, MovementData_0x78f87
+	scall AideScript_GiveYouBalls
+	applymovement $3, AideWalksLeft1
 	end
 
-UnknownScript_0x78ebc:
-	applymovement $3, MovementData_0x78f82
+AideScript_WalkBalls2:
+	applymovement $3, AideWalksRight2
 	spriteface $0, DOWN
-	scall UnknownScript_0x78ecb
-	applymovement $3, MovementData_0x78f8b
+	scall AideScript_GiveYouBalls
+	applymovement $3, AideWalksLeft2
 	end
 
-UnknownScript_0x78ecb:
+AideScript_GiveYouBalls:
 	loadfont
-	writetext UnknownText_0x7a078
+	writetext AideText_GiveYouBalls
 	keeptextopen
 	itemtotext POKE_BALL, $1
-	scall UnknownScript_0x78ee2
+	scall AideScript_ReceiveTheBalls
 	giveitem POKE_BALL, $5
-	writetext UnknownText_0x7a09a
+	writetext AideText_ExplainBalls
 	keeptextopen
 	itemnotify
 	loadmovesprites
 	dotrigger $2
 	end
 
-UnknownScript_0x78ee2:
+AideScript_ReceiveTheBalls:
 	jumpstd receiveitem
 	end
 
@@ -515,49 +515,49 @@ ElmsAideScript:
 	faceplayer
 	loadfont
 	checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
-	iftrue UnknownScript_0x78f0c
+	iftrue AideScript_AfterTheft
 	checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
-	iftrue UnknownScript_0x78f06
+	iftrue AideScript_ExplainBalls
 	checkevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON
-	iftrue UnknownScript_0x78f00
-	writetext UnknownText_0x79f65
+	iftrue AideScript_TheftTestimony
+	writetext AideText_AlwaysBusy
 	closetext
 	loadmovesprites
 	end
 
-UnknownScript_0x78f00:
-	writetext UnknownText_0x79f95
+AideScript_TheftTestimony:
+	writetext AideText_TheftTestimony
 	closetext
 	loadmovesprites
 	end
 
-UnknownScript_0x78f06:
-	writetext UnknownText_0x7a09a
+AideScript_ExplainBalls:
+	writetext AideText_ExplainBalls
 	closetext
 	loadmovesprites
 	end
 
-UnknownScript_0x78f0c:
-	writetext UnknownText_0x79c65
+AideScript_AfterTheft:
+	writetext AideText_AfterTheft
 	closetext
 	loadmovesprites
 	end
 
-UnknownScript_0x78f12:
-	applymovement $0, MovementData_0x78f72
+MeetCopScript2:
+	applymovement $0, MeetCopScript2_StepLeft
 
 MeetCopScript:
-	applymovement $0, MovementData_0x78f74
+	applymovement $0, MeetCopScript_WalkUp
 CopScript:
 	spriteface $7, LEFT
 	loadfont
-	writetext UnknownText_0x7a0f0
+	writetext ElmsLabOfficerText1
 	keeptextopen
 	special SpecialNameRival
-	writetext UnknownText_0x7a1c0
+	writetext ElmsLabOfficerText2
 	closetext
 	loadmovesprites
-	applymovement $7, MovementData_0x78f78
+	applymovement $7, OfficerLeavesMovement
 	disappear $7
 	dotrigger $2
 	end
@@ -607,7 +607,7 @@ ElmsLabTrashcan2:
 ElmsLabBookshelf:
 	jumpstd difficultbookshelf
 
-MovementData_0x78f67:
+ElmsLab_WalkUpToElmMovement:
 	step_up
 	step_up
 	step_up
@@ -622,17 +622,17 @@ MovementData_0x78f70:
 	step_up
 	step_end
 
-MovementData_0x78f72:
+MeetCopScript2_StepLeft:
 	step_left
 	step_end
 
-MovementData_0x78f74:
+MeetCopScript_WalkUp:
 	step_up
 	step_up
 	turn_head_right
 	step_end
 
-MovementData_0x78f78:
+OfficerLeavesMovement:
 	step_down
 	step_down
 	step_down
@@ -640,61 +640,61 @@ MovementData_0x78f78:
 	step_down
 	step_end
 
-MovementData_0x78f7e:
+AideWalksRight1:
 	step_right
 	step_right
 	turn_head_up
 	step_end
 
-MovementData_0x78f82:
+AideWalksRight2:
 	step_right
 	step_right
 	step_right
 	turn_head_up
 	step_end
 
-MovementData_0x78f87:
+AideWalksLeft1:
 	step_left
 	step_left
 	turn_head_down
 	step_end
 
-MovementData_0x78f8b:
+AideWalksLeft2:
 	step_left
 	step_left
 	step_left
 	turn_head_down
 	step_end
 
-MovementData_0x78f90:
+ElmJumpUpMovement:
 	fix_facing
 	big_step_up
 	remove_fixed_facing
 	step_end
 
-MovementData_0x78f94:
+ElmJumpDownMovement:
 	fix_facing
 	big_step_down
 	remove_fixed_facing
 	step_end
 
-MovementData_0x78f98:
+ElmJumpLeftMovement:
 	fix_facing
 	big_step_left
 	remove_fixed_facing
 	step_end
 
-MovementData_0x78f9c:
+ElmJumpRightMovement:
 	fix_facing
 	big_step_right
 	remove_fixed_facing
 	step_end
 
-MovementData_0x78fa0:
+ElmsLab_ElmToDefaultPositionMovement1:
 	step_up
 	step_end
 
-MovementData_0x78fa2:
+ElmsLab_ElmToDefaultPositionMovement2:
 	step_right
 	step_right
 	step_up
@@ -722,7 +722,7 @@ AfterChikoritaMovement:
 	turn_head_up
 	step_end
 
-UnknownText_0x78fb6:
+ElmText_Intro:
 	text "ELM: <PLAY_G>!"
 	line "There you are!"
 
@@ -761,19 +761,19 @@ UnknownText_0x78fb6:
 	line "caught."
 	done
 
-UnknownText_0x790fa:
+ElmText_Accepted:
 	text "Thanks, <PLAY_G>!"
 
 	para "You're a great"
 	line "help!"
 	done
 
-UnknownText_0x7911a:
+ElmText_Refused:
 	text "But… Please, I"
 	line "need your help!"
 	done
 
-UnknownText_0x7913a:
+ElmText_ResearchAmbitions:
 	text "When I announce my"
 	line "findings, I'm sure"
 
@@ -787,7 +787,7 @@ UnknownText_0x7913a:
 	line "it!"
 	done
 
-UnknownText_0x791ae:
+ElmText_GotAnEmail:
 	text "Oh, hey! I got an"
 	line "e-mail!"
 
@@ -797,7 +797,7 @@ UnknownText_0x791ae:
 	para "Okay…"
 	done
 
-UnknownText_0x791df:
+ElmText_MissionFromMrPokemon:
 	text "Hey, listen."
 
 	para "I have an acquain-"
@@ -830,7 +830,7 @@ UnknownText_0x791df:
 	line "go in our place?"
 	done
 
-UnknownText_0x792ff:
+ElmText_ChooseAPokemon:
 	text "I want you to"
 	line "raise one of the"
 
@@ -844,7 +844,7 @@ UnknownText_0x792ff:
 	para "Go on. Pick one!"
 	done
 
-UnknownText_0x79375:
+ElmText_LetYourMonBattleIt:
 	text "If a wild #MON"
 	line "appears, let your"
 	cont "#MON battle it!"
@@ -1125,13 +1125,13 @@ ElmGiveEverstoneText2:
 	cont "to evolve."
 	done
 
-UnknownText_0x79c37:
+ElmText_CallYou:
 	text "ELM: <PLAY_G>, I'll"
 	line "call you if any-"
 	cont "thing comes up."
 	done
 
-UnknownText_0x79c65:
+AideText_AfterTheft:
 	text "…sigh… That"
 	line "stolen #MON."
 
@@ -1208,25 +1208,25 @@ ElmGiveTicketText2:
 	line "PROF.OAK in KANTO!"
 	done
 
-UnknownText_0x79f0b:
+ElmsLabSignpostText_Egg:
 	text "It's the #MON"
 	line "EGG being studied"
 	cont "by PROF.ELM."
 	done
 
-UnknownText_0x79f38:
+AideText_GiveYouPotions:
 	text "<PLAY_G>, I want"
 	line "you to have this"
 	cont "for your errand."
 	done
 
-UnknownText_0x79f65:
+AideText_AlwaysBusy:
 	text "There are only two"
 	line "of us, so we're"
 	cont "always busy."
 	done
 
-UnknownText_0x79f95:
+AideText_TheftTestimony:
 	text "There was a loud"
 	line "noise outside…"
 
@@ -1251,14 +1251,14 @@ UnknownText_0x79f95:
 	line "itself."
 	done
 
-UnknownText_0x7a078:
+AideText_GiveYouBalls:
 	text "<PLAY_G>!"
 
 	para "Use these on your"
 	line "#DEX quest!"
 	done
 
-UnknownText_0x7a09a:
+AideText_ExplainBalls:
 	text "To add to your"
 	line "#DEX, you have"
 	cont "to catch #MON."
@@ -1268,7 +1268,7 @@ UnknownText_0x7a09a:
 	cont "to get them."
 	done
 
-UnknownText_0x7a0f0:
+ElmsLabOfficerText1:
 	text "I heard a #MON"
 	line "was stolen here…"
 
@@ -1289,7 +1289,7 @@ UnknownText_0x7a0f0:
 	line "get his name?"
 	done
 
-UnknownText_0x7a1c0:
+ElmsLabOfficerText2:
 	text "OK! So <RIVAL>"
 	line "was his name."
 
@@ -1381,11 +1381,11 @@ ElmsLab_MapEventHeader:
 	xy_trigger 1, $6, $4, $0, LabTryToLeaveScript, $0, $0
 	xy_trigger 1, $6, $5, $0, LabTryToLeaveScript, $0, $0
 	xy_trigger 3, $5, $4, $0, MeetCopScript, $0, $0
-	xy_trigger 3, $5, $5, $0, UnknownScript_0x78f12, $0, $0
-	xy_trigger 5, $8, $4, $0, UnknownScript_0x78e7f, $0, $0
-	xy_trigger 5, $8, $5, $0, UnknownScript_0x78e8e, $0, $0
-	xy_trigger 6, $8, $4, $0, UnknownScript_0x78ead, $0, $0
-	xy_trigger 6, $8, $5, $0, UnknownScript_0x78ebc, $0, $0
+	xy_trigger 3, $5, $5, $0, MeetCopScript2, $0, $0
+	xy_trigger 5, $8, $4, $0, AideScript_WalkPotions1, $0, $0
+	xy_trigger 5, $8, $5, $0, AideScript_WalkPotions2, $0, $0
+	xy_trigger 6, $8, $4, $0, AideScript_WalkBalls1, $0, $0
+	xy_trigger 6, $8, $5, $0, AideScript_WalkBalls2, $0, $0
 
 	; signposts
 	db 16
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index 5e9eb09d9..562917910 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -45,7 +45,7 @@ TwinScript_0x75ebb:
 	spriteface $4, UP
 	special Function8c0ab
 	spriteface $3, DOWN
-	showemote $0, $3, 15
+	showemote EMOTE_SHOCK, $3, 15
 	applymovement $4, MovementData_0x7600c
 	spriteface $3, RIGHT
 	checkflag ENGINE_PLAYER_IS_FEMALE
diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm
index 5c3b58a4a..08c1d8fda 100644
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -129,7 +129,7 @@ FastShipBed:
 	loadmovesprites
 	special Function8c0b6
 	special Functiond91
-	special Function1060a2
+	special Mobile_HealParty
 	special HealParty
 	playmusic MUSIC_HEAL
 	pause 60
diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
index a551e86ad..fde98406a 100644
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -60,7 +60,7 @@ ReceptionistScript_0x560ce:
 	if_not_equal SUNDAY, UnknownScript_0x56112
 	checkflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT
 	iftrue UnknownScript_0x56112
-	special Function718d
+	special GetFirstPokemonHappiness
 	writetext UnknownText_0x56143
 	keeptextopen
 	if_greater_than $95, UnknownScript_0x560ee
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index 6195a7c5f..462e899c2 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -114,7 +114,7 @@ LassCarrieScript:
 	end
 
 WhitneyCriesScript:
-	showemote $0, $4, 15
+	showemote EMOTE_SHOCK, $4, 15
 	applymovement $4, BridgetWalksUpMovement
 	spriteface $0, DOWN
 	loadfont
diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm
index 4a8b442bb..492345d55 100644
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -8,7 +8,7 @@ GoldenrodHappinessRater_MapScriptHeader:
 TeacherScript_0x54953:
 	faceplayer
 	loadfont
-	special Function718d
+	special GetFirstPokemonHappiness
 	writetext UnknownText_0x549a3
 	keeptextopen
 	if_greater_than $f9, UnknownScript_0x54973
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index 6050cef09..a50361a17 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -3,50 +3,50 @@ HallOfFame_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw UnknownScript_0x18144f, $0000
-	dw UnknownScript_0x181453, $0000
+	dw .Trigger1, $0000
+	dw .Trigger2, $0000
 
 	; callback count
 	db 0
 
-UnknownScript_0x18144f:
-	priorityjump UnknownScript_0x181454
+.Trigger1:
+	priorityjump HallOfFameScript
 	end
 
-UnknownScript_0x181453:
+.Trigger2:
 	end
 
-UnknownScript_0x181454:
+HallOfFameScript:
 	follow $2, $0
-	applymovement $2, MovementData_0x181499
+	applymovement $2, HallOfFame_WalkUpWithLance
 	stopfollow
 	spriteface $0, RIGHT
 	loadfont
-	writetext UnknownText_0x1814a6
+	writetext HallOfFame_LanceText
 	closetext
 	loadmovesprites
 	spriteface $2, UP
-	applymovement $0, MovementData_0x1814a4
+	applymovement $0, HallOfFame_SlowlyApproachMachine
 	dotrigger $1
 	pause 15
-	writebyte $2
+	writebyte 2 ; Machine is in the Hall of Fame
 	special HealMachineAnim
 	setevent EVENT_BEAT_ELITE_FOUR
 	setevent EVENT_TELEPORT_GUY
 	setevent EVENT_RIVAL_SPROUT_TOWER
 	clearevent EVENT_RED_IN_MT_SILVER
-	setevent EVENT_737
-	clearevent EVENT_738
+	setevent EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
+	clearevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
 	domaptrigger GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F, $1
 	special HealParty
 	checkevent EVENT_GOT_SS_TICKET_FROM_ELM
-	iftrue UnknownScript_0x181497
+	iftrue HallOfFame_SkipPhoneCall
 	specialphonecall $5
-UnknownScript_0x181497:
+HallOfFame_SkipPhoneCall:
 	halloffame
 	end
 
-MovementData_0x181499:
+HallOfFame_WalkUpWithLance:
 	step_up
 	step_up
 	step_up
@@ -59,11 +59,11 @@ MovementData_0x181499:
 	turn_head_left
 	step_end
 
-MovementData_0x1814a4:
+HallOfFame_SlowlyApproachMachine:
 	slow_step_up
 	step_end
 
-UnknownText_0x1814a6:
+HallOfFame_LanceText:
 	text "LANCE: It's been a"
 	line "long time since I"
 	cont "last came here."
@@ -126,4 +126,4 @@ HallOfFame_MapEventHeader:
 
 	; people-events
 	db 1
-	person_event SPRITE_LANCE, 16, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, -1
+	person_event SPRITE_LANCE, 16, 8, UP << 2 | $3, $0, -1, -1, PAL_OW_RED << 4 | $0, 0, ObjectEvent, -1
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index 79d8f55b8..409291535 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -467,7 +467,7 @@ UnknownScript_0x6ee42:
 	closetext
 	loadmovesprites
 	pause 20
-	showemote $0, $0, 20
+	showemote EMOTE_SHOCK, $0, 20
 	special Functionc48f
 	applymovement $0, MovementData_0x6ef58
 	pause 30
diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm
index 03013b174..f1ff2f719 100644
--- a/maps/IndigoPlateauPokeCenter1F.asm
+++ b/maps/IndigoPlateauPokeCenter1F.asm
@@ -54,7 +54,7 @@ UnknownScript_0x180053:
 	moveperson $5, $11, $9
 	appear $5
 	spriteface $0, DOWN
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	special Functionc48f
 	pause 15
 	applymovement $5, MovementData_0x180164
@@ -75,7 +75,7 @@ UnknownScript_0x180094:
 	if_equal SATURDAY, UnknownScript_0x18012b
 	appear $5
 	spriteface $0, DOWN
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	special Functionc48f
 	pause 15
 	applymovement $5, MovementData_0x18016b
diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm
index eb0e121fb..31ee9737b 100644
--- a/maps/KrissHouse1F.asm
+++ b/maps/KrissHouse1F.asm
@@ -20,7 +20,7 @@ UnknownScript_0x7a4d8:
 
 UnknownScript_0x7a4db:
 	playmusic MUSIC_MOM
-	showemote $0, $2, 15
+	showemote EMOTE_SHOCK, $2, 15
 	spriteface $0, LEFT
 	checkevent EVENT_000
 	iffalse UnknownScript_0x7a4f2
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index 43479f6e4..3f5ca6fba 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -295,7 +295,7 @@ UnknownScript_0x18e378:
 	clearevent EVENT_GAVE_GS_BALL_TO_KURT
 	special Functionc48f
 	pause 20
-	showemote $0, $2, 30
+	showemote EMOTE_SHOCK, $2, 30
 	checkcode VAR_FACING
 	if_equal $1, UnknownScript_0x18e3a2
 	spriteface $0, DOWN
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index b489a60d4..ce2043ea0 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -75,7 +75,7 @@ LanceScript_0x180e7b:
 	setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
 	musicfadeout MUSIC_BEAUTY_ENCOUNTER, $10
 	pause 30
-	showemote $0, $2, 15
+	showemote EMOTE_SHOCK, $2, 15
 	spriteface $2, DOWN
 	pause 10
 	spriteface $0, DOWN
@@ -119,7 +119,7 @@ LanceScript_0x180e7b:
 	playsound SFX_EXIT_BUILDING
 	disappear $0
 	applymovement $3, MovementData_0x180f57
-	showemote $0, $3, 15
+	showemote EMOTE_SHOCK, $3, 15
 	loadfont
 	writetext UnknownText_0x1813c5
 	pause 30
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index e74d77437..9a186ad19 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -85,7 +85,7 @@ UnknownScript_0x6c38f:
 	loadfont
 	writetext UnknownText_0x6c59e
 	closetext
-	showemote $0, $2, 10
+	showemote EMOTE_SHOCK, $2, 10
 	playsound SFX_UNKNOWN_2A
 	changeblock $6, $2, $1e
 	reloadmappart
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index f3d9f7457..9f271af91 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -23,7 +23,7 @@ MahoganyTown_MapScriptHeader:
 	return
 
 UnknownScript_0x190013:
-	showemote $0, $2, 15
+	showemote EMOTE_SHOCK, $2, 15
 	applymovement $2, MovementData_0x1900a9
 	follow $0, $2
 	applymovement $0, MovementData_0x1900a7
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index b0ef957be..bace21c16 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -43,7 +43,7 @@ UnknownScript_0x1935f4:
 	special RestartMapMusic
 	refreshscreen $0
 UnknownScript_0x19360d:
-	special Function1060a2
+	special Mobile_HealParty
 	special HealParty
 	special Function10383c
 	iftrue UnknownScript_0x193624
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 4e1701e17..e2be9902a 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -18,7 +18,7 @@ UnknownScript_0x7408d:
 
 UnknownScript_0x7408e:
 	spriteface $0, RIGHT
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	special Functionc48f
 	pause 15
 	applymovement $2, MovementData_0x740f9
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index cd424a320..64c49f749 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -59,7 +59,7 @@ UnknownScript_0x7709a:
 	stopfollow
 	spriteface $2, DOWN
 	pause 10
-	showemote $0, $2, 15
+	showemote EMOTE_SHOCK, $2, 15
 	spriteface $2, DOWN
 	cry CLEFAIRY
 	pause 15
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index f8a758907..779783a5c 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -17,7 +17,7 @@ UnknownScript_0x196e55:
 	end
 
 UnknownScript_0x196e56:
-	showemote $0, $2, 15
+	showemote EMOTE_SHOCK, $2, 15
 	spriteface $2, DOWN
 	loadfont
 	writetext UnknownText_0x196f66
@@ -111,7 +111,7 @@ UnknownScript_0x196ec9:
 	special Function8c0b6
 	special Functiond91
 	playmusic MUSIC_HEAL
-	special Function1060a2
+	special Mobile_HealParty
 	special HealParty
 	pause 60
 	special Function8c0ab
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index a6b03a426..932bd1a3f 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -24,7 +24,7 @@ OlivineCity_MapScriptHeader:
 
 UnknownScript_0x1a8833:
 	spriteface $0, LEFT
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	special Functionc48f
 	pause 15
 	playsound SFX_ENTER_DOOR
@@ -48,7 +48,7 @@ UnknownScript_0x1a8833:
 
 UnknownScript_0x1a886b:
 	spriteface $0, LEFT
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	special Functionc48f
 	pause 15
 	playsound SFX_ENTER_DOOR
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index aac3ba7c4..ea0edc48e 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -399,9 +399,9 @@ OlivinePort_MapEventHeader:
 	; people-events
 	db 7
 	person_event SPRITE_SAILOR, 27, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x748c0, EVENT_72A
-	person_event SPRITE_SAILOR, 19, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x749fe, EVENT_737
-	person_event SPRITE_SAILOR, 19, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x7499c, EVENT_738
-	person_event SPRITE_FISHING_GURU, 18, 8, $7, $0, 255, 255, $0, 0, FishingGuruScript_0x74a01, EVENT_737
-	person_event SPRITE_FISHING_GURU, 18, 17, $7, $0, 255, 255, $0, 0, FishingGuruScript_0x74a0c, EVENT_737
-	person_event SPRITE_YOUNGSTER, 19, 8, $6, $0, 255, 255, $0, 0, YoungsterScript_0x74a17, EVENT_738
-	person_event SPRITE_COOLTRAINER_F, 19, 15, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x74a22, EVENT_738
+	person_event SPRITE_SAILOR, 19, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x749fe, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
+	person_event SPRITE_SAILOR, 19, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
+	person_event SPRITE_FISHING_GURU, 18, 8, $7, $0, 255, 255, $0, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
+	person_event SPRITE_FISHING_GURU, 18, 17, $7, $0, 255, 255, $0, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
+	person_event SPRITE_YOUNGSTER, 19, 8, $6, $0, 255, 255, $0, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
+	person_event SPRITE_COOLTRAINER_F, 19, 15, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x74a22, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm
index 60f7310b0..59a9acf8f 100644
--- a/maps/PokeCenter2F.asm
+++ b/maps/PokeCenter2F.asm
@@ -440,7 +440,7 @@ UnknownScript_0x192b12:
 	writetext UnknownText_0x19329a
 	closetext
 	loadmovesprites
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	applymovement $0, MovementData_0x192ce5
 	end
 
@@ -549,7 +549,7 @@ UnknownScript_0x192c20:
 	writetext UnknownText_0x19329a
 	closetext
 	loadmovesprites
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	applymovement $0, MovementData_0x192d2d
 	end
 
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index 0ee68c71d..b534b7fb3 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -17,7 +17,7 @@ UnknownScript_0x188dc4:
 
 UnknownScript_0x188dc5:
 	playsound SFX_CALL
-	showemote $0, $2, 15
+	showemote EMOTE_SHOCK, $2, 15
 	waitbutton
 	pause 30
 	applymovement $2, MovementData_0x188ed5
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index f0933aae1..1942202d0 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -320,7 +320,7 @@ UnknownScript_0x5d8a4:
 	pause 15
 	checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
 	iftrue UnknownScript_0x5d8cc
-	showemote $0, $b, 15
+	showemote EMOTE_SHOCK, $b, 15
 	setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
 	setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
 	loadfont
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index 1811692a5..e4a130ef0 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -21,7 +21,7 @@ UnknownScript_0x60010:
 
 UnknownScript_0x60011:
 	spriteface $2, UP
-	showemote $0, $2, 15
+	showemote EMOTE_SHOCK, $2, 15
 	loadfont
 	writetext UnknownText_0x60128
 	closetext
diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm
index 98ba1ccf5..2b62fee86 100644
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -20,7 +20,7 @@ UnknownScript_0x733ed:
 	end
 
 UnknownScript_0x733f3:
-	showemote $0, $2, 15
+	showemote EMOTE_SHOCK, $2, 15
 	spriteface $0, UP
 	loadfont
 	writetext UnknownText_0x73496
diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm
index 1a89d8951..46daed8b1 100644
--- a/maps/Route1718Gate.asm
+++ b/maps/Route1718Gate.asm
@@ -20,7 +20,7 @@ UnknownScript_0x73611:
 	end
 
 UnknownScript_0x73617:
-	showemote $0, $2, 15
+	showemote EMOTE_SHOCK, $2, 15
 	spriteface $0, UP
 	loadfont
 	writetext UnknownText_0x7364d
diff --git a/maps/Route25.asm b/maps/Route25.asm
index 662dbb7e0..f5867764c 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -18,7 +18,7 @@ UnknownScript_0x19ee9f:
 UnknownScript_0x19eea0:
 	showemote $4, $2, 15
 	pause 30
-	showemote $0, $3, 10
+	showemote EMOTE_SHOCK, $3, 10
 	spriteface $2, DOWN
 	applymovement $3, MovementData_0x19efe8
 	disappear $3
@@ -44,7 +44,7 @@ UnknownScript_0x19eea0:
 UnknownScript_0x19eee0:
 	showemote $4, $2, 15
 	pause 30
-	showemote $0, $3, 10
+	showemote EMOTE_SHOCK, $3, 10
 	spriteface $2, DOWN
 	applymovement $3, MovementData_0x19efea
 	disappear $3
diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm
index ac31d6055..62814fd28 100644
--- a/maps/Route26HealSpeechHouse.asm
+++ b/maps/Route26HealSpeechHouse.asm
@@ -13,7 +13,7 @@ TeacherScript_0x7b125:
 	loadmovesprites
 	special Function8c0b6
 	special Functiond91
-	special Function1060a2
+	special Mobile_HealParty
 	playmusic MUSIC_HEAL
 	special HealParty
 	pause 60
diff --git a/maps/Route27.asm b/maps/Route27.asm
index 7ccdb3625..a1302d70c 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -17,13 +17,13 @@ UnknownScript_0x1a0872:
 
 UnknownScript_0x1a0873:
 	spriteface $a, LEFT
-	showemote $0, $a, 15
+	showemote EMOTE_SHOCK, $a, 15
 	applymovement $a, MovementData_0x1a0a66
 	jump UnknownScript_0x1a088c
 
 UnknownScript_0x1a0881:
 	spriteface $a, LEFT
-	showemote $0, $a, 15
+	showemote EMOTE_SHOCK, $a, 15
 	applymovement $a, MovementData_0x1a0a69
 UnknownScript_0x1a088c:
 	spriteface $0, RIGHT
diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm
index 6e2bec168..a6994be7a 100644
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -10,7 +10,7 @@ SandstormHouseWoman:
 	loadfont
 	checkevent EVENT_GOT_TM37_SANDSTORM
 	iftrue .AlreadyGotItem
-	special Function718d
+	special GetFirstPokemonHappiness
 	writetext SandstormHouseWomanText1
 	keeptextopen
 	if_greater_than $95, .Loyal
diff --git a/maps/Route29.asm b/maps/Route29.asm
index 2b5879136..984dce1f6 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -35,7 +35,7 @@ TuscanyCallback:
 
 UnknownScript_0x1a0f6d:
 	spriteface $2, UP
-	showemote $0, $2, 15
+	showemote EMOTE_SHOCK, $2, 15
 	applymovement $2, MovementData_0x1a108d
 	spriteface $0, LEFT
 	setevent EVENT_DUDE_TALKED_TO_YOU
@@ -60,7 +60,7 @@ UnknownScript_0x1a0f6d:
 
 UnknownScript_0x1a0fa3:
 	spriteface $2, UP
-	showemote $0, $2, 15
+	showemote EMOTE_SHOCK, $2, 15
 	applymovement $2, MovementData_0x1a1094
 	spriteface $0, LEFT
 	setevent EVENT_DUDE_TALKED_TO_YOU
diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
index 51e160e08..29fba0540 100644
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -24,7 +24,7 @@ UnknownScript_0x62d38:
 UnknownScript_0x62d3d:
 	checkevent EVENT_FOREST_IS_RESTLESS
 	iffalse UnknownScript_0x62d62
-	showemote $0, $5, 20
+	showemote EMOTE_SHOCK, $5, 20
 	spriteface $5, LEFT
 	spriteface $0, RIGHT
 	follow $0, $5
diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm
index 0f454c405..dc1f0c437 100644
--- a/maps/Route35NationalParkgate.asm
+++ b/maps/Route35NationalParkgate.asm
@@ -88,7 +88,7 @@ OfficerScript_0x6a204:
 	if_equal FRIDAY, UnknownScript_0x6a2c7
 	faceplayer
 	loadfont
-	checkflag ENGINE_51
+	checkflag ENGINE_DAILY_BUG_CONTEST
 	iftrue UnknownScript_0x6a2c1
 	scall UnknownScript_0x6a2de
 	writetext UnknownText_0x6a2eb
@@ -97,7 +97,7 @@ OfficerScript_0x6a204:
 	checkcode VAR_PARTYCOUNT
 	if_greater_than $1, UnknownScript_0x6a271
 	special Function13a12
-	clearevent EVENT_308
+	clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
 UnknownScript_0x6a234:
 	setflag ENGINE_BUG_CONTEST_TIMER
 	special PlayMapMusic
@@ -142,7 +142,7 @@ UnknownScript_0x6a27d: ; 6a27d
 	iffalse UnknownScript_0x6a2a9
 	special Function13a12
 	iftrue UnknownScript_0x6a2af
-	setevent EVENT_308
+	setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
 	writetext UnknownText_0x6a537
 	keeptextopen
 	writetext UnknownText_0x6a56b
@@ -193,7 +193,7 @@ UnknownScript_0x6a2c7:
 OfficerScript_0x6a2ca:
 	faceplayer
 	loadfont
-	checkflag ENGINE_51
+	checkflag ENGINE_DAILY_BUG_CONTEST
 	iftrue UnknownScript_0x6a2c1
 	writetext UnknownText_0x6a894
 	closetext
diff --git a/maps/Route36.asm b/maps/Route36.asm
index f63cad50a..3a5c1f0d3 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -30,7 +30,7 @@ ArthurCallback:
 	return
 
 UnknownScript_0x19401b:
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	pause 15
 	playsound SFX_WARP_FROM
 	spriteface $0, UP
diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm
index d7fe698a7..145f4067f 100644
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -129,7 +129,7 @@ UnknownScript_0x6abd4:
 	iftrue UnknownScript_0x6abdc
 	appear $c
 UnknownScript_0x6abdc:
-	special Function1ad2
+	special DrawOnMap
 	end
 
 OfficerScript_0x6abe0:
@@ -140,7 +140,7 @@ OfficerScript_0x6abe0:
 	if_equal FRIDAY, UnknownScript_0x6acf1
 	faceplayer
 	loadfont
-	checkflag ENGINE_51
+	checkflag ENGINE_DAILY_BUG_CONTEST
 	iftrue UnknownScript_0x6ac91
 	scall UnknownScript_0x6ad02
 	writetext UnknownText_0x6add5
@@ -149,7 +149,7 @@ OfficerScript_0x6abe0:
 	checkcode VAR_PARTYCOUNT
 	if_greater_than $1, UnknownScript_0x6ac41
 	special Function13a12
-	clearevent EVENT_308
+	clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
 UnknownScript_0x6ac10:
 	setflag ENGINE_BUG_CONTEST_TIMER
 	special PlayMapMusic
@@ -185,7 +185,7 @@ UnknownScript_0x6ac4d:
 	iffalse UnknownScript_0x6ac79
 	special Function13a12
 	iftrue UnknownScript_0x6ac7f
-	setevent EVENT_308
+	setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
 	writetext UnknownText_0x6b021
 	keeptextopen
 	writetext UnknownText_0x6b055
@@ -225,13 +225,13 @@ UnknownScript_0x6ac8b:
 	end
 
 UnknownScript_0x6ac91:
-	checkevent EVENT_313
+	checkevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
 	iftrue UnknownScript_0x6acaf
-	checkevent EVENT_314
+	checkevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
 	iftrue UnknownScript_0x6acbe
-	checkevent EVENT_315
+	checkevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
 	iftrue UnknownScript_0x6accd
-	checkevent EVENT_316
+	checkevent EVENT_CONTEST_OFFICER_HAS_BERRY
 	iftrue UnknownScript_0x6acdc
 	writetext UnknownText_0x6b32b
 	closetext
@@ -243,7 +243,7 @@ UnknownScript_0x6acaf:
 	keeptextopen
 	verbosegiveitem SUN_STONE, 1
 	iffalse UnknownScript_0x6aceb
-	clearevent EVENT_313
+	clearevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
 	loadmovesprites
 	end
 
@@ -252,7 +252,7 @@ UnknownScript_0x6acbe:
 	keeptextopen
 	verbosegiveitem EVERSTONE, 1
 	iffalse UnknownScript_0x6aceb
-	clearevent EVENT_314
+	clearevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
 	loadmovesprites
 	end
 
@@ -261,7 +261,7 @@ UnknownScript_0x6accd:
 	keeptextopen
 	verbosegiveitem GOLD_BERRY, 1
 	iffalse UnknownScript_0x6aceb
-	clearevent EVENT_315
+	clearevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
 	loadmovesprites
 	end
 
@@ -270,7 +270,7 @@ UnknownScript_0x6acdc:
 	keeptextopen
 	verbosegiveitem BERRY, 1
 	iffalse UnknownScript_0x6aceb
-	clearevent EVENT_316
+	clearevent EVENT_CONTEST_OFFICER_HAS_BERRY
 	loadmovesprites
 	end
 
@@ -286,7 +286,7 @@ UnknownScript_0x6acf1:
 OfficerScript_0x6acf4:
 	faceplayer
 	loadfont
-	checkflag ENGINE_51
+	checkflag ENGINE_DAILY_BUG_CONTEST
 	iftrue UnknownScript_0x6ac91
 	writetext UnknownText_0x6b370
 	closetext
diff --git a/maps/Route42.asm b/maps/Route42.asm
index 0e8aa15b5..3c6cf7528 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -16,7 +16,7 @@ UnknownScript_0x1a9217:
 	end
 
 UnknownScript_0x1a9218:
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	pause 15
 	playsound SFX_WARP_FROM
 	applymovement $a, MovementData_0x1a9356
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index 9067119ce..61eda0bad 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -40,10 +40,10 @@ UnknownScript_0x19abda:
 
 UnknownScript_0x19abea:
 	applymovement $0, MovementData_0x19aca2
-	showemote $0, $4, 15
+	showemote EMOTE_SHOCK, $4, 15
 	applymovement $4, MovementData_0x19acbb
 	spriteface $3, UP
-	showemote $0, $3, 15
+	showemote EMOTE_SHOCK, $3, 15
 	applymovement $3, MovementData_0x19aca4
 	loadfont
 	writetext UnknownText_0x19acd2
@@ -72,10 +72,10 @@ UnknownScript_0x19ac28:
 	end
 
 UnknownScript_0x19ac38:
-	showemote $0, $3, 15
+	showemote EMOTE_SHOCK, $3, 15
 	applymovement $3, MovementData_0x19acaf
 	spriteface $4, DOWN
-	showemote $0, $4, 15
+	showemote EMOTE_SHOCK, $4, 15
 	applymovement $4, MovementData_0x19acc7
 	loadfont
 	writetext UnknownText_0x19acd2
diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm
index d9fd82bd4..102f9540d 100644
--- a/maps/RuinsofAlphAerodactylChamber.asm
+++ b/maps/RuinsofAlphAerodactylChamber.asm
@@ -42,7 +42,7 @@ UnknownScript_0x58dca:
 UnknownScript_0x58dd3:
 	pause 30
 	earthquake 30
-	showemote $0, $0, 20
+	showemote EMOTE_SHOCK, $0, 20
 	pause 30
 	playsound SFX_STRENGTH
 	changeblock $4, $0, $30
@@ -66,7 +66,7 @@ UnknownScript_0x58df7:
 	setflag ENGINE_UNLOCKED_UNOWNS_3
 	domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1
 	earthquake 30
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	changeblock $2, $2, $18
 	changeblock $4, $2, $19
 	reloadmappart
diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm
index ec375ecb6..9ab9517be 100644
--- a/maps/RuinsofAlphHoOhChamber.asm
+++ b/maps/RuinsofAlphHoOhChamber.asm
@@ -43,7 +43,7 @@ UnknownScript_0x5858d:
 UnknownScript_0x58596:
 	pause 30
 	earthquake 30
-	showemote $0, $0, 20
+	showemote EMOTE_SHOCK, $0, 20
 	pause 30
 	playsound SFX_STRENGTH
 	changeblock $4, $0, $30
@@ -67,7 +67,7 @@ UnknownScript_0x585ba:
 	setflag ENGINE_UNLOCKED_UNOWNS_4
 	domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1
 	earthquake 30
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	changeblock $2, $2, $18
 	changeblock $4, $2, $19
 	reloadmappart
diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm
index 0c46a3b21..808ba0a4a 100644
--- a/maps/RuinsofAlphKabutoChamber.asm
+++ b/maps/RuinsofAlphKabutoChamber.asm
@@ -44,7 +44,7 @@ UnknownScript_0x58748:
 UnknownScript_0x58751:
 	pause 30
 	earthquake 30
-	showemote $0, $0, 20
+	showemote EMOTE_SHOCK, $0, 20
 	pause 30
 	playsound SFX_STRENGTH
 	changeblock $4, $0, $30
@@ -72,7 +72,7 @@ UnknownScript_0x58778:
 	setevent EVENT_74E
 	domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1
 	earthquake 30
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	changeblock $2, $2, $18
 	changeblock $4, $2, $19
 	reloadmappart
diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm
index 8f5cae4d8..917c8e2eb 100644
--- a/maps/RuinsofAlphOmanyteChamber.asm
+++ b/maps/RuinsofAlphOmanyteChamber.asm
@@ -43,7 +43,7 @@ UnknownScript_0x58c09:
 UnknownScript_0x58c12:
 	pause 30
 	earthquake 30
-	showemote $0, $0, 20
+	showemote EMOTE_SHOCK, $0, 20
 	pause 30
 	playsound SFX_STRENGTH
 	changeblock $4, $0, $30
@@ -67,7 +67,7 @@ UnknownScript_0x58c36:
 	setflag ENGINE_UNLOCKED_UNOWNS_2
 	domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1
 	earthquake 30
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	changeblock $2, $2, $18
 	changeblock $4, $2, $19
 	reloadmappart
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index c7de575fd..05c6ec486 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -17,7 +17,7 @@ UnknownScript_0x184946:
 
 UnknownScript_0x184947:
 	spriteface $0, UP
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	special Functionc48f
 	playsound SFX_TACKLE
 	playsound SFX_ELEVATOR
@@ -32,7 +32,7 @@ UnknownScript_0x184947:
 	writetext UnknownText_0x184a27
 	closetext
 	loadmovesprites
-	showemote $0, $8, 15
+	showemote EMOTE_SHOCK, $8, 15
 	spriteface $8, DOWN
 	pause 15
 	applymovement $8, MovementData_0x184a24
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 21881ef03..e658be5d3 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -25,7 +25,7 @@ SecurityCamera1a:
 	scall PlaySecurityCameraSounds
 	checkevent EVENT_6DA
 	iftrue NoSecurityCamera
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveperson $2, $13, $2
 	appear $2
@@ -34,7 +34,7 @@ SecurityCamera1a:
 	scall TrainerCameraGrunt1
 	if_equal $1, NoSecurityCamera
 	scall PlaySecurityCameraSounds
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveperson $2, $13, $2
 	appear $2
@@ -50,7 +50,7 @@ SecurityCamera1b:
 	scall PlaySecurityCameraSounds
 	checkevent EVENT_6DA
 	iftrue NoSecurityCamera
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveperson $2, $13, $3
 	appear $2
@@ -59,7 +59,7 @@ SecurityCamera1b:
 	scall TrainerCameraGrunt1
 	if_equal $1, NoSecurityCamera
 	scall PlaySecurityCameraSounds
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveperson $2, $13, $3
 	appear $2
@@ -75,7 +75,7 @@ SecurityCamera2a:
 	scall PlaySecurityCameraSounds
 	checkevent EVENT_6DA
 	iftrue NoSecurityCamera
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveperson $2, $4, $7
 	appear $2
@@ -84,7 +84,7 @@ SecurityCamera2a:
 	scall TrainerCameraGrunt1
 	if_equal $1, NoSecurityCamera
 	scall PlaySecurityCameraSounds
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	spriteface $0, RIGHT
 	moveperson $2, $c, $5
@@ -101,7 +101,7 @@ SecurityCamera2b:
 	scall PlaySecurityCameraSounds
 	checkevent EVENT_6DA
 	iftrue NoSecurityCamera
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveperson $2, $4, $8
 	appear $2
@@ -110,7 +110,7 @@ SecurityCamera2b:
 	scall TrainerCameraGrunt1
 	if_equal $1, NoSecurityCamera
 	scall PlaySecurityCameraSounds
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	spriteface $0, RIGHT
 	moveperson $2, $c, $5
@@ -127,7 +127,7 @@ SecurityCamera3a:
 	scall PlaySecurityCameraSounds
 	checkevent EVENT_6DA
 	iftrue NoSecurityCamera
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveperson $2, $13, $6
 	appear $2
@@ -136,7 +136,7 @@ SecurityCamera3a:
 	scall TrainerCameraGrunt1
 	if_equal $1, NoSecurityCamera
 	scall PlaySecurityCameraSounds
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	spriteface $0, RIGHT
 	moveperson $2, $19, $b
@@ -153,7 +153,7 @@ SecurityCamera3b:
 	scall PlaySecurityCameraSounds
 	checkevent EVENT_6DA
 	iftrue NoSecurityCamera
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveperson $2, $13, $7
 	appear $2
@@ -162,7 +162,7 @@ SecurityCamera3b:
 	scall TrainerCameraGrunt1
 	if_equal $1, NoSecurityCamera
 	scall PlaySecurityCameraSounds
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	spriteface $0, RIGHT
 	moveperson $2, $19, $c
@@ -179,7 +179,7 @@ SecurityCamera4:
 	scall PlaySecurityCameraSounds
 	checkevent EVENT_6DA
 	iftrue NoSecurityCamera
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveperson $2, $11, $10
 	appear $2
@@ -188,7 +188,7 @@ SecurityCamera4:
 	scall TrainerCameraGrunt1
 	if_equal $1, NoSecurityCamera
 	scall PlaySecurityCameraSounds
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	spriteface $0, RIGHT
 	moveperson $2, $19, $b
@@ -205,7 +205,7 @@ SecurityCamera5:
 	scall PlaySecurityCameraSounds
 	checkevent EVENT_6DA
 	iftrue NoSecurityCamera
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveperson $2, $3, $10
 	appear $2
@@ -214,7 +214,7 @@ SecurityCamera5:
 	scall TrainerCameraGrunt1
 	if_equal $1, NoSecurityCamera
 	scall PlaySecurityCameraSounds
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	spriteface $0, RIGHT
 	moveperson $2, $e, $10
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 7b0b7bb39..7b503ecaf 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -53,7 +53,7 @@ UnknownScript_0x6cfac:
 	closetext
 	loadmovesprites
 	spriteface $0, DOWN
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	applymovement $0, MovementData_0x6d21f
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	applymovement $3, MovementData_0x6d224
@@ -156,7 +156,7 @@ UnknownScript_0x6d091:
 	closetext
 	loadmovesprites
 	special Function8c084
-	special Function1060a2
+	special Mobile_HealParty
 	playsound SFX_FULL_HEAL
 	special HealParty
 	special Function8c079
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 71b883128..4725368c0 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -54,7 +54,7 @@ LanceScript_0x6dffc:
 
 UnknownScript_0x6e019:
 	spriteface $0, LEFT
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	special Functionc48f
 	appear $a
 	applymovement $a, MovementData_0x6e164
@@ -83,7 +83,7 @@ UnknownScript_0x6e052:
 	applymovement $0, MovementData_0x6e13a
 UnknownScript_0x6e056:
 	pause 30
-	showemote $0, $3, 15
+	showemote EMOTE_SHOCK, $3, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	spriteface $3, DOWN
 	loadfont
diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm
index f5e8b439e..24d9c01e4 100644
--- a/maps/UndergroundPathSwitchRoomEntrances.asm
+++ b/maps/UndergroundPathSwitchRoomEntrances.asm
@@ -79,7 +79,7 @@ TeacherScript_0x7ca7d:
 
 UnknownScript_0x7ca80:
 	spriteface $0, RIGHT
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	special Functionc48f
 	pause 15
 	playsound SFX_EXIT_BUILDING
@@ -98,7 +98,7 @@ UnknownScript_0x7ca80:
 
 UnknownScript_0x7caaa:
 	spriteface $0, RIGHT
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	special Functionc48f
 	pause 15
 	playsound SFX_EXIT_BUILDING
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index c858b1192..103e511dc 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -18,7 +18,7 @@ UnknownScript_0x74491:
 UnknownScript_0x74492:
 	moveperson $2, $12, $b
 	spriteface $0, DOWN
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	special Functionc48f
 	pause 15
 	appear $2
@@ -32,7 +32,7 @@ UnknownScript_0x74492:
 
 UnknownScript_0x744b5:
 	spriteface $0, DOWN
-	showemote $0, $0, 15
+	showemote EMOTE_SHOCK, $0, 15
 	special Functionc48f
 	pause 15
 	appear $2
diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm
index e8dafe2d1..d23619947 100644
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -52,7 +52,7 @@ SageScript_0x985a0:
 UnknownScript_0x985a3:
 	spriteface $4, UP
 	spriteface $0, DOWN
-	showemote $0, $4, 20
+	showemote EMOTE_SHOCK, $4, 20
 	follow $0, $4
 	applymovement $0, MovementData_0x98622
 	stopfollow
@@ -140,7 +140,7 @@ SageKojiScript:
 	checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
 	iftrue UnknownScript_0x9861b
 	pause 10
-	showemote $0, $7, 20
+	showemote EMOTE_SHOCK, $7, 20
 	loadfont
 	writetext UnknownText_0x98c6c
 	keeptextopen
author	PikalaxALT <PikalaxALT@gmail.com>	2015-07-15 15:48:44 -0400
committer	PikalaxALT <PikalaxALT@gmail.com>	2015-07-15 15:48:44 -0400
commit	39524cdb766660a7bf6d60379040349652cecc04 (patch)
tree	e0657f37fbd8cbd7bf724025a4bb19e68e1e0254 /maps
parent	67e56102ef56e91e9563a32f6fc68827219d2037 (diff)