diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-04-09 01:05:20 +0000 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-04-08 18:05:20 -0700 |
| commit | 83d7f52f2cadd4232ee674947a93e93fc18e483a (patch) | |
| tree | a7b36f471848a276c896ea874515b4ddb37e96d2 /include | |
| parent | 30310871d369055715374958e5244f84c028da7f (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/berry.h | 4 | ||||
| -rw-r--r-- | include/field_map_obj_helpers.h | 1 | ||||
| -rw-r--r-- | include/field_screeneffect.h (renamed from include/weather.h) | 0 | ||||
| -rw-r--r-- | include/pokemon.h | 2 |
4 files changed, 5 insertions, 2 deletions
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); diff --git a/include/field_map_obj_helpers.h b/include/field_map_obj_helpers.h index 5498bde12..daae74ae9 100644 --- a/include/field_map_obj_helpers.h +++ b/include/field_map_obj_helpers.h @@ -7,5 +7,6 @@ void FreezeMapObjectsExceptOne(u8); void UnfreezeMapObjects(void); void sub_806487C(struct Sprite *sprite, bool8 invisible); void sub_8064990(u8, u8); +void UnfreezeMapObject(struct MapObject *mapObject); #endif diff --git a/include/weather.h b/include/field_screeneffect.h index af07c970d..af07c970d 100644 --- a/include/weather.h +++ b/include/field_screeneffect.h diff --git a/include/pokemon.h b/include/pokemon.h index 3987bada6..e0ad7136c 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -455,4 +455,6 @@ u16 nature_stat_mod(u8 nature, u16 n, u8 statIndex); void sub_8040B1C(void *); +u8 *sub_803F378(u16 itemId); + #endif // GUARD_POKEMON_H |