diff options
| author | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-08 12:13:15 +0800 |
|---|---|---|
| committer | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-08 12:13:15 +0800 |
| commit | 8a8baaeaaaffd7528c13f064b664c31e747c8fdc (patch) | |
| tree | bbd238d169df88dc2dbbed17956daae2ad630227 /include/battle_setup.h | |
| parent | 907ed3f5f5537d14ed6136daeb81e38c383239c2 (diff) | |
| parent | 6068495619364c8e0ccae15ad036a1b5a9eef171 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/battle_setup.h')
| -rw-r--r-- | include/battle_setup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle_setup.h b/include/battle_setup.h index 98c366acd..3b327e3f7 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -38,7 +38,7 @@ void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerSc void ConfigureTwoTrainersBattle(u8 trainerEventObjId, const u8 *trainerScript); void SetUpTwoTrainersBattle(void); bool32 GetTrainerFlagFromScriptPointer(const u8 *data); -void sub_80B16D8(void); +void SetUpTrainerMovement(void); u8 GetTrainerBattleMode(void); bool8 GetTrainerFlag(void); bool8 HasTrainerBeenFought(u16 trainerId); |