diff options
Diffstat (limited to 'maps/Route20.asm')
| -rw-r--r-- | maps/Route20.asm | 138 |
1 files changed, 35 insertions, 103 deletions
diff --git a/maps/Route20.asm b/maps/Route20.asm index c81882bf9..4f90a042f 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -1,200 +1,132 @@ -Route20_MapScriptHeader: ; 0x1acd20 - ; trigger count +Route20_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks - dbw 5, UnknownScript_0x1acd25 -; 0x1acd25 + dbw 5, .ClearRocks -UnknownScript_0x1acd25: ; 0x1acd25 - setevent $00d7 +.ClearRocks + setevent EVENT_CINNABAR_ROCKS_CLEARED return -; 0x1acd29 -TrainerSwimmerfNicole: ; 0x1acd29 - ; bit/flag number - dw $3f5 +TrainerSwimmerfNicole: + trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, $0000, SwimmerfNicoleScript - ; trainer group && trainer id - db SWIMMERF, NICOLE - - ; text when seen - dw SwimmerfNicoleSeenText - - ; text when trainer beaten - dw SwimmerfNicoleBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfNicoleScript -; 0x1acd35 - -SwimmerfNicoleScript: ; 0x1acd35 +SwimmerfNicoleScript: talkaftercancel loadfont writetext UnknownText_0x1acd93 closetext loadmovesprites end -; 0x1acd3d - -TrainerSwimmerfLori: ; 0x1acd3d - ; bit/flag number - dw $3f6 - - ; trainer group && trainer id - db SWIMMERF, LORI - - ; text when seen - dw SwimmerfLoriSeenText - ; text when trainer beaten - dw SwimmerfLoriBeatenText +TrainerSwimmerfLori: + trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, $0000, SwimmerfLoriScript - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfLoriScript -; 0x1acd49 - -SwimmerfLoriScript: ; 0x1acd49 +SwimmerfLoriScript: talkaftercancel loadfont writetext UnknownText_0x1ace15 closetext loadmovesprites end -; 0x1acd51 - -TrainerSwimmermCameron: ; 0x1acd51 - ; bit/flag number - dw $5a4 - - ; trainer group && trainer id - db SWIMMERM, CAMERON - - ; text when seen - dw SwimmermCameronSeenText - - ; text when trainer beaten - dw SwimmermCameronBeatenText - - ; script when lost - dw $0000 - ; script when talk again - dw SwimmermCameronScript -; 0x1acd5d +TrainerSwimmermCameron: + trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, $0000, SwimmermCameronScript -SwimmermCameronScript: ; 0x1acd5d +SwimmermCameronScript: talkaftercancel loadfont writetext UnknownText_0x1ace8b closetext loadmovesprites end -; 0x1acd65 -MapRoute20Signpost0Script: ; 0x1acd65 +MapRoute20Signpost0Script: jumptext UnknownText_0x1acec2 -; 0x1acd68 -SwimmerfNicoleSeenText: ; 0x1acd68 +SwimmerfNicoleSeenText: text "I feel so much" line "lighter in water." done -; 0x1acd8a -SwimmerfNicoleBeatenText: ; 0x1acd8a +SwimmerfNicoleBeatenText: text "Oh, no!" done -; 0x1acd93 -UnknownText_0x1acd93: ; 0x1acd93 +UnknownText_0x1acd93: text "Swimming exercises" line "your full body." para "It's really good" line "for you." done -; 0x1acdd0 -SwimmerfLoriSeenText: ; 0x1acdd0 +SwimmerfLoriSeenText: text "What an impressive" line "collection of GYM" para "BADGES. We should" line "battle!" done -; 0x1ace10 -SwimmerfLoriBeatenText: ; 0x1ace10 +SwimmerfLoriBeatenText: text "No!" done -; 0x1ace15 -UnknownText_0x1ace15: ; 0x1ace15 +UnknownText_0x1ace15: text "SURF is no longer" line "the only HM move" cont "you use in water." done -; 0x1ace4b -SwimmermCameronSeenText: ; 0x1ace4b +SwimmermCameronSeenText: text "I guess it's im-" line "possible to swim" para "all the way to" line "JOHTO." done -; 0x1ace83 -SwimmermCameronBeatenText: ; 0x1ace83 +SwimmermCameronBeatenText: text "Aiyah!" done -; 0x1ace8b -UnknownText_0x1ace8b: ; 0x1ace8b +UnknownText_0x1ace8b: text "Besides the sea, I" line "can also swim in" cont "ponds and rivers." done -; 0x1acec2 -UnknownText_0x1acec2: ; 0x1acec2 +UnknownText_0x1acec2: text "What does this" line "sign say?" para "CINNABAR GYM" line "LEADER: BLAINE" done -; 0x1acef8 -Route20_MapEventHeader: ; 0x1acef8 +Route20_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $26, 1, GROUP_SEAFOAM_GYM, MAP_SEAFOAM_GYM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 11, 37, $0, MapRoute20Signpost0Script + signpost 11, 37, SIGNPOST_READ, MapRoute20Signpost0Script - ; people-events +.PersonEvents: db 3 - person_event SPRITE_SWIMMER_GIRL, 12, 56, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNicole, $ffff - person_event SPRITE_SWIMMER_GIRL, 17, 49, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfLori, $ffff - person_event SPRITE_SWIMMER_GUY, 17, 16, $a, $0, 255, 255, $82, 3, TrainerSwimmermCameron, $ffff -; 0x1acf2f + person_event SPRITE_SWIMMER_GIRL, 12, 56, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfNicole, -1 + person_event SPRITE_SWIMMER_GIRL, 17, 49, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfLori, -1 + person_event SPRITE_SWIMMER_GUY, 17, 16, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermCameron, -1 |