diff --git a/src/data/personality_test1.h b/src/data/personality_test1.h index 50a2d8a72..5e939f674 100644 --- a/src/data/personality_test1.h +++ b/src/data/personality_test1.h @@ -754,25 +754,37 @@ static const MenuItem gGenderMenu[] = { -UNUSED static const u8 unknownPersonality[NUM_PERSONALITIES] = { - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 +UNUSED static const u8 sUnusedLUT[NUM_PERSONALITIES] = { + [HARDY ] = HARDY + 1, + [DOCILE ] = DOCILE + 1, + [BRAVE ] = BRAVE + 1, + [JOLLY ] = JOLLY + 1, + [IMPISH ] = IMPISH + 1, + [NAIVE ] = NAIVE + 1, + [TIMID ] = TIMID + 1, + [HASTY ] = HASTY + 1, + [SASSY ] = SASSY + 1, + [CALM ] = CALM + 1, + [RELAXED] = RELAXED + 1, + [LONELY ] = LONELY + 1, + [QUIRKY ] = QUIRKY + 1, }; static const s16 gStarters[NUM_PERSONALITIES][2] = { - // MALE / FEMALE - [HARDY] = {MONSTER_CHARMANDER, MONSTER_PIKACHU}, - [DOCILE] = {MONSTER_BULBASAUR, MONSTER_CHIKORITA}, - [BRAVE] = {MONSTER_MACHOP, MONSTER_CHARMANDER}, - [JOLLY] = {MONSTER_SQUIRTLE, MONSTER_TOTODILE}, - [IMPISH] = {MONSTER_PIKACHU, MONSTER_CUBONE}, - [NAIVE] = {MONSTER_TOTODILE, MONSTER_EEVEE}, - [TIMID] = {MONSTER_CYNDAQUIL, MONSTER_MUDKIP}, - [HASTY] = {MONSTER_TORCHIC, MONSTER_SKITTY}, - [SASSY] = {MONSTER_TREECKO, MONSTER_TORCHIC}, - [CALM] = {MONSTER_MUDKIP, MONSTER_BULBASAUR}, - [RELAXED] = {MONSTER_PSYDUCK, MONSTER_SQUIRTLE}, - [LONELY] = {MONSTER_CUBONE, MONSTER_PSYDUCK}, - [QUIRKY] = {MONSTER_MEOWTH, MONSTER_TREECKO} + // MALE FEMALE + [HARDY ] = { MONSTER_CHARMANDER, MONSTER_PIKACHU }, + [DOCILE ] = { MONSTER_BULBASAUR, MONSTER_CHIKORITA }, + [BRAVE ] = { MONSTER_MACHOP, MONSTER_CHARMANDER }, + [JOLLY ] = { MONSTER_SQUIRTLE, MONSTER_TOTODILE }, + [IMPISH ] = { MONSTER_PIKACHU, MONSTER_CUBONE }, + [NAIVE ] = { MONSTER_TOTODILE, MONSTER_EEVEE }, + [TIMID ] = { MONSTER_CYNDAQUIL, MONSTER_MUDKIP }, + [HASTY ] = { MONSTER_TORCHIC, MONSTER_SKITTY }, + [SASSY ] = { MONSTER_TREECKO, MONSTER_TORCHIC }, + [CALM ] = { MONSTER_MUDKIP, MONSTER_BULBASAUR }, + [RELAXED] = { MONSTER_PSYDUCK, MONSTER_SQUIRTLE }, + [LONELY ] = { MONSTER_CUBONE, MONSTER_PSYDUCK }, + [QUIRKY ] = { MONSTER_MEOWTH, MONSTER_TREECKO } };