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/maps/FallarborTown/scripts.inc | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/maps/FallarborTown/scripts.inc')
| -rw-r--r-- | data/maps/FallarborTown/scripts.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 21cea72e1..80dc91f9e 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -13,21 +13,21 @@ FallarborTown_EventScript_1EB20C:: @ 81EB20C faceplayer checkflag FLAG_0x08B goto_eq FallarborTown_EventScript_1EB221 - msgbox FallarborTown_Text_1EB26B, 4 + msgbox FallarborTown_Text_1EB26B, MSGBOX_DEFAULT release end FallarborTown_EventScript_1EB221:: @ 81EB221 - msgbox FallarborTown_Text_1EB2DE, 4 + msgbox FallarborTown_Text_1EB2DE, MSGBOX_DEFAULT release end FallarborTown_EventScript_1EB22B:: @ 81EB22B - msgbox FallarborTown_Text_1EB35F, 2 + msgbox FallarborTown_Text_1EB35F, MSGBOX_NPC end FallarborTown_EventScript_1EB234:: @ 81EB234 - msgbox FallarborTown_Text_1EB3CA, 2 + msgbox FallarborTown_Text_1EB3CA, MSGBOX_NPC end FallarborTown_EventScript_1EB23D:: @ 81EB23D @@ -35,21 +35,21 @@ FallarborTown_EventScript_1EB23D:: @ 81EB23D faceplayer waitse playmoncry SPECIES_AZURILL, 0 - msgbox FallarborTown_Text_1EB3B5, 4 + msgbox FallarborTown_Text_1EB3B5, MSGBOX_DEFAULT waitmoncry release end FallarborTown_EventScript_1EB250:: @ 81EB250 - msgbox FallarborTown_Text_1EB4C2, 3 + msgbox FallarborTown_Text_1EB4C2, MSGBOX_SIGN end FallarborTown_EventScript_1EB259:: @ 81EB259 - msgbox FallarborTown_Text_1EB4FE, 3 + msgbox FallarborTown_Text_1EB4FE, MSGBOX_SIGN end FallarborTown_EventScript_1EB262:: @ 81EB262 - msgbox FallarborTown_Text_1EB534, 3 + msgbox FallarborTown_Text_1EB534, MSGBOX_SIGN end FallarborTown_Text_1EB26B: @ 81EB26B |