summaryrefslogtreecommitdiff
path: root/maps/Route6SaffronGate.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route6SaffronGate.asm')
-rw-r--r--maps/Route6SaffronGate.asm16
1 files changed, 7 insertions, 9 deletions
diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm
index 9e3275d97..25f234e82 100644
--- a/maps/Route6SaffronGate.asm
+++ b/maps/Route6SaffronGate.asm
@@ -2,16 +2,14 @@ const_value set 2
const ROUTE6SAFFRONGATE_OFFICER
Route6SaffronGate_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 1
-
- ; triggers
- dw UnknownScript_0x1926e9, 0
+ scene_script .DummyScene
.MapCallbacks:
db 0
-UnknownScript_0x1926e9:
+.DummyScene:
end
OfficerScript_0x1926ea:
@@ -70,12 +68,12 @@ Route6SaffronGate_MapEventHeader:
warp_def $7, $4, 2, ROUTE_6
warp_def $7, $5, 2, ROUTE_6
-.XYTriggers:
+.CoordEvents:
db 0
-.Signposts:
+.BGEvents:
db 0
-.PersonEvents:
+.ObjectEvents:
db 1
- person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x1926ea, -1
+ object_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1926ea, -1