diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-04-02 18:29:51 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-04-02 18:29:51 -0500 |
| commit | 181baf9fe561e893023f71a5793a8b1ac6d644d6 (patch) | |
| tree | 8ac4906fc6f70fb000fc3fbcd73a325dc6114d20 /include/union_room_battle.h | |
| parent | 1241700b204b9f450221299c6e837c0f522f60b2 (diff) | |
| parent | d8c9f1b30fb92289e7aa4d44dfcf1b2120bea8d6 (diff) | |
Merge remote-tracking branch 'upstream/master' into misc_docs
# Conflicts:
# src/field_weather_effect.c
Diffstat (limited to 'include/union_room_battle.h')
| -rw-r--r-- | include/union_room_battle.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/union_room_battle.h b/include/union_room_battle.h new file mode 100644 index 000000000..2f5086008 --- /dev/null +++ b/include/union_room_battle.h @@ -0,0 +1,7 @@ +#ifndef GUARD_UNION_ROOM_BATTLE_H +#define GUARD_UNION_ROOM_BATTLE_H + +u8 sub_8013C40(void); +void sub_8014210(u16 battleFlags); + +#endif //GUARD_UNION_ROOM_BATTLE_H |