diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-03-10 15:31:59 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-03-10 16:00:19 -0400 |
| commit | e002b536af8423f420e13e93d6c0e59f94ee5044 (patch) | |
| tree | b5bd658c777fca9e7d464d776a7f438deed61386 /maps/Route30.asm | |
| parent | 6393ecb7e5d1f105db65cb831964b925db2bb2e8 (diff) | |
Rename more script commands for consistency and predictability
Fixes #540
Diffstat (limited to 'maps/Route30.asm')
| -rw-r--r-- | maps/Route30.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route30.asm b/maps/Route30.asm index a7d066601..90c4ece81 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -40,7 +40,7 @@ TrainerYoungsterJoey: trainer YOUNGSTER, JOEY1, EVENT_BEAT_YOUNGSTER_JOEY, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, 0, .Script .Script: - writecode VAR_CALLERID, PHONE_YOUNGSTER_JOEY + loadvar VAR_CALLERID, PHONE_YOUNGSTER_JOEY endifjustbattled opentext checkflag ENGINE_JOEY @@ -61,14 +61,14 @@ TrainerYoungsterJoey: askforphonenumber PHONE_YOUNGSTER_JOEY ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext YOUNGSTER, JOEY1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1 scall .RegisteredNumber jump .NumberAccepted .Rematch: scall .RematchStd winlosstext YoungsterJoey1BeatenText, 0 - copybytetovar wJoeyFightCount + readmem wJoeyFightCount ifequal 4, .Fight4 ifequal 3, .Fight3 ifequal 2, .Fight2 @@ -90,7 +90,7 @@ TrainerYoungsterJoey: loadtrainer YOUNGSTER, JOEY1 startbattle reloadmapafterbattle - loadvar wJoeyFightCount, 1 + loadmem wJoeyFightCount, 1 clearflag ENGINE_JOEY end @@ -98,7 +98,7 @@ TrainerYoungsterJoey: loadtrainer YOUNGSTER, JOEY2 startbattle reloadmapafterbattle - loadvar wJoeyFightCount, 2 + loadmem wJoeyFightCount, 2 clearflag ENGINE_JOEY end @@ -106,7 +106,7 @@ TrainerYoungsterJoey: loadtrainer YOUNGSTER, JOEY3 startbattle reloadmapafterbattle - loadvar wJoeyFightCount, 3 + loadmem wJoeyFightCount, 3 clearflag ENGINE_JOEY end @@ -114,7 +114,7 @@ TrainerYoungsterJoey: loadtrainer YOUNGSTER, JOEY4 startbattle reloadmapafterbattle - loadvar wJoeyFightCount, 4 + loadmem wJoeyFightCount, 4 clearflag ENGINE_JOEY end |