diff options
Diffstat (limited to 'maps/LavenderSpeechHouse.asm')
| -rw-r--r-- | maps/LavenderSpeechHouse.asm | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm index eacb6b4d6..dd73aa81f 100644 --- a/maps/LavenderSpeechHouse.asm +++ b/maps/LavenderSpeechHouse.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const LAVENDERSPEECHHOUSE_POKEFAN_F LavenderSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks LavenderSpeechHousePokefanFScript: jumptextfaceplayer LavenderSpeechHousePokefanFText @@ -29,22 +27,17 @@ LavenderSpeechHousePokefanFText: done LavenderSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, LAVENDER_TOWN - warp_def 3, 7, 3, LAVENDER_TOWN + db 2 ; warp events + warp_event 2, 7, LAVENDER_TOWN, 3 + warp_event 3, 7, LAVENDER_TOWN, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderSpeechHousePokefanFScript, -1 + db 1 ; object events + object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderSpeechHousePokefanFScript, -1 |