diff --git a/include/status_actions.h b/include/status_actions.h index 1632e96b8..594e0930a 100644 --- a/include/status_actions.h +++ b/include/status_actions.h @@ -4,14 +4,14 @@ #include "constants/move.h" #include "structs/dungeon_entity.h" -bool8 sub_805B668(Entity *pokemon, Entity *target, Move *move, s32 param_4); +bool8 DreamEaterMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); bool8 sub_805B734(Entity *pokemon, Entity *target, Move *move, s32 param_4); bool8 RecycleMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); bool8 ReflectMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -bool8 sub_805B808(Entity *pokemon, Entity *target, Move *move, s32 param_4); +bool8 DragonRageMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); bool8 sub_805B884(Entity *pokemon, Entity *target, Move *move, s32 param_4); bool8 SkullBashMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -bool8 sub_805B910(Entity *pokemon, Entity *target, Move *move, s32 param_4); +bool8 LusterPurgeMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); bool8 sub_805B968(Entity *pokemon, Entity *target, Move *move, s32 param_4); bool8 RockSmashMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); bool8 sub_805BA44(Entity *pokemon, Entity *target, Move *move, s32 param_4); diff --git a/src/called_move_data.c b/src/called_move_data.c index f83ab7cd3..5b09f19e2 100644 --- a/src/called_move_data.c +++ b/src/called_move_data.c @@ -2,300 +2,300 @@ #include "called_move_data.h" #include "constants/move_id.h" -extern bool8 sub_8057634(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 IronTailMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 YawnMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 NightmareMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805783C(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 CharmMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 EncoreMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8057974(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 SuperFangMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 PainSplitMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 TormentMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8057BC4(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8057C88(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 SwaggerMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 RockSlideMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 WhirlpoolMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8057D7C(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8057D9C(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 FakeTearsMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 SpiteMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 SmokescreenMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8057FCC(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 FlatterMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_8057FF4(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805805C(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805816C(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058270(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80582C4(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80583D8(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058430(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058478(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80584C0(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058548(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 ReturnMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 FlameWheelMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 GustMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 DisableMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 CrunchMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 BiteMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 ThunderMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 EndeavorMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 FacadeMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_8058580(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 BrickBreakMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058638(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80586DC(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058770(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80587E8(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058838(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058858(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80588B8(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80588F4(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058930(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058A18(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058BF0(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 RockTombMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 GigaDrainMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 ReversalMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 SmellingSaltMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 MetalSoundMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 TickleMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 OutrageMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 LowKickMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 AncientPowerMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 RapidSpinMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 ScaryFaceMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_8058E5C(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058FBC(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80590D4(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 LickMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 FissureMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_8059190(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80591E4(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 AbsorbMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 SkillSwapMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059424(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805946C(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 HeadbuttMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 DoubleEdgeMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_8059528(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059540(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80595A0(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 SmogMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 SacredFireMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_80595EC(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80598CC(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059928(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059988(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 MuddyWaterMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 TwisterMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 TwineedleMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_8059A2C(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059AA8(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059AB8(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059AF8(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059D00(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059D48(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059D98(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059DA4(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059DB4(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059DC4(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059E0C(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 SupersonicMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 TauntMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 HornDrillMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 ThundershockMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 ThunderWaveMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 BlockMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 PoisonGasMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 ToxicMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 PoisonFangMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 PoisonStingMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 TriAttackMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805A120(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805A210(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805A258(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 TrickMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 TripleKickMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 MudSlapMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_805A2A0(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 RolePlayMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805A3DC(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805A464(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 LeerMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 PayDayMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 CurseMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_805A568(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 TickleMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 SuperpowerMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_805A688(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 KnockOffMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 SecretPowerMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_805AC90(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_805AD04(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_805AD34(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805AD54(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805AE3C(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805AE74(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805AECC(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 BeatUpMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 BlastBurnMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 CrushClawMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 BlazeKickMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 PresentMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805AFA4(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B028(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B074(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B0BC(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 EruptionMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 GlareMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 PoisonTailMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 RoarMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_805B17C(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 WrapMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B264(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B324(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 MagnitudeMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 MistBallMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 DestinyBondMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B388(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B3E0(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B454(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 FalseSwipeMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 HiddenPowerMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 AttractMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 MimicMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B53C(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 FrustrationMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 LeechSeedMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B668(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B910(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B808(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805A408(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 DreamEaterMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 LusterPurgeMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 DragonRageMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 FakeOutMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 HandleRegularDamagingMove(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059050(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 StunSporeMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); // Todo: move this data to some better place once the file structure is better understood // These are random const struct CalledMove gMetronomeCalledMoves[METRONOME_AVAILABLE_CALLED_MOVES] = { - {MOVE_IRON_TAIL, sub_8057634}, + {MOVE_IRON_TAIL, IronTailMoveAction}, {MOVE_YAWN, YawnMoveAction}, {MOVE_NIGHTMARE, NightmareMoveAction}, - {MOVE_CHARM, sub_805783C}, + {MOVE_CHARM, CharmMoveAction}, {MOVE_ENCORE, EncoreMoveAction}, - {MOVE_SUPER_FANG, sub_8057974}, + {MOVE_SUPER_FANG, SuperFangMoveAction}, {MOVE_PAIN_SPLIT, PainSplitMoveAction}, {MOVE_TORMENT, TormentMoveAction}, - {MOVE_SWAGGER, sub_8057BC4}, - {MOVE_ROCK_SLIDE, sub_8057C88}, + {MOVE_SWAGGER, SwaggerMoveAction}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, {MOVE_WHIRLPOOL, WhirlpoolMoveAction}, - {MOVE_FAKE_TEARS, sub_8057D7C}, - {MOVE_SPITE, sub_8057D9C}, + {MOVE_FAKE_TEARS, FakeTearsMoveAction}, + {MOVE_SPITE, SpiteMoveAction}, {MOVE_SMOKESCREEN, SmokescreenMoveAction}, - {MOVE_FLATTER, sub_8057FCC}, + {MOVE_FLATTER, FlatterMoveAction}, {MOVE_WILL_O_WISP, sub_8057FF4}, - {MOVE_RETURN, sub_805805C}, - {MOVE_FLAME_WHEEL, sub_805816C}, - {MOVE_GUST, sub_8058270}, - {MOVE_DISABLE, sub_80582C4}, - {MOVE_CRUNCH, sub_80583D8}, - {MOVE_BITE, sub_8058430}, - {MOVE_THUNDER, sub_8058478}, - {MOVE_ENDEAVOR, sub_80584C0}, - {MOVE_FACADE, sub_8058548}, + {MOVE_RETURN, ReturnMoveAction}, + {MOVE_FLAME_WHEEL, FlameWheelMoveAction}, + {MOVE_GUST, GustMoveAction}, + {MOVE_DISABLE, DisableMoveAction}, + {MOVE_CRUNCH, CrunchMoveAction}, + {MOVE_BITE, BiteMoveAction}, + {MOVE_THUNDER, ThunderMoveAction}, + {MOVE_ENDEAVOR, EndeavorMoveAction}, + {MOVE_FACADE, FacadeMoveAction}, {MOVE_CONSTRICT, sub_8058580}, {MOVE_BRICK_BREAK, BrickBreakMoveAction}, - {MOVE_ROCK_TOMB, sub_8058638}, - {MOVE_GIGA_DRAIN, sub_80586DC}, - {MOVE_REVERSAL, sub_8058770}, - {MOVE_SMELLINGSALT, sub_80587E8}, - {MOVE_METAL_SOUND, sub_8058838}, - {MOVE_TICKLE, sub_8058858}, - {MOVE_OUTRAGE, sub_80588B8}, - {MOVE_LOW_KICK, sub_80588F4}, - {MOVE_ANCIENTPOWER, sub_8058930}, - {MOVE_RAPID_SPIN, sub_8058A18}, - {MOVE_SCARY_FACE, sub_8058BF0}, + {MOVE_ROCK_TOMB, RockTombMoveAction}, + {MOVE_GIGA_DRAIN, GigaDrainMoveAction}, + {MOVE_REVERSAL, ReversalMoveAction}, + {MOVE_SMELLINGSALT, SmellingSaltMoveAction}, + {MOVE_METAL_SOUND, MetalSoundMoveAction}, + {MOVE_TICKLE, TickleMoveAction}, + {MOVE_OUTRAGE, OutrageMoveAction}, + {MOVE_LOW_KICK, LowKickMoveAction}, + {MOVE_ANCIENTPOWER, AncientPowerMoveAction}, + {MOVE_RAPID_SPIN, RapidSpinMoveAction}, + {MOVE_SCARY_FACE, ScaryFaceMoveAction}, {MOVE_SUBMISSION, sub_8058E5C}, - {MOVE_LICK, sub_8058FBC}, - {MOVE_FISSURE, sub_80590D4}, + {MOVE_LICK, LickMoveAction}, + {MOVE_FISSURE, FissureMoveAction}, {MOVE_EXTRASENSORY, sub_8059190}, - {MOVE_ABSORB, sub_80591E4}, + {MOVE_ABSORB, AbsorbMoveAction}, {MOVE_SKILL_SWAP, SkillSwapMoveAction}, - {MOVE_HEADBUTT, sub_8059424}, - {MOVE_DOUBLE_EDGE, sub_805946C}, + {MOVE_HEADBUTT, HeadbuttMoveAction}, + {MOVE_DOUBLE_EDGE, DoubleEdgeMoveAction}, {MOVE_SAND_ATTACK, sub_8059528}, - {MOVE_SMOG, sub_8059540}, - {MOVE_SACRED_FIRE, sub_80595A0}, + {MOVE_SMOG, SmogMoveAction}, + {MOVE_SACRED_FIRE, SacredFireMoveAction}, {MOVE_SHEER_COLD, sub_80595EC}, - {MOVE_MUDDY_WATER, sub_80598CC}, - {MOVE_TWISTER, sub_8059928}, - {MOVE_TWINEEDLE, sub_8059988}, + {MOVE_MUDDY_WATER, MuddyWaterMoveAction}, + {MOVE_TWISTER, TwisterMoveAction}, + {MOVE_TWINEEDLE, TwineedleMoveAction}, {MOVE_SEISMIC_TOSS, sub_8059A2C}, - {MOVE_SUPERSONIC, sub_8059AA8}, - {MOVE_TAUNT, sub_8059AB8}, - {MOVE_HORN_DRILL, sub_8059AF8}, - {MOVE_THUNDERSHOCK, sub_8059D00}, - {MOVE_THUNDER_WAVE, sub_8059D48}, - {MOVE_BLOCK, sub_8059D98}, - {MOVE_POISON_GAS, sub_8059DA4}, - {MOVE_TOXIC, sub_8059DB4}, - {MOVE_POISON_FANG, sub_8059DC4}, - {MOVE_POISON_STING, sub_8059E0C}, + {MOVE_SUPERSONIC, SupersonicMoveAction}, + {MOVE_TAUNT, TauntMoveAction}, + {MOVE_HORN_DRILL, HornDrillMoveAction}, + {MOVE_THUNDERSHOCK, ThundershockMoveAction}, + {MOVE_THUNDER_WAVE, ThunderWaveMoveAction}, + {MOVE_BLOCK, BlockMoveAction}, + {MOVE_POISON_GAS, PoisonGasMoveAction}, + {MOVE_TOXIC, ToxicMoveAction}, + {MOVE_POISON_FANG, PoisonFangMoveAction}, + {MOVE_POISON_STING, PoisonStingMoveAction}, {MOVE_TRI_ATTACK, TriAttackMoveAction}, - {MOVE_TRICK, sub_805A120}, - {MOVE_TRIPLE_KICK, sub_805A210}, - {MOVE_MUD_SLAP, sub_805A258}, + {MOVE_TRICK, TrickMoveAction}, + {MOVE_TRIPLE_KICK, TripleKickMoveAction}, + {MOVE_MUD_SLAP, MudSlapMoveAction}, {MOVE_THIEF, sub_805A2A0}, {MOVE_ROLE_PLAY, RolePlayMoveAction}, - {MOVE_LEER, sub_805A3DC}, - {MOVE_PAY_DAY, sub_805A464}, + {MOVE_LEER, LeerMoveAction}, + {MOVE_PAY_DAY, PayDayMoveAction}, {MOVE_CURSE, CurseMoveAction}, {MOVE_FRENZY_PLANT, sub_805A568}, - {MOVE_SUPERPOWER, TickleMoveAction}, + {MOVE_SUPERPOWER, SuperpowerMoveAction}, {MOVE_DYNAMICPUNCH, sub_805A688}, {MOVE_KNOCK_OFF, KnockOffMoveAction}, {MOVE_SECRET_POWER, SecretPowerMoveAction}, {MOVE_DIZZY_PUNCH, sub_805AC90}, {MOVE_IMPRISON, sub_805AD04}, {MOVE_FEATHERDANCE, sub_805AD34}, - {MOVE_BEAT_UP, sub_805AD54}, - {MOVE_BLAST_BURN, sub_805AE3C}, - {MOVE_CRUSH_CLAW, sub_805AE74}, - {MOVE_BLAZE_KICK, sub_805AECC}, + {MOVE_BEAT_UP, BeatUpMoveAction}, + {MOVE_BLAST_BURN, BlastBurnMoveAction}, + {MOVE_CRUSH_CLAW, CrushClawMoveAction}, + {MOVE_BLAZE_KICK, BlazeKickMoveAction}, {MOVE_PRESENT, PresentMoveAction}, - {MOVE_ERUPTION, sub_805AFA4}, - {MOVE_GLARE, sub_805B028}, - {MOVE_POISON_TAIL, sub_805B074}, - {MOVE_ROAR, sub_805B0BC}, + {MOVE_ERUPTION, EruptionMoveAction}, + {MOVE_GLARE, GlareMoveAction}, + {MOVE_POISON_TAIL, PoisonTailMoveAction}, + {MOVE_ROAR, RoarMoveAction}, {MOVE_FIRE_SPIN, sub_805B17C}, {MOVE_WRAP, WrapMoveAction}, - {MOVE_MAGNITUDE, sub_805B264}, - {MOVE_MIST_BALL, sub_805B324}, + {MOVE_MAGNITUDE, MagnitudeMoveAction}, + {MOVE_MIST_BALL, MistBallMoveAction}, {MOVE_DESTINY_BOND, DestinyBondMoveAction}, - {MOVE_FALSE_SWIPE, sub_805B388}, - {MOVE_HIDDEN_POWER, sub_805B3E0}, - {MOVE_ATTRACT, sub_805B454}, + {MOVE_FALSE_SWIPE, FalseSwipeMoveAction}, + {MOVE_HIDDEN_POWER, HiddenPowerMoveAction}, + {MOVE_ATTRACT, AttractMoveAction}, {MOVE_MIMIC, MimicMoveAction}, - {MOVE_FRUSTRATION, sub_805B53C}, + {MOVE_FRUSTRATION, FrustrationMoveAction}, {MOVE_LEECH_SEED, LeechSeedMoveAction}, - {MOVE_DREAM_EATER, sub_805B668}, - {MOVE_LUSTER_PURGE, sub_805B910}, - {MOVE_DRAGON_RAGE, sub_805B808}, - {MOVE_FAKE_OUT, sub_805A408}, + {MOVE_DREAM_EATER, DreamEaterMoveAction}, + {MOVE_LUSTER_PURGE, LusterPurgeMoveAction}, + {MOVE_DRAGON_RAGE, DragonRageMoveAction}, + {MOVE_FAKE_OUT, FakeOutMoveAction}, }; // These correspond to dungeon's tileset id const struct CalledMove gNaturePowerCalledMoves[] = { {MOVE_SURF, HandleRegularDamagingMove}, - {MOVE_STUN_SPORE, sub_8059050}, - {MOVE_ROCK_SLIDE, sub_8057C88}, - {MOVE_SHADOW_BALL, sub_80583D8}, - {MOVE_SHADOW_BALL, sub_80583D8}, - {MOVE_ROCK_SLIDE, sub_8057C88}, - {MOVE_ROCK_SLIDE, sub_8057C88}, - {MOVE_SHADOW_BALL, sub_80583D8}, + {MOVE_STUN_SPORE, StunSporeMoveAction}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, + {MOVE_SHADOW_BALL, CrunchMoveAction}, + {MOVE_SHADOW_BALL, CrunchMoveAction}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, + {MOVE_SHADOW_BALL, CrunchMoveAction}, {MOVE_SWIFT, HandleRegularDamagingMove}, - {MOVE_ROCK_SLIDE, sub_8057C88}, - {MOVE_STUN_SPORE, sub_8059050}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, + {MOVE_STUN_SPORE, StunSporeMoveAction}, {MOVE_EARTHQUAKE, HandleRegularDamagingMove}, {MOVE_SWIFT, HandleRegularDamagingMove}, {MOVE_SWIFT, HandleRegularDamagingMove}, - {MOVE_STUN_SPORE, sub_8059050}, + {MOVE_STUN_SPORE, StunSporeMoveAction}, {MOVE_SWIFT, HandleRegularDamagingMove}, {MOVE_SWIFT, HandleRegularDamagingMove}, - {MOVE_SHADOW_BALL, sub_80583D8}, - {MOVE_SHADOW_BALL, sub_80583D8}, - {MOVE_SHADOW_BALL, sub_80583D8}, - {MOVE_STUN_SPORE, sub_8059050}, + {MOVE_SHADOW_BALL, CrunchMoveAction}, + {MOVE_SHADOW_BALL, CrunchMoveAction}, + {MOVE_SHADOW_BALL, CrunchMoveAction}, + {MOVE_STUN_SPORE, StunSporeMoveAction}, {MOVE_EARTHQUAKE, HandleRegularDamagingMove}, - {MOVE_ROCK_SLIDE, sub_8057C88}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, {MOVE_SWIFT, HandleRegularDamagingMove}, - {MOVE_ROCK_SLIDE, sub_8057C88}, - {MOVE_STUN_SPORE, sub_8059050}, - {MOVE_STUN_SPORE, sub_8059050}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, + {MOVE_STUN_SPORE, StunSporeMoveAction}, + {MOVE_STUN_SPORE, StunSporeMoveAction}, {MOVE_SWIFT, HandleRegularDamagingMove}, - {MOVE_ROCK_SLIDE, sub_8057C88}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, {MOVE_RAZOR_LEAF, HandleRegularDamagingMove}, - {MOVE_SHADOW_BALL, sub_80583D8}, - {MOVE_SHADOW_BALL, sub_80583D8}, + {MOVE_SHADOW_BALL, CrunchMoveAction}, + {MOVE_SHADOW_BALL, CrunchMoveAction}, {MOVE_RAZOR_LEAF, HandleRegularDamagingMove}, {MOVE_RAZOR_LEAF, HandleRegularDamagingMove}, - {MOVE_ROCK_SLIDE, sub_8057C88}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, {MOVE_SWIFT, HandleRegularDamagingMove}, {MOVE_SWIFT, HandleRegularDamagingMove}, - {MOVE_SHADOW_BALL, sub_80583D8}, - {MOVE_ROCK_SLIDE, sub_8057C88}, - {MOVE_ROCK_SLIDE, sub_8057C88}, - {MOVE_ROCK_SLIDE, sub_8057C88}, - {MOVE_STUN_SPORE, sub_8059050}, - {MOVE_ROCK_SLIDE, sub_8057C88}, - {MOVE_ROCK_SLIDE, sub_8057C88}, + {MOVE_SHADOW_BALL, CrunchMoveAction}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, + {MOVE_STUN_SPORE, StunSporeMoveAction}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, {MOVE_EARTHQUAKE, HandleRegularDamagingMove}, {MOVE_SWIFT, HandleRegularDamagingMove}, - {MOVE_ROCK_SLIDE, sub_8057C88}, - {MOVE_ROCK_SLIDE, sub_8057C88}, - {MOVE_ROCK_SLIDE, sub_8057C88}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, {MOVE_SURF, HandleRegularDamagingMove}, - {MOVE_STUN_SPORE, sub_8059050}, - {MOVE_STUN_SPORE, sub_8059050}, + {MOVE_STUN_SPORE, StunSporeMoveAction}, + {MOVE_STUN_SPORE, StunSporeMoveAction}, {MOVE_EARTHQUAKE, HandleRegularDamagingMove}, {MOVE_BUBBLEBEAM, sub_8058580}, - {MOVE_SHADOW_BALL, sub_80583D8}, - {MOVE_ROCK_SLIDE, sub_8057C88}, - {MOVE_STUN_SPORE, sub_8059050}, + {MOVE_SHADOW_BALL, CrunchMoveAction}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, + {MOVE_STUN_SPORE, StunSporeMoveAction}, {MOVE_SWIFT, HandleRegularDamagingMove}, {MOVE_SWIFT, HandleRegularDamagingMove}, - {MOVE_ROCK_SLIDE, sub_8057C88}, - {MOVE_STUN_SPORE, sub_8059050}, - {MOVE_SHADOW_BALL, sub_80583D8}, - {MOVE_STUN_SPORE, sub_8059050}, - {MOVE_STUN_SPORE, sub_8059050}, - {MOVE_ROCK_SLIDE, sub_8057C88}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, + {MOVE_STUN_SPORE, StunSporeMoveAction}, + {MOVE_SHADOW_BALL, CrunchMoveAction}, + {MOVE_STUN_SPORE, StunSporeMoveAction}, + {MOVE_STUN_SPORE, StunSporeMoveAction}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, {MOVE_RAZOR_LEAF, HandleRegularDamagingMove}, - {MOVE_ROCK_SLIDE, sub_8057C88}, - {MOVE_ROCK_SLIDE, sub_8057C88}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, {MOVE_SWIFT, HandleRegularDamagingMove}, {MOVE_SWIFT, HandleRegularDamagingMove}, - {MOVE_ROCK_SLIDE, sub_8057C88}, + {MOVE_ROCK_SLIDE, RockSlideMoveAction}, {MOVE_SWIFT, HandleRegularDamagingMove}, {MOVE_SWIFT, HandleRegularDamagingMove}, {MOVE_SURF, HandleRegularDamagingMove}, diff --git a/src/dungeon_move.c b/src/dungeon_move.c index d654f04e8..7168604ff 100644 --- a/src/dungeon_move.c +++ b/src/dungeon_move.c @@ -74,119 +74,120 @@ extern void sub_8042930(Entity *r0); extern void sub_8041B48(Entity *pokemon); extern void sub_8041BA8(Entity *pokemon); extern void sub_8042950(Entity *r0); -extern bool8 sub_8057634(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern void sub_80421C0(Entity *pokemon, u16 r1); +extern bool8 IronTailMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 YawnMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 NightmareMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805783C(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 CharmMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 EncoreMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8057974(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 SuperFangMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 PainSplitMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 TormentMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8057BC4(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8057C88(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 SwaggerMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 RockSlideMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 WhirlpoolMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 SurfMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_805889C(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8057D7C(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8057D9C(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 FakeTearsMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 SpiteMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 SmokescreenMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8057FCC(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 FlatterMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_8057FF4(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805805C(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805816C(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 ReturnMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 FlameWheelMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_80581D0(Entity *pokemon, Entity *target, Move *move, u32 param_4); extern bool8 sub_8058B3C(Entity *pokemon, Entity *target, Move *move, u32 param_4); -extern bool8 sub_8058270(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80582C4(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80583D8(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058430(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058478(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80584C0(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058548(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 GustMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 DisableMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 CrunchMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 BiteMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 ThunderMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 EndeavorMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 FacadeMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_8058580(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 BrickBreakMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058638(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80586DC(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058770(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80587E8(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058838(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058858(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80588B8(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80588F4(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058930(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 RockTombMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 GigaDrainMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 ReversalMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 SmellingSaltMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 MetalSoundMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 TickleMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 OutrageMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 LowKickMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 AncientPowerMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_8058C00(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058A18(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058BF0(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 RapidSpinMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 ScaryFaceMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_8058E5C(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8058FBC(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80590D4(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 LickMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 FissureMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_8059190(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80591E4(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 AbsorbMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 SkillSwapMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059424(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805946C(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 HeadbuttMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 DoubleEdgeMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_8059528(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059540(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80595A0(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 SmogMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 SacredFireMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_80595EC(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_805C138(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_80598CC(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059928(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059988(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 MuddyWaterMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 TwisterMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 TwineedleMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_8059A2C(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059AA8(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059AB8(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059AF8(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059D00(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059D48(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059D98(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059DA4(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059DB4(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059DC4(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059E0C(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 SupersonicMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 TauntMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 HornDrillMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 ThundershockMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 ThunderWaveMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 BlockMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 PoisonGasMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 ToxicMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 PoisonFangMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 PoisonStingMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 TriAttackMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805A120(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805A210(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805A258(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 TrickMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 TripleKickMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 MudSlapMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_805A2A0(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 RolePlayMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805A3DC(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805A464(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 LeerMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 PayDayMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 CurseMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_805A568(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 FocusEnergyMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 TickleMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 SuperpowerMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_805A688(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 KnockOffMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 SecretPowerMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_805AC90(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_805AD04(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_805AD34(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805AD54(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805AE3C(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805AE74(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805AECC(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 BeatUpMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 BlastBurnMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 CrushClawMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 BlazeKickMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 PresentMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805AFA4(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B028(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B074(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B0BC(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 EruptionMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 GlareMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 PoisonTailMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 RoarMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_805B17C(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 WrapMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B264(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B324(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 MagnitudeMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 MistBallMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 DestinyBondMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B388(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B3E0(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B454(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 FalseSwipeMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 HiddenPowerMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 AttractMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 MimicMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B53C(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 FrustrationMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 LeechSeedMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B668(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B910(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805B808(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_805A408(Entity *pokemon, Entity *target, Move *move, s32 param_4); -extern bool8 sub_8059050(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 DreamEaterMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 LusterPurgeMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 DragonRageMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 FakeOutMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); +extern bool8 StunSporeMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4); extern bool8 sub_8059FC8(Entity * pokemon,Entity * target,Move * move,u32 param_4,u8 param_5); extern bool8 sub_8059E54(Entity * pokemon,Entity * target,Move * move,u32 param_4,u8 param_5); extern void SetShopkeeperAggression(Entity *, Entity *); @@ -727,13 +728,13 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = sub_8058F04(attacker, currTarget, move, itemId); break; case MOVE_GUST: - moveHadEffect = sub_8058270(attacker, currTarget, move, itemId); + moveHadEffect = GustMoveAction(attacker, currTarget, move, itemId); break; case MOVE_STRUGGLE: moveHadEffect = sub_805B968(attacker, currTarget, move, itemId); break; case MOVE_FLAME_WHEEL: - moveHadEffect = sub_805816C(attacker, currTarget, move, itemId); + moveHadEffect = FlameWheelMoveAction(attacker, currTarget, move, itemId); break; case MOVE_FLAMETHROWER: case MOVE_FIRE_BLAST: @@ -766,7 +767,7 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = (HandleDamagingMove(attacker, currTarget, move, 0x100, itemId) != 0); break; case MOVE_FISSURE: - moveHadEffect = sub_80590D4(attacker, currTarget, move, itemId); + moveHadEffect = FissureMoveAction(attacker, currTarget, move, itemId); break; case MOVE_SHEER_COLD: case MOVE_GUILLOTINE: @@ -794,7 +795,7 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move case MOVE_POISON_STING: case MOVE_SLUDGE: case MOVE_SLUDGE_BOMB: - moveHadEffect = sub_8059E0C(attacker, currTarget, move, itemId); + moveHadEffect = PoisonStingMoveAction(attacker, currTarget, move, itemId); break; case MOVE_PSYCHIC: moveHadEffect = sub_8058C98(attacker, currTarget, move, gUnknown_8106A50, itemId); @@ -809,10 +810,10 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = sub_805A5E8(attacker, currTarget, move, gUnknown_8106A4C, itemId); break; case MOVE_POISON_TAIL: - moveHadEffect = sub_805B074(attacker, currTarget, move, itemId); + moveHadEffect = PoisonTailMoveAction(attacker, currTarget, move, itemId); break; case MOVE_TWISTER: - moveHadEffect = sub_8059928(attacker, currTarget, move, itemId); + moveHadEffect = TwisterMoveAction(attacker, currTarget, move, itemId); break; case MOVE_CONSTRICT: case MOVE_BUBBLEBEAM: @@ -820,7 +821,7 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move break; case MOVE_SILVER_WIND: case MOVE_ANCIENTPOWER: - moveHadEffect = sub_8058930(attacker, currTarget, move, itemId); + moveHadEffect = AncientPowerMoveAction(attacker, currTarget, move, itemId); break; case MOVE_PSYBEAM: case MOVE_SIGNAL_BEAM: @@ -828,28 +829,28 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = sub_8058C00(attacker, currTarget, move, itemId); break; case MOVE_MIST_BALL: - moveHadEffect = sub_805B324(attacker, currTarget, move, itemId); + moveHadEffect = MistBallMoveAction(attacker, currTarget, move, itemId); break; case MOVE_LUSTER_PURGE: - moveHadEffect = sub_805B910(attacker, currTarget, move, itemId); + moveHadEffect = LusterPurgeMoveAction(attacker, currTarget, move, itemId); break; case MOVE_CRUSH_CLAW: - moveHadEffect = sub_805AE74(attacker, currTarget, move, itemId); + moveHadEffect = CrushClawMoveAction(attacker, currTarget, move, itemId); break; case MOVE_SMOG: - moveHadEffect = sub_8059540(attacker, currTarget, move, itemId); + moveHadEffect = SmogMoveAction(attacker, currTarget, move, itemId); break; case MOVE_SACRED_FIRE: - moveHadEffect = sub_80595A0(attacker, currTarget, move, itemId); + moveHadEffect = SacredFireMoveAction(attacker, currTarget, move, itemId); break; case MOVE_THUNDERSHOCK: - moveHadEffect = sub_8059D00(attacker, currTarget, move, itemId); + moveHadEffect = ThundershockMoveAction(attacker, currTarget, move, itemId); break; case MOVE_LICK: case MOVE_SPARK: case MOVE_BODY_SLAM: case MOVE_DRAGONBREATH: - moveHadEffect = sub_8058FBC(attacker, currTarget, move, itemId); + moveHadEffect = LickMoveAction(attacker, currTarget, move, itemId); break; case MOVE_EXTRASENSORY: case MOVE_HYPER_FANG: @@ -860,18 +861,18 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move case MOVE_NEEDLE_ARM: case MOVE_STOMP: case MOVE_ROLLING_KICK: - moveHadEffect = sub_8058430(attacker, currTarget, move, itemId); + moveHadEffect = BiteMoveAction(attacker, currTarget, move, itemId); break; case MOVE_HEADBUTT: - moveHadEffect = sub_8059424(attacker, currTarget, move, itemId); + moveHadEffect = HeadbuttMoveAction(attacker, currTarget, move, itemId); break; case MOVE_ROCK_SLIDE: case MOVE_ASTONISH: - moveHadEffect = sub_8057C88(attacker, currTarget, move, itemId); + moveHadEffect = RockSlideMoveAction(attacker, currTarget, move, itemId); break; case MOVE_CRUNCH: case MOVE_SHADOW_BALL: - moveHadEffect = sub_80583D8(attacker, currTarget, move, itemId); + moveHadEffect = CrunchMoveAction(attacker, currTarget, move, itemId); break; case MOVE_DIZZY_PUNCH: case MOVE_WATER_PULSE: @@ -884,29 +885,29 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = sub_8058B84(attacker, currTarget, move, itemId); break; case MOVE_BLAZE_KICK: - moveHadEffect = sub_805AECC(attacker, currTarget, move, itemId); + moveHadEffect = BlazeKickMoveAction(attacker, currTarget, move, itemId); break; case MOVE_ATTRACT: - moveHadEffect = sub_805B454(attacker, currTarget, move, itemId); + moveHadEffect = AttractMoveAction(attacker, currTarget, move, itemId); break; case MOVE_DISABLE: - moveHadEffect = sub_80582C4(attacker, currTarget, move, itemId); + moveHadEffect = DisableMoveAction(attacker, currTarget, move, itemId); break; case MOVE_FAKE_OUT: - moveHadEffect = sub_805A408(attacker, currTarget, move, itemId); + moveHadEffect = FakeOutMoveAction(attacker, currTarget, move, itemId); break; case MOVE_SONICBOOM: moveHadEffect = sub_8059714(attacker, currTarget, move, itemId); break; case MOVE_DRAGON_RAGE: - moveHadEffect = sub_805B808(attacker, currTarget, move, itemId); + moveHadEffect = DragonRageMoveAction(attacker, currTarget, move, itemId); break; case MOVE_STUN_SPORE: - moveHadEffect = sub_8059050(attacker, currTarget, move, itemId); + moveHadEffect = StunSporeMoveAction(attacker, currTarget, move, itemId); break; case MOVE_THUNDER: case MOVE_THUNDERPUNCH: - moveHadEffect = sub_8058478(attacker, currTarget, move, itemId); + moveHadEffect = ThunderMoveAction(attacker, currTarget, move, itemId); break; case MOVE_LOVELY_KISS: case MOVE_SING: @@ -923,49 +924,49 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = sub_8059080(attacker, currTarget, move, itemId); break; case MOVE_BLOCK: - moveHadEffect = sub_8059D98(attacker, currTarget, move, itemId); + moveHadEffect = BlockMoveAction(attacker, currTarget, move, itemId); break; case MOVE_HORN_DRILL: - moveHadEffect = sub_8059AF8(attacker, currTarget, move, itemId); + moveHadEffect = HornDrillMoveAction(attacker, currTarget, move, itemId); break; case MOVE_CONFUSE_RAY: case MOVE_SUPERSONIC: case MOVE_SWEET_KISS: case MOVE_TEETER_DANCE: case MOVE_TOTTER: - moveHadEffect = sub_8059AA8(attacker, currTarget, move, itemId); + moveHadEffect = SupersonicMoveAction(attacker, currTarget, move, itemId); break; case MOVE_POISON_GAS: case MOVE_POISONPOWDER: - moveHadEffect = sub_8059DA4(attacker, currTarget, move, itemId); + moveHadEffect = PoisonGasMoveAction(attacker, currTarget, move, itemId); break; case MOVE_THUNDER_WAVE: - moveHadEffect = sub_8059D48(attacker, currTarget, move, itemId); + moveHadEffect = ThunderWaveMoveAction(attacker, currTarget, move, itemId); break; case MOVE_GLARE: - moveHadEffect = sub_805B028(attacker, currTarget, move, itemId); + moveHadEffect = GlareMoveAction(attacker, currTarget, move, itemId); break; case MOVE_ZAP_CANNON: moveHadEffect = sub_8059D58(attacker, currTarget, move, itemId); break; case MOVE_SUPERPOWER: - moveHadEffect = TickleMoveAction(attacker, currTarget, move, itemId); + moveHadEffect = SuperpowerMoveAction(attacker, currTarget, move, itemId); break; case MOVE_ROCK_TOMB: case MOVE_ICY_WIND: case MOVE_MUD_SHOT: - moveHadEffect = sub_8058638(attacker, currTarget, move, itemId); + moveHadEffect = RockTombMoveAction(attacker, currTarget, move, itemId); break; case MOVE_DYNAMICPUNCH: moveHadEffect = sub_805A688(attacker, currTarget, move, itemId); break; case MOVE_FAKE_TEARS: - moveHadEffect = sub_8057D7C(attacker, currTarget, move, itemId); + moveHadEffect = FakeTearsMoveAction(attacker, currTarget, move, itemId); break; case MOVE_WHIRLWIND: case MOVE_ROAR: case MOVE_BLOWBACK: - moveHadEffect = sub_805B0BC(attacker, currTarget, move, itemId); + moveHadEffect = RoarMoveAction(attacker, currTarget, move, itemId); break; case MOVE_PAIN_SPLIT: moveHadEffect = PainSplitMoveAction(attacker, currTarget, move, itemId); @@ -1014,7 +1015,7 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = sub_8058A7C(attacker, currTarget, move, itemId); break; case MOVE_MUDDY_WATER: - moveHadEffect = sub_80598CC(attacker, currTarget, move, itemId); + moveHadEffect = MuddyWaterMoveAction(attacker, currTarget, move, itemId); break; case MOVE_OCTAZOOKA: moveHadEffect = sub_8057F7C(attacker, currTarget, move, itemId); @@ -1027,7 +1028,7 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move break; case MOVE_SCARY_FACE: case MOVE_COTTON_SPORE: - moveHadEffect = sub_8058BF0(attacker, currTarget, move, itemId); + moveHadEffect = ScaryFaceMoveAction(attacker, currTarget, move, itemId); break; case MOVE_GROWL: moveHadEffect = sub_805A2C8(attacker, currTarget, move, itemId); @@ -1045,10 +1046,10 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move case MOVE_GIGA_DRAIN: case MOVE_LEECH_LIFE: case MOVE_MEGA_DRAIN: - moveHadEffect = sub_80586DC(attacker, currTarget, move, itemId); + moveHadEffect = GigaDrainMoveAction(attacker, currTarget, move, itemId); break; case MOVE_DOUBLE_EDGE: - moveHadEffect = sub_805946C(attacker, currTarget, move, itemId); + moveHadEffect = DoubleEdgeMoveAction(attacker, currTarget, move, itemId); break; case MOVE_SUBMISSION: case MOVE_TAKE_DOWN: @@ -1056,16 +1057,16 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = sub_8058E5C(attacker, currTarget, move, itemId); break; case MOVE_ABSORB: - moveHadEffect = sub_80591E4(attacker, currTarget, move, itemId); + moveHadEffect = AbsorbMoveAction(attacker, currTarget, move, itemId); break; case MOVE_SWAGGER: - moveHadEffect = sub_8057BC4(attacker, currTarget, move, itemId); + moveHadEffect = SwaggerMoveAction(attacker, currTarget, move, itemId); break; case MOVE_TRIPLE_KICK: - moveHadEffect = sub_805A210(attacker, currTarget, move, itemId); + moveHadEffect = TripleKickMoveAction(attacker, currTarget, move, itemId); break; case MOVE_TWINEEDLE: - moveHadEffect = sub_8059988(attacker, currTarget, move, itemId); + moveHadEffect = TwineedleMoveAction(attacker, currTarget, move, itemId); break; case MOVE_SOLARBEAM: moveHadEffect = SolarBeamMoveAction(attacker, currTarget, move, itemId); @@ -1078,7 +1079,7 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move break; case MOVE_OUTRAGE: case MOVE_PETAL_DANCE: - moveHadEffect = sub_80588B8(attacker, currTarget, move, itemId); + moveHadEffect = OutrageMoveAction(attacker, currTarget, move, itemId); break; case MOVE_WRAP: moveHadEffect = WrapMoveAction(attacker, currTarget, move, itemId); @@ -1087,7 +1088,7 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = sub_8058D38(attacker, currTarget, move, itemId); break; case MOVE_POISON_FANG: - moveHadEffect = sub_8059DC4(attacker, currTarget, move, itemId); + moveHadEffect = PoisonFangMoveAction(attacker, currTarget, move, itemId); break; case MOVE_PRESENT: moveHadEffect = PresentMoveAction(attacker, currTarget, move, itemId); @@ -1135,7 +1136,7 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = ScannerOrbAction(attacker, currTarget, move, itemId); break; case MOVE_TRICK: - moveHadEffect = sub_805A120(attacker, currTarget, move, itemId); + moveHadEffect = TrickMoveAction(attacker, currTarget, move, itemId); break; case MOVE_TAKEAWAY: moveHadEffect = sub_805BA50(attacker, currTarget, move, itemId); @@ -1172,10 +1173,10 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = sub_8059FC8(attacker, currTarget, move, itemId, 0); break; case MOVE_BLAST_BURN: - moveHadEffect = sub_805AE3C(attacker, currTarget, move, itemId); + moveHadEffect = BlastBurnMoveAction(attacker, currTarget, move, itemId); break; case MOVE_HIDDEN_POWER: - moveHadEffect = sub_805B3E0(attacker, currTarget, move, itemId); + moveHadEffect = HiddenPowerMoveAction(attacker, currTarget, move, itemId); break; case MOVE_RAZOR_WIND: moveHadEffect = RazorWindMoveAction(attacker, currTarget, move, itemId); @@ -1200,11 +1201,11 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = MudWaterSportMoveAction(attacker, currTarget, move, itemId); break; case MOVE_IRON_TAIL: - moveHadEffect = sub_8057634(attacker, currTarget, move, itemId); + moveHadEffect = IronTailMoveAction(attacker, currTarget, move, itemId); break; case MOVE_TAIL_WHIP: case MOVE_LEER: - moveHadEffect = sub_805A3DC(attacker, currTarget, move, itemId); + moveHadEffect = LeerMoveAction(attacker, currTarget, move, itemId); break; case MOVE_WILL_O_WISP: moveHadEffect = sub_8057FF4(attacker, currTarget, move, itemId); @@ -1236,10 +1237,10 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = sub_805BC70(attacker, currTarget, move, itemId); break; case MOVE_SMELLINGSALT: - moveHadEffect = sub_80587E8(attacker, currTarget, move, itemId); + moveHadEffect = SmellingSaltMoveAction(attacker, currTarget, move, itemId); break; case MOVE_MAGNITUDE: - moveHadEffect = sub_805B264(attacker, currTarget, move, itemId); + moveHadEffect = MagnitudeMoveAction(attacker, currTarget, move, itemId); break; case MOVE_SKULL_BASH: moveHadEffect = SkullBashMoveAction(attacker, currTarget, move, itemId); @@ -1248,10 +1249,10 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = WishMoveAction(attacker, currTarget, move, itemId); break; case MOVE_FLATTER: - moveHadEffect = sub_8057FCC(attacker, currTarget, move, itemId); + moveHadEffect = FlatterMoveAction(attacker, currTarget, move, itemId); break; case MOVE_MUD_SLAP: - moveHadEffect = sub_805A258(attacker, currTarget, move, itemId); + moveHadEffect = MudSlapMoveAction(attacker, currTarget, move, itemId); break; case MOVE_SAND_ATTACK: case MOVE_KINESIS: @@ -1262,32 +1263,32 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = sub_8057E6C(attacker, currTarget, move, itemId); break; case MOVE_TOXIC: - moveHadEffect = sub_8059DB4(attacker, currTarget, move, itemId); + moveHadEffect = ToxicMoveAction(attacker, currTarget, move, itemId); break; case MOVE_METAL_SOUND: - moveHadEffect = sub_8058838(attacker, currTarget, move, itemId); + moveHadEffect = MetalSoundMoveAction(attacker, currTarget, move, itemId); break; case MOVE_TORMENT: moveHadEffect = TormentMoveAction(attacker, currTarget, move, itemId); break; case MOVE_SUPER_FANG: - moveHadEffect = sub_8057974(attacker, currTarget, move, itemId); + moveHadEffect = SuperFangMoveAction(attacker, currTarget, move, itemId); break; case MOVE_FALSE_SWIPE: - moveHadEffect = sub_805B388(attacker, currTarget, move, itemId); + moveHadEffect = FalseSwipeMoveAction(attacker, currTarget, move, itemId); break; case MOVE_TWO_EDGE: moveHadEffect = sub_805BC98(attacker, currTarget, move, itemId); break; case MOVE_ENDEAVOR: - moveHadEffect = sub_80584C0(attacker, currTarget, move, itemId); + moveHadEffect = EndeavorMoveAction(attacker, currTarget, move, itemId); break; case MOVE_BATON_PASS: case MOVE_SWITCHER: moveHadEffect = sub_805BB74(attacker, currTarget, move, itemId); break; case MOVE_DREAM_EATER: - moveHadEffect = sub_805B668(attacker, currTarget, move, itemId); + moveHadEffect = DreamEaterMoveAction(attacker, currTarget, move, itemId); break; case MOVE_SEARCHLIGHT: moveHadEffect = LuminousOrbAction(attacker, currTarget, move, itemId); @@ -1378,14 +1379,14 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = ProtectMoveAction(attacker, currTarget, move, itemId); break; case MOVE_TAUNT: - moveHadEffect = sub_8059AB8(attacker, currTarget, move, itemId); + moveHadEffect = TauntMoveAction(attacker, currTarget, move, itemId); break; case MOVE_TICKLE: - moveHadEffect = sub_8058858(attacker, currTarget, move, itemId); + moveHadEffect = TickleMoveAction(attacker, currTarget, move, itemId); break; case MOVE_REVERSAL: case MOVE_FLAIL: - moveHadEffect = sub_8058770(attacker, currTarget, move, itemId); + moveHadEffect = ReversalMoveAction(attacker, currTarget, move, itemId); break; case MOVE_SELFDESTRUCT: moveHadEffect = sub_8059004(attacker, currTarget, move, itemId); @@ -1397,16 +1398,16 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = ChargeMoveAction(attacker, currTarget, move, itemId); break; case MOVE_FACADE: - moveHadEffect = sub_8058548(attacker, currTarget, move, itemId); + moveHadEffect = FacadeMoveAction(attacker, currTarget, move, itemId); break; case MOVE_LOW_KICK: - moveHadEffect = sub_80588F4(attacker, currTarget, move, itemId); + moveHadEffect = LowKickMoveAction(attacker, currTarget, move, itemId); break; case MOVE_WATER_SPOUT: moveHadEffect = sub_8058D44(attacker, currTarget, move, itemId); break; case MOVE_ERUPTION: - moveHadEffect = sub_805AFA4(attacker, currTarget, move, itemId); + moveHadEffect = EruptionMoveAction(attacker, currTarget, move, itemId); break; case MOVE_SMOKESCREEN: moveHadEffect = SmokescreenMoveAction(attacker, currTarget, move, itemId); @@ -1427,7 +1428,7 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = RainDanceMoveAction(attacker, currTarget, move, itemId); break; case MOVE_SPITE: - moveHadEffect = sub_8057D9C(attacker, currTarget, move, itemId); + moveHadEffect = SpiteMoveAction(attacker, currTarget, move, itemId); break; case MOVE_INVISIFY: moveHadEffect = InvisifyOrbAction(attacker, currTarget, move, itemId); @@ -1439,7 +1440,7 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = PerishSongMoveAction(attacker, currTarget, move, itemId); break; case MOVE_RAPID_SPIN: - moveHadEffect = sub_8058A18(attacker, currTarget, move, itemId); + moveHadEffect = RapidSpinMoveAction(attacker, currTarget, move, itemId); break; case MOVE_DESTINY_BOND: moveHadEffect = DestinyBondMoveAction(attacker, currTarget, move, itemId); @@ -1454,7 +1455,7 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = SunnyDayMoveAction(attacker, currTarget, move, itemId); break; case MOVE_PAY_DAY: - moveHadEffect = sub_805A464(attacker, currTarget, move, itemId); + moveHadEffect = PayDayMoveAction(attacker, currTarget, move, itemId); break; case MOVE_ONE_ROOM: moveHadEffect = sub_805C2A0(attacker, currTarget, move, itemId); @@ -1472,7 +1473,7 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = sub_805C288(attacker, currTarget, move, itemId); break; case MOVE_CHARM: - moveHadEffect = sub_805783C(attacker, currTarget, move, itemId); + moveHadEffect = CharmMoveAction(attacker, currTarget, move, itemId); break; case MOVE_BUBBLE: moveHadEffect = sub_80578FC(attacker, currTarget, move, itemId); @@ -1507,7 +1508,7 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = sub_805BB98(attacker, currTarget, move, itemId); break; case MOVE_BEAT_UP: - moveHadEffect = sub_805AD54(attacker, currTarget, move, itemId); + moveHadEffect = BeatUpMoveAction(attacker, currTarget, move, itemId); break; case MOVE_REBOUND: moveHadEffect = ReboundOrbAction(attacker, currTarget, move, itemId); @@ -1553,7 +1554,7 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = CleanseOrbAction(attacker, currTarget, move, itemId); break; case MOVE_RETURN: - moveHadEffect = sub_805805C(attacker, currTarget, move, itemId); + moveHadEffect = ReturnMoveAction(attacker, currTarget, move, itemId); break; case MOVE_SNATCH: moveHadEffect = SnatchMoveAction(attacker, currTarget, move, itemId); @@ -1562,7 +1563,7 @@ static void UseMoveAgainstTargets(Entity **targetsArray, Entity *attacker, Move moveHadEffect = HandleColorChange(attacker, currTarget, move, itemId); break; case MOVE_FRUSTRATION: - moveHadEffect = sub_805B53C(attacker, currTarget, move, itemId); + moveHadEffect = FrustrationMoveAction(attacker, currTarget, move, itemId); break; case MOVE_PSYCH_UP: moveHadEffect = PsychUpMoveAction(attacker, currTarget, move, itemId); diff --git a/src/move_actions.c b/src/move_actions.c index fbb367301..7d8af954d 100644 --- a/src/move_actions.c +++ b/src/move_actions.c @@ -273,7 +273,7 @@ u8 ToItemID(u32 itemID) return itemID; } -bool8 sub_8057634(Entity *pokemon, Entity *target, Move *move, s32 param_4) +bool8 IronTailMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4) { bool8 flag; @@ -360,7 +360,7 @@ bool32 sub_8057824(Entity *pokemon, Entity *target, Move *move, s32 param_4) return TRUE; } -bool32 sub_805783C(Entity *pokemon, Entity *target, Move *move, s32 param_4) +bool32 CharmMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4) { ChangeAttackMultiplierTarget(pokemon,target,gUnknown_8106A4C,FloatToF248(0.5),TRUE); return TRUE; @@ -419,7 +419,7 @@ bool32 RageMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4) return TRUE; } -bool32 sub_8057974(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool32 SuperFangMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { s32 newHP; bool8 local_24; @@ -524,7 +524,7 @@ bool8 sub_8057BB4(Entity *pokemon, Entity *target, Move *move, s32 param_4) return TRUE; } -bool8 sub_8057BC4(Entity *pokemon, Entity *target, Move *move, s32 param_4) +bool8 SwaggerMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4) { ConfuseStatusTarget(pokemon, target, TRUE); RaiseAttackStageTarget(pokemon, target, gUnknown_8106A4C, 2); @@ -556,7 +556,7 @@ bool8 sub_8057C68(Entity *pokemon, Entity *target, Move *move, s32 param_4) return TRUE; } -bool8 sub_8057C88(Entity *pokemon, Entity *target, Move * move, u32 param_4) +bool8 RockSlideMoveAction(Entity *pokemon, Entity *target, Move * move, u32 param_4) { bool8 flag; @@ -605,13 +605,13 @@ bool8 WhirlpoolMoveAction(Entity * pokemon, Entity * target, Move * move, u32 pa return flag; } -bool8 sub_8057D7C(Entity * pokemon, Entity * target, Move *move, s32 param_4) +bool8 FakeTearsMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param_4) { LowerDefenseStageTarget(pokemon, target, gUnknown_8106A50, 2, 1, TRUE); return TRUE; } -bool8 sub_8057D9C(Entity * pokemon, Entity * target, Move *move, s32 param_4) +bool8 SpiteMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param_4) { s32 i; EntityInfo *targetInfo = GetEntInfo(target); @@ -714,7 +714,7 @@ bool8 sub_8057F7C(Entity *pokemon, Entity *target, Move *move, u32 param_4) return flag; } -bool8 sub_8057FCC(Entity *pokemon, Entity *target, Move *move, s32 param_4) +bool8 FlatterMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4) { ConfuseStatusTarget(pokemon, target, TRUE); RaiseAttackStageTarget(pokemon, target, gUnknown_8106A50, 1); @@ -744,7 +744,7 @@ bool8 sub_8057FF4(Entity *pokemon, Entity *target, Move *move, s32 param_4) return TRUE; } -bool8 sub_805805C(Entity * pokemon,Entity * target,Move * move,s32 param_4) +bool8 ReturnMoveAction(Entity * pokemon,Entity * target,Move * move,s32 param_4) { s16 *psVar3; s32 index; @@ -799,7 +799,7 @@ bool8 CounterMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4 return TRUE; } -bool8 sub_805816C(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 FlameWheelMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag; @@ -845,7 +845,7 @@ bool8 sub_805825C(Entity *pokemon, Entity *target, Move *move, u32 param_4) return TRUE; } -bool8 sub_8058270(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 GustMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag; u32 r3; @@ -865,7 +865,7 @@ bool8 sub_80582AC(Entity *pokemon, Entity *target, Move *move, u32 param_4) return TRUE; } -bool8 sub_80582C4(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 DisableMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { ParalyzeStatusTarget(pokemon, target, TRUE); return TRUE; @@ -914,7 +914,7 @@ bool8 sub_805836C(Entity *pokemon, Entity *target, Move *move, u32 param_4) return local_18; } -bool8 sub_80583D8(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 CrunchMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag; @@ -929,7 +929,7 @@ bool8 sub_80583D8(Entity *pokemon, Entity *target, Move *move, u32 param_4) return flag; } -bool8 sub_8058430(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 BiteMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag; @@ -944,7 +944,7 @@ bool8 sub_8058430(Entity *pokemon, Entity *target, Move *move, u32 param_4) return flag; } -bool8 sub_8058478(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 ThunderMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag; @@ -959,7 +959,7 @@ bool8 sub_8058478(Entity *pokemon, Entity *target, Move *move, u32 param_4) return flag; } -bool8 sub_80584C0(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 EndeavorMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { s32 diffHP; bool8 local_24; @@ -980,7 +980,7 @@ bool8 sub_80584C0(Entity *pokemon, Entity *target, Move *move, u32 param_4) return local_24; } -bool8 sub_8058548(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 FacadeMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag; u32 r5; @@ -1022,7 +1022,7 @@ bool8 BrickBreakMoveAction(Entity *pokemon, Entity *target, Move *move, u32 para return flag; } -bool8 sub_8058638(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 RockTombMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag; @@ -1052,7 +1052,7 @@ bool8 FocusPunchMoveAction(Entity * pokemon, Entity * target, Move * move, u32 p return flag; } -bool8 sub_80586DC(Entity * pokemon, Entity * target, Move * move, u32 param_4) +bool8 GigaDrainMoveAction(Entity * pokemon, Entity * target, Move * move, u32 param_4) { bool8 hasLiquidOoze; s32 uVar3; @@ -1083,7 +1083,7 @@ bool8 sub_80586DC(Entity * pokemon, Entity * target, Move * move, u32 param_4) // NOTE: almost the same as sub_8058D44 and sub_805AFA4 in status_actions.c -bool8 sub_8058770(Entity * pokemon, Entity * target, Move * move, u32 param_4) +bool8 ReversalMoveAction(Entity * pokemon, Entity * target, Move * move, u32 param_4) { s32 index; bool8 flag; @@ -1106,7 +1106,7 @@ bool8 sub_8058770(Entity * pokemon, Entity * target, Move * move, u32 param_4) return flag; } -bool8 sub_80587E8(Entity * pokemon, Entity * target, Move * move, u32 param_4) +bool8 SmellingSaltMoveAction(Entity * pokemon, Entity * target, Move * move, u32 param_4) { bool8 flag; @@ -1120,13 +1120,13 @@ bool8 sub_80587E8(Entity * pokemon, Entity * target, Move * move, u32 param_4) return flag; } -bool8 sub_8058838(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 MetalSoundMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { LowerDefenseStageTarget(pokemon, target, gUnknown_8106A50, 3, 1, TRUE); return TRUE; } -bool8 sub_8058858(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 TickleMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { s32 index = gUnknown_8106A4C; LowerAttackStageTarget(pokemon, target, index, 1, 1, TRUE); @@ -1146,7 +1146,7 @@ bool8 sub_80588A8(Entity *pokemon, Entity *target, Move *move, u32 param_4) return TRUE; } -bool8 sub_80588B8(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 OutrageMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag = FALSE; if(HandleDamagingMove(pokemon, target, move, 0x80 << 1, param_4) != 0) @@ -1160,7 +1160,7 @@ bool8 sub_80588B8(Entity *pokemon, Entity *target, Move *move, u32 param_4) return flag; } -bool8 sub_80588F4(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 LowKickMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag; EntityInfo *entityInfo = GetEntInfo(target); @@ -1170,7 +1170,7 @@ bool8 sub_80588F4(Entity *pokemon, Entity *target, Move *move, u32 param_4) } -bool8 sub_8058930(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 AncientPowerMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag = FALSE; EntityInfo *entityInfo; @@ -1207,7 +1207,7 @@ bool8 sub_8058A08(Entity *pokemon, Entity *target, Move *move, u32 param_4) return TRUE; } -bool8 sub_8058A18(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 RapidSpinMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag = FALSE; if(HandleDamagingMove(pokemon, target, move, 0x80 << 1, param_4) != 0) @@ -1293,7 +1293,7 @@ bool8 EndureMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) return TRUE; } -bool8 sub_8058BF0(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 ScaryFaceMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { LowerMovementSpeedTarget(pokemon, target, 1, TRUE); return TRUE; @@ -1484,7 +1484,7 @@ bool8 NaturePowerMoveAction(Entity *pokemon, Entity *target, Move *move, s32 par return flag; } -bool8 sub_8058FBC(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 LickMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag; @@ -1505,7 +1505,7 @@ bool8 sub_8059004(Entity *pokemon, Entity *target, Move *move, u32 param_4) return TRUE; } -bool8 sub_8059050(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 StunSporeMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { ParalyzeStatusTarget(pokemon, target, TRUE); return TRUE; @@ -1538,7 +1538,7 @@ bool8 MistMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) return TRUE; } -bool8 sub_80590D4(Entity *pokemon, Entity *target, Move *move, s32 param_4) +bool8 FissureMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4) { u8 moveType; bool8 uVar5; @@ -1583,7 +1583,7 @@ bool8 SafeguardMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param return TRUE; } -bool8 sub_80591E4(Entity *pokemon, Entity *target, Move *move, s32 param_4) +bool8 AbsorbMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4) { bool8 hasLiquidOoze; s32 iVar3; @@ -1685,7 +1685,7 @@ bool32 SketchMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4 return ret; } -bool8 sub_8059424(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 HeadbuttMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag; @@ -1700,7 +1700,7 @@ bool8 sub_8059424(Entity *pokemon, Entity *target, Move *move, u32 param_4) return flag; } -bool8 sub_805946C(Entity * pokemon,Entity * target,Move * move,u32 param_4) +bool8 DoubleEdgeMoveAction(Entity * pokemon,Entity * target,Move * move,u32 param_4) { s32 HP; bool8 flag; @@ -1740,7 +1740,7 @@ bool8 sub_8059528(Entity *pokemon, Entity *target, Move *move, u32 param_4) return TRUE; } -bool8 sub_8059540(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 SmogMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag; @@ -1761,7 +1761,7 @@ bool8 sub_8059588(Entity *pokemon, Entity *target, Move *move, u32 param_4) return TRUE; } -bool8 sub_80595A0(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 SacredFireMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag; @@ -1867,7 +1867,7 @@ bool8 DiveMoveAction(Entity * pokemon, Entity * target, Move * move, u32 param_4 return flag; } -bool8 sub_80598CC(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 MuddyWaterMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag; @@ -1888,7 +1888,7 @@ bool8 StockpileMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param return TRUE; } -bool8 sub_8059928(Entity * pokemon,Entity * target,Move * move,u32 param_4) +bool8 TwisterMoveAction(Entity * pokemon,Entity * target,Move * move,u32 param_4) { bool8 flag; s32 iVar2; @@ -1908,7 +1908,7 @@ bool8 sub_8059928(Entity * pokemon,Entity * target,Move * move,u32 param_4) return flag; } -bool8 sub_8059988(Entity * pokemon,Entity * target,Move * move,u32 param_4) +bool8 TwineedleMoveAction(Entity * pokemon,Entity * target,Move * move,u32 param_4) { bool8 flag; @@ -1953,13 +1953,13 @@ bool8 sub_8059A2C(Entity * pokemon,Entity * target,Move * move,u32 param_4) return local_20; } -bool8 sub_8059AA8(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 SupersonicMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { ConfuseStatusTarget(pokemon, target, TRUE); return TRUE; } -bool8 sub_8059AB8(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 TauntMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { TauntStatusTarget(pokemon, target); return TRUE; @@ -1971,7 +1971,7 @@ bool8 sub_8059AC4(Entity *pokemon, Entity *target, Move *move, u32 param_4) return TRUE; } -bool8 sub_8059AF8(Entity * pokemon,Entity * target,Move * move,u32 param_4) +bool8 HornDrillMoveAction(Entity * pokemon,Entity * target,Move * move,u32 param_4) { u8 local_20; @@ -2071,7 +2071,7 @@ bool8 sub_8059CF0(Entity *pokemon, Entity *target, Move *move, u32 param_4) return TRUE; } -bool8 sub_8059D00(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 ThundershockMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag; @@ -2086,7 +2086,7 @@ bool8 sub_8059D00(Entity *pokemon, Entity *target, Move *move, u32 param_4) return flag; } -bool8 sub_8059D48(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 ThunderWaveMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { ParalyzeStatusTarget(pokemon, target, TRUE); return TRUE; @@ -2107,25 +2107,25 @@ bool8 sub_8059D58(Entity *pokemon, Entity *target, Move *move, u32 param_4) return flag; } -bool8 sub_8059D98(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 BlockMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { ImmobilizedStatusTarget(pokemon, target); return TRUE; } -bool8 sub_8059DA4(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 PoisonGasMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { PoisonedStatusTarget(pokemon, target, TRUE); return TRUE; } -bool8 sub_8059DB4(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 ToxicMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { BadlyPoisonedStatusTarget(pokemon, target, TRUE); return TRUE; } -bool8 sub_8059DC4(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 PoisonFangMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag; @@ -2140,7 +2140,7 @@ bool8 sub_8059DC4(Entity *pokemon, Entity *target, Move *move, u32 param_4) return flag; } -bool8 sub_8059E0C(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 PoisonStingMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag; @@ -2262,7 +2262,7 @@ bool8 TriAttackMoveAction(Entity * pokemon, Entity * target, Move *move, u32 par return flag; } -bool8 sub_805A120(Entity * pokemon,Entity * target, Move *move, u32 param_4) +bool8 TrickMoveAction(Entity * pokemon,Entity * target, Move *move, u32 param_4) { EntityInfo *r9; EntityInfo *r8; @@ -2318,7 +2318,7 @@ bool8 sub_805A120(Entity * pokemon,Entity * target, Move *move, u32 param_4) } } -bool8 sub_805A210(Entity * pokemon, Entity * target, Move *move, u32 param_4) +bool8 TripleKickMoveAction(Entity * pokemon, Entity * target, Move *move, u32 param_4) { bool8 flag; @@ -2341,7 +2341,7 @@ bool8 MudWaterSportMoveAction(Entity * pokemon, Entity * target, Move *move, u32 } -bool8 sub_805A258(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 MudSlapMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag; @@ -2423,7 +2423,7 @@ bool8 SunnyDayMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_ return TRUE; } -bool8 sub_805A3DC(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 LeerMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { LowerDefenseStageTarget(pokemon, target, gUnknown_8106A4C, 1, 1, TRUE); return TRUE; @@ -2435,7 +2435,7 @@ bool8 WishMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) return TRUE; } -bool8 sub_805A408(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 FakeOutMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag; @@ -2456,7 +2456,7 @@ bool8 sub_805A450(Entity *pokemon, Entity *target, Move *move, u32 param_4) return FALSE; } -bool8 sub_805A464(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 PayDayMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool32 flag; Item item; @@ -2469,7 +2469,7 @@ bool8 sub_805A464(Entity *pokemon, Entity *target, Move *move, u32 param_4) if (!EntityExists(target)) { pos.x = 0; pos.y = 0; - sub_8045C28(&item,0x69,2); + sub_8045C28(&item,ITEM_POKE,2); sub_805A7D4(pokemon,target,&item,&pos); } } @@ -2524,7 +2524,7 @@ bool8 sub_805A568(Entity * pokemon, Entity * target, Move *move, u32 param_4) return flag; } -bool8 TickleMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 SuperpowerMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { u32 stat; bool32 flag; @@ -2865,7 +2865,7 @@ bool8 sub_805AD34(Entity *pokemon, Entity *target, Move *move, u32 param_4) return TRUE; } -bool32 sub_805AD54(Entity * pokemon, Entity * target, Move *move, u32 param_4) +bool32 BeatUpMoveAction(Entity * pokemon, Entity * target, Move *move, u32 param_4) { s32 numPossibleTargets; s32 i; @@ -2903,7 +2903,7 @@ bool32 sub_805AD54(Entity * pokemon, Entity * target, Move *move, u32 param_4) return flag; } -bool8 sub_805AE3C(Entity *pokemon, Entity *target, Move *move, u32 param_4) +bool8 BlastBurnMoveAction(Entity *pokemon, Entity *target, Move *move, u32 param_4) { bool8 flag; @@ -2912,7 +2912,7 @@ bool8 sub_805AE3C(Entity *pokemon, Entity *target, Move *move, u32 param_4) return flag; } -bool8 sub_805AE74(Entity * pokemon, Entity * target, Move *move, u32 param_4) +bool8 CrushClawMoveAction(Entity * pokemon, Entity * target, Move *move, u32 param_4) { bool8 flag; @@ -2926,7 +2926,7 @@ bool8 sub_805AE74(Entity * pokemon, Entity * target, Move *move, u32 param_4) return flag; } -bool8 sub_805AECC(Entity * pokemon, Entity * target, Move *move, u32 param_4) +bool8 BlazeKickMoveAction(Entity * pokemon, Entity * target, Move *move, u32 param_4) { bool8 flag; diff --git a/src/status_actions.c b/src/status_actions.c index 82c782218..da66f23ee 100644 --- a/src/status_actions.c +++ b/src/status_actions.c @@ -143,7 +143,7 @@ extern u8 *gUnknown_80FEFF4[]; extern u32 gUnknown_80F51C4[]; -bool8 sub_805AFA4(Entity * pokemon, Entity * target, Move *move, u32 param_4) +bool8 EruptionMoveAction(Entity * pokemon, Entity * target, Move *move, u32 param_4) { EntityInfo *entityInfo; s32 maxHp; @@ -170,7 +170,7 @@ bool8 sub_805AFA4(Entity * pokemon, Entity * target, Move *move, u32 param_4) return flag; } -bool8 sub_805B028(Entity * pokemon,Entity * target,Move *move) +bool8 GlareMoveAction(Entity * pokemon,Entity * target,Move *move) { ParalyzeStatusTarget(pokemon,target, TRUE); return TRUE; @@ -189,7 +189,7 @@ bool8 TransformMoveAction(Entity * pokemon, Entity * target, Move *move, s32 par } } -bool8 sub_805B074(Entity * pokemon, Entity * target, Move *move, s32 param_4) +bool8 PoisonTailMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param_4) { bool8 flag; @@ -203,7 +203,7 @@ bool8 sub_805B074(Entity * pokemon, Entity * target, Move *move, s32 param_4) return flag; } -bool8 sub_805B0BC(Entity * pokemon, Entity * target) +bool8 RoarMoveAction(Entity * pokemon, Entity * target) { sub_807CD9C(pokemon, target, GetEntInfo(pokemon)->action.direction); return TRUE; @@ -300,7 +300,7 @@ bool8 SpikesMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param_ return trapLaid; } -bool8 sub_805B264(Entity * pokemon, Entity * target, Move *move, s32 param_4) +bool8 MagnitudeMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param_4) { s32 r3; bool8 r6; @@ -345,7 +345,7 @@ bool8 sub_805B314(Entity * pokemon,Entity * target,Move *move, s32 param_4) return TRUE; } -bool8 sub_805B324(Entity * pokemon,Entity * target,Move *move, s32 param_4) +bool8 MistBallMoveAction(Entity * pokemon,Entity * target,Move *move, s32 param_4) { bool8 flag; @@ -365,7 +365,7 @@ bool8 DestinyBondMoveAction(Entity * pokemon,Entity * target,Move *move, s32 par return TRUE; } -bool8 sub_805B388(Entity * pokemon,Entity * target,Move *move, s32 param_4) +bool8 FalseSwipeMoveAction(Entity * pokemon,Entity * target,Move *move, s32 param_4) { return (HandleDamagingMove(pokemon,target,move,0x100,param_4)) ? TRUE : FALSE; } @@ -384,7 +384,7 @@ bool8 sub_805B3B4(Entity * pokemon,Entity * target,Move *move, s32 param_4) return TRUE; } -bool8 sub_805B3E0(Entity * pokemon,Entity * target,Move *move, s32 param_4) +bool8 HiddenPowerMoveAction(Entity * pokemon,Entity * target,Move *move, s32 param_4) { HandleDamagingMove(pokemon,target,move,0x100,param_4); return TRUE; @@ -407,7 +407,7 @@ bool8 sub_805B3FC(Entity * pokemon,Entity * target,Move *move, s32 param_4, s32 return flag; } -bool8 sub_805B454(Entity * pokemon, Entity * target, Move *move, s32 param_4) +bool8 AttractMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param_4) { InfatuateStatusTarget(pokemon, target, TRUE); return TRUE; @@ -450,7 +450,7 @@ bool8 MimicMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param_4 return mimicSuccess; } -bool8 sub_805B53C(Entity * pokemon, Entity * target, Move *move, s32 param_4) +bool8 FrustrationMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param_4) { s16 *r1; s32 index; @@ -499,7 +499,7 @@ bool8 sub_805B618(Entity * pokemon, Entity * target, Move *move, s32 param_4) return flag; } -bool8 sub_805B668(Entity * pokemon, Entity * target, Move *move, s32 param_4) +bool8 DreamEaterMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param_4) { bool8 hasLiquidOoze; s32 iVar3; @@ -580,7 +580,7 @@ bool8 ReflectMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param return TRUE; } -bool8 sub_805B808(Entity * pokemon, Entity * target, Move *move, s32 param_4) +bool8 DragonRageMoveAction(Entity * pokemon, Entity * target, Move *move, s32 param_4) { u8 local_20; @@ -612,7 +612,7 @@ bool8 SkullBashMoveAction(Entity * pokemon, Entity * target, Move * move, s32 pa return flag; } -bool8 sub_805B910(Entity * pokemon, Entity * target, Move * move, s32 param_4) +bool8 LusterPurgeMoveAction(Entity * pokemon, Entity * target, Move * move, s32 param_4) { bool8 flag;