From bc143a695d54f7ac663b2b3f1ea98c53b21842e2 Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Sun, 14 Jun 2020 16:08:21 -0400 Subject: Initial work on pokemon_summary_screen.c --- include/main.h | 4 ++-- include/pokemon_summary_screen.h | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/main.h b/include/main.h index f89ffbd63..a27145c7b 100644 --- a/include/main.h +++ b/include/main.h @@ -1,12 +1,12 @@ #ifndef GUARD_MAIN_H #define GUARD_MAIN_H -#include "global.h" - typedef void (*MainCallback)(void); typedef void (*IntrCallback)(void); typedef void (*IntrFunc)(void); +#include "global.h" + extern IntrFunc gIntrTable[]; struct Main diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index 2b8f96316..4dd7881bd 100644 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -20,16 +20,18 @@ enum PokemonSummaryScreenMode { PSS_MODE_NORMAL, PSS_MODE_UNK1, - PSS_MODE_BOX, PSS_MODE_SELECT_MOVE, + PSS_MODE_UNK3, + PSS_MODE_UNK4, + PSS_MODE_BOX, }; enum PokemonSummaryScreenPage { PSS_PAGE_INFO, PSS_PAGE_SKILLS, - PSS_PAGE_BATTLE_MOVES, - PSS_PAGE_CONTEST_MOVES, + PSS_PAGE_MOVES, + PSS_PAGE_MOVES_INFO, }; s32 GetLastViewedMonIndex(void); -- cgit v1.2.3