diff options
Diffstat (limited to 'maps/CherrygroveGymSpeechHouse.asm')
| -rw-r--r-- | maps/CherrygroveGymSpeechHouse.asm | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index 2709ed1c0..95aa6c91a 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const CHERRYGROVEGYMSPEECHHOUSE_POKEFAN_M const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER CherrygroveGymSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CherrygroveGymSpeechHousePokefanMScript: jumptextfaceplayer CherrygroveGymSpeechHousePokefanMText @@ -45,23 +43,18 @@ CherrygroveGymSpeechHouseBugCatcherText: done CherrygroveGymSpeechHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 3, CHERRYGROVE_CITY - warp_def 3, 7, 3, CHERRYGROVE_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf - -.ObjectEvents: - db 2 - object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1 - object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, CHERRYGROVE_CITY, 3 + warp_event 3, 7, CHERRYGROVE_CITY, 3 + + db 0 ; coord events + + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf + + db 2 ; object events + object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1 + object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1 |