summaryrefslogtreecommitdiff
path: root/maps/VermilionMagnetTrainSpeechHouse.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-26 16:29:43 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-26 16:29:43 -0400
commitd24f1c71149b59c50dba57e500f30b223a54a25f (patch)
tree140ad8c04b396af2e0d55f3218bfb3e428391f42 /maps/VermilionMagnetTrainSpeechHouse.asm
parent6ca1857732502a60251e3738cbccc6d0067eaed2 (diff)
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/VermilionMagnetTrainSpeechHouse.asm')
-rw-r--r--maps/VermilionMagnetTrainSpeechHouse.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm
index 426aa6cf..8688d8dc 100644
--- a/maps/VermilionMagnetTrainSpeechHouse.asm
+++ b/maps/VermilionMagnetTrainSpeechHouse.asm
@@ -1,11 +1,11 @@
- object_const_def ; object_event constants
+ object_const_def
const VERMILIONMAGNETTRAINSPEECHHOUSE_POKEFAN_F
const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER
VermilionMagnetTrainSpeechHouse_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 0 ; callbacks
+ def_callbacks
VermilionMagnetTrainSpeechHousePokefanFScript:
jumptextfaceplayer VermilionMagnetTrainSpeechHousePokefanFText
@@ -34,16 +34,16 @@ VermilionMagnetTrainSpeechHouseYoungsterText:
VermilionMagnetTrainSpeechHouse_MapEvents:
db 0, 0 ; filler
- db 2 ; warp events
+ def_warp_events
warp_event 2, 7, VERMILION_CITY, 4
warp_event 3, 7, VERMILION_CITY, 4
- db 0 ; coord events
+ def_coord_events
- db 2 ; bg events
+ def_bg_events
bg_event 0, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf
bg_event 1, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf
- db 2 ; object events
+ def_object_events
object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1
object_event 0, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1