diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 11:28:03 -0500 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 11:28:03 -0500 |
commit | fd0fc184d6d06e01e017ba88b06d3c1709e626de (patch) | |
tree | 56e7852cb2d20931985caf1e25003fdc43391025 /include/battle_setup.h | |
parent | 91844cdfb2e0c3c1fd00fae45d1cec2be763c522 (diff) | |
parent | 4e07002d13c97f90cb8885298c0db2c331dc2b07 (diff) |
Merge branch 'master' of https://github.com/pret/pokefirered into doc-pokemonleague
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 4dc2f10f0..2aecbb0a4 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -19,7 +19,7 @@ void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerSc bool32 GetTrainerFlagFromScriptPointer(const u8 *data); void SetUpTrainerMovement(void); u8 ScrSpecial_GetTrainerBattleMode(void); -u16 sub_80803D8(void); +u16 GetRivalBattleFlags(void); u16 ScrSpecial_HasTrainerBeenFought(void); void SetBattledTrainerFlag(void); bool8 HasTrainerBeenFought(u16 trainerId); |