summaryrefslogtreecommitdiff
path: root/maps/Route16Gate.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route16Gate.asm')
-rw-r--r--maps/Route16Gate.asm26
1 files changed, 12 insertions, 14 deletions
diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm
index e1ed8c714..3ce10b391 100644
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -2,20 +2,18 @@ const_value set 2
const ROUTE16GATE_OFFICER
Route16Gate_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 1
-
- ; triggers
- dw UnknownScript_0x733e9, 0
+ scene_script .DummyScene
.MapCallbacks:
db 0
-UnknownScript_0x733e9:
+.DummyScene:
end
-OfficerScript_0x733ea:
- jumptextfaceplayer UnknownText_0x73408
+Route16GateOfficerScript:
+ jumptextfaceplayer Route16GateOfficerText
UnknownScript_0x733ed:
checkitem BICYCLE
@@ -37,7 +35,7 @@ MovementData_0x73405:
turn_head LEFT
step_end
-UnknownText_0x73408:
+Route16GateOfficerText:
text "CYCLING ROAD"
line "starts here."
@@ -73,14 +71,14 @@ Route16Gate_MapEventHeader:
warp_def $4, $9, 2, ROUTE_16
warp_def $5, $9, 3, ROUTE_16
-.XYTriggers:
+.CoordEvents:
db 2
- xy_trigger 0, $4, $5, $0, UnknownScript_0x733ed, $0, $0
- xy_trigger 0, $5, $5, $0, UnknownScript_0x733ed, $0, $0
+ coord_event 0, $4, $5, UnknownScript_0x733ed
+ coord_event 0, $5, $5, UnknownScript_0x733ed
-.Signposts:
+.BGEvents:
db 0
-.PersonEvents:
+.ObjectEvents:
db 1
- person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x733ea, -1
+ object_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1