diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-28 15:55:57 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-28 15:55:57 -0400 |
commit | efe914a5bab5062834f35cbae7824d1703f45618 (patch) | |
tree | b047c6c07890a7e30ef3f127d534b7fe12051b03 /include | |
parent | e9cf9fc104ceedd50330af6b22c6e896e85930e1 (diff) |
trade through sub_804E944
Diffstat (limited to 'include')
-rw-r--r-- | include/overworld.h | 1 | ||||
-rw-r--r-- | include/pokemon_summary_screen.h | 2 | ||||
-rw-r--r-- | include/strings.h | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/include/overworld.h b/include/overworld.h index 805ddc8a0..2e591a599 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -142,5 +142,6 @@ bool32 sub_8058318(void); void CB2_ReturnToStartMenu(void); void CB2_WhiteOut(void); +void c2_8056854(void); #endif //GUARD_OVERWORLD_H diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index 90a67205c..b800e3d30 100644 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -8,7 +8,6 @@ extern u8 gLastViewedMonIndex; extern const u8 *const gMoveDescriptionPointers[]; extern const u8 *const gNatureNamePointers[]; -void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)); void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16); void ShowPokemonSummaryScreenSet40EF(u8 mode, struct BoxPokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)); u8 sub_8138B2C(void); @@ -34,5 +33,6 @@ enum PokemonSummaryScreenPage }; s32 sub_8138B20(void); +void ShowPokemonSummaryScreen(struct Pokemon * party, u8 cursorPos, u8 lastIdx, void (*callback)(void), u8 a4); #endif // GUARD_POKEMON_SUMMARY_SCREEN_H diff --git a/include/strings.h b/include/strings.h index 9304b225d..43043b537 100644 --- a/include/strings.h +++ b/include/strings.h @@ -660,4 +660,7 @@ extern const u8 gText_FiveIsland[]; extern const u8 gText_SixIsland[]; extern const u8 gText_SevenIsland[]; +// trade +extern const u8 gUnknown_841E0A5[]; + #endif //GUARD_STRINGS_H |