diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2019-01-05 19:54:26 +0000 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2019-01-05 19:54:26 +0000 |
| commit | f8c2fcb9b22a1b9cf43e293fdcb6df2b9d0dd164 (patch) | |
| tree | 81b80d287c4fb3320a8143b9cfbb06e9fc4b34d5 /data/scripts/apprentice.inc | |
| parent | ee5a239534d7c4bd64ce7ced4146204579f5d598 (diff) | |
| parent | cbf7d6cee59e7aa2cdef6b9e89fa62fbeb4a07c5 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base
Diffstat (limited to 'data/scripts/apprentice.inc')
| -rw-r--r-- | data/scripts/apprentice.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index 034732db2..ac4bd1979 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -33,7 +33,7 @@ EventScript_Apprentice:: @ 82B688D special CallApprenticeFunction compare VAR_0x8004, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B68BE - goto_if_set FLAG_0x934, Script_Apprentice_ReleaseAndEnd + goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, Script_Apprentice_ReleaseAndEnd BattleFrontier_BattleTowerLobby_EventScript_2B68BE: setvar VAR_0x8004, 11 @@ -289,7 +289,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4: Script_Apprentice_SetLeavingFlags: setflag FLAG_HIDE_APPRENTICE - setflag FLAG_0x934 + setflag FLAG_DAILY_APPRENTICE_LEAVES return Script_Apprentice_LeaveGoRight: |