diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-07 17:37:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-07 17:37:04 -0400 |
| commit | d8f5e73bb7738da97647bc06a87b6b70f4c0966f (patch) | |
| tree | 1efdd0f6e8bab9e14eade4096ee114eb78094de0 /data/scripts | |
| parent | c4deb4db96ac8463c2ef1dd92ca5c7d6d13c4dae (diff) | |
| parent | 7ba11b7a1b4e8639cdd65ab147a24b430f6424c5 (diff) | |
Merge branch 'master' into doc-inc
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/apprentice.inc | 14 | ||||
| -rw-r--r-- | data/scripts/gabby_and_ty.inc | 12 | ||||
| -rw-r--r-- | data/scripts/secret_power_tm.inc | 6 |
3 files changed, 16 insertions, 16 deletions
diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index b75a3c579..7eae99dcf 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -74,7 +74,7 @@ Script_Apprentice_FirstMeetingNag: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end @@ -117,7 +117,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B69D3: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end @@ -163,7 +163,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6B09: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end @@ -187,7 +187,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6BD4: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end @@ -235,7 +235,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6C77: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end @@ -261,7 +261,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6D5C: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end @@ -283,7 +283,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index af9688f55..0f8d71f6b 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -214,11 +214,11 @@ Route120_EventScript_28CF36:: @ 828CF36 Route111_EventScript_28CF56:: @ 828CF56 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToEventObjectLocalIds - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq Route111_EventScript_28CF94 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if_eq Route111_EventScript_28CF9F - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq Route111_EventScript_28CFB1 goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE msgbox Route111_Text_28B042, MSGBOX_YESNO @@ -247,11 +247,11 @@ Route118_EventScript_28CFC3:: @ 828CFC3 Route120_EventScript_28CFC3:: @ 828CFC3 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToEventObjectLocalIds - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq Route111_EventScript_28CF94 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if_eq Route111_EventScript_28CF9F - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq Route111_EventScript_28CFB1 goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE specialvar VAR_RESULT, GabbyAndTyGetLastQuote diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 647064829..51a327142 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -51,11 +51,11 @@ Route111_EventScript_27661E:: @ 827661E closemessage setflag FLAG_RECEIVED_SECRET_POWER clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if_eq Route111_EventScript_27666A - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq Route111_EventScript_27666A - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq Route111_EventScript_276675 removeobject VAR_LAST_TALKED release |