diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
| commit | 8cd4908fa3820b22a8b4e3d96780d725132549c4 (patch) | |
| tree | bcc8e697ce7dd0d4ab532a61fccafbbdb6d2400e /include/rom6.h | |
| parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
| parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) | |
merge bike with master, fix conflicts
Diffstat (limited to 'include/rom6.h')
| -rw-r--r-- | include/rom6.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rom6.h b/include/rom6.h index 6d20752e2..fc33b7d1f 100644 --- a/include/rom6.h +++ b/include/rom6.h @@ -1,7 +1,7 @@ #ifndef GUARD_ROM6_H #define GUARD_ROM6_H -void sub_81357FC(u8, void(void)); +void OpenPokeblockCase(u8, void(void)); u8 GetLeadMonIndex(void); u8 GetSSTidalLocation(u8 *grp, u8 *num, s16 *x, s16 *y); void sub_813BADC(bool8); |