diff options
Diffstat (limited to 'maps/UnionCaveB2F.asm')
-rw-r--r-- | maps/UnionCaveB2F.asm | 152 |
1 files changed, 41 insertions, 111 deletions
diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index f57519427..b97276ce7 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -1,137 +1,77 @@ -UnionCaveB2F_MapScriptHeader: ; 0x5a308 - ; trigger count +UnionCaveB2F_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks dbw 2, UnknownScript_0x5a30d -; 0x5a30d -UnknownScript_0x5a30d: ; 0x5a30d - checkflag $0059 +UnknownScript_0x5a30d: + checkflag ENGINE_UNION_CAVE_LAPRAS iftrue UnknownScript_0x5a319 - checkcode $b + checkcode VAR_WEEKDAY if_equal FRIDAY, UnknownScript_0x5a31c -UnknownScript_0x5a319: ; 0x5a319 +UnknownScript_0x5a319: disappear $7 return -; 0x5a31c -UnknownScript_0x5a31c: ; 0x5a31c +UnknownScript_0x5a31c: appear $7 return -; 0x5a31f -SurfScript_0x5a31f: ; 0x5a31f +SurfScript_0x5a31f: faceplayer cry LAPRAS loadpokedata LAPRAS, 20 startbattle disappear $7 - setflag $0059 + setflag ENGINE_UNION_CAVE_LAPRAS returnafterbattle end -; 0x5a32e -TrainerCooltrainermNick: ; 0x5a32e - ; bit/flag number - dw $548 +TrainerCooltrainermNick: + trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, $0000, CooltrainermNickScript - ; trainer group && trainer id - db COOLTRAINERM, NICK - - ; text when seen - dw CooltrainermNickSeenText - - ; text when trainer beaten - dw CooltrainermNickBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermNickScript -; 0x5a33a - -CooltrainermNickScript: ; 0x5a33a +CooltrainermNickScript: talkaftercancel loadfont writetext UnknownText_0x5a3f0 closetext loadmovesprites end -; 0x5a342 - -TrainerCooltrainerfGwen: ; 0x5a342 - ; bit/flag number - dw $55b - - ; trainer group && trainer id - db COOLTRAINERF, GWEN - - ; text when seen - dw CooltrainerfGwenSeenText - ; text when trainer beaten - dw CooltrainerfGwenBeatenText +TrainerCooltrainerfGwen: + trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, $0000, CooltrainerfGwenScript - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfGwenScript -; 0x5a34e - -CooltrainerfGwenScript: ; 0x5a34e +CooltrainerfGwenScript: talkaftercancel loadfont writetext UnknownText_0x5a488 closetext loadmovesprites end -; 0x5a356 - -TrainerCooltrainerfEmma: ; 0x5a356 - ; bit/flag number - dw $569 - - ; trainer group && trainer id - db COOLTRAINERF, EMMA - - ; text when seen - dw CooltrainerfEmmaSeenText - - ; text when trainer beaten - dw CooltrainerfEmmaBeatenText - - ; script when lost - dw $0000 - ; script when talk again - dw CooltrainerfEmmaScript -; 0x5a362 +TrainerCooltrainerfEmma: + trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, $0000, CooltrainerfEmmaScript -CooltrainerfEmmaScript: ; 0x5a362 +CooltrainerfEmmaScript: talkaftercancel loadfont writetext UnknownText_0x5a52b closetext loadmovesprites end -; 0x5a36a -ItemFragment_0x5a36a: ; 0x5a36a +ItemFragment_0x5a36a: db ELIXER, 1 -; 0x5a36c -ItemFragment_0x5a36c: ; 0x5a36c +ItemFragment_0x5a36c: db HYPER_POTION, 1 -; 0x5a36e -CooltrainermNickSeenText: ; 0x5a36e +CooltrainermNickSeenText: text "There are two" line "kinds of people." @@ -142,15 +82,13 @@ CooltrainermNickSeenText: ; 0x5a36e para "What kind of" line "person are you?" done -; 0x5a3d5 -CooltrainermNickBeatenText: ; 0x5a3d5 +CooltrainermNickBeatenText: text "You've got" line "dazzling style!" done -; 0x5a3f0 -UnknownText_0x5a3f0: ; 0x5a3f0 +UnknownText_0x5a3f0: text "Your #MON style" line "is stunning and" cont "colorful, I admit." @@ -158,28 +96,24 @@ UnknownText_0x5a3f0: ; 0x5a3f0 para "You'll just keep" line "getting better!" done -; 0x5a444 -CooltrainerfGwenSeenText: ; 0x5a444 +CooltrainerfGwenSeenText: text "I'm in training." line "Care for a round?" done -; 0x5a467 -CooltrainerfGwenBeatenText: ; 0x5a467 +CooltrainerfGwenBeatenText: text "Aww, no! You're" line "too good for me." done -; 0x5a488 -UnknownText_0x5a488: ; 0x5a488 +UnknownText_0x5a488: text "I'm going to train" line "by myself until I" cont "improve." done -; 0x5a4b6 -CooltrainerfEmmaSeenText: ; 0x5a4b6 +CooltrainerfEmmaSeenText: text "If the #MON I" line "liked were there," cont "I'd go anywhere." @@ -187,15 +121,13 @@ CooltrainerfEmmaSeenText: ; 0x5a4b6 para "That's what a real" line "trainer does." done -; 0x5a507 -CooltrainerfEmmaBeatenText: ; 0x5a507 +CooltrainerfEmmaBeatenText: text "I'd rather pet my" line "babies than this!" done -; 0x5a52b -UnknownText_0x5a52b: ; 0x5a52b +UnknownText_0x5a52b: text "Just once a week," line "a #MON comes to" cont "the water's edge." @@ -203,28 +135,26 @@ UnknownText_0x5a52b: ; 0x5a52b para "I wanted to see" line "that #MON…" done -; 0x5a57a -UnionCaveB2F_MapEventHeader: ; 0x5a57a +UnionCaveB2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $3, $5, 5, GROUP_UNION_CAVE_B1F, MAP_UNION_CAVE_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 6 - person_event SPRITE_ROCKER, 23, 19, $6, $0, 255, 255, $82, 3, TrainerCooltrainermNick, $ffff - person_event SPRITE_COOLTRAINER_F, 17, 9, $a, $0, 255, 255, $82, 1, TrainerCooltrainerfGwen, $ffff - person_event SPRITE_COOLTRAINER_F, 34, 7, $7, $0, 255, 255, $82, 3, TrainerCooltrainerfEmma, $ffff - person_event SPRITE_POKE_BALL, 6, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36a, $0660 - person_event SPRITE_POKE_BALL, 23, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36c, $0661 - person_event SPRITE_SURF, 35, 15, $24, $11, 255, 255, $90, 0, SurfScript_0x5a31f, $0760 -; 0x5a5d3 + person_event SPRITE_ROCKER, 23, 19, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermNick, -1 + person_event SPRITE_COOLTRAINER_F, 17, 9, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainerfGwen, -1 + person_event SPRITE_COOLTRAINER_F, 34, 7, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfEmma, -1 + person_event SPRITE_POKE_BALL, 6, 20, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a36a, EVENT_UNION_CAVE_B2F_ELIXER + person_event SPRITE_POKE_BALL, 23, 16, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a36c, EVENT_UNION_CAVE_B2F_HYPER_POTION + person_event SPRITE_SURF, 35, 15, OW_UP | $20, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SurfScript_0x5a31f, EVENT_UNION_CAVE_B2F_LAPRAS |