From 34af4331c515a0300f99b1881b731940d11fdeca Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Sat, 20 Aug 2022 01:32:27 +0000 Subject: [PATCH] Merge pull request #1727 from AsparagusEduardo/pret_clean --- pokeemerald.sym | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index 0b5a913c03..f16e3e1a53 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -2948,18 +2948,18 @@ 0803939c l 000003d0 AskRecordBattle 0803976c l 00000058 TryCorrectShedinjaLanguage 080397c4 g 00000018 GetBattleWindowTemplatePixelWidth -080397dc g 00000030 SpriteCb_WildMon -0803980c l 0000002c SpriteCb_MoveWildMonToRight -08039838 l 0000005c SpriteCb_WildMonShowHealthbox -08039894 l 00000024 SpriteCb_WildMonAnimate +080397dc g 00000030 SpriteCB_WildMon +0803980c l 0000002c SpriteCB_MoveWildMonToRight +08039838 l 0000005c SpriteCB_WildMonShowHealthbox +08039894 l 00000024 SpriteCB_WildMonAnimate 080398b8 g 00000002 SpriteCallbackDummy_2 080398bc l 00000014 SpriteCB_InitFlicker 080398d0 l 00000064 SpriteCB_Flicker 08039934 g 00000114 SpriteCB_FaintOpponentMon 08039a48 l 00000090 SpriteCB_AnimFaintOpponent -08039ad8 g 0000001c SpriteCb_ShowAsMoveTarget -08039af4 l 00000036 SpriteCb_BlinkVisible -08039b2c g 0000002c SpriteCb_HideAsMoveTarget +08039ad8 g 0000001c SpriteCB_ShowAsMoveTarget +08039af4 l 00000036 SpriteCB_BlinkVisible +08039b2c g 0000002c SpriteCB_HideAsMoveTarget 08039b58 g 0000005c SpriteCB_OpponentMonFromBall 08039bb4 g 0000000c SpriteCB_BattleSpriteStartSlideLeft 08039bc0 l 00000030 SpriteCB_BattleSpriteSlideLeft @@ -3039,7 +3039,7 @@ 0803f480 g 000000c8 PressurePPLose 0803f548 g 00000134 PressurePPLoseOnUsingImprison 0803f67c g 00000114 PressurePPLoseOnUsingPerishSong -0803f790 g 00000070 MarkAllBattlersForControllerExec +0803f790 l 00000070 MarkAllBattlersForControllerExec 0803f800 g 00000050 MarkBattlerForControllerExec 0803f850 g 00000050 MarkBattlerReceivedLinkData 0803f8a0 g 0000006c CancelMultiTurnMoves @@ -14319,17 +14319,17 @@ 0819033c l 0000007c IncrementDomeStreaks 081903b8 l 00000048 ShowDomeOpponentInfo 08190400 l 00000390 Task_ShowTourneyInfoCard -08190790 l 00000068 SpriteCb_TrainerIconCardScrollUp -081907f8 l 00000068 SpriteCb_TrainerIconCardScrollDown -08190860 l 0000006c SpriteCb_TrainerIconCardScrollLeft -081908cc l 0000006c SpriteCb_TrainerIconCardScrollRight -08190938 l 00000016 SpriteCb_MonIcon -08190950 l 0000007c SpriteCb_MonIconCardScrollUp -081909cc l 0000007c SpriteCb_MonIconCardScrollDown -08190a48 l 0000007c SpriteCb_MonIconCardScrollLeft -08190ac4 l 0000007c SpriteCb_MonIconCardScrollRight -08190b40 l 0000012a SpriteCb_HorizontalScrollArrow -08190c6c l 00000066 SpriteCb_VerticalScrollArrow +08190790 l 00000068 SpriteCB_TrainerIconCardScrollUp +081907f8 l 00000068 SpriteCB_TrainerIconCardScrollDown +08190860 l 0000006c SpriteCB_TrainerIconCardScrollLeft +081908cc l 0000006c SpriteCB_TrainerIconCardScrollRight +08190938 l 00000016 SpriteCB_MonIconDomeInfo +08190950 l 0000007c SpriteCB_MonIconCardScrollUp +081909cc l 0000007c SpriteCB_MonIconCardScrollDown +08190a48 l 0000007c SpriteCB_MonIconCardScrollLeft +08190ac4 l 0000007c SpriteCB_MonIconCardScrollRight +08190b40 l 0000012a SpriteCB_HorizontalScrollArrow +08190c6c l 00000066 SpriteCB_VerticalScrollArrow 08190cd4 l 00001548 Task_HandleInfoCardInput 0819221c l 000002c4 Task_GetInfoCardInput 081924e0 l 00000a28 DisplayTrainerInfoOnCard @@ -14825,7 +14825,7 @@ 081a5238 l 00000000 .gcc2_compiled. 081a5258 g 00000300 BattleArena_ShowJudgmentWindow 081a5558 l 00000140 ShowJudgmentSprite -081a5698 l 0000001c SpriteCb_JudgmentIcon +081a5698 l 0000001c SpriteCB_JudgmentIcon 081a56b4 g 00000034 BattleArena_InitPoints 081a56e8 g 00000030 BattleArena_AddMindPoints 081a5718 g 000000cc BattleArena_AddSkillPoints @@ -15842,7 +15842,7 @@ 081c4a08 l 00000080 CreateCaughtBallSprite 081c4a88 l 0000006e CreateSetStatusSprite 081c4af8 l 000000ec CreateMoveSelectorSprites -081c4be4 l 0000007c SpriteCb_MoveSelector +081c4be4 l 0000007c SpriteCB_MoveSelector 081c4c60 l 00000022 DestroyMoveSelectorSprites 081c4c84 l 00000094 SetMainMoveSelectorColor 081c4d18 l 00000058 KeepMoveSelectorVisible