diff options
Diffstat (limited to 'maps/UnionCaveB2F.asm')
| -rw-r--r-- | maps/UnionCaveB2F.asm | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index a0e1c24e3..86e6eacf3 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -1,3 +1,11 @@ +const_value set 2 + const UNIONCAVEB2F_ROCKER + const UNIONCAVEB2F_COOLTRAINER_F1 + const UNIONCAVEB2F_COOLTRAINER_F2 + const UNIONCAVEB2F_POKE_BALL1 + const UNIONCAVEB2F_POKE_BALL2 + const UNIONCAVEB2F_SURF + UnionCaveB2F_MapScriptHeader: .MapTriggers: db 0 @@ -15,19 +23,19 @@ UnknownScript_0x5a30d: checkcode VAR_WEEKDAY if_equal FRIDAY, UnknownScript_0x5a31c UnknownScript_0x5a319: - disappear $7 + disappear UNIONCAVEB2F_SURF return UnknownScript_0x5a31c: - appear $7 + appear UNIONCAVEB2F_SURF return SurfScript_0x5a31f: faceplayer cry LAPRAS - loadpokedata LAPRAS, 20 + loadwildmon LAPRAS, 20 startbattle - disappear $7 + disappear UNIONCAVEB2F_SURF setflag ENGINE_UNION_CAVE_LAPRAS returnafterbattle end @@ -36,40 +44,40 @@ TrainerCooltrainermNick: trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, CooltrainermNickScript CooltrainermNickScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5a3f0 + waitbutton closetext - loadmovesprites end TrainerCooltrainerfGwen: trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, CooltrainerfGwenScript CooltrainerfGwenScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5a488 + waitbutton closetext - loadmovesprites end TrainerCooltrainerfEmma: trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, CooltrainerfEmmaScript CooltrainerfEmmaScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5a52b + waitbutton closetext - loadmovesprites end -ItemFragment_0x5a36a: - db ELIXER, 1 +UnionCaveB2FElixer: + itemball ELIXER -ItemFragment_0x5a36c: - db HYPER_POTION, 1 +UnionCaveB2FHyperPotion: + itemball HYPER_POTION CooltrainermNickSeenText: text "There are two" @@ -155,6 +163,6 @@ UnionCaveB2F_MapEventHeader: person_event SPRITE_ROCKER, 19, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermNick, -1 person_event SPRITE_COOLTRAINER_F, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1 person_event SPRITE_COOLTRAINER_F, 30, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1 - person_event SPRITE_POKE_BALL, 2, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5a36a, EVENT_UNION_CAVE_B2F_ELIXER - person_event SPRITE_POKE_BALL, 19, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5a36c, EVENT_UNION_CAVE_B2F_HYPER_POTION + person_event SPRITE_POKE_BALL, 2, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER + person_event SPRITE_POKE_BALL, 19, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION person_event SPRITE_SURF, 31, 11, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SurfScript_0x5a31f, EVENT_UNION_CAVE_B2F_LAPRAS |