diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
| commit | 82ddae9db42f45abf876e68dc9b0b69a00b44070 (patch) | |
| tree | 26e39c75e92ca8cf128b9143c0e664b06bff23a9 /include/safari_zone.h | |
| parent | c56305607a1bad264b89d07b7539eff3fe010e0d (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
fix merge conflicts
Diffstat (limited to 'include/safari_zone.h')
| -rw-r--r-- | include/safari_zone.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/safari_zone.h b/include/safari_zone.h index f491be2f1..0bee08a95 100644 --- a/include/safari_zone.h +++ b/include/safari_zone.h @@ -1,6 +1,8 @@ #ifndef GUARD_SAFARI_ZONE_H #define GUARD_SAFARI_ZONE_H +extern u8 gNumSafariBalls; + bool32 GetSafariZoneFlag(void); void SetSafariZoneFlag(void); void ResetSafariZoneFlag(void); |