diff options
Diffstat (limited to 'data/scripts/day_care.inc')
| -rw-r--r-- | data/scripts/day_care.inc | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 4c57e0b9f..acb87170a 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -3,11 +3,11 @@ Route117_EventScript_1B222D:: @ 81B222D faceplayer special sp0B5_daycare specialval RESULT, sp0B6_daycare - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_1B2262 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq Route117_EventScript_1B22E7 - compare RESULT, 3 + compare_var_to_imm RESULT, 3 goto_if_eq Route117_EventScript_1B22FE msgbox Route117_Text_1B25CB, 4 release @@ -15,10 +15,10 @@ Route117_EventScript_1B222D:: @ 81B222D Route117_EventScript_1B2262:: @ 81B2262 msgbox Route117_Text_1B2659, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_1B2298 msgbox Route117_Text_1B28C4, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_1B2298 msgbox Route117_Text_1B2745, 4 clearflag 134 @@ -28,7 +28,7 @@ Route117_EventScript_1B2262:: @ 81B2262 Route117_EventScript_1B2298:: @ 81B2298 specialval RESULT, CalculatePlayerPartyCount - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if 5, Route117_EventScript_1B22B2 msgbox Route117_Text_1B2766, 4 release @@ -48,7 +48,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2 Route117_EventScript_1B22CD:: @ 81B22CD specialval RESULT, sub_8042B4C - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route117_EventScript_1B22DE return @@ -82,14 +82,14 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 lock faceplayer specialval RESULT, sp0B6_daycare - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2407 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B242B - compare RESULT, 3 + compare_var_to_imm RESULT, 3 goto_if_eq Route117_PokemonDayCare_EventScript_1B2558 msgbox Route117_PokemonDayCare_Text_1B28F2, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B236C msgbox Route117_PokemonDayCare_Text_1B2A14, 4 release @@ -97,16 +97,16 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C specialval RESULT, sub_8095B6C - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B23F3 msgbox Route117_PokemonDayCare_Text_1B2947, 4 fadescreen 1 special ChooseSendDaycareMon waitstate - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 specialval RESULT, sub_8095C10 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD specialval 0x8005, sub_8042328 checksound @@ -116,7 +116,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C special Daycare_SendPokemon_Special inccounter GAME_STAT_USED_DAYCARE specialval RESULT, sp0B6_daycare - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23DA release end @@ -128,7 +128,7 @@ Route117_PokemonDayCare_EventScript_1B23D0:: @ 81B23D0 Route117_PokemonDayCare_EventScript_1B23DA:: @ 81B23DA msgbox Route117_PokemonDayCare_Text_1B29AD, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B236C goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -154,7 +154,7 @@ Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411 Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A specialval RESULT, sub_80417B8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 5, Route117_PokemonDayCare_EventScript_1B2411 return @@ -163,26 +163,26 @@ Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B setvar 0x8004, 0 call Route117_PokemonDayCare_EventScript_1B241A msgbox Route117_PokemonDayCare_Text_1B29AD, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B236C msgbox Route117_PokemonDayCare_Text_1B2BF6, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 specialval RESULT, CalculatePlayerPartyCount - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq Route117_PokemonDayCare_EventScript_1B2539 specialval RESULT, sp0B6_daycare setvar 0x8004, 0 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B24A8 special ShowDaycareLevelMenu waitstate copyvar 0x8004, RESULT - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 goto Route117_PokemonDayCare_EventScript_1B24A8 end @@ -190,14 +190,14 @@ Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8 special sub_8041770 msgbox Route117_PokemonDayCare_Text_1B2B49, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B24C4 goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4 specialval RESULT, sub_80B7CE8 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B24DE msgbox Route117_PokemonDayCare_Text_1B2A30, 4 release @@ -215,14 +215,14 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE msgbox Route117_PokemonDayCare_Text_1B2B93, 4 waitpokecry specialval RESULT, sp0B6_daycare - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B2520 goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B2520:: @ 81B2520 msgbox Route117_PokemonDayCare_Text_1B2A4F, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -264,7 +264,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 setvar 0x8004, 1 call Route117_PokemonDayCare_EventScript_1B241A msgbox Route117_PokemonDayCare_Text_1B2BF6, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 msgbox Route117_PokemonDayCare_Text_1B2A76, 4 release @@ -273,7 +273,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 @ 81B2591 special ShowDaycareLevelMenu waitstate - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 copyvar 0x8004, RESULT specialval RESULT, sub_8041648 |