diff options
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/day_care.inc | 8 | ||||
| -rw-r--r-- | data/scripts/field_moves.inc | 36 | ||||
| -rw-r--r-- | data/scripts/surf.inc | 4 |
3 files changed, 24 insertions, 24 deletions
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index bac14d221..c089472cb 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -8,8 +8,8 @@ Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398 specialvar VAR_RESULT, IsThereMonInRoute5Daycare compare VAR_RESULT, 1 goto_if_eq EventScript_1BF46E - msgbox Text_19DD66, 5 - compare VAR_RESULT, 1 + msgbox Text_19DD66, MSGBOX_YESNO + compare VAR_RESULT, YES goto_if_eq EventScript_1BF3DD msgbox Text_19DDB2 goto EventScript_1BF541 @@ -64,8 +64,8 @@ EventScript_1BF46E:: @ 81BF46E compare VAR_RESULT, 0 call_if_eq EventScript_1BF4B3 special GetCostToWithdrawRoute5DaycareMon - msgbox Text_19DE80, 5 - compare VAR_RESULT, 1 + msgbox Text_19DE80, MSGBOX_YESNO + compare VAR_RESULT, YES goto_if_eq EventScript_1BF4BC goto EventScript_1BF444 end diff --git a/data/scripts/field_moves.inc b/data/scripts/field_moves.inc index 3d808fa86..e1e0beebb 100644 --- a/data/scripts/field_moves.inc +++ b/data/scripts/field_moves.inc @@ -10,8 +10,8 @@ EventScript_InteractWithCutTreeObject:: @ 81BDF13 setfieldeffectarg 0, VAR_RESULT getpartymonname 0, VAR_RESULT getmovename 1, MOVE_CUT - msgbox gUnknown_81BDF94, 5 - compare VAR_RESULT, 0 + msgbox gUnknown_81BDF94, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_1BDF91 msgbox gUnknown_81BDFD7 closemessage @@ -39,7 +39,7 @@ Movement_1BDF85:: @ 81BDF85 step_end EventScript_1BDF87:: @ 81BDF87 - msgbox gUnknown_81BDFE3, 3 + msgbox gUnknown_81BDFE3, MSGBOX_SIGN releaseall end @@ -72,8 +72,8 @@ EventScript_InteractWithRockSmashRockObject:: @ 81BE00C setfieldeffectarg 0, VAR_RESULT getpartymonname 0, VAR_RESULT getmovename 1, MOVE_ROCK_SMASH - msgbox Text_1BE09D, 5 - compare VAR_RESULT, 0 + msgbox Text_1BE09D, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_1BE09A msgbox gUnknown_81BDFD7 closemessage @@ -109,7 +109,7 @@ Movement_1BE08F:: @ 81BE08F step_end EventScript_1BE091:: @ 81BE091 - msgbox gUnknown_81BE0E2, 3 + msgbox gUnknown_81BE0E2, MSGBOX_SIGN end EventScript_1BE09A:: @ 81BE09A @@ -136,8 +136,8 @@ EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D compare VAR_RESULT, PARTY_SIZE goto_if_eq EventScript_1BE185 setfieldeffectarg 0, VAR_RESULT - msgbox gUnknown_81BE19A, 5 - compare VAR_RESULT, 0 + msgbox gUnknown_81BE19A, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_1BE197 closemessage dofieldeffect FLDEFF_USE_STRENGTH @@ -154,15 +154,15 @@ EventScript_FldEffStrength:: @ 81BE16E EventScript_1BE179:: @ 81BE179 setflag FLAG_SYS_STRENGTH_ACTIVE - msgbox gUnknown_81BE1FA, 3 + msgbox gUnknown_81BE1FA, MSGBOX_SIGN end EventScript_1BE185:: @ 81BE185 - msgbox gUnknown_81BE244, 3 + msgbox gUnknown_81BE244, MSGBOX_SIGN end EventScript_1BE18E:: @ 81BE18E - msgbox gUnknown_81BE284, 3 + msgbox gUnknown_81BE284, MSGBOX_SIGN end EventScript_1BE197:: @ 81BE197 @@ -198,8 +198,8 @@ gUnknown_81BE2B7:: @ 81BE2B7 goto_if_eq EventScript_1BE300 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT - msgbox gUnknown_81BE33F, 5 - compare VAR_RESULT, 0 + msgbox gUnknown_81BE33F, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_1BE308 msgbox gUnknown_81BE378 dofieldeffect FLDEFF_USE_WATERFALL @@ -233,8 +233,8 @@ EventScript_1BE38B:: @ 81BE38B getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT setfieldeffectarg 1, 1 - msgbox gUnknown_81BE469, 5 - compare VAR_RESULT, 0 + msgbox gUnknown_81BE469, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_1BE3D2 msgbox gUnknown_81BE49B dofieldeffect FLDEFF_USE_DIVE @@ -256,8 +256,8 @@ EventScript_1BE3D4:: @ 81BE3D4 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT setfieldeffectarg 1, 1 - msgbox gUnknown_81BE4EF, 5 - compare VAR_RESULT, 0 + msgbox gUnknown_81BE4EF, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_1BE429 msgbox gUnknown_81BE49B dofieldeffect FLDEFF_USE_DIVE @@ -299,7 +299,7 @@ gUnknown_81BE52F:: @ 81BE52F .string "DIVE can't be used here.$" EventScript_FailSweetScent:: @ 81BE564 - msgbox Text_1BE56D, 3 + msgbox Text_1BE56D, MSGBOX_SIGN end Text_1BE56D:: @ 81BE56D diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc index 782c71a92..edc11e317 100644 --- a/data/scripts/surf.inc +++ b/data/scripts/surf.inc @@ -8,8 +8,8 @@ EventScript_UseSurf:: @ 81A6AC8 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT lockall - msgbox Text_1A556E, 5 - compare VAR_RESULT, 0 + msgbox Text_1A556E, MSGBOX_YESNO + compare VAR_RESULT, NO goto_if_eq EventScript_UseSurfRelease msgbox Text_1A55A5 dofieldeffect FLDEFF_USE_SURF |