diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-28 01:30:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-28 01:30:36 -0500 |
| commit | da28d1a84b0499bead314e17ae2ff0d13eb03196 (patch) | |
| tree | c212adfc53d1996c06f2e4be1d6e480e687a2ad8 /maps/Route27.asm | |
| parent | bad9e33530af8cdc29ce5629df682fc7915bfff0 (diff) | |
| parent | 2c4777f3363cd64d05fb00084fd83dff8ac31674 (diff) | |
Merge pull request #437 from roukaour/master
Reorganize battle/; rename most "header" misnomers; gfx/pics → gfx/pokemon
Diffstat (limited to 'maps/Route27.asm')
| -rw-r--r-- | maps/Route27.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route27.asm b/maps/Route27.asm index a058af254..e58ae3656 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -59,8 +59,8 @@ TrainerPsychicGilbert: closetext end -TrainerBird_keeperJose2: - trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, Bird_keeperJose2SeenText, Bird_keeperJose2BeatenText, 0, .Script +TrainerBirdKeeperJose2: + trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, BirdKeeperJose2SeenText, BirdKeeperJose2BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE @@ -92,7 +92,7 @@ UnknownScript_0x1a08eb: UnknownScript_0x1a08ff: scall UnknownScript_0x1a096f - winlosstext Bird_keeperJose2BeatenText, 0 + winlosstext BirdKeeperJose2BeatenText, 0 copybytetovar wJoseFightCount if_equal 2, .Fight2 if_equal 1, .Fight1 @@ -443,12 +443,12 @@ PsychicGilbertAfterBattleText: line "premonition says." done -Bird_keeperJose2SeenText: +BirdKeeperJose2SeenText: text "Tweet! Tweet!" line "Tetweet!" done -Bird_keeperJose2BeatenText: +BirdKeeperJose2BeatenText: text "Tweet!" done @@ -493,7 +493,7 @@ Route27_MapEventHeader: object_event SPRITE_COOLTRAINER_F, 10, 72, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfReena, -1 object_event SPRITE_COOLTRAINER_F, 6, 37, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1 object_event SPRITE_YOUNGSTER, 7, 65, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicGilbert, -1 - object_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperJose2, -1 + object_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperJose2, -1 object_event SPRITE_POKE_BALL, 12, 60, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM object_event SPRITE_POKE_BALL, 12, 53, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY object_event SPRITE_FISHER, 10, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 3, Route27FisherScript, -1 |