diff options
Diffstat (limited to 'maps/Route40.asm')
| -rw-r--r-- | maps/Route40.asm | 236 |
1 files changed, 67 insertions, 169 deletions
diff --git a/maps/Route40.asm b/maps/Route40.asm index ea889d272..6fd99ee3a 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -1,8 +1,8 @@ -Route40_MapScriptHeader: ; 0x1a6160 - ; trigger count +Route40_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -10,8 +10,8 @@ Route40_MapScriptHeader: ; 0x1a6160 dbw 2, MonicaCallback MonicaCallback: - clearevent $07cf - checkcode $b + clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + checkcode VAR_WEEKDAY if_equal MONDAY, .MonicaAppears disappear $a return @@ -20,150 +20,73 @@ MonicaCallback: appear $a return -TrainerSwimmerfElaine: ; 0x1a6174 - ; bit/flag number - dw $3e8 +TrainerSwimmerfElaine: + trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, $0000, SwimmerfElaineScript - ; trainer group && trainer id - db SWIMMERF, ELAINE - - ; text when seen - dw SwimmerfElaineSeenText - - ; text when trainer beaten - dw SwimmerfElaineBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfElaineScript -; 0x1a6180 - -SwimmerfElaineScript: ; 0x1a6180 +SwimmerfElaineScript: talkaftercancel loadfont writetext UnknownText_0x1a637b closetext loadmovesprites end -; 0x1a6188 - -TrainerSwimmerfPaula: ; 0x1a6188 - ; bit/flag number - dw $3e9 - - ; trainer group && trainer id - db SWIMMERF, PAULA - - ; text when seen - dw SwimmerfPaulaSeenText - - ; text when trainer beaten - dw SwimmerfPaulaBeatenText - - ; script when lost - dw $0000 - ; script when talk again - dw SwimmerfPaulaScript -; 0x1a6194 +TrainerSwimmerfPaula: + trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, $0000, SwimmerfPaulaScript -SwimmerfPaulaScript: ; 0x1a6194 +SwimmerfPaulaScript: talkaftercancel loadfont writetext UnknownText_0x1a63f5 closetext loadmovesprites end -; 0x1a619c -TrainerSwimmermSimon: ; 0x1a619c - ; bit/flag number - dw $595 +TrainerSwimmermSimon: + trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, $0000, SwimmermSimonScript - ; trainer group && trainer id - db SWIMMERM, SIMON - - ; text when seen - dw SwimmermSimonSeenText - - ; text when trainer beaten - dw SwimmermSimonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermSimonScript -; 0x1a61a8 - -SwimmermSimonScript: ; 0x1a61a8 +SwimmermSimonScript: talkaftercancel loadfont writetext UnknownText_0x1a6282 closetext loadmovesprites end -; 0x1a61b0 - -TrainerSwimmermRandall: ; 0x1a61b0 - ; bit/flag number - dw $596 - - ; trainer group && trainer id - db SWIMMERM, RANDALL - - ; text when seen - dw SwimmermRandallSeenText - - ; text when trainer beaten - dw SwimmermRandallBeatenText - - ; script when lost - dw $0000 - ; script when talk again - dw SwimmermRandallScript -; 0x1a61bc +TrainerSwimmermRandall: + trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, $0000, SwimmermRandallScript -SwimmermRandallScript: ; 0x1a61bc +SwimmermRandallScript: talkaftercancel loadfont writetext UnknownText_0x1a62fa closetext loadmovesprites end -; 0x1a61c4 -LassScript_0x1a61c4: ; 0x1a61c4 +LassScript_0x1a61c4: jumptextfaceplayer UnknownText_0x1a6429 -; 0x1a61c7 -PokefanMScript_0x1a61c7: ; 0x1a61c7 +PokefanMScript_0x1a61c7: special Function10630f iftrue UnknownScript_0x1a61d0 jumptextfaceplayer UnknownText_0x1a646a -; 0x1a61d0 -UnknownScript_0x1a61d0: ; 0x1a61d0 +UnknownScript_0x1a61d0: jumptextfaceplayer UnknownText_0x1a649b -; 0x1a61d3 -LassScript_0x1a61d3: ; 0x1a61d3 +LassScript_0x1a61d3: jumptextfaceplayer UnknownText_0x1a64e6 -; 0x1a61d6 -StandingYoungsterScript_0x1a61d6: ; 0x1a61d6 +StandingYoungsterScript_0x1a61d6: jumptextfaceplayer UnknownText_0x1a6564 -; 0x1a61d9 MonicaScript: faceplayer loadfont checkevent EVENT_GOT_SHARP_BEAK_FROM_MONICA iftrue MonicaMondayScript - checkcode $b + checkcode VAR_WEEKDAY if_not_equal MONDAY, MonicaNotMondayScript checkevent EVENT_MET_MONICA_OF_MONDAY iftrue .MetMonica @@ -194,20 +117,16 @@ MonicaNotMondayScript: loadmovesprites end -MapRoute40Signpost0Script: ; 0x1a6213 +MapRoute40Signpost0Script: jumptext UnknownText_0x1a6767 -; 0x1a6216 -Route40Rock: ; 0x1a6216 +Route40Rock: jumpstd smashrock -; 0x1a6219 -MapRoute40SignpostItem1: ; 0x1a6219 - dw $00ab - db HYPER_POTION -; 0x1a621c +MapRoute40SignpostItem1: + dwb EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION -MovementData_0x1a621c: ; 0x1a621c +MovementData_0x1a621c: step_right step_up step_up @@ -216,128 +135,111 @@ MovementData_0x1a621c: ; 0x1a621c step_up step_up step_end -; 0x1a6224 -MovementData_0x1a6224: ; 0x1a6224 +MovementData_0x1a6224: step_up step_up step_up step_up step_up step_end -; 0x1a622a -MovementData_0x1a622a: ; 0x1a622a +MovementData_0x1a622a: step_up step_up step_up step_up step_end -; 0x1a622f -SwimmermSimonSeenText: ; 0x1a622f +SwimmermSimonSeenText: text "You have to warm" line "up before going" cont "into the water." para "That's basic." done -; 0x1a626e -SwimmermSimonBeatenText: ; 0x1a626e +SwimmermSimonBeatenText: text "OK! Uncle! I give!" done -; 0x1a6282 -UnknownText_0x1a6282: ; 0x1a6282 +UnknownText_0x1a6282: text "CIANWOOD CITY is" line "a good distance" cont "away from here." done -; 0x1a62b4 -SwimmermRandallSeenText: ; 0x1a62b4 +SwimmermRandallSeenText: text "Hey, you're young" line "and fit!" para "Don't ride your" line "#MON! Swim!" done -; 0x1a62ea -SwimmermRandallBeatenText: ; 0x1a62ea +SwimmermRandallBeatenText: text "Uh-oh. I lost…" done -; 0x1a62fa -UnknownText_0x1a62fa: ; 0x1a62fa +UnknownText_0x1a62fa: text "Swimming exercises" line "your entire body." cont "It's healthy." done -; 0x1a632d -SwimmerfElaineSeenText: ; 0x1a632d +SwimmerfElaineSeenText: text "Are you going to" line "CIANWOOD?" para "How about a quick" line "battle first?" done -; 0x1a6369 -SwimmerfElaineBeatenText: ; 0x1a6369 +SwimmerfElaineBeatenText: text "I lost that one!" done -; 0x1a637b -UnknownText_0x1a637b: ; 0x1a637b +UnknownText_0x1a637b: text "I'd say I'm a bet-" line "ter swimmer than" cont "you. Yeah!" done -; 0x1a63a9 -SwimmerfPaulaSeenText: ; 0x1a63a9 +SwimmerfPaulaSeenText: text "No inner tube for" line "me." para "I'm hanging on to" line "a sea #MON!" done -; 0x1a63dd -SwimmerfPaulaBeatenText: ; 0x1a63dd +SwimmerfPaulaBeatenText: text "Ooh, I'm feeling" line "dizzy!" done -; 0x1a63f5 -UnknownText_0x1a63f5: ; 0x1a63f5 +UnknownText_0x1a63f5: text "While I float like" line "this, the waves" cont "carry me along." done -; 0x1a6429 -UnknownText_0x1a6429: ; 0x1a6429 +UnknownText_0x1a6429: text "Although you can't" line "see it from here," para "CIANWOOD is across" line "the sea." done -; 0x1a646a -UnknownText_0x1a646a: ; 0x1a646a +UnknownText_0x1a646a: text "Hm! There's a big" line "building up ahead!" para "What is it?" done -; 0x1a649b -UnknownText_0x1a649b: ; 0x1a649b +UnknownText_0x1a649b: text "Hm! Look at all" line "those serious-" cont "looking trainers" @@ -345,9 +247,8 @@ UnknownText_0x1a649b: ; 0x1a649b para "What? What?" done -; 0x1a64e6 -UnknownText_0x1a64e6: ; 0x1a64e6 +UnknownText_0x1a64e6: text "I came to OLIVINE" line "by ship to see the" @@ -358,9 +259,8 @@ UnknownText_0x1a64e6: ; 0x1a64e6 line "feels so different" cont "from a big city." done -; 0x1a6564 -UnknownText_0x1a6564: ; 0x1a6564 +UnknownText_0x1a6564: text "Have you gone to" line "the BATTLE TOWER?" @@ -376,7 +276,6 @@ UnknownText_0x1a6564: ; 0x1a6564 para "you shouldn't do" line "badly at all." done -; 0x1a6606 MeetMonicaText: text "MONICA: Glad to" @@ -420,41 +319,40 @@ MonicaNotMondayText: cont "Monday. How sad…" done -UnknownText_0x1a6767: ; 0x1a6767 +UnknownText_0x1a6767: text "ROUTE 40" para "CIANWOOD CITY -" line "OLIVINE CITY" done -; 0x1a678e -Route40_MapEventHeader: ; 0x1a678e +Route40_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $5, $9, 1, GROUP_ROUTE_40_BATTLE_TOWER_GATE, MAP_ROUTE_40_BATTLE_TOWER_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 10, 14, $0, MapRoute40Signpost0Script - signpost 8, 7, $7, MapRoute40SignpostItem1 + signpost 10, 14, SIGNPOST_READ, MapRoute40Signpost0Script + signpost 8, 7, SIGNPOST_ITEM, MapRoute40SignpostItem1 - ; people-events +.PersonEvents: db 12 - person_event SPRITE_OLIVINE_RIVAL, 19, 18, $9, $0, 255, 255, $82, 4, TrainerSwimmermSimon, $ffff - person_event SPRITE_OLIVINE_RIVAL, 34, 22, $8, $0, 255, 255, $82, 5, TrainerSwimmermRandall, $ffff - person_event SPRITE_SWIMMER_GIRL, 23, 7, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfElaine, $ffff - person_event SPRITE_SWIMMER_GIRL, 29, 14, $1f, $0, 255, 255, $a2, 3, TrainerSwimmerfPaula, $ffff - person_event SPRITE_ROCK, 15, 11, $18, $0, 255, 255, $0, 0, Route40Rock, $ffff - person_event SPRITE_ROCK, 13, 10, $18, $0, 255, 255, $0, 0, Route40Rock, $ffff - person_event SPRITE_ROCK, 12, 11, $18, $0, 255, 255, $0, 0, Route40Rock, $ffff - person_event SPRITE_LASS, 17, 15, $6, $0, 255, 255, $0, 0, LassScript_0x1a61c4, $ffff - person_event SPRITE_BUENA, 14, 12, $3, $0, 255, 255, $0, 0, MonicaScript, $075e - person_event SPRITE_POKEFAN_M, 10, 11, $9, $0, 255, 255, $0, 0, PokefanMScript_0x1a61c7, $ffff - person_event SPRITE_LASS, 8, 17, $3, $0, 255, 255, $a0, 0, LassScript_0x1a61d3, $ffff - person_event SPRITE_STANDING_YOUNGSTER, 13, 20, $3, $0, 255, 255, $90, 0, StandingYoungsterScript_0x1a61d6, $07cf + person_event SPRITE_OLIVINE_RIVAL, 19, 18, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerSwimmermSimon, -1 + person_event SPRITE_OLIVINE_RIVAL, 34, 22, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerSwimmermRandall, -1 + person_event SPRITE_SWIMMER_GIRL, 23, 7, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerSwimmerfElaine, -1 + person_event SPRITE_SWIMMER_GIRL, 29, 14, OW_RIGHT | $13, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfPaula, -1 + person_event SPRITE_ROCK, 15, 11, OW_LEFT | $10, $0, -1, -1, $0, 0, Route40Rock, -1 + person_event SPRITE_ROCK, 13, 10, OW_LEFT | $10, $0, -1, -1, $0, 0, Route40Rock, -1 + person_event SPRITE_ROCK, 12, 11, OW_LEFT | $10, $0, -1, -1, $0, 0, Route40Rock, -1 + person_event SPRITE_LASS, 17, 15, OW_UP | $2, $0, -1, -1, $0, 0, LassScript_0x1a61c4, -1 + person_event SPRITE_BUENA, 14, 12, OW_DOWN | $3, $0, -1, -1, $0, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY + person_event SPRITE_POKEFAN_M, 10, 11, OW_LEFT | $1, $0, -1, -1, $0, 0, PokefanMScript_0x1a61c7, -1 + person_event SPRITE_LASS, 8, 17, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x1a61d3, -1 + person_event SPRITE_STANDING_YOUNGSTER, 13, 20, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, StandingYoungsterScript_0x1a61d6, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR |