diff --git a/pokeemerald.sym b/pokeemerald.sym
index be92b267df..968e085cea 100644
--- a/pokeemerald.sym
+++ b/pokeemerald.sym
@@ -540,7 +540,7 @@
 0203ab94 l 00000004 sCryWaveformWindowTiledata
 0203ab98 l 00000004 sCryMeterNeedle
 0203ab9c g 00000001 sCoinsWindowId
-0203aba0 l 00000004 sTransitionStructPtr
+0203aba0 l 00000004 sTransitionData
 0203aba4 l 00000004 sBattlerAbilities
 0203aba8 g 00000004 gBattleMsgDataPtr
 0203abac l 00000004 sCableCar
@@ -840,10 +840,10 @@
 03001200 l 00000002 i.50
 03001202 l 00000002 mapSecId.51
 03001204 l 00000002 numSprites.52
-03001208 l 00000002 sUnusedRectangularSpiralVar
+03001208 l 00000002 sDebug_RectangularSpiralData
 0300120a l 00000001 sTestingTransitionId
 0300120b l 00000001 sTestingTransitionState
-03001210 l 00000030 sRectangularSpiralTransition
+03001210 l 00000030 sRectangularSpiralLines
 03001240 l 00000030 sAnims
 03001270 l 00000001 sAnimIdx
 03001274 l 00000004 sIsSummaryAnim
@@ -12034,215 +12034,215 @@
 08145e74 l 00000010 StartStrengthFieldEffect
 08145e84 l 00000000 .gcc2_compiled.
 08145e84 l 00000058 CB2_TestBattleTransition
-08145edc g 00000018 TestBattleTransition
+08145edc l 00000018 TestBattleTransition
 08145ef4 g 0000001c BattleTransition_StartOnField
 08145f10 g 0000000e BattleTransition_Start
 08145f20 g 0000004c IsBattleTransitionDone
 08145f6c l 0000003c LaunchBattleTransitionTask
-08145fa8 l 00000038 Task_BattleTransitionMain
-08145fe0 l 00000050 Transition_Phase1
-08146030 l 00000032 Transition_WaitForPhase1
-08146064 l 00000028 Transition_Phase2
-0814608c l 00000030 Transition_WaitForPhase2
-081460bc l 00000050 Phase1Task_TransitionAll
-0814610c l 00000038 Phase2Task_Blur
-08146144 l 00000032 Phase2_Blur_Func1
-08146178 l 00000060 Phase2_Blur_Func2
-081461d8 l 0000002c Phase2_Blur_Func3
-08146204 l 00000038 Phase2Task_Swirl
-0814623c l 0000006c Phase2_Swirl_Func1
-081462a8 l 00000078 Phase2_Swirl_Func2
-08146320 l 00000038 VBlankCB_Phase2_Swirl
-08146358 l 0000002c HBlankCB_Phase2_Swirl
-08146384 l 00000038 Phase2Task_Shuffle
-081463bc l 00000064 Phase2_Shuffle_Func1
-08146420 l 00000090 Phase2_Shuffle_Func2
-081464b0 l 00000038 VBlankCB_Phase2_Shuffle
-081464e8 l 0000002c HBlankCB_Phase2_Shuffle
-08146514 l 00000038 Phase2Task_BigPokeball
-0814654c l 00000038 Phase2Task_Aqua
-08146584 l 00000038 Phase2Task_Magma
-081465bc l 00000038 Phase2Task_Regice
-081465f4 l 00000038 Phase2Task_Registeel
-0814662c l 00000038 Phase2Task_Regirock
-08146664 l 00000038 Phase2Task_Kyogre
-0814669c l 00000070 sub_814669C
-0814670c l 00000054 Phase2_Aqua_Func1
-08146760 l 00000054 Phase2_Magma_Func1
-081467b4 l 0000004c Phase2_Regi_Func1
-08146800 l 00000054 Phase2_BigPokeball_Func1
-08146854 l 00000090 Phase2_BigPokeball_Func2
-081468e4 l 00000048 Phase2_Aqua_Func2
-0814692c l 00000048 Phase2_Magma_Func2
-08146974 l 00000058 Phase2_Regice_Func2
-081469cc l 00000058 Phase2_Registeel_Func2
-08146a24 l 00000058 Phase2_Regirock_Func2
-08146a7c l 0000004c Phase2_Kyogre_Func3
-08146ac8 l 0000005c Phase2_Kyogre_Func4
-08146b24 l 00000058 Phase2_Kyogre_Func5
-08146b7c l 0000002c Phase2_WeatherDuo_Func6
-08146ba8 l 00000050 Phase2_WeatherDuo_Func7
-08146bf8 l 00000094 Phase2_BigPokeball_Func3
-08146c8c l 00000094 Phase2_BigPokeball_Func4
-08146d20 l 00000070 Phase2_BigPokeball_Func5
-08146d90 l 0000001c Phase2_FramesCountdown
-08146dac l 0000002c Phase2_WeatherTrio_Func1
-08146dd8 l 00000020 Phase2_WaitPaletteFade
-08146df8 l 000000c8 Phase2_BigPokeball_Func6
-08146ec0 l 0000007c Transition_BigPokeball_Vblank
-08146f3c l 0000002c VBlankCB0_Phase2_BigPokeball
-08146f68 l 0000002c VBlankCB1_Phase2_BigPokeball
-08146f94 l 00000038 Phase2Task_PokeballsTrail
-08146fcc l 0000004c Phase2_PokeballsTrail_Func1
-08147018 l 0000008c Phase2_PokeballsTrail_Func2
-081470a4 l 0000002c Phase2_PokeballsTrail_Func3
-081470d0 g 0000006c FldEff_Pokeball
-0814713c l 000000c8 sub_814713C
-08147204 l 00000038 Phase2Task_Clockwise_BlackFade
-0814723c l 00000068 Phase2_Clockwise_BlackFade_Func1
-081472a4 l 00000090 Phase2_Clockwise_BlackFade_Func2
-08147334 l 000000f4 Phase2_Clockwise_BlackFade_Func3
-08147428 l 00000088 Phase2_Clockwise_BlackFade_Func4
-081474b0 l 00000100 Phase2_Clockwise_BlackFade_Func5
-081475b0 l 00000098 Phase2_Clockwise_BlackFade_Func6
-08147648 l 00000040 Phase2_Clockwise_BlackFade_Func7
-08147688 l 00000090 VBlankCB_Phase2_Clockwise_BlackFade
-08147718 l 00000038 Phase2Task_Ripple
-08147750 l 00000058 Phase2_Ripple_Func1
-081477a8 l 000000e0 Phase2_Ripple_Func2
-08147888 l 00000038 VBlankCB_Phase2_Ripple
-081478c0 l 0000002c HBlankCB_Phase2_Ripple
-081478ec l 00000038 Phase2Task_Wave
-08147924 l 00000058 Phase2_Wave_Func1
-0814797c l 0000009c Phase2_Wave_Func2
-08147a18 l 00000040 Phase2_Wave_Func3
-08147a58 l 0000008c VBlankCB_Phase2_Wave
-08147ae4 l 00000020 Phase2Task_Sidney
-08147b04 l 00000020 Phase2Task_Phoebe
-08147b24 l 00000020 Phase2Task_Glacia
-08147b44 l 00000020 Phase2Task_Drake
-08147b64 l 00000020 Phase2Task_Champion
-08147b84 l 00000038 Phase2Task_MugShotTransition
-08147bbc l 00000068 Phase2_Mugshot_Func1
-08147c24 l 000000c0 Phase2_Mugshot_Func2
-08147ce4 l 000000ec Phase2_Mugshot_Func3
-08147dd0 l 0000007c Phase2_Mugshot_Func4
-08147e4c l 0000003c Phase2_Mugshot_Func5
-08147e88 l 000000b8 Phase2_Mugshot_Func6
-08147f40 l 000000c8 Phase2_Mugshot_Func7
-08148008 l 00000038 Phase2_Mugshot_Func8
-08148040 l 0000004c Phase2_Mugshot_Func9
-0814808c l 00000040 Phase2_Mugshot_Func10
-081480cc l 00000094 VBlankCB0_Phase2_Mugshots
-08148160 l 00000080 VBlankCB1_Phase2_Mugshots
-081481e0 l 00000038 HBlankCB_Phase2_Mugshots
-08148218 l 00000168 Mugshots_CreateOpponentPlayerSprites
-08148380 l 00000028 SpriteCb_TrainerPic
-081483a8 l 00000004 TrainerPicCb_Nothing
-081483ac l 0000004c TrainerPicCb_SetSlideOffsets
-081483f8 l 00000032 TrainerPicCb_Slide1
-0814842c l 0000002c TrainerPicCb_Slide2
-08148458 l 0000002a TrainerPicCb_Slide3
-08148484 l 00000018 SetTrainerPicSlideTable
+08145fa8 l 00000038 Task_BattleTransition
+08145fe0 l 00000050 Transition_StartIntro
+08146030 l 00000032 Transition_WaitForIntro
+08146064 l 00000028 Transition_StartMain
+0814608c l 00000030 Transition_WaitForMain
+081460bc l 00000050 Task_Intro
+0814610c l 00000038 Task_Blur
+08146144 l 00000032 Blur_Init
+08146178 l 00000060 Blur_Main
+081461d8 l 0000002c Blur_End
+08146204 l 00000038 Task_Swirl
+0814623c l 0000006c Swirl_Init
+081462a8 l 00000078 Swirl_End
+08146320 l 00000038 VBlankCB_Swirl
+08146358 l 0000002c HBlankCB_Swirl
+08146384 l 00000038 Task_Shuffle
+081463bc l 00000064 Shuffle_Init
+08146420 l 00000090 Shuffle_End
+081464b0 l 00000038 VBlankCB_Shuffle
+081464e8 l 0000002c HBlankCB_Shuffle
+08146514 l 00000038 Task_BigPokeball
+0814654c l 00000038 Task_Aqua
+08146584 l 00000038 Task_Magma
+081465bc l 00000038 Task_Regice
+081465f4 l 00000038 Task_Registeel
+0814662c l 00000038 Task_Regirock
+08146664 l 00000038 Task_Kyogre
+0814669c l 00000070 InitPatternWeaveTransition
+0814670c l 00000054 Aqua_Init
+08146760 l 00000054 Magma_Init
+081467b4 l 0000004c Regi_Init
+08146800 l 00000054 BigPokeball_Init
+08146854 l 00000090 BigPokeball_SetGfx
+081468e4 l 00000048 Aqua_SetGfx
+0814692c l 00000048 Magma_SetGfx
+08146974 l 00000058 Regice_SetGfx
+081469cc l 00000058 Registeel_SetGfx
+08146a24 l 00000058 Regirock_SetGfx
+08146a7c l 0000004c Kyogre_Init
+08146ac8 l 0000005c Kyogre_PaletteFlash
+08146b24 l 00000058 Kyogre_PaletteBrighten
+08146b7c l 0000002c WeatherDuo_FadeOut
+08146ba8 l 00000050 WeatherDuo_End
+08146bf8 l 00000094 PatternWeave_Blend1
+08146c8c l 00000094 PatternWeave_Blend2
+08146d20 l 00000070 PatternWeave_FinishAppear
+08146d90 l 0000001c FramesCountdown
+08146dac l 0000002c WeatherTrio_BgFadeBlack
+08146dd8 l 00000020 WeatherTrio_WaitFade
+08146df8 l 000000c8 PatternWeave_CircularMask
+08146ec0 l 0000007c VBlankCB_SetWinAndBlend
+08146f3c l 0000002c VBlankCB_PatternWeave
+08146f68 l 0000002c VBlankCB_CircularMask
+08146f94 l 00000038 Task_PokeballsTrail
+08146fcc l 0000004c PokeballsTrail_Init
+08147018 l 0000008c PokeballsTrail_Main
+081470a4 l 0000002c PokeballsTrail_End
+081470d0 g 0000006c FldEff_PokeballTrail
+0814713c l 000000c8 SpriteCB_FldEffPokeballTrail
+08147204 l 00000038 Task_ClockwiseWipe
+0814723c l 00000068 ClockwiseWipe_Init
+081472a4 l 00000090 ClockwiseWipe_TopRight
+08147334 l 000000f4 ClockwiseWipe_Right
+08147428 l 00000088 ClockwiseWipe_Bottom
+081474b0 l 00000100 ClockwiseWipe_Left
+081475b0 l 00000098 ClockwiseWipe_TopLeft
+08147648 l 00000040 ClockwiseWipe_End
+08147688 l 00000090 VBlankCB_ClockwiseWipe
+08147718 l 00000038 Task_Ripple
+08147750 l 00000058 Ripple_Init
+081477a8 l 000000e0 Ripple_Main
+08147888 l 00000038 VBlankCB_Ripple
+081478c0 l 0000002c HBlankCB_Ripple
+081478ec l 00000038 Task_Wave
+08147924 l 00000058 Wave_Init
+0814797c l 0000009c Wave_Main
+08147a18 l 00000040 Wave_End
+08147a58 l 0000008c VBlankCB_Wave
+08147ae4 l 00000020 Task_Sidney
+08147b04 l 00000020 Task_Phoebe
+08147b24 l 00000020 Task_Glacia
+08147b44 l 00000020 Task_Drake
+08147b64 l 00000020 Task_Champion
+08147b84 l 00000038 DoMugshotTransition
+08147bbc l 00000068 Mugshot_Init
+08147c24 l 000000c0 Mugshot_SetGfx
+08147ce4 l 000000ec Mugshot_ShowBanner
+08147dd0 l 0000007c Mugshot_StartOpponentSlide
+08147e4c l 0000003c Mugshot_WaitStartPlayerSlide
+08147e88 l 000000b8 Mugshot_WaitPlayerSlide
+08147f40 l 000000c8 Mugshot_GradualWhiteFade
+08148008 l 00000038 Mugshot_InitFadeWhiteToBlack
+08148040 l 0000004c Mugshot_FadeToBlack
+0814808c l 00000040 Mugshot_End
+081480cc l 00000094 VBlankCB_Mugshots
+08148160 l 00000080 VBlankCB_MugshotsFadeOut
+081481e0 l 00000038 HBlankCB_Mugshots
+08148218 l 00000168 Mugshots_CreateTrainerPics
+08148380 l 00000028 SpriteCB_MugshotTrainerPic
+081483a8 l 00000004 MugshotTrainerPic_Pause
+081483ac l 0000004c MugshotTrainerPic_Init
+081483f8 l 00000032 MugshotTrainerPic_Slide
+0814842c l 0000002c MugshotTrainerPic_SlideSlow
+08148458 l 0000002a MugshotTrainerPic_SlideOffscreen
+08148484 l 00000018 SetTrainerPicSlideDirection
 0814849c l 0000001c IncrementTrainerPicState
 081484b8 l 00000018 IsTrainerPicSlideDone
-081484d0 l 00000038 Phase2Task_Slice
-08148508 l 00000088 Phase2_Slice_Func1
-08148590 l 000000cc Phase2_Slice_Func2
-0814865c l 00000040 Phase2_Slice_Func3
-0814869c l 0000008c VBlankCB_Phase2_Slice
-08148728 l 00000038 HBlankCB_Phase2_Slice
-08148760 l 00000038 Phase2Task_ShredSplit
-08148798 l 000000cc Phase2_ShredSplit_Func1
-08148864 l 00000270 Phase2_ShredSplit_Func2
-08148ad4 l 00000040 Phase2_ShredSplit_Func3
-08148b14 l 00000040 Phase2_ShredSplit_Func4
-08148b54 l 00000038 Phase2Task_Blackhole1
-08148b8c l 00000038 Phase2Task_Blackhole2
-08148bc4 l 00000064 Phase2_Blackhole_Func1
-08148c28 l 000000be Phase2_Blackhole1_Func3
-08148ce8 l 00000084 Phase2_Blackhole1_Func2
-08148d6c l 000000e8 Phase2_Blackhole2_Func2
-08148e54 l 00000038 Phase2Task_RectangularSpiral
-08148e8c l 000000c0 Phase2_RectangularSpiral_Func1
-08148f4c l 000000bc Phase2_RectangularSpiral_Func2
-08149008 l 00000040 Phase2_RectangularSpiral_Func3
-08149048 l 000000f6 sub_8149048
-08149140 l 00000038 Phase2Task_Groudon
-08149178 l 00000050 Phase2_Groudon_Func3
-081491c8 l 0000005c Phase2_Groudon_Func4
-08149224 l 00000058 Phase2_Groudon_Func5
-0814927c l 00000038 Phase2Task_Rayquaza
-081492b4 l 000000a4 Phase2_Rayquaza_Func3
-08149358 l 00000030 Phase2_Rayquaza_Func4
-08149388 l 00000050 Phase2_Rayquaza_Func5
-081493d8 l 00000038 Phase2_Rayquaza_Func6
-08149410 l 0000002c Phase2_Rayquaza_Func7
-0814943c l 00000030 Phase2_Rayquaza_Func8
-0814946c l 0000009c Phase2_Rayquaza_Func9
-08149508 l 00000070 VBlankCB_Phase2_Rayquaza
-08149578 l 00000038 Phase2Task_WhiteFade
-081495b0 l 00000078 Phase2_WhiteFade_Func1
-08149628 l 00000074 Phase2_WhiteFade_Func2
-0814969c l 0000003c Phase2_WhiteFade_Func3
-081496d8 l 00000068 Phase2_WhiteFade_Func4
-08149740 l 00000034 Phase2_WhiteFade_Func5
-08149774 l 00000090 VBlankCB0_Phase2_WhiteFade
-08149804 l 0000003c VBlankCB1_Phase2_WhiteFade
-08149840 l 00000024 HBlankCB_Phase2_WhiteFade
-08149864 l 000000f8 sub_8149864
-0814995c l 00000038 Phase2Task_GridSquares
-08149994 l 00000054 Phase2_GridSquares_Func1
-081499e8 l 00000058 Phase2_GridSquares_Func2
-08149a40 l 0000002c Phase2_GridSquares_Func3
-08149a6c l 00000038 Phase2Task_Shards
-08149aa4 l 00000064 Phase2_Shards_Func1
-08149b08 l 0000007c Phase2_Shards_Func2
-08149b84 l 000000dc Phase2_Shards_Func3
-08149c60 l 0000006c Phase2_Shards_Func4
-08149ccc l 0000001c Phase2_Shards_Func5
-08149ce8 l 00000090 VBlankCB_Phase2_Shards
-08149d78 l 00000064 CreatePhase1Task
-08149ddc l 0000001e IsPhase1Done
-08149dfc g 00000038 TransitionPhase1_Task_RunFuncs
-08149e34 l 0000005c Phase1_TransitionAll_Func1
-08149e90 l 00000076 Phase1_TransitionAll_Func2
-08149f08 l 00000024 InitTransitionStructVars
+081484d0 l 00000038 Task_Slice
+08148508 l 00000088 Slice_Init
+08148590 l 000000cc Slice_Main
+0814865c l 00000040 Slice_End
+0814869c l 0000008c VBlankCB_Slice
+08148728 l 00000038 HBlankCB_Slice
+08148760 l 00000038 Task_ShredSplit
+08148798 l 000000cc ShredSplit_Init
+08148864 l 00000270 ShredSplit_Main
+08148ad4 l 00000040 ShredSplit_BrokenCheck
+08148b14 l 00000040 ShredSplit_End
+08148b54 l 00000038 Task_Blackhole
+08148b8c l 00000038 Task_BlackholePulsate
+08148bc4 l 00000064 Blackhole_Init
+08148c28 l 000000be Blackhole_GrowEnd
+08148ce8 l 00000084 Blackhole_Vibrate
+08148d6c l 000000e8 BlackholePulsate_Main
+08148e54 l 00000038 Task_RectangularSpiral
+08148e8c l 000000c0 RectangularSpiral_Init
+08148f4c l 000000bc RectangularSpiral_Main
+08149008 l 00000040 RectangularSpiral_End
+08149048 l 000000f6 UpdateRectangularSpiralLine
+08149140 l 00000038 Task_Groudon
+08149178 l 00000050 Groudon_Init
+081491c8 l 0000005c Groudon_PaletteFlash
+08149224 l 00000058 Groudon_PaletteBrighten
+0814927c l 00000038 Task_Rayquaza
+081492b4 l 000000a4 Rayquaza_Init
+08149358 l 00000030 Rayquaza_SetGfx
+08149388 l 00000050 Rayquaza_PaletteFlash
+081493d8 l 00000038 Rayquaza_FadeToBlack
+08149410 l 0000002c Rayquaza_WaitFade
+0814943c l 00000030 Rayquaza_SetBlack
+0814946c l 0000009c Rayquaza_TriRing
+08149508 l 00000070 VBlankCB_Rayquaza
+08149578 l 00000038 Task_WhiteBarsFade
+081495b0 l 00000078 WhiteBarsFade_Init
+08149628 l 00000074 WhiteBarsFade_StartBars
+0814969c l 0000003c WhiteBarsFade_WaitBars
+081496d8 l 00000068 WhiteBarsFade_BlendToBlack
+08149740 l 00000034 WhiteBarsFade_End
+08149774 l 00000090 VBlankCB_WhiteBarsFade
+08149804 l 0000003c VBlankCB_WhiteBarsFade_Blend
+08149840 l 00000024 HBlankCB_WhiteBarsFade
+08149864 l 000000f8 SpriteCB_WhiteBarFade
+0814995c l 00000038 Task_GridSquares
+08149994 l 00000054 GridSquares_Init
+081499e8 l 00000058 GridSquares_Main
+08149a40 l 0000002c GridSquares_End
+08149a6c l 00000038 Task_AngledWipes
+08149aa4 l 00000064 AngledWipes_Init
+08149b08 l 0000007c AngledWipes_SetWipeData
+08149b84 l 000000dc AngledWipes_DoWipe
+08149c60 l 0000006c AngledWipes_TryEnd
+08149ccc l 0000001c AngledWipes_StartNext
+08149ce8 l 00000090 VBlankCB_AngledWipes
+08149d78 l 00000064 CreateIntroTask
+08149ddc l 0000001e IsIntroTaskDone
+08149dfc g 00000038 Task_BattleTransition_Intro
+08149e34 l 0000005c TransitionIntro_FadeToGray
+08149e90 l 00000076 TransitionIntro_FadeFromGray
+08149f08 l 00000024 InitTransitionData
 08149f2c l 00000012 VBlankCB_BattleTransition
 08149f40 l 00000018 GetBg0TilemapDst
 08149f58 g 0000002c GetBg0TilesDst
 08149f84 l 00000012 FadeScreenBlack
-08149f98 l 0000007c sub_8149F98
-0814a014 l 00000198 sub_814A014
-0814a1ac l 0000007a sub_814A1AC
-0814a228 l 000000fc sub_814A228
-0814a324 l 00000050 Phase2_FrontierLogoWiggle_Func1
-0814a374 l 00000048 Phase2_FrontierLogoWiggle_Func2
-0814a3bc l 00000038 Phase2Task_FrontierLogoWiggle
-0814a3f4 l 00000038 Phase2Task_FrontierLogoWave
-0814a42c l 000000a8 Phase2_FrontierLogoWave_Func1
-0814a4d4 l 0000002c Phase2_FrontierLogoWave_Func2
-0814a500 l 00000050 Phase2_FrontierLogoWave_Func3
-0814a550 l 00000134 Phase2_FrontierLogoWave_Func4
-0814a684 l 00000048 VBlankCB_Phase2_30
-0814a6cc l 00000024 HBlankCB_Phase2_30
-0814a6f0 l 00000038 Phase2Task_FrontierSquares
-0814a728 l 00000038 Phase2Task_FrontierSquaresSpiral
-0814a760 l 00000038 Phase2Task_FrontierSquaresScroll
-0814a798 l 00000090 Phase2_FrontierSquares_Func1
-0814a828 l 00000070 Phase2_FrontierSquares_Func2
-0814a898 l 000000c8 Phase2_FrontierSquares_Func3
-0814a960 l 000000a4 Phase2_FrontierSquaresSpiral_Func1
-0814aa04 l 00000080 Phase2_FrontierSquaresSpiral_Func2
-0814aa84 l 00000034 Phase2_FrontierSquaresSpiral_Func3
-0814aab8 l 000000e8 Phase2_FrontierSquaresSpiral_Func4
-0814aba0 l 00000042 Phase2_FrontierSquares_End
-0814abe4 l 00000054 sub_814ABE4
-0814ac38 l 00000110 Phase2_FrontierSquaresScroll_Func1
-0814ad48 l 0000006c Phase2_FrontierSquaresScroll_Func2
-0814adb4 l 00000024 Phase2_FrontierSquaresScroll_Func3
-0814add8 l 00000068 Phase2_FrontierSquaresScroll_Func4
-0814ae40 l 0000006c Phase2_FrontierSquaresScroll_Func5
+08149f98 l 0000007c SetSinWave
+0814a014 l 00000198 SetCircularMask
+0814a1ac l 0000007a InitBlackWipe
+0814a228 l 000000fc UpdateBlackWipe
+0814a324 l 00000050 FrontierLogoWiggle_Init
+0814a374 l 00000048 FrontierLogoWiggle_SetGfx
+0814a3bc l 00000038 Task_FrontierLogoWiggle
+0814a3f4 l 00000038 Task_FrontierLogoWave
+0814a42c l 000000a8 FrontierLogoWave_Init
+0814a4d4 l 0000002c FrontierLogoWave_SetGfx
+0814a500 l 00000050 FrontierLogoWave_InitScanline
+0814a550 l 00000134 FrontierLogoWave_Main
+0814a684 l 00000048 VBlankCB_FrontierLogoWave
+0814a6cc l 00000024 HBlankCB_FrontierLogoWave
+0814a6f0 l 00000038 Task_FrontierSquares
+0814a728 l 00000038 Task_FrontierSquaresSpiral
+0814a760 l 00000038 Task_FrontierSquaresScroll
+0814a798 l 00000090 FrontierSquares_Init
+0814a828 l 00000070 FrontierSquares_Draw
+0814a898 l 000000c8 FrontierSquares_Shrink
+0814a960 l 000000a4 FrontierSquaresSpiral_Init
+0814aa04 l 00000080 FrontierSquaresSpiral_Outward
+0814aa84 l 00000034 FrontierSquaresSpiral_SetBlack
+0814aab8 l 000000e8 FrontierSquaresSpiral_Inward
+0814aba0 l 00000042 FrontierSquares_End
+0814abe4 l 00000054 Task_ScrollBg
+0814ac38 l 00000110 FrontierSquaresScroll_Init
+0814ad48 l 0000006c FrontierSquaresScroll_Draw
+0814adb4 l 00000024 FrontierSquaresScroll_SetBlack
+0814add8 l 00000068 FrontierSquaresScroll_Erase
+0814ae40 l 0000006c FrontierSquaresScroll_End
 0814aeac l 00000000 .gcc2_compiled.
 0814aeac l 00000002 SpriteCB_Null2
 0814aeb0 g 0000001c SetControllerToLinkPartner
@@ -16810,28 +16810,28 @@
 081daacc l 00000080 Circles_Init
 081dab4c l 0000006e FadeInCenterLogoCircle
 081dabbc l 0000001e WaitForLogoCirclesAnim
-081dabdc g 00000038 Phase2Task_FrontierCirclesMeet
+081dabdc g 00000038 Task_FrontierCirclesMeet
 081dac14 l 0000006c CirclesMeet_CreateSprites
 081dac80 l 00000034 CirclesMeet_End
-081dacb4 g 00000038 Phase2Task_FrontierCirclesCross
+081dacb4 g 00000038 Task_FrontierCirclesCross
 081dacec l 0000006c CirclesCross_CreateSprites
 081dad58 l 00000034 CirclesCross_End
-081dad8c g 00000038 Phase2Task_FrontierCirclesAsymmetricSpiral
+081dad8c g 00000038 Task_FrontierCirclesAsymmetricSpiral
 081dadc4 l 0000007e CirclesAsymmetricSpiral_CreateSprites
 081dae44 l 00000034 CirclesAsymmetricSpiral_End
-081dae78 g 00000038 Phase2Task_FrontierCirclesSymmetricSpiral
+081dae78 g 00000038 Task_FrontierCirclesSymmetricSpiral
 081daeb0 l 00000082 CirclesSymmetricSpiral_CreateSprites
 081daf34 l 00000034 CirclesSymmetricSpiral_End
-081daf68 g 00000038 Phase2Task_FrontierCirclesMeetInSeq
+081daf68 g 00000038 Task_FrontierCirclesMeetInSeq
 081dafa0 l 0000008a CirclesMeetInSeq_CreateSprites
 081db02c l 00000034 CirclesMeetInSeq_End
-081db060 g 00000038 Phase2Task_FrontierCirclesCrossInSeq
+081db060 g 00000038 Task_FrontierCirclesCrossInSeq
 081db098 l 0000008a CirclesCrossInSeq_CreateSprites
 081db124 l 00000034 CirclesCrossInSeq_End
-081db158 g 00000038 Phase2Task_FrontierCirclesAsymmetricSpiralInSeq
+081db158 g 00000038 Task_FrontierCirclesAsymmetricSpiralInSeq
 081db190 l 00000092 CirclesAsymmetricSpiralInSeq_CreateSprites
 081db224 l 00000034 CirclesAsymmetricSpiralInSeq_End
-081db258 g 00000038 Phase2Task_FrontierCirclesSymmetricSpiralInSeq
+081db258 g 00000038 Task_FrontierCirclesSymmetricSpiralInSeq
 081db290 l 00000096 CirclesSymmetricSpiralInSeq_CreateSprites
 081db328 l 00000034 CirclesSymmetricSpiralInSeq_End
 081db35c g 0000000c GetStringCenterAlignXOffset
@@ -35470,7 +35470,7 @@
 082dbc35 g 00000000 gFieldEffectScript_HotSpringsWater
 082dbc3f g 00000000 gFieldEffectScript_UseWaterfall
 082dbc45 g 00000000 gFieldEffectScript_UseDive
-082dbc4b g 00000000 gFieldEffectScript_Pokeball
+082dbc4b g 00000000 gFieldEffectScript_PokeballTrail
 082dbc56 g 00000000 gFieldEffectScript_HeartIcon
 082dbc60 g 00000000 gFieldEffectScript_Nop47
 082dbc66 g 00000000 gFieldEffectScript_Nop48
@@ -53093,7 +53093,7 @@
 085bc314 l 00000800 sRegice_Tilemap
 085bcb14 l 00000800 sRegisteel_Tilemap
 085bd314 l 00000800 sRegirock_Tilemap
-085bdb14 l 00000020 gUnknown_085BDB14
+085bdb14 l 00000020 sUnused_Palette
 085bdb34 l 000006b4 sKyogre_Tileset
 085be1e8 l 00000334 sKyogre_Tilemap
 085be51c l 0000056c sGroudon_Tileset
@@ -53114,69 +53114,69 @@
 085c87f4 l 000000b0 sFrontierSquares_Shrink1_Tileset
 085c88a4 l 00000084 sFrontierSquares_Shrink2_Tileset
 085c8928 l 00000020 sFrontierSquares_Tilemap
-085c8948 l 000000a8 sPhase1_Tasks
-085c89f0 l 000000a8 sPhase2_Tasks
-085c8a98 l 00000010 sMainTransitionPhases
-085c8aa8 l 0000000c sPhase2_Blur_Funcs
-085c8ab4 l 00000008 sPhase2_Swirl_Funcs
-085c8abc l 00000008 sPhase2_Shuffle_Funcs
-085c8ac4 l 0000001c sPhase2_Aqua_Funcs
-085c8ae0 l 0000001c sPhase2_Magma_Funcs
-085c8afc l 00000018 sPhase2_BigPokeball_Funcs
-085c8b14 l 00000018 sPhase2_Regice_Funcs
-085c8b2c l 00000018 sPhase2_Registeel_Funcs
-085c8b44 l 00000018 sPhase2_Regirock_Funcs
-085c8b5c l 00000020 sPhase2_Kyogre_Funcs
-085c8b7c l 0000000c sPhase2_PokeballsTrail_Funcs
-085c8b88 l 00000004 sUnknown_085C8B88
-085c8b8c l 0000000a sUnknown_085C8B8C
-085c8b96 l 00000004 sUnknown_085C8B96
-085c8b9c l 0000001c sPhase2_Clockwise_BlackFade_Funcs
-085c8bb8 l 00000008 sPhase2_Ripple_Funcs
-085c8bc0 l 0000000c sPhase2_Wave_Funcs
-085c8bcc l 00000028 sPhase2_Mugshot_Funcs
+085c8948 l 000000a8 sTasks_Intro
+085c89f0 l 000000a8 sTasks_Main
+085c8a98 l 00000010 sTaskHandlers
+085c8aa8 l 0000000c sBlur_Funcs
+085c8ab4 l 00000008 sSwirl_Funcs
+085c8abc l 00000008 sShuffle_Funcs
+085c8ac4 l 0000001c sAqua_Funcs
+085c8ae0 l 0000001c sMagma_Funcs
+085c8afc l 00000018 sBigPokeball_Funcs
+085c8b14 l 00000018 sRegice_Funcs
+085c8b2c l 00000018 sRegisteel_Funcs
+085c8b44 l 00000018 sRegirock_Funcs
+085c8b5c l 00000020 sKyogre_Funcs
+085c8b7c l 0000000c sPokeballsTrail_Funcs
+085c8b88 l 00000004 sPokeballsTrail_StartXCoords
+085c8b8c l 0000000a sPokeballsTrail_Delays
+085c8b96 l 00000004 sPokeballsTrail_Speeds
+085c8b9c l 0000001c sClockwiseWipe_Funcs
+085c8bb8 l 00000008 sRipple_Funcs
+085c8bc0 l 0000000c sWave_Funcs
+085c8bcc l 00000028 sMugshot_Funcs
 085c8bf4 l 00000005 sMugshotsTrainerPicIDsTable
 085c8bfa l 00000014 sMugshotsOpponentRotationScales
 085c8c0e l 00000014 sMugshotsOpponentCoords
-085c8c24 l 0000001c sTrainerPicSpriteCbs
-085c8c40 l 00000004 sTrainerPicSlideOffsets1
-085c8c44 l 00000004 sTrainerPicSlideOffsets2
-085c8c48 l 0000000c sPhase2_Slice_Funcs
-085c8c54 l 00000010 sPhase2_ShredSplit_Funcs
-085c8c64 l 00000002 gUnknown_085C8C64
-085c8c66 l 00000004 gUnknown_085C8C66
-085c8c6c l 0000000c sPhase2_Blackhole1_Funcs
-085c8c78 l 00000008 sPhase2_Blackhole2_Funcs
-085c8c80 l 00000004 gUnknown_085C8C80
-085c8c84 l 0000000c sPhase2_RectangularSpiral_Funcs
-085c8c90 l 00000008 gUnknown_085C8C90
-085c8c98 l 00000006 gUnknown_085C8C98
-085c8c9e l 00000006 gUnknown_085C8C9E
-085c8ca4 l 00000006 gUnknown_085C8CA4
-085c8caa l 00000006 gUnknown_085C8CAA
-085c8cb0 l 00000006 gUnknown_085C8CB0
-085c8cb6 l 00000006 gUnknown_085C8CB6
-085c8cbc l 00000008 gUnknown_085C8CBC
-085c8cc4 l 00000006 gUnknown_085C8CC4
-085c8cca l 00000008 gUnknown_085C8CCA
-085c8cd2 l 00000006 gUnknown_085C8CD2
-085c8cd8 l 00000006 gUnknown_085C8CD8
-085c8cde l 00000006 gUnknown_085C8CDE
-085c8ce4 l 00000006 gUnknown_085C8CE4
-085c8cea l 00000008 gUnknown_085C8CEA
-085c8cf2 l 00000006 gUnknown_085C8CF2
-085c8cf8 l 00000020 gUnknown_085C8CF8
-085c8d18 l 00000020 gUnknown_085C8D18
-085c8d38 l 00000008 gUnknown_085C8D38
-085c8d40 l 00000020 sPhase2_Groudon_Funcs
-085c8d60 l 0000002c sPhase2_Rayquaza_Funcs
-085c8d8c l 00000014 sPhase2_WhiteFade_Funcs
-085c8da0 l 00000010 sUnknown_085C8DA0
-085c8db0 l 0000000c sPhase2_GridSquares_Funcs
-085c8dbc l 00000014 sPhase2_Shards_Funcs
-085c8dd0 l 00000046 sUnknown_085C8DD0
-085c8e16 l 0000000e sUnknown_085C8E16
-085c8e24 l 00000008 sPhase1_TransitionAll_Funcs
+085c8c24 l 0000001c sMugshotTrainerPicFuncs
+085c8c40 l 00000004 sTrainerPicSlideSpeeds
+085c8c44 l 00000004 sTrainerPicSlideAccels
+085c8c48 l 0000000c sSlice_Funcs
+085c8c54 l 00000010 sShredSplit_Funcs
+085c8c64 l 00000002 sShredSplit_SectionYCoords
+085c8c66 l 00000004 sShredSplit_SectionMoveDirs
+085c8c6c l 0000000c sBlackhole_Funcs
+085c8c78 l 00000008 sBlackholePulsate_Funcs
+085c8c80 l 00000004 sBlackhole_Vibrations
+085c8c84 l 0000000c sRectangularSpiral_Funcs
+085c8c90 l 00000008 sRectangularSpiral_Major_InwardRight
+085c8c98 l 00000006 sRectangularSpiral_Major_InwardLeft
+085c8c9e l 00000006 sRectangularSpiral_Major_InwardUp
+085c8ca4 l 00000006 sRectangularSpiral_Major_InwardDown
+085c8caa l 00000006 sRectangularSpiral_Minor_InwardRight
+085c8cb0 l 00000006 sRectangularSpiral_Minor_InwardLeft
+085c8cb6 l 00000006 sRectangularSpiral_Minor_InwardUp
+085c8cbc l 00000008 sRectangularSpiral_Minor_InwardDown
+085c8cc4 l 00000006 sRectangularSpiral_Minor_OutwardRight
+085c8cca l 00000008 sRectangularSpiral_Minor_OutwardLeft
+085c8cd2 l 00000006 sRectangularSpiral_Minor_OutwardUp
+085c8cd8 l 00000006 sRectangularSpiral_Minor_OutwardDown
+085c8cde l 00000006 sRectangularSpiral_Major_OutwardRight
+085c8ce4 l 00000006 sRectangularSpiral_Major_OutwardLeft
+085c8cea l 00000008 sRectangularSpiral_Major_OutwardUp
+085c8cf2 l 00000006 sRectangularSpiral_Major_OutwardDown
+085c8cf8 l 00000020 sRectangularSpiral_MoveDataTable_MajorDiagonal
+085c8d18 l 00000020 sRectangularSpiral_MoveDataTable_MinorDiagonal
+085c8d38 l 00000008 sRectangularSpiral_MoveDataTables
+085c8d40 l 00000020 sGroudon_Funcs
+085c8d60 l 0000002c sRayquaza_Funcs
+085c8d8c l 00000014 sWhiteBarsFade_Funcs
+085c8da0 l 00000010 sWhiteBarsFade_StartDelays
+085c8db0 l 0000000c sGridSquares_Funcs
+085c8dbc l 00000014 sAngledWipes_Funcs
+085c8dd0 l 00000046 sAngledWipes_MoveData
+085c8e16 l 0000000e sAngledWipes_EndDelays
+085c8e24 l 00000008 sTransitionIntroFuncs
 085c8e2c l 00000008 sSpriteImage_Pokeball
 085c8e34 l 00000008 sSpriteAnim_Pokeball
 085c8e3c l 00000004 sSpriteAnimTable_Pokeball
@@ -53206,13 +53206,13 @@
 085c9018 l 00000008 sSpritePalette_UnusedTrainer
 085c9020 l 000004b0 sBigPokeball_Tilemap
 085c94d0 l 00000500 sMugshotsTilemap
-085c99d0 l 00000018 sPhase2_FrontierLogoWiggle_Funcs
-085c99e8 l 00000010 sPhase2_FrontierLogoWave_Funcs
-085c99f8 l 00000010 sPhase2_FrontierSquares_Funcs
-085c9a08 l 00000014 sPhase2_FrontierSquaresSpiral_Funcs
-085c9a1c l 00000014 sPhase2_FrontierSquaresScroll_Funcs
-085c9a30 l 00000023 gUnknown_085C9A30
-085c9a53 l 00000041 gUnknown_085C9A53
+085c99d0 l 00000018 sFrontierLogoWiggle_Funcs
+085c99e8 l 00000010 sFrontierLogoWave_Funcs
+085c99f8 l 00000010 sFrontierSquares_Funcs
+085c9a08 l 00000014 sFrontierSquaresSpiral_Funcs
+085c9a1c l 00000014 sFrontierSquaresScroll_Funcs
+085c9a30 l 00000023 sFrontierSquaresSpiral_Positions
+085c9a53 l 00000040 sFrontierSquaresScroll_Positions
 085c9a94 l 000000e4 sLinkPartnerBufferCommands
 085c9b78 l 00000003 sText_Trainer1LoseText
 085c9b7b l 0000001d sText_PkmnGainedEXP
@@ -59007,14 +59007,14 @@
 0862b744 l 00000008 sAnim_LogoCircle_Right
 0862b74c l 0000000c sAnimTable_LogoCircles
 0862b758 l 00000018 sSpriteTemplate_LogoCircles
-0862b770 l 00000014 sPhase2_FrontierCirclesMeet_Funcs
-0862b784 l 00000014 sPhase2_FrontierCirclesCross_Funcs
-0862b798 l 00000014 sPhase2_FrontierCirclesAsymmetricSpiral_Funcs
-0862b7ac l 00000014 sPhase2_FrontierCirclesSymmetricSpiral_Funcs
-0862b7c0 l 00000014 sPhase2_FrontierCirclesMeetInSeq_Funcs
-0862b7d4 l 00000014 sPhase2_FrontierCirclesCrossInSeq_Funcs
-0862b7e8 l 00000014 sPhase2_FrontierCirclesAsymmetricSpiralInSeq_Funcs
-0862b7fc l 00000014 sPhase2_FrontierCirclesSymmetricSpiralInSeq_Funcs
+0862b770 l 00000014 sFrontierCirclesMeet_Funcs
+0862b784 l 00000014 sFrontierCirclesCross_Funcs
+0862b798 l 00000014 sFrontierCirclesAsymmetricSpiral_Funcs
+0862b7ac l 00000014 sFrontierCirclesSymmetricSpiral_Funcs
+0862b7c0 l 00000014 sFrontierCirclesMeetInSeq_Funcs
+0862b7d4 l 00000014 sFrontierCirclesCrossInSeq_Funcs
+0862b7e8 l 00000014 sFrontierCirclesAsymmetricSpiralInSeq_Funcs
+0862b7fc l 00000014 sFrontierCirclesSymmetricSpiralInSeq_Funcs
 0862b810 g 00000022 gText_EasyChatKeyboard_ABCDEFothers
 0862b832 g 00000019 gText_EasyChatKeyboard_GHIJKL
 0862b84b g 00000021 gText_EasyChatKeyboard_MNOPQRS