summaryrefslogtreecommitdiff
path: root/include/battle_setup.h
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-07-16 20:09:46 -0400
committerProjectRevoTPP <projectrevotpp@hotmail.com>2017-07-16 20:09:46 -0400
commit93f767e26de82d1d4133e719a758578ede98b306 (patch)
tree0932ef3730d627bb9d9fc6c919cdcd5a6a358d7f /include/battle_setup.h
parentdd7e19107879f74d8f962a6a47d619470eaefbcd (diff)
parente50b9e28bc0d98c69b22f6d13298e705eb4eb865 (diff)
resolve conflict
Diffstat (limited to 'include/battle_setup.h')
-rw-r--r--include/battle_setup.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle_setup.h b/include/battle_setup.h
index e88aefe6d..c8c463f6d 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -87,7 +87,7 @@ bool32 battle_exit_is_player_defeat(u32 a1);
//void sub_80822BC(void);
//void TrainerBattleLoadArgs(const struct TrainerBattleSpec *specs, u8 *data);
//void battle_80801F0(void);
-u8 *TrainerBattleConfigure(u8 *data);
+u8 *TrainerBattleConfigure(const u8 *data);
void TrainerWantsBattle(u8, u8 *);
bool32 GetTrainerFlagFromScriptPointer(u8 *data);
//void sub_8082524(void);