diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-01-24 21:42:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-24 21:42:44 -0500 |
| commit | 9ecc991814986fdadecd83247adf13e10eaf77ed (patch) | |
| tree | c7a356e72b31deee8cc91e05d4da173796231610 /maps | |
| parent | 79ea091ff627d5e3613799698b5bf1ea95f45148 (diff) | |
| parent | e288ef20d539a04042c5e91cc562db04bb33b707 (diff) | |
Merge pull request #593 from mid-kid/temp
More patches
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/LakeOfRage.asm | 2 | ||||
| -rw-r--r-- | maps/Route36.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index a63fb147e..fbfaa93bb 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -87,7 +87,7 @@ RedGyarados: loadwildmon GYARADOS, 30 writecode VAR_BATTLETYPE, BATTLETYPE_SHINY startbattle - ifequal $1, .NotBeaten + ifequal LOSE, .NotBeaten disappear LAKEOFRAGE_GYARADOS .NotBeaten: reloadmapafterbattle diff --git a/maps/Route36.asm b/maps/Route36.asm index 67458e6f5..d9845bc30 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -77,7 +77,7 @@ WateredWeirdTreeScript:: ; export (for when you use Squirtbottle from pack) loadwildmon SUDOWOODO, 20 startbattle setevent EVENT_FOUGHT_SUDOWOODO - ifequal $2, DidntCatchSudowoodo + ifequal DRAW, DidntCatchSudowoodo disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN reloadmapafterbattle |