Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-03-21 17:46:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

DungeonMonIsOnTeam

Browse Source
This commit is contained in:
Eduardo Quezada 2025-11-27 14:29:52 -03:00
parent 3c773fc453
commit b35329f119
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pokemon.h
View File

@ -134,7 +134,7 @@ static inline bool8 PokemonIsOnTeam(Pokemon *mon)
return (mon->flags & POKEMON_FLAG_ON_TEAM) != 0;
}
static inline bool8 PokemonFlag2Struct2(DungeonMon *mon)
static inline bool8 DungeonMonIsOnTeam(DungeonMon *mon)
{
return (mon->flags & POKEMON_FLAG_ON_TEAM) != 0;
}

2
src/dungeon_misc.c
View File

@ -92,7 +92,7 @@ void LoadDungeonPokemonSprites(void)
{
DungeonMon *ptr = &gRecruitedPokemonRef->dungeonTeam[index];
if(DungeonMonExists(ptr))
if(PokemonFlag2Struct2(ptr))
if(DungeonMonIsOnTeam(ptr))
LoadPokemonSprite(ptr->speciesNum, FALSE);
}
if(gDungeon->fixedRoomNumber == FIXED_ROOM_RESCUE_TEAM_MAZE_BOSS)

8
src/dungeon_mon_spawn.c
View File

@ -191,7 +191,7 @@ UNUSED static s32 sub_806B09C(SpawnPokemonData *unkPtr, bool8 a1)
for (i = 0, unk2Field = unkPtr->randNum, loopPtr = unkPtr; i < MAX_TEAM_MEMBERS; i++) {
DungeonMon *monStructPtr = &gRecruitedPokemonRef->dungeonTeam[i];
if (DungeonMonExists(monStructPtr) && PokemonFlag2Struct2(monStructPtr))
if (DungeonMonExists(monStructPtr) && DungeonMonIsOnTeam(monStructPtr))
{
for (j = 0; j < count; j++) {
if (ExtractSpeciesIndex(&unkPtr[j]) == monStructPtr->speciesNum)
@ -237,7 +237,7 @@ void sub_806B168(void)
count = 0;
for (i = 0; i < MAX_TEAM_MEMBERS; i++) {
DungeonMon *currMonPtr = &gRecruitedPokemonRef->dungeonTeam[i];
if (DungeonMonExists(currMonPtr) && PokemonFlag2Struct2(currMonPtr)) {
if (DungeonMonExists(currMonPtr) && DungeonMonIsOnTeam(currMonPtr)) {
monPtrs[count++] = currMonPtr;
}
}
@ -339,7 +339,7 @@ void sub_806B404(void)
for (i = 0; i < MAX_TEAM_MEMBERS; i++) {
DungeonMon *currMonPtr = &gRecruitedPokemonRef->dungeonTeam[i];
if (DungeonMonExists(currMonPtr) && PokemonFlag2Struct2(currMonPtr) && currMonPtr->recruitedPokemonId == UNK_RECRUITED_POKEMON_ID_55AA) {
if (DungeonMonExists(currMonPtr) && DungeonMonIsOnTeam(currMonPtr) && currMonPtr->recruitedPokemonId == UNK_RECRUITED_POKEMON_ID_55AA) {
monPtrs[count++] = currMonPtr;
break;
}
@ -367,7 +367,7 @@ void sub_806B404(void)
s32 j;
DungeonMon *currMonPtr = monPtrs[i];
if (currMonPtr != NULL && DungeonMonExists(currMonPtr) && PokemonFlag2Struct2(currMonPtr) && currMonPtr->recruitedPokemonId == UNK_RECRUITED_POKEMON_ID_55AA) {
if (currMonPtr != NULL && DungeonMonExists(currMonPtr) && DungeonMonIsOnTeam(currMonPtr) && currMonPtr->recruitedPokemonId == UNK_RECRUITED_POKEMON_ID_55AA) {
currMonPtr->recruitedPokemonId = UNK_RECRUITED_POKEMON_ID_5AA5;
skipNextLoop = FALSE;
j = 0;