From 9fb073ca2326f55bc601816cbd57d11d83750ec9 Mon Sep 17 00:00:00 2001 From: Eduardo Alvaro Quezada D'Ottone Date: Sat, 27 Jun 2020 05:21:13 -0400 Subject: [PATCH] Some cleanup (#454) * Toxic Thread doesn't have power. * Added missing commas. * Autotomize typo. It wasn't until today that I learned that autotomize was a word. --- asm/macros/battle_script.inc | 4 ++-- data/battle_ai_scripts.s | 4 ++-- data/battle_scripts_1.s | 20 ++++++++++---------- include/battle.h | 2 +- include/constants/battle_move_effects.h | 2 +- include/constants/battle_script_commands.h | 2 +- src/battle_script_commands.c | 4 ++-- src/battle_util.c | 2 +- src/data/battle_moves.h | 8 ++++---- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index a6a611b4b6..8dcc64f39f 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1562,8 +1562,8 @@ .4byte \ptr .endm - .macro tryautonomize battler:req, ptr:req - various \battler, VARIOUS_TRY_AUTONOMIZE + .macro tryautotomize battler:req, ptr:req + various \battler, VARIOUS_TRY_AUTOTOMIZE .4byte \ptr .endm diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index f3cfe95caf..4ba7ca7624 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -247,7 +247,7 @@ AI_CheckBadMove_CheckEffect: @ 82DC045 if_effect EFFECT_PSYCHO_SHIFT, AI_CBM_PsychicShift if_effect EFFECT_DEFOG, AI_CBM_Defog if_effect EFFECT_SYNCHRONOISE, AI_CBM_Synchronoise - if_effect EFFECT_AUTONOMIZE, AI_CBM_SpeedUp + if_effect EFFECT_AUTOTOMIZE, AI_CBM_SpeedUp if_effect EFFECT_TOXIC_THREAD, AI_CBM_ToxicThread if_effect EFFECT_VENOM_DRENCH, AI_CBM_VenomDrench if_effect EFFECT_DEFENSE_UP_3, AI_CBM_DefenseUp @@ -3477,7 +3477,7 @@ AI_SetupFirstTurn_SetupEffectsToEncourage: .2byte EFFECT_BULK_UP .2byte EFFECT_CALM_MIND .2byte EFFECT_ACUPRESSURE - .2byte EFFECT_AUTONOMIZE + .2byte EFFECT_AUTOTOMIZE .2byte EFFECT_SHIFT_GEAR .2byte EFFECT_SHELL_SMASH .2byte EFFECT_GROWTH diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index bd3748b21a..e5c8f18b58 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -317,7 +317,7 @@ gBattleScriptsForMoveEffects:: @ 82D86A8 .4byte BattleScript_EffectFinalGambit .4byte BattleScript_EffectTechnoBlast .4byte BattleScript_EffectJudgment - .4byte BattleScript_EffectAutonomize + .4byte BattleScript_EffectAutotomize .4byte BattleScript_EffectCopycat .4byte BattleScript_EffectDefog .4byte BattleScript_EffectHitEnemyHealAlly @@ -1039,27 +1039,27 @@ BattleScript_EffectInstruct: setbyte sB_ANIM_TARGETS_HIT, 0x0 jumptocalledmove TRUE -BattleScript_EffectAutonomize: +BattleScript_EffectAutotomize: setstatchanger STAT_SPEED, 2, FALSE attackcanceler attackstring ppreduce - statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AutonomizeWeightLoss - jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_AutonomizeAttackAnim + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AutotomizeWeightLoss + jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_AutotomizeAttackAnim pause 0x20 - goto BattleScript_AutonomizePrintString -BattleScript_AutonomizeAttackAnim:: + goto BattleScript_AutotomizePrintString +BattleScript_AutotomizeAttackAnim:: attackanimation waitanimation -BattleScript_AutonomizeDoAnim:: +BattleScript_AutotomizeDoAnim:: setgraphicalstatchangevalues playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 -BattleScript_AutonomizePrintString:: +BattleScript_AutotomizePrintString:: printfromtable gStatUpStringIds waitmessage 0x40 -BattleScript_AutonomizeWeightLoss:: +BattleScript_AutotomizeWeightLoss:: jumpifmovehadnoeffect BattleScript_MoveEnd - tryautonomize BS_ATTACKER, BattleScript_MoveEnd + tryautotomize BS_ATTACKER, BattleScript_MoveEnd printstring STRINGID_BECAMENIMBLE waitmessage 0x40 goto BattleScript_MoveEnd diff --git a/include/battle.h b/include/battle.h index a9c9516c89..520b4c136d 100644 --- a/include/battle.h +++ b/include/battle.h @@ -107,7 +107,7 @@ struct DisableStruct u8 truantSwitchInHack:1; u8 mimickedMoves:4; u8 rechargeTimer; - u8 autonomizeCount; + u8 autotomizeCount; u8 slowStartTimer; u8 embargoTimer; u8 magnetRiseTimer; diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index 7b19d1eb71..abdd193771 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -304,7 +304,7 @@ #define EFFECT_FINAL_GAMBIT 298 #define EFFECT_TECHNO_BLAST 299 #define EFFECT_JUDGMENT 300 -#define EFFECT_AUTONOMIZE 301 +#define EFFECT_AUTOTOMIZE 301 #define EFFECT_COPYCAT 302 #define EFFECT_DEFOG 303 #define EFFECT_HIT_ENEMY_HEAL_ALLY 304 // Pollen Puff diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index 764d0d422d..364aad8e5d 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -115,7 +115,7 @@ #define VARIOUS_TRY_LAST_RESORT 52 #define VARIOUS_ARGUMENT_STATUS_EFFECT 53 #define VARIOUS_TRY_HIT_SWITCH_TARGET 54 -#define VARIOUS_TRY_AUTONOMIZE 55 +#define VARIOUS_TRY_AUTOTOMIZE 55 #define VARIOUS_TRY_COPYCAT 56 #define VARIOUS_ABILITY_POPUP 57 #define VARIOUS_DEFOG 58 diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index a4ee9be4da..291a8fb0a4 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -7684,10 +7684,10 @@ static void Cmd_various(void) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3); } return; - case VARIOUS_TRY_AUTONOMIZE: + case VARIOUS_TRY_AUTOTOMIZE: if (GetBattlerWeight(gActiveBattler) > 1) { - gDisableStructs[gActiveBattler].autonomizeCount++; + gDisableStructs[gActiveBattler].autotomizeCount++; gBattlescriptCurrInstr += 7; } else diff --git a/src/battle_util.c b/src/battle_util.c index 612652a81a..716e568478 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -5344,7 +5344,7 @@ u32 GetBattlerWeight(u8 battlerId) if (holdEffect == HOLD_EFFECT_FLOAT_STONE) weight /= 2; - for (i = 0; i < gDisableStructs[battlerId].autonomizeCount; i++) + for (i = 0; i < gDisableStructs[battlerId].autotomizeCount; i++) { if (weight > 1000) { diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index e07cad2d55..5c6c45e05f 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -3512,7 +3512,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .target = MOVE_TARGET_SELECTED, .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_UNDERWATER, - .split = SPLIT_SPECIAL + .split = SPLIT_SPECIAL, }, [MOVE_BEAT_UP] = @@ -4325,7 +4325,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .target = MOVE_TARGET_SELECTED, .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - .split = SPLIT_SPECIAL + .split = SPLIT_SPECIAL, }, [MOVE_METEOR_MASH] = @@ -6662,7 +6662,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_AUTOTOMIZE] = { - .effect = EFFECT_AUTONOMIZE, + .effect = EFFECT_AUTOTOMIZE, .power = 0, .type = TYPE_STEEL, .accuracy = 0, @@ -8915,7 +8915,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_TOXIC_THREAD] = { .effect = EFFECT_TOXIC_THREAD, - .power = 20, + .power = 0, .type = TYPE_POISON, .accuracy = 100, .pp = 0,