diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-03 16:58:54 -0500 |
---|---|---|
committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-03 16:58:54 -0500 |
commit | 2879fe7fe05166f16b21223c2d4d24f5855c2788 (patch) | |
tree | 3e5525a118c249ab2419a61d7a61b4cb1985462b /src/battle_controller_wally.c | |
parent | 63e700af6c735dc40f8ddb2b46cad9c0c43ad6b3 (diff) | |
parent | 1e7f4a80c77832d952688206bd7c98e11dba25ba (diff) |
Merge branch 'master' into summary-screen-macros
Diffstat (limited to 'src/battle_controller_wally.c')
-rw-r--r-- | src/battle_controller_wally.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index d891b96b6..a196f8a44 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -92,7 +92,7 @@ static void WallyHandleBattleAnimation(void); static void WallyHandleLinkStandbyMsg(void); static void WallyHandleResetActionMoveSelection(void); static void WallyHandleCmd55(void); -static void nullsub_118(void); +static void SpriteCB_Null8(void); static void WallyBufferRunCommand(void); static void WallyBufferExecCompleted(void); @@ -161,10 +161,10 @@ static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(void) = WallyHandleLinkStandbyMsg, WallyHandleResetActionMoveSelection, WallyHandleCmd55, - nullsub_118 + SpriteCB_Null8 }; -static void nullsub_117(void) +static void SpriteCB_Null7(void) { } @@ -1559,6 +1559,6 @@ static void WallyHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } -static void nullsub_118(void) +static void SpriteCB_Null8(void) { } |