diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-25 00:23:12 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-06-25 00:26:50 -0400 |
| commit | 2cae14cf5ae83831d5c387b3823de34d8d476908 (patch) | |
| tree | b776589bf88596d7280011c3ea1d9befd32b287f /include/pokemon_summary_screen.h | |
| parent | 3300def3b39752f9f290f10dbf0cf7748f0dec5b (diff) | |
| parent | e72babd734ab7fd4e5c6d29f456b82d5e76e1bde (diff) | |
Merge remote-tracking branch 'origin/master' into de/integrate-data-includes
Conflicts:
asm/battle_anim_8137220.s
asm-de/battle_message.s
Diffstat (limited to 'include/pokemon_summary_screen.h')
| -rw-r--r-- | include/pokemon_summary_screen.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index 3f7ed8fad..71259c887 100644 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -3,7 +3,7 @@ extern const u8 *const gNatureNames[]; -void ShowPokemonSummaryScreen(struct Pokemon *, u8, u8, void (*)(u8), int); +void ShowPokemonSummaryScreen(struct Pokemon *, u8, u8, void (*)(void), int); void sub_809D9F0(struct Pokemon *party, u8, u8, void *, u32); void sub_809D9F0(struct Pokemon *, u8, u8, void *, u32); u8 sub_809FA30(void); |