diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 14:43:07 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 14:43:07 -0400 |
| commit | 0117d43fa758bfc12a8bf5c3dd09a625556a644c (patch) | |
| tree | 47499078917499aa228e76097a25cb478f9553b1 | |
| parent | 849725d85e7379c939c459f1e38e9693e24fc378 (diff) | |
Merge UNK_STRUCT_2018000 into pssData
| -rw-r--r-- | include/ewram.h | 1 | ||||
| -rw-r--r-- | include/pokemon_summary_screen.h | 2 | ||||
| -rw-r--r-- | src/pokemon_summary_screen.c | 4 | ||||
| -rw-r--r-- | src/script_pokemon_util_80F99CC.c | 2 |
4 files changed, 4 insertions, 5 deletions
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, diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 9009bff59..3141b9d8c 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -659,7 +659,7 @@ void sub_809DA1C(void) pssData.inputHandlingTaskId = CreateTask(SummaryScreenHandleKeyInput, 0); break; case PSS_MODE_SELECT_MOVE: - case PSS_MODE_UNKNOWN: + case PSS_MODE_MOVE_DELETER: pssData.inputHandlingTaskId = CreateTask(sub_809EB40, 0); break; case PSS_MODE_MOVES_ONLY: @@ -1894,7 +1894,7 @@ static bool8 SummaryScreen_CanForgetSelectedMove(u8 taskId) SummaryScreen_GetPokemon(&mon); move = GetMonMove(&mon, pssData.selectedMoveIndex); - if (IsHMMove(move) == TRUE && pssData.mode != PSS_MODE_UNKNOWN) + if (IsHMMove(move) == TRUE && pssData.mode != PSS_MODE_MOVE_DELETER) return FALSE; return TRUE; } diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c index cc05f9fde..89c803a8b 100644 --- a/src/script_pokemon_util_80F99CC.c +++ b/src/script_pokemon_util_80F99CC.c @@ -277,7 +277,7 @@ void HandleMoveTutorPartyMenu(u8 var) void SelectMove(void) { ShowSelectMovePokemonSummaryScreen(&gPlayerParty[0], gSpecialVar_0x8004, gPlayerPartyCount - 1, CB2_ReturnToField, 0); - UNK_2018000_STRUCT.unk8 = 3; + pssData.mode = PSS_MODE_MOVE_DELETER; gFieldCallback = sub_8080990; } |