Merge pull request #111 from PikalaxALT/link

Port link from Emerald

7 files changed, 19 insertions, 48 deletions

diff --git a/data/data.s b/data/data.s
index eb755739a..d0bd198e1 100644
--- a/data/data.s
+++ b/data/data.s
@@ -6,43 +6,14 @@
 
 	.section .rodata
 
-	.align 2
-gUnknown_8231EC4:: @ 8231EC4
-	.incbin "baserom.gba", 0x231EC4, 0x20
-
-	.align 2
-gWirelessLinkDisplay4bpp:: @ 8231EE4
-	.incbin "graphics/interface/wireless_link_display.4bpp.lz"
-
-	.align 2
-gWirelessLinkDisplayBin:: @ 823238C
-	.incbin "graphics/interface/wireless_link_display.bin.lz"
-
-	.align 2
-gUnknown_8232578:: @ 8232578
-	.incbin "baserom.gba", 0x232578, 0x20
-
-gUnknown_8232598:: @ 8232598
-	.incbin "baserom.gba", 0x232598, 0x2000
-
-gUnknown_8234598:: @ 8234598
-	.incbin "baserom.gba", 0x234598, 0x28
-
-gUnknown_82345C0:: @ 82345C0
-	.incbin "baserom.gba", 0x2345C0, 0x10
-
-gUnknown_82345D0:: @ 82345D0
-	.incbin "baserom.gba", 0x2345D0, 0x18
-
-gUnknown_82345E8:: @ 82345E8
-	.incbin "baserom.gba", 0x2345E8, 0x8
-
-gUnknown_82345F0:: @ 82345F0
-	.incbin "baserom.gba", 0x2345F0, 0x20
+	.align 2, 0
+gUnknown_8234614::
+	.string "$"
 
-gUnknown_8234610:: @ 8234610
-	.incbin "baserom.gba", 0x234610, 0x8
+gUnknown_8234615::
+	.string "\n$"
 
+	.align 2, 0
 gUnknown_8234618:: @ 8234618
 	.incbin "baserom.gba", 0x234618, 0x8
 
diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc
index 44861f91f..908d7e543 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
diff --git a/data/strings.s b/data/strings.s
index 98b137425..be47054b5 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -3714,22 +3714,22 @@ gUnknown_841DE9B:: @ 841DE9B
 gUnknown_841DE9C:: @ 841DE9C
 	.string "$"
 
-gUnknown_841DE9D:: @ 841DE9D
+gText_CommErrorCheckConnections:: @ 841DE9D
 	.string "Communication error…\n"
 	.string "Please check all connections,\n"
 	.string "then turn the power OFF and ON.$"
 
-gUnknown_841DEF0:: @ 841DEF0
+gText_CommErrorEllipsis:: @ 841DEF0
 	.string "Communication error…$"
 
-gUnknown_841DF05:: @ 841DF05
+gText_MoveCloserToLinkPartner:: @ 841DF05
 	.string "Move closer to your link partner(s).\n"
 	.string "Avoid obstacles between partners.$"
 
-gUnknown_841DF4C:: @ 841DF4C
+gText_ABtnRegistrationCounter:: @ 841DF4C
 	.string "A Button: Registration Counter$"
 
-gUnknown_841DF6B:: @ 841DF6B
+gText_ABtnTitleScreen:: @ 841DF6B
 	.string "A Button: Title Screen$"
 
 gUnknown_841DF82:: @ 841DF82