summaryrefslogtreecommitdiff
path: root/include/global.berry.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/global.berry.h')
-rw-r--r--include/global.berry.h46
1 files changed, 23 insertions, 23 deletions
diff --git a/include/global.berry.h b/include/global.berry.h
index 6632e55e2..096d8b1d8 100644
--- a/include/global.berry.h
+++ b/include/global.berry.h
@@ -3,33 +3,33 @@
struct Berry
{
- const u8 name[7];
- u8 firmness;
- u16 size;
- u8 maxYield;
- u8 minYield;
- const u8 *description1;
- const u8 *description2;
- u8 stageDuration;
- u8 spicy;
- u8 dry;
- u8 sweet;
- u8 bitter;
- u8 sour;
- u8 smoothness;
+ /*0x00*/const u8 name[7];
+ /*0x07*/u8 firmness;
+ /*0x08*/u16 size;
+ /*0x0A*/u8 maxYield;
+ /*0x0B*/u8 minYield;
+ /*0x0C*/const u8 *description1;
+ /*0x10*/const u8 *description2;
+ /*0x14*/u8 stageDuration;
+ /*0x15*/u8 spicy;
+ /*0x16*/u8 dry;
+ /*0x17*/u8 sweet;
+ /*0x18*/u8 bitter;
+ /*0x19*/u8 sour;
+ /*0x1A*/u8 smoothness;
};
struct EnigmaBerry
{
- struct Berry berry;
- u8 pic[(6 * 6) * TILE_SIZE_4BPP];
- u16 palette[16];
- u8 description1[45];
- u8 description2[45];
- u8 itemEffect[18];
- u8 holdEffect;
- u8 holdEffectParam;
- u32 checksum;
+ /*0x000*/struct Berry berry;
+ /*0x01B*/u8 pic[(6 * 6) * TILE_SIZE_4BPP];
+ /*0x49C*/u16 palette[16];
+ /*0x4BC*/u8 description1[45];
+ /*0x4E9*/u8 description2[45];
+ /*0x516*/u8 itemEffect[18];
+ /*0x528*/u8 holdEffect;
+ /*0x529*/u8 holdEffectParam;
+ /*0x52C*/u32 checksum;
};
struct BattleEnigmaBerry