diff options
Diffstat (limited to 'maps/CeladonGym.asm')
| -rw-r--r-- | maps/CeladonGym.asm | 71 |
1 files changed, 32 insertions, 39 deletions
diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 53f09324a..246b30a39 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const CELADONGYM_ERIKA const CELADONGYM_LASS1 const CELADONGYM_LASS2 @@ -7,11 +7,9 @@ const_value set 2 const CELADONGYM_TWIN2 CeladonGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ErikaScript_0x72a6a: faceplayer @@ -50,10 +48,10 @@ UnknownScript_0x72aae: end TrainerLassMichelle: - trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, .Script + trainer LASS, MICHELLE, EVENT_BEAT_LASS_MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext LassMichelleAfterBattleText waitbutton @@ -61,10 +59,10 @@ TrainerLassMichelle: end TrainerPicnickerTanya: - trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, .Script + trainer PICNICKER, TANYA, EVENT_BEAT_PICNICKER_TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PicnickerTanyaAfterBattleText waitbutton @@ -72,10 +70,10 @@ TrainerPicnickerTanya: end TrainerBeautyJulia: - trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, .Script + trainer BEAUTY, JULIA, EVENT_BEAT_BEAUTY_JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BeautyJuliaAfterBattleText waitbutton @@ -83,10 +81,10 @@ TrainerBeautyJulia: end TrainerTwinsJoandzoe1: - trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, .Script + trainer TWINS, JOANDZOE1, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext TwinsJoandzoe1AfterBattleText waitbutton @@ -94,10 +92,10 @@ TrainerTwinsJoandzoe1: end TrainerTwinsJoandzoe2: - trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, .Script + trainer TWINS, JOANDZOE2, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext TwinsJoandzoe2AfterBattleText waitbutton @@ -268,27 +266,22 @@ TwinsJoandzoe2AfterBattleText: done CeladonGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 17, 8, CELADON_CITY - warp_def 5, 17, 8, CELADON_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 3, 15, BGEVENT_READ, CeladonGymStatue - bg_event 6, 15, BGEVENT_READ, CeladonGymStatue - -.ObjectEvents: - db 6 - object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1 - object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1 - object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1 - object_event 3, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1 - object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1 - object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 17, CELADON_CITY, 8 + warp_event 5, 17, CELADON_CITY, 8 + + db 0 ; coord events + + db 2 ; bg events + bg_event 3, 15, BGEVENT_READ, CeladonGymStatue + bg_event 6, 15, BGEVENT_READ, CeladonGymStatue + + db 6 ; object events + object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1 + object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1 + object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1 + object_event 3, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1 + object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1 + object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1 |