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/tv.inc | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/scripts/tv.inc')
| -rw-r--r-- | data/scripts/tv.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 2292e9984..9033e741f 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -32,18 +32,18 @@ EventScript_27EE54:: @ 827EE54 EventScript_27EE8A:: @ 827EE8A special GetMomOrDadStringForTVMessage - msgbox gUnknown_08272BCF, 4 + msgbox gUnknown_08272BCF, MSGBOX_DEFAULT special TurnOffTVScreen releaseall end EventScript_27EE9A:: @ 827EE9A - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F0F, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F0F, MSGBOX_DEFAULT releaseall end EventScript_27EEA4:: @ 827EEA4 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT special InitRoamer clearflag FLAG_SYS_TV_LATI setflag FLAG_0x0FF @@ -68,7 +68,7 @@ EventScript_27EED0:: @ 827EED0 EventScript_27EED8:: @ 827EED8 special GetMomOrDadStringForTVMessage - msgbox gUnknown_08272BCF, 4 + msgbox gUnknown_08272BCF, MSGBOX_DEFAULT goto EventScript_27EED0 end |