diff options
| author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2016-12-01 03:51:24 +0100 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-11-30 18:51:24 -0800 |
| commit | 4258e60771aa9fdabd678930eca534423bd371b8 (patch) | |
| tree | ecca2ee7641abc0562f39b6c7dd907af2184e102 /include/pokemon.h | |
| parent | 831f8cd4fd94613d6b52d87df1b4903bedfaa717 (diff) | |
Declare more non-static functions in header files (#111)
* Declare more non-static functions in header files
* Use `(void)` for functions without arguments.
* Move global-included data to seperate headers
* Don't import types or global in header
* Fix fieldmap imports
* Revert in-code changes
* Add missing newlines
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 450a8174f..956a3984f 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -1,8 +1,6 @@ #ifndef GUARD_POKEMON_H #define GUARD_POKEMON_H -#include "global.h" - #define MON_DATA_PERSONALITY 0 #define MON_DATA_OT_ID 1 #define MON_DATA_NICKNAME 2 @@ -362,6 +360,8 @@ u16 sub_803B7C8(struct Pokemon *mon, u8 a2); void DeleteFirstMoveAndGiveMoveToMon(struct Pokemon *mon, u16 move); void DeleteFirstMoveAndGiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move); +u8 sub_803C348(u8 a1); +u8 sub_803C434(u8 a1); u8 GetMonGender(struct Pokemon *mon); u8 GetBoxMonGender(struct BoxPokemon *boxMon); u8 GetGenderFromSpeciesAndPersonality(u16 species, u32 personality); |