summaryrefslogtreecommitdiff
path: root/maps/TrainerHouseB1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/TrainerHouseB1F.asm')
-rw-r--r--maps/TrainerHouseB1F.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index caae8972d..43d3bcd38 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -3,14 +3,14 @@ const_value set 2
const TRAINERHOUSEB1F_CHRIS
TrainerHouseB1F_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 1
- maptrigger .DummyTrigger
+ scene_script .DummyScene
.MapCallbacks:
db 0
-.DummyTrigger:
+.DummyScene:
end
TrainerHouseReceptionistScript:
@@ -177,14 +177,14 @@ TrainerHouseB1F_MapEventHeader:
db 1
warp_def $4, $9, 3, TRAINER_HOUSE_1F
-.XYTriggers:
+.CoordEvents:
db 1
- xy_trigger 0, $3, $7, TrainerHouseReceptionistScript
+ coord_event 0, $3, $7, TrainerHouseReceptionistScript
-.Signposts:
+.BGEvents:
db 0
-.PersonEvents:
+.ObjectEvents:
db 2
- person_event SPRITE_RECEPTIONIST, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1
- person_event SPRITE_CHRIS, 11, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1
+ object_event SPRITE_RECEPTIONIST, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
+ object_event SPRITE_CHRIS, 11, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1