From 0117d43fa758bfc12a8bf5c3dd09a625556a644c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 29 Jun 2021 14:43:07 -0400 Subject: Merge UNK_STRUCT_2018000 into pssData --- include/ewram.h | 1 - include/pokemon_summary_screen.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'include') diff --git a/include/ewram.h b/include/ewram.h index 2528b62d1..e3ae79b7f 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -170,7 +170,6 @@ extern u8 gSharedMem[]; #define ewram18000_3 *(struct Pokemon **)(gSharedMem + 0x18000) #define eBerryBlenderData (struct BerryBlenderData*)(&gSharedMem[0x18000]) #define eEggHatchData (struct EggHatchData*)(&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]) diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index 29bdd332e..02296c27f 100644 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -13,7 +13,7 @@ enum PokemonSummaryScreenMode PSS_MODE_NORMAL, PSS_MODE_MOVES_ONLY, PSS_MODE_SELECT_MOVE, - PSS_MODE_UNKNOWN, // TODO: this mode might be used by pokemon_storage_system + PSS_MODE_MOVE_DELETER, // TODO: this mode might be used by pokemon_storage_system PSS_MODE_NO_MOVE_ORDER_EDIT, PSS_MODE_PC_NORMAL, PSS_MODE_PC_MOVES_ONLY, -- cgit v1.2.3