dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-inc

Browse Source
This commit is contained in:
GriffinR
2019-10-07 17:37:04 -04:00
committed by GitHub
parent c4deb4db96 7ba11b7a1b
commit d8f5e73bb7
44 changed files with 313 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
data/scripts/apprentice.inc
View File

@@ -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

12
data/scripts/gabby_and_ty.inc
View File

@@ -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

6
data/scripts/secret_power_tm.inc
View File

@@ -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