diff options
author | Made-s <made111@gmx.de> | 2018-01-06 19:20:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-06 19:20:14 +0100 |
commit | cc2c226d2d598bb65376b53f6828e69bdf43245d (patch) | |
tree | efc9b28d5c846371fb38e2984f4e71a3a5d03efe /data/scripts/day_care.inc | |
parent | 8906ac68e7c5caf7c62597abf16affafc2bb05a3 (diff) | |
parent | 7bf330e9f2b048a9b3d7882c80c9aa413c55484a (diff) |
Merge branch 'master' into master
Diffstat (limited to 'data/scripts/day_care.inc')
-rw-r--r-- | data/scripts/day_care.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 0d0d83801..fc5df6abe 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -29,7 +29,7 @@ Route117_EventScript_1B2262:: @ 81B2262 Route117_EventScript_1B2298:: @ 81B2298 specialvar RESULT, CalculatePlayerPartyCount compare RESULT, 6 - goto_if 5, Route117_EventScript_1B22B2 + goto_if_ne Route117_EventScript_1B22B2 msgbox Route117_Text_1B2766, 4 release end @@ -49,7 +49,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2 Route117_EventScript_1B22CD:: @ 81B22CD specialvar RESULT, sub_8042B4C compare RESULT, 1 - call_if 1, Route117_EventScript_1B22DE + call_if_eq Route117_EventScript_1B22DE return Route117_EventScript_1B22DE:: @ 81B22DE @@ -155,7 +155,7 @@ Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411 Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A specialvar RESULT, GetNumLevelsGainedFromDaycare compare RESULT, 0 - call_if 5, Route117_PokemonDayCare_EventScript_1B2411 + call_if_ne Route117_PokemonDayCare_EventScript_1B2411 return Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B |