diff options
Diffstat (limited to 'maps/UnionCaveB2F.asm')
| -rw-r--r-- | maps/UnionCaveB2F.asm | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 5f2baabf2..2c3b63973 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const UNIONCAVEB2F_ROCKER const UNIONCAVEB2F_COOLTRAINER_F1 const UNIONCAVEB2F_COOLTRAINER_F2 @@ -7,18 +7,16 @@ const_value set 2 const UNIONCAVEB2F_LAPRAS UnionCaveB2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .Lapras .Lapras: checkflag ENGINE_UNION_CAVE_LAPRAS iftrue .NoAppear checkcode VAR_WEEKDAY - if_equal FRIDAY, .Appear + ifequal FRIDAY, .Appear .NoAppear: disappear UNIONCAVEB2F_LAPRAS return @@ -38,10 +36,10 @@ UnionCaveLapras: end TrainerCooltrainermNick: - trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, .Script + trainer COOLTRAINERM, NICK, EVENT_BEAT_COOLTRAINERM_NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainermNickAfterBattleText waitbutton @@ -49,10 +47,10 @@ TrainerCooltrainermNick: end TrainerCooltrainerfGwen: - trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, .Script + trainer COOLTRAINERF, GWEN, EVENT_BEAT_COOLTRAINERF_GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainerfGwenAfterBattleText waitbutton @@ -60,10 +58,10 @@ TrainerCooltrainerfGwen: end TrainerCooltrainerfEmma: - trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, .Script + trainer COOLTRAINERF, EMMA, EVENT_BEAT_COOLTRAINERF_EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainerfEmmaAfterBattleText waitbutton @@ -142,24 +140,19 @@ CooltrainerfEmmaAfterBattleText: done UnionCaveB2F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 5, 3, 5, UNION_CAVE_B1F + db 1 ; warp events + warp_event 5, 3, UNION_CAVE_B1F, 5 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 6 + db 6 ; object events object_event 15, 19, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermNick, -1 - object_event 5, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1 - object_event 3, 30, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1 - object_event 16, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER - object_event 12, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION - object_event 11, 31, SPRITE_SURF, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS + object_event 5, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1 + object_event 3, 30, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1 + object_event 16, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER + object_event 12, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION + object_event 11, 31, SPRITE_SURF, SPRITEMOVEDATA_SWIM_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS |