dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6

Browse Source
This commit is contained in:
GriffinR
2025-05-14 11:50:11 -04:00
parent 07c897ad48 0aae36984f
commit 929bc8b990
276 changed files with 11759 additions and 11089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pokemon_storage_system.c
View File

@@ -432,7 +432,7 @@ struct PokemonStorageSystemData
u16 scrollUnused5; // Never read
u16 scrollUnused6; // Never read
u8 filler1[22];
u8 boxTitleTiles[1024];
u8 ALIGNED(2) boxTitleTiles[1024];
u8 boxTitleCycleId;
u8 wallpaperLoadState; // Written to, but never read.
u8 wallpaperLoadBoxId;
@@ -9633,9 +9633,9 @@ u32 CountAllStorageMons(void)
return count;
}
bool32 AnyStorageMonWithMove(u16 moveId)
bool32 AnyStorageMonWithMove(u16 move)
{
u16 moves[] = {moveId, MOVES_COUNT};
u16 moves[] = {move, MOVES_COUNT};
s32 i, j;
for (i = 0; i < TOTAL_BOXES_COUNT; i++)