diff options
| author | garak <garakmon@gmail.com> | 2018-12-16 20:05:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 20:05:31 -0500 |
| commit | e292d0ca8375a8c54907d6bcf404e2e084344156 (patch) | |
| tree | b9c59449d47bf73d98d3e38fa26804a163d871ab /data/scripts/berry_tree.inc | |
| parent | 10237e8d13b35474ea999b4e9139f9a48a80c53d (diff) | |
| parent | d1e6e705ccf05f93933ae4494b1d388550d81d26 (diff) | |
Merge branch 'master' into fldeff
Diffstat (limited to 'data/scripts/berry_tree.inc')
| -rw-r--r-- | data/scripts/berry_tree.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 6b9fb14ef..238541ee6 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -31,7 +31,7 @@ Route102_EventScript_274359:: @ 8274359 end Route102_EventScript_274374:: @ 8274374 - msgbox Route102_Text_274507, 5 + msgbox Route102_Text_274507, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route102_EventScript_274393 compare VAR_RESULT, 0 @@ -106,7 +106,7 @@ Route102_EventScript_274421:: @ 8274421 lock faceplayer special EventObjectInteractionGetBerryCountString - msgbox Route102_Text_2745EE, 5 + msgbox Route102_Text_2745EE, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route102_EventScript_274448 compare VAR_RESULT, 0 @@ -155,7 +155,7 @@ Route102_EventScript_27448D:: @ 827448D compare VAR_RESULT, 0 goto_eq Route102_EventScript_2744BE special EventObjectInteractionGetBerryName - msgbox Route102_Text_2746E4, 5 + msgbox Route102_Text_2746E4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route102_EventScript_2744C4 compare VAR_RESULT, 0 @@ -193,10 +193,10 @@ Route102_EventScript_2744DD:: @ 82744DD return Route102_Text_2744F0: @ 82744F0 - .string "It’s soft, loamy soil.$" + .string "It's soft, loamy soil.$" Route102_Text_274507: @ 8274507 - .string "It’s soft, loamy soil.\n" + .string "It's soft, loamy soil.\n" .string "Want to plant a BERRY?$" Route102_Text_274535: @ 8274535 @@ -235,13 +235,13 @@ Route102_Text_27461B: @ 827461B Route102_Text_274630: @ 8274630 .string "{PLAYER} put away the {STR_VAR_1}\n" - .string "in the BAG’s BERRIES POCKET.\p" + .string "in the BAG's BERRIES POCKET.\p" .string "The soil returned to its soft and\n" .string "loamy state.$" Route102_Text_27468F: @ 827468F - .string "The BAG’s BERRIES POCKET is full.\p" - .string "The {STR_VAR_1} couldn’t be taken.$" + .string "The BAG's BERRIES POCKET is full.\p" + .string "The {STR_VAR_1} couldn't be taken.$" Route102_Text_2746CB: @ 82746CB .string "{PLAYER} left the {STR_VAR_1}\n" |