Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-08-26 18:55:56 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better match for the two

Browse Source 
Co-authored by: SethBarberee <seth.barberee@gmail.com>
Co-authored by: jiangzhengwenjz <jiangzhengwenjz@users.noreply.github.com>
This commit is contained in:
Seth Barberee
2023-01-30 21:08:11 -08:00
parent 5536be8ef8
commit 94cdc3faae
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/moves.c
View File

@@ -174,44 +174,49 @@ u8 GetMoveType(struct Move *move)
return gMovesData[move->id].type;
}
u8 *GetLevelUpMoves(s16 species)
{
#ifndef NONMATCHING
s32 species_s32, species_s32_1 = species;
asm("add \tr2, r1, #0");
#ifndef NONMATCHING
register s32 species1 asm("r1"), species2;
#else
s32 species_s32, species_s32_1 = species;
s32 species1, species2;
#endif
if (species_s32_1 == MONSTER_DECOY || species_s32_1 == MONSTER_NONE)
species1 = species;
species2 = species1;
if (species1 == MONSTER_DECOY || species1 == MONSTER_NONE)
{
return &gUnknown_810992B;
}
if (species_s32 == MONSTER_MUNCHLAX)
if (species2 == MONSTER_MUNCHLAX)
{
return &gUnknown_810992B;
}
return (*gMoveLearnsets)[species_s32].levelUpMoves;
return (*gMoveLearnsets)[species2].levelUpMoves;
}
u8 *GetHMTMMoves(s16 species)
{
#ifndef NONMATCHING
s32 species_s32, species_s32_1 = species;
asm("add \tr2, r1, #0");
#ifndef NONMATCHING
register s32 species1 asm("r1"), species2;
#else
s32 species_s32, species_s32_1 = species;
s32 species1, species2;
#endif
if (species_s32_1 == MONSTER_DECOY || species_s32_1 == MONSTER_NONE)
species1 = species;
species2 = species1;
if (species1 == MONSTER_DECOY || species1 == MONSTER_NONE)
{
return &gUnknown_810992B;
}
if (species_s32 == MONSTER_MUNCHLAX)
if (species2 == MONSTER_MUNCHLAX)
{
return &gUnknown_810992B;
}
return (*gMoveLearnsets)[species_s32].HMTMMoves;
return (*gMoveLearnsets)[species2].HMTMMoves;
}
u8 GetMoveAIWeight(struct Move *move)