diff options
| author | yenatch <yenatch@gmail.com> | 2018-01-22 01:06:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 01:06:48 -0500 |
| commit | c60f1331fef22b886adf3472d2b4f348832cfaf7 (patch) | |
| tree | 5a471fad61e406f5b3ca1aba67ced0186de01c52 /maps/Route38.asm | |
| parent | f27f79488a460f0a89670f3611e1e9e175baf5d6 (diff) | |
| parent | 7fba864883732ccecb1221ae7ff97492d112362a (diff) | |
Merge pull request #456 from Rangi42/master
OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming
Diffstat (limited to 'maps/Route38.asm')
| -rw-r--r-- | maps/Route38.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/Route38.asm b/maps/Route38.asm index 526bf3e36..c228429ba 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -7,7 +7,7 @@ const_value set 2 const ROUTE38_FRUIT_TREE const ROUTE38_BUENA2 -Route38_MapScriptHeader: +Route38_MapScripts: .SceneScripts: db 0 @@ -61,9 +61,9 @@ TrainerLassDana1: scall .AskNumber2F .AskForPhoneNumber: askforphonenumber PHONE_LASS_DANA - if_equal $1, .PhoneFull - if_equal $2, .DeclinedPhoneNumber - trainertotext LASS, DANA1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .DeclinedPhoneNumber + trainertotext LASS, DANA1, MEM_BUFFER_0 scall .RegisteredPhoneNumber jump .NumberAccepted @@ -197,9 +197,9 @@ TrainerSchoolboyChad1: scall .AskPhoneNumber2 .AskToRegisterNumber: askforphonenumber PHONE_SCHOOLBOY_CHAD - if_equal $1, .PhoneFull - if_equal $2, .SaidNo - trainertotext SCHOOLBOY, CHAD1, $0 + if_equal PHONE_CONTACTS_FULL, .PhoneFull + if_equal PHONE_CONTACT_REFUSED, .SaidNo + trainertotext SCHOOLBOY, CHAD1, MEM_BUFFER_0 scall .RegisteredChad jump .HaveChadsNumber @@ -472,7 +472,7 @@ Route38TrainerTipsText: cont "its evolution." done -Route38_MapEventHeader: +Route38_MapEvents: ; filler db 0, 0 |