diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /data/scripts/berry_tree.inc | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/scripts/berry_tree.inc')
| -rw-r--r-- | data/scripts/berry_tree.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 1fda1133f..21ab4256c 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 |