diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 5623654048..7344b2d3e6 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -341,7 +341,6 @@ gBattleAnimMove_MetalBurst:: waitforvisualfinish end -@Credits: Skeli gBattleAnimMove_UTurn:: loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_RAZOR_LEAF @@ -1979,7 +1978,6 @@ SnowSlide1: delay 2 return -@Credits to Skeli gBattleAnimMove_IceShard:: monbg ANIM_TARGET splitbgprio ANIM_TARGET @@ -2419,7 +2417,6 @@ InitRoomAnimation: createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1 return -@ Credits to Skeli gBattleAnimMove_DracoMeteor:: loadspritegfx ANIM_TAG_ROCKS @Rocks loadspritegfx ANIM_TAG_FAIRY_LOCK_CHAINS @Gray Colour @@ -5606,7 +5603,6 @@ GrassPledgeMiddleFountain: delay 4 return -@Credits to Skeli gBattleAnimMove_VoltSwitch:: loadspritegfx ANIM_TAG_SHADOW_BALL loadspritegfx ANIM_TAG_IONS @@ -14105,7 +14101,6 @@ SmallAppleShower: delay 2 return -@ credits to Skeli gBattleAnimMove_SpiritBreak:: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_TEAL_ALERT @@ -14212,7 +14207,6 @@ gBattleAnimMove_Obstruct:: clearmonbg ANIM_ATK_PARTNER end -@Credits to Skeli gBattleAnimMove_FalseSurrender:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_CROSS_IMPACT @@ -14435,7 +14429,6 @@ SetSteelBeamBgPlayer: fadetobg BG_STEEL_BEAM_PLAYER goto SetHighSpeedBgFade -@Credits to Skeli gBattleAnimMove_ExpandingForce:: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_EXPLOSION_2 @@ -14546,7 +14539,6 @@ MaxKnuckleExplosionGeyser: return -@Credits to Skeli gBattleAnimMove_SteelRoller:: loadspritegfx ANIM_TAG_STEAMROLLER loadspritegfx ANIM_TAG_IMPACT @@ -14569,7 +14561,6 @@ SteelRollerRocks: createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 0xc, 0x19, 0x4, 0x4 return -@Credits to Skeli gBattleAnimMove_ScaleShot:: loadspritegfx ANIM_TAG_SHELL_RIGHT loadspritegfx ANIM_TAG_IMPACT @@ -14586,7 +14577,6 @@ gBattleAnimMove_ScaleShot:: waitforvisualfinish end -@Credits to Skeli gBattleAnimMove_MeteorBeam:: loadspritegfx ANIM_TAG_ROCKS fadetobg BG_COSMIC @@ -14692,7 +14682,6 @@ gBattleAnimMove_ShellSideArmSpecial:: @ Modified Snipe Shot, placeholder waitforvisualfinish end -@Credits to Skeli gBattleAnimMove_MistyExplosion:: loadspritegfx ANIM_TAG_EXPLOSION createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 8, 9, RGB(27, 18, 30), 8, RGB_BLACK, 8 @@ -14709,7 +14698,6 @@ gBattleAnimMove_MistyExplosion:: createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 3, 16, 0, RGB(31, 27, 31) @;White Pink end -@Credits to Skeli gBattleAnimMove_GrassyGlide:: loadspritegfx ANIM_TAG_LEAF @leaves loadspritegfx ANIM_TAG_IMPACT @hits @@ -14725,7 +14713,6 @@ gBattleAnimMove_GrassyGlide:: createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x2 end -@Credits to Skeli gBattleAnimMove_RisingVoltage:: loadspritegfx ANIM_TAG_ELECTRIC_ORBS loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @@ -14929,7 +14916,6 @@ gBattleAnimMove_SkitterSmack:: waitforvisualfinish end -@Credits to Skeli gBattleAnimMove_BurningJealousy:: loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER @@ -14982,7 +14968,6 @@ BurningJealousyFlames: return -@Credits to Skeli gBattleAnimMove_LashOut:: loadspritegfx ANIM_TAG_FOCUS_ENERGY @focus energy loadspritegfx ANIM_TAG_HANDS_AND_FEET @black color @@ -15063,7 +15048,6 @@ gBattleAnimMove_Poltergeist:: unloadspritegfx ANIM_TAG_ITEM_BAG end -@Credits to Skeli gBattleAnimMove_CorrosiveGas:: loadspritegfx ANIM_TAG_PINK_CLOUD @Fumes createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PINK_CLOUD, 0, 14, 14, RGB(15, 15, 6) @;Garbage green @@ -15089,7 +15073,6 @@ gBattleAnimMove_CorrosiveGas:: clearmonbg ANIM_ATTACKER end -@Credits to Skeli gBattleAnimMove_Coaching:: playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER createvisualtask AnimTask_Splash, 2, ANIM_ATTACKER, 1 @@ -15100,7 +15083,6 @@ gBattleAnimMove_Coaching:: waitforvisualfinish end -@Credits to Skeli gBattleAnimMove_FlipTurn:: loadspritegfx ANIM_TAG_ICE_CRYSTALS @;Bubbles loadspritegfx ANIM_TAG_HYDRO_PUMP @@ -15124,7 +15106,6 @@ gBattleAnimMove_FlipTurn:: end -@Credits to Skeli gBattleAnimMove_TripleAxel:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT @@ -15169,7 +15150,6 @@ TripleAxelEnd: blendoff end -@Credits to Skeli gBattleAnimMove_DualWingbeat:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_WHITE_FEATHER @@ -15226,7 +15206,6 @@ DualWingbeatFeatherScatterRight: createsprite gDualWingbeatFeatherSpriteTemplate, ANIM_TARGET, 1, 0, 0xfff8, 0xfe80, 0xffe1 return -@ credits to Skeli gBattleAnimMove_ScorchingSands:: loadspritegfx ANIM_TAG_MUD_SAND loadspritegfx ANIM_TAG_SMALL_EMBER @@ -15251,7 +15230,6 @@ gBattleAnimMove_ScorchingSands:: blendoff end -@ credits to skeli gBattleAnimMove_JungleHealing:: loadspritegfx ANIM_TAG_ROOTS loadspritegfx ANIM_TAG_ORBS @@ -15289,7 +15267,6 @@ gBattleAnimMove_JungleHealing:: waitbgfadein end -@ credits to ghoulslash gBattleAnimMove_SilkTrap:: loadspritegfx ANIM_TAG_PROTECT loadspritegfx ANIM_TAG_SPIDER_WEB @@ -15305,7 +15282,6 @@ gBattleAnimMove_SilkTrap:: clearmonbg ANIM_ATK_PARTNER end -@ Also used by Snow weather. Credits to Dat.H A gBattleAnimMove_Snowscape:: loadspritegfx ANIM_TAG_SNOWFLAKES playsewithpan SE_M_GUST, SOUND_PAN_ATTACKER @@ -15322,7 +15298,6 @@ gBattleAnimMove_Snowscape:: waitforvisualfinish end -@Credits to Skeli gBattleAnimMove_WickedBlow:: loadspritegfx ANIM_TAG_FOCUS_ENERGY loadspritegfx ANIM_TAG_HANDS_AND_FEET @@ -15385,7 +15360,6 @@ WickedBlowBuffEffect: -@Credits to Skeli gBattleAnimMove_SurgingStrikes:: loadspritegfx ANIM_TAG_IMPACT_2 loadspritegfx ANIM_TAG_WATER_IMPACT @@ -15432,7 +15406,6 @@ SURGING_STRIKES_2: end -@Credits to Skeli gBattleAnimMove_ThunderCage:: loadspritegfx ANIM_TAG_SHOCK_3 @Thunderbolt Ball loadspritegfx ANIM_TAG_SPARK @Electric lines @@ -15471,7 +15444,6 @@ ThunderCageBolts: return -@Credits to Skeli gBattleAnimMove_DragonEnergy:: loadspritegfx ANIM_TAG_HYDRO_PUMP createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HYDRO_PUMP, 0, 12, 12, RGB(30, 2, 11) @;Regidrago Reddish Reddish, Purple @@ -15530,7 +15502,6 @@ DragonEnergyShot: return -@Credits to Skeli gBattleAnimMove_FreezingGlare:: loadspritegfx ANIM_TAG_SMALL_RED_EYE loadspritegfx ANIM_TAG_EYE_SPARKLE @@ -15549,7 +15520,6 @@ gBattleAnimMove_FreezingGlare:: end -@Credits to Skeli gBattleAnimMove_FieryWrath:: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_PURPLE_RING @@ -15629,7 +15599,6 @@ FieryWrathGeyser: return -@Credits to Skeli gBattleAnimMove_ThunderousKick:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET @@ -15666,7 +15635,6 @@ gBattleAnimMove_ThunderousKick:: end -@Credits to Skeli gBattleAnimMove_GlacialLance:: loadspritegfx ANIM_TAG_ICICLE_SPEAR loadspritegfx ANIM_TAG_ICE_CUBE @@ -15821,7 +15789,6 @@ AstralBarrageFlames5: return -@Credits to Skeli gBattleAnimMove_EerieSpell:: loadspritegfx ANIM_TAG_PURPLE_FLAME call SetPsychicBackground @@ -15864,7 +15831,6 @@ EerieSpellConvergingFlames: return @@@@@@@@@@@@@@@@@@@@@@@ GEN 9 @@@@@@@@@@@@@@@@@@@@@@@ -@ credits to Skeli gBattleAnimMove_DireClaw:: loadspritegfx ANIM_TAG_SLASH loadspritegfx ANIM_TAG_POISON_BUBBLE @@ -15885,7 +15851,6 @@ gBattleAnimMove_DireClaw:: end -@ credits to Skeli gBattleAnimMove_PsyshieldBash:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_WATER_GUN @Blue colour @@ -15914,7 +15879,6 @@ gBattleAnimMove_PsyshieldBash:: blendoff end -@ credits to skeli gBattleAnimMove_PowerShift:: loadspritegfx ANIM_TAG_BLUEGREEN_ORB loadspritegfx ANIM_TAG_RED_HEART @Red colour for orb @@ -15930,7 +15894,6 @@ gBattleAnimMove_PowerShift:: end -@ credits to skeli gBattleAnimMove_StoneAxe:: loadspritegfx ANIM_TAG_SLAM_HIT_2 @Cut loadspritegfx ANIM_TAG_ROCKS @@ -15960,7 +15923,6 @@ StoneAxeRockFragments: return -@Credits to Skeli gBattleAnimMove_SpringtideStorm:: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_RED_HEART @@ -15999,7 +15961,6 @@ SpringtideStormHeartSwirl: return -@Credits to Skeli gBattleAnimMove_MysticalPower:: loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_POISON_BUBBLE @Purple Colour @@ -16054,7 +16015,6 @@ MysticalPowerFoeTwoRingsOnly: return -@Credits to Skeli gBattleAnimMove_RagingFury:: loadspritegfx ANIM_TAG_SMALL_EMBER loopsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER, 0x8, 0x3 @@ -16071,7 +16031,6 @@ gBattleAnimMove_RagingFury:: waitforvisualfinish end -@Credits to Skeli gBattleAnimMove_WaveCrash:: loadspritegfx ANIM_TAG_WATER_IMPACT loadspritegfx ANIM_TAG_SMALL_BUBBLES @@ -16092,7 +16051,6 @@ gBattleAnimMove_WaveCrash:: end -@Credits to Skeli gBattleAnimMove_Chloroblast:: loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_HYDRO_PUMP @@ -16153,7 +16111,6 @@ ChloroblastShot: delay 2 return -@Credits to Skeli gBattleAnimMove_MountainGale:: loadspritegfx ANIM_TAG_ROCKS @Rocks loadspritegfx ANIM_TAG_DRAGON_ASCENT_FOE @White Rock Colour @@ -16186,7 +16143,6 @@ MountainGaleIceRock: -@Credits to Skeli gBattleAnimMove_VictoryDance:: loadspritegfx ANIM_TAG_HOLLOW_ORB createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 40, 6, 3, 3 @@ -16206,7 +16162,6 @@ gBattleAnimMove_VictoryDance:: waitforvisualfinish end -@Credits to Skeli gBattleAnimMove_HeadlongRush:: loadspritegfx ANIM_TAG_MUD_SAND @Dig loadspritegfx ANIM_TAG_IMPACT @@ -16293,7 +16248,6 @@ MaxQuake_DirtGeyser: return -@Credits to Skeli gBattleAnimMove_BarbBarrage:: loadspritegfx ANIM_TAG_SPIKES loadspritegfx ANIM_TAG_SHADOW_BALL @Spikes colour @@ -16326,7 +16280,6 @@ BarbBarrageSpikeShoot: -@Credits to Skeli gBattleAnimMove_EsperWing:: loadspritegfx ANIM_TAG_PUNISHMENT_BLADES @Punishment Blade loadspritegfx ANIM_TAG_WHITE_FEATHER @@ -16363,7 +16316,6 @@ WingAttackFeatherScatter: return -@Credits to Skeli gBattleAnimMove_BitterMalice:: loadspritegfx ANIM_TAG_PURPLE_RING loadspritegfx ANIM_TAG_EYE_SPARKLE @@ -16397,7 +16349,6 @@ BitterMaliceSwirl: delay 2 return -@ credits to Skeli gBattleAnimMove_Shelter:: loadspritegfx ANIM_TAG_SHELL_LEFT loadspritegfx ANIM_TAG_SHELL_RIGHT @@ -16413,7 +16364,6 @@ gBattleAnimMove_Shelter:: end -@Credits to Skeli gBattleAnimMove_TripleArrows:: loadspritegfx ANIM_TAG_SPIRIT_ARROW @Arrow loadspritegfx ANIM_TAG_HANDS_AND_FEET @@ -16447,7 +16397,6 @@ TripleArrowsOnOpponent: -@Credits to Skeli gBattleAnimMove_InfernalParade:: loadspritegfx ANIM_TAG_PURPLE_FLAME loadspritegfx ANIM_TAG_WISP_FIRE @@ -16493,7 +16442,6 @@ InfernalFlames: -@Credits to Skeli gBattleAnimMove_CeaselessEdge:: loadspritegfx ANIM_TAG_SLASH playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER @@ -16531,7 +16479,6 @@ CeaselessEdgeSlashes: return -@Credits to Skeli gBattleAnimMove_BleakwindStorm:: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_ICE_CRYSTALS @@ -16571,7 +16518,6 @@ BleakwindStormIceSwirl: return -@Credits to Skeli gBattleAnimMove_WildboltStorm:: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_SPARK_2 @@ -16617,7 +16563,6 @@ WildboltStormSparkSwirl: return -@Credits to Skeli gBattleAnimMove_SandsearStorm:: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_SMALL_EMBER @@ -16659,7 +16604,6 @@ SandsearStormFireSpin: return -@Credits to Skeli gBattleAnimMove_LunarBlessing:: loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_MOON @@ -16693,7 +16637,6 @@ gBattleAnimMove_LunarBlessing:: end -@Credits to Skeli gBattleAnimMove_TakeHeart:: loadspritegfx ANIM_TAG_RED_HEART loadspritegfx ANIM_TAG_SPARKLE_2 @@ -16796,7 +16739,6 @@ gBattleAnimMove_SyrupBomb:: jumpargeq 0x0, FALSE, gBattleAnimMove_SyrupBombRed jumpargeq 0x0, TRUE, gBattleAnimMove_SyrupBombYellow -@ Credits to Dat.H A gBattleAnimMove_SyrupBombRed:: loadspritegfx ANIM_TAG_SYRUP_BLOB_RED loadspritegfx ANIM_TAG_SYRUP_SPLAT_RED @@ -17015,7 +16957,6 @@ gBattleAnimMove_AlluringVoice:: waitforvisualfinish end -@ Credits to Z-nogyroP gBattleAnimMove_AquaCutter:: loadspritegfx ANIM_TAG_SLASH_2 loadspritegfx ANIM_TAG_SMALL_BUBBLES @@ -17054,7 +16995,6 @@ gBattleAnimMove_AquaCutter:: waitforvisualfinish end -@ Credits to Z-nogyroP gBattleAnimMove_GigatonHammer:: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_WOOD_HAMMER_HAMMER @@ -17083,7 +17023,6 @@ GigatonHammerImpact: createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 0xc, 0x1e, 0x4, 0x3 return -@ Credits to Z-nogyroP gBattleAnimMove_IceSpinner:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_RAPID_SPIN @@ -17126,7 +17065,6 @@ IceCrystalSpinEffect: delay 2 return -@ Credits to Z-nogyroP gBattleAnimMove_RagingBull:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ANGER @@ -17213,7 +17151,6 @@ RagingBullShatteredWall: clearmonbg ANIM_TARGET end -@ Credits to Z-nogyroP. Simple anim that combines Force Palm + Fake Out gBattleAnimMove_UpperHand:: loadspritegfx ANIM_TAG_SHADOW_BALL loadspritegfx ANIM_TAG_HANDS_AND_FEET diff --git a/src/battle_anim_new.c b/src/battle_anim_new.c index fff35b4073..cc8338b687 100644 --- a/src/battle_anim_new.c +++ b/src/battle_anim_new.c @@ -9629,7 +9629,6 @@ void AnimTask_RandomBool(u8 taskId) DestroyAnimVisualTask(taskId); } -// Credit to Skeli #define PRIMAL_PULSE_SCALE_SIZE 16 #define PRIMAL_PULSE_FRAME_COUNT 4 static const union AffineAnimCmd sSpriteAffineAnim_PrimalSymbol[] = diff --git a/src/debug.c b/src/debug.c index 718ec46c5e..fdeaa8813e 100644 --- a/src/debug.c +++ b/src/debug.c @@ -1,12 +1,3 @@ -//CREDITS -//TheXaman: https://github.com/TheXaman/pokeemerald/tree/tx_debug_system -//CODE USED FROM: -//ketsuban: https://github.com/pret/pokeemerald/wiki/Add-a-debug-menu -//Pyredrid: https://github.com/Pyredrid/pokeemerald/tree/debugmenu -//AsparagusEduardo: https://github.com/AsparagusEduardo/pokeemerald/tree/InfusedEmerald_v2 -//Ghoulslash: https://github.com/ghoulslash/pokeemerald -//Jaizu: https://jaizu.moe/ -//AND OTHER RHH POKEEMERALD-EXPANSION CONTRIBUTORS #include "global.h" #include "battle.h" #include "battle_setup.h" diff --git a/src/decompress_asm.s b/src/decompress_asm.s index 4ab6060a0c..758a5fa7a0 100644 --- a/src/decompress_asm.s +++ b/src/decompress_asm.s @@ -19,9 +19,6 @@ FastUnsafeCopy32: pop {r4-r10} bx lr - -@ Credit to: luckytyphlosion as it's his implementation - .section .text @Copied to stack on run-time .align 2 diff --git a/src/pokemon_sprite_visualizer.c b/src/pokemon_sprite_visualizer.c index cc51b2dfc7..44515a54e3 100644 --- a/src/pokemon_sprite_visualizer.c +++ b/src/pokemon_sprite_visualizer.c @@ -1,4 +1,3 @@ -//Credits: Gamer2020, AsparagusEduardo, TheXaman, ShinyDragonHunter #include "global.h" #include "battle.h" #include "battle_anim.h"