diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-12 00:50:55 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-12 00:50:55 -0500 |
| commit | 096afdcdaca0714612f3670a3c4a670f312c1c3f (patch) | |
| tree | 0c0bedcd311ab83262e31cf6d9d4c37257143acc /maps/Route1.asm | |
| parent | 98128cd4d8457948e7136a16e08bacff0bc3529d (diff) | |
| parent | f6942b9a136b2ee3b25159ebc4d54509a42c5266 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'maps/Route1.asm')
| -rw-r--r-- | maps/Route1.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route1.asm b/maps/Route1.asm index a8070b4e5..3bda2934f 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -16,7 +16,7 @@ TrainerSchoolboyDanny: SchoolboyDannyScript: end_if_just_battled opentext - writetext UnknownText_0x1ac5d7 + writetext SchoolboyDannyAfterBattleText waitbutton closetext end @@ -27,7 +27,7 @@ TrainerCooltrainerfQuinn: CooltrainerfQuinnScript: end_if_just_battled opentext - writetext UnknownText_0x1ac640 + writetext CooltrainerfQuinnAfterBattleText waitbutton closetext end @@ -49,7 +49,7 @@ SchoolboyDannyBeatenText: line "losing record…" done -UnknownText_0x1ac5d7: +SchoolboyDannyAfterBattleText: text "For trainers, it's" line "a given that we'll" @@ -66,7 +66,7 @@ CooltrainerfQuinnBeatenText: text "Down and out…" done -UnknownText_0x1ac640: +CooltrainerfQuinnAfterBattleText: text "You're strong." para "You obviously must" @@ -96,6 +96,6 @@ Route1_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_YOUNGSTER, 12, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1 - person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1 + person_event SPRITE_YOUNGSTER, 12, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1 + person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1 person_event SPRITE_FRUIT_TREE, 7, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1 |