dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pokemon_summary_screen.c, part 12.

Browse Source
This commit is contained in:
luckytyphlosion
2020-07-04 16:07:40 -04:00
parent 4bf7e4f4fb
commit db2fb7785d
4 changed files with 950 additions and 2633 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/pokemon_summary_screen.s
-2606
View File
File diff suppressed because it is too large Load Diff
include/pokemon_icon.h
+2
View File
@@ -30,5 +30,7 @@ u8 GetMonIconPaletteIndexFromSpecies(u16 species);
u16 GetIconSpecies(u16 species, u32 personality); u16 GetIconSpecies(u16 species, u32 personality);
void LoadMonIconPalettesAt(u16 offset); void LoadMonIconPalettesAt(u16 offset);
u8 GetValidMonIconPalIndex(u16 species); u8 GetValidMonIconPalIndex(u16 species);
void SafeLoadMonIconPalette(u16 species);
void SafeFreeMonIconPalette(u16 species);
#endif // GUARD_POKEMON_ICON_H #endif // GUARD_POKEMON_ICON_H
src/pokemon_storage_system.c
+3 -3
View File
@@ -138,7 +138,7 @@ void SetBoxWallpaper(u8 boxId, u8 wallpaperId)
gPokemonStoragePtr->boxWallpapers[boxId] = wallpaperId; gPokemonStoragePtr->boxWallpapers[boxId] = wallpaperId;
} }
s16 SeekToNextMonInBox(struct BoxPokemon * boxMons, s8 currIndex, u8 maxIndex, u8 flags) s16 SeekToNextMonInBox(struct BoxPokemon * boxMons, s8 curIndex, u8 maxIndex, u8 flags)
{ {
// flags: // flags:
// bit 0: Allow eggs // bit 0: Allow eggs
@@ -152,7 +152,7 @@ s16 SeekToNextMonInBox(struct BoxPokemon * boxMons, s8 currIndex, u8 maxIndex, u
if (flags == 1 || flags == 3) if (flags == 1 || flags == 3)
{ {
for (i = currIndex + adder; i >= 0 && i <= maxIndex; i += adder) for (i = curIndex + adder; i >= 0 && i <= maxIndex; i += adder)
{ {
if (GetBoxMonData(&boxMons[i], MON_DATA_SPECIES) != SPECIES_NONE) if (GetBoxMonData(&boxMons[i], MON_DATA_SPECIES) != SPECIES_NONE)
return i; return i;
@@ -160,7 +160,7 @@ s16 SeekToNextMonInBox(struct BoxPokemon * boxMons, s8 currIndex, u8 maxIndex, u
} }
else else
{ {
for (i = currIndex + adder; i >= 0 && i <= maxIndex; i += adder) for (i = curIndex + adder; i >= 0 && i <= maxIndex; i += adder)
{ {
if (GetBoxMonData(&boxMons[i], MON_DATA_SPECIES) != SPECIES_NONE if (GetBoxMonData(&boxMons[i], MON_DATA_SPECIES) != SPECIES_NONE
&& !GetBoxMonData(&boxMons[i], MON_DATA_IS_EGG)) && !GetBoxMonData(&boxMons[i], MON_DATA_IS_EGG))
src/pokemon_summary_screen.c
+945 -24
View File
File diff suppressed because it is too large Load Diff