diff options
Diffstat (limited to 'maps/ViridianGym.asm')
| -rw-r--r-- | maps/ViridianGym.asm | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index ed47a099e..ac0003fd5 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const VIRIDIANGYM_BLUE const VIRIDIANGYM_GYM_GUY ViridianGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ViridianGymBlueScript: faceplayer @@ -170,23 +168,18 @@ ViridianGymGuyWinText: done ViridianGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 17, 1, VIRIDIAN_CITY - warp_def 5, 17, 1, VIRIDIAN_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 3, 13, BGEVENT_READ, ViridianGymStatue - bg_event 6, 13, BGEVENT_READ, ViridianGymStatue - -.ObjectEvents: - db 2 - object_event 5, 3, SPRITE_BLUE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE - object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 17, VIRIDIAN_CITY, 1 + warp_event 5, 17, VIRIDIAN_CITY, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 3, 13, BGEVENT_READ, ViridianGymStatue + bg_event 6, 13, BGEVENT_READ, ViridianGymStatue + + db 2 ; object events + object_event 5, 3, SPRITE_BLUE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE + object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE |