ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some cleanup (#454)

Browse Source 
* Toxic Thread doesn't have power.

* Added missing commas.

* Autotomize typo.

It wasn't until today that I learned that autotomize was a word.
This commit is contained in:
Eduardo Alvaro Quezada D'Ottone 2020-06-27 05:21:13 -04:00 committed by GitHub
parent 3cf091d635
commit 9fb073ca23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/macros/battle_script.inc
View File

@ -1562,8 +1562,8 @@
.4byte \ptr .4byte \ptr
.endm .endm
.macro tryautonomize battler:req, ptr:req .macro tryautotomize battler:req, ptr:req
various \battler, VARIOUS_TRY_AUTONOMIZE various \battler, VARIOUS_TRY_AUTOTOMIZE
.4byte \ptr .4byte \ptr
.endm .endm

4
data/battle_ai_scripts.s
View File

@ -247,7 +247,7 @@ AI_CheckBadMove_CheckEffect: @ 82DC045
if_effect EFFECT_PSYCHO_SHIFT, AI_CBM_PsychicShift if_effect EFFECT_PSYCHO_SHIFT, AI_CBM_PsychicShift
if_effect EFFECT_DEFOG, AI_CBM_Defog if_effect EFFECT_DEFOG, AI_CBM_Defog
if_effect EFFECT_SYNCHRONOISE, AI_CBM_Synchronoise 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_TOXIC_THREAD, AI_CBM_ToxicThread
if_effect EFFECT_VENOM_DRENCH, AI_CBM_VenomDrench if_effect EFFECT_VENOM_DRENCH, AI_CBM_VenomDrench
if_effect EFFECT_DEFENSE_UP_3, AI_CBM_DefenseUp if_effect EFFECT_DEFENSE_UP_3, AI_CBM_DefenseUp
@ -3477,7 +3477,7 @@ AI_SetupFirstTurn_SetupEffectsToEncourage:
.2byte EFFECT_BULK_UP .2byte EFFECT_BULK_UP
.2byte EFFECT_CALM_MIND .2byte EFFECT_CALM_MIND
.2byte EFFECT_ACUPRESSURE .2byte EFFECT_ACUPRESSURE
.2byte EFFECT_AUTONOMIZE .2byte EFFECT_AUTOTOMIZE
.2byte EFFECT_SHIFT_GEAR .2byte EFFECT_SHIFT_GEAR
.2byte EFFECT_SHELL_SMASH .2byte EFFECT_SHELL_SMASH
.2byte EFFECT_GROWTH .2byte EFFECT_GROWTH

20
data/battle_scripts_1.s
View File

@ -317,7 +317,7 @@ gBattleScriptsForMoveEffects:: @ 82D86A8
.4byte BattleScript_EffectFinalGambit .4byte BattleScript_EffectFinalGambit
.4byte BattleScript_EffectTechnoBlast .4byte BattleScript_EffectTechnoBlast
.4byte BattleScript_EffectJudgment .4byte BattleScript_EffectJudgment
.4byte BattleScript_EffectAutonomize .4byte BattleScript_EffectAutotomize
.4byte BattleScript_EffectCopycat .4byte BattleScript_EffectCopycat
.4byte BattleScript_EffectDefog .4byte BattleScript_EffectDefog
.4byte BattleScript_EffectHitEnemyHealAlly .4byte BattleScript_EffectHitEnemyHealAlly
@ -1039,27 +1039,27 @@ BattleScript_EffectInstruct:
setbyte sB_ANIM_TARGETS_HIT, 0x0 setbyte sB_ANIM_TARGETS_HIT, 0x0
jumptocalledmove TRUE jumptocalledmove TRUE
BattleScript_EffectAutonomize: BattleScript_EffectAutotomize:
setstatchanger STAT_SPEED, 2, FALSE setstatchanger STAT_SPEED, 2, FALSE
attackcanceler attackcanceler
attackstring attackstring
ppreduce ppreduce
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AutonomizeWeightLoss statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AutotomizeWeightLoss
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_AutonomizeAttackAnim jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_AutotomizeAttackAnim
pause 0x20 pause 0x20
goto BattleScript_AutonomizePrintString goto BattleScript_AutotomizePrintString
BattleScript_AutonomizeAttackAnim:: BattleScript_AutotomizeAttackAnim::
attackanimation attackanimation
waitanimation waitanimation
BattleScript_AutonomizeDoAnim:: BattleScript_AutotomizeDoAnim::
setgraphicalstatchangevalues setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
BattleScript_AutonomizePrintString:: BattleScript_AutotomizePrintString::
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage 0x40 waitmessage 0x40
BattleScript_AutonomizeWeightLoss:: BattleScript_AutotomizeWeightLoss::
jumpifmovehadnoeffect BattleScript_MoveEnd jumpifmovehadnoeffect BattleScript_MoveEnd
tryautonomize BS_ATTACKER, BattleScript_MoveEnd tryautotomize BS_ATTACKER, BattleScript_MoveEnd
printstring STRINGID_BECAMENIMBLE printstring STRINGID_BECAMENIMBLE
waitmessage 0x40 waitmessage 0x40
goto BattleScript_MoveEnd goto BattleScript_MoveEnd

2
include/battle.h
View File

@ -107,7 +107,7 @@ struct DisableStruct
u8 truantSwitchInHack:1; u8 truantSwitchInHack:1;
u8 mimickedMoves:4; u8 mimickedMoves:4;
u8 rechargeTimer; u8 rechargeTimer;
u8 autonomizeCount; u8 autotomizeCount;
u8 slowStartTimer; u8 slowStartTimer;
u8 embargoTimer; u8 embargoTimer;
u8 magnetRiseTimer; u8 magnetRiseTimer;

2
include/constants/battle_move_effects.h
View File

@ -304,7 +304,7 @@
#define EFFECT_FINAL_GAMBIT 298 #define EFFECT_FINAL_GAMBIT 298
#define EFFECT_TECHNO_BLAST 299 #define EFFECT_TECHNO_BLAST 299
#define EFFECT_JUDGMENT 300 #define EFFECT_JUDGMENT 300
#define EFFECT_AUTONOMIZE 301 #define EFFECT_AUTOTOMIZE 301
#define EFFECT_COPYCAT 302 #define EFFECT_COPYCAT 302
#define EFFECT_DEFOG 303 #define EFFECT_DEFOG 303
#define EFFECT_HIT_ENEMY_HEAL_ALLY 304 // Pollen Puff #define EFFECT_HIT_ENEMY_HEAL_ALLY 304 // Pollen Puff

2
include/constants/battle_script_commands.h
View File

@ -115,7 +115,7 @@
#define VARIOUS_TRY_LAST_RESORT 52 #define VARIOUS_TRY_LAST_RESORT 52
#define VARIOUS_ARGUMENT_STATUS_EFFECT 53 #define VARIOUS_ARGUMENT_STATUS_EFFECT 53
#define VARIOUS_TRY_HIT_SWITCH_TARGET 54 #define VARIOUS_TRY_HIT_SWITCH_TARGET 54
#define VARIOUS_TRY_AUTONOMIZE 55 #define VARIOUS_TRY_AUTOTOMIZE 55
#define VARIOUS_TRY_COPYCAT 56 #define VARIOUS_TRY_COPYCAT 56
#define VARIOUS_ABILITY_POPUP 57 #define VARIOUS_ABILITY_POPUP 57
#define VARIOUS_DEFOG 58 #define VARIOUS_DEFOG 58

4
src/battle_script_commands.c
View File

@ -7684,10 +7684,10 @@ static void Cmd_various(void)
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3);
} }
return; return;
case VARIOUS_TRY_AUTONOMIZE: case VARIOUS_TRY_AUTOTOMIZE:
if (GetBattlerWeight(gActiveBattler) > 1) if (GetBattlerWeight(gActiveBattler) > 1)
{ {
gDisableStructs[gActiveBattler].autonomizeCount++; gDisableStructs[gActiveBattler].autotomizeCount++;
gBattlescriptCurrInstr += 7; gBattlescriptCurrInstr += 7;
} }
else else

2
src/battle_util.c
View File

@ -5344,7 +5344,7 @@ u32 GetBattlerWeight(u8 battlerId)
if (holdEffect == HOLD_EFFECT_FLOAT_STONE) if (holdEffect == HOLD_EFFECT_FLOAT_STONE)
weight /= 2; weight /= 2;
for (i = 0; i < gDisableStructs[battlerId].autonomizeCount; i++) for (i = 0; i < gDisableStructs[battlerId].autotomizeCount; i++)
{ {
if (weight > 1000) if (weight > 1000)
{ {

8
src/data/battle_moves.h
View File

@ -3512,7 +3512,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_UNDERWATER, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_UNDERWATER,
.split = SPLIT_SPECIAL .split = SPLIT_SPECIAL,
}, },
[MOVE_BEAT_UP] = [MOVE_BEAT_UP] =
@ -4325,7 +4325,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.split = SPLIT_SPECIAL .split = SPLIT_SPECIAL,
}, },
[MOVE_METEOR_MASH] = [MOVE_METEOR_MASH] =
@ -6662,7 +6662,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_AUTOTOMIZE] = [MOVE_AUTOTOMIZE] =
{ {
.effect = EFFECT_AUTONOMIZE, .effect = EFFECT_AUTOTOMIZE,
.power = 0, .power = 0,
.type = TYPE_STEEL, .type = TYPE_STEEL,
.accuracy = 0, .accuracy = 0,
@ -8915,7 +8915,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_TOXIC_THREAD] = [MOVE_TOXIC_THREAD] =
{ {
.effect = EFFECT_TOXIC_THREAD, .effect = EFFECT_TOXIC_THREAD,
.power = 20, .power = 0,
.type = TYPE_POISON, .type = TYPE_POISON,
.accuracy = 100, .accuracy = 100,
.pp = 0, .pp = 0,