Merge branch 'master' of github.com:pret/pokecrystal

1 files changed, 22 insertions, 27 deletions

diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index c49c522fc..c64997e71 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -9,61 +9,56 @@ const_value set 2
 ElmsLab_MapScriptHeader:
 .MapTriggers:
 	db 6
-
-	; triggers
-	maptrigger .Trigger0
-	maptrigger .Trigger1
-	maptrigger .Trigger2
-	maptrigger .Trigger3
-	maptrigger .Trigger4
-	maptrigger .Trigger5
+	maptrigger .MeetElm
+	maptrigger .DummyTrigger1
+	maptrigger .DummyTrigger2
+	maptrigger .DummyTrigger3
+	maptrigger .DummyTrigger4
+	maptrigger .DummyTrigger5
 
 .MapCallbacks:
 	db 1
+	dbw MAPCALLBACK_OBJECTS, .MoveElmCallback
 
-	; callbacks
-
-	dbw MAPCALLBACK_OBJECTS, .Callback_MoveElm
-
-.Trigger0:
-	priorityjump ElmsLab_AutowalkUpToElm
+.MeetElm:
+	priorityjump .WalkUpToElm
 	end
 
-.Trigger1:
+.DummyTrigger1:
 	end
 
-.Trigger2:
+.DummyTrigger2:
 	end
 
-.Trigger3:
+.DummyTrigger3:
 	end
 
-.Trigger4:
+.DummyTrigger4:
 	end
 
-.Trigger5:
+.DummyTrigger5:
 	end
 
-.Callback_MoveElm:
+.MoveElmCallback:
 	checktriggers
 	iftrue .Skip
 	moveperson ELMSLAB_ELM, $3, $4
 .Skip:
 	return
 
-ElmsLab_AutowalkUpToElm:
+.WalkUpToElm:
 	applymovement PLAYER, ElmsLab_WalkUpToElmMovement
 	showemote EMOTE_SHOCK, ELMSLAB_ELM, 15
 	spriteface ELMSLAB_ELM, RIGHT
 	opentext
 	writetext ElmText_Intro
-ElmsLab_RefuseLoop:
+.MustSayYes:
 	yesorno
-	iftrue ElmsLab_ElmGetsEmail
+	iftrue .ElmGetsEmail
 	writetext ElmText_Refused
-	jump ElmsLab_RefuseLoop
+	jump .MustSayYes
 
-ElmsLab_ElmGetsEmail:
+.ElmGetsEmail:
 	writetext ElmText_Accepted
 	buttonsound
 	writetext ElmText_ResearchAmbitions
@@ -1417,8 +1412,8 @@ ElmsLab_MapEventHeader:
 .PersonEvents:
 	db 6
 	person_event SPRITE_ELM, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ProfElmScript, -1
-	person_event SPRITE_SCIENTIST, 9, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
+	person_event SPRITE_SCIENTIST, 9, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
 	person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
 	person_event SPRITE_POKE_BALL, 3, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
 	person_event SPRITE_POKE_BALL, 3, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
-	person_event SPRITE_OFFICER, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB
+	person_event SPRITE_OFFICER, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB