diff options
| -rw-r--r-- | asm/macros/battle_script.inc | 2 | ||||
| -rw-r--r-- | data/battle_scripts_1.s | 6 | ||||
| -rw-r--r-- | include/battle.h | 2 | ||||
| -rw-r--r-- | src/battle_main.c | 2 | ||||
| -rw-r--r-- | src/battle_script_commands.c | 18 | ||||
| -rw-r--r-- | src/battle_util.c | 4 |
6 files changed, 17 insertions, 17 deletions
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 34d529cc7..5b283b647 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -530,7 +530,7 @@ .byte \battler .endm - .macro jumptorandomattack param0 + .macro jumptocalledattack param0 .byte 0x63 .byte \param0 .endm diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 0c5e172b0..a9dfd7635 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1354,7 +1354,7 @@ BattleScript_SleepTalkUsingMove:: waitanimation setbyte sB_ANIM_TURN, 0x0 setbyte sB_ANIM_TARGETS_HIT, 0x0 - jumptorandomattack TRUE + jumptocalledattack TRUE BattleScript_EffectDestinyBond:: attackcanceler @@ -2399,7 +2399,7 @@ BattleScript_EffectAssist:: waitanimation setbyte sB_ANIM_TURN, 0x0 setbyte sB_ANIM_TARGETS_HIT, 0x0 - jumptorandomattack TRUE + jumptocalledattack TRUE BattleScript_EffectIngrain:: attackcanceler @@ -4260,7 +4260,7 @@ BattleScript_IgnoresWhileAsleep:: BattleScript_IgnoresAndUsesRandomMove:: printstring STRINGID_PKMNIGNOREDORDERS waitmessage 0x40 - jumptorandomattack FALSE + jumptocalledattack FALSE BattleScript_MoveUsedLoafingAround:: jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x4, BattleScript_82DB6C7 diff --git a/include/battle.h b/include/battle.h index fae21908b..ae1eccf57 100644 --- a/include/battle.h +++ b/include/battle.h @@ -730,7 +730,7 @@ extern u8 gCurrMovePos; extern u8 gChosenMovePos; extern u16 gCurrentMove; extern u16 gChosenMove; -extern u16 gRandomMove; +extern u16 gCalledMove; extern s32 gBattleMoveDamage; extern s32 gHpDealt; extern s32 gTakenDmg[MAX_BATTLERS_COUNT]; diff --git a/src/battle_main.c b/src/battle_main.c index 12e49ee65..8f5d39055 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -219,7 +219,7 @@ EWRAM_DATA u8 gCurrMovePos = 0; EWRAM_DATA u8 gChosenMovePos = 0; EWRAM_DATA u16 gCurrentMove = 0; EWRAM_DATA u16 gChosenMove = 0; -EWRAM_DATA u16 gRandomMove = 0; +EWRAM_DATA u16 gCalledMove = 0; EWRAM_DATA s32 gBattleMoveDamage = 0; EWRAM_DATA s32 gHpDealt = 0; EWRAM_DATA s32 gTakenDmg[MAX_BATTLERS_COUNT] = {0}; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 90dacc8cb..c8f3f1175 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -190,7 +190,7 @@ static void atk5F_swapattackerwithtarget(void); static void atk60_incrementgamestat(void); static void atk61_drawpartystatussummary(void); static void atk62_hidepartystatussummary(void); -static void atk63_jumptorandomattack(void); +static void atk63_jumptocalledattack(void); static void atk64_statusanimation(void); static void atk65_status2animation(void); static void atk66_chosenstatusanimation(void); @@ -442,7 +442,7 @@ void (* const gBattleScriptingCommandsTable[])(void) = atk60_incrementgamestat, atk61_drawpartystatussummary, atk62_hidepartystatussummary, - atk63_jumptorandomattack, + atk63_jumptocalledattack, atk64_statusanimation, atk65_status2animation, atk66_chosenstatusanimation, @@ -6049,12 +6049,12 @@ static void atk62_hidepartystatussummary(void) gBattlescriptCurrInstr += 2; } -static void atk63_jumptorandomattack(void) +static void atk63_jumptocalledattack(void) { if (gBattlescriptCurrInstr[1]) - gCurrentMove = gRandomMove; + gCurrentMove = gCalledMove; else - gChosenMove = gCurrentMove = gRandomMove; + gChosenMove = gCurrentMove = gCalledMove; gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]; } @@ -8509,10 +8509,10 @@ static void atkA9_trychoosesleeptalkmove(void) movePosition = Random() & 3; } while ((gBitTable[movePosition] & unusableMovesBits)); - gRandomMove = gBattleMons[gBattlerAttacker].moves[movePosition]; + gCalledMove = gBattleMons[gBattlerAttacker].moves[movePosition]; gCurrMovePos = movePosition; gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); - gBattlerTarget = GetMoveTarget(gRandomMove, 0); + gBattlerTarget = GetMoveTarget(gCalledMove, 0); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } } @@ -9737,8 +9737,8 @@ static void atkDE_asistattackselect(void) if (chooseableMovesNo) { gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); - gRandomMove = movesArray[((Random() & 0xFF) * chooseableMovesNo) >> 8]; - gBattlerTarget = GetMoveTarget(gRandomMove, 0); + gCalledMove = movesArray[((Random() & 0xFF) * chooseableMovesNo) >> 8]; + gBattlerTarget = GetMoveTarget(gCalledMove, 0); gBattlescriptCurrInstr += 5; } else diff --git a/src/battle_util.c b/src/battle_util.c index 5096a2f3a..79ce180ee 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -3408,9 +3408,9 @@ u8 IsMonDisobedient(void) gCurrMovePos = gChosenMovePos = Random() & 3; } while (gBitTable[gCurrMovePos] & calc); - gRandomMove = gBattleMons[gBattlerAttacker].moves[gCurrMovePos]; + gCalledMove = gBattleMons[gBattlerAttacker].moves[gCurrMovePos]; gBattlescriptCurrInstr = BattleScript_IgnoresAndUsesRandomMove; - gBattlerTarget = GetMoveTarget(gRandomMove, 0); + gBattlerTarget = GetMoveTarget(gCalledMove, 0); gHitMarker |= HITMARKER_x200000; return 2; } |