From 0bb1dc370b03afe7fb8c021eadd80e094da0d864 Mon Sep 17 00:00:00 2001
From: travis <travis@travis-ci.org>
Date: Thu, 11 Mar 2021 02:23:56 +0000
Subject: [PATCH] Define MAPGROUP_* constants and verify MapGroup_* table sizes

---
 pokecrystal.sym         | 144 ++++++++++++++++++++--------------------
 pokecrystal11.sym       | 144 ++++++++++++++++++++--------------------
 pokecrystal11_debug.sym | 144 ++++++++++++++++++++--------------------
 pokecrystal_au.sym      | 144 ++++++++++++++++++++--------------------
 pokecrystal_debug.sym   | 144 ++++++++++++++++++++--------------------
 5 files changed, 360 insertions(+), 360 deletions(-)

diff --git a/pokecrystal.sym b/pokecrystal.sym
index b94391b8f..29e7e0246 100644
--- a/pokecrystal.sym
+++ b/pokecrystal.sym
@@ -289,7 +289,7 @@
 00:1082 DummyChar
 00:1083 NextChar
 00:1087 CheckDict
-00:1122 CheckDict.__8460
+00:1122 CheckDict.__8476
 00:1145 CheckDict.diacritic
 00:114c CheckDict.not_diacritic
 00:115c CheckDict.hiragana_dakuten
@@ -627,9 +627,9 @@
 00:21a5 LoadMetatiles.row
 00:21a9 LoadMetatiles.col
 00:21b2 LoadMetatiles.ok
-00:21d8 LoadMetatiles.next_8623
-00:21eb LoadMetatiles.next_8628
-00:21fe LoadMetatiles.next_8633
+00:21d8 LoadMetatiles.next_8639
+00:21eb LoadMetatiles.next_8644
+00:21fe LoadMetatiles.next_8649
 00:2225 LoadMetatiles.ok2
 00:222a ReturnToMapFromSubmenu
 00:2238 CheckWarpTile
@@ -959,16 +959,16 @@
 00:326d _CopyTilemapAtOnce.wait2
 00:327b _CopyTilemapAtOnce.CopyBGMapViaStack
 00:328c _CopyTilemapAtOnce.loop
-00:328d _CopyTilemapAtOnce.loop_8711
-00:3296 _CopyTilemapAtOnce.loop_8712
-00:329f _CopyTilemapAtOnce.loop_8713
-00:32a8 _CopyTilemapAtOnce.loop_8714
-00:32b1 _CopyTilemapAtOnce.loop_8715
-00:32ba _CopyTilemapAtOnce.loop_8716
-00:32c3 _CopyTilemapAtOnce.loop_8717
-00:32cc _CopyTilemapAtOnce.loop_8718
-00:32d5 _CopyTilemapAtOnce.loop_8719
-00:32de _CopyTilemapAtOnce.loop_8720
+00:328d _CopyTilemapAtOnce.loop_8727
+00:3296 _CopyTilemapAtOnce.loop_8728
+00:329f _CopyTilemapAtOnce.loop_8729
+00:32a8 _CopyTilemapAtOnce.loop_8730
+00:32b1 _CopyTilemapAtOnce.loop_8731
+00:32ba _CopyTilemapAtOnce.loop_8732
+00:32c3 _CopyTilemapAtOnce.loop_8733
+00:32cc _CopyTilemapAtOnce.loop_8734
+00:32d5 _CopyTilemapAtOnce.loop_8735
+00:32de _CopyTilemapAtOnce.loop_8736
 00:32f9 SetPalettes
 00:3309 SetPalettes.SetPalettesForGameBoyColor
 00:3317 ClearPalettes
@@ -2034,11 +2034,11 @@
 02:44d3 QueueFollowerFirstStep.up
 02:44d7 QueueFollowerFirstStep.same_xy
 02:44d9 _Sine
-02:44e5 _Sine.negative_9311
-02:44ef _Sine.apply_9311
-02:44fe _Sine.multiply_9311
-02:4503 _Sine.even_9311
-02:450b _Sine.sinetable_9311
+02:44e5 _Sine.negative_9327
+02:44ef _Sine.apply_9327
+02:44fe _Sine.multiply_9327
+02:4503 _Sine.even_9327
+02:450b _Sine.sinetable_9327
 02:454b GetPredefPointer
 02:456b PredefPointers
 02:456b LearnMovePredef
@@ -10625,11 +10625,11 @@
 12:5b2f UpdateCelebiPosition.done
 12:5b30 UpdateCelebiPosition.FreezeCelebiPosition
 12:5b3b CelebiEvent_Cosine
-12:5b48 CelebiEvent_Cosine.negative_28918
-12:5b52 CelebiEvent_Cosine.apply_28918
-12:5b61 CelebiEvent_Cosine.multiply_28918
-12:5b66 CelebiEvent_Cosine.even_28918
-12:5b6e CelebiEvent_Cosine.sinetable_28918
+12:5b48 CelebiEvent_Cosine.negative_28934
+12:5b52 CelebiEvent_Cosine.apply_28934
+12:5b61 CelebiEvent_Cosine.multiply_28934
+12:5b66 CelebiEvent_Cosine.even_28934
+12:5b6e CelebiEvent_Cosine.sinetable_28934
 12:5bae GetCelebiSpriteTile
 12:5bd0 GetCelebiSpriteTile.Frame1
 12:5bd4 GetCelebiSpriteTile.Frame2
@@ -10930,16 +10930,16 @@
 13:4f72 SaveMenu_CopyTilemapAtOnce.wait2
 13:4f80 SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack
 13:4f91 SaveMenu_CopyTilemapAtOnce.loop
-13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39375
-13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39376
-13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39377
-13:4fad SaveMenu_CopyTilemapAtOnce.loop_39378
-13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39379
-13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39380
-13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39381
-13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39382
-13:4fda SaveMenu_CopyTilemapAtOnce.loop_39383
-13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39384
+13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39391
+13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39392
+13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39393
+13:4fad SaveMenu_CopyTilemapAtOnce.loop_39394
+13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39395
+13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39396
+13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39397
+13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39398
+13:4fda SaveMenu_CopyTilemapAtOnce.loop_39399
+13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39400
 13:4ffe CheckSave
 13:501b CheckSave.ok
 13:501e MapScenes
@@ -10954,16 +10954,16 @@
 13:51bd PhoneRing_CopyTilemapAtOnce.wait2
 13:51cb PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack
 13:51dc PhoneRing_CopyTilemapAtOnce.loop
-13:51dd PhoneRing_CopyTilemapAtOnce.loop_39546
-13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39547
-13:51ef PhoneRing_CopyTilemapAtOnce.loop_39548
-13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39549
-13:5201 PhoneRing_CopyTilemapAtOnce.loop_39550
-13:520a PhoneRing_CopyTilemapAtOnce.loop_39551
-13:5213 PhoneRing_CopyTilemapAtOnce.loop_39552
-13:521c PhoneRing_CopyTilemapAtOnce.loop_39553
-13:5225 PhoneRing_CopyTilemapAtOnce.loop_39554
-13:522e PhoneRing_CopyTilemapAtOnce.loop_39555
+13:51dd PhoneRing_CopyTilemapAtOnce.loop_39562
+13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39563
+13:51ef PhoneRing_CopyTilemapAtOnce.loop_39564
+13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39565
+13:5201 PhoneRing_CopyTilemapAtOnce.loop_39566
+13:520a PhoneRing_CopyTilemapAtOnce.loop_39567
+13:5213 PhoneRing_CopyTilemapAtOnce.loop_39568
+13:521c PhoneRing_CopyTilemapAtOnce.loop_39569
+13:5225 PhoneRing_CopyTilemapAtOnce.loop_39570
+13:522e PhoneRing_CopyTilemapAtOnce.loop_39571
 13:5249 Shrink1Pic
 13:52d9 Shrink2Pic
 13:5319 LinkMonStatsScreen
@@ -17223,11 +17223,11 @@
 23:46ef WipeLYOverrides.wipe
 23:46f2 WipeLYOverrides.loop
 23:46f7 StartTrainerBattle_DrawSineWave
-23:4702 StartTrainerBattle_DrawSineWave.negative_54417
-23:470c StartTrainerBattle_DrawSineWave.apply_54417
-23:471b StartTrainerBattle_DrawSineWave.multiply_54417
-23:4720 StartTrainerBattle_DrawSineWave.even_54417
-23:4728 StartTrainerBattle_DrawSineWave.sinetable_54417
+23:4702 StartTrainerBattle_DrawSineWave.negative_54433
+23:470c StartTrainerBattle_DrawSineWave.apply_54433
+23:471b StartTrainerBattle_DrawSineWave.multiply_54433
+23:4720 StartTrainerBattle_DrawSineWave.even_54433
+23:4728 StartTrainerBattle_DrawSineWave.sinetable_54433
 23:4768 StartTrainerBattle_ZoomToBlack
 23:4771 StartTrainerBattle_ZoomToBlack.loop
 23:478c StartTrainerBattle_ZoomToBlack.done
@@ -17584,11 +17584,11 @@
 23:672a Sprites_Cosine
 23:672a UnusedSpriteAnimGFX.DeletedGFX
 23:672c Sprites_Sine
-23:6737 Sprites_Sine.negative_55804
-23:6741 Sprites_Sine.apply_55804
-23:6750 Sprites_Sine.multiply_55804
-23:6755 Sprites_Sine.even_55804
-23:675d Sprites_Sine.sinetable_55804
+23:6737 Sprites_Sine.negative_55820
+23:6741 Sprites_Sine.apply_55820
+23:6750 Sprites_Sine.multiply_55820
+23:6755 Sprites_Sine.even_55820
+23:675d Sprites_Sine.sinetable_55820
 23:679d AnimateEndOfExpBar
 23:67a8 AnimateEndOfExpBar.load
 23:67b5 AnimateEndOfExpBar.loop
@@ -21835,13 +21835,13 @@
 2f:4eaa MomPhoneCalleeScript
 2f:4ec5 MomPhoneCalleeScript.started_quest
 2f:4edf MomPhoneLandmark
-2f:4ee7 MomPhonePalette1
-2f:4f05 MomPhonePalette1.newbark
-2f:4f0d MomPhonePalette1.cherrygrove
-2f:4f15 MomPhonePalette1.violet
-2f:4f1b MomPhonePalette1.azalea
-2f:4f21 MomPhonePalette1.goldenrod
-2f:4f27 MomPhonePalette2
+2f:4ee7 MomPhoneInTown
+2f:4f05 MomPhoneInTown.newbark
+2f:4f0d MomPhoneInTown.cherrygrove
+2f:4f15 MomPhoneInTown.violet
+2f:4f1b MomPhoneInTown.azalea
+2f:4f21 MomPhoneInTown.goldenrod
+2f:4f27 MomPhoneOnRoute
 2f:4f2f MomPhoneOther
 2f:4f37 MomSavingMoney
 2f:4f49 MomSavingMoney.NotSaving
@@ -23931,10 +23931,10 @@
 33:672c BattleAnim_IncAnonJumptableIndex
 33:6732 BattleAnim_Cosine
 33:6734 BattleAnim_Sine
-33:673f BattleAnim_Sine.negative_69746
-33:6749 BattleAnim_Sine.apply_69746
-33:6758 BattleAnim_Sine.multiply_69746
-33:675d BattleAnim_Sine.even_69746
+33:673f BattleAnim_Sine.negative_69762
+33:6749 BattleAnim_Sine.apply_69762
+33:6758 BattleAnim_Sine.multiply_69762
+33:675d BattleAnim_Sine.even_69762
 33:6765 BattleAnim_Sine_e
 33:676b BattleAnim_Cosine_e
 33:6771 BattleAnim_AbsSinePrecise
@@ -27079,14 +27079,14 @@
 38:6d23 BillsPC_RefreshTextboxes.placeholder_string
 38:6d2a BillsPC_RefreshTextboxes.Placeholder
 38:6d30 CopyBoxmonSpecies
-38:6d57 CopyBoxmonSpecies.loop_76360
-38:6d79 CopyBoxmonSpecies.done_76360
+38:6d57 CopyBoxmonSpecies.loop_76376
+38:6d79 CopyBoxmonSpecies.done_76376
 38:6d87 CopyBoxmonSpecies.party
-38:6d8a CopyBoxmonSpecies.loop_76361
-38:6dac CopyBoxmonSpecies.done_76361
+38:6d8a CopyBoxmonSpecies.loop_76377
+38:6dac CopyBoxmonSpecies.done_76377
 38:6db7 CopyBoxmonSpecies.sBox
-38:6dbf CopyBoxmonSpecies.loop_76362
-38:6de1 CopyBoxmonSpecies.done_76362
+38:6dbf CopyBoxmonSpecies.loop_76378
+38:6de1 CopyBoxmonSpecies.done_76378
 38:6def BillsPC_GetSelectedPokemonSpecies
 38:6e01 BillsPC_UpdateSelectionCursor
 38:6e0b BillsPC_UpdateSelectionCursor.place_cursor
@@ -31113,7 +31113,7 @@
 41:46c4 EnterMapConnection.done
 41:46c6 EnterMapWarp
 41:46df EnterMapWarp.SaveDigWarp
-41:4705 EnterMapWarp.not_mt_moon_or_tin_tower
+41:4705 EnterMapWarp.not_mt_moon_square_or_tin_tower_roof
 41:4718 EnterMapWarp.SetSpawn
 41:4743 EnterMapWarp.pokecenter_pokecom
 41:4750 LoadMapTimeOfDay
diff --git a/pokecrystal11.sym b/pokecrystal11.sym
index e2d28515d..61a47701e 100644
--- a/pokecrystal11.sym
+++ b/pokecrystal11.sym
@@ -289,7 +289,7 @@
 00:1082 DummyChar
 00:1083 NextChar
 00:1087 CheckDict
-00:1122 CheckDict.__8460
+00:1122 CheckDict.__8476
 00:1145 CheckDict.diacritic
 00:114c CheckDict.not_diacritic
 00:115c CheckDict.hiragana_dakuten
@@ -627,9 +627,9 @@
 00:21a5 LoadMetatiles.row
 00:21a9 LoadMetatiles.col
 00:21b2 LoadMetatiles.ok
-00:21d8 LoadMetatiles.next_8623
-00:21eb LoadMetatiles.next_8628
-00:21fe LoadMetatiles.next_8633
+00:21d8 LoadMetatiles.next_8639
+00:21eb LoadMetatiles.next_8644
+00:21fe LoadMetatiles.next_8649
 00:2225 LoadMetatiles.ok2
 00:222a ReturnToMapFromSubmenu
 00:2238 CheckWarpTile
@@ -959,16 +959,16 @@
 00:326d _CopyTilemapAtOnce.wait2
 00:327b _CopyTilemapAtOnce.CopyBGMapViaStack
 00:328c _CopyTilemapAtOnce.loop
-00:328d _CopyTilemapAtOnce.loop_8711
-00:3296 _CopyTilemapAtOnce.loop_8712
-00:329f _CopyTilemapAtOnce.loop_8713
-00:32a8 _CopyTilemapAtOnce.loop_8714
-00:32b1 _CopyTilemapAtOnce.loop_8715
-00:32ba _CopyTilemapAtOnce.loop_8716
-00:32c3 _CopyTilemapAtOnce.loop_8717
-00:32cc _CopyTilemapAtOnce.loop_8718
-00:32d5 _CopyTilemapAtOnce.loop_8719
-00:32de _CopyTilemapAtOnce.loop_8720
+00:328d _CopyTilemapAtOnce.loop_8727
+00:3296 _CopyTilemapAtOnce.loop_8728
+00:329f _CopyTilemapAtOnce.loop_8729
+00:32a8 _CopyTilemapAtOnce.loop_8730
+00:32b1 _CopyTilemapAtOnce.loop_8731
+00:32ba _CopyTilemapAtOnce.loop_8732
+00:32c3 _CopyTilemapAtOnce.loop_8733
+00:32cc _CopyTilemapAtOnce.loop_8734
+00:32d5 _CopyTilemapAtOnce.loop_8735
+00:32de _CopyTilemapAtOnce.loop_8736
 00:32f9 SetPalettes
 00:3309 SetPalettes.SetPalettesForGameBoyColor
 00:3317 ClearPalettes
@@ -2034,11 +2034,11 @@
 02:44d3 QueueFollowerFirstStep.up
 02:44d7 QueueFollowerFirstStep.same_xy
 02:44d9 _Sine
-02:44e5 _Sine.negative_9311
-02:44ef _Sine.apply_9311
-02:44fe _Sine.multiply_9311
-02:4503 _Sine.even_9311
-02:450b _Sine.sinetable_9311
+02:44e5 _Sine.negative_9327
+02:44ef _Sine.apply_9327
+02:44fe _Sine.multiply_9327
+02:4503 _Sine.even_9327
+02:450b _Sine.sinetable_9327
 02:454b GetPredefPointer
 02:456b PredefPointers
 02:456b LearnMovePredef
@@ -10625,11 +10625,11 @@
 12:5b2f UpdateCelebiPosition.done
 12:5b30 UpdateCelebiPosition.FreezeCelebiPosition
 12:5b3b CelebiEvent_Cosine
-12:5b48 CelebiEvent_Cosine.negative_28918
-12:5b52 CelebiEvent_Cosine.apply_28918
-12:5b61 CelebiEvent_Cosine.multiply_28918
-12:5b66 CelebiEvent_Cosine.even_28918
-12:5b6e CelebiEvent_Cosine.sinetable_28918
+12:5b48 CelebiEvent_Cosine.negative_28934
+12:5b52 CelebiEvent_Cosine.apply_28934
+12:5b61 CelebiEvent_Cosine.multiply_28934
+12:5b66 CelebiEvent_Cosine.even_28934
+12:5b6e CelebiEvent_Cosine.sinetable_28934
 12:5bae GetCelebiSpriteTile
 12:5bd0 GetCelebiSpriteTile.Frame1
 12:5bd4 GetCelebiSpriteTile.Frame2
@@ -10930,16 +10930,16 @@
 13:4f72 SaveMenu_CopyTilemapAtOnce.wait2
 13:4f80 SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack
 13:4f91 SaveMenu_CopyTilemapAtOnce.loop
-13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39375
-13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39376
-13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39377
-13:4fad SaveMenu_CopyTilemapAtOnce.loop_39378
-13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39379
-13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39380
-13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39381
-13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39382
-13:4fda SaveMenu_CopyTilemapAtOnce.loop_39383
-13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39384
+13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39391
+13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39392
+13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39393
+13:4fad SaveMenu_CopyTilemapAtOnce.loop_39394
+13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39395
+13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39396
+13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39397
+13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39398
+13:4fda SaveMenu_CopyTilemapAtOnce.loop_39399
+13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39400
 13:4ffe CheckSave
 13:501b CheckSave.ok
 13:501e MapScenes
@@ -10954,16 +10954,16 @@
 13:51bd PhoneRing_CopyTilemapAtOnce.wait2
 13:51cb PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack
 13:51dc PhoneRing_CopyTilemapAtOnce.loop
-13:51dd PhoneRing_CopyTilemapAtOnce.loop_39546
-13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39547
-13:51ef PhoneRing_CopyTilemapAtOnce.loop_39548
-13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39549
-13:5201 PhoneRing_CopyTilemapAtOnce.loop_39550
-13:520a PhoneRing_CopyTilemapAtOnce.loop_39551
-13:5213 PhoneRing_CopyTilemapAtOnce.loop_39552
-13:521c PhoneRing_CopyTilemapAtOnce.loop_39553
-13:5225 PhoneRing_CopyTilemapAtOnce.loop_39554
-13:522e PhoneRing_CopyTilemapAtOnce.loop_39555
+13:51dd PhoneRing_CopyTilemapAtOnce.loop_39562
+13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39563
+13:51ef PhoneRing_CopyTilemapAtOnce.loop_39564
+13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39565
+13:5201 PhoneRing_CopyTilemapAtOnce.loop_39566
+13:520a PhoneRing_CopyTilemapAtOnce.loop_39567
+13:5213 PhoneRing_CopyTilemapAtOnce.loop_39568
+13:521c PhoneRing_CopyTilemapAtOnce.loop_39569
+13:5225 PhoneRing_CopyTilemapAtOnce.loop_39570
+13:522e PhoneRing_CopyTilemapAtOnce.loop_39571
 13:5249 Shrink1Pic
 13:52d9 Shrink2Pic
 13:5319 LinkMonStatsScreen
@@ -17223,11 +17223,11 @@
 23:46ef WipeLYOverrides.wipe
 23:46f2 WipeLYOverrides.loop
 23:46f7 StartTrainerBattle_DrawSineWave
-23:4702 StartTrainerBattle_DrawSineWave.negative_54417
-23:470c StartTrainerBattle_DrawSineWave.apply_54417
-23:471b StartTrainerBattle_DrawSineWave.multiply_54417
-23:4720 StartTrainerBattle_DrawSineWave.even_54417
-23:4728 StartTrainerBattle_DrawSineWave.sinetable_54417
+23:4702 StartTrainerBattle_DrawSineWave.negative_54433
+23:470c StartTrainerBattle_DrawSineWave.apply_54433
+23:471b StartTrainerBattle_DrawSineWave.multiply_54433
+23:4720 StartTrainerBattle_DrawSineWave.even_54433
+23:4728 StartTrainerBattle_DrawSineWave.sinetable_54433
 23:4768 StartTrainerBattle_ZoomToBlack
 23:4771 StartTrainerBattle_ZoomToBlack.loop
 23:478c StartTrainerBattle_ZoomToBlack.done
@@ -17584,11 +17584,11 @@
 23:672a Sprites_Cosine
 23:672a UnusedSpriteAnimGFX.DeletedGFX
 23:672c Sprites_Sine
-23:6737 Sprites_Sine.negative_55804
-23:6741 Sprites_Sine.apply_55804
-23:6750 Sprites_Sine.multiply_55804
-23:6755 Sprites_Sine.even_55804
-23:675d Sprites_Sine.sinetable_55804
+23:6737 Sprites_Sine.negative_55820
+23:6741 Sprites_Sine.apply_55820
+23:6750 Sprites_Sine.multiply_55820
+23:6755 Sprites_Sine.even_55820
+23:675d Sprites_Sine.sinetable_55820
 23:679d AnimateEndOfExpBar
 23:67a8 AnimateEndOfExpBar.load
 23:67b5 AnimateEndOfExpBar.loop
@@ -21835,13 +21835,13 @@
 2f:4eaa MomPhoneCalleeScript
 2f:4ec5 MomPhoneCalleeScript.started_quest
 2f:4edf MomPhoneLandmark
-2f:4ee7 MomPhonePalette1
-2f:4f05 MomPhonePalette1.newbark
-2f:4f0d MomPhonePalette1.cherrygrove
-2f:4f15 MomPhonePalette1.violet
-2f:4f1b MomPhonePalette1.azalea
-2f:4f21 MomPhonePalette1.goldenrod
-2f:4f27 MomPhonePalette2
+2f:4ee7 MomPhoneInTown
+2f:4f05 MomPhoneInTown.newbark
+2f:4f0d MomPhoneInTown.cherrygrove
+2f:4f15 MomPhoneInTown.violet
+2f:4f1b MomPhoneInTown.azalea
+2f:4f21 MomPhoneInTown.goldenrod
+2f:4f27 MomPhoneOnRoute
 2f:4f2f MomPhoneOther
 2f:4f37 MomSavingMoney
 2f:4f49 MomSavingMoney.NotSaving
@@ -23931,10 +23931,10 @@
 33:672c BattleAnim_IncAnonJumptableIndex
 33:6732 BattleAnim_Cosine
 33:6734 BattleAnim_Sine
-33:673f BattleAnim_Sine.negative_69746
-33:6749 BattleAnim_Sine.apply_69746
-33:6758 BattleAnim_Sine.multiply_69746
-33:675d BattleAnim_Sine.even_69746
+33:673f BattleAnim_Sine.negative_69762
+33:6749 BattleAnim_Sine.apply_69762
+33:6758 BattleAnim_Sine.multiply_69762
+33:675d BattleAnim_Sine.even_69762
 33:6765 BattleAnim_Sine_e
 33:676b BattleAnim_Cosine_e
 33:6771 BattleAnim_AbsSinePrecise
@@ -27079,14 +27079,14 @@
 38:6d23 BillsPC_RefreshTextboxes.placeholder_string
 38:6d2a BillsPC_RefreshTextboxes.Placeholder
 38:6d30 CopyBoxmonSpecies
-38:6d57 CopyBoxmonSpecies.loop_76360
-38:6d79 CopyBoxmonSpecies.done_76360
+38:6d57 CopyBoxmonSpecies.loop_76376
+38:6d79 CopyBoxmonSpecies.done_76376
 38:6d87 CopyBoxmonSpecies.party
-38:6d8a CopyBoxmonSpecies.loop_76361
-38:6dac CopyBoxmonSpecies.done_76361
+38:6d8a CopyBoxmonSpecies.loop_76377
+38:6dac CopyBoxmonSpecies.done_76377
 38:6db7 CopyBoxmonSpecies.sBox
-38:6dbf CopyBoxmonSpecies.loop_76362
-38:6de1 CopyBoxmonSpecies.done_76362
+38:6dbf CopyBoxmonSpecies.loop_76378
+38:6de1 CopyBoxmonSpecies.done_76378
 38:6def BillsPC_GetSelectedPokemonSpecies
 38:6e01 BillsPC_UpdateSelectionCursor
 38:6e0b BillsPC_UpdateSelectionCursor.place_cursor
@@ -31113,7 +31113,7 @@
 41:46c4 EnterMapConnection.done
 41:46c6 EnterMapWarp
 41:46df EnterMapWarp.SaveDigWarp
-41:4705 EnterMapWarp.not_mt_moon_or_tin_tower
+41:4705 EnterMapWarp.not_mt_moon_square_or_tin_tower_roof
 41:4718 EnterMapWarp.SetSpawn
 41:4743 EnterMapWarp.pokecenter_pokecom
 41:4750 LoadMapTimeOfDay
diff --git a/pokecrystal11_debug.sym b/pokecrystal11_debug.sym
index e3b630da0..f57606e8e 100644
--- a/pokecrystal11_debug.sym
+++ b/pokecrystal11_debug.sym
@@ -289,7 +289,7 @@
 00:1082 DummyChar
 00:1083 NextChar
 00:1087 CheckDict
-00:1122 CheckDict.__8460
+00:1122 CheckDict.__8476
 00:1145 CheckDict.diacritic
 00:114c CheckDict.not_diacritic
 00:115c CheckDict.hiragana_dakuten
@@ -627,9 +627,9 @@
 00:21a5 LoadMetatiles.row
 00:21a9 LoadMetatiles.col
 00:21b2 LoadMetatiles.ok
-00:21d8 LoadMetatiles.next_8623
-00:21eb LoadMetatiles.next_8628
-00:21fe LoadMetatiles.next_8633
+00:21d8 LoadMetatiles.next_8639
+00:21eb LoadMetatiles.next_8644
+00:21fe LoadMetatiles.next_8649
 00:2225 LoadMetatiles.ok2
 00:222a ReturnToMapFromSubmenu
 00:2238 CheckWarpTile
@@ -962,16 +962,16 @@
 00:329b _CopyTilemapAtOnce.wait2
 00:32a9 _CopyTilemapAtOnce.CopyBGMapViaStack
 00:32ba _CopyTilemapAtOnce.loop
-00:32bb _CopyTilemapAtOnce.loop_8711
-00:32c4 _CopyTilemapAtOnce.loop_8712
-00:32cd _CopyTilemapAtOnce.loop_8713
-00:32d6 _CopyTilemapAtOnce.loop_8714
-00:32df _CopyTilemapAtOnce.loop_8715
-00:32e8 _CopyTilemapAtOnce.loop_8716
-00:32f1 _CopyTilemapAtOnce.loop_8717
-00:32fa _CopyTilemapAtOnce.loop_8718
-00:3303 _CopyTilemapAtOnce.loop_8719
-00:330c _CopyTilemapAtOnce.loop_8720
+00:32bb _CopyTilemapAtOnce.loop_8727
+00:32c4 _CopyTilemapAtOnce.loop_8728
+00:32cd _CopyTilemapAtOnce.loop_8729
+00:32d6 _CopyTilemapAtOnce.loop_8730
+00:32df _CopyTilemapAtOnce.loop_8731
+00:32e8 _CopyTilemapAtOnce.loop_8732
+00:32f1 _CopyTilemapAtOnce.loop_8733
+00:32fa _CopyTilemapAtOnce.loop_8734
+00:3303 _CopyTilemapAtOnce.loop_8735
+00:330c _CopyTilemapAtOnce.loop_8736
 00:3327 SetPalettes
 00:3337 SetPalettes.SetPalettesForGameBoyColor
 00:3345 ClearPalettes
@@ -2038,11 +2038,11 @@
 02:44d3 QueueFollowerFirstStep.up
 02:44d7 QueueFollowerFirstStep.same_xy
 02:44d9 _Sine
-02:44e5 _Sine.negative_9312
-02:44ef _Sine.apply_9312
-02:44fe _Sine.multiply_9312
-02:4503 _Sine.even_9312
-02:450b _Sine.sinetable_9312
+02:44e5 _Sine.negative_9328
+02:44ef _Sine.apply_9328
+02:44fe _Sine.multiply_9328
+02:4503 _Sine.even_9328
+02:450b _Sine.sinetable_9328
 02:454b GetPredefPointer
 02:456b PredefPointers
 02:456b LearnMovePredef
@@ -10631,11 +10631,11 @@
 12:5b2f UpdateCelebiPosition.done
 12:5b30 UpdateCelebiPosition.FreezeCelebiPosition
 12:5b3b CelebiEvent_Cosine
-12:5b48 CelebiEvent_Cosine.negative_28919
-12:5b52 CelebiEvent_Cosine.apply_28919
-12:5b61 CelebiEvent_Cosine.multiply_28919
-12:5b66 CelebiEvent_Cosine.even_28919
-12:5b6e CelebiEvent_Cosine.sinetable_28919
+12:5b48 CelebiEvent_Cosine.negative_28935
+12:5b52 CelebiEvent_Cosine.apply_28935
+12:5b61 CelebiEvent_Cosine.multiply_28935
+12:5b66 CelebiEvent_Cosine.even_28935
+12:5b6e CelebiEvent_Cosine.sinetable_28935
 12:5bae GetCelebiSpriteTile
 12:5bd0 GetCelebiSpriteTile.Frame1
 12:5bd4 GetCelebiSpriteTile.Frame2
@@ -10937,16 +10937,16 @@
 13:4f72 SaveMenu_CopyTilemapAtOnce.wait2
 13:4f80 SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack
 13:4f91 SaveMenu_CopyTilemapAtOnce.loop
-13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39377
-13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39378
-13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39379
-13:4fad SaveMenu_CopyTilemapAtOnce.loop_39380
-13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39381
-13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39382
-13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39383
-13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39384
-13:4fda SaveMenu_CopyTilemapAtOnce.loop_39385
-13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39386
+13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39393
+13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39394
+13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39395
+13:4fad SaveMenu_CopyTilemapAtOnce.loop_39396
+13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39397
+13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39398
+13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39399
+13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39400
+13:4fda SaveMenu_CopyTilemapAtOnce.loop_39401
+13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39402
 13:4ffe CheckSave
 13:501b CheckSave.ok
 13:501e MapScenes
@@ -10961,16 +10961,16 @@
 13:51bd PhoneRing_CopyTilemapAtOnce.wait2
 13:51cb PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack
 13:51dc PhoneRing_CopyTilemapAtOnce.loop
-13:51dd PhoneRing_CopyTilemapAtOnce.loop_39548
-13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39549
-13:51ef PhoneRing_CopyTilemapAtOnce.loop_39550
-13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39551
-13:5201 PhoneRing_CopyTilemapAtOnce.loop_39552
-13:520a PhoneRing_CopyTilemapAtOnce.loop_39553
-13:5213 PhoneRing_CopyTilemapAtOnce.loop_39554
-13:521c PhoneRing_CopyTilemapAtOnce.loop_39555
-13:5225 PhoneRing_CopyTilemapAtOnce.loop_39556
-13:522e PhoneRing_CopyTilemapAtOnce.loop_39557
+13:51dd PhoneRing_CopyTilemapAtOnce.loop_39564
+13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39565
+13:51ef PhoneRing_CopyTilemapAtOnce.loop_39566
+13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39567
+13:5201 PhoneRing_CopyTilemapAtOnce.loop_39568
+13:520a PhoneRing_CopyTilemapAtOnce.loop_39569
+13:5213 PhoneRing_CopyTilemapAtOnce.loop_39570
+13:521c PhoneRing_CopyTilemapAtOnce.loop_39571
+13:5225 PhoneRing_CopyTilemapAtOnce.loop_39572
+13:522e PhoneRing_CopyTilemapAtOnce.loop_39573
 13:5249 Shrink1Pic
 13:52d9 Shrink2Pic
 13:5319 LinkMonStatsScreen
@@ -17235,11 +17235,11 @@
 23:46ef WipeLYOverrides.wipe
 23:46f2 WipeLYOverrides.loop
 23:46f7 StartTrainerBattle_DrawSineWave
-23:4702 StartTrainerBattle_DrawSineWave.negative_54421
-23:470c StartTrainerBattle_DrawSineWave.apply_54421
-23:471b StartTrainerBattle_DrawSineWave.multiply_54421
-23:4720 StartTrainerBattle_DrawSineWave.even_54421
-23:4728 StartTrainerBattle_DrawSineWave.sinetable_54421
+23:4702 StartTrainerBattle_DrawSineWave.negative_54437
+23:470c StartTrainerBattle_DrawSineWave.apply_54437
+23:471b StartTrainerBattle_DrawSineWave.multiply_54437
+23:4720 StartTrainerBattle_DrawSineWave.even_54437
+23:4728 StartTrainerBattle_DrawSineWave.sinetable_54437
 23:4768 StartTrainerBattle_ZoomToBlack
 23:4771 StartTrainerBattle_ZoomToBlack.loop
 23:478c StartTrainerBattle_ZoomToBlack.done
@@ -17596,11 +17596,11 @@
 23:672a Sprites_Cosine
 23:672a UnusedSpriteAnimGFX.DeletedGFX
 23:672c Sprites_Sine
-23:6737 Sprites_Sine.negative_55808
-23:6741 Sprites_Sine.apply_55808
-23:6750 Sprites_Sine.multiply_55808
-23:6755 Sprites_Sine.even_55808
-23:675d Sprites_Sine.sinetable_55808
+23:6737 Sprites_Sine.negative_55824
+23:6741 Sprites_Sine.apply_55824
+23:6750 Sprites_Sine.multiply_55824
+23:6755 Sprites_Sine.even_55824
+23:675d Sprites_Sine.sinetable_55824
 23:679d AnimateEndOfExpBar
 23:67a8 AnimateEndOfExpBar.load
 23:67b5 AnimateEndOfExpBar.loop
@@ -21847,13 +21847,13 @@
 2f:4eaa MomPhoneCalleeScript
 2f:4ec5 MomPhoneCalleeScript.started_quest
 2f:4edf MomPhoneLandmark
-2f:4ee7 MomPhonePalette1
-2f:4f05 MomPhonePalette1.newbark
-2f:4f0d MomPhonePalette1.cherrygrove
-2f:4f15 MomPhonePalette1.violet
-2f:4f1b MomPhonePalette1.azalea
-2f:4f21 MomPhonePalette1.goldenrod
-2f:4f27 MomPhonePalette2
+2f:4ee7 MomPhoneInTown
+2f:4f05 MomPhoneInTown.newbark
+2f:4f0d MomPhoneInTown.cherrygrove
+2f:4f15 MomPhoneInTown.violet
+2f:4f1b MomPhoneInTown.azalea
+2f:4f21 MomPhoneInTown.goldenrod
+2f:4f27 MomPhoneOnRoute
 2f:4f2f MomPhoneOther
 2f:4f37 MomSavingMoney
 2f:4f49 MomSavingMoney.NotSaving
@@ -23943,10 +23943,10 @@
 33:672c BattleAnim_IncAnonJumptableIndex
 33:6732 BattleAnim_Cosine
 33:6734 BattleAnim_Sine
-33:673f BattleAnim_Sine.negative_69750
-33:6749 BattleAnim_Sine.apply_69750
-33:6758 BattleAnim_Sine.multiply_69750
-33:675d BattleAnim_Sine.even_69750
+33:673f BattleAnim_Sine.negative_69766
+33:6749 BattleAnim_Sine.apply_69766
+33:6758 BattleAnim_Sine.multiply_69766
+33:675d BattleAnim_Sine.even_69766
 33:6765 BattleAnim_Sine_e
 33:676b BattleAnim_Cosine_e
 33:6771 BattleAnim_AbsSinePrecise
@@ -27091,14 +27091,14 @@
 38:6d23 BillsPC_RefreshTextboxes.placeholder_string
 38:6d2a BillsPC_RefreshTextboxes.Placeholder
 38:6d30 CopyBoxmonSpecies
-38:6d57 CopyBoxmonSpecies.loop_76364
-38:6d79 CopyBoxmonSpecies.done_76364
+38:6d57 CopyBoxmonSpecies.loop_76380
+38:6d79 CopyBoxmonSpecies.done_76380
 38:6d87 CopyBoxmonSpecies.party
-38:6d8a CopyBoxmonSpecies.loop_76365
-38:6dac CopyBoxmonSpecies.done_76365
+38:6d8a CopyBoxmonSpecies.loop_76381
+38:6dac CopyBoxmonSpecies.done_76381
 38:6db7 CopyBoxmonSpecies.sBox
-38:6dbf CopyBoxmonSpecies.loop_76366
-38:6de1 CopyBoxmonSpecies.done_76366
+38:6dbf CopyBoxmonSpecies.loop_76382
+38:6de1 CopyBoxmonSpecies.done_76382
 38:6def BillsPC_GetSelectedPokemonSpecies
 38:6e01 BillsPC_UpdateSelectionCursor
 38:6e0b BillsPC_UpdateSelectionCursor.place_cursor
@@ -31125,7 +31125,7 @@
 41:46c4 EnterMapConnection.done
 41:46c6 EnterMapWarp
 41:46df EnterMapWarp.SaveDigWarp
-41:4705 EnterMapWarp.not_mt_moon_or_tin_tower
+41:4705 EnterMapWarp.not_mt_moon_square_or_tin_tower_roof
 41:4718 EnterMapWarp.SetSpawn
 41:4743 EnterMapWarp.pokecenter_pokecom
 41:4750 LoadMapTimeOfDay
diff --git a/pokecrystal_au.sym b/pokecrystal_au.sym
index 2c75f9494..3ef4097ef 100644
--- a/pokecrystal_au.sym
+++ b/pokecrystal_au.sym
@@ -289,7 +289,7 @@
 00:1082 DummyChar
 00:1083 NextChar
 00:1087 CheckDict
-00:1122 CheckDict.__8460
+00:1122 CheckDict.__8476
 00:1145 CheckDict.diacritic
 00:114c CheckDict.not_diacritic
 00:115c CheckDict.hiragana_dakuten
@@ -627,9 +627,9 @@
 00:21a5 LoadMetatiles.row
 00:21a9 LoadMetatiles.col
 00:21b2 LoadMetatiles.ok
-00:21d8 LoadMetatiles.next_8623
-00:21eb LoadMetatiles.next_8628
-00:21fe LoadMetatiles.next_8633
+00:21d8 LoadMetatiles.next_8639
+00:21eb LoadMetatiles.next_8644
+00:21fe LoadMetatiles.next_8649
 00:2225 LoadMetatiles.ok2
 00:222a ReturnToMapFromSubmenu
 00:2238 CheckWarpTile
@@ -959,16 +959,16 @@
 00:326d _CopyTilemapAtOnce.wait2
 00:327b _CopyTilemapAtOnce.CopyBGMapViaStack
 00:328c _CopyTilemapAtOnce.loop
-00:328d _CopyTilemapAtOnce.loop_8711
-00:3296 _CopyTilemapAtOnce.loop_8712
-00:329f _CopyTilemapAtOnce.loop_8713
-00:32a8 _CopyTilemapAtOnce.loop_8714
-00:32b1 _CopyTilemapAtOnce.loop_8715
-00:32ba _CopyTilemapAtOnce.loop_8716
-00:32c3 _CopyTilemapAtOnce.loop_8717
-00:32cc _CopyTilemapAtOnce.loop_8718
-00:32d5 _CopyTilemapAtOnce.loop_8719
-00:32de _CopyTilemapAtOnce.loop_8720
+00:328d _CopyTilemapAtOnce.loop_8727
+00:3296 _CopyTilemapAtOnce.loop_8728
+00:329f _CopyTilemapAtOnce.loop_8729
+00:32a8 _CopyTilemapAtOnce.loop_8730
+00:32b1 _CopyTilemapAtOnce.loop_8731
+00:32ba _CopyTilemapAtOnce.loop_8732
+00:32c3 _CopyTilemapAtOnce.loop_8733
+00:32cc _CopyTilemapAtOnce.loop_8734
+00:32d5 _CopyTilemapAtOnce.loop_8735
+00:32de _CopyTilemapAtOnce.loop_8736
 00:32f9 SetPalettes
 00:3309 SetPalettes.SetPalettesForGameBoyColor
 00:3317 ClearPalettes
@@ -2034,11 +2034,11 @@
 02:44d3 QueueFollowerFirstStep.up
 02:44d7 QueueFollowerFirstStep.same_xy
 02:44d9 _Sine
-02:44e5 _Sine.negative_9311
-02:44ef _Sine.apply_9311
-02:44fe _Sine.multiply_9311
-02:4503 _Sine.even_9311
-02:450b _Sine.sinetable_9311
+02:44e5 _Sine.negative_9327
+02:44ef _Sine.apply_9327
+02:44fe _Sine.multiply_9327
+02:4503 _Sine.even_9327
+02:450b _Sine.sinetable_9327
 02:454b GetPredefPointer
 02:456b PredefPointers
 02:456b LearnMovePredef
@@ -10625,11 +10625,11 @@
 12:5b2f UpdateCelebiPosition.done
 12:5b30 UpdateCelebiPosition.FreezeCelebiPosition
 12:5b3b CelebiEvent_Cosine
-12:5b48 CelebiEvent_Cosine.negative_28918
-12:5b52 CelebiEvent_Cosine.apply_28918
-12:5b61 CelebiEvent_Cosine.multiply_28918
-12:5b66 CelebiEvent_Cosine.even_28918
-12:5b6e CelebiEvent_Cosine.sinetable_28918
+12:5b48 CelebiEvent_Cosine.negative_28934
+12:5b52 CelebiEvent_Cosine.apply_28934
+12:5b61 CelebiEvent_Cosine.multiply_28934
+12:5b66 CelebiEvent_Cosine.even_28934
+12:5b6e CelebiEvent_Cosine.sinetable_28934
 12:5bae GetCelebiSpriteTile
 12:5bd0 GetCelebiSpriteTile.Frame1
 12:5bd4 GetCelebiSpriteTile.Frame2
@@ -10930,16 +10930,16 @@
 13:4f72 SaveMenu_CopyTilemapAtOnce.wait2
 13:4f80 SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack
 13:4f91 SaveMenu_CopyTilemapAtOnce.loop
-13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39375
-13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39376
-13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39377
-13:4fad SaveMenu_CopyTilemapAtOnce.loop_39378
-13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39379
-13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39380
-13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39381
-13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39382
-13:4fda SaveMenu_CopyTilemapAtOnce.loop_39383
-13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39384
+13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39391
+13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39392
+13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39393
+13:4fad SaveMenu_CopyTilemapAtOnce.loop_39394
+13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39395
+13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39396
+13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39397
+13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39398
+13:4fda SaveMenu_CopyTilemapAtOnce.loop_39399
+13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39400
 13:4ffe CheckSave
 13:501b CheckSave.ok
 13:501e MapScenes
@@ -10954,16 +10954,16 @@
 13:51bd PhoneRing_CopyTilemapAtOnce.wait2
 13:51cb PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack
 13:51dc PhoneRing_CopyTilemapAtOnce.loop
-13:51dd PhoneRing_CopyTilemapAtOnce.loop_39546
-13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39547
-13:51ef PhoneRing_CopyTilemapAtOnce.loop_39548
-13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39549
-13:5201 PhoneRing_CopyTilemapAtOnce.loop_39550
-13:520a PhoneRing_CopyTilemapAtOnce.loop_39551
-13:5213 PhoneRing_CopyTilemapAtOnce.loop_39552
-13:521c PhoneRing_CopyTilemapAtOnce.loop_39553
-13:5225 PhoneRing_CopyTilemapAtOnce.loop_39554
-13:522e PhoneRing_CopyTilemapAtOnce.loop_39555
+13:51dd PhoneRing_CopyTilemapAtOnce.loop_39562
+13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39563
+13:51ef PhoneRing_CopyTilemapAtOnce.loop_39564
+13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39565
+13:5201 PhoneRing_CopyTilemapAtOnce.loop_39566
+13:520a PhoneRing_CopyTilemapAtOnce.loop_39567
+13:5213 PhoneRing_CopyTilemapAtOnce.loop_39568
+13:521c PhoneRing_CopyTilemapAtOnce.loop_39569
+13:5225 PhoneRing_CopyTilemapAtOnce.loop_39570
+13:522e PhoneRing_CopyTilemapAtOnce.loop_39571
 13:5249 Shrink1Pic
 13:52d9 Shrink2Pic
 13:5319 LinkMonStatsScreen
@@ -17223,11 +17223,11 @@
 23:46ef WipeLYOverrides.wipe
 23:46f2 WipeLYOverrides.loop
 23:46f7 StartTrainerBattle_DrawSineWave
-23:4702 StartTrainerBattle_DrawSineWave.negative_54417
-23:470c StartTrainerBattle_DrawSineWave.apply_54417
-23:471b StartTrainerBattle_DrawSineWave.multiply_54417
-23:4720 StartTrainerBattle_DrawSineWave.even_54417
-23:4728 StartTrainerBattle_DrawSineWave.sinetable_54417
+23:4702 StartTrainerBattle_DrawSineWave.negative_54433
+23:470c StartTrainerBattle_DrawSineWave.apply_54433
+23:471b StartTrainerBattle_DrawSineWave.multiply_54433
+23:4720 StartTrainerBattle_DrawSineWave.even_54433
+23:4728 StartTrainerBattle_DrawSineWave.sinetable_54433
 23:4768 StartTrainerBattle_ZoomToBlack
 23:4771 StartTrainerBattle_ZoomToBlack.loop
 23:478c StartTrainerBattle_ZoomToBlack.done
@@ -17584,11 +17584,11 @@
 23:672a Sprites_Cosine
 23:672a UnusedSpriteAnimGFX.DeletedGFX
 23:672c Sprites_Sine
-23:6737 Sprites_Sine.negative_55804
-23:6741 Sprites_Sine.apply_55804
-23:6750 Sprites_Sine.multiply_55804
-23:6755 Sprites_Sine.even_55804
-23:675d Sprites_Sine.sinetable_55804
+23:6737 Sprites_Sine.negative_55820
+23:6741 Sprites_Sine.apply_55820
+23:6750 Sprites_Sine.multiply_55820
+23:6755 Sprites_Sine.even_55820
+23:675d Sprites_Sine.sinetable_55820
 23:679d AnimateEndOfExpBar
 23:67a8 AnimateEndOfExpBar.load
 23:67b5 AnimateEndOfExpBar.loop
@@ -21835,13 +21835,13 @@
 2f:4eaa MomPhoneCalleeScript
 2f:4ec5 MomPhoneCalleeScript.started_quest
 2f:4edf MomPhoneLandmark
-2f:4ee7 MomPhonePalette1
-2f:4f05 MomPhonePalette1.newbark
-2f:4f0d MomPhonePalette1.cherrygrove
-2f:4f15 MomPhonePalette1.violet
-2f:4f1b MomPhonePalette1.azalea
-2f:4f21 MomPhonePalette1.goldenrod
-2f:4f27 MomPhonePalette2
+2f:4ee7 MomPhoneInTown
+2f:4f05 MomPhoneInTown.newbark
+2f:4f0d MomPhoneInTown.cherrygrove
+2f:4f15 MomPhoneInTown.violet
+2f:4f1b MomPhoneInTown.azalea
+2f:4f21 MomPhoneInTown.goldenrod
+2f:4f27 MomPhoneOnRoute
 2f:4f2f MomPhoneOther
 2f:4f37 MomSavingMoney
 2f:4f49 MomSavingMoney.NotSaving
@@ -23931,10 +23931,10 @@
 33:672c BattleAnim_IncAnonJumptableIndex
 33:6732 BattleAnim_Cosine
 33:6734 BattleAnim_Sine
-33:673f BattleAnim_Sine.negative_69746
-33:6749 BattleAnim_Sine.apply_69746
-33:6758 BattleAnim_Sine.multiply_69746
-33:675d BattleAnim_Sine.even_69746
+33:673f BattleAnim_Sine.negative_69762
+33:6749 BattleAnim_Sine.apply_69762
+33:6758 BattleAnim_Sine.multiply_69762
+33:675d BattleAnim_Sine.even_69762
 33:6765 BattleAnim_Sine_e
 33:676b BattleAnim_Cosine_e
 33:6771 BattleAnim_AbsSinePrecise
@@ -27079,14 +27079,14 @@
 38:6d23 BillsPC_RefreshTextboxes.placeholder_string
 38:6d2a BillsPC_RefreshTextboxes.Placeholder
 38:6d30 CopyBoxmonSpecies
-38:6d57 CopyBoxmonSpecies.loop_76360
-38:6d79 CopyBoxmonSpecies.done_76360
+38:6d57 CopyBoxmonSpecies.loop_76376
+38:6d79 CopyBoxmonSpecies.done_76376
 38:6d87 CopyBoxmonSpecies.party
-38:6d8a CopyBoxmonSpecies.loop_76361
-38:6dac CopyBoxmonSpecies.done_76361
+38:6d8a CopyBoxmonSpecies.loop_76377
+38:6dac CopyBoxmonSpecies.done_76377
 38:6db7 CopyBoxmonSpecies.sBox
-38:6dbf CopyBoxmonSpecies.loop_76362
-38:6de1 CopyBoxmonSpecies.done_76362
+38:6dbf CopyBoxmonSpecies.loop_76378
+38:6de1 CopyBoxmonSpecies.done_76378
 38:6def BillsPC_GetSelectedPokemonSpecies
 38:6e01 BillsPC_UpdateSelectionCursor
 38:6e0b BillsPC_UpdateSelectionCursor.place_cursor
@@ -31113,7 +31113,7 @@
 41:46c4 EnterMapConnection.done
 41:46c6 EnterMapWarp
 41:46df EnterMapWarp.SaveDigWarp
-41:4705 EnterMapWarp.not_mt_moon_or_tin_tower
+41:4705 EnterMapWarp.not_mt_moon_square_or_tin_tower_roof
 41:4718 EnterMapWarp.SetSpawn
 41:4743 EnterMapWarp.pokecenter_pokecom
 41:4750 LoadMapTimeOfDay
diff --git a/pokecrystal_debug.sym b/pokecrystal_debug.sym
index 7b26639f3..c8f2869f0 100644
--- a/pokecrystal_debug.sym
+++ b/pokecrystal_debug.sym
@@ -289,7 +289,7 @@
 00:1082 DummyChar
 00:1083 NextChar
 00:1087 CheckDict
-00:1122 CheckDict.__8460
+00:1122 CheckDict.__8476
 00:1145 CheckDict.diacritic
 00:114c CheckDict.not_diacritic
 00:115c CheckDict.hiragana_dakuten
@@ -627,9 +627,9 @@
 00:21a5 LoadMetatiles.row
 00:21a9 LoadMetatiles.col
 00:21b2 LoadMetatiles.ok
-00:21d8 LoadMetatiles.next_8623
-00:21eb LoadMetatiles.next_8628
-00:21fe LoadMetatiles.next_8633
+00:21d8 LoadMetatiles.next_8639
+00:21eb LoadMetatiles.next_8644
+00:21fe LoadMetatiles.next_8649
 00:2225 LoadMetatiles.ok2
 00:222a ReturnToMapFromSubmenu
 00:2238 CheckWarpTile
@@ -962,16 +962,16 @@
 00:329b _CopyTilemapAtOnce.wait2
 00:32a9 _CopyTilemapAtOnce.CopyBGMapViaStack
 00:32ba _CopyTilemapAtOnce.loop
-00:32bb _CopyTilemapAtOnce.loop_8711
-00:32c4 _CopyTilemapAtOnce.loop_8712
-00:32cd _CopyTilemapAtOnce.loop_8713
-00:32d6 _CopyTilemapAtOnce.loop_8714
-00:32df _CopyTilemapAtOnce.loop_8715
-00:32e8 _CopyTilemapAtOnce.loop_8716
-00:32f1 _CopyTilemapAtOnce.loop_8717
-00:32fa _CopyTilemapAtOnce.loop_8718
-00:3303 _CopyTilemapAtOnce.loop_8719
-00:330c _CopyTilemapAtOnce.loop_8720
+00:32bb _CopyTilemapAtOnce.loop_8727
+00:32c4 _CopyTilemapAtOnce.loop_8728
+00:32cd _CopyTilemapAtOnce.loop_8729
+00:32d6 _CopyTilemapAtOnce.loop_8730
+00:32df _CopyTilemapAtOnce.loop_8731
+00:32e8 _CopyTilemapAtOnce.loop_8732
+00:32f1 _CopyTilemapAtOnce.loop_8733
+00:32fa _CopyTilemapAtOnce.loop_8734
+00:3303 _CopyTilemapAtOnce.loop_8735
+00:330c _CopyTilemapAtOnce.loop_8736
 00:3327 SetPalettes
 00:3337 SetPalettes.SetPalettesForGameBoyColor
 00:3345 ClearPalettes
@@ -2038,11 +2038,11 @@
 02:44d3 QueueFollowerFirstStep.up
 02:44d7 QueueFollowerFirstStep.same_xy
 02:44d9 _Sine
-02:44e5 _Sine.negative_9312
-02:44ef _Sine.apply_9312
-02:44fe _Sine.multiply_9312
-02:4503 _Sine.even_9312
-02:450b _Sine.sinetable_9312
+02:44e5 _Sine.negative_9328
+02:44ef _Sine.apply_9328
+02:44fe _Sine.multiply_9328
+02:4503 _Sine.even_9328
+02:450b _Sine.sinetable_9328
 02:454b GetPredefPointer
 02:456b PredefPointers
 02:456b LearnMovePredef
@@ -10631,11 +10631,11 @@
 12:5b2f UpdateCelebiPosition.done
 12:5b30 UpdateCelebiPosition.FreezeCelebiPosition
 12:5b3b CelebiEvent_Cosine
-12:5b48 CelebiEvent_Cosine.negative_28919
-12:5b52 CelebiEvent_Cosine.apply_28919
-12:5b61 CelebiEvent_Cosine.multiply_28919
-12:5b66 CelebiEvent_Cosine.even_28919
-12:5b6e CelebiEvent_Cosine.sinetable_28919
+12:5b48 CelebiEvent_Cosine.negative_28935
+12:5b52 CelebiEvent_Cosine.apply_28935
+12:5b61 CelebiEvent_Cosine.multiply_28935
+12:5b66 CelebiEvent_Cosine.even_28935
+12:5b6e CelebiEvent_Cosine.sinetable_28935
 12:5bae GetCelebiSpriteTile
 12:5bd0 GetCelebiSpriteTile.Frame1
 12:5bd4 GetCelebiSpriteTile.Frame2
@@ -10937,16 +10937,16 @@
 13:4f72 SaveMenu_CopyTilemapAtOnce.wait2
 13:4f80 SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack
 13:4f91 SaveMenu_CopyTilemapAtOnce.loop
-13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39377
-13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39378
-13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39379
-13:4fad SaveMenu_CopyTilemapAtOnce.loop_39380
-13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39381
-13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39382
-13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39383
-13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39384
-13:4fda SaveMenu_CopyTilemapAtOnce.loop_39385
-13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39386
+13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39393
+13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39394
+13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39395
+13:4fad SaveMenu_CopyTilemapAtOnce.loop_39396
+13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39397
+13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39398
+13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39399
+13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39400
+13:4fda SaveMenu_CopyTilemapAtOnce.loop_39401
+13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39402
 13:4ffe CheckSave
 13:501b CheckSave.ok
 13:501e MapScenes
@@ -10961,16 +10961,16 @@
 13:51bd PhoneRing_CopyTilemapAtOnce.wait2
 13:51cb PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack
 13:51dc PhoneRing_CopyTilemapAtOnce.loop
-13:51dd PhoneRing_CopyTilemapAtOnce.loop_39548
-13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39549
-13:51ef PhoneRing_CopyTilemapAtOnce.loop_39550
-13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39551
-13:5201 PhoneRing_CopyTilemapAtOnce.loop_39552
-13:520a PhoneRing_CopyTilemapAtOnce.loop_39553
-13:5213 PhoneRing_CopyTilemapAtOnce.loop_39554
-13:521c PhoneRing_CopyTilemapAtOnce.loop_39555
-13:5225 PhoneRing_CopyTilemapAtOnce.loop_39556
-13:522e PhoneRing_CopyTilemapAtOnce.loop_39557
+13:51dd PhoneRing_CopyTilemapAtOnce.loop_39564
+13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39565
+13:51ef PhoneRing_CopyTilemapAtOnce.loop_39566
+13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39567
+13:5201 PhoneRing_CopyTilemapAtOnce.loop_39568
+13:520a PhoneRing_CopyTilemapAtOnce.loop_39569
+13:5213 PhoneRing_CopyTilemapAtOnce.loop_39570
+13:521c PhoneRing_CopyTilemapAtOnce.loop_39571
+13:5225 PhoneRing_CopyTilemapAtOnce.loop_39572
+13:522e PhoneRing_CopyTilemapAtOnce.loop_39573
 13:5249 Shrink1Pic
 13:52d9 Shrink2Pic
 13:5319 LinkMonStatsScreen
@@ -17235,11 +17235,11 @@
 23:46ef WipeLYOverrides.wipe
 23:46f2 WipeLYOverrides.loop
 23:46f7 StartTrainerBattle_DrawSineWave
-23:4702 StartTrainerBattle_DrawSineWave.negative_54421
-23:470c StartTrainerBattle_DrawSineWave.apply_54421
-23:471b StartTrainerBattle_DrawSineWave.multiply_54421
-23:4720 StartTrainerBattle_DrawSineWave.even_54421
-23:4728 StartTrainerBattle_DrawSineWave.sinetable_54421
+23:4702 StartTrainerBattle_DrawSineWave.negative_54437
+23:470c StartTrainerBattle_DrawSineWave.apply_54437
+23:471b StartTrainerBattle_DrawSineWave.multiply_54437
+23:4720 StartTrainerBattle_DrawSineWave.even_54437
+23:4728 StartTrainerBattle_DrawSineWave.sinetable_54437
 23:4768 StartTrainerBattle_ZoomToBlack
 23:4771 StartTrainerBattle_ZoomToBlack.loop
 23:478c StartTrainerBattle_ZoomToBlack.done
@@ -17596,11 +17596,11 @@
 23:672a Sprites_Cosine
 23:672a UnusedSpriteAnimGFX.DeletedGFX
 23:672c Sprites_Sine
-23:6737 Sprites_Sine.negative_55808
-23:6741 Sprites_Sine.apply_55808
-23:6750 Sprites_Sine.multiply_55808
-23:6755 Sprites_Sine.even_55808
-23:675d Sprites_Sine.sinetable_55808
+23:6737 Sprites_Sine.negative_55824
+23:6741 Sprites_Sine.apply_55824
+23:6750 Sprites_Sine.multiply_55824
+23:6755 Sprites_Sine.even_55824
+23:675d Sprites_Sine.sinetable_55824
 23:679d AnimateEndOfExpBar
 23:67a8 AnimateEndOfExpBar.load
 23:67b5 AnimateEndOfExpBar.loop
@@ -21847,13 +21847,13 @@
 2f:4eaa MomPhoneCalleeScript
 2f:4ec5 MomPhoneCalleeScript.started_quest
 2f:4edf MomPhoneLandmark
-2f:4ee7 MomPhonePalette1
-2f:4f05 MomPhonePalette1.newbark
-2f:4f0d MomPhonePalette1.cherrygrove
-2f:4f15 MomPhonePalette1.violet
-2f:4f1b MomPhonePalette1.azalea
-2f:4f21 MomPhonePalette1.goldenrod
-2f:4f27 MomPhonePalette2
+2f:4ee7 MomPhoneInTown
+2f:4f05 MomPhoneInTown.newbark
+2f:4f0d MomPhoneInTown.cherrygrove
+2f:4f15 MomPhoneInTown.violet
+2f:4f1b MomPhoneInTown.azalea
+2f:4f21 MomPhoneInTown.goldenrod
+2f:4f27 MomPhoneOnRoute
 2f:4f2f MomPhoneOther
 2f:4f37 MomSavingMoney
 2f:4f49 MomSavingMoney.NotSaving
@@ -23943,10 +23943,10 @@
 33:672c BattleAnim_IncAnonJumptableIndex
 33:6732 BattleAnim_Cosine
 33:6734 BattleAnim_Sine
-33:673f BattleAnim_Sine.negative_69750
-33:6749 BattleAnim_Sine.apply_69750
-33:6758 BattleAnim_Sine.multiply_69750
-33:675d BattleAnim_Sine.even_69750
+33:673f BattleAnim_Sine.negative_69766
+33:6749 BattleAnim_Sine.apply_69766
+33:6758 BattleAnim_Sine.multiply_69766
+33:675d BattleAnim_Sine.even_69766
 33:6765 BattleAnim_Sine_e
 33:676b BattleAnim_Cosine_e
 33:6771 BattleAnim_AbsSinePrecise
@@ -27091,14 +27091,14 @@
 38:6d23 BillsPC_RefreshTextboxes.placeholder_string
 38:6d2a BillsPC_RefreshTextboxes.Placeholder
 38:6d30 CopyBoxmonSpecies
-38:6d57 CopyBoxmonSpecies.loop_76364
-38:6d79 CopyBoxmonSpecies.done_76364
+38:6d57 CopyBoxmonSpecies.loop_76380
+38:6d79 CopyBoxmonSpecies.done_76380
 38:6d87 CopyBoxmonSpecies.party
-38:6d8a CopyBoxmonSpecies.loop_76365
-38:6dac CopyBoxmonSpecies.done_76365
+38:6d8a CopyBoxmonSpecies.loop_76381
+38:6dac CopyBoxmonSpecies.done_76381
 38:6db7 CopyBoxmonSpecies.sBox
-38:6dbf CopyBoxmonSpecies.loop_76366
-38:6de1 CopyBoxmonSpecies.done_76366
+38:6dbf CopyBoxmonSpecies.loop_76382
+38:6de1 CopyBoxmonSpecies.done_76382
 38:6def BillsPC_GetSelectedPokemonSpecies
 38:6e01 BillsPC_UpdateSelectionCursor
 38:6e0b BillsPC_UpdateSelectionCursor.place_cursor
@@ -31125,7 +31125,7 @@
 41:46c4 EnterMapConnection.done
 41:46c6 EnterMapWarp
 41:46df EnterMapWarp.SaveDigWarp
-41:4705 EnterMapWarp.not_mt_moon_or_tin_tower
+41:4705 EnterMapWarp.not_mt_moon_square_or_tin_tower_roof
 41:4718 EnterMapWarp.SetSpawn
 41:4743 EnterMapWarp.pokecenter_pokecom
 41:4750 LoadMapTimeOfDay