Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-09-29 20:37:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #350 from FexCollects/master
Some checks failed
GithubCI / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Seth Barberee
2025-03-05 06:45:23 -08:00
committed by GitHub
parent d232ae74b7 79da9a38a5
commit 91d397caea
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/pokemon.h
View File

@@ -74,7 +74,7 @@ s16 GetAlphabetParentNo(s16 index, s32 r1);
s16 GetInternalNo(s16 index);
s32 CalculateEXPGain(s16 index, s32 level);
s16 GetPokemonEvolveConditons(s16 index, unkEvolve *);
u8 GetPokemonOverworldPalette(s16 index, u32 r1);
u8 GetPokemonOverworldPalette(s16 index, bool32 recolorShopKecleon);
bool8 IsPokemonDialogueSpriteAvail(s16 index, s32 spriteId);
OpenedFile *OpenPokemonDialogueSpriteFile(s16 index);
OpenedFile *GetDialogueSpriteDataPtr(s32 index);

4
src/code_8069E0C.c
View File

@@ -2084,10 +2084,10 @@ void sub_806C51C(Entity *entity)
}
if (decoySprite) {
overworldPal = GetPokemonOverworldPalette(MONSTER_DECOY, 0);
overworldPal = GetPokemonOverworldPalette(MONSTER_DECOY, FALSE);
}
else {
overworldPal = GetPokemonOverworldPalette(entInfo->apparentID, 0);
overworldPal = GetPokemonOverworldPalette(entInfo->apparentID, FALSE);
}
if (entity->unk22 == 0) {

2
src/friend_areas_map_util.c
View File

@@ -71,7 +71,7 @@ void FriendAreasMap_InitGfx(void)
gFriendAreasMapPtr->unk0[4] = OpenFileAndGetFileDataPtr(gUnknown_80D408C[2], &gTitleMenuFileArchive);
gFriendAreasMapPtr->unk0[1] = OpenFileAndGetFileDataPtr("palet", &gMonsterFileArchive);
gFriendAreasMapPtr->unk0[0] = OpenFileAndGetFileDataPtr(gUnknown_80D408C[3], &gTitleMenuFileArchive);
gFriendAreasMapPtr->unk4DD0 = GetPokemonOverworldPalette(pokeStruct->speciesNum, 0);
gFriendAreasMapPtr->unk4DD0 = GetPokemonOverworldPalette(pokeStruct->speciesNum, FALSE);
sub_8005610(gFriendAreasMapPtr->unk0[2], 0x40, 0x1F, 0);

4
src/pokemon.c
View File

@@ -889,10 +889,10 @@ s16 GetPokemonEvolveConditions(s16 index, unkEvolve *r1)
return index;
}
u8 GetPokemonOverworldPalette(s16 index, u32 r1)
u8 GetPokemonOverworldPalette(s16 index, bool32 recolorShopKecleon)
{
s32 id = SpeciesId(index);
if (r1 != 0)
if (recolorShopKecleon)
{
return 10;
}

2
src/world_map.c
View File

@@ -291,7 +291,7 @@ static void sub_801059C(void)
sWorldMapPtr->unk1100[4] = OpenFileAndGetFileDataPtr(gUnknown_80D4014[2], &gTitleMenuFileArchive);
sWorldMapPtr->unk1100[1] = OpenFileAndGetFileDataPtr("palet", &gMonsterFileArchive);
sWorldMapPtr->unk1100[0] = OpenFileAndGetFileDataPtr(gUnknown_80D4014[3], &gTitleMenuFileArchive);
sWorldMapPtr->unk52D4 = GetPokemonOverworldPalette(pokeStruct->speciesNum, 0);
sWorldMapPtr->unk52D4 = GetPokemonOverworldPalette(pokeStruct->speciesNum, FALSE);
sub_8005610(sWorldMapPtr->unk1100[2], 0x40, 0x1F, 0);