diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-31 20:43:42 -0400 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-31 20:43:42 -0400 |
| commit | cd069446e06c277222be0aaa05fb43b090259234 (patch) | |
| tree | a740e2042ff6af3465cfdaa15fc29c35269cfa70 /data/maps/FallarborTown_House2/scripts.inc | |
| parent | 3181c64c64afa47b3adc04f325ad3798c8c324ec (diff) | |
| parent | 93c4e35d844046d12c7d8bcc64e8fc3e03e85e0d (diff) | |
Merge branch 'master' into pokedex-area-const-array
Diffstat (limited to 'data/maps/FallarborTown_House2/scripts.inc')
| -rw-r--r-- | data/maps/FallarborTown_House2/scripts.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index 2f2ec1b3f..d0305ad4b 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -37,7 +37,7 @@ FallarborTown_House2_EventScript_2013D6:: @ 82013D6 FallarborTown_House2_EventScript_20140C:: @ 820140C msgbox FallarborTown_House2_Text_2015C3, MSGBOX_DEFAULT - special TeachMoveTutorMove + special TeachMoveRelearnerMove waitstate compare VAR_0x8004, 0 goto_if_eq FallarborTown_House2_EventScript_2013D6 |