From e8cc43d6d573c192e7474a1ca679457032bfcb50 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Sat, 27 Aug 2022 15:45:08 +0000 Subject: [PATCH] Merge pull request #1757 from AsparagusEduardo/pret_clean2 --- pokeemerald.sym | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index 4e55698c51..9f854eb48c 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -2806,9 +2806,9 @@ 08033648 g 00000114 TryReceiveLinkBattleData 0803375c l 00000158 Task_HandleCopyReceivedLinkBuffersData 080338b4 g 00000024 BtlController_EmitGetMonData -080338d8 g 00000028 BtlController_EmitGetRawMonData +080338d8 l 00000028 BtlController_EmitGetRawMonData 08033900 g 00000040 BtlController_EmitSetMonData -08033940 g 00000040 BtlController_EmitSetRawMonData +08033940 l 00000040 BtlController_EmitSetRawMonData 08033980 g 00000020 BtlController_EmitLoadMonSprite 080339a0 g 00000024 BtlController_EmitSwitchInAnim 080339c4 g 00000020 BtlController_EmitReturnMonToBall @@ -2816,10 +2816,10 @@ 08033a04 g 00000020 BtlController_EmitTrainerSlide 08033a24 g 00000020 BtlController_EmitTrainerSlideBack 08033a44 g 00000020 BtlController_EmitFaintAnimation -08033a64 g 00000020 BtlController_EmitPaletteFade -08033a84 g 00000020 BtlController_EmitSuccessBallThrowAnim +08033a64 l 00000020 BtlController_EmitPaletteFade +08033a84 l 00000020 BtlController_EmitSuccessBallThrowAnim 08033aa4 g 00000020 BtlController_EmitBallThrowAnim -08033ac4 g 00000048 BtlController_EmitPause +08033ac4 l 00000048 BtlController_EmitPause 08033b0c g 000000d8 BtlController_EmitMoveAnimation 08033be4 g 00000118 BtlController_EmitPrintString 08033cfc g 000000e8 BtlController_EmitPrintSelectionString @@ -2828,24 +2828,24 @@ 08033e30 g 0000003c BtlController_EmitChooseMove 08033e6c g 00000034 BtlController_EmitChooseItem 08033ea0 g 0000003c BtlController_EmitChoosePokemon -08033edc g 00000020 BtlController_EmitCmd23 +08033edc l 00000020 BtlController_EmitCmd23 08033efc g 00000038 BtlController_EmitHealthBarUpdate 08033f34 g 00000034 BtlController_EmitExpUpdate 08033f68 g 00000054 BtlController_EmitStatusIconUpdate 08033fbc g 0000003c BtlController_EmitStatusAnimation -08033ff8 g 00000020 BtlController_EmitStatusXor +08033ff8 l 00000020 BtlController_EmitStatusXor 08034018 g 00000048 BtlController_EmitDataTransfer -08034060 g 00000068 BtlController_EmitDMA3Transfer -080340c8 g 00000048 BtlController_EmitPlayBGM -08034110 g 00000048 BtlController_EmitCmd32 +08034060 l 00000068 BtlController_EmitDMA3Transfer +080340c8 l 00000048 BtlController_EmitPlayBGM +08034110 l 00000048 BtlController_EmitCmd32 08034158 g 0000002c BtlController_EmitTwoReturnValues 08034184 g 00000038 BtlController_EmitChosenMonReturnValue 080341bc g 0000002c BtlController_EmitOneReturnValue 080341e8 g 0000002c BtlController_EmitOneReturnValue_Duplicate -08034214 g 00000020 BtlController_EmitClearUnkVar -08034234 g 00000020 BtlController_EmitSetUnkVar -08034254 g 00000020 BtlController_EmitClearUnkFlag -08034274 g 00000020 BtlController_EmitToggleUnkFlag +08034214 l 00000020 BtlController_EmitClearUnkVar +08034234 l 00000020 BtlController_EmitSetUnkVar +08034254 l 00000020 BtlController_EmitClearUnkFlag +08034274 l 00000020 BtlController_EmitToggleUnkFlag 08034294 g 00000020 BtlController_EmitHitAnimation 080342b4 g 00000020 BtlController_EmitCantSwitch 080342d4 g 0000002c BtlController_EmitPlaySE @@ -52870,7 +52870,7 @@ 085b7504 l 00000004 sAnim_GridIcon_Makuhita 085b7508 l 00000060 sSpriteTemplates_PokeHeaders 085b7568 l 00000048 sSpriteTemplates_ColorHeaders -085b75b0 l 00000060 sSpriteTemplate_GridIcons +085b75b0 l 00000060 sSpriteTemplates_GridIcons 085b7610 l 00000120 sSpriteTemplates_WheelIcons 085b7730 l 00000008 sOam_Credit 085b7738 l 00000008 sOam_CreditDigit @@ -53808,7 +53808,7 @@ 085cdb84 l 00000008 sOam_CableCar 085cdb8c l 00000008 sOam_CableCarDoor 085cdb94 l 00000008 sOam_Cable -085cdb9c l 00000030 sSpriteTemplate_CableCar +085cdb9c l 00000030 sSpriteTemplates_CableCar 085cdbcc l 00000018 sSpriteTemplate_Cable 085cdc00 l 00000038 sSaveSlotLayout 085cdc3e l 00000004 sShadowEffectTemplateIds