diff --git a/pokeemerald.sym b/pokeemerald.sym
index 06845cc958..3c7ad6383c 100644
--- a/pokeemerald.sym
+++ b/pokeemerald.sym
@@ -11667,8 +11667,8 @@
 08138c94 g 00000010 FieldShowRegionMap
 08138ca4 g 00000044 DoPCTurnOnEffect
 08138ce8 l 00000028 Task_PCTurnOnEffect
-08138d10 l 00000078 PCTurnOnEffect_0
-08138d88 l 00000098 PCTurnOnEffect_1
+08138d10 l 00000078 PCTurnOnEffect
+08138d88 l 00000098 PCTurnOnEffect_SetMetatile
 08138e20 g 0000000a DoPCTurnOffEffect
 08138e2c l 00000094 PCTurnOffEffect
 08138ec0 g 00000044 DoLotteryCornerComputerEffect
@@ -11699,7 +11699,7 @@
 081393c8 g 00000032 Special_AreLeadMonEVsMaxedOut
 081393fc g 0000005e TryUpdateRusturfTunnelState
 0813945c g 00000010 SetShoalItemFlag
-0813946c g 0000006c PutZigzagoonInPlayerParty
+0813946c g 0000006c LoadWallyZigzagoon
 081394d8 g 00000056 IsStarterInParty
 08139530 g 0000000e ScriptCheckFreePokemonStorageSpace
 08139540 g 0000001e IsPokerusInParty
@@ -28158,9 +28158,9 @@
 08267f65 l 00000000 BirthIsland_Exterior_OnResume
 08267f6f g 00000000 BirthIsland_Exterior_EventScript_TryRemoveDeoxys
 08267f83 g 00000000 BirthIsland_Exterior_EventScript_Triangle
-08267fbb g 00000000 BirthIsland_Exterior_EventScript_NotSolved1
-08267fbd g 00000000 BirthIsland_Exterior_EventScript_NotSolved2
-08267fbf g 00000000 BirthIsland_Exterior_EventScript_NotSolved3
+08267fbb g 00000000 BirthIsland_Exterior_EventScript_Failed
+08267fbd g 00000000 BirthIsland_Exterior_EventScript_Progressed
+08267fbf g 00000000 BirthIsland_Exterior_EventScript_Complete
 08267fc1 g 00000000 BirthIsland_Exterior_EventScript_Deoxys
 0826803b g 00000000 BirthIsland_Exterior_EventScript_DefeatedDeoxys
 08268049 g 00000000 BirthIsland_Exterior_EventScript_RanFromDeoxys
@@ -52724,12 +52724,12 @@
 085b2b88 l 0000000c sSlotMachineRandomSeeds.204
 085b2b94 l 0000000c sSlotMachineIds.205
 085b2ba0 l 0000000c sSlotMachineServiceDayIds.206
-085b2bac g 00000008 gElevatorFloor_WindowTemplate
-085b2bb4 g 00000040 gDeptStoreFloorNames
+085b2bac l 00000008 sWindowTemplate_ElevatorFloor
+085b2bb4 l 00000040 sDeptStoreFloorNames
 085b2bf4 l 00000012 sElevatorWindowTiles_Ascending
 085b2c06 l 00000012 sElevatorWindowTiles_Descending
-085b2c18 l 00000000 sElevatorTripLength.309
-085b2c21 l 00000000 sElevatorLightCycles.322
+085b2c18 l 00000009 sElevatorTripLength.309
+085b2c21 l 00000009 sElevatorLightCycles.322
 085b2c2a l 00000000 sPokemonCenters.332
 085b2c50 l 00000000 sFrontierManiacMessages.342
 085b2cc8 l 00000000 sFrontierManiacStreakThresholds.343
@@ -52757,7 +52757,7 @@
 085b3254 l 00000000 sBattleFrontier_TutorMoveDescriptions2.461
 085b3280 l 00000160 sDeoxysRockPalettes
 085b33e0 l 00000016 sDeoxysRockCoords
-085b33f6 l 00000000 sStoneMaxStepCounts.480
+085b33f6 l 0000000a sStoneMaxStepCounts.480
 085b3400 l 00000000 sAbnormalWeatherMapNumbers.511
 085b3410 l 00000000 sAbnormalWeatherMapNumbers.515
 085b3420 l 00000000 sPokeMarts.522