summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-12-04 16:45:35 -0800
committerYamaArashi <shadow962@live.com>2016-12-04 16:45:35 -0800
commit3602331ae2cba4e225cea61adfe7267a9d42c8b6 (patch)
treec45dae1504533404f4462876d3a6cf8402b20c47 /src
parented58b6c1ca744683d6531360b8278fddad6c79f3 (diff)
fix battle_setup.c warning
Diffstat (limited to 'src')
-rw-r--r--src/battle_setup.c4
1 files changed, 2 insertions, 2 deletions
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)