From 8bbf771dd7116df8d4a254a672934c4f1b41dee5 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Mon, 1 Nov 2021 21:52:07 +0000 Subject: [PATCH] Merge pull request #1537 from AsparagusEduardo/pret_solarbeam --- pokeemerald.sym | 54 ++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index b54aa0def3..db7399fb22 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -9625,10 +9625,10 @@ 080fe840 l 00000058 AnimMovePowderParticle 080fe898 l 00000048 AnimMovePowderParticle_Step 080fe8e0 l 00000050 AnimPowerAbsorptionOrb -080fe930 l 00000058 AnimSolarbeamBigOrb -080fe988 l 0000005c AnimSolarbeamSmallOrb -080fe9e4 l 00000074 AnimSolarbeamSmallOrb_Step -080fea58 g 00000080 AnimTask_CreateSmallSolarbeamOrbs +080fe930 l 00000058 AnimSolarBeamBigOrb +080fe988 l 0000005c AnimSolarBeamSmallOrb +080fe9e4 l 00000074 AnimSolarBeamSmallOrb_Step +080fea58 g 00000080 AnimTask_CreateSmallSolarBeamOrbs 080fead8 l 00000050 AnimAbsorptionOrb 080feb28 l 0000001a AnimAbsorptionOrb_Step 080feb44 l 000000b8 AnimHyperBeamOrb @@ -34741,12 +34741,12 @@ 082d7cfc l 00000000 SetSkyBgContinue 082d7cfe l 00000000 SetSkyBgContest 082d7d15 l 00000000 UnsetSkyBg -082d7d1d l 00000000 SetSolarbeamBg -082d7d40 l 00000000 SetSolarbeamBgContinue -082d7d42 l 00000000 SetSolarbeamBgContest -082d7d49 l 00000000 SetSolarbeamBgPlayer -082d7d50 l 00000000 SetSolarbeamBgOpponent -082d7d57 l 00000000 UnsetSolarbeamBg +082d7d1d l 00000000 SetSolarBeamBg +082d7d40 l 00000000 SetSolarBeamBgContinue +082d7d42 l 00000000 SetSolarBeamBgContest +082d7d49 l 00000000 SetSolarBeamBgPlayer +082d7d50 l 00000000 SetSolarBeamBgOpponent +082d7d57 l 00000000 UnsetSolarBeamBg 082d7d5a l 00000000 Status_Poison 082d7d85 l 00000000 Status_Confusion 082d7d8e l 00000000 Status_Burn @@ -35028,9 +35028,9 @@ 082d9cc4 g 00000000 BattleScript_EffectFutureSight 082d9cdb g 00000000 BattleScript_EffectGust 082d9cfa g 00000000 BattleScript_EffectStomp -082d9d10 g 00000000 BattleScript_EffectSolarbeam -082d9d28 g 00000000 BattleScript_SolarbeamDecideTurn -082d9d50 g 00000000 BattleScript_SolarbeamOnFirstTurn +082d9d10 g 00000000 BattleScript_EffectSolarBeam +082d9d28 g 00000000 BattleScript_SolarBeamDecideTurn +082d9d50 g 00000000 BattleScript_SolarBeamOnFirstTurn 082d9d66 g 00000000 BattleScript_EffectThunder 082d9d7a g 00000000 BattleScript_EffectTeleport 082d9db4 g 00000000 BattleScript_EffectBeatUp @@ -49729,23 +49729,23 @@ 08592118 g 00000018 gSleepPowderParticleSpriteTemplate 08592130 g 00000018 gStunSporeParticleSpriteTemplate 08592148 g 00000018 gPoisonPowderParticleSpriteTemplate -08592160 g 00000008 gSolarbeamBigOrbAnimCmds1 -08592168 g 00000008 gSolarbeamBigOrbAnimCmds2 -08592170 g 00000008 gSolarbeamBigOrbAnimCmds3 -08592178 g 00000008 gSolarbeamBigOrbAnimCmds4 -08592180 g 00000008 gSolarbeamBigOrbAnimCmds5 -08592188 g 00000008 gSolarbeamBigOrbAnimCmds6 -08592190 g 00000008 gSolarbeamBigOrbAnimCmds7 -08592198 g 00000008 gSolarbeamSmallOrbAnimCms +08592160 g 00000008 gSolarBeamBigOrbAnimCmds1 +08592168 g 00000008 gSolarBeamBigOrbAnimCmds2 +08592170 g 00000008 gSolarBeamBigOrbAnimCmds3 +08592178 g 00000008 gSolarBeamBigOrbAnimCmds4 +08592180 g 00000008 gSolarBeamBigOrbAnimCmds5 +08592188 g 00000008 gSolarBeamBigOrbAnimCmds6 +08592190 g 00000008 gSolarBeamBigOrbAnimCmds7 +08592198 g 00000008 gSolarBeamSmallOrbAnimCms 085921a0 g 00000008 gPowerAbsorptionOrbAnimCmds -085921a8 g 0000001c gSolarbeamBigOrbAnimTable -085921c4 g 00000004 gSolarbeamSmallOrbAnimTable +085921a8 g 0000001c gSolarBeamBigOrbAnimTable +085921c4 g 00000004 gSolarBeamSmallOrbAnimTable 085921c8 g 00000004 gPowerAbsorptionOrbAnimTable 085921cc g 00000010 gPowerAbsorptionOrbAffineAnimCmds 085921dc g 00000004 gPowerAbsorptionOrbAffineAnimTable 085921e0 g 00000018 gPowerAbsorptionOrbSpriteTemplate -085921f8 g 00000018 gSolarbeamBigOrbSpriteTemplate -08592210 g 00000018 gSolarbeamSmallOrbSpriteTemplate +085921f8 g 00000018 gSolarBeamBigOrbSpriteTemplate +08592210 g 00000018 gSolarBeamSmallOrbSpriteTemplate 08592228 g 00000018 gStockpileAbsorptionOrbAffineCmds 08592240 g 00000004 gStockpileAbsorptionOrbAffineAnimTable 08592244 g 00000018 gStockpileAbsorptionOrbSpriteTemplate @@ -72064,8 +72064,8 @@ 08d90d3c g 0000001c gBattleAnimBgPalette_Ghost 08d90d58 g 000002f4 gBattleAnimBgTilemap_Ghost 08d9104c g 00000028 gBattleAnimSpritePal_WhipHit -08d91074 g 00000028 gBattleAnimBgPalette_Solarbeam -08d9109c g 000004fc gBattleAnimBgTilemap_Solarbeam +08d91074 g 00000028 gBattleAnimBgPalette_SolarBeam +08d9109c g 000004fc gBattleAnimBgTilemap_SolarBeam 08d91598 g 00000820 gBerryBlenderCenter_Gfx 08d91db8 g 00000a34 gBerryBlenderOuter_Gfx 08d927ec g 00000314 gBerryBlenderOuter_Tilemap