diff options
| author | YamaArashi <shadow962@live.com> | 2016-12-04 16:45:35 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-12-04 16:45:35 -0800 |
| commit | 3602331ae2cba4e225cea61adfe7267a9d42c8b6 (patch) | |
| tree | c45dae1504533404f4462876d3a6cf8402b20c47 | |
| parent | ed58b6c1ca744683d6531360b8278fddad6c79f3 (diff) | |
fix battle_setup.c warning
| -rw-r--r-- | include/battle_setup.h | 2 | ||||
| -rw-r--r-- | src/battle_setup.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/battle_setup.h b/include/battle_setup.h index b82180f28..aee1f6820 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -37,7 +37,7 @@ bool32 battle_exit_is_player_defeat(u32 a1); // battle_80801F0 u8 *TrainerBattleConfigure(u8 *data); void TrainerWantsBattle(u8, u8 *); -u8* GetTrainerFlagFromScriptPointer(u8 *data); +bool32 GetTrainerFlagFromScriptPointer(u8 *data); // sub_8082524 // sub_8082558 // sub_8082564 diff --git a/src/battle_setup.c b/src/battle_setup.c index eb8016b5b..4822cd585 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -684,10 +684,10 @@ void TrainerWantsBattle(u8 trainerMapObjId, u8 *trainerScript) ScriptContext2_Enable(); } -u8* GetTrainerFlagFromScriptPointer(u8 *data) +bool32 GetTrainerFlagFromScriptPointer(u8 *data) { u32 flag = TrainerBattleLoadArg16(data + 2); - return (u8*)FlagGet(TRAINER_FLAG_START + flag); + return FlagGet(TRAINER_FLAG_START + flag); } void sub_8082524(void) |