Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Aaghat 2023-09-08 21:47:43 +05:30
parent e8f56d5c68
commit 7832a43544
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/party_menu.h
View File

@ -96,8 +96,5 @@ void MoveDeleterForgetMove(void);
void BufferMoveDeleterNicknameAndMove(void);
void GetNumMovesSelectedMonHas(void);
void MoveDeleterChooseMoveToForget(void);
#if POKEDEX_PLUS_HGSS == TRUE
u16 GetTMHMMoves(u16 item);
#endif
#endif // GUARD_PARTY_MENU_H

5
src/party_menu.c
View File

@ -6964,8 +6964,3 @@ void IsLastMonThatKnowsSurf(void)
gSpecialVar_Result = TRUE;
}
}
u16 GetTMHMMoves(u16 item)
{
return (ItemId_GetPocket(item) == POCKET_TM_HM) ? gItems[item].secondaryId : MOVE_NONE;
}

4
src/pokedex_plus_hgss.c
View File

@ -159,7 +159,7 @@ static EWRAM_DATA u16 sLastSelectedPokemon = 0;
static EWRAM_DATA u8 sPokeBallRotation = 0;
static EWRAM_DATA struct PokedexListItem *sPokedexListItem = NULL;
//Pokedex Plus HGSS_Ui
#define MOVES_COUNT_TOTAL (EGG_MOVES_ARRAY_COUNT + MAX_LEVEL_UP_MOVES + NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES + 20)
#define MOVES_COUNT_TOTAL (EGG_MOVES_ARRAY_COUNT + MAX_LEVEL_UP_MOVES + NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES)
EWRAM_DATA static u16 sStatsMoves[MOVES_COUNT_TOTAL] = {0};
EWRAM_DATA static u16 sStatsMovesTMHM_ID[NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES] = {0};
@ -5108,7 +5108,7 @@ static bool8 CalculateMoves(void)
move = gTeachableLearnsets[species][i];
for (j = 0; j < NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES; j++)
{
if (GetTMHMMoves(j) == move)
if (ItemIdToBattleMoveId(ITEM_TM01 + j) == move)
{
sStatsMovesTMHM_ID[numTMHMMoves] = (ITEM_TM01 + j);
numTMHMMoves++;