dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

berry.s decompiled

Browse Source
This commit is contained in:
DizzyEggg
2017-09-13 11:16:26 +02:00
parent a83d07e1b3
commit 5f4c5e280c
49 changed files with 1089 additions and 1780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/berry.h
View File

@@ -37,12 +37,14 @@ u8 CalcBerryYieldInternal(u16 max, u16 min, u8 water);
u8 CalcBerryYield(struct BerryTree *tree);
u8 GetBerryCountByBerryTreeId(u8 id);
u16 GetStageDurationByBerryType(u8);
void Bag_ChooseBerry(void);
void FieldObjectInteractionGetBerryTreeData(void);
void sub_80B4EE4(void);
void FieldObjectInteractionPlantBerryTree(void);
void FieldObjectInteractionPickBerryTree(void);
void FieldObjectInteractionRemoveBerryTree(void);
u8 PlayerHasBerries(void);
void ResetBerryTreeSparkleFlags(void);
extern const struct Berry gBerries[];
#endif // GUARD_BERRY_H

6
include/fieldmap.h Normal file
View File

@@ -0,0 +1,6 @@
#ifndef GUARD_FIELDMAP_H
#define GUARD_FIELDMAP_H
void GetCameraCoords(u16*, u16*);
#endif // GUARD_FIELDMAP_H

4
include/global.berry.h
View File

@@ -42,10 +42,6 @@ struct Berry2
struct EnigmaBerry
{
struct Berry2 berry;
u8 pic[(6 * 6) * TILE_SIZE_4BPP];
u16 palette[16];
u8 description1[45];
u8 description2[45];
u8 itemEffect[18];
u8 holdEffect;
u8 holdEffectParam;

8
include/global.h
View File

@@ -649,8 +649,9 @@ struct DaycareData
u8 stepCounter;
};
#define FLAGS_NUMBER 300
#define VARS_NUMBER 256
#define BERRY_TREES_NUMBER 128
#define FLAGS_NUMBER 300
#define VARS_NUMBER 256
struct SaveBlock1
{
@@ -688,7 +689,7 @@ struct SaveBlock1
/*0x1270*/ u8 flags[FLAGS_NUMBER];
/*0x139C*/ u16 vars[VARS_NUMBER];
/*0x159C*/ u32 gameStats[NUM_GAME_STATS];
/*0x169C*/ struct BerryTree berryTrees[128];
/*0x169C*/ struct BerryTree berryTrees[BERRY_TREES_NUMBER];
/*0x1A9C*/ struct SecretBaseRecord secretBases[20];
/*0x271C*/ u8 playerRoomDecor[12];
/*0x2728*/ u8 playerRoomDecorPos[12];
@@ -731,6 +732,7 @@ struct SaveBlock1
/*0x31A8*/ u8 giftRibbons[52];
/*0x31DC*/ struct Roamer roamer;
/*0x31F8*/ struct EnigmaBerry enigmaBerry;
/*0x322C*/ u8 field_322C[1276];
/*0x3728*/ struct RamScript ramScript;
/*0x3B14*/ struct RecordMixingGift recordMixingGift;
/*0x3B24*/ u8 seen2[52];