summaryrefslogtreecommitdiff
path: root/maps/Route20.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/Route20.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/Route20.asm')
-rw-r--r--maps/Route20.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/Route20.asm b/maps/Route20.asm
index c0a05f7a4..1bdac9b3c 100644
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -4,7 +4,7 @@ const_value set 2
const ROUTE20_SWIMMER_GUY
Route20_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 0
.MapCallbacks:
@@ -120,15 +120,15 @@ Route20_MapEventHeader:
db 1
warp_def $7, $26, 1, SEAFOAM_GYM
-.XYTriggers:
+.CoordEvents:
db 0
-.Signposts:
+.BGEvents:
db 1
- signpost 11, 37, SIGNPOST_READ, CinnabarGymSign
+ bg_event 11, 37, BGEVENT_READ, CinnabarGymSign
-.PersonEvents:
+.ObjectEvents:
db 3
- person_event SPRITE_SWIMMER_GIRL, 8, 52, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1
- person_event SPRITE_SWIMMER_GIRL, 13, 45, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfLori, -1
- person_event SPRITE_SWIMMER_GUY, 13, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermCameron, -1
+ object_event SPRITE_SWIMMER_GIRL, 8, 52, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1
+ object_event SPRITE_SWIMMER_GIRL, 13, 45, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfLori, -1
+ object_event SPRITE_SWIMMER_GUY, 13, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCameron, -1