atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed funcs, lists, etc. - Teach->Teachable

Browse source
This commit is contained in:
crater-git 2022-08-26 14:48:06 -04:00
parent b8a3cc2846
commit f8fb4e8cf2
8 changed files with 2243 additions and 2243 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/pokemon.h
View file

@ -397,7 +397,7 @@ extern const struct BaseStats gBaseStats[];
extern const u8 *const gItemEffectTable[];
extern const u32 gExperienceTables[][MAX_LEVEL + 1];
extern const struct LevelUpMove *const gLevelUpLearnsets[];
extern const u16 *const gTeachLearnsets[];
extern const u16 *const gTeachableLearnsets[];
extern const u8 gPPUpGetMask[];
extern const u8 gPPUpClearMask[];
extern const u8 gPPUpAddValues[];
@ -510,7 +510,7 @@ u8 CheckPartyHasHadPokerus(struct Pokemon *party, u8 selection);
void UpdatePartyPokerusTime(u16 days);
void PartySpreadPokerus(struct Pokemon *party);
bool8 TryIncrementMonLevel(struct Pokemon *mon);
u8 CanLearnTaughtMove(u16 species, u16 move);
u8 CanLearnTeachableMove(u16 species, u16 move);
u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves);
u8 GetLevelUpMovesBySpecies(u16 species, u16 *moves);
u8 GetNumberOfRelearnableMoves(struct Pokemon *mon);

2
src/apprentice.c
View file

@ -376,7 +376,7 @@ static u16 GetRandomAlternateMove(u8 monId)
do
{
id = Random() % (NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES);
shouldUseMove = CanLearnTaughtMove(species, ItemIdToBattleMoveId(ITEM_TM01 + id));
shouldUseMove = CanLearnTeachableMove(species, ItemIdToBattleMoveId(ITEM_TM01 + id));
}
while (!shouldUseMove);

1279
src/data/pokemon/teach_learnset_pointers.h
View file

File diff suppressed because it is too large Load diff

1279
src/data/pokemon/teachable_learnset_pointers.h Normal file
View file

File diff suppressed because it is too large Load diff

1908
src/data/pokemon/teach_learnsets.h → src/data/pokemon/teachable_learnsets.h
View file

File diff suppressed because it is too large Load diff

2
src/daycare.c
View file

@ -696,7 +696,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru
for (j = 0; j < NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES; j++)
{
u16 moveId = ItemIdToBattleMoveId(ITEM_TM01 + j);
if (sHatchedEggFatherMoves[i] == moveId && CanLearnTaughtMove(GetMonData(egg, MON_DATA_SPECIES2), moveId))
if (sHatchedEggFatherMoves[i] == moveId && CanLearnTeachableMove(GetMonData(egg, MON_DATA_SPECIES2), moveId))
{
if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == MON_HAS_MAX_MOVES)
DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]);

2
src/party_menu.c
View file

@ -2030,7 +2030,7 @@ static u8 CanTeachMove(struct Pokemon *mon, u16 move)
{
if (GetMonData(mon, MON_DATA_IS_EGG))
return CANNOT_LEARN_MOVE_IS_EGG;
else if (!CanLearnTaughtMove(GetMonData(mon, MON_DATA_SPECIES2), move))
else if (!CanLearnTeachableMove(GetMonData(mon, MON_DATA_SPECIES2), move))
return CANNOT_LEARN_MOVE;
else if (MonKnowsMove(mon, move) == TRUE)
return ALREADY_KNOWS_MOVE;

10
src/pokemon.c
View file

@ -1894,14 +1894,14 @@ const s8 gNatureStatTable[NUM_NATURES][NUM_NATURE_STATS] =
#include "data/pokemon/experience_tables.h"
#include "data/pokemon/base_stats.h"
#include "data/pokemon/level_up_learnsets.h"
#include "data/pokemon/teach_learnsets.h"
#include "data/pokemon/teachable_learnsets.h"
#if P_NEW_POKEMON == TRUE
#include "data/pokemon/evolution.h"
#else
#include "data/pokemon/evolution_old.h"
#endif
#include "data/pokemon/level_up_learnset_pointers.h"
#include "data/pokemon/teach_learnset_pointers.h"
#include "data/pokemon/teachable_learnset_pointers.h"
#include "data/pokemon/form_species_tables.h"
#include "data/pokemon/form_species_table_pointers.h"
#include "data/pokemon/form_change_tables.h"
@ -7244,7 +7244,7 @@ bool8 TryIncrementMonLevel(struct Pokemon *mon)
}
}
u8 CanLearnTaughtMove(u16 species, u16 move)
u8 CanLearnTeachableMove(u16 species, u16 move)
{
if (species == SPECIES_EGG)
{
@ -7253,9 +7253,9 @@ u8 CanLearnTaughtMove(u16 species, u16 move)
else
{
u8 i;
for (i = 0; gTeachLearnsets[species][i] != MOVE_UNAVAILABLE; i++)
for (i = 0; gTeachableLearnsets[species][i] != MOVE_UNAVAILABLE; i++)
{
if (gTeachLearnsets[species][i] == move) {
if (gTeachableLearnsets[species][i] == move) {
return TRUE;
}
}