summaryrefslogtreecommitdiff
path: root/maps/Route1.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-24 13:46:34 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-24 14:33:17 -0500
commitc05b7f41dd5783315e9e4032b63ca84c6ed05893 (patch)
tree0c1995c8a928a297f842a75c2e009003534b3ec8 /maps/Route1.asm
parent20d6c1d876cde19061c458761c7283163e316d8a (diff)
Renaming: (fix #412)
- MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
Diffstat (limited to 'maps/Route1.asm')
-rw-r--r--maps/Route1.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/Route1.asm b/maps/Route1.asm
index d083b2708..0f898163c 100644
--- a/maps/Route1.asm
+++ b/maps/Route1.asm
@@ -4,7 +4,7 @@ const_value set 2
const ROUTE1_FRUIT_TREE
Route1_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 0
.MapCallbacks:
@@ -87,15 +87,15 @@ Route1_MapEventHeader:
.Warps:
db 0
-.XYTriggers:
+.CoordEvents:
db 0
-.Signposts:
+.BGEvents:
db 1
- signpost 27, 7, SIGNPOST_READ, Route1Sign
+ bg_event 27, 7, BGEVENT_READ, Route1Sign
-.PersonEvents:
+.ObjectEvents:
db 3
- person_event SPRITE_YOUNGSTER, 12, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1
- person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1
- person_event SPRITE_FRUIT_TREE, 7, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1
+ object_event SPRITE_YOUNGSTER, 12, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1
+ object_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1
+ object_event SPRITE_FRUIT_TREE, 7, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1