From 616edd6c3f591ed62f11aedbeb0dbc744fac4c07 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 15 Nov 2017 20:08:31 +0100 Subject: daycare file is decompiled --- data/scripts/day_care.inc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 8c538f7aa..2084e995c 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -1,8 +1,8 @@ Route117_EventScript_291C18:: @ 8291C18 lock faceplayer - special sp0B5_daycare - specialvar VAR_RESULT, sp0B6_daycare + special GetDaycareMonNicknames + specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 1 goto_eq Route117_EventScript_291C4D compare_var_to_value VAR_RESULT, 2 @@ -56,7 +56,7 @@ Route117_EventScript_291CC8:: @ 8291CC8 return Route117_EventScript_291CD1:: @ 8291CD1 - special sp0B5_daycare + special GetDaycareMonNicknames msgbox Route117_Text_292114, 4 setvar VAR_0x8004, 0 call Route117_EventScript_291CB7 @@ -64,9 +64,9 @@ Route117_EventScript_291CD1:: @ 8291CD1 end Route117_EventScript_291CE8:: @ 8291CE8 - special sp0B5_daycare + special GetDaycareMonNicknames msgbox Route117_Text_292299, 4 - special sp0B9_daycare_relationship_comment + special SetDaycareCompatibilityString special sub_8138AC0 waitmessage waitbuttonpress @@ -80,7 +80,7 @@ Route117_EventScript_291CE8:: @ 8291CE8 Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11 lock faceplayer - specialvar VAR_RESULT, sp0B6_daycare + specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291E0B compare_var_to_value VAR_RESULT, 2 @@ -103,21 +103,21 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 goto_eq Route117_PokemonDayCare_EventScript_291E01 msgbox Route117_PokemonDayCare_Text_292349, 4 fadescreen 1 - special sub_8071330 + special ChooseSendDaycareMon waitstate compare_var_to_value VAR_0x8004, 255 goto_eq Route117_PokemonDayCare_EventScript_291DCA specialvar VAR_RESULT, sub_80C70AC compare_var_to_value VAR_RESULT, 0 goto_eq Route117_PokemonDayCare_EventScript_291DF7 - specialvar VAR_0x8005, sub_8070C58 + specialvar VAR_0x8005, GetSelectedMonNickAndSpecies waitse playmoncry VAR_0x8005, 0 msgbox Route117_PokemonDayCare_Text_292370, 4 waitmoncry special StoreSelectedPokemonInDaycare incrementgamestat 47 - specialvar VAR_RESULT, sp0B6_daycare + specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291DD4 release @@ -182,11 +182,11 @@ Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D specialvar VAR_RESULT, CalculatePlayerPartyCount compare_var_to_value VAR_RESULT, 6 goto_eq Route117_PokemonDayCare_EventScript_291F3D - specialvar VAR_RESULT, sp0B6_daycare + specialvar VAR_RESULT, GetDaycareState setvar VAR_0x8004, 0 compare_var_to_value VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291EAC - special sub_80712C0 + special ShowDaycareLevelMenu waitstate copyvar VAR_0x8004, VAR_RESULT compare_var_to_value VAR_RESULT, 2 @@ -221,7 +221,7 @@ Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2 playmoncry VAR_RESULT, 0 msgbox Route117_PokemonDayCare_Text_292593, 4 waitmoncry - specialvar VAR_RESULT, sp0B6_daycare + specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291F24 goto Route117_PokemonDayCare_EventScript_291DCA @@ -278,7 +278,7 @@ Route117_PokemonDayCare_EventScript_291F5C:: @ 8291F5C end Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95 - special sub_80712C0 + special ShowDaycareLevelMenu waitstate compare_var_to_value VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291DCA -- cgit v1.2.3 From a98c6bf210cec0591badb51be1e472c5fb4f1f1a Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Thu, 16 Nov 2017 09:30:04 -0600 Subject: Fix build by renaming specials --- data/scripts/cable_club.inc | 2 +- data/scripts/day_care.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'data/scripts') 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 -- cgit v1.2.3