diff options
Diffstat (limited to 'maps/Route6.asm')
| -rw-r--r-- | maps/Route6.asm | 104 |
1 files changed, 28 insertions, 76 deletions
diff --git a/maps/Route6.asm b/maps/Route6.asm index 92a7c48b8..06e2f0c7c 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -1,107 +1,64 @@ -Route6_MapScriptHeader: ; 0x1ad927 - ; trigger count +Route6_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 -; 0x1ad929 -TrainerPokefanmRex: ; 0x1ad929 - ; bit/flag number - dw $5c7 +TrainerPokefanmRex: + trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, $0000, PokefanmRexScript - ; trainer group && trainer id - db POKEFANM, REX - - ; text when seen - dw PokefanmRexSeenText - - ; text when trainer beaten - dw PokefanmRexBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmRexScript -; 0x1ad935 - -PokefanmRexScript: ; 0x1ad935 +PokefanmRexScript: talkaftercancel loadfont writetext UnknownText_0x1ad9ff closetext loadmovesprites end -; 0x1ad93d - -TrainerPokefanmAllan: ; 0x1ad93d - ; bit/flag number - dw $5c8 - - ; trainer group && trainer id - db POKEFANM, ALLAN - - ; text when seen - dw PokefanmAllanSeenText - - ; text when trainer beaten - dw PokefanmAllanBeatenText - - ; script when lost - dw $0000 - ; script when talk again - dw PokefanmAllanScript -; 0x1ad949 +TrainerPokefanmAllan: + trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, $0000, PokefanmAllanScript -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 +66,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,27 +85,25 @@ UnknownText_0x1ada88: ; 0x1ada88 line "enough to make" cont "your heart melt?" done -; 0x1adadb -Route6_MapEventHeader: ; 0x1adadb +Route6_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $11, 1, GROUP_ROUTE_6_UNDERGROUND_ENTRANCE, MAP_ROUTE_6_UNDERGROUND_ENTRANCE warp_def $1, $6, 3, GROUP_ROUTE_6_SAFFRON_GATE, MAP_ROUTE_6_SAFFRON_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 5, 19, $0, MapRoute6Signpost0Script + signpost 5, 19, SIGNPOST_READ, MapRoute6Signpost0Script - ; people-events +.PersonEvents: db 3 - 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 + person_event SPRITE_POKEFAN_M, 8, 21, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 2, PokefanMScript_0x1ad951, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH + person_event SPRITE_POKEFAN_M, 16, 13, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerPokefanmRex, -1 + person_event SPRITE_POKEFAN_M, 16, 14, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerPokefanmAllan, -1 |