From 98062c69d613fb1b9e2345924dd34d0bbdcfcc90 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 2 Jan 2017 04:27:51 -0500 Subject: label and document berry.c, decompress.c, item_use.c and label gBattleTypeFlags (#146) * make ROM match again * clean up item_use.c labels and clarify functions. * label and clarify some functions in decompress.c * label and clarify berry.c * rename 20239F8 to gBattleTypeFlags * formatting --- include/berry.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include/berry.h') diff --git a/include/berry.h b/include/berry.h index 2b2933412..152f92e38 100644 --- a/include/berry.h +++ b/include/berry.h @@ -1,16 +1,16 @@ #ifndef GUARD_BERRY_H #define GUARD_BERRY_H -void unref_sub_80B4884(void); -void sub_80B48A8(u8 *src); -u32 sub_80B48F8(struct EnigmaBerry *enigmaBerry); -bool32 sub_80B4940(void); +void ClearEnigmaBerries(void); +void SetEnigmaBerry(u8 *src); +u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry); +bool32 IsEnigmaBerryValid(void); struct Berry *GetBerryInfo(u8 berry); struct BerryTree *GetBerryTreeInfo(u8 id); bool32 FieldObjectInteractionWaterBerryTree(void); bool32 IsPlayerFacingPlantedBerryTree(void); -u8 WaterBerryTree(void); -void sub_80B4A90(void); +u8 TryToWaterBerryTree(void); +void ClearBerryTrees(void); bool32 BerryTreeGrow(struct BerryTree *tree); void BerryTreeTimeUpdate(int time); void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 sparkle); -- cgit v1.2.3 From b9ff56bd89ac11a9b40b34f834dcf7a5be4d90a6 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Fri, 27 Jan 2017 13:06:20 -0500 Subject: define more data in C (#219) * define some graphics data in C * define wild pokemon in C * use less #ifdefs * define data in berry.c --- include/berry.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'include/berry.h') diff --git a/include/berry.h b/include/berry.h index 152f92e38..f17799870 100644 --- a/include/berry.h +++ b/include/berry.h @@ -1,11 +1,21 @@ #ifndef GUARD_BERRY_H #define GUARD_BERRY_H +enum +{ + BERRY_FIRMNESS_UNKNOWN, + BERRY_FIRMNESS_VERY_SOFT, + BERRY_FIRMNESS_SOFT, + BERRY_FIRMNESS_HARD, + BERRY_FIRMNESS_VERY_HARD, + BERRY_FIRMNESS_SUPER_HARD, +}; + void ClearEnigmaBerries(void); void SetEnigmaBerry(u8 *src); u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry); bool32 IsEnigmaBerryValid(void); -struct Berry *GetBerryInfo(u8 berry); +const struct Berry *GetBerryInfo(u8 berry); struct BerryTree *GetBerryTreeInfo(u8 id); bool32 FieldObjectInteractionWaterBerryTree(void); bool32 IsPlayerFacingPlantedBerryTree(void); -- cgit v1.2.3 From 83d7f52f2cadd4232ee674947a93e93fc18e483a Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 9 Apr 2017 01:05:20 +0000 Subject: finish decompiling item_use.c (#244) * nonmatching sub_80C9720 and decompile sub_80C9838 * finish decompiling Itemfinder functions. * decompile ItemUseOutOfBattle_PokeblockCase and ItemUseOutOfBattle_CoinCase * rename field_doortransition * rename weather file * decompile more of item_use.c * decompile up to repel code * decompile up to stat increase code * finish decompiling item_use.c * remove item_use from ld_script --- include/berry.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/berry.h') diff --git a/include/berry.h b/include/berry.h index f17799870..0013b4dba 100644 --- a/include/berry.h +++ b/include/berry.h @@ -18,8 +18,8 @@ bool32 IsEnigmaBerryValid(void); const struct Berry *GetBerryInfo(u8 berry); struct BerryTree *GetBerryTreeInfo(u8 id); bool32 FieldObjectInteractionWaterBerryTree(void); -bool32 IsPlayerFacingPlantedBerryTree(void); -u8 TryToWaterBerryTree(void); +bool8 IsPlayerFacingPlantedBerryTree(void); +bool8 TryToWaterBerryTree(void); void ClearBerryTrees(void); bool32 BerryTreeGrow(struct BerryTree *tree); void BerryTreeTimeUpdate(int time); -- cgit v1.2.3 From 242af849cb56ce0c4469c4e2be82a3ad5dbd3434 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Tue, 9 May 2017 20:39:43 -0700 Subject: minutes, not seconds --- include/berry.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/berry.h') diff --git a/include/berry.h b/include/berry.h index 0013b4dba..f0acbe0ad 100644 --- a/include/berry.h +++ b/include/berry.h @@ -22,7 +22,7 @@ bool8 IsPlayerFacingPlantedBerryTree(void); bool8 TryToWaterBerryTree(void); void ClearBerryTrees(void); bool32 BerryTreeGrow(struct BerryTree *tree); -void BerryTreeTimeUpdate(int time); +void BerryTreeTimeUpdate(s32 minutes); void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 sparkle); void RemoveBerryTree(u8 id); u8 GetBerryTypeByBerryTreeId(u8 id); -- cgit v1.2.3