decompile overworld

9 files changed, 15 insertions, 16 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index 7b9d6519c..6668f0d1f 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -8,7 +8,6 @@
 	.include "asm/macros.inc"
 	.include "asm/macros/event.inc"
 	.include "constants/constants.inc"
-	
 
 	.section script_data, "aw", %progbits
 
diff --git a/data/item_use.s b/data/item_use.s
index d9bcc44f6..6c9affbc8 100644
--- a/data/item_use.s
+++ b/data/item_use.s
@@ -8,7 +8,7 @@
     .align 2
 gUnknown_085920D8:: @ 85920D8
 	.4byte sub_81B617C
-	.4byte c2_exit_to_overworld_2_switch
+	.4byte CB2_ReturnToField
 	.4byte NULL
 
     .align 2
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index b8aef7c3d..e5b330bf3 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -916,21 +916,21 @@ RecordCorner_EventScript_277471:: @ 8277471
 	releaseall
 	end
 
-gUnknown_0827747E:: @ 827747E
+EventScript_TradeRoom_ReadTrainerCard1:: @ 827747E
 	msgbox Text_278452, 4
 	fadescreen 1
 	special sp02A_crash_sound
 	waitstate
 	end
 
-gUnknown_0827748D:: @ 827748D
+EventScript_TradeRoom_ReadTrainerCard2:: @ 827748D
 	msgbox Text_27847B, 4
 	fadescreen 1
 	special sp02A_crash_sound
 	waitstate
 	end
 
-gUnknown_0827749C:: @ 827749C
+EventScript_TradeRoom_TooBusyToNotice:: @ 827749C
 	msgbox Text_27842E, 4
 	closemessage
 	end
@@ -983,7 +983,7 @@ gUnknown_08277509:: @ 8277509
 	special sub_80B371C
 	end
 
-gUnknown_08277513:: @ 8277513
+EventScript_277513:: @ 8277513
 	special sub_80B36EC
 	special sub_80AF9F8
 	waitstate
diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc
index fc069a8ee..01ce60717 100644
--- a/data/scripts/maps/FortreeCity_Gym.inc
+++ b/data/scripts/maps/FortreeCity_Gym.inc
@@ -12,7 +12,7 @@ FortreeCity_Gym_MapScript2_2165BA: @ 82165BA
 	.2byte 0
 
 FortreeCity_Gym_EventScript_2165C4:: @ 82165C4
-	special sub_80FBED0
+	special RotatingGate_InitPuzzleAndGraphics
 	end
 
 FortreeCity_Gym_EventScript_2165C8:: @ 82165C8
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc
index a043b2ec4..6b13cf8cb 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc
+++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc
@@ -12,7 +12,7 @@ Route110_TrickHousePuzzle6_MapScript2_26DDB6: @ 826DDB6
 	.2byte 0
 
 Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0
-	special sub_80FBED0
+	special RotatingGate_InitPuzzleAndGraphics
 	end
 
 Route110_TrickHousePuzzle6_EventScript_26DDC4:: @ 826DDC4
diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc
index 72707186b..2f99f7c4e 100644
--- a/data/scripts/maps/Route119.inc
+++ b/data/scripts/maps/Route119.inc
@@ -18,7 +18,7 @@ Route119_EventScript_1F4439:: @ 81F4439
 Route119_MapScript1_1F444D: @ 81F444D
 	call Route119_EventScript_271ED7
 	call Route119_EventScript_271EFB
-	compare VAR_0x40B3, 1
+	compare VAR_WEATHER_INSTITUTE_STATE, 1
 	call_if 1, Route119_EventScript_1F4466
 	special SetRoute119Weather
 	end
@@ -26,7 +26,7 @@ Route119_MapScript1_1F444D: @ 81F444D
 Route119_EventScript_1F4466:: @ 81F4466
 	setflag FLAG_0x37D
 	clearflag FLAG_0x37C
-	setvar VAR_0x40B3, 2
+	setvar VAR_WEATHER_INSTITUTE_STATE, 2
 	return
 
 Route119_EventScript_1F4472:: @ 81F4472
diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc
index 399692db3..b008f52c0 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc
+++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc
@@ -3,7 +3,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86
 	.byte 0
 
 Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C
-	compare VAR_0x40B3, 0
+	compare VAR_WEATHER_INSTITUTE_STATE, 0
 	call_if 1, Route119_WeatherInstitute_1F_EventScript_26FA98
 	end
 
@@ -16,7 +16,7 @@ Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4
 	lock
 	faceplayer
 	special GetPlayerBigGuyGirlString
-	compare VAR_0x40B3, 0
+	compare VAR_WEATHER_INSTITUTE_STATE, 0
 	goto_eq Route119_WeatherInstitute_1F_EventScript_26FABE
 	msgbox Route119_WeatherInstitute_1F_Text_26FCE5, 4
 	release
diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
index 38f79763d..c8f24f33d 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc
+++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
@@ -3,9 +3,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E
 	.byte 0
 
 Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24
-	compare VAR_0x40B3, 0
+	compare VAR_WEATHER_INSTITUTE_STATE, 0
 	call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF44
-	compare VAR_0x40B3, 1
+	compare VAR_WEATHER_INSTITUTE_STATE, 1
 	call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF50
 	checkflag FLAG_SYS_GAME_CLEAR
 	call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF5C
@@ -62,7 +62,7 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8
 	waitmovement 0
 	msgbox Route119_WeatherInstitute_2F_Text_2705DD, 4
 	closemessage
-	setvar VAR_0x40B3, 1
+	setvar VAR_WEATHER_INSTITUTE_STATE, 1
 	clearflag FLAG_0x37D
 	fadedefaultbgm
 	fadescreen 1
diff --git a/data/specials.inc b/data/specials.inc
index f9f7c97d7..62dd9717e 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -213,7 +213,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_80F972C
 	def_special sp0C8_whiteout_maybe
 	def_special sub_80FBE90
-	def_special sub_80FBED0
+	def_special RotatingGate_InitPuzzleAndGraphics
 	def_special SetSSTidalFlag
 	def_special ResetSSTidalFlag
 	def_special EnterSafariMode