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/RustboroCity_PokemonCenter_1F/scripts.inc | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/maps/RustboroCity_PokemonCenter_1F/scripts.inc')
| -rw-r--r-- | data/maps/RustboroCity_PokemonCenter_1F/scripts.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index acf33e647..0a5a6ed92 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -17,15 +17,15 @@ RustboroCity_PokemonCenter_1F_EventScript_214D76:: @ 8214D76 end RustboroCity_PokemonCenter_1F_EventScript_214D84:: @ 8214D84 - msgbox RustboroCity_PokemonCenter_1F_Text_214D9F, 2 + msgbox RustboroCity_PokemonCenter_1F_Text_214D9F, MSGBOX_NPC end RustboroCity_PokemonCenter_1F_EventScript_214D8D:: @ 8214D8D - msgbox RustboroCity_PokemonCenter_1F_Text_214E13, 2 + msgbox RustboroCity_PokemonCenter_1F_Text_214E13, MSGBOX_NPC end RustboroCity_PokemonCenter_1F_EventScript_214D96:: @ 8214D96 - msgbox RustboroCity_PokemonCenter_1F_Text_214E81, 2 + msgbox RustboroCity_PokemonCenter_1F_Text_214E81, MSGBOX_NPC end RustboroCity_PokemonCenter_1F_Text_214D9F: @ 8214D9F |