diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-12 17:11:58 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-12 17:11:58 -0400 |
| commit | 09b94d8b342bb29f962bb3c23fb4267877df710e (patch) | |
| tree | b3e465f91031ebb2e44abffb6eb074563ccd6c8b /include | |
| parent | f64421dd8cc397f7d4551f3dc674e80a31d36631 (diff) | |
| parent | ad274b9561d16589d8099a3671617e2255c1e9c5 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered
Diffstat (limited to 'include')
| -rw-r--r-- | include/overworld.h | 1 | ||||
| -rw-r--r-- | include/pokedex.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/overworld.h b/include/overworld.h index 60fa566f7..799389353 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -104,6 +104,7 @@ extern bool8 (* gFieldCallback2)(void); void SetLastHealLocationWarp(u8 healLocaionId); void sub_8055864(u8 mapGroup, u8 mapNum); +void CB2_Overworld(void); void CB2_NewGame(void); bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType); void Overworld_ResetStateAfterTeleport(void); diff --git a/include/pokedex.h b/include/pokedex.h index b389bf821..c4ec27e0b 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -7,7 +7,8 @@ void ResetPokedex(void); void CopyMonCategoryText(u16 species, u8 *dst); u16 GetPokedexHeightWeight(u16 dexNum, u8 data); u16 GetNationalPokedexCount(u8); -u16 GetHoennPokedexCount(u8); +u16 GetKantoPokedexCount(u8); +bool16 HasAllKantoMons(void); u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 trainerId, u32 personality); enum |