diff options
Diffstat (limited to 'maps/Route4.asm')
| -rw-r--r-- | maps/Route4.asm | 69 |
1 files changed, 24 insertions, 45 deletions
diff --git a/maps/Route4.asm b/maps/Route4.asm index f33f7e563..a9e2bea3c 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -1,14 +1,13 @@ -Route4_MapScriptHeader: ; 0x1ae1ce +Route4_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x1ae1d0 -TrainerBird_keeperHank: ; 0x1ae1d0 +TrainerBird_keeperHank: ; bit/flag number - dw $402 + dw EVENT_BEAT_BIRD_KEEPER_HANK ; trainer group && trainer id db BIRD_KEEPER, HANK @@ -24,20 +23,18 @@ TrainerBird_keeperHank: ; 0x1ae1d0 ; script when talk again dw Bird_keeperHankScript -; 0x1ae1dc -Bird_keeperHankScript: ; 0x1ae1dc +Bird_keeperHankScript: talkaftercancel loadfont writetext UnknownText_0x1ae258 closetext loadmovesprites end -; 0x1ae1e4 -TrainerPicnickerHope: ; 0x1ae1e4 +TrainerPicnickerHope: ; bit/flag number - dw $483 + dw EVENT_BEAT_PICNICKER_HOPE ; trainer group && trainer id db PICNICKER, HOPE @@ -53,20 +50,18 @@ TrainerPicnickerHope: ; 0x1ae1e4 ; script when talk again dw PicnickerHopeScript -; 0x1ae1f0 -PicnickerHopeScript: ; 0x1ae1f0 +PicnickerHopeScript: talkaftercancel loadfont writetext UnknownText_0x1ae320 closetext loadmovesprites end -; 0x1ae1f8 -TrainerPicnickerSharon: ; 0x1ae1f8 +TrainerPicnickerSharon: ; bit/flag number - dw $484 + dw EVENT_BEAT_PICNICKER_SHARON ; trainer group && trainer id db PICNICKER, SHARON @@ -82,45 +77,38 @@ TrainerPicnickerSharon: ; 0x1ae1f8 ; script when talk again dw PicnickerSharonScript -; 0x1ae204 -PicnickerSharonScript: ; 0x1ae204 +PicnickerSharonScript: talkaftercancel loadfont writetext UnknownText_0x1ae369 closetext loadmovesprites end -; 0x1ae20c -MapRoute4Signpost0Script: ; 0x1ae20c +MapRoute4Signpost0Script: jumptext UnknownText_0x1ae384 -; 0x1ae20f -ItemFragment_0x1ae20f: ; 0x1ae20f +ItemFragment_0x1ae20f: db HP_UP, 1 -; 0x1ae211 -MapRoute4SignpostItem1: ; 0x1ae211 +MapRoute4SignpostItem1: dw $00f1 db ULTRA_BALL -; 0x1ae214 -Bird_keeperHankSeenText: ; 0x1ae214 +Bird_keeperHankSeenText: text "I'm raising my" line "#MON. Want to" cont "battle with me?" done -; 0x1ae241 -Bird_keeperHankBeatenText: ; 0x1ae241 +Bird_keeperHankBeatenText: text "Ack! I lost that" line "one…" done -; 0x1ae258 -UnknownText_0x1ae258: ; 0x1ae258 +UnknownText_0x1ae258: text "If you have a" line "specific #MON" @@ -133,58 +121,50 @@ UnknownText_0x1ae258: ; 0x1ae258 para "That's how to do" line "it." done -; 0x1ae2ce -PicnickerHopeSeenText: ; 0x1ae2ce +PicnickerHopeSeenText: text "I have a feeling" line "that I can win." para "Let's see if I'm" line "right!" done -; 0x1ae306 -PicnickerHopeBeatenText: ; 0x1ae306 +PicnickerHopeBeatenText: text "Aww, you are too" line "strong." done -; 0x1ae320 -UnknownText_0x1ae320: ; 0x1ae320 +UnknownText_0x1ae320: text "I heard CLEFAIRY" line "appear at MT.MOON." para "But where could" line "they be?" done -; 0x1ae35e -PicnickerSharonSeenText: ; 0x1ae35e +PicnickerSharonSeenText: text "Um…" line "I…" done -; 0x1ae366 -PicnickerSharonBeatenText: ; 0x1ae366 +PicnickerSharonBeatenText: text "…" done -; 0x1ae369 -UnknownText_0x1ae369: ; 0x1ae369 +UnknownText_0x1ae369: text "……I'll go train" line "some more…" done -; 0x1ae384 -UnknownText_0x1ae384: ; 0x1ae384 +UnknownText_0x1ae384: text "MT.MOON SQUARE" para "Just go up the" line "stairs." done -; 0x1ae3ab -Route4_MapEventHeader: ; 0x1ae3ab +Route4_MapEventHeader: ; filler db 0, 0 @@ -206,4 +186,3 @@ Route4_MapEventHeader: ; 0x1ae3ab person_event SPRITE_LASS, 12, 13, $8, $0, 255, 255, $a2, 4, TrainerPicnickerHope, $ffff person_event SPRITE_LASS, 10, 25, $9, $0, 255, 255, $a2, 4, TrainerPicnickerSharon, $ffff person_event SPRITE_POKE_BALL, 7, 30, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ae20f, $0787 -; 0x1ae3f4 |