Merge branch 'master' into extern-cleanup
This commit is contained in:
@@ -90,7 +90,7 @@ static void WallyHandleBattleAnimation(void);
|
||||
static void WallyHandleLinkStandbyMsg(void);
|
||||
static void WallyHandleResetActionMoveSelection(void);
|
||||
static void WallyHandleCmd55(void);
|
||||
static void nullsub_118(void);
|
||||
static void WallyCmdEnd(void);
|
||||
|
||||
static void WallyBufferRunCommand(void);
|
||||
static void WallyBufferExecCompleted(void);
|
||||
@@ -159,10 +159,10 @@ static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
|
||||
WallyHandleLinkStandbyMsg,
|
||||
WallyHandleResetActionMoveSelection,
|
||||
WallyHandleCmd55,
|
||||
nullsub_118
|
||||
WallyCmdEnd
|
||||
};
|
||||
|
||||
static void nullsub_117(void)
|
||||
static void SpriteCB_Null7(void)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -1557,6 +1557,6 @@ static void WallyHandleCmd55(void)
|
||||
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
|
||||
}
|
||||
|
||||
static void nullsub_118(void)
|
||||
static void WallyCmdEnd(void)
|
||||
{
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user