From fc16ee9498c8283a2bb520f524409999ba27612b Mon Sep 17 00:00:00 2001 From: hjk321 Date: Mon, 22 Feb 2021 10:04:27 -0600 Subject: Fix storage magic numbers I could *kinda* understand missing SendMonToPc, but IN THE STRUCT ITSELF?! --- include/pokemon.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'include') 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 -- cgit v1.2.3