Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu

7 files changed, 29 insertions, 62 deletions

diff --git a/data/coord_event_weather.s b/data/coord_event_weather.s
deleted file mode 100644
index c7b995912..000000000
--- a/data/coord_event_weather.s
+++ /dev/null
@@ -1,21 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-gUnknown_085102E0:: @ 85102E0
-	.4byte 0x00000001, sub_809D7BC
-	.4byte 0x00000002, sub_809D7C8
-	.4byte 0x00000003, sub_809D7D4
-	.4byte 0x00000004, sub_809D7E0
-	.4byte 0x00000005, sub_809D7EC
-	.4byte 0x00000006, sub_809D7F8
-	.4byte 0x00000007, sub_809D804
-	.4byte 0x00000008, sub_809D810
-	.4byte 0x00000009, sub_809D81C
-	.4byte 0x0000000a, sub_809D828
-	.4byte 0x0000000b, sub_809D834
-	.4byte 0x00000014, sub_809D840
-	.4byte 0x00000015, sub_809D84C
-
diff --git a/data/mystery_event_menu.s b/data/mystery_event_menu.s
deleted file mode 100644
index bb8330497..000000000
--- a/data/mystery_event_menu.s
+++ /dev/null
@@ -1,12 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_085EFD64:: @ 85EFD64
-	.4byte 0x1F8
-
-gUnknown_085EFD68:: @ 85EFD68
-	window_template 0, 4, 15, 22, 4, 14, 20
-	window_template 0, 7, 6, 16, 4, 14, 0x6C
-	null_window_template
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index bcd92d1c2..b8aef7c3d 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -231,7 +231,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276C9D:: @ 8276C9D
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_276CB5:: @ 8276CB5
-	special sub_80097E8
+	special CloseLink
 	setvar VAR_0x4087, 0
 	compare VAR_0x8007, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5
@@ -254,7 +254,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276CE7:: @ 8276CE7
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_276CFF:: @ 8276CFF
-	special sub_80097E8
+	special CloseLink
 	setvar VAR_0x4087, 0
 	compare VAR_0x8007, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5
@@ -276,7 +276,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D2C:: @ 8276D2C
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_276D44:: @ 8276D44
-	special sub_80097E8
+	special CloseLink
 	setvar VAR_0x4087, 0
 	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27734F
 	waitmovement 0
@@ -501,25 +501,25 @@ OldaleTown_PokemonCenter_2F_EventScript_277046:: @ 8277046
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_277072:: @ 8277072
-	special sub_80097E8
+	special CloseLink
 	msgbox OldaleTown_PokemonCenter_2F_Text_27833D, 4
 	goto OldaleTown_PokemonCenter_2F_EventScript_2770A5
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_277083:: @ 8277083
-	special sub_80097E8
+	special CloseLink
 	msgbox OldaleTown_PokemonCenter_2F_Text_278307, 4
 	goto OldaleTown_PokemonCenter_2F_EventScript_2770A5
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_277094:: @ 8277094
-	special sub_80097E8
+	special CloseLink
 	msgbox OldaleTown_PokemonCenter_2F_Text_2782D1, 4
 	goto OldaleTown_PokemonCenter_2F_EventScript_2770A5
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_2770A5:: @ 82770A5
-	special sub_80097E8
+	special CloseLink
 	msgbox OldaleTown_PokemonCenter_2F_Text_278372, 4
 	release
 	end
@@ -658,45 +658,45 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_2772AB:: @ 82772AB
-	special sub_80097E8
+	special CloseLink
 	msgbox OldaleTown_PokemonCenter_2F_Text_278565, 4
 	release
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_2772B8:: @ 82772B8
-	special sub_80097E8
+	special CloseLink
 	msgbox OldaleTown_PokemonCenter_2F_Text_2785C9, 4
 	release
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_2772C5:: @ 82772C5
 OldaleTown_PokemonCenter_2F_EventScript_2772C5:: @ 82772C5
-	special sub_80097E8
+	special CloseLink
 	msgbox OldaleTown_PokemonCenter_2F_Text_27821C, 4
 	release
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_2772D2:: @ 82772D2
 OldaleTown_PokemonCenter_2F_EventScript_2772D2:: @ 82772D2
-	special sub_80097E8
+	special CloseLink
 	msgbox OldaleTown_PokemonCenter_2F_Text_2781C7, 4
 	release
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_2772DF:: @ 82772DF
-	special sub_80097E8
+	special CloseLink
 	msgbox OldaleTown_PokemonCenter_2F_Text_278255, 4
 	release
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_2772EC:: @ 82772EC
-	special sub_80097E8
+	special CloseLink
 	msgbox OldaleTown_PokemonCenter_2F_Text_278291, 4
 	release
 	end
 
 MossdeepCity_GameCorner_1F_EventScript_2772F9:: @ 82772F9
-	special sub_80097E8
+	special CloseLink
 	msgbox MossdeepCity_GameCorner_1F_Text_278D51, 4
 	release
 	end
@@ -708,19 +708,19 @@ OldaleTown_PokemonCenter_2F_EventScript_277306:: @ 8277306
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_27730E:: @ 827730E
-	special sub_80097E8
+	special CloseLink
 	msgbox OldaleTown_PokemonCenter_2F_Text_2782A8, 4
 	release
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_27731B:: @ 827731B
-	special sub_80097E8
+	special CloseLink
 	msgbox OldaleTown_PokemonCenter_2F_Text_2785E9, 4
 	release
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_277328:: @ 8277328
-	special sub_80097E8
+	special CloseLink
 	msgbox OldaleTown_PokemonCenter_2F_Text_278651, 4
 	release
 	end
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc
index 7c0762417..def3dd122 100644
--- a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc
+++ b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc
@@ -725,7 +725,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0E3:: @ 823F0E3
 	special copy_player_party_from_sav1
 
 BattleFrontier_BattleTowerLobby_EventScript_23F0E6:: @ 823F0E6
-	special sub_80097E8
+	special CloseLink
 	msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4
 
 BattleFrontier_BattleTowerLobby_EventScript_23F0F1:: @ 823F0F1
@@ -951,7 +951,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327
-	special sub_80097E8
+	special CloseLink
 	compare VAR_0x8005, 3
 	goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F
 	msgbox BattleFrontier_BattleTowerLobby_Text_278255, 4
@@ -966,13 +966,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F33F:: @ 823F33F
 
 BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351
 	msgbox BattleFrontier_BattleTowerLobby_Text_241240, 4
-	special sub_80097E8
+	special CloseLink
 	msgbox BattleFrontier_BattleTowerLobby_Text_2782A8, 4
 	release
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_23F366:: @ 823F366
-	special sub_80097E8
+	special CloseLink
 	compare VAR_0x8005, 0
 	call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F394
 	compare VAR_0x8005, 1
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc
index 3b7d6a2f2..beb96e171 100644
--- a/data/scripts/maps/LilycoveCity_ContestLobby.inc
+++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc
@@ -709,7 +709,7 @@ LilycoveCity_ContestLobby_EventScript_21A971:: @ 821A971
 	end
 
 LilycoveCity_ContestLobby_EventScript_21A97F:: @ 821A97F
-	special sub_80097E8
+	special CloseLink
 	msgbox LilycoveCity_ContestLobby_Text_27BD4F, 4
 	release
 	end
@@ -811,13 +811,13 @@ LilycoveCity_ContestLobby_EventScript_21AAE1:: @ 821AAE1
 	end
 
 LilycoveCity_ContestLobby_EventScript_21AAEF:: @ 821AAEF
-	special sub_80097E8
+	special CloseLink
 	msgbox LilycoveCity_ContestLobby_Text_27821C, 4
 	release
 	end
 
 LilycoveCity_ContestLobby_EventScript_21AAFC:: @ 821AAFC
-	special sub_80097E8
+	special CloseLink
 	msgbox LilycoveCity_ContestLobby_Text_27C879, 4
 	release
 	end
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 0f705c841..39cca8244 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -655,25 +655,25 @@ LilycoveCity_ContestLobby_EventScript_29416C:: @ 829416C
 	end
 
 LilycoveCity_ContestLobby_EventScript_294176:: @ 8294176
-	special sub_80097E8
+	special CloseLink
 	msgbox LilycoveCity_ContestLobby_Text_2781C7, 4
 	releaseall
 	end
 
 LilycoveCity_ContestLobby_EventScript_294183:: @ 8294183
-	special sub_80097E8
+	special CloseLink
 	msgbox LilycoveCity_ContestLobby_Text_278255, 4
 	releaseall
 	end
 
 LilycoveCity_ContestLobby_EventScript_294190:: @ 8294190
-	special sub_80097E8
+	special CloseLink
 	msgbox gUnknown_08272D9C, 4
 	releaseall
 	end
 
 LilycoveCity_ContestLobby_EventScript_29419D:: @ 829419D
-	special sub_80097E8
+	special CloseLink
 	msgbox LilycoveCity_ContestLobby_Text_27821C, 4
 	releaseall
 	end
diff --git a/data/specials.inc b/data/specials.inc
index 332c58bca..ac4a47b69 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -40,7 +40,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_80B2E4C
 	def_special sub_80B2E74
 	def_special sub_80B2EA8
-	def_special sub_80097E8
+	def_special CloseLink
 	def_special sub_80B3968
 	def_special sub_80B3924
 	def_special nullsub_37