summaryrefslogtreecommitdiff
path: root/maps/Route16FuchsiaSpeechHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route16FuchsiaSpeechHouse.asm')
-rw-r--r--maps/Route16FuchsiaSpeechHouse.asm33
1 files changed, 13 insertions, 20 deletions
diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm
index 1d709e4ea..53af80d35 100644
--- a/maps/Route16FuchsiaSpeechHouse.asm
+++ b/maps/Route16FuchsiaSpeechHouse.asm
@@ -1,12 +1,10 @@
-const_value set 2
+ const_def 2 ; object constants
const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD
Route16FuchsiaSpeechHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route16FuchsiaSpeechHouseSuperNerdScript:
jumptextfaceplayer Route16FuchsiaSpeechHouseSuperNerdText
@@ -23,22 +21,17 @@ Route16FuchsiaSpeechHouseSuperNerdText:
done
Route16FuchsiaSpeechHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
- warp_def 2, 7, 1, ROUTE_16
- warp_def 3, 7, 1, ROUTE_16
+ db 2 ; warp events
+ warp_event 2, 7, ROUTE_16, 1
+ warp_event 3, 7, ROUTE_16, 1
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 2
- bg_event 0, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf
- bg_event 1, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf
+ db 2 ; bg events
+ bg_event 0, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf
+ bg_event 1, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf
-.ObjectEvents:
- db 1
- object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1
+ db 1 ; object events
+ object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1