diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-16 20:23:05 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-16 20:23:05 +0200 |
| commit | ea5ffa3375f58c3d859f48d220a8a67fcb56fa61 (patch) | |
| tree | e04cbfe52909f094f9b7a0b20e927d0f5851b201 /data/scripts | |
| parent | ee3d505b585c5d0a8b6a8a68b8ab787d04bdc33a (diff) | |
| parent | 07ef76277021d5cddf14004e37e785c31fcea69b (diff) | |
Merge with master
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/cable_club.inc | 8 | ||||
| -rw-r--r-- | data/scripts/pokeblocks.inc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index f02ffbe66..adf02ddd0 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -999,7 +999,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27731B copyvar VAR_0x8007, VAR_LAST_TALKED - specialvar VAR_RESULT, sub_80093CC + specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277668 message OldaleTown_PokemonCenter_2F_Text_27940D @@ -1108,7 +1108,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4 specialvar VAR_RESULT, sub_813990C compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27731B - specialvar VAR_RESULT, sub_80093CC + specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276E13 message OldaleTown_PokemonCenter_2F_Text_279013 @@ -1396,7 +1396,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277B8A:: @ 8277B8A lockall checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27733F - specialvar VAR_RESULT, sub_80093CC + specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 goto_eq EventScript_277BB4 fadescreen 1 @@ -1495,7 +1495,7 @@ MossdeepCity_GameCorner_1F_EventScript_277C91:: @ 8277C91 faceplayer message MossdeepCity_GameCorner_1F_Text_278CEB waitmessage - specialvar VAR_RESULT, sub_80093CC + specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_277E48 delay 60 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 9c4b46ae2..bd8d0cd0c 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -594,7 +594,7 @@ LilycoveCity_ContestLobby_EventScript_2940BB:: @ 82940BB call LilycoveCity_ContestLobby_EventScript_27134F compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_294160 - specialvar VAR_RESULT, sub_80093CC + specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_2941ED message LilycoveCity_ContestLobby_Text_293955 |