diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-22 11:26:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 11:26:52 -0500 |
| commit | 12c7dab2194f707daf51a9da13b0b38e2f856a04 (patch) | |
| tree | b333d98e65ce3821061a1f956dd396a5bc688df9 | |
| parent | 5351028d7e00acb885bf81aab46b03d2be6f34d8 (diff) | |
| parent | fc16ee9498c8283a2bb520f524409999ba27612b (diff) | |
Merge pull request #396 from hjk321/storage-magic
Change embarassing magic numbers that should have been fixed a long time ago
| -rw-r--r-- | include/pokemon.h | 7 | ||||
| -rw-r--r-- | src/pokemon.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 3460b76dd..6a9b657ea 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -4,6 +4,7 @@ #include "global.h" #include "sprite.h" #include "constants/pokemon.h" +#include "pokemon_storage_system.h" struct PokemonSubstruct0 { @@ -125,9 +126,9 @@ struct Pokemon struct PokemonStorage { /*0x0000*/ u8 currentBox; - /*0x0001*/ struct BoxPokemon boxes[14][30]; - /*0x8344*/ u8 boxNames[14][BOX_NAME_LENGTH + 1]; - /*0x83C2*/ u8 boxWallpapers[14]; + /*0x0001*/ struct BoxPokemon boxes[TOTAL_BOXES_COUNT][IN_BOX_COUNT]; + /*0x8344*/ u8 boxNames[TOTAL_BOXES_COUNT][BOX_NAME_LENGTH + 1]; + /*0x83C2*/ u8 boxWallpapers[TOTAL_BOXES_COUNT]; }; struct BattleTowerPokemon diff --git a/src/pokemon.c b/src/pokemon.c index c0960f552..f58aee9b3 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -3646,7 +3646,7 @@ static u8 SendMonToPC(struct Pokemon* mon) do { - for (boxPos = 0; boxPos < 30; boxPos++) + for (boxPos = 0; boxPos < IN_BOX_COUNT; boxPos++) { struct BoxPokemon* checkingMon = GetBoxedMonPtr(boxNo, boxPos); if (GetBoxMonData(checkingMon, MON_DATA_SPECIES, NULL) == SPECIES_NONE) @@ -3663,7 +3663,7 @@ static u8 SendMonToPC(struct Pokemon* mon) } boxNo++; - if (boxNo == 14) + if (boxNo == TOTAL_BOXES_COUNT) boxNo = 0; } while (boxNo != StorageGetCurrentBox()); |