diff options
Diffstat (limited to 'maps/CeruleanGym.asm')
| -rw-r--r-- | maps/CeruleanGym.asm | 79 |
1 files changed, 36 insertions, 43 deletions
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index b1076ded5..7e5f62973 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const CERULEANGYM_ROCKET const CERULEANGYM_MISTY const CERULEANGYM_SWIMMER_GIRL1 @@ -7,13 +7,11 @@ const_value set 2 const CERULEANGYM_GYM_GUY CeruleanGym_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .GruntRunsOut + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_CERULEANGYM_NOTHING + scene_script .GruntRunsOut ; SCENE_CERULEANGYM_GRUNT_RUNS_OUT -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -48,13 +46,13 @@ CeruleanGym_MapScripts: setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM clearevent EVENT_ROUTE_24_ROCKET clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND - setscene 0 - setmapscene ROUTE_25, 1 - setmapscene POWER_PLANT, 0 + setscene SCENE_CERULEANGYM_NOTHING + setmapscene ROUTE_25, SCENE_ROUTE25_MISTYS_DATE + setmapscene POWER_PLANT, SCENE_POWERPLANT_NOTHING waitsfx special RestartMapMusic pause 15 - spriteface PLAYER, DOWN + turnobject PLAYER, DOWN pause 15 end @@ -86,10 +84,10 @@ MistyScript_0x188432: end TrainerSwimmerfDiana: - trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, .Script + trainer SWIMMERF, DIANA, EVENT_BEAT_SWIMMERF_DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfDianaAfterBattleText waitbutton @@ -97,10 +95,10 @@ TrainerSwimmerfDiana: end TrainerSwimmerfBriana: - trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, .Script + trainer SWIMMERF, BRIANA, EVENT_BEAT_SWIMMERF_BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfBrianaAfterBattleText waitbutton @@ -108,10 +106,10 @@ TrainerSwimmerfBriana: end TrainerSwimmermParker: - trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, .Script + trainer SWIMMERM, PARKER, EVENT_BEAT_SWIMMERM_PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmermParkerAfterBattleText waitbutton @@ -135,7 +133,7 @@ CeruleanGymGuyScript: end CeruleanGymHiddenMachinePart: - hiddenitem EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART + hiddenitem MACHINE_PART, EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM CeruleanGymStatue1: checkevent EVENT_TRAINERS_IN_CERULEAN_GYM @@ -363,28 +361,23 @@ CeruleanGymGuyWinText: done CeruleanGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 15, 5, CERULEAN_CITY - warp_def 5, 15, 5, CERULEAN_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 3, 8, BGEVENT_ITEM, CeruleanGymHiddenMachinePart - bg_event 2, 13, BGEVENT_READ, CeruleanGymStatue1 - bg_event 6, 13, BGEVENT_READ, CeruleanGymStatue2 - -.ObjectEvents: - db 6 - object_event 4, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET - object_event 5, 3, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM - object_event 4, 6, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM - object_event 1, 9, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM - object_event 8, 9, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM - object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 15, CERULEAN_CITY, 5 + warp_event 5, 15, CERULEAN_CITY, 5 + + db 0 ; coord events + + db 3 ; bg events + bg_event 3, 8, BGEVENT_ITEM, CeruleanGymHiddenMachinePart + bg_event 2, 13, BGEVENT_READ, CeruleanGymStatue1 + bg_event 6, 13, BGEVENT_READ, CeruleanGymStatue2 + + db 6 ; object events + object_event 4, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET + object_event 5, 3, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event 4, 6, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event 1, 9, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event 8, 9, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM |