diff options
| author | itskobold <itskobold@users.noreply.github.com> | 2017-11-17 09:25:40 +0000 |
|---|---|---|
| committer | itskobold <itskobold@users.noreply.github.com> | 2017-11-17 09:25:40 +0000 |
| commit | 370e47beeef3f115d071161a7b2f09dcfbd2168b (patch) | |
| tree | 648fdb13c6a341e8efc5ba5c734f7cd25d826b60 /data/scripts | |
| parent | 46ee15b96250d53b4100171c572f6e6b6e2c99c6 (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/cable_club.inc | 2 | ||||
| -rw-r--r-- | data/scripts/day_care.inc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index c38305f20..71e3303b5 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1058,7 +1058,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F end OldaleTown_PokemonCenter_2F_EventScript_277626:: @ 8277626 - specialvar VAR_RESULT, sub_80C7008 + specialvar VAR_RESULT, CountPartyNonEggMons compare_var_to_value VAR_RESULT, 2 goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27764C specialvar VAR_RESULT, sub_80F9370 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 63ebafe4f..a7000460b 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -95,7 +95,7 @@ Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11 end Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 - specialvar VAR_RESULT, sub_80C7008 + specialvar VAR_RESULT, CountPartyNonEggMons compare_var_to_value VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291DED specialvar VAR_RESULT, sub_80722E0 @@ -107,7 +107,7 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 waitstate compare_var_to_value VAR_0x8004, 255 goto_eq Route117_PokemonDayCare_EventScript_291DCA - specialvar VAR_RESULT, sub_80C70AC + specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot compare_var_to_value VAR_RESULT, 0 goto_eq Route117_PokemonDayCare_EventScript_291DF7 specialvar VAR_0x8005, sub_8070C58 |