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/apprentice.inc | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/scripts/apprentice.inc')
| -rw-r--r-- | data/scripts/apprentice.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index a644008d0..bbb7662ba 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -289,7 +289,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4: end Script_Apprentice_SetLeavingFlags: - setflag FLAG_0x2BD + setflag FLAG_HIDE_APPRENTICE setflag FLAG_0x934 return |