summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorhjk321 <anderdude@outlook.com>2021-02-22 10:04:27 -0600
committerhjk321 <anderdude@outlook.com>2021-02-22 10:04:27 -0600
commitfc16ee9498c8283a2bb520f524409999ba27612b (patch)
treee28c8c8f43a268059b3fb51047c4bd36a954a5a9 /include
parent33126a06331f8afce668a1152a26e9ed6f5d9a16 (diff)
Fix storage magic numbers
I could *kinda* understand missing SendMonToPc, but IN THE STRUCT ITSELF?!
Diffstat (limited to 'include')
-rw-r--r--include/pokemon.h7
1 files changed, 4 insertions, 3 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