diff options
Diffstat (limited to 'maps/VermilionGym.asm')
| -rw-r--r-- | maps/VermilionGym.asm | 91 |
1 files changed, 42 insertions, 49 deletions
diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 31f19615d..42622e2a8 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const VERMILIONGYM_SURGE const VERMILIONGYM_GENTLEMAN const VERMILIONGYM_ROCKER @@ -6,11 +6,9 @@ const_value set 2 const VERMILIONGYM_GYM_GUY VermilionGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SurgeScript_0x1920a5: faceplayer @@ -45,10 +43,10 @@ SurgeScript_0x1920a5: end TrainerGentlemanGregory: - trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, .Script + trainer GENTLEMAN, GREGORY, EVENT_BEAT_GENTLEMAN_GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GentlemanGregoryAfterBattleText waitbutton @@ -56,10 +54,10 @@ TrainerGentlemanGregory: end TrainerGuitaristVincent: - trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, .Script + trainer GUITARIST, VINCENT, EVENT_BEAT_GUITARIST_VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GuitaristVincentAfterBattleText waitbutton @@ -67,10 +65,10 @@ TrainerGuitaristVincent: end TrainerJugglerHorton: - trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, .Script + trainer JUGGLER, HORTON, EVENT_BEAT_JUGGLER_HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext JugglerHortonAfterBattleText waitbutton @@ -261,41 +259,36 @@ UnknownText_0x19261e: done VermilionGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 17, 7, VERMILION_CITY - warp_def 5, 17, 7, VERMILION_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 17 - bg_event 1, 7, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 3, 7, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 5, 7, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 7, 7, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 9, 7, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 1, 9, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 3, 9, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 5, 9, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 7, 9, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 9, 9, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 1, 11, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 3, 11, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 5, 11, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 7, 11, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 9, 11, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 3, 15, BGEVENT_READ, VermilionGymStatue - bg_event 6, 15, BGEVENT_READ, VermilionGymStatue - -.ObjectEvents: - db 5 - object_event 5, 2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1 - object_event 8, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1 - object_event 4, 7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1 - object_event 0, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerJugglerHorton, -1 - object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, VermilionGymGuyScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 17, VERMILION_CITY, 7 + warp_event 5, 17, VERMILION_CITY, 7 + + db 0 ; coord events + + db 17 ; bg events + bg_event 1, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 3, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 5, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 7, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 9, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 1, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 3, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 5, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 7, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 9, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 1, 11, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 3, 11, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 5, 11, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 7, 11, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 9, 11, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 3, 15, BGEVENT_READ, VermilionGymStatue + bg_event 6, 15, BGEVENT_READ, VermilionGymStatue + + db 5 ; object events + object_event 5, 2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1 + object_event 8, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1 + object_event 4, 7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1 + object_event 0, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerJugglerHorton, -1 + object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, VermilionGymGuyScript, -1 |