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

merge union room with master

Browse Source
This commit is contained in:
DizzyEggg
2018-07-22 13:14:58 +02:00
parent c9d486a5d3 06b3ce408f
commit 1e9143e0b2
5307 changed files with 54502 additions and 62660 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/pokeblocks.inc
+3 -3
View File
@@ -573,7 +573,7 @@ LilycoveCity_ContestLobby_EventScript_294032: @ 8294032
end
LilycoveCity_ContestLobby_Movement_294053: @ 8294053
step_28
walk_in_place_fastest_right
step_end
EventScript_PblockLink:: @ 8294055
@@ -608,7 +608,7 @@ EventScript_PblocLink_TryConnect: @ 82940BB
call LilycoveCity_ContestLobby_EventScript_27134F
compare VAR_RESULT, 0
goto_eq EventScript_PblocLink_End
specialvar VAR_RESULT, sub_80093CC
specialvar VAR_RESULT, IsWirelessAdapterConnected
compare VAR_RESULT, 1
goto_eq LilycoveCity_ContestLobby_EventScript_2941ED
message Text_PblockLink_Searching
@@ -697,7 +697,7 @@ EventScript_PblocLink_SpawnPartners: @ 82941AA
specialvar VAR_RESULT, GetLinkPartnerNames
copyvar VAR_0x8008, VAR_RESULT
copyvar VAR_0x8004, VAR_0x8008
special SpawnLinkPartnerFieldObject
special SpawnLinkPartnerEventObject
goto EventScript_PblocLink_Arrived
end