summaryrefslogtreecommitdiff
path: root/maps/FightingDojo.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/FightingDojo.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/FightingDojo.asm')
-rw-r--r--maps/FightingDojo.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm
index 2487adefd..9507e9a26 100644
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -3,7 +3,7 @@ const_value set 2
const FIGHTINGDOJO_POKE_BALL
FightingDojo_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 0
.MapCallbacks:
@@ -51,15 +51,15 @@ FightingDojo_MapEventHeader:
warp_def $b, $4, 1, SAFFRON_CITY
warp_def $b, $5, 1, SAFFRON_CITY
-.XYTriggers:
+.CoordEvents:
db 0
-.Signposts:
+.BGEvents:
db 2
- signpost 0, 4, SIGNPOST_READ, MapFightingDojoSignpost0Script
- signpost 0, 5, SIGNPOST_READ, MapFightingDojoSignpost1Script
+ bg_event 0, 4, BGEVENT_READ, MapFightingDojoSignpost0Script
+ bg_event 0, 5, BGEVENT_READ, MapFightingDojoSignpost1Script
-.PersonEvents:
+.ObjectEvents:
db 2
- person_event SPRITE_BLACK_BELT, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1
- person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND
+ object_event SPRITE_BLACK_BELT, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1
+ object_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND