diff options
Diffstat (limited to 'maps/PewterGym.asm')
| -rw-r--r-- | maps/PewterGym.asm | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 9e6395f13..d6a0f3998 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const PEWTERGYM_BROCK const PEWTERGYM_YOUNGSTER const PEWTERGYM_GYM_GUY PewterGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks BrockScript_0x1a2864: faceplayer @@ -41,10 +39,10 @@ BrockScript_0x1a2864: end TrainerCamperJerry: - trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, .Script + trainer CAMPER, JERRY, EVENT_BEAT_CAMPER_JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CamperJerryAfterBattleText waitbutton @@ -209,24 +207,19 @@ PewterGymGuyWinText: done PewterGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 13, 2, PEWTER_CITY - warp_def 5, 13, 2, PEWTER_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 2, 11, BGEVENT_READ, PewterGymStatue - bg_event 7, 11, BGEVENT_READ, PewterGymStatue - -.ObjectEvents: - db 3 - object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1 - object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1 - object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 13, PEWTER_CITY, 2 + warp_event 5, 13, PEWTER_CITY, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 2, 11, BGEVENT_READ, PewterGymStatue + bg_event 7, 11, BGEVENT_READ, PewterGymStatue + + db 3 ; object events + object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1 + object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1 + object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1 |