diff --git a/pokecrystal-au.sym b/pokecrystal-au.sym index fbff95b21..0bd660f4d 100644 --- a/pokecrystal-au.sym +++ b/pokecrystal-au.sym @@ -819,7 +819,7 @@ 00:2d27 LoadMapTileset 00:2d43 InexplicablyEmptyFunction 00:2d54 FarCall_de -00:2d61 FarCall_de.de +00:2d61 FarCall_JumpToDE 00:2d63 FarCall_hl 00:2d6e ReturnFarCall 00:2d82 FarCall_JumpToHL @@ -4695,7 +4695,7 @@ 05:5790 PlayersPCMenuData.Decoration 05:579b PlayersPCMenuData.TurnOff 05:57a4 PlayersPCMenuData.LogOff -05:57ac PlayersPCMenuData.PlayersPCMenuList1 +05:57ac PlayersPCMenuData.WhichPC 05:57bb PC_DisplayTextWaitMenu 05:57cc PlayersPCAskWhatDoText 05:57d1 PlayerWithdrawItemMenu @@ -10190,11 +10190,11 @@ 12:5b2f UpdateCelebiPosition.done 12:5b30 UpdateCelebiPosition.FreezeCelebiPosition 12:5b3b CelebiEvent_Cosine -12:5b48 CelebiEvent_Cosine.negative_21281 -12:5b52 CelebiEvent_Cosine.apply_21281 -12:5b61 CelebiEvent_Cosine.multiply_21281 -12:5b66 CelebiEvent_Cosine.even_21281 -12:5b6e CelebiEvent_Cosine.sinetable_21281 +12:5b48 CelebiEvent_Cosine.negative_21302 +12:5b52 CelebiEvent_Cosine.apply_21302 +12:5b61 CelebiEvent_Cosine.multiply_21302 +12:5b66 CelebiEvent_Cosine.even_21302 +12:5b6e CelebiEvent_Cosine.sinetable_21302 12:5bae GetCelebiSpriteTile 12:5bd0 GetCelebiSpriteTile.Frame1 12:5bd4 GetCelebiSpriteTile.Frame2 @@ -10486,16 +10486,16 @@ 13:4f72 SaveMenu_CopyTilemapAtOnce.wait2 13:4f80 SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 13:4f91 SaveMenu_CopyTilemapAtOnce.loop -13:4f92 SaveMenu_CopyTilemapAtOnce.loop_31735 -13:4f9b SaveMenu_CopyTilemapAtOnce.loop_31736 -13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_31737 -13:4fad SaveMenu_CopyTilemapAtOnce.loop_31738 -13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_31739 -13:4fbf SaveMenu_CopyTilemapAtOnce.loop_31740 -13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_31741 -13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_31742 -13:4fda SaveMenu_CopyTilemapAtOnce.loop_31743 -13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_31744 +13:4f92 SaveMenu_CopyTilemapAtOnce.loop_31756 +13:4f9b SaveMenu_CopyTilemapAtOnce.loop_31757 +13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_31758 +13:4fad SaveMenu_CopyTilemapAtOnce.loop_31759 +13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_31760 +13:4fbf SaveMenu_CopyTilemapAtOnce.loop_31761 +13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_31762 +13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_31763 +13:4fda SaveMenu_CopyTilemapAtOnce.loop_31764 +13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_31765 13:4ffe CheckSave 13:501b CheckSave.ok 13:501e MapScenes @@ -10510,16 +10510,16 @@ 13:51bd PhoneRing_CopyTilemapAtOnce.wait2 13:51cb PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack 13:51dc PhoneRing_CopyTilemapAtOnce.loop -13:51dd PhoneRing_CopyTilemapAtOnce.loop_31906 -13:51e6 PhoneRing_CopyTilemapAtOnce.loop_31907 -13:51ef PhoneRing_CopyTilemapAtOnce.loop_31908 -13:51f8 PhoneRing_CopyTilemapAtOnce.loop_31909 -13:5201 PhoneRing_CopyTilemapAtOnce.loop_31910 -13:520a PhoneRing_CopyTilemapAtOnce.loop_31911 -13:5213 PhoneRing_CopyTilemapAtOnce.loop_31912 -13:521c PhoneRing_CopyTilemapAtOnce.loop_31913 -13:5225 PhoneRing_CopyTilemapAtOnce.loop_31914 -13:522e PhoneRing_CopyTilemapAtOnce.loop_31915 +13:51dd PhoneRing_CopyTilemapAtOnce.loop_31927 +13:51e6 PhoneRing_CopyTilemapAtOnce.loop_31928 +13:51ef PhoneRing_CopyTilemapAtOnce.loop_31929 +13:51f8 PhoneRing_CopyTilemapAtOnce.loop_31930 +13:5201 PhoneRing_CopyTilemapAtOnce.loop_31931 +13:520a PhoneRing_CopyTilemapAtOnce.loop_31932 +13:5213 PhoneRing_CopyTilemapAtOnce.loop_31933 +13:521c PhoneRing_CopyTilemapAtOnce.loop_31934 +13:5225 PhoneRing_CopyTilemapAtOnce.loop_31935 +13:522e PhoneRing_CopyTilemapAtOnce.loop_31936 13:5249 Shrink1Pic 13:52d9 Shrink2Pic 13:5319 LinkMonStatsScreen @@ -16637,11 +16637,11 @@ 23:46ef WipeLYOverrides.wipe 23:46f2 WipeLYOverrides.loop 23:46f7 StartTrainerBattle_DrawSineWave -23:4702 StartTrainerBattle_DrawSineWave.negative_43983 -23:470c StartTrainerBattle_DrawSineWave.apply_43983 -23:471b StartTrainerBattle_DrawSineWave.multiply_43983 -23:4720 StartTrainerBattle_DrawSineWave.even_43983 -23:4728 StartTrainerBattle_DrawSineWave.sinetable_43983 +23:4702 StartTrainerBattle_DrawSineWave.negative_44004 +23:470c StartTrainerBattle_DrawSineWave.apply_44004 +23:471b StartTrainerBattle_DrawSineWave.multiply_44004 +23:4720 StartTrainerBattle_DrawSineWave.even_44004 +23:4728 StartTrainerBattle_DrawSineWave.sinetable_44004 23:4768 StartTrainerBattle_ZoomToBlack 23:4771 StartTrainerBattle_ZoomToBlack.loop 23:478c StartTrainerBattle_ZoomToBlack.done @@ -16983,11 +16983,11 @@ 23:672a Sprites_Cosine 23:672a BrokenStdGFXPointers.deleted 23:672c Sprites_Sine -23:6737 Sprites_Sine.negative_45364 -23:6741 Sprites_Sine.apply_45364 -23:6750 Sprites_Sine.multiply_45364 -23:6755 Sprites_Sine.even_45364 -23:675d Sprites_Sine.sinetable_45364 +23:6737 Sprites_Sine.negative_45385 +23:6741 Sprites_Sine.apply_45385 +23:6750 Sprites_Sine.multiply_45385 +23:6755 Sprites_Sine.even_45385 +23:675d Sprites_Sine.sinetable_45385 23:679d AnimateEndOfExpBar 23:67a8 AnimateEndOfExpBar.load 23:67b5 AnimateEndOfExpBar.loop @@ -23122,10 +23122,10 @@ 33:672c BattleAnim_IncAnonJumptableIndex 33:6732 BattleAnim_Cosine 33:6734 BattleAnim_Sine -33:673f BattleAnim_Sine.negative_59244 -33:6749 BattleAnim_Sine.apply_59244 -33:6758 BattleAnim_Sine.multiply_59244 -33:675d BattleAnim_Sine.even_59244 +33:673f BattleAnim_Sine.negative_59265 +33:6749 BattleAnim_Sine.apply_59265 +33:6758 BattleAnim_Sine.multiply_59265 +33:675d BattleAnim_Sine.even_59265 33:6765 BattleAnim_Sine_e 33:676b BattleAnim_Cosine_e 33:677f BattleAnimSineWave @@ -26257,14 +26257,14 @@ 38:6d23 BillsPC_RefreshTextboxes.placeholder_string 38:6d2a BillsPC_RefreshTextboxes.Placeholder 38:6d30 CopyBoxmonSpecies -38:6d57 CopyBoxmonSpecies.loop_65690 -38:6d79 CopyBoxmonSpecies.done_65690 +38:6d57 CopyBoxmonSpecies.loop_65711 +38:6d79 CopyBoxmonSpecies.done_65711 38:6d87 CopyBoxmonSpecies.party -38:6d8a CopyBoxmonSpecies.loop_65691 -38:6dac CopyBoxmonSpecies.done_65691 +38:6d8a CopyBoxmonSpecies.loop_65712 +38:6dac CopyBoxmonSpecies.done_65712 38:6db7 CopyBoxmonSpecies.sBox -38:6dbf CopyBoxmonSpecies.loop_65692 -38:6de1 CopyBoxmonSpecies.done_65692 +38:6dbf CopyBoxmonSpecies.loop_65713 +38:6de1 CopyBoxmonSpecies.done_65713 38:6def BillsPC_GetSelectedPokemonSpecies 38:6e01 BillsPC_UpdateSelectionCursor 38:6e0b BillsPC_UpdateSelectionCursor.place_cursor @@ -26661,26 +26661,26 @@ 3a:4146 UpdateChannels.Channel1 3a:414c UpdateChannels.Channel5 3a:4159 UpdateChannels.noPitchSweep -3a:416b UpdateChannels.frequency_override -3a:4175 UpdateChannels.check_duty_override -3a:4184 UpdateChannels.asm_e8184 -3a:4195 UpdateChannels.ch1rest -3a:41a2 UpdateChannels.asm_e81a2 +3a:416b UpdateChannels.ch1_frequency_override +3a:4175 UpdateChannels.ch1_check_duty_override +3a:4184 UpdateChannels.ch1_vibrato_override +3a:4195 UpdateChannels.ch1_rest +3a:41a2 UpdateChannels.ch1_noise_sampling 3a:41bc UpdateChannels.Channel2 3a:41bc UpdateChannels.Channel6 -3a:41e6 UpdateChannels.asm_e81e6 -3a:41f7 UpdateChannels.ch2rest -3a:4204 UpdateChannels.asm_e8204 +3a:41e6 UpdateChannels.ch2_vibrato_override +3a:41f7 UpdateChannels.ch2_rest +3a:4204 UpdateChannels.ch2_noise_sampling 3a:421e UpdateChannels.Channel3 3a:421e UpdateChannels.Channel7 -3a:423a UpdateChannels.asm_e823a -3a:4240 UpdateChannels.ch3rest -3a:424d UpdateChannels.asm_e824d -3a:4268 UpdateChannels.asm_e8268 +3a:423a UpdateChannels.ch3_vibrato_override +3a:4240 UpdateChannels.ch3_rest +3a:424d UpdateChannels.ch3_noise_sampling +3a:4268 UpdateChannels.load_wave_pattern 3a:42b4 UpdateChannels.Channel4 3a:42b4 UpdateChannels.Channel8 -3a:42c7 UpdateChannels.ch4rest -3a:42d4 UpdateChannels.asm_e82d4 +3a:42c7 UpdateChannels.ch4_rest +3a:42d4 UpdateChannels.ch4_noise_sampling 3a:42e7 _CheckSFX 3a:4305 _CheckSFX.sfxon 3a:4307 PlayDanger diff --git a/pokecrystal.sym b/pokecrystal.sym index 166b76dfb..dabc55d4f 100644 --- a/pokecrystal.sym +++ b/pokecrystal.sym @@ -819,7 +819,7 @@ 00:2d27 LoadMapTileset 00:2d43 InexplicablyEmptyFunction 00:2d54 FarCall_de -00:2d61 FarCall_de.de +00:2d61 FarCall_JumpToDE 00:2d63 FarCall_hl 00:2d6e ReturnFarCall 00:2d82 FarCall_JumpToHL @@ -4695,7 +4695,7 @@ 05:5790 PlayersPCMenuData.Decoration 05:579b PlayersPCMenuData.TurnOff 05:57a4 PlayersPCMenuData.LogOff -05:57ac PlayersPCMenuData.PlayersPCMenuList1 +05:57ac PlayersPCMenuData.WhichPC 05:57bb PC_DisplayTextWaitMenu 05:57cc PlayersPCAskWhatDoText 05:57d1 PlayerWithdrawItemMenu @@ -10190,11 +10190,11 @@ 12:5b2f UpdateCelebiPosition.done 12:5b30 UpdateCelebiPosition.FreezeCelebiPosition 12:5b3b CelebiEvent_Cosine -12:5b48 CelebiEvent_Cosine.negative_21281 -12:5b52 CelebiEvent_Cosine.apply_21281 -12:5b61 CelebiEvent_Cosine.multiply_21281 -12:5b66 CelebiEvent_Cosine.even_21281 -12:5b6e CelebiEvent_Cosine.sinetable_21281 +12:5b48 CelebiEvent_Cosine.negative_21302 +12:5b52 CelebiEvent_Cosine.apply_21302 +12:5b61 CelebiEvent_Cosine.multiply_21302 +12:5b66 CelebiEvent_Cosine.even_21302 +12:5b6e CelebiEvent_Cosine.sinetable_21302 12:5bae GetCelebiSpriteTile 12:5bd0 GetCelebiSpriteTile.Frame1 12:5bd4 GetCelebiSpriteTile.Frame2 @@ -10486,16 +10486,16 @@ 13:4f72 SaveMenu_CopyTilemapAtOnce.wait2 13:4f80 SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 13:4f91 SaveMenu_CopyTilemapAtOnce.loop -13:4f92 SaveMenu_CopyTilemapAtOnce.loop_31735 -13:4f9b SaveMenu_CopyTilemapAtOnce.loop_31736 -13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_31737 -13:4fad SaveMenu_CopyTilemapAtOnce.loop_31738 -13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_31739 -13:4fbf SaveMenu_CopyTilemapAtOnce.loop_31740 -13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_31741 -13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_31742 -13:4fda SaveMenu_CopyTilemapAtOnce.loop_31743 -13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_31744 +13:4f92 SaveMenu_CopyTilemapAtOnce.loop_31756 +13:4f9b SaveMenu_CopyTilemapAtOnce.loop_31757 +13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_31758 +13:4fad SaveMenu_CopyTilemapAtOnce.loop_31759 +13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_31760 +13:4fbf SaveMenu_CopyTilemapAtOnce.loop_31761 +13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_31762 +13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_31763 +13:4fda SaveMenu_CopyTilemapAtOnce.loop_31764 +13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_31765 13:4ffe CheckSave 13:501b CheckSave.ok 13:501e MapScenes @@ -10510,16 +10510,16 @@ 13:51bd PhoneRing_CopyTilemapAtOnce.wait2 13:51cb PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack 13:51dc PhoneRing_CopyTilemapAtOnce.loop -13:51dd PhoneRing_CopyTilemapAtOnce.loop_31906 -13:51e6 PhoneRing_CopyTilemapAtOnce.loop_31907 -13:51ef PhoneRing_CopyTilemapAtOnce.loop_31908 -13:51f8 PhoneRing_CopyTilemapAtOnce.loop_31909 -13:5201 PhoneRing_CopyTilemapAtOnce.loop_31910 -13:520a PhoneRing_CopyTilemapAtOnce.loop_31911 -13:5213 PhoneRing_CopyTilemapAtOnce.loop_31912 -13:521c PhoneRing_CopyTilemapAtOnce.loop_31913 -13:5225 PhoneRing_CopyTilemapAtOnce.loop_31914 -13:522e PhoneRing_CopyTilemapAtOnce.loop_31915 +13:51dd PhoneRing_CopyTilemapAtOnce.loop_31927 +13:51e6 PhoneRing_CopyTilemapAtOnce.loop_31928 +13:51ef PhoneRing_CopyTilemapAtOnce.loop_31929 +13:51f8 PhoneRing_CopyTilemapAtOnce.loop_31930 +13:5201 PhoneRing_CopyTilemapAtOnce.loop_31931 +13:520a PhoneRing_CopyTilemapAtOnce.loop_31932 +13:5213 PhoneRing_CopyTilemapAtOnce.loop_31933 +13:521c PhoneRing_CopyTilemapAtOnce.loop_31934 +13:5225 PhoneRing_CopyTilemapAtOnce.loop_31935 +13:522e PhoneRing_CopyTilemapAtOnce.loop_31936 13:5249 Shrink1Pic 13:52d9 Shrink2Pic 13:5319 LinkMonStatsScreen @@ -16637,11 +16637,11 @@ 23:46ef WipeLYOverrides.wipe 23:46f2 WipeLYOverrides.loop 23:46f7 StartTrainerBattle_DrawSineWave -23:4702 StartTrainerBattle_DrawSineWave.negative_43983 -23:470c StartTrainerBattle_DrawSineWave.apply_43983 -23:471b StartTrainerBattle_DrawSineWave.multiply_43983 -23:4720 StartTrainerBattle_DrawSineWave.even_43983 -23:4728 StartTrainerBattle_DrawSineWave.sinetable_43983 +23:4702 StartTrainerBattle_DrawSineWave.negative_44004 +23:470c StartTrainerBattle_DrawSineWave.apply_44004 +23:471b StartTrainerBattle_DrawSineWave.multiply_44004 +23:4720 StartTrainerBattle_DrawSineWave.even_44004 +23:4728 StartTrainerBattle_DrawSineWave.sinetable_44004 23:4768 StartTrainerBattle_ZoomToBlack 23:4771 StartTrainerBattle_ZoomToBlack.loop 23:478c StartTrainerBattle_ZoomToBlack.done @@ -16983,11 +16983,11 @@ 23:672a Sprites_Cosine 23:672a BrokenStdGFXPointers.deleted 23:672c Sprites_Sine -23:6737 Sprites_Sine.negative_45364 -23:6741 Sprites_Sine.apply_45364 -23:6750 Sprites_Sine.multiply_45364 -23:6755 Sprites_Sine.even_45364 -23:675d Sprites_Sine.sinetable_45364 +23:6737 Sprites_Sine.negative_45385 +23:6741 Sprites_Sine.apply_45385 +23:6750 Sprites_Sine.multiply_45385 +23:6755 Sprites_Sine.even_45385 +23:675d Sprites_Sine.sinetable_45385 23:679d AnimateEndOfExpBar 23:67a8 AnimateEndOfExpBar.load 23:67b5 AnimateEndOfExpBar.loop @@ -23122,10 +23122,10 @@ 33:672c BattleAnim_IncAnonJumptableIndex 33:6732 BattleAnim_Cosine 33:6734 BattleAnim_Sine -33:673f BattleAnim_Sine.negative_59244 -33:6749 BattleAnim_Sine.apply_59244 -33:6758 BattleAnim_Sine.multiply_59244 -33:675d BattleAnim_Sine.even_59244 +33:673f BattleAnim_Sine.negative_59265 +33:6749 BattleAnim_Sine.apply_59265 +33:6758 BattleAnim_Sine.multiply_59265 +33:675d BattleAnim_Sine.even_59265 33:6765 BattleAnim_Sine_e 33:676b BattleAnim_Cosine_e 33:677f BattleAnimSineWave @@ -26257,14 +26257,14 @@ 38:6d23 BillsPC_RefreshTextboxes.placeholder_string 38:6d2a BillsPC_RefreshTextboxes.Placeholder 38:6d30 CopyBoxmonSpecies -38:6d57 CopyBoxmonSpecies.loop_65690 -38:6d79 CopyBoxmonSpecies.done_65690 +38:6d57 CopyBoxmonSpecies.loop_65711 +38:6d79 CopyBoxmonSpecies.done_65711 38:6d87 CopyBoxmonSpecies.party -38:6d8a CopyBoxmonSpecies.loop_65691 -38:6dac CopyBoxmonSpecies.done_65691 +38:6d8a CopyBoxmonSpecies.loop_65712 +38:6dac CopyBoxmonSpecies.done_65712 38:6db7 CopyBoxmonSpecies.sBox -38:6dbf CopyBoxmonSpecies.loop_65692 -38:6de1 CopyBoxmonSpecies.done_65692 +38:6dbf CopyBoxmonSpecies.loop_65713 +38:6de1 CopyBoxmonSpecies.done_65713 38:6def BillsPC_GetSelectedPokemonSpecies 38:6e01 BillsPC_UpdateSelectionCursor 38:6e0b BillsPC_UpdateSelectionCursor.place_cursor @@ -26661,26 +26661,26 @@ 3a:4146 UpdateChannels.Channel1 3a:414c UpdateChannels.Channel5 3a:4159 UpdateChannels.noPitchSweep -3a:416b UpdateChannels.frequency_override -3a:4175 UpdateChannels.check_duty_override -3a:4184 UpdateChannels.asm_e8184 -3a:4195 UpdateChannels.ch1rest -3a:41a2 UpdateChannels.asm_e81a2 +3a:416b UpdateChannels.ch1_frequency_override +3a:4175 UpdateChannels.ch1_check_duty_override +3a:4184 UpdateChannels.ch1_vibrato_override +3a:4195 UpdateChannels.ch1_rest +3a:41a2 UpdateChannels.ch1_noise_sampling 3a:41bc UpdateChannels.Channel2 3a:41bc UpdateChannels.Channel6 -3a:41e6 UpdateChannels.asm_e81e6 -3a:41f7 UpdateChannels.ch2rest -3a:4204 UpdateChannels.asm_e8204 +3a:41e6 UpdateChannels.ch2_vibrato_override +3a:41f7 UpdateChannels.ch2_rest +3a:4204 UpdateChannels.ch2_noise_sampling 3a:421e UpdateChannels.Channel3 3a:421e UpdateChannels.Channel7 -3a:423a UpdateChannels.asm_e823a -3a:4240 UpdateChannels.ch3rest -3a:424d UpdateChannels.asm_e824d -3a:4268 UpdateChannels.asm_e8268 +3a:423a UpdateChannels.ch3_vibrato_override +3a:4240 UpdateChannels.ch3_rest +3a:424d UpdateChannels.ch3_noise_sampling +3a:4268 UpdateChannels.load_wave_pattern 3a:42b4 UpdateChannels.Channel4 3a:42b4 UpdateChannels.Channel8 -3a:42c7 UpdateChannels.ch4rest -3a:42d4 UpdateChannels.asm_e82d4 +3a:42c7 UpdateChannels.ch4_rest +3a:42d4 UpdateChannels.ch4_noise_sampling 3a:42e7 _CheckSFX 3a:4305 _CheckSFX.sfxon 3a:4307 PlayDanger diff --git a/pokecrystal11.sym b/pokecrystal11.sym index a38d7deb0..ebc226a3c 100644 --- a/pokecrystal11.sym +++ b/pokecrystal11.sym @@ -819,7 +819,7 @@ 00:2d27 LoadMapTileset 00:2d43 InexplicablyEmptyFunction 00:2d54 FarCall_de -00:2d61 FarCall_de.de +00:2d61 FarCall_JumpToDE 00:2d63 FarCall_hl 00:2d6e ReturnFarCall 00:2d82 FarCall_JumpToHL @@ -4695,7 +4695,7 @@ 05:5790 PlayersPCMenuData.Decoration 05:579b PlayersPCMenuData.TurnOff 05:57a4 PlayersPCMenuData.LogOff -05:57ac PlayersPCMenuData.PlayersPCMenuList1 +05:57ac PlayersPCMenuData.WhichPC 05:57bb PC_DisplayTextWaitMenu 05:57cc PlayersPCAskWhatDoText 05:57d1 PlayerWithdrawItemMenu @@ -10190,11 +10190,11 @@ 12:5b2f UpdateCelebiPosition.done 12:5b30 UpdateCelebiPosition.FreezeCelebiPosition 12:5b3b CelebiEvent_Cosine -12:5b48 CelebiEvent_Cosine.negative_21281 -12:5b52 CelebiEvent_Cosine.apply_21281 -12:5b61 CelebiEvent_Cosine.multiply_21281 -12:5b66 CelebiEvent_Cosine.even_21281 -12:5b6e CelebiEvent_Cosine.sinetable_21281 +12:5b48 CelebiEvent_Cosine.negative_21302 +12:5b52 CelebiEvent_Cosine.apply_21302 +12:5b61 CelebiEvent_Cosine.multiply_21302 +12:5b66 CelebiEvent_Cosine.even_21302 +12:5b6e CelebiEvent_Cosine.sinetable_21302 12:5bae GetCelebiSpriteTile 12:5bd0 GetCelebiSpriteTile.Frame1 12:5bd4 GetCelebiSpriteTile.Frame2 @@ -10486,16 +10486,16 @@ 13:4f72 SaveMenu_CopyTilemapAtOnce.wait2 13:4f80 SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 13:4f91 SaveMenu_CopyTilemapAtOnce.loop -13:4f92 SaveMenu_CopyTilemapAtOnce.loop_31735 -13:4f9b SaveMenu_CopyTilemapAtOnce.loop_31736 -13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_31737 -13:4fad SaveMenu_CopyTilemapAtOnce.loop_31738 -13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_31739 -13:4fbf SaveMenu_CopyTilemapAtOnce.loop_31740 -13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_31741 -13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_31742 -13:4fda SaveMenu_CopyTilemapAtOnce.loop_31743 -13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_31744 +13:4f92 SaveMenu_CopyTilemapAtOnce.loop_31756 +13:4f9b SaveMenu_CopyTilemapAtOnce.loop_31757 +13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_31758 +13:4fad SaveMenu_CopyTilemapAtOnce.loop_31759 +13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_31760 +13:4fbf SaveMenu_CopyTilemapAtOnce.loop_31761 +13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_31762 +13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_31763 +13:4fda SaveMenu_CopyTilemapAtOnce.loop_31764 +13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_31765 13:4ffe CheckSave 13:501b CheckSave.ok 13:501e MapScenes @@ -10510,16 +10510,16 @@ 13:51bd PhoneRing_CopyTilemapAtOnce.wait2 13:51cb PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack 13:51dc PhoneRing_CopyTilemapAtOnce.loop -13:51dd PhoneRing_CopyTilemapAtOnce.loop_31906 -13:51e6 PhoneRing_CopyTilemapAtOnce.loop_31907 -13:51ef PhoneRing_CopyTilemapAtOnce.loop_31908 -13:51f8 PhoneRing_CopyTilemapAtOnce.loop_31909 -13:5201 PhoneRing_CopyTilemapAtOnce.loop_31910 -13:520a PhoneRing_CopyTilemapAtOnce.loop_31911 -13:5213 PhoneRing_CopyTilemapAtOnce.loop_31912 -13:521c PhoneRing_CopyTilemapAtOnce.loop_31913 -13:5225 PhoneRing_CopyTilemapAtOnce.loop_31914 -13:522e PhoneRing_CopyTilemapAtOnce.loop_31915 +13:51dd PhoneRing_CopyTilemapAtOnce.loop_31927 +13:51e6 PhoneRing_CopyTilemapAtOnce.loop_31928 +13:51ef PhoneRing_CopyTilemapAtOnce.loop_31929 +13:51f8 PhoneRing_CopyTilemapAtOnce.loop_31930 +13:5201 PhoneRing_CopyTilemapAtOnce.loop_31931 +13:520a PhoneRing_CopyTilemapAtOnce.loop_31932 +13:5213 PhoneRing_CopyTilemapAtOnce.loop_31933 +13:521c PhoneRing_CopyTilemapAtOnce.loop_31934 +13:5225 PhoneRing_CopyTilemapAtOnce.loop_31935 +13:522e PhoneRing_CopyTilemapAtOnce.loop_31936 13:5249 Shrink1Pic 13:52d9 Shrink2Pic 13:5319 LinkMonStatsScreen @@ -16637,11 +16637,11 @@ 23:46ef WipeLYOverrides.wipe 23:46f2 WipeLYOverrides.loop 23:46f7 StartTrainerBattle_DrawSineWave -23:4702 StartTrainerBattle_DrawSineWave.negative_43983 -23:470c StartTrainerBattle_DrawSineWave.apply_43983 -23:471b StartTrainerBattle_DrawSineWave.multiply_43983 -23:4720 StartTrainerBattle_DrawSineWave.even_43983 -23:4728 StartTrainerBattle_DrawSineWave.sinetable_43983 +23:4702 StartTrainerBattle_DrawSineWave.negative_44004 +23:470c StartTrainerBattle_DrawSineWave.apply_44004 +23:471b StartTrainerBattle_DrawSineWave.multiply_44004 +23:4720 StartTrainerBattle_DrawSineWave.even_44004 +23:4728 StartTrainerBattle_DrawSineWave.sinetable_44004 23:4768 StartTrainerBattle_ZoomToBlack 23:4771 StartTrainerBattle_ZoomToBlack.loop 23:478c StartTrainerBattle_ZoomToBlack.done @@ -16983,11 +16983,11 @@ 23:672a Sprites_Cosine 23:672a BrokenStdGFXPointers.deleted 23:672c Sprites_Sine -23:6737 Sprites_Sine.negative_45364 -23:6741 Sprites_Sine.apply_45364 -23:6750 Sprites_Sine.multiply_45364 -23:6755 Sprites_Sine.even_45364 -23:675d Sprites_Sine.sinetable_45364 +23:6737 Sprites_Sine.negative_45385 +23:6741 Sprites_Sine.apply_45385 +23:6750 Sprites_Sine.multiply_45385 +23:6755 Sprites_Sine.even_45385 +23:675d Sprites_Sine.sinetable_45385 23:679d AnimateEndOfExpBar 23:67a8 AnimateEndOfExpBar.load 23:67b5 AnimateEndOfExpBar.loop @@ -23122,10 +23122,10 @@ 33:672c BattleAnim_IncAnonJumptableIndex 33:6732 BattleAnim_Cosine 33:6734 BattleAnim_Sine -33:673f BattleAnim_Sine.negative_59244 -33:6749 BattleAnim_Sine.apply_59244 -33:6758 BattleAnim_Sine.multiply_59244 -33:675d BattleAnim_Sine.even_59244 +33:673f BattleAnim_Sine.negative_59265 +33:6749 BattleAnim_Sine.apply_59265 +33:6758 BattleAnim_Sine.multiply_59265 +33:675d BattleAnim_Sine.even_59265 33:6765 BattleAnim_Sine_e 33:676b BattleAnim_Cosine_e 33:677f BattleAnimSineWave @@ -26257,14 +26257,14 @@ 38:6d23 BillsPC_RefreshTextboxes.placeholder_string 38:6d2a BillsPC_RefreshTextboxes.Placeholder 38:6d30 CopyBoxmonSpecies -38:6d57 CopyBoxmonSpecies.loop_65690 -38:6d79 CopyBoxmonSpecies.done_65690 +38:6d57 CopyBoxmonSpecies.loop_65711 +38:6d79 CopyBoxmonSpecies.done_65711 38:6d87 CopyBoxmonSpecies.party -38:6d8a CopyBoxmonSpecies.loop_65691 -38:6dac CopyBoxmonSpecies.done_65691 +38:6d8a CopyBoxmonSpecies.loop_65712 +38:6dac CopyBoxmonSpecies.done_65712 38:6db7 CopyBoxmonSpecies.sBox -38:6dbf CopyBoxmonSpecies.loop_65692 -38:6de1 CopyBoxmonSpecies.done_65692 +38:6dbf CopyBoxmonSpecies.loop_65713 +38:6de1 CopyBoxmonSpecies.done_65713 38:6def BillsPC_GetSelectedPokemonSpecies 38:6e01 BillsPC_UpdateSelectionCursor 38:6e0b BillsPC_UpdateSelectionCursor.place_cursor @@ -26661,26 +26661,26 @@ 3a:4146 UpdateChannels.Channel1 3a:414c UpdateChannels.Channel5 3a:4159 UpdateChannels.noPitchSweep -3a:416b UpdateChannels.frequency_override -3a:4175 UpdateChannels.check_duty_override -3a:4184 UpdateChannels.asm_e8184 -3a:4195 UpdateChannels.ch1rest -3a:41a2 UpdateChannels.asm_e81a2 +3a:416b UpdateChannels.ch1_frequency_override +3a:4175 UpdateChannels.ch1_check_duty_override +3a:4184 UpdateChannels.ch1_vibrato_override +3a:4195 UpdateChannels.ch1_rest +3a:41a2 UpdateChannels.ch1_noise_sampling 3a:41bc UpdateChannels.Channel2 3a:41bc UpdateChannels.Channel6 -3a:41e6 UpdateChannels.asm_e81e6 -3a:41f7 UpdateChannels.ch2rest -3a:4204 UpdateChannels.asm_e8204 +3a:41e6 UpdateChannels.ch2_vibrato_override +3a:41f7 UpdateChannels.ch2_rest +3a:4204 UpdateChannels.ch2_noise_sampling 3a:421e UpdateChannels.Channel3 3a:421e UpdateChannels.Channel7 -3a:423a UpdateChannels.asm_e823a -3a:4240 UpdateChannels.ch3rest -3a:424d UpdateChannels.asm_e824d -3a:4268 UpdateChannels.asm_e8268 +3a:423a UpdateChannels.ch3_vibrato_override +3a:4240 UpdateChannels.ch3_rest +3a:424d UpdateChannels.ch3_noise_sampling +3a:4268 UpdateChannels.load_wave_pattern 3a:42b4 UpdateChannels.Channel4 3a:42b4 UpdateChannels.Channel8 -3a:42c7 UpdateChannels.ch4rest -3a:42d4 UpdateChannels.asm_e82d4 +3a:42c7 UpdateChannels.ch4_rest +3a:42d4 UpdateChannels.ch4_noise_sampling 3a:42e7 _CheckSFX 3a:4305 _CheckSFX.sfxon 3a:4307 PlayDanger