diff options
| author | yenatch <yenatch@gmail.com> | 2018-05-06 22:27:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-06 22:27:22 -0400 |
| commit | 59c4d824e65409f6de211d6e0fd354ca4ef6c61e (patch) | |
| tree | dea75336bac86e9c6361656d8ab8439fea9c82ec /maps | |
| parent | a63d9dfd4f4b214034c9a88a14b53635c10914d9 (diff) | |
| parent | acdb3020359de30ccde3bd1227883902b18b60a9 (diff) | |
Merge pull request #509 from mid-kid/master
A fix-various-little-things PR
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/OaksLab.asm | 2 | ||||
| -rw-r--r-- | maps/Route31.asm | 2 | ||||
| -rw-r--r-- | maps/Route35GoldenrodGate.asm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 1931747e5..86ac71ac0 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -223,7 +223,7 @@ OaksLabPoster2Text: line "manner." done -OaksLabTrashcanText +OaksLabTrashcanText: text "There's nothing in" line "here…" done diff --git a/maps/Route31.asm b/maps/Route31.asm index 36bf98412..1a7ba7205 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -195,7 +195,7 @@ Route31MailRecipientScript: .TryGiveKenya: writetext Text_Route31SleepyManGotMail buttonsound - checkpokeitem ReceivedSpearowMailText + checkpokemail ReceivedSpearowMailText ifequal POKEMAIL_WRONG_MAIL, .WrongMail ifequal POKEMAIL_REFUSED, .Refused ifequal POKEMAIL_NO_MAIL, .NoMail diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index 79adcf93e..52089c4db 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -29,7 +29,7 @@ RandyScript: playsound SFX_KEY_ITEM waitsfx givepoke SPEAROW, 10, NO_ITEM, TRUE, GiftSpearowName, GiftSpearowOTName - givepokeitem GiftSpearowMail + givepokemail GiftSpearowMail setevent EVENT_GOT_KENYA .alreadyhavekenya writetext UnknownText_0x69ed6 |