diff options
Diffstat (limited to 'maps/VioletGym.asm')
| -rw-r--r-- | maps/VioletGym.asm | 61 |
1 files changed, 27 insertions, 34 deletions
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 12480e21f..1e32e338a 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const VIOLETGYM_FALKNER const VIOLETGYM_YOUNGSTER1 const VIOLETGYM_YOUNGSTER2 const VIOLETGYM_GYM_GUY VioletGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FalknerScript_0x683c2: faceplayer @@ -36,7 +34,7 @@ FalknerScript_0x683c2: iftrue .SpeechAfterTM setevent EVENT_BEAT_BIRD_KEEPER_ROD setevent EVENT_BEAT_BIRD_KEEPER_ABE - setmapscene ELMS_LAB, 2 + setmapscene ELMS_LAB, SCENE_ELMSLAB_NOTHING specialphonecall SPECIALCALL_ASSISTANT writetext UnknownText_0x685c8 buttonsound @@ -56,8 +54,8 @@ FalknerScript_0x683c2: end VioletGymActivateRockets: - if_equal 7, .RadioTowerRockets - if_equal 6, .GoldenrodRockets + ifequal 7, .RadioTowerRockets + ifequal 6, .GoldenrodRockets end .GoldenrodRockets: @@ -67,10 +65,10 @@ VioletGymActivateRockets: jumpstd radiotowerrockets TrainerBirdKeeperRod: - trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, BirdKeeperRodSeenText, BirdKeeperRodBeatenText, 0, .Script + trainer BIRD_KEEPER, ROD, EVENT_BEAT_BIRD_KEEPER_ROD, BirdKeeperRodSeenText, BirdKeeperRodBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BirdKeeperRodAfterBattleText waitbutton @@ -78,10 +76,10 @@ TrainerBirdKeeperRod: end TrainerBirdKeeperAbe: - trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, BirdKeeperAbeSeenText, BirdKeeperAbeBeatenText, 0, .Script + trainer BIRD_KEEPER, ABE, EVENT_BEAT_BIRD_KEEPER_ABE, BirdKeeperAbeSeenText, BirdKeeperAbeBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BirdKeeperAbeAfterBattleText waitbutton @@ -282,25 +280,20 @@ VioletGymGuyWinText: done VioletGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 15, 2, VIOLET_CITY - warp_def 5, 15, 2, VIOLET_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 3, 13, BGEVENT_READ, VioletGymStatue - bg_event 6, 13, BGEVENT_READ, VioletGymStatue - -.ObjectEvents: - db 4 - object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1 - object_event 7, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1 - object_event 2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1 - object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 15, VIOLET_CITY, 2 + warp_event 5, 15, VIOLET_CITY, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 3, 13, BGEVENT_READ, VioletGymStatue + bg_event 6, 13, BGEVENT_READ, VioletGymStatue + + db 4 ; object events + object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1 + object_event 7, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1 + object_event 2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1 + object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1 |