From e3c9d2a6295eea6576370b50151b3059e82849e2 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Thu, 9 Jun 2022 15:16:14 +0000 Subject: [PATCH] Merge pull request #1675 from GriffinRichards/doc-arg --- pokeemerald.sym | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index 0143af3de5..e8ba98c228 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -4062,8 +4062,8 @@ 080751e4 l 00000038 SafariTextIntoHealthboxObject 0807521c g 00000154 SmokescreenImpact 0807521c l 00000000 .gcc2_compiled. -08075370 l 00000044 SmokescreenImpact_Callback -080753b4 l 00000034 SpriteCB_DestroySprite +08075370 l 00000044 SpriteCB_SmokescreenImpactMain +080753b4 l 00000034 SpriteCB_SmokescreenImpact 080753e8 g 00000068 DoPokeballSendOutAnimation 080753e8 l 00000000 .gcc2_compiled. 08075450 l 000001d0 Task_DoPokeballSendOutAnim @@ -6724,7 +6724,7 @@ 080a74dc l 00000016 ArcTan2_ 080a74f4 g 00000018 ArcTan2Neg 080a750c g 000000a0 SetGrayscaleOrOriginalPalette -080a75ac g 00000116 GetBattleBgPalettesMask +080a75ac g 00000116 GetBattlePalettesMask 080a76c4 g 000000e8 GetBattleMonSpritePalettesMask 080a77ac g 00000006 AnimDummyReturnArg 080a77b4 l 00000012 GetBattlerAtPosition_ @@ -9471,13 +9471,13 @@ 080faff8 g 00000014 DoWateringBerryTreeAnim 080fb00c g 00000068 CreateRecordMixingLights 080fb074 g 0000003c DestroyRecordMixingLights -080fb0b0 g 0000002c GetTruckCameraBobbingY 080fb0b0 l 00000000 .gcc2_compiled. -080fb0dc g 0000001a GetTruckBoxMovement -080fb0f8 g 000000b4 Task_Truck1 -080fb1ac g 00000114 Task_Truck2 +080fb0b0 l 0000002c GetTruckCameraBobbingY +080fb0dc l 0000001a GetTruckBoxYMovement +080fb0f8 l 000000b4 Task_Truck1 +080fb1ac l 00000114 Task_Truck2 080fb2c0 l 000000ac Task_Truck3 -080fb36c g 00000172 Task_HandleTruckSequence +080fb36c l 00000172 Task_HandleTruckSequence 080fb4e0 g 00000060 ExecuteTruckSequence 080fb540 g 0000005c EndTruckSequence 080fb59c g 0000004c TrySetPortholeWarpDestination @@ -9755,7 +9755,7 @@ 08102be8 g 000000b8 AnimTask_MusicNotesRainbowBlend 08102ca0 g 00000034 AnimTask_MusicNotesClearRainbowBlend 08102cd4 l 000000b8 AnimWavyMusicNotes -08102d8c l 00000058 AnimWavyMusicNotesGetNextPos +08102d8c l 00000058 AnimWavyMusicNotes_CalcVelocity 08102de4 l 000000cc AnimWavyMusicNotes_Step 08102eb0 l 00000090 AnimFlyingMusicNotes 08102f40 l 00000078 AnimFlyingMusicNotes_Step @@ -10296,7 +10296,7 @@ 0811572c l 0000006c AnimConfusionDuck 08115798 l 00000064 AnimConfusionDuck_Step 081157fc l 00000040 AnimSimplePaletteBlend -0811583c g 00000048 UnpackSelectedBattleBgPalettes +0811583c g 00000048 UnpackSelectedBattlePalettes 08115884 l 00000020 AnimSimplePaletteBlend_Step 081158a4 l 00000054 AnimComplexPaletteBlend 081158f8 l 0000008a AnimComplexPaletteBlend_Step1 @@ -14303,8 +14303,8 @@ 0818fa74 l 00000168 CreateDomeOpponentMon 0818fbdc l 0000009a CreateDomeOpponentMons 0818fc78 g 00000044 GetDomeTrainerSelectedMons -0818fcbc l 000000fc SelectOpponentMonsUsingPersonality -0818fdb8 l 000000fc SelectOpponentMonsUsingOtId +0818fcbc l 000000fc SelectOpponentMons_Good +0818fdb8 l 000000fc SelectOpponentMons_Bad 0818feb4 l 0000010c SelectOpponentMonsFromParty 0818ffc0 l 000001a6 GetTypeEffectivenessPoints 08190168 l 00000038 GetDomeTrainerMonIvs @@ -50192,7 +50192,7 @@ 08595584 g 00000018 gFireSpiralOutwardSpriteTemplate 0859559c g 00000018 gWeatherBallFireDownSpriteTemplate 085955b4 g 00000018 gEruptionLaunchRockSpriteTemplate -085955cc l 0000001c sEruptionLaunchRockCoords +085955cc l 0000001c sEruptionLaunchRockSpeeds 085955e8 g 00000018 gEruptionFallingRockSpriteTemplate 08595600 l 00000014 sAnim_WillOWispOrb_0 08595614 l 00000008 sAnim_WillOWispOrb_1 @@ -56908,7 +56908,8 @@ 085f5434 l 00000008 sSpriteAnim_EvoSparkle 085f543c l 00000004 sSpriteAnimTable_EvoSparkle 085f5440 l 00000018 sEvoSparkleSpriteTemplate -085f5458 l 00000038 sEvoSparkleMatrices +085f5458 l 00000018 sEvoSparkleMatrices +085f5470 l 00000020 sUnused 085f5490 g 00000002 gNumBardWords_Species 085f5494 g 00004d40 gBardSounds_Pokemon 085fa1d4 g 00000002 gNumBardWords_Moves