diff options
Diffstat (limited to 'maps/Route2.asm')
| -rw-r--r-- | maps/Route2.asm | 212 |
1 files changed, 63 insertions, 149 deletions
diff --git a/maps/Route2.asm b/maps/Route2.asm index e37d96887..2fb81e3f8 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -1,202 +1,120 @@ -Route2_MapScriptHeader: ; 0x1ac2ba - ; trigger count +Route2_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 -; 0x1ac2bc -TrainerBug_catcherRob: ; 0x1ac2bc - ; bit/flag number - dw $539 +TrainerBug_catcherRob: + trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, $0000, Bug_catcherRobScript - ; trainer group && trainer id - db BUG_CATCHER, ROB - - ; text when seen - dw Bug_catcherRobSeenText - - ; text when trainer beaten - dw Bug_catcherRobBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherRobScript -; 0x1ac2c8 - -Bug_catcherRobScript: ; 0x1ac2c8 +Bug_catcherRobScript: talkaftercancel loadfont writetext UnknownText_0x1ac34d closetext loadmovesprites end -; 0x1ac2d0 - -TrainerBug_catcherEd: ; 0x1ac2d0 - ; bit/flag number - dw $53a - - ; trainer group && trainer id - db BUG_CATCHER, ED - - ; text when seen - dw Bug_catcherEdSeenText - - ; text when trainer beaten - dw Bug_catcherEdBeatenText - - ; script when lost - dw $0000 - ; script when talk again - dw Bug_catcherEdScript -; 0x1ac2dc +TrainerBug_catcherEd: + trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, $0000, Bug_catcherEdScript -Bug_catcherEdScript: ; 0x1ac2dc +Bug_catcherEdScript: talkaftercancel loadfont writetext UnknownText_0x1ac3cf closetext loadmovesprites end -; 0x1ac2e4 -TrainerBug_catcherDoug: ; 0x1ac2e4 - ; bit/flag number - dw $543 +TrainerBug_catcherDoug: + trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, $0000, Bug_catcherDougScript - ; trainer group && trainer id - db BUG_CATCHER, DOUG - - ; text when seen - dw Bug_catcherDougSeenText - - ; text when trainer beaten - dw Bug_catcherDougBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherDougScript -; 0x1ac2f0 - -Bug_catcherDougScript: ; 0x1ac2f0 +Bug_catcherDougScript: talkaftercancel loadfont writetext UnknownText_0x1ac423 closetext loadmovesprites end -; 0x1ac2f8 -MapRoute2Signpost0Script: ; 0x1ac2f8 +MapRoute2Signpost0Script: jumptext UnknownText_0x1ac47a -; 0x1ac2fb -MapRoute2Signpost1Script: ; 0x1ac2fb +MapRoute2Signpost1Script: jumptext UnknownText_0x1ac49f -; 0x1ac2fe -ItemFragment_0x1ac2fe: ; 0x1ac2fe +ItemFragment_0x1ac2fe: db DIRE_HIT, 1 -; 0x1ac300 -ItemFragment_0x1ac300: ; 0x1ac300 +ItemFragment_0x1ac300: db MAX_POTION, 1 -; 0x1ac302 -ItemFragment_0x1ac302: ; 0x1ac302 +ItemFragment_0x1ac302: db CARBOS, 1 -; 0x1ac304 -ItemFragment_0x1ac304: ; 0x1ac304 +ItemFragment_0x1ac304: db ELIXER, 1 -; 0x1ac306 -FruitTreeScript_0x1ac306: ; 0x1ac306 +FruitTreeScript_0x1ac306: fruittree $19 -; 0x1ac308 - -MapRoute2SignpostItem2: ; 0x1ac308 - dw $00ed - db MAX_ETHER - -; 0x1ac30b - -MapRoute2SignpostItem3: ; 0x1ac30b - dw $00ee - db FULL_HEAL - -; 0x1ac30e - -MapRoute2SignpostItem4: ; 0x1ac30e - dw $00ef - db FULL_RESTORE - -; 0x1ac311 - -MapRoute2SignpostItem5: ; 0x1ac311 - dw $00f0 - db REVIVE - -; 0x1ac314 - -Bug_catcherRobSeenText: ; 0x1ac314 + +MapRoute2SignpostItem2: + dwb EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER + +MapRoute2SignpostItem3: + dwb EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL + +MapRoute2SignpostItem4: + dwb EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE + +MapRoute2SignpostItem5: + dwb EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE + +Bug_catcherRobSeenText: text "My bug #MON are" line "tough. Prepare to" cont "lose!" done -; 0x1ac33d -Bug_catcherRobBeatenText: ; 0x1ac33d +Bug_catcherRobBeatenText: text "I was whipped…" done -; 0x1ac34d -UnknownText_0x1ac34d: ; 0x1ac34d +UnknownText_0x1ac34d: text "I'm going to look" line "for stronger bug" cont "#MON." done -; 0x1ac376 -Bug_catcherEdSeenText: ; 0x1ac376 +Bug_catcherEdSeenText: text "If you walk in" line "tall grass wearing" para "shorts, do you get" line "nicks and cuts?" done -; 0x1ac3bc -Bug_catcherEdBeatenText: ; 0x1ac3bc +Bug_catcherEdBeatenText: text "Ouch, ouch, ouch!" done -; 0x1ac3cf -UnknownText_0x1ac3cf: ; 0x1ac3cf +UnknownText_0x1ac3cf: text "They'll really" line "sting when you" cont "take a bath." done -; 0x1ac3fa -Bug_catcherDougSeenText: ; 0x1ac3fa +Bug_catcherDougSeenText: text "Why don't girls" line "like bug #MON?" done -; 0x1ac419 -Bug_catcherDougBeatenText: ; 0x1ac419 +Bug_catcherDougBeatenText: text "No good!" done -; 0x1ac423 -UnknownText_0x1ac423: ; 0x1ac423 +UnknownText_0x1ac423: text "Bug #MON squish" line "like plush toys" @@ -206,26 +124,23 @@ UnknownText_0x1ac423: ; 0x1ac423 para "I love how they" line "feel!" done -; 0x1ac47a -UnknownText_0x1ac47a: ; 0x1ac47a +UnknownText_0x1ac47a: text "ROUTE 2" para "VIRIDIAN CITY -" line "PEWTER CITY" done -; 0x1ac49f -UnknownText_0x1ac49f: ; 0x1ac49f +UnknownText_0x1ac49f: text "DIGLETT'S CAVE" done -; 0x1ac4af -Route2_MapEventHeader: ; 0x1ac4af +Route2_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $f, $f, 1, GROUP_ROUTE_2_NUGGET_SPEECH_HOUSE, MAP_ROUTE_2_NUGGET_SPEECH_HOUSE warp_def $1f, $f, 3, GROUP_ROUTE_2_GATE, MAP_ROUTE_2_GATE @@ -233,26 +148,25 @@ Route2_MapEventHeader: ; 0x1ac4af warp_def $1b, $11, 2, GROUP_ROUTE_2_GATE, MAP_ROUTE_2_GATE warp_def $7, $c, 3, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 - signpost 51, 7, $0, MapRoute2Signpost0Script - signpost 9, 11, $0, MapRoute2Signpost1Script - signpost 23, 7, $7, MapRoute2SignpostItem2 - signpost 14, 4, $7, MapRoute2SignpostItem3 - signpost 27, 4, $7, MapRoute2SignpostItem4 - signpost 30, 11, $7, MapRoute2SignpostItem5 - - ; people-events + signpost 51, 7, SIGNPOST_READ, MapRoute2Signpost0Script + signpost 9, 11, SIGNPOST_READ, MapRoute2Signpost1Script + signpost 23, 7, SIGNPOST_ITEM, MapRoute2SignpostItem2 + signpost 14, 4, SIGNPOST_ITEM, MapRoute2SignpostItem3 + signpost 27, 4, SIGNPOST_ITEM, MapRoute2SignpostItem4 + signpost 30, 11, SIGNPOST_ITEM, MapRoute2SignpostItem5 + +.PersonEvents: db 8 - person_event SPRITE_BUG_CATCHER, 49, 14, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherRob, $ffff - person_event SPRITE_BUG_CATCHER, 8, 10, $1f, $0, 255, 255, $b2, 3, TrainerBug_catcherEd, $ffff - person_event SPRITE_BUG_CATCHER, 44, 4, $9, $0, 255, 255, $b2, 3, TrainerBug_catcherDoug, $ffff - person_event SPRITE_POKE_BALL, 33, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac2fe, $0783 - person_event SPRITE_POKE_BALL, 27, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac300, $0784 - person_event SPRITE_POKE_BALL, 6, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac302, $0785 - person_event SPRITE_POKE_BALL, 54, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac304, $0786 - person_event SPRITE_FRUIT_TREE, 18, 14, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac306, $ffff -; 0x1ac554 + person_event SPRITE_BUG_CATCHER, 49, 14, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 5, TrainerBug_catcherRob, -1 + person_event SPRITE_BUG_CATCHER, 8, 10, OW_RIGHT | $13, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherEd, -1 + person_event SPRITE_BUG_CATCHER, 44, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherDoug, -1 + person_event SPRITE_POKE_BALL, 33, 4, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac2fe, EVENT_ROUTE_2_DIRE_HIT + person_event SPRITE_POKE_BALL, 27, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac300, EVENT_ROUTE_2_MAX_POTION + person_event SPRITE_POKE_BALL, 6, 23, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac302, EVENT_ROUTE_2_CARBOS + person_event SPRITE_POKE_BALL, 54, 18, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac304, EVENT_ROUTE_2_ELIXER + person_event SPRITE_FRUIT_TREE, 18, 14, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1ac306, -1 |