summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-11-26 13:35:08 -0800
committerMarcus Huderle <huderlem@gmail.com>2017-11-26 13:35:08 -0800
commit1829f7e7195575e872eb378722a56b344e2a1cd7 (patch)
tree75145e84fd87319c553ad21cde74e6662e5c0a42 /include
parent3339dbf0ea8c635abd2159732e9e55882b8b629c (diff)
Cleanup pokemon_summary_screen
Diffstat (limited to 'include')
-rwxr-xr-xinclude/ewram.h1
-rw-r--r--include/pokemon_summary_screen.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/ewram.h b/include/ewram.h
index 06ea513a3..eacc02cab 100755
--- a/include/ewram.h
+++ b/include/ewram.h
@@ -207,6 +207,7 @@ extern u8 gSharedMem[];
#define eEggHatchData (struct EggHatchData*)(&gSharedMem[0x18000])
#define ePokedexView1 (struct PokedexView *)(gSharedMem + 0x18000)
#define UNK_2018000_STRUCT (*(struct UnknownStruct2018000 *)(gSharedMem + 0x18000))
+#define pssData (*(struct PokemonSummaryScreenStruct *)(gSharedMem + 0x18000))
#define ewram18300 ((u16 *)(gSharedMem + 0x18300))
#define ewram18800 (&gSharedMem[0x18800])
#define ePokedexView2 (struct PokedexView *)(gSharedMem + 0x18800)
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index 99af37f69..945e810a3 100644
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -59,7 +59,7 @@ struct PokemonSummaryScreenStruct
};
void ShowPokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u8);
-void sub_809D9F0(struct Pokemon *, u8, u8, MainCallback, u16);
+void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16);
u8 sub_809FA30(void);
u8 pokemon_ailments_get_primary(u32);
u8 GetMonStatusAndPokerus();