diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-28 16:32:23 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-28 16:32:23 +0200 |
| commit | 14fcc9ec209a0a910dd0cf870dc835e7b7408e4c (patch) | |
| tree | 9f36acaa5a718f110f200603038b2942caabf30c /include | |
| parent | bc3b4b4d9ae6ab59c9ce3892b7d287ebd0ee13fa (diff) | |
| parent | 3c8091393ca12b8eeb26f236a997b70eea5688c6 (diff) | |
merge with master and move to C
Diffstat (limited to 'include')
| -rw-r--r-- | include/berry.h | 7 | ||||
| -rw-r--r-- | include/gba/defines.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/berry.h b/include/berry.h index dc0481d3d..f51503d41 100644 --- a/include/berry.h +++ b/include/berry.h @@ -53,4 +53,11 @@ void ResetBerryTreeSparkleFlags(void); extern const struct Berry gBerries[]; +struct UnkStruct_0858AB24 { + u8 unk0; + u16 unk1; +}; + +extern const struct UnkStruct_0858AB24 gUnknown_0858AB24[]; + #endif // GUARD_BERRY_H diff --git a/include/gba/defines.h b/include/gba/defines.h index e67d64777..41cc84f4a 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -50,6 +50,8 @@ #define OAM 0x7000000 #define OAM_SIZE 0x400 +#define ROM_HEADER_SIZE 0xC0 + #define DISPLAY_WIDTH 240 #define DISPLAY_HEIGHT 160 |