diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-06 18:25:36 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-06 18:25:36 -0500 |
| commit | f14f13b31269d4e0a537b20c53c766314bab0f86 (patch) | |
| tree | ad4beac6ebf3f6e2120f8aa8686805feb25ea1c9 /src | |
| parent | 60b75e85c91a87e70dda2695bf5c5c66d61a0c17 (diff) | |
Document battle_scripts_2.s
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_main.c | 12 | ||||
| -rw-r--r-- | src/battle_script_commands.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index a7cd989ed..8852fa188 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -66,8 +66,8 @@ static void HandleAction_UseItem(void); static void HandleAction_Run(void); static void HandleAction_WatchesCarefully(void); static void HandleAction_SafariZoneBallThrow(void); -static void HandleAction_ThrowPokeblock(void); -static void HandleAction_GoNear(void); +static void HandleAction_ThrowBait(void); +static void HandleAction_ThrowRock(void); static void HandleAction_SafariZoneRun(void); static void HandleAction_OldManBallThrow(void); static void HandleAction_TryFinish(void); @@ -582,8 +582,8 @@ static void (*const sTurnActionsFuncsTable[])(void) = [B_ACTION_RUN] = HandleAction_Run, [B_ACTION_SAFARI_WATCH_CAREFULLY] = HandleAction_WatchesCarefully, [B_ACTION_SAFARI_BALL] = HandleAction_SafariZoneBallThrow, - [B_ACTION_SAFARI_POKEBLOCK] = HandleAction_ThrowPokeblock, - [B_ACTION_SAFARI_GO_NEAR] = HandleAction_GoNear, + [B_ACTION_SAFARI_POKEBLOCK] = HandleAction_ThrowBait, + [B_ACTION_SAFARI_GO_NEAR] = HandleAction_ThrowRock, [B_ACTION_SAFARI_RUN] = HandleAction_SafariZoneRun, [B_ACTION_OLDMAN_THROW] = HandleAction_OldManBallThrow, [B_ACTION_EXEC_SCRIPT] = HandleAction_RunBattleScript, @@ -4313,7 +4313,7 @@ static void HandleAction_SafariZoneBallThrow(void) gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT; } -static void HandleAction_ThrowPokeblock(void) +static void HandleAction_ThrowBait(void) { gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; @@ -4329,7 +4329,7 @@ static void HandleAction_ThrowPokeblock(void) gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT; } -static void HandleAction_GoNear(void) +static void HandleAction_ThrowRock(void) { gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 7be47d762..0eba68f29 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -9441,7 +9441,7 @@ static void atkEF_handleballthrow(void) { BtlController_EmitBallThrowAnim(0, BALL_3_SHAKES_SUCCESS); MarkBattlerForControllerExec(gActiveBattler); - gBattlescriptCurrInstr = gUnknown_81D9A88; + gBattlescriptCurrInstr = BattleScript_OldMan_Pokedude_CaughtMessage; } else { |