1 files changed, 14 insertions, 20 deletions
diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsofAlphgate.asm
index 359f1f269..4854e7f8b 100644
--- a/maps/Route36RuinsofAlphgate.asm
+++ b/maps/Route36RuinsofAlphgate.asm
@@ -1,28 +1,24 @@
-Route36RuinsofAlphgate_MapScriptHeader: ; 0x6aa18
-	; trigger count
+Route36RuinsofAlphgate_MapScriptHeader:
+.MapTriggers:
 	db 0
 
-	; callback count
+.MapCallbacks:
 	db 0
-; 0x6aa1a
 
-OfficerScript_0x6aa1a: ; 0x6aa1a
+OfficerScript_0x6aa1a:
 	jumptextfaceplayer UnknownText_0x6aa20
-; 0x6aa1d
 
-GrampsScript_0x6aa1d: ; 0x6aa1d
+GrampsScript_0x6aa1d:
 	jumptextfaceplayer UnknownText_0x6aa5b
-; 0x6aa20
 
-UnknownText_0x6aa20: ; 0x6aa20
+UnknownText_0x6aa20:
 	text "Don't you wonder"
 	line "who'd make some-"
 	cont "thing like this?"
 	cont "And why?"
 	done
-; 0x6aa5b
 
-UnknownText_0x6aa5b: ; 0x6aa5b
+UnknownText_0x6aa5b:
 	text "Did you see that"
 	line "strange tree in"
 	cont "the road?"
@@ -33,27 +29,25 @@ UnknownText_0x6aa5b: ; 0x6aa5b
 	para "are visiting the"
 	line "RUINS OF ALPH."
 	done
-; 0x6aac9
 
-Route36RuinsofAlphgate_MapEventHeader: ; 0x6aac9
+Route36RuinsofAlphgate_MapEventHeader:
 	; filler
 	db 0, 0
 
-	; warps
+.Warps:
 	db 4
 	warp_def $0, $4, 3, GROUP_ROUTE_36, MAP_ROUTE_36
 	warp_def $0, $5, 4, GROUP_ROUTE_36, MAP_ROUTE_36
 	warp_def $7, $4, 9, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE
 	warp_def $7, $5, 9, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE
 
-	; xy triggers
+.XYTriggers:
 	db 0
 
-	; signposts
+.Signposts:
 	db 0
 
-	; people-events
+.PersonEvents:
 	db 2
-	person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x6aa1a, $ffff
-	person_event SPRITE_GRAMPS, 9, 11, $2, $21, 255, 255, $b0, 0, GrampsScript_0x6aa1d, $ffff
-; 0x6aafd
+	person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x6aa1a, -1
+	person_event SPRITE_GRAMPS, 9, 11, OW_DOWN | $2, $21, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x6aa1d, -1