diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-05 15:49:05 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-05 15:49:05 -0400 |
| commit | b01da1a59260b2ac54dd876e9cf35d2c1fb944e7 (patch) | |
| tree | 8384ebb678d1237c49d6f1b59cd6504e6e58a1e4 /data | |
| parent | b4b509f68477068ae111cc5a6094d858d396c4bb (diff) | |
link.c through InitLocalLinkPlayer
Diffstat (limited to 'data')
| -rw-r--r-- | data/data.s | 4 | ||||
| -rw-r--r-- | data/map_event_scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc | 4 | ||||
| -rw-r--r-- | data/maps/OneIsland_PokemonCenter_1F/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/ThreeIsland_DunsparceTunnel/scripts.inc | 4 | ||||
| -rw-r--r-- | data/specials.inc | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/data/data.s b/data/data.s index eb755739a..018135521 100644 --- a/data/data.s +++ b/data/data.s @@ -19,10 +19,10 @@ gWirelessLinkDisplayBin:: @ 823238C .incbin "graphics/interface/wireless_link_display.bin.lz" .align 2 -gUnknown_8232578:: @ 8232578 +gLinkTestDigitsPal:: @ 8232578 .incbin "baserom.gba", 0x232578, 0x20 -gUnknown_8232598:: @ 8232598 +gLinkTestDigitsGfx:: @ 8232598 .incbin "baserom.gba", 0x232598, 0x2000 gUnknown_8234598:: @ 8234598 diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc index c333c6336..d485777f3 100644 --- a/data/map_event_scripts.inc +++ b/data/map_event_scripts.inc @@ -1492,7 +1492,7 @@ EventScript_1A651A:: @ 81A651A clearflag FLAG_0x09D call EventScript_1A6551 special sub_81130A8 - specialvar VAR_RESULT, sub_806E25C + specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 0 call_if 1, EventScript_1A653B call EventScript_1A6541 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 7dae5f353..048ca96d6 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -5,7 +5,7 @@ IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65 setrespawn SPAWN_INDIGO_PLATEAU - specialvar VAR_RESULT, sub_806E25C + specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 call_if 1, EventScript_16EA79 end @@ -19,7 +19,7 @@ EventScript_16EA79:: @ 816EA79 IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A lock faceplayer - specialvar VAR_RESULT, sub_806E25C + specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_16EAA6 msgbox gUnknown_819A8D8 diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 7a1941f72..83a42e67d 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -220,7 +220,7 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 goto_if_eq EventScript_171044 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if_eq EventScript_1710F2 - specialvar VAR_RESULT, sub_806E25C + specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_1710FC compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 9fc141070..7cdedc60c 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -4,7 +4,7 @@ ThreeIsland_DunsparceTunnel_MapScripts:: @ 8164D26 ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL - specialvar VAR_RESULT, sub_806E25C + specialvar VAR_RESULT, IsNationalPokedexEnabled copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 1 call_if 1, EventScript_164D50 @@ -26,7 +26,7 @@ ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 faceplayer checkflag FLAG_0x2E2 goto_if_eq EventScript_164DC2 - specialvar VAR_RESULT, sub_806E25C + specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_164D90 msgbox gUnknown_817D13B diff --git a/data/specials.inc b/data/specials.inc index c99d484d4..5e9a3aeae 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -371,7 +371,7 @@ gSpecials:: @ 815FD60 def_special sub_80CC2BC def_special sub_80CC3CC def_special sub_80CC524 - def_special sub_8009480 + def_special IsWirelessAdapterConnected def_special sub_8115A24 def_special BerryBlenderLinkJoinGroup def_special UnionRoomSpecial @@ -412,7 +412,7 @@ gSpecials:: @ 815FD60 def_special sub_812B35C def_special Special_SSAnneDepartureCutscene def_special sub_8149A18 - def_special sub_806E25C + def_special IsNationalPokedexEnabled def_special sub_815D9E8 def_special sub_814B504 def_special sub_80CC8CC |