diff options
Diffstat (limited to 'maps/Route6.asm')
| -rw-r--r-- | maps/Route6.asm | 52 |
1 files changed, 18 insertions, 34 deletions
diff --git a/maps/Route6.asm b/maps/Route6.asm index 92a7c48b8..865e56d6a 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -1,14 +1,13 @@ -Route6_MapScriptHeader: ; 0x1ad927 +Route6_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x1ad929 -TrainerPokefanmRex: ; 0x1ad929 +TrainerPokefanmRex: ; bit/flag number - dw $5c7 + dw EVENT_BEAT_POKEFANM_REX ; trainer group && trainer id db POKEFANM, REX @@ -24,20 +23,18 @@ TrainerPokefanmRex: ; 0x1ad929 ; script when talk again dw PokefanmRexScript -; 0x1ad935 -PokefanmRexScript: ; 0x1ad935 +PokefanmRexScript: talkaftercancel loadfont writetext UnknownText_0x1ad9ff closetext loadmovesprites end -; 0x1ad93d -TrainerPokefanmAllan: ; 0x1ad93d +TrainerPokefanmAllan: ; bit/flag number - dw $5c8 + dw EVENT_BEAT_POKEFANM_ALLAN ; trainer group && trainer id db POKEFANM, ALLAN @@ -53,55 +50,47 @@ TrainerPokefanmAllan: ; 0x1ad93d ; script when talk again dw PokefanmAllanScript -; 0x1ad949 -PokefanmAllanScript: ; 0x1ad949 +PokefanmAllanScript: talkaftercancel loadfont writetext UnknownText_0x1ada88 closetext loadmovesprites end -; 0x1ad951 -PokefanMScript_0x1ad951: ; 0x1ad951 +PokefanMScript_0x1ad951: jumptextfaceplayer UnknownText_0x1ad957 -; 0x1ad954 -MapRoute6Signpost0Script: ; 0x1ad954 +MapRoute6Signpost0Script: jumptext UnknownText_0x1ad99b -; 0x1ad957 -UnknownText_0x1ad957: ; 0x1ad957 +UnknownText_0x1ad957: text "The road is closed" line "until the problem" para "at the POWER PLANT" line "is solved." done -; 0x1ad99b -UnknownText_0x1ad99b: ; 0x1ad99b +UnknownText_0x1ad99b: text "UNDERGROUND PATH" para "CERULEAN CITY -" line "VERMILION CITY" done -; 0x1ad9cc -PokefanmRexSeenText: ; 0x1ad9cc +PokefanmRexSeenText: text "My PHANPY is the" line "cutest in the" cont "world." done -; 0x1ad9f3 -PokefanmRexBeatenText: ; 0x1ad9f3 +PokefanmRexBeatenText: text "My PHANPY!" done -; 0x1ad9ff -UnknownText_0x1ad9ff: ; 0x1ad9ff +UnknownText_0x1ad9ff: text "Look how adorable" line "my PHANPY acts!" @@ -109,21 +98,18 @@ UnknownText_0x1ad9ff: ; 0x1ad9ff line "enough to make" cont "your heart melt?" done -; 0x1ada4f -PokefanmAllanSeenText: ; 0x1ada4f +PokefanmAllanSeenText: text "My TEDDIURSA is" line "the cutest in the" cont "world." done -; 0x1ada79 -PokefanmAllanBeatenText: ; 0x1ada79 +PokefanmAllanBeatenText: text "My TEDDIURSA!" done -; 0x1ada88 -UnknownText_0x1ada88: ; 0x1ada88 +UnknownText_0x1ada88: text "Look how adorable" line "my TEDDIURSA acts!" @@ -131,9 +117,8 @@ UnknownText_0x1ada88: ; 0x1ada88 line "enough to make" cont "your heart melt?" done -; 0x1adadb -Route6_MapEventHeader: ; 0x1adadb +Route6_MapEventHeader: ; filler db 0, 0 @@ -154,4 +139,3 @@ Route6_MapEventHeader: ; 0x1adadb person_event SPRITE_POKEFAN_M, 8, 21, $6, $0, 255, 255, $b0, 2, PokefanMScript_0x1ad951, $0771 person_event SPRITE_POKEFAN_M, 16, 13, $9, $0, 255, 255, $82, 0, TrainerPokefanmRex, $ffff person_event SPRITE_POKEFAN_M, 16, 14, $8, $0, 255, 255, $82, 0, TrainerPokefanmAllan, $ffff -; 0x1adb17 |