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

Merge conflict resolves into review changes

Browse Source
This commit is contained in:
GriffinR
2019-10-13 15:33:19 -04:00
parent 144c5888a1 a081124a20
commit bb23128b77
172 changed files with 7753 additions and 8366 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

1750
data/scripts/cable_club.inc
View File

File diff suppressed because it is too large Load Diff

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

10
data/scripts/pokeblocks.inc
View File

@@ -667,13 +667,13 @@ EventScript_PblocLink_NoPokeblock: @ 829416C
EventScript_PblocLink_SomeoneNotReady: @ 8294176
special CloseLink
msgbox LilycoveCity_ContestLobby_Text_2781C7, MSGBOX_DEFAULT
msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT
releaseall
end
EventScript_PblocLink_DifferentSelections: @ 8294183
special CloseLink
msgbox LilycoveCity_ContestLobby_Text_278255, MSGBOX_DEFAULT
msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT
releaseall
end
@@ -685,7 +685,7 @@ EventScript_PblocLink_CloseLink: @ 8294190
EventScript_PblocLink_LinkError: @ 829419D
special CloseLink
msgbox LilycoveCity_ContestLobby_Text_27821C, MSGBOX_DEFAULT
msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT
releaseall
end
@@ -745,12 +745,12 @@ EventScript_PblocLink_TryJoinGroup: @ 829425D
end
EventScript_PblocLink_BecomeLeader: @ 8294285
special BerryBlenderLinkBecomeLeader
special TryBecomeLinkLeader
waitstate
return
EventScript_PblocLink_JoinGroup: @ 829428A
special BerryBlenderLinkJoinGroup
special TryJoinLinkGroup
waitstate
return

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