From 0f5d38b4d03a6a9d8f49001b5eda0acc7eb92b53 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Sun, 14 Nov 2021 04:37:25 +0000 Subject: [PATCH] Merge pull request #1548 from GriffinRichards/doc-banim --- pokeemerald.sym | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index b4b54514d2..14914af21c 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -321,7 +321,7 @@ 02038437 g 00000001 gBattleAnimTarget 02038438 g 00000008 gAnimBattlerSpecies 02038440 g 00000001 gAnimCustomPanning -02038444 l 00000004 gAnimTaskAffineAnim +02038444 l 00000004 sAnimTaskAffineAnim 02038454 g 00000750 gWeather 02038ba4 l 00000020 sFieldEffectPaletteGammaTypes 02038bc4 l 00000001 gCurrentAbnormalWeather @@ -2970,7 +2970,7 @@ 08039e44 g 0000001c SpriteCB_PlayerMonFromBall 08039e60 l 00000024 SpriteCB_TrainerThrowObject_Main 08039e84 g 00000018 SpriteCB_TrainerThrowObject -08039e9c g 0000002c sub_8039E9C +08039e9c g 0000002c AnimSetCenterToCornerVecX 08039ec8 g 00000002 BeginBattleIntroDummy 08039ecc g 00000024 BeginBattleIntro 08039ef0 l 00000050 BattleMainCB1 @@ -6655,22 +6655,22 @@ 080a6240 g 00000094 GetAnimBattlerSpriteId 080a62d4 g 00000008 StoreSpriteCallbackInData6 080a62dc g 0000000e SetCallbackToStoredInData6 -080a62ec g 00000060 TranslateSpriteInCircleOverDuration -080a634c g 0000007c TranslateSpriteInGrowingCircleOverDuration -080a63c8 g 00000088 sub_80A63C8 -080a6450 g 00000060 TranslateSpriteInEllipseOverDuration +080a62ec g 00000060 TranslateSpriteInCircle +080a634c g 0000007c TranslateSpriteInGrowingCircle +080a63c8 l 00000088 TranslateSpriteInWavePattern +080a6450 g 00000060 TranslateSpriteInEllipse 080a64b0 g 0000001e WaitAnimForDuration -080a64d0 l 0000001c sub_80A64D0 -080a64ec g 0000004e sub_80A64EC +080a64d0 l 0000001c AnimPosToTranslateLinear +080a64ec g 0000004e ConvertPosDataToTranslateLinearData 080a653c g 0000002e TranslateSpriteLinear 080a656c g 0000003a TranslateSpriteLinearFixedPoint 080a65a8 l 00000042 TranslateSpriteLinearFixedPointIconFrame -080a65ec g 00000044 sub_80A65EC -080a6630 g 00000050 TranslateMonSpriteLinear -080a6680 g 0000005c TranslateMonSpriteLinearFixedPoint +080a65ec l 00000044 TranslateSpriteToBattleTargetPos +080a6630 g 00000050 TranslateSpriteLinearById +080a6680 g 0000005c TranslateSpriteLinearByIdFixedPoint 080a66dc g 0000006e TranslateSpriteLinearAndFlicker 080a674c g 00000014 DestroySpriteAndMatrix -080a6760 g 00000044 sub_80A6760 +080a6760 l 00000044 TranslateSpriteToBattleAttackerPos 080a67a4 l 00000016 EndUnkPaletteAnim 080a67bc g 0000001a RunStoredCallbackWhenAffineAnimEnds 080a67d8 g 0000001a RunStoredCallbackWhenAnimEnds @@ -6691,7 +6691,7 @@ 080a6b20 g 00000010 IsDoubleBattle 080a6b30 g 00000060 GetBattleAnimBg1Data 080a6b90 g 0000006c GetBattleAnimBgData -080a6bfc g 0000006a sub_80A6BFC +080a6bfc g 0000006a GetBgDataForTransform 080a6c68 g 00000058 ClearBattleAnimBg 080a6cc0 g 00000050 AnimLoadCompressedBgGfx 080a6d10 l 00000038 InitAnimBgTilemapBuffer @@ -6703,10 +6703,10 @@ 080a6e14 g 0000003e InitSpriteDataForLinearTranslation 080a6e54 g 00000098 InitAnimLinearTranslation 080a6eec g 00000028 StartAnimLinearTranslation -080a6f14 g 00000028 sub_80A6F14 +080a6f14 l 00000028 StartAnimLinearTranslation_SetCornerVecX 080a6f3c g 0000005a AnimTranslateLinear -080a6f98 g 0000001a AnimTranslateLinear_WaitEnd -080a6fb4 l 00000020 sub_80A6FB4 +080a6f98 g 0000001a AnimTranslateLinear_WithFollowup +080a6fb4 l 00000020 AnimTranslateLinear_WithFollowup_SetCornerVecX 080a6fd4 g 0000002c InitAnimLinearTranslationWithSpeed 080a7000 g 00000028 InitAnimLinearTranslationWithSpeedAndPos 080a7028 l 00000098 InitAnimFastLinearTranslation @@ -6716,7 +6716,7 @@ 080a7160 g 0000002c InitAnimFastLinearTranslationWithSpeed 080a718c g 00000028 InitAnimFastLinearTranslationWithSpeedAndPos 080a71b4 g 00000084 SetSpriteRotScale -080a7238 l 00000038 sub_80A7238 +080a7238 l 00000038 ShouldRotScaleSpeciesBeFlipped 080a7270 g 000000d4 PrepareBattlerSpriteForRotScale 080a7344 g 0000005c ResetSpriteRotScale 080a73a0 g 00000040 SetBattlerSpriteYOffsetFromRotation @@ -6735,7 +6735,7 @@ 080a791c l 0000001a AnimThrowProjectile_Step 080a7938 g 000000b0 AnimTravelDiagonally 080a79e8 g 00000074 CloneBattlerSpriteWithBlend -080a7a5c g 00000016 obj_delete_but_dont_free_vram +080a7a5c g 00000016 DestroySpriteWithActiveSheet 080a7a74 g 00000088 AnimTask_AlphaFadeIn 080a7afc l 0000009a AnimTask_AlphaFadeIn_Step 080a7b98 g 0000005c AnimTask_BlendMonInAndOut @@ -6767,8 +6767,8 @@ 080a8b64 g 00000060 AnimSpinningSparkle 080a8bc4 g 000000e8 AnimTask_AttackerPunchWithTrace 080a8cac l 000000cc AnimTask_AttackerPunchWithTrace_Step -080a8d78 l 00000084 sub_80A8D78 -080a8dfc l 00000034 sub_80A8DFC +080a8d78 l 00000084 CreateBattlerTrace +080a8dfc l 00000034 AnimBattlerTrace 080a8e30 g 00000058 AnimWeatherBallUp 080a8e88 l 0000005a AnimWeatherBallUp_Step 080a8ee4 g 0000006c AnimWeatherBallDown @@ -40271,7 +40271,7 @@ 0831acc0 l 00000004 sUnused1Ptr 0831acc4 l 00000018 sUnused2 0831acdc l 00000004 sUnused2Ptr -0831ace0 l 00000008 gUnknown_0831ACE0 +0831ace0 l 00000008 sCenterToCornerVecXs 0831ace8 g 00000150 gTypeEffectiveness 0831ae38 g 0000007e gTypeNames 0831aeb8 g 000000e0 gTrainerMoneyTable