diff options
Diffstat (limited to 'maps/Route11.asm')
| -rw-r--r-- | maps/Route11.asm | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/maps/Route11.asm b/maps/Route11.asm index 05b19d424..9aa324439 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -6,52 +6,52 @@ const_value set 2 const ROUTE11_FRUIT_TREE Route11_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerYoungsterOwen: - trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, YoungsterOwenScript + trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script -YoungsterOwenScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x680b2 + writetext YoungsterOwenAfterBattleText waitbutton closetext end TrainerYoungsterJason: - trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, YoungsterJasonScript + trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, .Script -YoungsterJasonScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x6814a + writetext YoungsterJasonAfterBattleText waitbutton closetext end TrainerPsychicHerman: - trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, PsychicHermanScript + trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, .Script -PsychicHermanScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x6817b + writetext PsychicHermanAfterBattleText waitbutton closetext end TrainerPsychicFidel: - trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, PsychicFidelScript + trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, .Script -PsychicFidelScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x681ec + writetext PsychicFidelAfterBattleText waitbutton closetext end @@ -79,7 +79,7 @@ YoungsterOwenBeatenText: line "happen?" done -UnknownText_0x680b2: +YoungsterOwenAfterBattleText: text "I fought fair and" line "square with honor." @@ -100,7 +100,7 @@ YoungsterJasonBeatenText: line "I got stomped!" done -UnknownText_0x6814a: +YoungsterJasonAfterBattleText: text "I'm going to catch" line "more #MON in" cont "the grass." @@ -114,7 +114,7 @@ PsychicHermanBeatenText: text "…" done -UnknownText_0x6817b: +PsychicHermanAfterBattleText: text "…" para "I lost while I had" @@ -133,7 +133,7 @@ PsychicFidelBeatenText: line "your power…" done -UnknownText_0x681ec: +PsychicFidelAfterBattleText: text "Strength in con-" line "viction…" @@ -153,18 +153,18 @@ Route11_MapEventHeader: .Warps: db 0 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 7, 3, SIGNPOST_READ, Route11Sign - signpost 5, 32, SIGNPOST_ITEM, Route11HiddenRevive + bg_event 7, 3, BGEVENT_READ, Route11Sign + bg_event 5, 32, BGEVENT_ITEM, Route11HiddenRevive -.PersonEvents: +.ObjectEvents: db 5 - person_event SPRITE_YOUNGSTER, 14, 22, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterOwen, -1 - person_event SPRITE_YOUNGSTER, 4, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterJason, -1 - person_event SPRITE_YOUNGSTER, 7, 28, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerPsychicHerman, -1 - person_event SPRITE_YOUNGSTER, 6, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicFidel, -1 - person_event SPRITE_FRUIT_TREE, 2, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1 + object_event SPRITE_YOUNGSTER, 14, 22, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterOwen, -1 + object_event SPRITE_YOUNGSTER, 4, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1 + object_event SPRITE_YOUNGSTER, 7, 28, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1 + object_event SPRITE_YOUNGSTER, 6, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFidel, -1 + object_event SPRITE_FRUIT_TREE, 2, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1 |