diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-22 13:14:58 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-22 13:14:58 +0200 |
| commit | 1e9143e0b22bc72cb77866e10817bc509064842a (patch) | |
| tree | 87b77fdd2c19d34cb7ac10870fdc4c30188e2d70 /data/scripts/pokeblocks.inc | |
| parent | c9d486a5d3ea6bf7d256c2d7ca7f10339e498427 (diff) | |
| parent | 06b3ce408f774c7192202308e783cc22bb8e7643 (diff) | |
merge union room with master
Diffstat (limited to 'data/scripts/pokeblocks.inc')
| -rw-r--r-- | data/scripts/pokeblocks.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index f694db330..3187c95f4 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -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 |