From 9f0da24417209c9cde160361398985d600d2c5f5 Mon Sep 17 00:00:00 2001 From: Skeli Date: Fri, 1 May 2020 15:02:28 +0300 Subject: [PATCH] Fix Pokedex Issues --- BPRE.ld | 1 + assembly/pokedex_hooks.s | 66 +- .../backspr/gBackShinySprite009Blastoise.png | Bin 792 -> 792 bytes .../frontspr/gFrontSprite009Blastoise.png | Bin 1010 -> 971 bytes hooks | 6 +- include/pokedex.h | 73 +- include/species.h | 2 + repointall | 1 + src/Front_Pic_Coords_Table.c | 2 +- src/Pokedex_Data_Table.c | 6171 ++++++++++++----- src/Pokedex_Orders.c | 5959 +++++++++------- src/updated_code.c | 130 +- 12 files changed, 7981 insertions(+), 4430 deletions(-) diff --git a/BPRE.ld b/BPRE.ld index 612b1d3..4f76b41 100644 --- a/BPRE.ld +++ b/BPRE.ld @@ -7,6 +7,7 @@ __umodsi3 = 0x081E4684|1; memcpy_ = 0x081E5E78|1; memset_ = 0x081E5ED8|1; +gPokedexScreenDataPtr = 0x203ACF0; gMain = 0x30030F0; GetGenderFromSpeciesAndPersonality = 0x803F78C | 1; diff --git a/assembly/pokedex_hooks.s b/assembly/pokedex_hooks.s index 50c6a1b..1d0d6cb 100644 --- a/assembly/pokedex_hooks.s +++ b/assembly/pokedex_hooks.s @@ -16,62 +16,13 @@ RegularPokedexMemoryAlloc: PokedexMemoryAllocReturn: ldr r1, =0x81025F0 | 1 +bxr1: bx r1 .align 2 .RegularPokedexSize: .word 0xC10 .ExpandedPokedexSize: .word 999 * 8 -.pool -@0x8103530 with r1 -PrepareDexListViewsHook: - cmp r0, #0x0 - beq PrepareDexListViewsReturn - ldr r2, =gNumDexEntries - ldrh r2, [r2] - str r2, [sp] - -PrepareDexListViewsReturn: - ldr r2, =gRegionalDexCount - ldrh r2, [r2] - sub r2, #0x1 - lsl r2, #0x1 - ldr r0, =gPokedexOrder_Regional - ldrh r2, [r0, r2] @Load final dexNum in regional dex - ldr r0, =0x810353A | 1 - bx r0 - -@0x810356C with r0 -RegionalDexHook: - mov r4, r8 - lsl r0, r4, #0x1 @;Index x2 - ldr r1, =gPokedexOrder_Regional - ldrh r0, [r1, r0] - add r4, #0x1 - mov r5, r0 - mov r1, #0 - ldr r2, =0x8103578 | 1 - bx r2 - -@0x81035B4 with r1 -StoreLastDexSeenHook: - str r0, [r2] - mov r10, r4 - mov r4, r3 - ldr r0, =0x081035D6 | 1 - bx r0 - -@0x081035F4 with r0 -LazyRegionalDexEndHook: - mov r0, r8 - ldr r1, =gRegionalDexCount - ldrh r1, [r1] - cmp r0, r1 - bcc RegionalDexHook - ldr r1, =0x08103906 | 1 -bxr1: - bx r1 - @0x8104A66 with r1 DisplayRegionalDexNumHook: mov r5, r0 @@ -92,26 +43,13 @@ DisplayRegionalDexNumHook: UseRegionalDexOrdering: mov r0, r5 - ldr r1, =SpeciesToNationalPokedexNum - bl bxr1 - bl NatDexNumToRegionalDexNum + bl SpeciesToRegionalDexNum DisplayDexNumberReturn: mov r5, r0 ldr r0, =0x8104A70 | 1 bx r0 -.pool -@0x8103684 with r1 -AlphabeticalDexHook: - add r8, r0 - ldr r0, =gNumDexEntries - ldrh r0, [r0] - sub r0, #0x1 - cmp r8, r0 - ldr r1, =0x810368C | 1 - bx r1 - .pool @0x8105CBC with r0 AlternateDexEntriesHook: diff --git a/graphics/backspr/gBackShinySprite009Blastoise.png b/graphics/backspr/gBackShinySprite009Blastoise.png index d42200ad8af7ac91566259a29658b3a890093da2..2830d4a379055a525a6e88533d590e12d0b0cfb7 100644 GIT binary patch delta 18 acmbQiHiKTO{E zi7~>^YiV4}UMyojk8Fp)Lf4pF_B4nkfi{pS`UjRUq=zjuIq0?rV;1eTEG7OoN^j}Y zIG)jLA=mcVV9@*UeLp1!!T-mOkDvB`@yqh3CxL-pzIqanI)7OX@%JEU&H#Mil0QR< zB<$5kof$};pvwUiP z2k6)S1I|PIBt3{!S%UEU2HlTs=*I2*JC z2zO0F>rw_9q=CuRpzyk|3xNX9-y{8%)dbS)Dn`v~@Y4ZXAeE8Utm;j_JfvVXXq)9=U9Ul?3#C?EYd7I%EY`R73I zgF^ic`qx#X_+-?Iz|+MCg-e4)taq0r;@*QrLQW(5Xrn#Aldo!kx_Rw^-8E$bAA@Ek zs&?;yakWxujAsonas%51*^H};OdZe^a**K2X@)tfH=+sV)q5l?{)&M<1Q(_1e9S!Paju8iv)qAp)c14Mk|zke6~mhv_=6i zU5RM_2OwQVtm6X#SzgsS5%Z2F@sVyx1YXL-6wLf4KLgtE+^kxEIR8dW@sztA@xQl! Y0GPhey9vov@&Et;07*qoM6N<$g0Wwz)c^nh delta 938 zcmV;b16BOX2l5AyR(}8h0AHfQ)BpejeMv+?RCt`-l|gG8M-<1m0gE0pW3iX?;GHV# zIO(O`e1Vk*LFpxwNJcm*(qcVHj(rhGgV5RXpyXuG8j*91S&~8mwkUHe)CjTeq33Kq zKq>tUeY2}NyS8=grE}Ol{D1S_|GjxTYZ(8}^~K%f&6WXQe}A`T5OVhpzhAx`*m+C| z=Pu*x;>oQ*gY!JcWeL%{A$}?4(0t0{RTN^J4l#t9AxEc&=cSzlaMvf3T54}NI*~ze zs1R@qn~#xbXMk7XEZ7ZBl{!a>atEKKiJuNI4@WY1sg#Am#SZ$+m&Ta@!&kGD(}D5} zoZs8~zzdwU8-M8lGiZe)bN~qau&bCwn)g#B9F(C^8J%vc3M^{iJP&6rt>gBq!vcT+flX%>UF?5E z6@USx&VQmMbp-Be7o{kSEo5e~C5O#^AqI#YX<}Zx2Eaidr)1M1j%y(?mstQn9!!pS z9D}U2Ii&0~n60zQywnXWxtGe}%UIlScIjXQilq6#MA% zZpT0Aw#d$?(F~z-JR4vv~&a7<#xBu#*5dt{5VnA^}`tkCFg5ubD=G7hi0I zntuU$#BpT|vYqmX)`@8b0n~CVCNhnxTY1!J-PEI6jRBUq1nXE8Ay#6%dZhJ@$v6ev zp{RR{?&h?K{zm$eGjh1wBUkMQSQn5nks}oK)cJtOcr+>`Ua14jemE<~j9P?|r9Y9J z=sx;Dl~r2?7|>MHN9ug3ZWv`XZK#_+kRw!*LGS8bU6N#Z{{MRY1Gg}p?QW6rEC2ui M07*qoM6N<$f_;#_g8%>k diff --git a/hooks b/hooks index 81f5810..5f1e447 100644 --- a/hooks +++ b/hooks @@ -17,11 +17,7 @@ HasAllMons 8088F84 0 GenderedMonIconHook 8096E38 2 GetIconSpecies 8096F5C 2 PokedexMemoryAllocationHook 81025E8 0 -PrepareDexListViewsHook 8103530 1 -RegionalDexHook 810356C 0 -StoreLastDexSeenHook 81035B4 1 -LazyRegionalDexEndHook 81035F4 0 -AlphabeticalDexHook 8103684 1 +LoadPokedexViews 8103518 1 DisplayRegionalDexNumHook 8104A66 1 CountSpeciesInDex 8104BBC 2 AlternateDexEntriesHook 8105CBC 0 diff --git a/include/pokedex.h b/include/pokedex.h index be0c4f0..2c12874 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -6,13 +6,13 @@ struct PokedexEntry /*0x0C*/ u16 height; //in decimeters /*0x0E*/ u16 weight; //in hectograms /*0x10*/ const u8* description; - /*0x14*/ u16 unused; - /*0x16*/ u16 pokemonScale; - /*0x18*/ u16 pokemonOffset; - /*0x1A*/ u16 trainerScale; - /*0x1C*/ u16 trainerOffset; - /*0x1E*/ u16 unknown1; - /*0x20*/ u32 unknown2; + /*0x14*/ const u8* unusedDescription; + /*0x18*/ u16 unused; + /*0x1A*/ u16 pokemonScale; + /*0x1C*/ u16 pokemonOffset; + /*0x1E*/ u16 trainerScale; + /*0x20*/ u16 trainerOffset; + /*0x22*/ u16 unused2; }; /*size = 0x24*/ struct AlternateDexEntries @@ -21,6 +21,65 @@ struct AlternateDexEntries const u8* description; }; +struct ListMenuItem +{ + const u8* name; + s32 id; +}; + +struct PokedexScreenData +{ + u8 field_00; + u8 field_01; + u8 field_02; + u8 field_03; + u8 field_04; + u32 field_08; + u32 field_0C; + u16 field_10; + u16 field_12; + u8 field_14; + u8 field_15; + u8 field_16; + u8 field_17; + u16 field_18[0x4]; + u8 field_20[0x4]; + u8 field_24[0x4]; + u8 field_28; + u8 field_29; + u8 field_2A; + u8 field_2B; + u8 field_2C; + u8 field_2D; + u8 field_2E; + u8 field_2F; + u32 field_30; + u16 field_34; + u16 field_36; + u16 field_38; + u16 field_3A; + u16 field_3C; + u16 field_3E; + u8 field_40; + u8 field_41; + u8 field_42; + struct ListMenuItem* listItem; + u16 field_48; + u8 field_4A[0x10]; + u16 field_5A; + u16 * field_5C; + u8 field_60; + u8 field_61; + u16 field_62; + u8 field_64; + u16 field_66; + u16 field_68; + u16 field_6A; + u16 field_6C; +}; + +struct PokedexScreenData* gPokedexScreenDataPtr; + enum { FLAG_GET_SEEN, diff --git a/include/species.h b/include/species.h index 93388f9..c67c6c1 100644 --- a/include/species.h +++ b/include/species.h @@ -1,5 +1,7 @@ #pragma once +#define POKEMON_NAME_LENGTH 10 + #define SPECIES_NONE 0x0 #define SPECIES_BULBASAUR 0x1 #define SPECIES_IVYSAUR 0x2 diff --git a/repointall b/repointall index 37f0c5d..d796da7 100644 --- a/repointall +++ b/repointall @@ -27,6 +27,7 @@ gSpeciesToNationalPokedexNum 0804323C gPokedexOrder_Alphabetical 08103694 gPokedexOrder_Weight 081037CC gPokedexOrder_Height 08103868 +gPokedexOrder_Type 8103734 gMonIconTable 08000138 gMonIconPaletteIndices 0800013C diff --git a/src/Front_Pic_Coords_Table.c b/src/Front_Pic_Coords_Table.c index b598fe9..d6a00ad 100644 --- a/src/Front_Pic_Coords_Table.c +++ b/src/Front_Pic_Coords_Table.c @@ -51,7 +51,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] = [SPECIES_BLASTOISE] = { .size = 0x87, - .y_offset = 0x5, + .y_offset = 0x4, }, [SPECIES_CATERPIE] = { diff --git a/src/Pokedex_Data_Table.c b/src/Pokedex_Data_Table.c index 8f4e5b4..5f0c7da 100644 --- a/src/Pokedex_Data_Table.c +++ b/src/Pokedex_Data_Table.c @@ -10,13 +10,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 0, .weight = 0, .description = (const u8*) 0x8444c35, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BULBASAUR] = { @@ -24,19 +22,18 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 7, .weight = 69, .description = (const u8*) 0x8444cb2, - .unused = 19729, - .pokemonScale = 2116, - .pokemonOffset = 0, - .trainerScale = 356, - .trainerOffset = 16, - .unknown1 = 256, - .unknown2 = 65534, + .unusedDescription = (const u8*) 0x8444d11, + .pokemonScale = 356, + .pokemonOffset = 16, + .trainerScale = 256, + .trainerOffset = 65534, }, [NATIONAL_DEX_IVYSAUR] = { .categoryName = {_S, _e, _e, _d, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 10, .weight = 130, +<<<<<<< Updated upstream .description = (const u8*) 0x8444d1c, .unused = 19830, .pokemonScale = 2116, @@ -45,12 +42,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 11, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8444d12, + .unusedDescription = (const u8*) 0x8444d76, + .pokemonScale = 332, + .pokemonOffset = 11, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_VENUSAUR] = { .categoryName = {_S, _e, _e, _d, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 20, .weight = 1000, +<<<<<<< Updated upstream .description = (const u8*) 0x8444d8c, .unused = 19934, .pokemonScale = 2116, @@ -59,12 +65,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 375, .unknown2 = 6, +======= + .description = (const u8*) 0x8444d77, + .unusedDescription = (const u8*) 0x8444dde, + .pokemonScale = 256, + .pokemonOffset = 1, + .trainerScale = 375, + .trainerOffset = 6, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CHARMANDER] = { .categoryName = {_L, _i, _z, _a, _r, _d, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 85, +<<<<<<< Updated upstream .description = (const u8*) 0x8444de8, .unused = 20039, .pokemonScale = 2116, @@ -73,12 +88,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 16, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8444ddf, + .unusedDescription = (const u8*) 0x8444e47, + .pokemonScale = 410, + .pokemonOffset = 16, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CHARMELEON] = { .categoryName = {_F, _l, _a, _m, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 11, .weight = 190, +<<<<<<< Updated upstream .description = (const u8*) 0x8444e59, .unused = 20140, .pokemonScale = 2116, @@ -87,26 +111,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 8, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8444e48, + .unusedDescription = (const u8*) 0x8444eac, + .pokemonScale = 294, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CHARIZARD] = { .categoryName = {_F, _l, _a, _m, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 17, .weight = 905, +<<<<<<< Updated upstream .description = (const u8*) 0x8444ec6, .unused = 20247, .pokemonScale = 2116, +======= + .description = (const u8*) 0x8444ead, + .unusedDescription = (const u8*) 0x8444f17, + .pokemonScale = 271, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 271, - .trainerOffset = 0, - .unknown1 = 317, - .unknown2 = 3, + .trainerScale = 317, + .trainerOffset = 3, }, [NATIONAL_DEX_SQUIRTLE] = { .categoryName = {_T, _i, _n, _y, _SPACE, _T, _u, _r, _t, _l, _e, _END}, .height = 5, .weight = 90, +<<<<<<< Updated upstream .description = (const u8*) 0x8444f39, .unused = 20351, .pokemonScale = 2116, @@ -115,12 +152,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 16, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8444f18, + .unusedDescription = (const u8*) 0x8444f7f, + .pokemonScale = 412, + .pokemonOffset = 16, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_WARTORTLE] = { .categoryName = {_T, _u, _r, _t, _l, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 10, .weight = 225, +<<<<<<< Updated upstream .description = (const u8*) 0x8444f93, .unused = 20454, .pokemonScale = 2116, @@ -129,12 +175,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 9, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8444f80, + .unusedDescription = (const u8*) 0x8444fe6, + .pokemonScale = 334, + .pokemonOffset = 9, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_BLASTOISE] = { .categoryName = {_S, _h, _e, _l, _l, _f, _i, _s, _h, _END, _SPACE, _SPACE}, .height = 16, .weight = 855, +<<<<<<< Updated upstream .description = (const u8*) 0x8444fee, .unused = 20553, .pokemonScale = 2116, @@ -143,12 +198,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 329, .unknown2 = 3, +======= + .description = (const u8*) 0x8444fe7, + .unusedDescription = (const u8*) 0x8445049, + .pokemonScale = 256, + .pokemonOffset = 1, + .trainerScale = 329, + .trainerOffset = 3, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CATERPIE] = { .categoryName = {_W, _o, _r, _m, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 3, .weight = 29, +<<<<<<< Updated upstream .description = (const u8*) 0x8445059, .unused = 20654, .pokemonScale = 2116, @@ -157,12 +221,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 20, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844504a, + .unusedDescription = (const u8*) 0x84450ae, + .pokemonScale = 549, + .pokemonOffset = 20, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_METAPOD] = { .categoryName = {_C, _o, _c, _o, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 7, .weight = 99, +<<<<<<< Updated upstream .description = (const u8*) 0x84450cc, .unused = 20750, .pokemonScale = 2116, @@ -171,12 +244,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 18, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84450af, + .unusedDescription = (const u8*) 0x844510e, + .pokemonScale = 350, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_BUTTERFREE] = { .categoryName = {_B, _u, _t, _t, _e, _r, _f, _l, _y, _END, _SPACE, _SPACE}, .height = 11, .weight = 320, +<<<<<<< Updated upstream .description = (const u8*) 0x8445138, .unused = 20847, .pokemonScale = 2116, @@ -185,12 +267,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844510f, + .unusedDescription = (const u8*) 0x844516f, + .pokemonScale = 312, + .pokemonOffset = 2, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_WEEDLE] = { .categoryName = {_H, _a, _i, _r, _y, _SPACE, _B, _u, _g, _END, _SPACE, _SPACE}, .height = 3, .weight = 32, +<<<<<<< Updated upstream .description = (const u8*) 0x844519f, .unused = 20946, .pokemonScale = 2116, @@ -199,12 +290,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 19, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445170, + .unusedDescription = (const u8*) 0x84451d2, + .pokemonScale = 455, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_KAKUNA] = { .categoryName = {_C, _o, _c, _o, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 100, +<<<<<<< Updated upstream .description = (const u8*) 0x844520b, .unused = 21043, .pokemonScale = 2116, @@ -213,12 +313,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 14, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84451d3, + .unusedDescription = (const u8*) 0x8445233, + .pokemonScale = 424, + .pokemonOffset = 14, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_BEEDRILL] = { .categoryName = {_P, _o, _i, _s, _o, _n, _SPACE, _B, _e, _e, _END, _SPACE}, .height = 10, .weight = 295, +<<<<<<< Updated upstream .description = (const u8*) 0x844527b, .unused = 21141, .pokemonScale = 2116, @@ -227,12 +336,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445234, + .unusedDescription = (const u8*) 0x8445295, + .pokemonScale = 366, + .pokemonOffset = 2, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_PIDGEY] = { .categoryName = {_T, _i, _n, _y, _SPACE, _B, _i, _r, _d, _END, _SPACE, _SPACE}, .height = 3, .weight = 18, +<<<<<<< Updated upstream .description = (const u8*) 0x84452e7, .unused = 21244, .pokemonScale = 2116, @@ -241,12 +359,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 18, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445296, + .unusedDescription = (const u8*) 0x84452fc, + .pokemonScale = 492, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_PIDGEOTTO] = { .categoryName = {_B, _i, _r, _d, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 11, .weight = 300, +<<<<<<< Updated upstream .description = (const u8*) 0x8445348, .unused = 21341, .pokemonScale = 2116, @@ -255,26 +382,41 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 11, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84452fd, + .unusedDescription = (const u8*) 0x844535d, + .pokemonScale = 334, + .pokemonOffset = 11, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_PIDGEOT] = { .categoryName = {_B, _i, _r, _d, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 15, .weight = 395, +<<<<<<< Updated upstream .description = (const u8*) 0x84453ba, .unused = 21447, .pokemonScale = 2116, .pokemonOffset = 0, .trainerScale = 269, +======= + .description = (const u8*) 0x844535e, + .unusedDescription = (const u8*) 0x84453c7, + .pokemonScale = 269, + .pokemonOffset = 65534, + .trainerScale = 256, +>>>>>>> Stashed changes .trainerOffset = 65534, - .unknown1 = 256, - .unknown2 = 65534, }, [NATIONAL_DEX_RATTATA] = { .categoryName = {_R, _a, _t, _END, _E, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 3, .weight = 35, +<<<<<<< Updated upstream .description = (const u8*) 0x8445423, .unused = 21542, .pokemonScale = 2116, @@ -283,12 +425,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 18, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84453c8, + .unusedDescription = (const u8*) 0x8445426, + .pokemonScale = 481, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_RATICATE] = { .categoryName = {_R, _a, _t, _END, _E, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 7, .weight = 185, +<<<<<<< Updated upstream .description = (const u8*) 0x8445490, .unused = 21631, .pokemonScale = 2116, @@ -297,12 +448,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 14, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445427, + .unusedDescription = (const u8*) 0x844547f, + .pokemonScale = 401, + .pokemonOffset = 14, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SPEAROW] = { .categoryName = {_T, _i, _n, _y, _SPACE, _B, _i, _r, _d, _END, _SPACE, _SPACE}, .height = 3, .weight = 20, +<<<<<<< Updated upstream .description = (const u8*) 0x84454e9, .unused = 21737, .pokemonScale = 2116, @@ -311,12 +471,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 19, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445480, + .unusedDescription = (const u8*) 0x84454e9, + .pokemonScale = 571, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_FEAROW] = { .categoryName = {_B, _e, _a, _k, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 12, .weight = 380, +<<<<<<< Updated upstream .description = (const u8*) 0x8445553, .unused = 21840, .pokemonScale = 2116, @@ -325,12 +494,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 272, .unknown2 = 65534, +======= + .description = (const u8*) 0x84454ea, + .unusedDescription = (const u8*) 0x8445550, + .pokemonScale = 282, + .pokemonOffset = 65535, + .trainerScale = 272, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_EKANS] = { .categoryName = {_S, _n, _a, _k, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 20, .weight = 69, +<<<<<<< Updated upstream .description = (const u8*) 0x84455c3, .unused = 21941, .pokemonScale = 2116, @@ -339,26 +517,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 13, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445551, + .unusedDescription = (const u8*) 0x84455b5, + .pokemonScale = 298, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_ARBOK] = { .categoryName = {_C, _o, _b, _r, _a, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 35, .weight = 650, +<<<<<<< Updated upstream .description = (const u8*) 0x8445630, .unused = 22044, .pokemonScale = 2116, +======= + .description = (const u8*) 0x84455b6, + .unusedDescription = (const u8*) 0x844561c, + .pokemonScale = 256, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 256, - .trainerOffset = 0, - .unknown1 = 296, - .unknown2 = 1, + .trainerScale = 296, + .trainerOffset = 1, }, [NATIONAL_DEX_PIKACHU] = { .categoryName = {_M, _o, _u, _s, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 4, .weight = 60, +<<<<<<< Updated upstream .description = (const u8*) 0x84456a2, .unused = 22149, .pokemonScale = 2116, @@ -367,12 +558,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 16, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844561d, + .unusedDescription = (const u8*) 0x8445685, + .pokemonScale = 479, + .pokemonOffset = 16, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_RAICHU] = { .categoryName = {_M, _o, _u, _s, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 8, .weight = 300, +<<<<<<< Updated upstream .description = (const u8*) 0x844570b, .unused = 22250, .pokemonScale = 2116, @@ -381,12 +581,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 10, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445686, + .unusedDescription = (const u8*) 0x84456ea, + .pokemonScale = 426, + .pokemonOffset = 10, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SANDSHREW] = { .categoryName = {_M, _o, _u, _s, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 120, +<<<<<<< Updated upstream .description = (const u8*) 0x844577c, .unused = 22347, .pokemonScale = 2116, @@ -395,12 +604,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 15, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84456eb, + .unusedDescription = (const u8*) 0x844574b, + .pokemonScale = 370, + .pokemonOffset = 15, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SANDSLASH] = { .categoryName = {_M, _o, _u, _s, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 10, .weight = 295, +<<<<<<< Updated upstream .description = (const u8*) 0x84457dd, .unused = 22452, .pokemonScale = 2116, @@ -409,12 +627,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 10, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844574c, + .unusedDescription = (const u8*) 0x84457b4, + .pokemonScale = 341, + .pokemonOffset = 10, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_NIDORAN_F] = { .categoryName = {_P, _o, _i, _s, _o, _n, _SPACE, _P, _i, _n, _END, _SPACE}, .height = 4, .weight = 70, +<<<<<<< Updated upstream .description = (const u8*) 0x8445846, .unused = 22554, .pokemonScale = 2116, @@ -423,12 +650,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 19, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84457b5, + .unusedDescription = (const u8*) 0x844581a, + .pokemonScale = 488, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_NIDORINA] = { .categoryName = {_P, _o, _i, _s, _o, _n, _SPACE, _P, _i, _n, _END, _SPACE}, .height = 8, .weight = 200, +<<<<<<< Updated upstream .description = (const u8*) 0x84458ba, .unused = 22644, .pokemonScale = 2116, @@ -437,12 +673,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 13, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844581b, + .unusedDescription = (const u8*) 0x8445874, + .pokemonScale = 381, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_NIDOQUEEN] = { .categoryName = {_D, _r, _i, _l, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 13, .weight = 600, +<<<<<<< Updated upstream .description = (const u8*) 0x8445920, .unused = 22746, .pokemonScale = 2116, @@ -451,12 +696,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445875, + .unusedDescription = (const u8*) 0x84458da, + .pokemonScale = 283, + .pokemonOffset = 2, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_NIDORAN_M] = { .categoryName = {_P, _o, _i, _s, _o, _n, _SPACE, _P, _i, _n, _END, _SPACE}, .height = 5, .weight = 90, +<<<<<<< Updated upstream .description = (const u8*) 0x8445989, .unused = 22857, .pokemonScale = 2116, @@ -465,12 +719,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 17, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84458db, + .unusedDescription = (const u8*) 0x8445949, + .pokemonScale = 480, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_NIDORINO] = { .categoryName = {_P, _o, _i, _s, _o, _n, _SPACE, _P, _i, _n, _END, _SPACE}, .height = 9, .weight = 195, +<<<<<<< Updated upstream .description = (const u8*) 0x84459fd, .unused = 22959, .pokemonScale = 2116, @@ -479,12 +742,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 13, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844594a, + .unusedDescription = (const u8*) 0x84459af, + .pokemonScale = 408, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_NIDOKING] = { .categoryName = {_D, _r, _i, _l, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 14, .weight = 620, +<<<<<<< Updated upstream .description = (const u8*) 0x8445a64, .unused = 23063, .pokemonScale = 2116, @@ -493,12 +765,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 3, .unknown1 = 323, .unknown2 = 2, +======= + .description = (const u8*) 0x84459b0, + .unusedDescription = (const u8*) 0x8445a17, + .pokemonScale = 304, + .pokemonOffset = 3, + .trainerScale = 323, + .trainerOffset = 2, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CLEFAIRY] = { .categoryName = {_F, _a, _i, _r, _y, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 75, +<<<<<<< Updated upstream .description = (const u8*) 0x8445ad2, .unused = 23162, .pokemonScale = 2116, @@ -507,12 +788,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 18, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445a18, + .unusedDescription = (const u8*) 0x8445a7a, + .pokemonScale = 425, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CLEFABLE] = { .categoryName = {_F, _a, _i, _r, _y, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 13, .weight = 400, +<<<<<<< Updated upstream .description = (const u8*) 0x8445b31, .unused = 23258, .pokemonScale = 2116, @@ -521,12 +811,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 3, .unknown1 = 272, .unknown2 = 65535, +======= + .description = (const u8*) 0x8445a7b, + .unusedDescription = (const u8*) 0x8445ada, + .pokemonScale = 256, + .pokemonOffset = 3, + .trainerScale = 272, + .trainerOffset = 65535, +>>>>>>> Stashed changes }, [NATIONAL_DEX_VULPIX] = { .categoryName = {_F, _o, _x, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 99, +<<<<<<< Updated upstream .description = (const u8*) 0x8445b94, .unused = 23346, .pokemonScale = 2116, @@ -535,12 +834,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 18, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445adb, + .unusedDescription = (const u8*) 0x8445b32, + .pokemonScale = 497, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_NINETALES] = { .categoryName = {_F, _o, _x, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 11, .weight = 199, +<<<<<<< Updated upstream .description = (const u8*) 0x8445bec, .unused = 23443, .pokemonScale = 2116, @@ -549,12 +857,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 6, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445b33, + .unusedDescription = (const u8*) 0x8445b93, + .pokemonScale = 339, + .pokemonOffset = 6, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_JIGGLYPUFF] = { .categoryName = {_B, _a, _l, _l, _o, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 5, .weight = 55, +<<<<<<< Updated upstream .description = (const u8*) 0x8445c44, .unused = 23545, .pokemonScale = 2116, @@ -563,12 +880,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 19, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445b94, + .unusedDescription = (const u8*) 0x8445bf9, + .pokemonScale = 419, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_WIGGLYTUFF] = { .categoryName = {_B, _a, _l, _l, _o, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 10, .weight = 120, +<<<<<<< Updated upstream .description = (const u8*) 0x8445caa, .unused = 23649, .pokemonScale = 2116, @@ -577,12 +903,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 9, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445bfa, + .unusedDescription = (const u8*) 0x8445c61, + .pokemonScale = 328, + .pokemonOffset = 9, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_ZUBAT] = { .categoryName = {_B, _a, _t, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 8, .weight = 75, +<<<<<<< Updated upstream .description = (const u8*) 0x8445d12, .unused = 23754, .pokemonScale = 2116, @@ -591,26 +926,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65532, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445c62, + .unusedDescription = (const u8*) 0x8445cca, + .pokemonScale = 355, + .pokemonOffset = 65532, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GOLBAT] = { .categoryName = {_B, _a, _t, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 16, .weight = 550, +<<<<<<< Updated upstream .description = (const u8*) 0x8445d7b, .unused = 23860, .pokemonScale = 2116, +======= + .description = (const u8*) 0x8445ccb, + .unusedDescription = (const u8*) 0x8445d34, + .pokemonScale = 291, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 291, - .trainerOffset = 0, - .unknown1 = 296, - .unknown2 = 2, + .trainerScale = 296, + .trainerOffset = 2, }, [NATIONAL_DEX_ODDISH] = { .categoryName = {_W, _e, _e, _d, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 5, .weight = 54, +<<<<<<< Updated upstream .description = (const u8*) 0x8445de0, .unused = 23968, .pokemonScale = 2116, @@ -619,12 +967,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 15, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445d35, + .unusedDescription = (const u8*) 0x8445da0, + .pokemonScale = 423, + .pokemonOffset = 15, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GLOOM] = { .categoryName = {_W, _e, _e, _d, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 8, .weight = 86, +<<<<<<< Updated upstream .description = (const u8*) 0x8445e4c, .unused = 24071, .pokemonScale = 2116, @@ -633,12 +990,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 10, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445da1, + .unusedDescription = (const u8*) 0x8445e07, + .pokemonScale = 329, + .pokemonOffset = 10, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_VILEPLUME] = { .categoryName = {_F, _l, _o, _w, _e, _r, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 12, .weight = 186, +<<<<<<< Updated upstream .description = (const u8*) 0x8445eba, .unused = 24175, .pokemonScale = 2116, @@ -647,12 +1013,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 4, .unknown1 = 272, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445e08, + .unusedDescription = (const u8*) 0x8445e6f, + .pokemonScale = 256, + .pokemonOffset = 4, + .trainerScale = 272, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_PARAS] = { .categoryName = {_M, _u, _s, _h, _r, _o, _o, _m, _END, _SPACE, _SPACE, _SPACE}, .height = 3, .weight = 54, +<<<<<<< Updated upstream .description = (const u8*) 0x8445f23, .unused = 24278, .pokemonScale = 2116, @@ -661,12 +1036,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 21, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445e70, + .unusedDescription = (const u8*) 0x8445ed6, + .pokemonScale = 546, + .pokemonOffset = 21, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_PARASECT] = { .categoryName = {_M, _u, _s, _h, _r, _o, _o, _m, _END, _SPACE, _SPACE, _SPACE}, .height = 10, .weight = 295, +<<<<<<< Updated upstream .description = (const u8*) 0x8445f88, .unused = 24386, .pokemonScale = 2116, @@ -675,12 +1059,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 8, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445ed7, + .unusedDescription = (const u8*) 0x8445f42, + .pokemonScale = 307, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_VENONAT] = { .categoryName = {_I, _n, _s, _e, _c, _t, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 10, .weight = 300, +<<<<<<< Updated upstream .description = (const u8*) 0x8445feb, .unused = 24480, .pokemonScale = 2116, @@ -689,12 +1082,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 14, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8445f43, + .unusedDescription = (const u8*) 0x8445fa0, + .pokemonScale = 360, + .pokemonOffset = 14, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_VENOMOTH] = { .categoryName = {_P, _o, _i, _s, _o, _n, _SPACE, _M, _o, _t, _h, _END}, .height = 15, .weight = 125, +<<<<<<< Updated upstream .description = (const u8*) 0x8446051, .unused = 24585, .pokemonScale = 2116, @@ -703,12 +1105,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 3, .unknown1 = 293, .unknown2 = 1, +======= + .description = (const u8*) 0x8445fa1, + .unusedDescription = (const u8*) 0x8446009, + .pokemonScale = 256, + .pokemonOffset = 3, + .trainerScale = 293, + .trainerOffset = 1, +>>>>>>> Stashed changes }, [NATIONAL_DEX_DIGLETT] = { .categoryName = {_M, _o, _l, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 2, .weight = 8, +<<<<<<< Updated upstream .description = (const u8*) 0x84460ba, .unused = 24696, .pokemonScale = 2116, @@ -717,12 +1128,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 22, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844600a, + .unusedDescription = (const u8*) 0x8446078, + .pokemonScale = 706, + .pokemonOffset = 22, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_DUGTRIO] = { .categoryName = {_M, _o, _l, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 7, .weight = 333, +<<<<<<< Updated upstream .description = (const u8*) 0x8446129, .unused = 24802, .pokemonScale = 2116, @@ -731,12 +1151,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 14, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8446079, + .unusedDescription = (const u8*) 0x84460e2, + .pokemonScale = 384, + .pokemonOffset = 14, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MEOWTH] = { .categoryName = {_S, _c, _r, _a, _t, _c, _h, _SPACE, _C, _a, _t, _END}, .height = 4, .weight = 42, +<<<<<<< Updated upstream .description = (const u8*) 0x844618f, .unused = 24899, .pokemonScale = 2116, @@ -745,12 +1174,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 17, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84460e3, + .unusedDescription = (const u8*) 0x8446143, + .pokemonScale = 480, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_PERSIAN] = { .categoryName = {_C, _l, _a, _s, _s, _y, _SPACE, _C, _a, _t, _END, _SPACE}, .height = 10, .weight = 320, +<<<<<<< Updated upstream .description = (const u8*) 0x84461f1, .unused = 24998, .pokemonScale = 2116, @@ -759,12 +1197,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 10, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8446144, + .unusedDescription = (const u8*) 0x84461a6, + .pokemonScale = 320, + .pokemonOffset = 10, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_PSYDUCK] = { .categoryName = {_D, _u, _c, _k, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 8, .weight = 196, +<<<<<<< Updated upstream .description = (const u8*) 0x844626b, .unused = 25107, .pokemonScale = 2116, @@ -773,12 +1220,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 11, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84461a7, + .unusedDescription = (const u8*) 0x8446213, + .pokemonScale = 347, + .pokemonOffset = 11, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GOLDUCK] = { .categoryName = {_D, _u, _c, _k, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 17, .weight = 766, +<<<<<<< Updated upstream .description = (const u8*) 0x84462d8, .unused = 25203, .pokemonScale = 2116, @@ -787,12 +1243,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 4, .unknown1 = 287, .unknown2 = 1, +======= + .description = (const u8*) 0x8446214, + .unusedDescription = (const u8*) 0x8446273, + .pokemonScale = 272, + .pokemonOffset = 4, + .trainerScale = 287, + .trainerOffset = 1, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MANKEY] = { .categoryName = {_P, _i, _g, _SPACE, _M, _o, _n, _k, _e, _y, _END, _SPACE}, .height = 5, .weight = 280, +<<<<<<< Updated upstream .description = (const u8*) 0x8446348, .unused = 25317, .pokemonScale = 2116, @@ -801,12 +1266,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 16, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8446274, + .unusedDescription = (const u8*) 0x84462e5, + .pokemonScale = 388, + .pokemonOffset = 16, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_PRIMEAPE] = { .categoryName = {_P, _i, _g, _SPACE, _M, _o, _n, _k, _e, _y, _END, _SPACE}, .height = 10, .weight = 320, +<<<<<<< Updated upstream .description = (const u8*) 0x84463ba, .unused = 25419, .pokemonScale = 2116, @@ -815,12 +1289,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 8, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84462e6, + .unusedDescription = (const u8*) 0x844634b, + .pokemonScale = 326, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GROWLITHE] = { .categoryName = {_P, _u, _p, _p, _y, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 7, .weight = 190, +<<<<<<< Updated upstream .description = (const u8*) 0x8446429, .unused = 25521, .pokemonScale = 2116, @@ -829,12 +1312,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 14, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844634c, + .unusedDescription = (const u8*) 0x84463b1, + .pokemonScale = 346, + .pokemonOffset = 14, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_ARCANINE] = { .categoryName = {_L, _e, _g, _e, _n, _d, _a, _r, _y, _END, _SPACE, _SPACE}, .height = 19, .weight = 1550, +<<<<<<< Updated upstream .description = (const u8*) 0x8446484, .unused = 25622, .pokemonScale = 2116, @@ -843,12 +1335,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 312, .unknown2 = 2, +======= + .description = (const u8*) 0x84463b2, + .unusedDescription = (const u8*) 0x8446416, + .pokemonScale = 256, + .pokemonOffset = 65535, + .trainerScale = 312, + .trainerOffset = 2, +>>>>>>> Stashed changes }, [NATIONAL_DEX_POLIWAG] = { .categoryName = {_T, _a, _d, _p, _o, _l, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 124, +<<<<<<< Updated upstream .description = (const u8*) 0x84464e2, .unused = 25725, .pokemonScale = 2116, @@ -857,12 +1358,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 17, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8446417, + .unusedDescription = (const u8*) 0x844647d, + .pokemonScale = 353, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_POLIWHIRL] = { .categoryName = {_T, _a, _d, _p, _o, _l, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 10, .weight = 200, +<<<<<<< Updated upstream .description = (const u8*) 0x844655a, .unused = 25819, .pokemonScale = 2116, @@ -871,26 +1381,40 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 10, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844647e, + .unusedDescription = (const u8*) 0x84464db, + .pokemonScale = 288, + .pokemonOffset = 10, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_POLIWRATH] = { .categoryName = {_T, _a, _d, _p, _o, _l, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 13, .weight = 540, +<<<<<<< Updated upstream .description = (const u8*) 0x84465bf, .unused = 25919, .pokemonScale = 2116, .pokemonOffset = 0, +======= + .description = (const u8*) 0x84464dc, + .unusedDescription = (const u8*) 0x844653f, + .pokemonScale = 256, + .pokemonOffset = 5, +>>>>>>> Stashed changes .trainerScale = 256, - .trainerOffset = 5, - .unknown1 = 256, - .unknown2 = 65534, + .trainerOffset = 65534, }, [NATIONAL_DEX_ABRA] = { .categoryName = {_P, _s, _i, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 9, .weight = 195, +<<<<<<< Updated upstream .description = (const u8*) 0x844662c, .unused = 26010, .pokemonScale = 2116, @@ -899,12 +1423,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 14, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8446540, + .unusedDescription = (const u8*) 0x844659a, + .pokemonScale = 374, + .pokemonOffset = 14, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_KADABRA] = { .categoryName = {_P, _s, _i, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 13, .weight = 565, +<<<<<<< Updated upstream .description = (const u8*) 0x8446687, .unused = 26102, .pokemonScale = 2116, @@ -913,26 +1446,41 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844659b, + .unusedDescription = (const u8*) 0x84465f6, + .pokemonScale = 272, + .pokemonOffset = 2, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_ALAKAZAM] = { .categoryName = {_P, _s, _i, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 15, .weight = 480, +<<<<<<< Updated upstream .description = (const u8*) 0x84466e8, .unused = 26211, .pokemonScale = 2116, .pokemonOffset = 0, .trainerScale = 272, +======= + .description = (const u8*) 0x84465f7, + .unusedDescription = (const u8*) 0x8446663, + .pokemonScale = 272, + .pokemonOffset = 65535, + .trainerScale = 271, +>>>>>>> Stashed changes .trainerOffset = 65535, - .unknown1 = 271, - .unknown2 = 65535, }, [NATIONAL_DEX_MACHOP] = { .categoryName = {_S, _u, _p, _e, _r, _p, _o, _w, _e, _r, _END, _SPACE}, .height = 8, .weight = 195, +<<<<<<< Updated upstream .description = (const u8*) 0x8446755, .unused = 26313, .pokemonScale = 2116, @@ -941,12 +1489,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 12, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8446664, + .unusedDescription = (const u8*) 0x84466c9, + .pokemonScale = 320, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MACHOKE] = { .categoryName = {_S, _u, _p, _e, _r, _p, _o, _w, _e, _r, _END, _SPACE}, .height = 15, .weight = 705, +<<<<<<< Updated upstream .description = (const u8*) 0x84467c4, .unused = 26417, .pokemonScale = 2116, @@ -955,12 +1512,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 6, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84466ca, + .unusedDescription = (const u8*) 0x8446731, + .pokemonScale = 304, + .pokemonOffset = 6, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MACHAMP] = { .categoryName = {_S, _u, _p, _e, _r, _p, _o, _w, _e, _r, _END, _SPACE}, .height = 16, .weight = 1300, +<<<<<<< Updated upstream .description = (const u8*) 0x844682c, .unused = 26522, .pokemonScale = 2116, @@ -969,12 +1535,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 283, .unknown2 = 0, +======= + .description = (const u8*) 0x8446732, + .unusedDescription = (const u8*) 0x844679a, + .pokemonScale = 278, + .pokemonOffset = 2, + .trainerScale = 283, + .trainerOffset = 0, +>>>>>>> Stashed changes }, [NATIONAL_DEX_BELLSPROUT] = { .categoryName = {_F, _l, _o, _w, _e, _r, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 7, .weight = 40, +<<<<<<< Updated upstream .description = (const u8*) 0x8446888, .unused = 26626, .pokemonScale = 2116, @@ -983,54 +1558,78 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 16, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844679b, + .unusedDescription = (const u8*) 0x8446802, + .pokemonScale = 354, + .pokemonOffset = 16, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_WEEPINBELL] = { .categoryName = {_F, _l, _y, _c, _a, _t, _c, _h, _e, _r, _END, _SPACE}, .height = 10, .weight = 64, +<<<<<<< Updated upstream .description = (const u8*) 0x84468f6, .unused = 26721, .pokemonScale = 2116, .pokemonOffset = 0, +======= + .description = (const u8*) 0x8446803, + .unusedDescription = (const u8*) 0x8446861, + .pokemonScale = 256, + .pokemonOffset = 65535, +>>>>>>> Stashed changes .trainerScale = 256, - .trainerOffset = 65535, - .unknown1 = 256, - .unknown2 = 65534, + .trainerOffset = 65534, }, [NATIONAL_DEX_VICTREEBEL] = { .categoryName = {_F, _l, _y, _c, _a, _t, _c, _h, _e, _r, _END, _SPACE}, .height = 17, .weight = 155, +<<<<<<< Updated upstream .description = (const u8*) 0x8446955, .unused = 26823, .pokemonScale = 2116, .pokemonOffset = 0, .trainerScale = 256, +======= + .description = (const u8*) 0x8446862, + .unusedDescription = (const u8*) 0x84468c7, + .pokemonScale = 256, + .pokemonOffset = 2, + .trainerScale = 302, +>>>>>>> Stashed changes .trainerOffset = 2, - .unknown1 = 302, - .unknown2 = 2, }, [NATIONAL_DEX_TENTACOOL] = { .categoryName = {_J, _e, _l, _l, _y, _f, _i, _s, _h, _END, _SPACE, _SPACE}, .height = 9, .weight = 455, +<<<<<<< Updated upstream .description = (const u8*) 0x84469bd, .unused = 26935, .pokemonScale = 2116, +======= + .description = (const u8*) 0x84468c8, + .unusedDescription = (const u8*) 0x8446937, + .pokemonScale = 256, +>>>>>>> Stashed changes .pokemonOffset = 0, .trainerScale = 256, - .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 65534, + .trainerOffset = 65534, }, [NATIONAL_DEX_TENTACRUEL] = { .categoryName = {_J, _e, _l, _l, _y, _f, _i, _s, _h, _END, _SPACE, _SPACE}, .height = 16, .weight = 550, +<<<<<<< Updated upstream .description = (const u8*) 0x8446a17, .unused = 27040, .pokemonScale = 2116, @@ -1039,12 +1638,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 312, .unknown2 = 0, +======= + .description = (const u8*) 0x8446938, + .unusedDescription = (const u8*) 0x84469a0, + .pokemonScale = 272, + .pokemonOffset = 65535, + .trainerScale = 312, + .trainerOffset = 0, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GEODUDE] = { .categoryName = {_R, _o, _c, _k, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 4, .weight = 200, +<<<<<<< Updated upstream .description = (const u8*) 0x8446a80, .unused = 27141, .pokemonScale = 2116, @@ -1053,12 +1661,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 17, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84469a1, + .unusedDescription = (const u8*) 0x8446a05, + .pokemonScale = 330, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GRAVELER] = { .categoryName = {_R, _o, _c, _k, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 10, .weight = 1050, +<<<<<<< Updated upstream .description = (const u8*) 0x8446af0, .unused = 27243, .pokemonScale = 2116, @@ -1067,12 +1684,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 8, .unknown1 = 305, .unknown2 = 1, +======= + .description = (const u8*) 0x8446a06, + .unusedDescription = (const u8*) 0x8446a6b, + .pokemonScale = 272, + .pokemonOffset = 8, + .trainerScale = 305, + .trainerOffset = 1, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GOLEM] = { .categoryName = {_M, _e, _g, _a, _t, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 14, .weight = 3000, +<<<<<<< Updated upstream .description = (const u8*) 0x8446b56, .unused = 27353, .pokemonScale = 2116, @@ -1081,12 +1707,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 3, .unknown1 = 298, .unknown2 = 1, +======= + .description = (const u8*) 0x8446a6c, + .unusedDescription = (const u8*) 0x8446ad9, + .pokemonScale = 266, + .pokemonOffset = 3, + .trainerScale = 298, + .trainerOffset = 1, +>>>>>>> Stashed changes }, [NATIONAL_DEX_PONYTA] = { .categoryName = {_F, _i, _r, _e, _SPACE, _H, _o, _r, _s, _e, _END, _SPACE}, .height = 10, .weight = 300, +<<<<<<< Updated upstream .description = (const u8*) 0x8446bc4, .unused = 27457, .pokemonScale = 2116, @@ -1095,12 +1730,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 7, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8446ada, + .unusedDescription = (const u8*) 0x8446b41, + .pokemonScale = 288, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_RAPIDASH] = { .categoryName = {_F, _i, _r, _e, _SPACE, _H, _o, _r, _s, _e, _END, _SPACE}, .height = 17, .weight = 950, +<<<<<<< Updated upstream .description = (const u8*) 0x8446c23, .unused = 27551, .pokemonScale = 2116, @@ -1109,12 +1753,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 312, .unknown2 = 1, +======= + .description = (const u8*) 0x8446b42, + .unusedDescription = (const u8*) 0x8446b9f, + .pokemonScale = 282, + .pokemonOffset = 65535, + .trainerScale = 312, + .trainerOffset = 1, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SLOWPOKE] = { .categoryName = {_D, _o, _p, _e, _y, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 12, .weight = 360, +<<<<<<< Updated upstream .description = (const u8*) 0x8446c8c, .unused = 27649, .pokemonScale = 2116, @@ -1123,12 +1776,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 10, .unknown1 = 272, .unknown2 = 65534, +======= + .description = (const u8*) 0x8446ba0, + .unusedDescription = (const u8*) 0x8446c01, + .pokemonScale = 271, + .pokemonOffset = 10, + .trainerScale = 272, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SLOWBRO] = { .categoryName = {_H, _e, _r, _m, _i, _t, _SPACE, _C, _r, _a, _b, _END}, .height = 16, .weight = 785, +<<<<<<< Updated upstream .description = (const u8*) 0x8446d05, .unused = 27745, .pokemonScale = 2116, @@ -1137,12 +1799,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65534, .unknown1 = 312, .unknown2 = 0, +======= + .description = (const u8*) 0x8446c02, + .unusedDescription = (const u8*) 0x8446c61, + .pokemonScale = 257, + .pokemonOffset = 65534, + .trainerScale = 312, + .trainerOffset = 0, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MAGNEMITE] = { .categoryName = {_M, _a, _g, _n, _e, _t, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 3, .weight = 60, +<<<<<<< Updated upstream .description = (const u8*) 0x8446d74, .unused = 27848, .pokemonScale = 2116, @@ -1151,12 +1822,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65528, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8446c62, + .unusedDescription = (const u8*) 0x8446cc8, + .pokemonScale = 294, + .pokemonOffset = 65528, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MAGNETON] = { .categoryName = {_M, _a, _g, _n, _e, _t, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 10, .weight = 600, +<<<<<<< Updated upstream .description = (const u8*) 0x8446ddb, .unused = 27950, .pokemonScale = 2116, @@ -1165,12 +1845,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65532, .unknown1 = 273, .unknown2 = 65534, +======= + .description = (const u8*) 0x8446cc9, + .unusedDescription = (const u8*) 0x8446d2e, + .pokemonScale = 293, + .pokemonOffset = 65532, + .trainerScale = 273, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_FARFETCHD] = { .categoryName = {_W, _i, _l, _d, _SPACE, _D, _u, _c, _k, _END, _SPACE, _SPACE}, .height = 8, .weight = 150, +<<<<<<< Updated upstream .description = (const u8*) 0x8446e41, .unused = 28054, .pokemonScale = 2116, @@ -1179,12 +1868,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65534, .unknown1 = 256, .unknown2 = 65533, +======= + .description = (const u8*) 0x8446d2f, + .unusedDescription = (const u8*) 0x8446d96, + .pokemonScale = 317, + .pokemonOffset = 65534, + .trainerScale = 256, + .trainerOffset = 65533, +>>>>>>> Stashed changes }, [NATIONAL_DEX_DODUO] = { .categoryName = {_T, _w, _i, _n, _SPACE, _B, _i, _r, _d, _END, _SPACE, _SPACE}, .height = 14, .weight = 392, +<<<<<<< Updated upstream .description = (const u8*) 0x8446ea9, .unused = 28158, .pokemonScale = 2116, @@ -1193,12 +1891,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 3, .unknown1 = 287, .unknown2 = 0, +======= + .description = (const u8*) 0x8446d97, + .unusedDescription = (const u8*) 0x8446dfe, + .pokemonScale = 256, + .pokemonOffset = 3, + .trainerScale = 287, + .trainerOffset = 0, +>>>>>>> Stashed changes }, [NATIONAL_DEX_DODRIO] = { .categoryName = {_T, _r, _i, _p, _l, _e, _SPACE, _B, _i, _r, _d, _END}, .height = 18, .weight = 852, +<<<<<<< Updated upstream .description = (const u8*) 0x8446f16, .unused = 28258, .pokemonScale = 2116, @@ -1207,12 +1914,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65534, .unknown1 = 296, .unknown2 = 1, +======= + .description = (const u8*) 0x8446dff, + .unusedDescription = (const u8*) 0x8446e62, + .pokemonScale = 272, + .pokemonOffset = 65534, + .trainerScale = 296, + .trainerOffset = 1, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SEEL] = { .categoryName = {_S, _e, _a, _SPACE, _L, _i, _o, _n, _END, _SPACE, _SPACE, _SPACE}, .height = 11, .weight = 900, +<<<<<<< Updated upstream .description = (const u8*) 0x8446f7c, .unused = 28380, .pokemonScale = 2116, @@ -1221,12 +1937,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 8, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8446e63, + .unusedDescription = (const u8*) 0x8446edc, + .pokemonScale = 298, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_DEWGONG] = { .categoryName = {_S, _e, _a, _SPACE, _L, _i, _o, _n, _END, _SPACE, _SPACE, _SPACE}, .height = 17, .weight = 1200, +<<<<<<< Updated upstream .description = (const u8*) 0x8446ff3, .unused = 28478, .pokemonScale = 2116, @@ -1235,12 +1960,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 306, .unknown2 = 65535, +======= + .description = (const u8*) 0x8446edd, + .unusedDescription = (const u8*) 0x8446f3e, + .pokemonScale = 288, + .pokemonOffset = 1, + .trainerScale = 306, + .trainerOffset = 65535, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GRIMER] = { .categoryName = {_S, _l, _u, _d, _g, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 9, .weight = 300, +<<<<<<< Updated upstream .description = (const u8*) 0x8447053, .unused = 28583, .pokemonScale = 2116, @@ -1249,26 +1983,40 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 8, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8446f3f, + .unusedDescription = (const u8*) 0x8446fa7, + .pokemonScale = 258, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MUK] = { .categoryName = {_S, _l, _u, _d, _g, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 12, .weight = 300, +<<<<<<< Updated upstream .description = (const u8*) 0x84470b7, .unused = 28691, .pokemonScale = 2116, .pokemonOffset = 0, +======= + .description = (const u8*) 0x8446fa8, + .unusedDescription = (const u8*) 0x8447013, + .pokemonScale = 288, + .pokemonOffset = 7, +>>>>>>> Stashed changes .trainerScale = 288, - .trainerOffset = 7, - .unknown1 = 288, - .unknown2 = 65535, + .trainerOffset = 65535, }, [NATIONAL_DEX_SHELLDER] = { .categoryName = {_B, _i, _v, _a, _l, _v, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 3, .weight = 40, +<<<<<<< Updated upstream .description = (const u8*) 0x8447123, .unused = 28790, .pokemonScale = 2116, @@ -1277,40 +2025,57 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 21, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8447014, + .unusedDescription = (const u8*) 0x8447076, + .pokemonScale = 643, + .pokemonOffset = 21, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CLOYSTER] = { .categoryName = {_B, _i, _v, _a, _l, _v, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 15, .weight = 1325, +<<<<<<< Updated upstream .description = (const u8*) 0x8447186, .unused = 28905, .pokemonScale = 2116, +======= + .description = (const u8*) 0x8447077, + .unusedDescription = (const u8*) 0x84470e9, + .pokemonScale = 264, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 264, - .trainerOffset = 0, - .unknown1 = 288, - .unknown2 = 65535, + .trainerScale = 288, + .trainerOffset = 65535, }, [NATIONAL_DEX_GASTLY] = { .categoryName = {_G, _a, _s, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 13, .weight = 1, +<<<<<<< Updated upstream .description = (const u8*) 0x84471f9, .unused = 29009, .pokemonScale = 2116, +======= + .description = (const u8*) 0x84470ea, + .unusedDescription = (const u8*) 0x8447151, + .pokemonScale = 256, +>>>>>>> Stashed changes .pokemonOffset = 0, .trainerScale = 256, - .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 65534, + .trainerOffset = 65534, }, [NATIONAL_DEX_HAUNTER] = { .categoryName = {_G, _a, _s, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 16, .weight = 1, +<<<<<<< Updated upstream .description = (const u8*) 0x8447265, .unused = 29105, .pokemonScale = 2116, @@ -1319,12 +2084,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 308, .unknown2 = 1, +======= + .description = (const u8*) 0x8447152, + .unusedDescription = (const u8*) 0x84471b1, + .pokemonScale = 269, + .pokemonOffset = 2, + .trainerScale = 308, + .trainerOffset = 1, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GENGAR] = { .categoryName = {_S, _h, _a, _d, _o, _w, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 15, .weight = 405, +<<<<<<< Updated upstream .description = (const u8*) 0x84472c3, .unused = 29214, .pokemonScale = 2116, @@ -1333,26 +2107,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 4, .unknown1 = 317, .unknown2 = 1, +======= + .description = (const u8*) 0x84471b2, + .unusedDescription = (const u8*) 0x844721e, + .pokemonScale = 256, + .pokemonOffset = 4, + .trainerScale = 317, + .trainerOffset = 1, +>>>>>>> Stashed changes }, [NATIONAL_DEX_ONIX] = { .categoryName = {_R, _o, _c, _k, _SPACE, _S, _n, _a, _k, _e, _END, _SPACE}, .height = 88, .weight = 2100, +<<<<<<< Updated upstream .description = (const u8*) 0x8447321, .unused = 29313, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844721f, + .unusedDescription = (const u8*) 0x8447281, + .pokemonScale = 257, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 257, - .trainerOffset = 0, - .unknown1 = 515, - .unknown2 = 12, + .trainerScale = 515, + .trainerOffset = 12, }, [NATIONAL_DEX_DROWZEE] = { .categoryName = {_H, _y, _p, _n, _o, _s, _i, _s, _END, _SPACE, _SPACE, _SPACE}, .height = 10, .weight = 324, +<<<<<<< Updated upstream .description = (const u8*) 0x8447393, .unused = 29421, .pokemonScale = 2116, @@ -1361,12 +2148,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 7, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8447282, + .unusedDescription = (const u8*) 0x84472ed, + .pokemonScale = 274, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_HYPNO] = { .categoryName = {_H, _y, _p, _n, _o, _s, _i, _s, _END, _SPACE, _SPACE, _SPACE}, .height = 16, .weight = 756, +<<<<<<< Updated upstream .description = (const u8*) 0x84473f8, .unused = 29522, .pokemonScale = 2116, @@ -1375,12 +2171,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 3, .unknown1 = 310, .unknown2 = 2, +======= + .description = (const u8*) 0x84472ee, + .unusedDescription = (const u8*) 0x8447352, + .pokemonScale = 298, + .pokemonOffset = 3, + .trainerScale = 310, + .trainerOffset = 2, +>>>>>>> Stashed changes }, [NATIONAL_DEX_KRABBY] = { .categoryName = {_R, _i, _v, _e, _r, _SPACE, _C, _r, _a, _b, _END, _SPACE}, .height = 4, .weight = 65, +<<<<<<< Updated upstream .description = (const u8*) 0x8447465, .unused = 29620, .pokemonScale = 2116, @@ -1389,12 +2194,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 18, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8447353, + .unusedDescription = (const u8*) 0x84473b4, + .pokemonScale = 469, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_KINGLER] = { .categoryName = {_P, _i, _n, _c, _e, _r, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 13, .weight = 600, +<<<<<<< Updated upstream .description = (const u8*) 0x84474c7, .unused = 29725, .pokemonScale = 2116, @@ -1403,12 +2217,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 3, .unknown1 = 308, .unknown2 = 1, +======= + .description = (const u8*) 0x84473b5, + .unusedDescription = (const u8*) 0x844741d, + .pokemonScale = 287, + .pokemonOffset = 3, + .trainerScale = 308, + .trainerOffset = 1, +>>>>>>> Stashed changes }, [NATIONAL_DEX_VOLTORB] = { .categoryName = {_B, _a, _l, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 5, .weight = 104, +<<<<<<< Updated upstream .description = (const u8*) 0x8447532, .unused = 29813, .pokemonScale = 2116, @@ -1417,26 +2240,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65528, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844741e, + .unusedDescription = (const u8*) 0x8447475, + .pokemonScale = 364, + .pokemonOffset = 65528, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_ELECTRODE] = { .categoryName = {_B, _a, _l, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 12, .weight = 666, +<<<<<<< Updated upstream .description = (const u8*) 0x844758a, .unused = 29913, .pokemonScale = 2116, +======= + .description = (const u8*) 0x8447476, + .unusedDescription = (const u8*) 0x84474d9, + .pokemonScale = 256, +>>>>>>> Stashed changes .pokemonOffset = 0, .trainerScale = 256, - .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 65534, + .trainerOffset = 65534, }, [NATIONAL_DEX_EXEGGCUTE] = { .categoryName = {_E, _g, _g, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 4, .weight = 25, +<<<<<<< Updated upstream .description = (const u8*) 0x84475ee, .unused = 30022, .pokemonScale = 2116, @@ -1445,26 +2281,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65532, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84474da, + .unusedDescription = (const u8*) 0x8447546, + .pokemonScale = 495, + .pokemonOffset = 65532, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_EXEGGUTOR] = { .categoryName = {_C, _o, _c, _o, _n, _u, _t, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 20, .weight = 1200, +<<<<<<< Updated upstream .description = (const u8*) 0x844765b, .unused = 30117, .pokemonScale = 2116, +======= + .description = (const u8*) 0x8447547, + .unusedDescription = (const u8*) 0x84475a5, + .pokemonScale = 283, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 283, - .trainerOffset = 0, - .unknown1 = 376, - .unknown2 = 7, + .trainerScale = 376, + .trainerOffset = 7, }, [NATIONAL_DEX_CUBONE] = { .categoryName = {_L, _o, _n, _e, _l, _y, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 4, .weight = 65, +<<<<<<< Updated upstream .description = (const u8*) 0x84476bf, .unused = 30214, .pokemonScale = 2116, @@ -1473,12 +2322,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 19, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84475a6, + .unusedDescription = (const u8*) 0x8447606, + .pokemonScale = 545, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MAROWAK] = { .categoryName = {_B, _o, _n, _e, _SPACE, _K, _e, _e, _p, _e, _r, _END}, .height = 10, .weight = 450, +<<<<<<< Updated upstream .description = (const u8*) 0x8447727, .unused = 30325, .pokemonScale = 2116, @@ -1487,26 +2345,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 12, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8447607, + .unusedDescription = (const u8*) 0x8447675, + .pokemonScale = 293, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_HITMONLEE] = { .categoryName = {_K, _i, _c, _k, _i, _n, _g, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 15, .weight = 498, +<<<<<<< Updated upstream .description = (const u8*) 0x844778e, .unused = 30419, .pokemonScale = 2116, +======= + .description = (const u8*) 0x8447676, + .unusedDescription = (const u8*) 0x84476d3, + .pokemonScale = 256, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 256, - .trainerOffset = 0, - .unknown1 = 273, - .unknown2 = 65534, + .trainerScale = 273, + .trainerOffset = 65534, }, [NATIONAL_DEX_HITMONCHAN] = { .categoryName = {_P, _u, _n, _c, _h, _i, _n, _g, _END, _SPACE, _SPACE, _SPACE}, .height = 14, .weight = 502, +<<<<<<< Updated upstream .description = (const u8*) 0x84477f9, .unused = 30515, .pokemonScale = 2116, @@ -1515,26 +2386,40 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 264, .unknown2 = 65534, +======= + .description = (const u8*) 0x84476d4, + .unusedDescription = (const u8*) 0x8447733, + .pokemonScale = 256, + .pokemonOffset = 1, + .trainerScale = 264, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_LICKITUNG] = { .categoryName = {_L, _i, _c, _k, _i, _n, _g, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 12, .weight = 655, +<<<<<<< Updated upstream .description = (const u8*) 0x8447865, .unused = 30621, .pokemonScale = 2116, .pokemonOffset = 0, +======= + .description = (const u8*) 0x8447734, + .unusedDescription = (const u8*) 0x844779d, + .pokemonScale = 272, + .pokemonOffset = 3, +>>>>>>> Stashed changes .trainerScale = 272, - .trainerOffset = 3, - .unknown1 = 272, - .unknown2 = 65533, + .trainerOffset = 65533, }, [NATIONAL_DEX_KOFFING] = { .categoryName = {_P, _o, _i, _s, _o, _n, _SPACE, _G, _a, _s, _END, _SPACE}, .height = 6, .weight = 10, +<<<<<<< Updated upstream .description = (const u8*) 0x84478cf, .unused = 30719, .pokemonScale = 2116, @@ -1543,26 +2428,41 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844779e, + .unusedDescription = (const u8*) 0x84477ff, + .pokemonScale = 369, + .pokemonOffset = 65535, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_WEEZING] = { .categoryName = {_P, _o, _i, _s, _o, _n, _SPACE, _G, _a, _s, _END, _SPACE}, .height = 12, .weight = 95, +<<<<<<< Updated upstream .description = (const u8*) 0x844792d, .unused = 30822, .pokemonScale = 2116, .pokemonOffset = 0, .trainerScale = 321, +======= + .description = (const u8*) 0x8447800, + .unusedDescription = (const u8*) 0x8447866, + .pokemonScale = 321, + .pokemonOffset = 65535, + .trainerScale = 276, +>>>>>>> Stashed changes .trainerOffset = 65535, - .unknown1 = 276, - .unknown2 = 65535, }, [NATIONAL_DEX_RHYHORN] = { .categoryName = {_S, _p, _i, _k, _e, _s, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 10, .weight = 1150, +<<<<<<< Updated upstream .description = (const u8*) 0x8447994, .unused = 30923, .pokemonScale = 2116, @@ -1571,12 +2471,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 7, .unknown1 = 276, .unknown2 = 65534, +======= + .description = (const u8*) 0x8447867, + .unusedDescription = (const u8*) 0x84478cb, + .pokemonScale = 291, + .pokemonOffset = 7, + .trainerScale = 276, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_RHYDON] = { .categoryName = {_D, _r, _i, _l, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 19, .weight = 1200, +<<<<<<< Updated upstream .description = (const u8*) 0x84479f7, .unused = 31022, .pokemonScale = 2116, @@ -1585,12 +2494,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 344, .unknown2 = 3, +======= + .description = (const u8*) 0x84478cc, + .unusedDescription = (const u8*) 0x844792e, + .pokemonScale = 272, + .pokemonOffset = 65535, + .trainerScale = 344, + .trainerOffset = 3, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CHANSEY] = { .categoryName = {_E, _g, _g, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 11, .weight = 346, +<<<<<<< Updated upstream .description = (const u8*) 0x8447a5f, .unused = 31121, .pokemonScale = 2116, @@ -1599,12 +2517,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 6, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844792f, + .unusedDescription = (const u8*) 0x8447991, + .pokemonScale = 257, + .pokemonOffset = 6, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_TANGELA] = { .categoryName = {_V, _i, _n, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 10, .weight = 350, +<<<<<<< Updated upstream .description = (const u8*) 0x8447abf, .unused = 31215, .pokemonScale = 2116, @@ -1613,12 +2540,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 9, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8447992, + .unusedDescription = (const u8*) 0x84479ef, + .pokemonScale = 320, + .pokemonOffset = 9, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_KANGASKHAN] = { .categoryName = {_P, _a, _r, _e, _n, _t, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 22, .weight = 800, +<<<<<<< Updated upstream .description = (const u8*) 0x8447b28, .unused = 31324, .pokemonScale = 2116, @@ -1627,12 +2563,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65533, .unknown1 = 349, .unknown2 = 5, +======= + .description = (const u8*) 0x84479f0, + .unusedDescription = (const u8*) 0x8447a5c, + .pokemonScale = 257, + .pokemonOffset = 65533, + .trainerScale = 349, + .trainerOffset = 5, +>>>>>>> Stashed changes }, [NATIONAL_DEX_HORSEA] = { .categoryName = {_D, _r, _a, _g, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 4, .weight = 80, +<<<<<<< Updated upstream .description = (const u8*) 0x8447b90, .unused = 31426, .pokemonScale = 2116, @@ -1641,12 +2586,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8447a5d, + .unusedDescription = (const u8*) 0x8447ac2, + .pokemonScale = 399, + .pokemonOffset = 65535, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SEADRA] = { .categoryName = {_D, _r, _a, _g, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 12, .weight = 250, +<<<<<<< Updated upstream .description = (const u8*) 0x8447bf6, .unused = 31531, .pokemonScale = 2116, @@ -1655,12 +2609,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 3, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8447ac3, + .unusedDescription = (const u8*) 0x8447b2b, + .pokemonScale = 296, + .pokemonOffset = 3, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GOLDEEN] = { .categoryName = {_G, _o, _l, _d, _f, _i, _s, _h, _END, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 150, +<<<<<<< Updated upstream .description = (const u8*) 0x8447c60, .unused = 31625, .pokemonScale = 2116, @@ -1669,12 +2632,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 4, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8447b2c, + .unusedDescription = (const u8*) 0x8447b89, + .pokemonScale = 379, + .pokemonOffset = 4, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SEAKING] = { .categoryName = {_G, _o, _l, _d, _f, _i, _s, _h, _END, _SPACE, _SPACE, _SPACE}, .height = 13, .weight = 390, +<<<<<<< Updated upstream .description = (const u8*) 0x8447cc9, .unused = 31717, .pokemonScale = 2116, @@ -1683,12 +2655,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 288, .unknown2 = 65534, +======= + .description = (const u8*) 0x8447b8a, + .unusedDescription = (const u8*) 0x8447be5, + .pokemonScale = 304, + .pokemonOffset = 1, + .trainerScale = 288, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_STARYU] = { .categoryName = {_S, _t, _a, _r, _SPACE, _S, _h, _a, _p, _e, _END, _SPACE}, .height = 8, .weight = 345, +<<<<<<< Updated upstream .description = (const u8*) 0x8447d25, .unused = 31810, .pokemonScale = 2116, @@ -1697,12 +2678,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8447be6, + .unusedDescription = (const u8*) 0x8447c42, + .pokemonScale = 326, + .pokemonOffset = 1, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_STARMIE] = { .categoryName = {_M, _y, _s, _t, _e, _r, _i, _o, _u, _s, _END, _SPACE}, .height = 11, .weight = 800, +<<<<<<< Updated upstream .description = (const u8*) 0x8447d85, .unused = 31916, .pokemonScale = 2116, @@ -1711,12 +2701,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 3, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8447c43, + .unusedDescription = (const u8*) 0x8447cac, + .pokemonScale = 301, + .pokemonOffset = 3, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MR_MIME] = { .categoryName = {_B, _a, _r, _r, _i, _e, _r, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 13, .weight = 545, +<<<<<<< Updated upstream .description = (const u8*) 0x8447def, .unused = 32008, .pokemonScale = 2116, @@ -1725,26 +2724,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 4, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8447cad, + .unusedDescription = (const u8*) 0x8447d08, + .pokemonScale = 258, + .pokemonOffset = 4, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SCYTHER] = { .categoryName = {_M, _a, _n, _t, _i, _s, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 15, .weight = 560, +<<<<<<< Updated upstream .description = (const u8*) 0x8447e50, .unused = 32115, .pokemonScale = 2116, +======= + .description = (const u8*) 0x8447d09, + .unusedDescription = (const u8*) 0x8447d73, + .pokemonScale = 272, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 272, - .trainerOffset = 0, - .unknown1 = 293, - .unknown2 = 1, + .trainerScale = 293, + .trainerOffset = 1, }, [NATIONAL_DEX_JYNX] = { .categoryName = {_H, _u, _m, _a, _n, _SPACE, _S, _h, _a, _p, _e, _END}, .height = 14, .weight = 406, +<<<<<<< Updated upstream .description = (const u8*) 0x8447eb4, .unused = 32213, .pokemonScale = 2116, @@ -1753,12 +2765,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 3, .unknown1 = 300, .unknown2 = 1, +======= + .description = (const u8*) 0x8447d74, + .unusedDescription = (const u8*) 0x8447dd5, + .pokemonScale = 256, + .pokemonOffset = 3, + .trainerScale = 300, + .trainerOffset = 1, +>>>>>>> Stashed changes }, [NATIONAL_DEX_ELECTABUZZ] = { .categoryName = {_E, _l, _e, _c, _t, _r, _i, _c, _END, _SPACE, _SPACE, _SPACE}, .height = 11, .weight = 300, +<<<<<<< Updated upstream .description = (const u8*) 0x8447f1a, .unused = 32315, .pokemonScale = 2116, @@ -1767,12 +2788,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 7, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8447dd6, + .unusedDescription = (const u8*) 0x8447e3b, + .pokemonScale = 330, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MAGMAR] = { .categoryName = {_S, _p, _i, _t, _f, _i, _r, _e, _END, _SPACE, _SPACE, _SPACE}, .height = 13, .weight = 445, +<<<<<<< Updated upstream .description = (const u8*) 0x8447f80, .unused = 32430, .pokemonScale = 2116, @@ -1781,12 +2811,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 4, .unknown1 = 272, .unknown2 = 65534, +======= + .description = (const u8*) 0x8447e3c, + .unusedDescription = (const u8*) 0x8447eae, + .pokemonScale = 293, + .pokemonOffset = 4, + .trainerScale = 272, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_PINSIR] = { .categoryName = {_S, _t, _a, _g, _SPACE, _B, _e, _e, _t, _l, _e, _END}, .height = 15, .weight = 550, +<<<<<<< Updated upstream .description = (const u8*) 0x8447fee, .unused = 32528, .pokemonScale = 2116, @@ -1795,12 +2834,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 257, .unknown2 = 65534, +======= + .description = (const u8*) 0x8447eaf, + .unusedDescription = (const u8*) 0x8447f10, + .pokemonScale = 256, + .pokemonOffset = 1, + .trainerScale = 257, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_TAUROS] = { .categoryName = {_W, _i, _l, _d, _SPACE, _B, _u, _l, _l, _END, _SPACE, _SPACE}, .height = 14, .weight = 884, +<<<<<<< Updated upstream .description = (const u8*) 0x844805a, .unused = 32633, .pokemonScale = 2116, @@ -1809,12 +2857,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 312, .unknown2 = 3, +======= + .description = (const u8*) 0x8447f11, + .unusedDescription = (const u8*) 0x8447f79, + .pokemonScale = 256, + .pokemonOffset = 2, + .trainerScale = 312, + .trainerOffset = 3, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MAGIKARP] = { .categoryName = {_F, _i, _s, _h, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 9, .weight = 100, +<<<<<<< Updated upstream .description = (const u8*) 0x84480af, .unused = 32729, .pokemonScale = 2116, @@ -1823,12 +2880,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 4, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8447f7a, + .unusedDescription = (const u8*) 0x8447fd9, + .pokemonScale = 317, + .pokemonOffset = 4, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GYARADOS] = { .categoryName = {_A, _t, _r, _o, _c, _i, _o, _u, _s, _END, _SPACE, _SPACE}, .height = 65, .weight = 2350, +<<<<<<< Updated upstream .description = (const u8*) 0x8448123, .unused = 32818, .pokemonScale = 2116, @@ -1837,26 +2903,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 512, .unknown2 = 11, +======= + .description = (const u8*) 0x8447fda, + .unusedDescription = (const u8*) 0x8448032, + .pokemonScale = 288, + .pokemonOffset = 65535, + .trainerScale = 512, + .trainerOffset = 11, +>>>>>>> Stashed changes }, [NATIONAL_DEX_LAPRAS] = { .categoryName = {_T, _r, _a, _n, _s, _p, _o, _r, _t, _END, _SPACE, _SPACE}, .height = 25, .weight = 2200, +<<<<<<< Updated upstream .description = (const u8*) 0x8448194, .unused = 32920, .pokemonScale = 2116, +======= + .description = (const u8*) 0x8448033, + .unusedDescription = (const u8*) 0x8448098, + .pokemonScale = 256, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 256, - .trainerOffset = 0, - .unknown1 = 425, - .unknown2 = 8, + .trainerScale = 425, + .trainerOffset = 8, }, [NATIONAL_DEX_DITTO] = { .categoryName = {_T, _r, _a, _n, _s, _f, _o, _r, _m, _END, _SPACE, _SPACE}, .height = 3, .weight = 40, +<<<<<<< Updated upstream .description = (const u8*) 0x84481f8, .unused = 33019, .pokemonScale = 2116, @@ -1865,12 +2944,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 21, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8448099, + .unusedDescription = (const u8*) 0x84480fb, + .pokemonScale = 602, + .pokemonOffset = 21, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_EEVEE] = { .categoryName = {_E, _v, _o, _l, _u, _t, _i, _o, _n, _END, _SPACE, _SPACE}, .height = 3, .weight = 65, +<<<<<<< Updated upstream .description = (const u8*) 0x8448251, .unused = 33114, .pokemonScale = 2116, @@ -1879,12 +2967,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 17, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84480fc, + .unusedDescription = (const u8*) 0x844815a, + .pokemonScale = 476, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_VAPOREON] = { .categoryName = {_B, _u, _b, _b, _l, _e, _SPACE, _J, _e, _t, _END, _SPACE}, .height = 10, .weight = 290, +<<<<<<< Updated upstream .description = (const u8*) 0x84482b0, .unused = 33228, .pokemonScale = 2116, @@ -1893,12 +2990,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 7, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844815b, + .unusedDescription = (const u8*) 0x84481cc, + .pokemonScale = 316, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_JOLTEON] = { .categoryName = {_L, _i, _g, _h, _t, _n, _i, _n, _g, _END, _SPACE, _SPACE}, .height = 8, .weight = 245, +<<<<<<< Updated upstream .description = (const u8*) 0x8448321, .unused = 33323, .pokemonScale = 2116, @@ -1907,12 +3013,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 8, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84481cd, + .unusedDescription = (const u8*) 0x844822b, + .pokemonScale = 283, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_FLAREON] = { .categoryName = {_F, _l, _a, _m, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 9, .weight = 250, +<<<<<<< Updated upstream .description = (const u8*) 0x8448388, .unused = 33439, .pokemonScale = 2116, @@ -1921,12 +3036,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 11, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844822c, + .unusedDescription = (const u8*) 0x844829f, + .pokemonScale = 302, + .pokemonOffset = 11, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_PORYGON] = { .categoryName = {_V, _i, _r, _t, _u, _a, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 8, .weight = 365, +<<<<<<< Updated upstream .description = (const u8*) 0x84483fc, .unused = 33547, .pokemonScale = 2116, @@ -1935,12 +3059,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 7, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84482a0, + .unusedDescription = (const u8*) 0x844830b, + .pokemonScale = 328, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_OMANYTE] = { .categoryName = {_S, _p, _i, _r, _a, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 4, .weight = 75, +<<<<<<< Updated upstream .description = (const u8*) 0x8448468, .unused = 33646, .pokemonScale = 2116, @@ -1949,12 +3082,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 20, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844830c, + .unusedDescription = (const u8*) 0x844836e, + .pokemonScale = 521, + .pokemonOffset = 20, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_OMASTAR] = { .categoryName = {_S, _p, _i, _r, _a, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 10, .weight = 350, +<<<<<<< Updated upstream .description = (const u8*) 0x84484ce, .unused = 33757, .pokemonScale = 2116, @@ -1963,12 +3105,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 5, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844836f, + .unusedDescription = (const u8*) 0x84483dd, + .pokemonScale = 307, + .pokemonOffset = 5, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_KABUTO] = { .categoryName = {_S, _h, _e, _l, _l, _f, _i, _s, _h, _END, _SPACE, _SPACE}, .height = 5, .weight = 115, +<<<<<<< Updated upstream .description = (const u8*) 0x8448538, .unused = 33860, .pokemonScale = 2116, @@ -1977,12 +3128,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 21, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84483de, + .unusedDescription = (const u8*) 0x8448444, + .pokemonScale = 438, + .pokemonOffset = 21, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_KABUTOPS] = { .categoryName = {_S, _h, _e, _l, _l, _f, _i, _s, _h, _END, _SPACE, _SPACE}, .height = 13, .weight = 405, +<<<<<<< Updated upstream .description = (const u8*) 0x84485a4, .unused = 33961, .pokemonScale = 2116, @@ -1991,12 +3151,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8448445, + .unusedDescription = (const u8*) 0x84484a9, + .pokemonScale = 271, + .pokemonOffset = 1, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_AERODACTYL] = { .categoryName = {_F, _o, _s, _s, _i, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 18, .weight = 590, +<<<<<<< Updated upstream .description = (const u8*) 0x844860e, .unused = 34064, .pokemonScale = 2116, @@ -2005,12 +3174,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 317, .unknown2 = 2, +======= + .description = (const u8*) 0x84484aa, + .unusedDescription = (const u8*) 0x8448510, + .pokemonScale = 275, + .pokemonOffset = 65535, + .trainerScale = 317, + .trainerOffset = 2, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SNORLAX] = { .categoryName = {_S, _l, _e, _e, _p, _i, _n, _g, _END, _SPACE, _SPACE, _SPACE}, .height = 21, .weight = 4600, +<<<<<<< Updated upstream .description = (const u8*) 0x844867e, .unused = 34175, .pokemonScale = 2116, @@ -2019,26 +3197,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 408, .unknown2 = 7, +======= + .description = (const u8*) 0x8448511, + .unusedDescription = (const u8*) 0x844857f, + .pokemonScale = 275, + .pokemonOffset = 1, + .trainerScale = 408, + .trainerOffset = 7, +>>>>>>> Stashed changes }, [NATIONAL_DEX_ARTICUNO] = { .categoryName = {_F, _r, _e, _e, _z, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 17, .weight = 554, +<<<<<<< Updated upstream .description = (const u8*) 0x84486f8, .unused = 34279, .pokemonScale = 2116, +======= + .description = (const u8*) 0x8448580, + .unusedDescription = (const u8*) 0x84485e7, + .pokemonScale = 278, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 278, - .trainerOffset = 0, - .unknown1 = 308, - .unknown2 = 1, + .trainerScale = 308, + .trainerOffset = 1, }, [NATIONAL_DEX_ZAPDOS] = { .categoryName = {_E, _l, _e, _c, _t, _r, _i, _c, _END, _SPACE, _SPACE, _SPACE}, .height = 16, .weight = 526, +<<<<<<< Updated upstream .description = (const u8*) 0x8448760, .unused = 34370, .pokemonScale = 2116, @@ -2047,12 +3238,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 330, .unknown2 = 3, +======= + .description = (const u8*) 0x84485e8, + .unusedDescription = (const u8*) 0x8448642, + .pokemonScale = 275, + .pokemonOffset = 1, + .trainerScale = 330, + .trainerOffset = 3, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MOLTRES] = { .categoryName = {_F, _l, _a, _m, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 20, .weight = 600, +<<<<<<< Updated upstream .description = (const u8*) 0x84487c0, .unused = 34475, .pokemonScale = 2116, @@ -2061,12 +3261,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 379, .unknown2 = 6, +======= + .description = (const u8*) 0x8448643, + .unusedDescription = (const u8*) 0x84486ab, + .pokemonScale = 270, + .pokemonOffset = 1, + .trainerScale = 379, + .trainerOffset = 6, +>>>>>>> Stashed changes }, [NATIONAL_DEX_DRATINI] = { .categoryName = {_D, _r, _a, _g, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 18, .weight = 33, +<<<<<<< Updated upstream .description = (const u8*) 0x8448831, .unused = 34570, .pokemonScale = 2116, @@ -2075,26 +3284,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 8, .unknown1 = 386, .unknown2 = 6, +======= + .description = (const u8*) 0x84486ac, + .unusedDescription = (const u8*) 0x844870a, + .pokemonScale = 256, + .pokemonOffset = 8, + .trainerScale = 386, + .trainerOffset = 6, +>>>>>>> Stashed changes }, [NATIONAL_DEX_DRAGONAIR] = { .categoryName = {_D, _r, _a, _g, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 40, .weight = 165, +<<<<<<< Updated upstream .description = (const u8*) 0x844888d, .unused = 34670, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844870b, + .unusedDescription = (const u8*) 0x844876e, + .pokemonScale = 274, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 274, - .trainerOffset = 0, - .unknown1 = 423, - .unknown2 = 6, + .trainerScale = 423, + .trainerOffset = 6, }, [NATIONAL_DEX_DRAGONITE] = { .categoryName = {_D, _r, _a, _g, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 22, .weight = 2100, +<<<<<<< Updated upstream .description = (const u8*) 0x84488f7, .unused = 34773, .pokemonScale = 2116, @@ -2103,12 +3325,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 342, .unknown2 = 4, +======= + .description = (const u8*) 0x844876f, + .unusedDescription = (const u8*) 0x84487d5, + .pokemonScale = 283, + .pokemonOffset = 65535, + .trainerScale = 342, + .trainerOffset = 4, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MEWTWO] = { .categoryName = {_G, _e, _n, _e, _t, _i, _c, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 20, .weight = 1220, +<<<<<<< Updated upstream .description = (const u8*) 0x8448952, .unused = 34874, .pokemonScale = 2116, @@ -2117,26 +3348,41 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 342, .unknown2 = 5, +======= + .description = (const u8*) 0x84487d6, + .unusedDescription = (const u8*) 0x844883a, + .pokemonScale = 276, + .pokemonOffset = 65535, + .trainerScale = 342, + .trainerOffset = 5, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MEW] = { .categoryName = {_N, _e, _w, _SPACE, _S, _p, _e, _c, _i, _e, _s, _END}, .height = 4, .weight = 40, +<<<<<<< Updated upstream .description = (const u8*) 0x84489b7, .unused = 34973, .pokemonScale = 2116, .pokemonOffset = 0, .trainerScale = 460, +======= + .description = (const u8*) 0x844883b, + .unusedDescription = (const u8*) 0x844889d, + .pokemonScale = 460, + .pokemonOffset = 65534, + .trainerScale = 256, +>>>>>>> Stashed changes .trainerOffset = 65534, - .unknown1 = 256, - .unknown2 = 65534, }, [NATIONAL_DEX_CHIKORITA] = { .categoryName = {_L, _e, _a, _f, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 9, .weight = 64, +<<<<<<< Updated upstream .description = (const u8*) 0x8448a26, .unused = 35078, .pokemonScale = 2116, @@ -2145,12 +3391,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 18, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844889e, + .unusedDescription = (const u8*) 0x8448906, + .pokemonScale = 512, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_BAYLEEF] = { .categoryName = {_L, _e, _a, _f, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 12, .weight = 158, +<<<<<<< Updated upstream .description = (const u8*) 0x8448a7e, .unused = 35173, .pokemonScale = 2116, @@ -2159,26 +3414,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 4, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8448907, + .unusedDescription = (const u8*) 0x8448965, + .pokemonScale = 296, + .pokemonOffset = 4, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MEGANIUM] = { .categoryName = {_H, _e, _r, _b, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 18, .weight = 1005, +<<<<<<< Updated upstream .description = (const u8*) 0x8448add, .unused = 35271, .pokemonScale = 2116, +======= + .description = (const u8*) 0x8448966, + .unusedDescription = (const u8*) 0x84489c7, + .pokemonScale = 286, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 286, - .trainerOffset = 0, - .unknown1 = 317, - .unknown2 = 2, + .trainerScale = 317, + .trainerOffset = 2, }, [NATIONAL_DEX_CYNDAQUIL] = { .categoryName = {_F, _i, _r, _e, _SPACE, _M, _o, _u, _s, _e, _END, _SPACE}, .height = 5, .weight = 79, +<<<<<<< Updated upstream .description = (const u8*) 0x8448b3f, .unused = 35374, .pokemonScale = 2116, @@ -2187,12 +3455,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 19, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84489c8, + .unusedDescription = (const u8*) 0x8448a2e, + .pokemonScale = 539, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_QUILAVA] = { .categoryName = {_V, _o, _l, _c, _a, _n, _o, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 9, .weight = 190, +<<<<<<< Updated upstream .description = (const u8*) 0x8448b9e, .unused = 35472, .pokemonScale = 2116, @@ -2201,12 +3478,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 10, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8448a2f, + .unusedDescription = (const u8*) 0x8448a90, + .pokemonScale = 329, + .pokemonOffset = 10, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_TYPHLOSION] = { .categoryName = {_V, _o, _l, _c, _a, _n, _o, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 17, .weight = 795, +<<<<<<< Updated upstream .description = (const u8*) 0x8448bfc, .unused = 35572, .pokemonScale = 2116, @@ -2215,12 +3501,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 287, .unknown2 = 0, +======= + .description = (const u8*) 0x8448a91, + .unusedDescription = (const u8*) 0x8448af4, + .pokemonScale = 284, + .pokemonOffset = 65535, + .trainerScale = 287, + .trainerOffset = 0, +>>>>>>> Stashed changes }, [NATIONAL_DEX_TOTODILE] = { .categoryName = {_B, _i, _g, _SPACE, _J, _a, _w, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 95, +<<<<<<< Updated upstream .description = (const u8*) 0x8448c5b, .unused = 35673, .pokemonScale = 2116, @@ -2229,12 +3524,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 20, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8448af5, + .unusedDescription = (const u8*) 0x8448b59, + .pokemonScale = 487, + .pokemonOffset = 20, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CROCONAW] = { .categoryName = {_B, _i, _g, _SPACE, _J, _a, _w, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 11, .weight = 250, +<<<<<<< Updated upstream .description = (const u8*) 0x8448cba, .unused = 35773, .pokemonScale = 2116, @@ -2243,12 +3547,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 11, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8448b5a, + .unusedDescription = (const u8*) 0x8448bbd, + .pokemonScale = 378, + .pokemonOffset = 11, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_FERALIGATR] = { .categoryName = {_B, _i, _g, _SPACE, _J, _a, _w, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 23, .weight = 888, +<<<<<<< Updated upstream .description = (const u8*) 0x8448d1e, .unused = 35876, .pokemonScale = 2116, @@ -2257,12 +3570,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 375, .unknown2 = 6, +======= + .description = (const u8*) 0x8448bbe, + .unusedDescription = (const u8*) 0x8448c24, + .pokemonScale = 282, + .pokemonOffset = 65535, + .trainerScale = 375, + .trainerOffset = 6, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SENTRET] = { .categoryName = {_S, _c, _o, _u, _t, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 8, .weight = 60, +<<<<<<< Updated upstream .description = (const u8*) 0x8448d8a, .unused = 35981, .pokemonScale = 2116, @@ -2271,12 +3593,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 12, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8448c25, + .unusedDescription = (const u8*) 0x8448c8d, + .pokemonScale = 439, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_FURRET] = { .categoryName = {_L, _o, _n, _g, _SPACE, _B, _o, _d, _y, _END, _SPACE, _SPACE}, .height = 18, .weight = 325, +<<<<<<< Updated upstream .description = (const u8*) 0x8448df3, .unused = 36090, .pokemonScale = 2116, @@ -2285,12 +3616,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 10, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8448c8e, + .unusedDescription = (const u8*) 0x8448cfa, + .pokemonScale = 346, + .pokemonOffset = 10, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_HOOTHOOT] = { .categoryName = {_O, _w, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 7, .weight = 212, +<<<<<<< Updated upstream .description = (const u8*) 0x8448e57, .unused = 36196, .pokemonScale = 2116, @@ -2299,12 +3639,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 15, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8448cfb, + .unusedDescription = (const u8*) 0x8448d64, + .pokemonScale = 380, + .pokemonOffset = 15, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_NOCTOWL] = { .categoryName = {_O, _w, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 16, .weight = 408, +<<<<<<< Updated upstream .description = (const u8*) 0x8448ec1, .unused = 36288, .pokemonScale = 2116, @@ -2313,40 +3662,59 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8448d65, + .unusedDescription = (const u8*) 0x8448dc0, + .pokemonScale = 278, + .pokemonOffset = 2, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_LEDYBA] = { .categoryName = {_F, _i, _v, _e, _SPACE, _S, _t, _a, _r, _END, _SPACE, _SPACE}, .height = 10, .weight = 108, +<<<<<<< Updated upstream .description = (const u8*) 0x8448f1d, .unused = 36391, .pokemonScale = 2116, .pokemonOffset = 0, +======= + .description = (const u8*) 0x8448dc1, + .unusedDescription = (const u8*) 0x8448e27, + .pokemonScale = 256, + .pokemonOffset = 4, +>>>>>>> Stashed changes .trainerScale = 256, - .trainerOffset = 4, - .unknown1 = 256, - .unknown2 = 65534, + .trainerOffset = 65534, }, [NATIONAL_DEX_LEDIAN] = { .categoryName = {_F, _i, _v, _e, _SPACE, _S, _t, _a, _r, _END, _SPACE, _SPACE}, .height = 14, .weight = 356, +<<<<<<< Updated upstream .description = (const u8*) 0x8448f87, .unused = 36492, .pokemonScale = 2116, .pokemonOffset = 0, +======= + .description = (const u8*) 0x8448e28, + .unusedDescription = (const u8*) 0x8448e8c, + .pokemonScale = 256, + .pokemonOffset = 1, +>>>>>>> Stashed changes .trainerScale = 256, - .trainerOffset = 1, - .unknown1 = 256, - .unknown2 = 65534, + .trainerOffset = 65534, }, [NATIONAL_DEX_SPINARAK] = { .categoryName = {_S, _t, _r, _i, _n, _g, _SPACE, _S, _p, _i, _t, _END}, .height = 5, .weight = 85, +<<<<<<< Updated upstream .description = (const u8*) 0x8448ff0, .unused = 36596, .pokemonScale = 2116, @@ -2355,12 +3723,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 20, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8448e8d, + .unusedDescription = (const u8*) 0x8448ef4, + .pokemonScale = 414, + .pokemonOffset = 20, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_ARIADOS] = { .categoryName = {_L, _o, _n, _g, _SPACE, _L, _e, _g, _END, _SPACE, _SPACE, _SPACE}, .height = 11, .weight = 335, +<<<<<<< Updated upstream .description = (const u8*) 0x8449052, .unused = 36700, .pokemonScale = 2116, @@ -2369,12 +3746,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 7, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8448ef5, + .unusedDescription = (const u8*) 0x8448f5c, + .pokemonScale = 316, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CROBAT] = { .categoryName = {_B, _a, _t, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 18, .weight = 750, +<<<<<<< Updated upstream .description = (const u8*) 0x84490bd, .unused = 36810, .pokemonScale = 2116, @@ -2383,26 +3769,41 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 313, .unknown2 = 2, +======= + .description = (const u8*) 0x8448f5d, + .unusedDescription = (const u8*) 0x8448fca, + .pokemonScale = 279, + .pokemonOffset = 65535, + .trainerScale = 313, + .trainerOffset = 2, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CHINCHOU] = { .categoryName = {_A, _n, _g, _l, _e, _r, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 5, .weight = 120, +<<<<<<< Updated upstream .description = (const u8*) 0x8449124, .unused = 36914, .pokemonScale = 2116, .pokemonOffset = 0, .trainerScale = 424, +======= + .description = (const u8*) 0x8448fcb, + .unusedDescription = (const u8*) 0x8449032, + .pokemonScale = 424, + .pokemonOffset = 65534, + .trainerScale = 256, +>>>>>>> Stashed changes .trainerOffset = 65534, - .unknown1 = 256, - .unknown2 = 65534, }, [NATIONAL_DEX_LANTURN] = { .categoryName = {_L, _i, _g, _h, _t, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 12, .weight = 225, +<<<<<<< Updated upstream .description = (const u8*) 0x8449181, .unused = 37015, .pokemonScale = 2116, @@ -2411,12 +3812,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 6, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449033, + .unusedDescription = (const u8*) 0x8449097, + .pokemonScale = 269, + .pokemonOffset = 6, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_PICHU] = { .categoryName = {_T, _i, _n, _y, _SPACE, _M, _o, _u, _s, _e, _END, _SPACE}, .height = 3, .weight = 20, +<<<<<<< Updated upstream .description = (const u8*) 0x84491e6, .unused = 37120, .pokemonScale = 2116, @@ -2425,12 +3835,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 17, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449098, + .unusedDescription = (const u8*) 0x8449100, + .pokemonScale = 508, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CLEFFA] = { .categoryName = {_S, _t, _a, _r, _SPACE, _S, _h, _a, _p, _e, _END, _SPACE}, .height = 3, .weight = 30, +<<<<<<< Updated upstream .description = (const u8*) 0x844924f, .unused = 37209, .pokemonScale = 2116, @@ -2439,12 +3858,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 22, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449101, + .unusedDescription = (const u8*) 0x8449159, + .pokemonScale = 462, + .pokemonOffset = 22, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_IGGLYBUFF] = { .categoryName = {_B, _a, _l, _l, _o, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 3, .weight = 10, +<<<<<<< Updated upstream .description = (const u8*) 0x84492a8, .unused = 37299, .pokemonScale = 2116, @@ -2453,12 +3881,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844915a, + .unusedDescription = (const u8*) 0x84491b3, + .pokemonScale = 457, + .pokemonOffset = 65535, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_TOGEPI] = { .categoryName = {_S, _p, _i, _k, _e, _SPACE, _B, _a, _l, _l, _END, _SPACE}, .height = 3, .weight = 15, +<<<<<<< Updated upstream .description = (const u8*) 0x8449302, .unused = 37393, .pokemonScale = 2116, @@ -2467,12 +3904,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 21, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84491b4, + .unusedDescription = (const u8*) 0x8449211, + .pokemonScale = 507, + .pokemonOffset = 21, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_TOGETIC] = { .categoryName = {_H, _a, _p, _p, _i, _n, _e, _s, _s, _END, _SPACE, _SPACE}, .height = 6, .weight = 32, +<<<<<<< Updated upstream .description = (const u8*) 0x8449360, .unused = 37494, .pokemonScale = 2116, @@ -2481,12 +3927,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 15, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449212, + .unusedDescription = (const u8*) 0x8449276, + .pokemonScale = 424, + .pokemonOffset = 15, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_NATU] = { .categoryName = {_T, _i, _n, _y, _SPACE, _B, _i, _r, _d, _END, _SPACE, _SPACE}, .height = 2, .weight = 20, +<<<<<<< Updated upstream .description = (const u8*) 0x84493c5, .unused = 37601, .pokemonScale = 2116, @@ -2495,12 +3950,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 23, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449277, + .unusedDescription = (const u8*) 0x84492e1, + .pokemonScale = 610, + .pokemonOffset = 23, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_XATU] = { .categoryName = {_M, _y, _s, _t, _i, _c, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 15, .weight = 150, +<<<<<<< Updated upstream .description = (const u8*) 0x8449431, .unused = 37705, .pokemonScale = 2116, @@ -2509,12 +3973,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 4, .unknown1 = 317, .unknown2 = 3, +======= + .description = (const u8*) 0x84492e2, + .unusedDescription = (const u8*) 0x8449349, + .pokemonScale = 258, + .pokemonOffset = 4, + .trainerScale = 317, + .trainerOffset = 3, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MAREEP] = { .categoryName = {_W, _o, _o, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 78, +<<<<<<< Updated upstream .description = (const u8*) 0x8449493, .unused = 37806, .pokemonScale = 2116, @@ -2523,12 +3996,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 18, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844934a, + .unusedDescription = (const u8*) 0x84493ae, + .pokemonScale = 379, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_FLAAFFY] = { .categoryName = {_W, _o, _o, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 8, .weight = 133, +<<<<<<< Updated upstream .description = (const u8*) 0x84494f8, .unused = 37914, .pokemonScale = 2116, @@ -2537,12 +4019,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 13, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84493af, + .unusedDescription = (const u8*) 0x844941a, + .pokemonScale = 372, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_AMPHAROS] = { .categoryName = {_L, _i, _g, _h, _t, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 14, .weight = 1000, +<<<<<<< Updated upstream .description = (const u8*) 0x8449559, .unused = 38022, .pokemonScale = 2116, @@ -2551,12 +4042,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 283, .unknown2 = 65535, +======= + .description = (const u8*) 0x844941b, + .unusedDescription = (const u8*) 0x8449486, + .pokemonScale = 275, + .pokemonOffset = 2, + .trainerScale = 283, + .trainerOffset = 65535, +>>>>>>> Stashed changes }, [NATIONAL_DEX_BELLOSSOM] = { .categoryName = {_F, _l, _o, _w, _e, _r, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 4, .weight = 58, +<<<<<<< Updated upstream .description = (const u8*) 0x84495c4, .unused = 38135, .pokemonScale = 2116, @@ -2565,12 +4065,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 19, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449487, + .unusedDescription = (const u8*) 0x84494f7, + .pokemonScale = 472, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MARILL] = { .categoryName = {_A, _q, _u, _a, _SPACE, _M, _o, _u, _s, _e, _END, _SPACE}, .height = 4, .weight = 85, +<<<<<<< Updated upstream .description = (const u8*) 0x844962a, .unused = 38230, .pokemonScale = 2116, @@ -2579,12 +4088,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 19, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84494f8, + .unusedDescription = (const u8*) 0x8449556, + .pokemonScale = 476, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_AZUMARILL] = { .categoryName = {_A, _q, _u, _a, _SPACE, _R, _a, _b, _b, _i, _t, _END}, .height = 8, .weight = 285, +<<<<<<< Updated upstream .description = (const u8*) 0x8449688, .unused = 38329, .pokemonScale = 2116, @@ -2593,12 +4111,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 15, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449557, + .unusedDescription = (const u8*) 0x84495b9, + .pokemonScale = 448, + .pokemonOffset = 15, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SUDOWOODO] = { .categoryName = {_I, _m, _i, _t, _a, _t, _i, _o, _n, _END, _SPACE, _SPACE}, .height = 12, .weight = 380, +<<<<<<< Updated upstream .description = (const u8*) 0x84496eb, .unused = 38436, .pokemonScale = 2116, @@ -2607,12 +4134,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 7, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84495ba, + .unusedDescription = (const u8*) 0x8449624, + .pokemonScale = 305, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_POLITOED] = { .categoryName = {_F, _r, _o, _g, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 11, .weight = 339, +<<<<<<< Updated upstream .description = (const u8*) 0x8449756, .unused = 38529, .pokemonScale = 2116, @@ -2621,12 +4157,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 5, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449625, + .unusedDescription = (const u8*) 0x8449681, + .pokemonScale = 289, + .pokemonOffset = 5, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_HOPPIP] = { .categoryName = {_C, _o, _t, _t, _o, _n, _w, _e, _e, _d, _END, _SPACE}, .height = 4, .weight = 5, +<<<<<<< Updated upstream .description = (const u8*) 0x84497bb, .unused = 38628, .pokemonScale = 2116, @@ -2635,26 +4180,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65529, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449682, + .unusedDescription = (const u8*) 0x84496e4, + .pokemonScale = 562, + .pokemonOffset = 65529, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SKIPLOOM] = { .categoryName = {_C, _o, _t, _t, _o, _n, _w, _e, _e, _d, _END, _SPACE}, .height = 6, .weight = 10, +<<<<<<< Updated upstream .description = (const u8*) 0x844981e, .unused = 38725, .pokemonScale = 2116, +======= + .description = (const u8*) 0x84496e5, + .unusedDescription = (const u8*) 0x8449745, + .pokemonScale = 387, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 387, - .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 65534, + .trainerScale = 256, + .trainerOffset = 65534, }, [NATIONAL_DEX_JUMPLUFF] = { .categoryName = {_C, _o, _t, _t, _o, _n, _w, _e, _e, _d, _END, _SPACE}, .height = 8, .weight = 30, +<<<<<<< Updated upstream .description = (const u8*) 0x844987d, .unused = 38833, .pokemonScale = 2116, @@ -2663,12 +4221,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65532, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449746, + .unusedDescription = (const u8*) 0x84497b1, + .pokemonScale = 418, + .pokemonOffset = 65532, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_AIPOM] = { .categoryName = {_L, _o, _n, _g, _SPACE, _T, _a, _i, _l, _END, _SPACE, _SPACE}, .height = 8, .weight = 115, +<<<<<<< Updated upstream .description = (const u8*) 0x84498e9, .unused = 38934, .pokemonScale = 2116, @@ -2677,26 +4244,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 8, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84497b2, + .unusedDescription = (const u8*) 0x8449816, + .pokemonScale = 363, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SUNKERN] = { .categoryName = {_S, _e, _e, _d, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 3, .weight = 18, +<<<<<<< Updated upstream .description = (const u8*) 0x844994d, .unused = 39041, .pokemonScale = 2116, +======= + .description = (const u8*) 0x8449817, + .unusedDescription = (const u8*) 0x8449881, + .pokemonScale = 541, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 541, - .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 65534, + .trainerScale = 256, + .trainerOffset = 65534, }, [NATIONAL_DEX_SUNFLORA] = { .categoryName = {_S, _u, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 8, .weight = 85, +<<<<<<< Updated upstream .description = (const u8*) 0x84499b8, .unused = 39145, .pokemonScale = 2116, @@ -2705,12 +4285,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 12, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449882, + .unusedDescription = (const u8*) 0x84498e9, + .pokemonScale = 374, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_YANMA] = { .categoryName = {_C, _l, _e, _a, _r, _SPACE, _W, _i, _n, _g, _END, _SPACE}, .height = 12, .weight = 380, +<<<<<<< Updated upstream .description = (const u8*) 0x8449a20, .unused = 39252, .pokemonScale = 2116, @@ -2719,12 +4308,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65532, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x84498ea, + .unusedDescription = (const u8*) 0x8449954, + .pokemonScale = 274, + .pokemonOffset = 65532, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_WOOPER] = { .categoryName = {_W, _a, _t, _e, _r, _SPACE, _F, _i, _s, _h, _END, _SPACE}, .height = 4, .weight = 85, +<<<<<<< Updated upstream .description = (const u8*) 0x8449a82, .unused = 39357, .pokemonScale = 2116, @@ -2733,26 +4331,40 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 20, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449955, + .unusedDescription = (const u8*) 0x84499bd, + .pokemonScale = 479, + .pokemonOffset = 20, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_QUAGSIRE] = { .categoryName = {_W, _a, _t, _e, _r, _SPACE, _F, _i, _s, _h, _END, _SPACE}, .height = 14, .weight = 750, +<<<<<<< Updated upstream .description = (const u8*) 0x8449ad7, .unused = 39463, .pokemonScale = 2116, .pokemonOffset = 0, +======= + .description = (const u8*) 0x84499be, + .unusedDescription = (const u8*) 0x8449a27, + .pokemonScale = 273, + .pokemonOffset = 4, +>>>>>>> Stashed changes .trainerScale = 273, - .trainerOffset = 4, - .unknown1 = 273, - .unknown2 = 65534, + .trainerOffset = 65534, }, [NATIONAL_DEX_ESPEON] = { .categoryName = {_S, _u, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 9, .weight = 265, +<<<<<<< Updated upstream .description = (const u8*) 0x8449b42, .unused = 39562, .pokemonScale = 2116, @@ -2761,12 +4373,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 12, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449a28, + .unusedDescription = (const u8*) 0x8449a8a, + .pokemonScale = 363, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_UMBREON] = { .categoryName = {_M, _o, _o, _n, _l, _i, _g, _h, _t, _END, _SPACE, _SPACE}, .height = 10, .weight = 270, +<<<<<<< Updated upstream .description = (const u8*) 0x8449b9e, .unused = 39660, .pokemonScale = 2116, @@ -2775,12 +4396,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 9, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449a8b, + .unusedDescription = (const u8*) 0x8449aec, + .pokemonScale = 317, + .pokemonOffset = 9, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MURKROW] = { .categoryName = {_D, _a, _r, _k, _n, _e, _s, _s, _END, _SPACE, _SPACE, _SPACE}, .height = 5, .weight = 21, +<<<<<<< Updated upstream .description = (const u8*) 0x8449c07, .unused = 39758, .pokemonScale = 2116, @@ -2789,12 +4419,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65528, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449aed, + .unusedDescription = (const u8*) 0x8449b4e, + .pokemonScale = 401, + .pokemonOffset = 65528, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SLOWKING] = { .categoryName = {_R, _o, _y, _a, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 20, .weight = 795, +<<<<<<< Updated upstream .description = (const u8*) 0x8449c72, .unused = 39853, .pokemonScale = 2116, @@ -2803,12 +4442,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 330, .unknown2 = 4, +======= + .description = (const u8*) 0x8449b4f, + .unusedDescription = (const u8*) 0x8449bad, + .pokemonScale = 265, + .pokemonOffset = 65535, + .trainerScale = 330, + .trainerOffset = 4, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MISDREAVUS] = { .categoryName = {_S, _c, _r, _e, _e, _c, _h, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 7, .weight = 10, +<<<<<<< Updated upstream .description = (const u8*) 0x8449cd1, .unused = 39960, .pokemonScale = 2116, @@ -2817,12 +4465,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65528, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449bae, + .unusedDescription = (const u8*) 0x8449c18, + .pokemonScale = 407, + .pokemonOffset = 65528, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_UNOWN] = { .categoryName = {_S, _y, _m, _b, _o, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 5, .weight = 50, +<<<<<<< Updated upstream .description = (const u8*) 0x8449d3c, .unused = 40047, .pokemonScale = 2116, @@ -2831,12 +4488,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449c19, + .unusedDescription = (const u8*) 0x8449c6f, + .pokemonScale = 411, + .pokemonOffset = 2, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_WOBBUFFET] = { .categoryName = {_P, _a, _t, _i, _e, _n, _t, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 13, .weight = 285, +<<<<<<< Updated upstream .description = (const u8*) 0x8449d93, .unused = 40148, .pokemonScale = 2116, @@ -2845,12 +4511,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 4, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449c70, + .unusedDescription = (const u8*) 0x8449cd4, + .pokemonScale = 274, + .pokemonOffset = 4, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GIRAFARIG] = { .categoryName = {_L, _o, _n, _g, _SPACE, _N, _e, _c, _k, _END, _SPACE, _SPACE}, .height = 15, .weight = 415, +<<<<<<< Updated upstream .description = (const u8*) 0x8449df8, .unused = 40247, .pokemonScale = 2116, @@ -2859,12 +4534,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449cd5, + .unusedDescription = (const u8*) 0x8449d37, + .pokemonScale = 281, + .pokemonOffset = 2, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_PINECO] = { .categoryName = {_B, _a, _g, _w, _o, _r, _m, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 72, +<<<<<<< Updated upstream .description = (const u8*) 0x8449e5b, .unused = 40344, .pokemonScale = 2116, @@ -2873,12 +4557,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449d38, + .unusedDescription = (const u8*) 0x8449d98, + .pokemonScale = 445, + .pokemonOffset = 2, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_FORRETRESS] = { .categoryName = {_B, _a, _g, _w, _o, _r, _m, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 12, .weight = 1258, +<<<<<<< Updated upstream .description = (const u8*) 0x8449ebc, .unused = 40450, .pokemonScale = 2116, @@ -2887,12 +4580,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 5, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449d99, + .unusedDescription = (const u8*) 0x8449e02, + .pokemonScale = 293, + .pokemonOffset = 5, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_DUNSPARCE] = { .categoryName = {_L, _a, _n, _d, _SPACE, _S, _n, _a, _k, _e, _END, _SPACE}, .height = 15, .weight = 140, +<<<<<<< Updated upstream .description = (const u8*) 0x8449f26, .unused = 40546, .pokemonScale = 2116, @@ -2901,12 +4603,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 15, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449e03, + .unusedDescription = (const u8*) 0x8449e62, + .pokemonScale = 284, + .pokemonOffset = 15, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GLIGAR] = { .categoryName = {_F, _l, _y, _s, _c, _o, _r, _p, _i, _o, _n, _END}, .height = 11, .weight = 648, +<<<<<<< Updated upstream .description = (const u8*) 0x8449f86, .unused = 40648, .pokemonScale = 2116, @@ -2915,12 +4626,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449e63, + .unusedDescription = (const u8*) 0x8449ec8, + .pokemonScale = 350, + .pokemonOffset = 65535, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_STEELIX] = { .categoryName = {_I, _r, _o, _n, _SPACE, _S, _n, _a, _k, _e, _END, _SPACE}, .height = 92, .weight = 4000, +<<<<<<< Updated upstream .description = (const u8*) 0x8449fec, .unused = 40748, .pokemonScale = 2116, @@ -2929,12 +4649,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 557, .unknown2 = 13, +======= + .description = (const u8*) 0x8449ec9, + .unusedDescription = (const u8*) 0x8449f2c, + .pokemonScale = 278, + .pokemonOffset = 65535, + .trainerScale = 557, + .trainerOffset = 13, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SNUBBULL] = { .categoryName = {_F, _a, _i, _r, _y, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 78, +<<<<<<< Updated upstream .description = (const u8*) 0x844a052, .unused = 40850, .pokemonScale = 2116, @@ -2943,54 +4672,76 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 18, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x8449f2d, + .unusedDescription = (const u8*) 0x8449f92, + .pokemonScale = 465, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GRANBULL] = { .categoryName = {_F, _a, _i, _r, _y, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 14, .weight = 487, +<<<<<<< Updated upstream .description = (const u8*) 0x844a0b9, .unused = 40947, .pokemonScale = 2116, .pokemonOffset = 0, +======= + .description = (const u8*) 0x8449f93, + .unusedDescription = (const u8*) 0x8449ff3, + .pokemonScale = 256, + .pokemonOffset = 3, +>>>>>>> Stashed changes .trainerScale = 256, - .trainerOffset = 3, - .unknown1 = 256, - .unknown2 = 65534, + .trainerOffset = 65534, }, [NATIONAL_DEX_QWILFISH] = { .categoryName = {_B, _a, _l, _l, _o, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 5, .weight = 39, +<<<<<<< Updated upstream .description = (const u8*) 0x844a120, .unused = 41049, .pokemonScale = 2116, +======= + .description = (const u8*) 0x8449ff4, + .unusedDescription = (const u8*) 0x844a059, + .pokemonScale = 430, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 430, - .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 65534, + .trainerScale = 256, + .trainerOffset = 65534, }, [NATIONAL_DEX_SCIZOR] = { .categoryName = {_S, _c, _i, _s, _s, _o, _r, _s, _END, _SPACE, _SPACE, _SPACE}, .height = 18, .weight = 1180, +<<<<<<< Updated upstream .description = (const u8*) 0x844a185, .unused = 41152, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844a05a, + .unusedDescription = (const u8*) 0x844a0c0, + .pokemonScale = 282, +>>>>>>> Stashed changes .pokemonOffset = 0, .trainerScale = 282, .trainerOffset = 0, - .unknown1 = 282, - .unknown2 = 0, }, [NATIONAL_DEX_SHUCKLE] = { .categoryName = {_M, _o, _l, _d, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 205, +<<<<<<< Updated upstream .description = (const u8*) 0x844a1e8, .unused = 41248, .pokemonScale = 2116, @@ -2999,26 +4750,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 16, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844a0c1, + .unusedDescription = (const u8*) 0x844a120, + .pokemonScale = 485, + .pokemonOffset = 16, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_HERACROSS] = { .categoryName = {_S, _i, _n, _g, _l, _e, _SPACE, _H, _o, _r, _n, _END}, .height = 15, .weight = 540, +<<<<<<< Updated upstream .description = (const u8*) 0x844a254, .unused = 41347, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844a121, + .unusedDescription = (const u8*) 0x844a183, + .pokemonScale = 285, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 285, - .trainerOffset = 0, - .unknown1 = 283, - .unknown2 = 65534, + .trainerScale = 283, + .trainerOffset = 65534, }, [NATIONAL_DEX_SNEASEL] = { .categoryName = {_S, _h, _a, _r, _p, _SPACE, _C, _l, _a, _w, _END, _SPACE}, .height = 9, .weight = 280, +<<<<<<< Updated upstream .description = (const u8*) 0x844a2b5, .unused = 41445, .pokemonScale = 2116, @@ -3027,12 +4791,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65533, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844a184, + .unusedDescription = (const u8*) 0x844a1e5, + .pokemonScale = 413, + .pokemonOffset = 65533, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_TEDDIURSA] = { .categoryName = {_L, _i, _t, _t, _l, _e, _SPACE, _B, _e, _a, _r, _END}, .height = 6, .weight = 88, +<<<<<<< Updated upstream .description = (const u8*) 0x844a318, .unused = 41546, .pokemonScale = 2116, @@ -3041,26 +4814,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 17, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844a1e6, + .unusedDescription = (const u8*) 0x844a24a, + .pokemonScale = 455, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_URSARING] = { .categoryName = {_H, _i, _b, _e, _r, _n, _a, _t, _o, _r, _END, _SPACE}, .height = 18, .weight = 1258, +<<<<<<< Updated upstream .description = (const u8*) 0x844a378, .unused = 41645, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844a24b, + .unusedDescription = (const u8*) 0x844a2ad, + .pokemonScale = 275, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 275, + .trainerScale = 280, .trainerOffset = 0, - .unknown1 = 280, - .unknown2 = 0, }, [NATIONAL_DEX_SLUGMA] = { .categoryName = {_L, _a, _v, _a, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 7, .weight = 350, +<<<<<<< Updated upstream .description = (const u8*) 0x844a3db, .unused = 41746, .pokemonScale = 2116, @@ -3069,12 +4855,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 14, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844a2ae, + .unusedDescription = (const u8*) 0x844a312, + .pokemonScale = 329, + .pokemonOffset = 14, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MAGCARGO] = { .categoryName = {_L, _a, _v, _a, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 8, .weight = 550, +<<<<<<< Updated upstream .description = (const u8*) 0x844a43e, .unused = 41850, .pokemonScale = 2116, @@ -3083,12 +4878,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 14, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844a313, + .unusedDescription = (const u8*) 0x844a37a, + .pokemonScale = 332, + .pokemonOffset = 14, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SWINUB] = { .categoryName = {_P, _i, _g, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 4, .weight = 65, +<<<<<<< Updated upstream .description = (const u8*) 0x844a498, .unused = 41940, .pokemonScale = 2116, @@ -3097,12 +4901,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 19, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844a37b, + .unusedDescription = (const u8*) 0x844a3d4, + .pokemonScale = 324, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_PILOSWINE] = { .categoryName = {_S, _w, _i, _n, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 11, .weight = 558, +<<<<<<< Updated upstream .description = (const u8*) 0x844a4f2, .unused = 42040, .pokemonScale = 2116, @@ -3111,12 +4924,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 8, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844a3d5, + .unusedDescription = (const u8*) 0x844a438, + .pokemonScale = 306, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CORSOLA] = { .categoryName = {_C, _o, _r, _a, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 50, +<<<<<<< Updated upstream .description = (const u8*) 0x844a556, .unused = 42138, .pokemonScale = 2116, @@ -3125,12 +4947,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 15, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844a439, + .unusedDescription = (const u8*) 0x844a49a, + .pokemonScale = 410, + .pokemonOffset = 15, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_REMORAID] = { .categoryName = {_J, _e, _t, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 120, +<<<<<<< Updated upstream .description = (const u8*) 0x844a5b8, .unused = 42240, .pokemonScale = 2116, @@ -3139,12 +4970,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 4, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844a49b, + .unusedDescription = (const u8*) 0x844a500, + .pokemonScale = 316, + .pokemonOffset = 4, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_OCTILLERY] = { .categoryName = {_J, _e, _t, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 9, .weight = 285, +<<<<<<< Updated upstream .description = (const u8*) 0x844a61e, .unused = 42344, .pokemonScale = 2116, @@ -3153,12 +4993,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 9, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844a501, + .unusedDescription = (const u8*) 0x844a568, + .pokemonScale = 296, + .pokemonOffset = 9, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_DELIBIRD] = { .categoryName = {_D, _e, _l, _i, _v, _e, _r, _y, _END, _SPACE, _SPACE, _SPACE}, .height = 9, .weight = 160, +<<<<<<< Updated upstream .description = (const u8*) 0x844a686, .unused = 42448, .pokemonScale = 2116, @@ -3167,40 +5016,57 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 8, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844a569, + .unusedDescription = (const u8*) 0x844a5d0, + .pokemonScale = 293, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MANTINE] = { .categoryName = {_K, _i, _t, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 21, .weight = 2200, +<<<<<<< Updated upstream .description = (const u8*) 0x844a6e5, .unused = 42556, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844a5d1, + .unusedDescription = (const u8*) 0x844a63c, + .pokemonScale = 275, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 275, - .trainerOffset = 0, - .unknown1 = 360, - .unknown2 = 6, + .trainerScale = 360, + .trainerOffset = 6, }, [NATIONAL_DEX_SKARMORY] = { .categoryName = {_A, _r, _m, _o, _r, _SPACE, _B, _i, _r, _d, _END, _SPACE}, .height = 17, .weight = 505, +<<<<<<< Updated upstream .description = (const u8*) 0x844a751, .unused = 42664, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844a63d, + .unusedDescription = (const u8*) 0x844a6a8, + .pokemonScale = 285, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 285, + .trainerScale = 276, .trainerOffset = 0, - .unknown1 = 276, - .unknown2 = 0, }, [NATIONAL_DEX_HOUNDOUR] = { .categoryName = {_D, _a, _r, _k, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 108, +<<<<<<< Updated upstream .description = (const u8*) 0x844a7af, .unused = 42757, .pokemonScale = 2116, @@ -3209,40 +5075,60 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 15, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844a6a9, + .unusedDescription = (const u8*) 0x844a705, + .pokemonScale = 393, + .pokemonOffset = 15, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_HOUNDOOM] = { .categoryName = {_D, _a, _r, _k, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 14, .weight = 350, +<<<<<<< Updated upstream .description = (const u8*) 0x844a80c, .unused = 42852, .pokemonScale = 2116, .pokemonOffset = 0, +======= + .description = (const u8*) 0x844a706, + .unusedDescription = (const u8*) 0x844a764, + .pokemonScale = 256, + .pokemonOffset = 2, +>>>>>>> Stashed changes .trainerScale = 256, - .trainerOffset = 2, - .unknown1 = 256, - .unknown2 = 65534, + .trainerOffset = 65534, }, [NATIONAL_DEX_KINGDRA] = { .categoryName = {_D, _r, _a, _g, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 18, .weight = 1520, +<<<<<<< Updated upstream .description = (const u8*) 0x844a870, .unused = 42951, .pokemonScale = 2116, .pokemonOffset = 0, .trainerScale = 257, +======= + .description = (const u8*) 0x844a765, + .unusedDescription = (const u8*) 0x844a7c7, + .pokemonScale = 257, + .pokemonOffset = 1, + .trainerScale = 293, +>>>>>>> Stashed changes .trainerOffset = 1, - .unknown1 = 293, - .unknown2 = 1, }, [NATIONAL_DEX_PHANPY] = { .categoryName = {_L, _o, _n, _g, _SPACE, _N, _o, _s, _e, _END, _SPACE, _SPACE}, .height = 5, .weight = 335, +<<<<<<< Updated upstream .description = (const u8*) 0x844a8d3, .unused = 43051, .pokemonScale = 2116, @@ -3251,12 +5137,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 20, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844a7c8, + .unusedDescription = (const u8*) 0x844a82b, + .pokemonScale = 465, + .pokemonOffset = 20, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_DONPHAN] = { .categoryName = {_A, _r, _m, _o, _r, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 11, .weight = 1200, +<<<<<<< Updated upstream .description = (const u8*) 0x844a937, .unused = 43152, .pokemonScale = 2116, @@ -3265,12 +5160,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 9, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844a82c, + .unusedDescription = (const u8*) 0x844a890, + .pokemonScale = 313, + .pokemonOffset = 9, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_PORYGON2] = { .categoryName = {_V, _i, _r, _t, _u, _a, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 325, +<<<<<<< Updated upstream .description = (const u8*) 0x844a99e, .unused = 43246, .pokemonScale = 2116, @@ -3279,26 +5183,40 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 15, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844a891, + .unusedDescription = (const u8*) 0x844a8ee, + .pokemonScale = 320, + .pokemonOffset = 15, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_STANTLER] = { .categoryName = {_B, _i, _g, _SPACE, _H, _o, _r, _n, _END, _SPACE, _SPACE, _SPACE}, .height = 14, .weight = 712, +<<<<<<< Updated upstream .description = (const u8*) 0x844aa04, .unused = 43346, .pokemonScale = 2116, .pokemonOffset = 0, +======= + .description = (const u8*) 0x844a8ef, + .unusedDescription = (const u8*) 0x844a952, + .pokemonScale = 277, + .pokemonOffset = 65535, +>>>>>>> Stashed changes .trainerScale = 277, - .trainerOffset = 65535, - .unknown1 = 277, - .unknown2 = 0, + .trainerOffset = 0, }, [NATIONAL_DEX_SMEARGLE] = { .categoryName = {_P, _a, _i, _n, _t, _e, _r, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 12, .weight = 580, +<<<<<<< Updated upstream .description = (const u8*) 0x844aa68, .unused = 43441, .pokemonScale = 2116, @@ -3307,12 +5225,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 5, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844a953, + .unusedDescription = (const u8*) 0x844a9b1, + .pokemonScale = 287, + .pokemonOffset = 5, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_TYROGUE] = { .categoryName = {_S, _c, _u, _f, _f, _l, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 7, .weight = 210, +<<<<<<< Updated upstream .description = (const u8*) 0x844aac7, .unused = 43542, .pokemonScale = 2116, @@ -3321,12 +5248,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 8, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844a9b2, + .unusedDescription = (const u8*) 0x844aa16, + .pokemonScale = 292, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_HITMONTOP] = { .categoryName = {_H, _a, _n, _d, _s, _t, _a, _n, _d, _END, _SPACE, _SPACE}, .height = 14, .weight = 480, +<<<<<<< Updated upstream .description = (const u8*) 0x844ab2c, .unused = 43641, .pokemonScale = 2116, @@ -3335,12 +5271,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 257, .unknown2 = 65534, +======= + .description = (const u8*) 0x844aa17, + .unusedDescription = (const u8*) 0x844aa79, + .pokemonScale = 256, + .pokemonOffset = 2, + .trainerScale = 257, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SMOOCHUM] = { .categoryName = {_K, _i, _s, _s, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 4, .weight = 60, +<<<<<<< Updated upstream .description = (const u8*) 0x844ab8f, .unused = 43733, .pokemonScale = 2116, @@ -3349,12 +5294,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 19, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844aa7a, + .unusedDescription = (const u8*) 0x844aad5, + .pokemonScale = 440, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_ELEKID] = { .categoryName = {_E, _l, _e, _c, _t, _r, _i, _c, _END, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 235, +<<<<<<< Updated upstream .description = (const u8*) 0x844abeb, .unused = 43824, .pokemonScale = 2116, @@ -3363,12 +5317,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 13, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844aad6, + .unusedDescription = (const u8*) 0x844ab30, + .pokemonScale = 363, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MAGBY] = { .categoryName = {_L, _i, _v, _e, _SPACE, _C, _o, _a, _l, _END, _SPACE, _SPACE}, .height = 7, .weight = 214, +<<<<<<< Updated upstream .description = (const u8*) 0x844ac46, .unused = 43919, .pokemonScale = 2116, @@ -3377,12 +5340,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 11, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844ab31, + .unusedDescription = (const u8*) 0x844ab8f, + .pokemonScale = 284, + .pokemonOffset = 11, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MILTANK] = { .categoryName = {_M, _i, _l, _k, _SPACE, _C, _o, _w, _END, _SPACE, _SPACE, _SPACE}, .height = 12, .weight = 755, +<<<<<<< Updated upstream .description = (const u8*) 0x844acb3, .unused = 44009, .pokemonScale = 2116, @@ -3391,68 +5363,95 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 3, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844ab90, + .unusedDescription = (const u8*) 0x844abe9, + .pokemonScale = 280, + .pokemonOffset = 3, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_BLISSEY] = { .categoryName = {_H, _a, _p, _p, _i, _n, _e, _s, _s, _END, _SPACE, _SPACE}, .height = 15, .weight = 468, +<<<<<<< Updated upstream .description = (const u8*) 0x844ad0d, .unused = 44116, .pokemonScale = 2116, .pokemonOffset = 0, .trainerScale = 256, +======= + .description = (const u8*) 0x844abea, + .unusedDescription = (const u8*) 0x844ac54, + .pokemonScale = 256, + .pokemonOffset = 3, + .trainerScale = 310, +>>>>>>> Stashed changes .trainerOffset = 3, - .unknown1 = 310, - .unknown2 = 3, }, [NATIONAL_DEX_RAIKOU] = { .categoryName = {_T, _h, _u, _n, _d, _e, _r, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 19, .weight = 1780, +<<<<<<< Updated upstream .description = (const u8*) 0x844ad78, .unused = 44207, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844ac55, + .unusedDescription = (const u8*) 0x844acaf, + .pokemonScale = 283, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 283, - .trainerOffset = 0, - .unknown1 = 359, - .unknown2 = 6, + .trainerScale = 359, + .trainerOffset = 6, }, [NATIONAL_DEX_ENTEI] = { .categoryName = {_V, _o, _l, _c, _a, _n, _o, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 21, .weight = 1980, +<<<<<<< Updated upstream .description = (const u8*) 0x844add3, .unused = 44308, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844acb0, + .unusedDescription = (const u8*) 0x844ad14, + .pokemonScale = 283, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 283, - .trainerOffset = 0, - .unknown1 = 370, - .unknown2 = 7, + .trainerScale = 370, + .trainerOffset = 7, }, [NATIONAL_DEX_SUICUNE] = { .categoryName = {_A, _u, _r, _o, _r, _a, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 20, .weight = 1870, +<<<<<<< Updated upstream .description = (const u8*) 0x844ae38, .unused = 44412, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844ad15, + .unusedDescription = (const u8*) 0x844ad7c, + .pokemonScale = 286, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 286, - .trainerOffset = 0, - .unknown1 = 371, - .unknown2 = 7, + .trainerScale = 371, + .trainerOffset = 7, }, [NATIONAL_DEX_LARVITAR] = { .categoryName = {_R, _o, _c, _k, _SPACE, _S, _k, _i, _n, _END, _SPACE, _SPACE}, .height = 6, .weight = 720, +<<<<<<< Updated upstream .description = (const u8*) 0x844aea0, .unused = 44509, .pokemonScale = 2116, @@ -3461,12 +5460,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 16, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844ad7d, + .unusedDescription = (const u8*) 0x844addd, + .pokemonScale = 472, + .pokemonOffset = 16, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_PUPITAR] = { .categoryName = {_H, _a, _r, _d, _SPACE, _S, _h, _e, _l, _l, _END, _SPACE}, .height = 12, .weight = 1520, +<<<<<<< Updated upstream .description = (const u8*) 0x844af01, .unused = 44609, .pokemonScale = 2116, @@ -3475,54 +5483,75 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 8, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844adde, + .unusedDescription = (const u8*) 0x844ae41, + .pokemonScale = 292, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_TYRANITAR] = { .categoryName = {_A, _r, _m, _o, _r, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 20, .weight = 2020, +<<<<<<< Updated upstream .description = (const u8*) 0x844af65, .unused = 44714, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844ae42, + .unusedDescription = (const u8*) 0x844aeaa, + .pokemonScale = 285, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 285, - .trainerOffset = 0, - .unknown1 = 383, - .unknown2 = 7, + .trainerScale = 383, + .trainerOffset = 7, }, [NATIONAL_DEX_LUGIA] = { .categoryName = {_D, _i, _v, _i, _n, _g, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 52, .weight = 2160, +<<<<<<< Updated upstream .description = (const u8*) 0x844afce, .unused = 44815, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844aeab, + .unusedDescription = (const u8*) 0x844af0f, + .pokemonScale = 283, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 283, - .trainerOffset = 0, - .unknown1 = 742, - .unknown2 = 18, + .trainerScale = 742, + .trainerOffset = 18, }, [NATIONAL_DEX_HO_OH] = { .categoryName = {_R, _a, _i, _n, _b, _o, _w, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 38, .weight = 1990, +<<<<<<< Updated upstream .description = (const u8*) 0x844b033, .unused = 44918, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844af10, + .unusedDescription = (const u8*) 0x844af76, + .pokemonScale = 283, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 283, - .trainerOffset = 0, - .unknown1 = 620, - .unknown2 = 16, + .trainerScale = 620, + .trainerOffset = 16, }, [NATIONAL_DEX_CELEBI] = { .categoryName = {_T, _i, _m, _e, _SPACE, _T, _r, _a, _v, _e, _l, _END}, .height = 6, .weight = 50, +<<<<<<< Updated upstream .description = (const u8*) 0x844b09a, .unused = 45022, .pokemonScale = 2116, @@ -3531,12 +5560,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65526, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844af77, + .unusedDescription = (const u8*) 0x844afde, + .pokemonScale = 393, + .pokemonOffset = 65526, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_TREECKO] = { .categoryName = {_W, _o, _o, _d, _SPACE, _G, _e, _c, _k, _o, _END, _SPACE}, .height = 5, .weight = 50, +<<<<<<< Updated upstream .description = (const u8*) 0x844b102, .unused = 45126, .pokemonScale = 2116, @@ -3545,12 +5583,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 17, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844afdf, + .unusedDescription = (const u8*) 0x844b046, + .pokemonScale = 541, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GROVYLE] = { .categoryName = {_W, _o, _o, _d, _SPACE, _G, _e, _c, _k, _o, _END, _SPACE}, .height = 9, .weight = 216, +<<<<<<< Updated upstream .description = (const u8*) 0x844b16e, .unused = 45221, .pokemonScale = 2116, @@ -3559,12 +5606,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 5, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b047, + .unusedDescription = (const u8*) 0x844b0a5, + .pokemonScale = 360, + .pokemonOffset = 5, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SCEPTILE] = { .categoryName = {_F, _o, _r, _e, _s, _t, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 17, .weight = 522, +<<<<<<< Updated upstream .description = (const u8*) 0x844b1c8, .unused = 45320, .pokemonScale = 2116, @@ -3573,12 +5629,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 313, .unknown2 = 3, +======= + .description = (const u8*) 0x844b0a6, + .unusedDescription = (const u8*) 0x844b108, + .pokemonScale = 282, + .pokemonOffset = 65535, + .trainerScale = 313, + .trainerOffset = 3, +>>>>>>> Stashed changes }, [NATIONAL_DEX_TORCHIC] = { .categoryName = {_C, _h, _i, _c, _k, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 4, .weight = 25, +<<<<<<< Updated upstream .description = (const u8*) 0x844b234, .unused = 45412, .pokemonScale = 2116, @@ -3587,12 +5652,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 18, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b109, + .unusedDescription = (const u8*) 0x844b164, + .pokemonScale = 566, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_COMBUSKEN] = { .categoryName = {_Y, _o, _u, _n, _g, _SPACE, _F, _o, _w, _l, _END, _SPACE}, .height = 9, .weight = 195, +<<<<<<< Updated upstream .description = (const u8*) 0x844b290, .unused = 45509, .pokemonScale = 2116, @@ -3601,12 +5675,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 5, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b165, + .unusedDescription = (const u8*) 0x844b1c5, + .pokemonScale = 343, + .pokemonOffset = 5, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_BLAZIKEN] = { .categoryName = {_B, _l, _a, _z, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 19, .weight = 520, +<<<<<<< Updated upstream .description = (const u8*) 0x844b2f4, .unused = 45618, .pokemonScale = 2116, @@ -3615,12 +5698,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 314, .unknown2 = 3, +======= + .description = (const u8*) 0x844b1c6, + .unusedDescription = (const u8*) 0x844b232, + .pokemonScale = 275, + .pokemonOffset = 65535, + .trainerScale = 314, + .trainerOffset = 3, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MUDKIP] = { .categoryName = {_M, _u, _d, _SPACE, _F, _i, _s, _h, _END, _SPACE, _SPACE, _SPACE}, .height = 4, .weight = 76, +<<<<<<< Updated upstream .description = (const u8*) 0x844b364, .unused = 45726, .pokemonScale = 2116, @@ -3629,12 +5721,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 19, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b233, + .unusedDescription = (const u8*) 0x844b29e, + .pokemonScale = 535, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MARSHTOMP] = { .categoryName = {_M, _u, _d, _SPACE, _F, _i, _s, _h, _END, _SPACE, _SPACE, _SPACE}, .height = 7, .weight = 280, +<<<<<<< Updated upstream .description = (const u8*) 0x844b3d0, .unused = 45834, .pokemonScale = 2116, @@ -3643,12 +5744,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 7, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b29f, + .unusedDescription = (const u8*) 0x844b30a, + .pokemonScale = 340, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SWAMPERT] = { .categoryName = {_M, _u, _d, _SPACE, _F, _i, _s, _h, _END, _SPACE, _SPACE, _SPACE}, .height = 15, .weight = 819, +<<<<<<< Updated upstream .description = (const u8*) 0x844b439, .unused = 45945, .pokemonScale = 2116, @@ -3657,12 +5767,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 282, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b30b, + .unusedDescription = (const u8*) 0x844b379, + .pokemonScale = 276, + .pokemonOffset = 65535, + .trainerScale = 282, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_POOCHYENA] = { .categoryName = {_B, _i, _t, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 5, .weight = 136, +<<<<<<< Updated upstream .description = (const u8*) 0x844b4a8, .unused = 46042, .pokemonScale = 2116, @@ -3671,12 +5790,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 18, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b37a, + .unusedDescription = (const u8*) 0x844b3da, + .pokemonScale = 481, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MIGHTYENA] = { .categoryName = {_B, _i, _t, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 10, .weight = 370, +<<<<<<< Updated upstream .description = (const u8*) 0x844b519, .unused = 46161, .pokemonScale = 2116, @@ -3685,12 +5813,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 9, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b3db, + .unusedDescription = (const u8*) 0x844b451, + .pokemonScale = 359, + .pokemonOffset = 9, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_ZIGZAGOON] = { .categoryName = {_T, _i, _n, _y, _r, _a, _c, _c, _o, _o, _n, _END}, .height = 4, .weight = 175, +<<<<<<< Updated upstream .description = (const u8*) 0x844b590, .unused = 46261, .pokemonScale = 2116, @@ -3699,12 +5836,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 21, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b452, + .unusedDescription = (const u8*) 0x844b4b5, + .pokemonScale = 560, + .pokemonOffset = 21, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_LINOONE] = { .categoryName = {_R, _u, _s, _h, _i, _n, _g, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 5, .weight = 325, +<<<<<<< Updated upstream .description = (const u8*) 0x844b5f4, .unused = 46381, .pokemonScale = 2116, @@ -3713,12 +5859,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 5, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b4b6, + .unusedDescription = (const u8*) 0x844b52d, + .pokemonScale = 321, + .pokemonOffset = 5, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_WURMPLE] = { .categoryName = {_W, _o, _r, _m, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 3, .weight = 36, +<<<<<<< Updated upstream .description = (const u8*) 0x844b664, .unused = 46495, .pokemonScale = 2116, @@ -3727,12 +5882,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 22, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b52e, + .unusedDescription = (const u8*) 0x844b59f, + .pokemonScale = 711, + .pokemonOffset = 22, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SILCOON] = { .categoryName = {_C, _o, _c, _o, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 100, +<<<<<<< Updated upstream .description = (const u8*) 0x844b6d6, .unused = 46599, .pokemonScale = 2116, @@ -3741,12 +5905,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 19, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b5a0, + .unusedDescription = (const u8*) 0x844b607, + .pokemonScale = 431, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_BEAUTIFLY] = { .categoryName = {_B, _u, _t, _t, _e, _r, _f, _l, _y, _END, _SPACE, _SPACE}, .height = 10, .weight = 284, +<<<<<<< Updated upstream .description = (const u8*) 0x844b74c, .unused = 46702, .pokemonScale = 2116, @@ -3755,12 +5928,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b608, + .unusedDescription = (const u8*) 0x844b66e, + .pokemonScale = 298, + .pokemonOffset = 65535, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CASCOON] = { .categoryName = {_C, _o, _c, _o, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 7, .weight = 115, +<<<<<<< Updated upstream .description = (const u8*) 0x844b7b3, .unused = 46798, .pokemonScale = 2116, @@ -3769,12 +5951,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 19, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b66f, + .unusedDescription = (const u8*) 0x844b6ce, + .pokemonScale = 391, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_DUSTOX] = { .categoryName = {_P, _o, _i, _s, _o, _n, _SPACE, _M, _o, _t, _h, _END}, .height = 12, .weight = 316, +<<<<<<< Updated upstream .description = (const u8*) 0x844b814, .unused = 46911, .pokemonScale = 2116, @@ -3783,12 +5974,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b6cf, + .unusedDescription = (const u8*) 0x844b73f, + .pokemonScale = 269, + .pokemonOffset = 1, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_LOTAD] = { .categoryName = {_W, _a, _t, _e, _r, _SPACE, _W, _e, _e, _d, _END, _SPACE}, .height = 5, .weight = 26, +<<<<<<< Updated upstream .description = (const u8*) 0x844b885, .unused = 47016, .pokemonScale = 2116, @@ -3797,12 +5997,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 17, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b740, + .unusedDescription = (const u8*) 0x844b7a8, + .pokemonScale = 406, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_LOMBRE] = { .categoryName = {_J, _o, _l, _l, _y, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 12, .weight = 325, +<<<<<<< Updated upstream .description = (const u8*) 0x844b8ee, .unused = 47119, .pokemonScale = 2116, @@ -3811,26 +6020,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 7, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b7a9, + .unusedDescription = (const u8*) 0x844b80f, + .pokemonScale = 277, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_LUDICOLO] = { .categoryName = {_C, _a, _r, _e, _f, _r, _e, _e, _END, _SPACE, _SPACE, _SPACE}, .height = 15, .weight = 550, +<<<<<<< Updated upstream .description = (const u8*) 0x844b965, .unused = 47222, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844b810, + .unusedDescription = (const u8*) 0x844b876, + .pokemonScale = 283, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 283, + .trainerScale = 282, .trainerOffset = 0, - .unknown1 = 282, - .unknown2 = 0, }, [NATIONAL_DEX_SEEDOT] = { .categoryName = {_A, _c, _o, _r, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 5, .weight = 40, +<<<<<<< Updated upstream .description = (const u8*) 0x844b9bf, .unused = 47340, .pokemonScale = 2116, @@ -3839,12 +6061,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 20, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b877, + .unusedDescription = (const u8*) 0x844b8ec, + .pokemonScale = 472, + .pokemonOffset = 20, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_NUZLEAF] = { .categoryName = {_W, _i, _l, _y, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 10, .weight = 280, +<<<<<<< Updated upstream .description = (const u8*) 0x844ba35, .unused = 47445, .pokemonScale = 2116, @@ -3853,12 +6084,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 8, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b8ed, + .unusedDescription = (const u8*) 0x844b955, + .pokemonScale = 299, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SHIFTRY] = { .categoryName = {_W, _i, _c, _k, _e, _d, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 13, .weight = 596, +<<<<<<< Updated upstream .description = (const u8*) 0x844ba9e, .unused = 47549, .pokemonScale = 2116, @@ -3867,12 +6107,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b956, + .unusedDescription = (const u8*) 0x844b9bd, + .pokemonScale = 290, + .pokemonOffset = 2, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_TAILLOW] = { .categoryName = {_T, _i, _n, _y, _s, _w, _a, _l, _l, _o, _w, _END}, .height = 3, .weight = 23, +<<<<<<< Updated upstream .description = (const u8*) 0x844bb06, .unused = 47665, .pokemonScale = 2116, @@ -3881,12 +6130,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 20, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844b9be, + .unusedDescription = (const u8*) 0x844ba31, + .pokemonScale = 465, + .pokemonOffset = 20, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SWELLOW] = { .categoryName = {_S, _w, _a, _l, _l, _o, _w, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 7, .weight = 198, +<<<<<<< Updated upstream .description = (const u8*) 0x844bb6f, .unused = 47777, .pokemonScale = 2116, @@ -3895,26 +6153,41 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 13, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844ba32, + .unusedDescription = (const u8*) 0x844baa1, + .pokemonScale = 428, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_WINGULL] = { .categoryName = {_S, _e, _a, _g, _u, _l, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 95, +<<<<<<< Updated upstream .description = (const u8*) 0x844bbdf, .unused = 47881, .pokemonScale = 2116, .pokemonOffset = 0, .trainerScale = 295, +======= + .description = (const u8*) 0x844baa2, + .unusedDescription = (const u8*) 0x844bb09, + .pokemonScale = 295, + .pokemonOffset = 65534, + .trainerScale = 256, +>>>>>>> Stashed changes .trainerOffset = 65534, - .unknown1 = 256, - .unknown2 = 65534, }, [NATIONAL_DEX_PELIPPER] = { .categoryName = {_W, _a, _t, _e, _r, _SPACE, _B, _i, _r, _d, _END, _SPACE}, .height = 12, .weight = 280, +<<<<<<< Updated upstream .description = (const u8*) 0x844bc40, .unused = 47989, .pokemonScale = 2116, @@ -3923,12 +6196,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844bb0a, + .unusedDescription = (const u8*) 0x844bb75, + .pokemonScale = 288, + .pokemonOffset = 1, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_RALTS] = { .categoryName = {_F, _e, _e, _l, _i, _n, _g, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 4, .weight = 66, +<<<<<<< Updated upstream .description = (const u8*) 0x844bcac, .unused = 48095, .pokemonScale = 2116, @@ -3937,12 +6219,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 18, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844bb76, + .unusedDescription = (const u8*) 0x844bbdf, + .pokemonScale = 457, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_KIRLIA] = { .categoryName = {_E, _m, _o, _t, _i, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 8, .weight = 202, +<<<<<<< Updated upstream .description = (const u8*) 0x844bd0a, .unused = 48191, .pokemonScale = 2116, @@ -3951,26 +6242,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 10, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844bbe0, + .unusedDescription = (const u8*) 0x844bc3f, + .pokemonScale = 354, + .pokemonOffset = 10, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GARDEVOIR] = { .categoryName = {_E, _m, _b, _r, _a, _c, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 16, .weight = 484, +<<<<<<< Updated upstream .description = (const u8*) 0x844bd7b, .unused = 48294, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844bc40, + .unusedDescription = (const u8*) 0x844bca6, + .pokemonScale = 277, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 277, - .trainerOffset = 0, - .unknown1 = 276, - .unknown2 = 65535, + .trainerScale = 276, + .trainerOffset = 65535, }, [NATIONAL_DEX_SURSKIT] = { .categoryName = {_P, _o, _n, _d, _SPACE, _S, _k, _a, _t, _e, _r, _END}, .height = 5, .weight = 17, +<<<<<<< Updated upstream .description = (const u8*) 0x844bdd7, .unused = 48389, .pokemonScale = 2116, @@ -3979,12 +6283,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 17, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844bca7, + .unusedDescription = (const u8*) 0x844bd05, + .pokemonScale = 375, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MASQUERAIN] = { .categoryName = {_E, _y, _e, _b, _a, _l, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 8, .weight = 36, +<<<<<<< Updated upstream .description = (const u8*) 0x844be36, .unused = 48508, .pokemonScale = 2116, @@ -3993,12 +6306,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844bd06, + .unusedDescription = (const u8*) 0x844bd7c, + .pokemonScale = 378, + .pokemonOffset = 65535, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SHROOMISH] = { .categoryName = {_M, _u, _s, _h, _r, _o, _o, _m, _END, _SPACE, _SPACE, _SPACE}, .height = 4, .weight = 45, +<<<<<<< Updated upstream .description = (const u8*) 0x844bead, .unused = 48618, .pokemonScale = 2116, @@ -4007,12 +6329,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 20, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844bd7d, + .unusedDescription = (const u8*) 0x844bdea, + .pokemonScale = 513, + .pokemonOffset = 20, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_BRELOOM] = { .categoryName = {_M, _u, _s, _h, _r, _o, _o, _m, _END, _SPACE, _SPACE, _SPACE}, .height = 12, .weight = 392, +<<<<<<< Updated upstream .description = (const u8*) 0x844bf1b, .unused = 48727, .pokemonScale = 2116, @@ -4021,12 +6352,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 6, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844bdeb, + .unusedDescription = (const u8*) 0x844be57, + .pokemonScale = 324, + .pokemonOffset = 6, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SLAKOTH] = { .categoryName = {_S, _l, _a, _c, _k, _e, _r, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 8, .weight = 240, +<<<<<<< Updated upstream .description = (const u8*) 0x844bf88, .unused = 48831, .pokemonScale = 2116, @@ -4035,12 +6375,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 16, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844be58, + .unusedDescription = (const u8*) 0x844bebf, + .pokemonScale = 291, + .pokemonOffset = 16, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_VIGOROTH] = { .categoryName = {_W, _i, _l, _d, _SPACE, _M, _o, _n, _k, _e, _y, _END}, .height = 14, .weight = 465, +<<<<<<< Updated upstream .description = (const u8*) 0x844bfe4, .unused = 48928, .pokemonScale = 2116, @@ -4049,12 +6398,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844bec0, + .unusedDescription = (const u8*) 0x844bf20, + .pokemonScale = 301, + .pokemonOffset = 1, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SLAKING] = { .categoryName = {_L, _a, _z, _y, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 20, .weight = 1305, +<<<<<<< Updated upstream .description = (const u8*) 0x844c048, .unused = 49050, .pokemonScale = 2116, @@ -4063,12 +6421,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 5, .unknown1 = 326, .unknown2 = 3, +======= + .description = (const u8*) 0x844bf21, + .unusedDescription = (const u8*) 0x844bf9a, + .pokemonScale = 277, + .pokemonOffset = 5, + .trainerScale = 326, + .trainerOffset = 3, +>>>>>>> Stashed changes }, [NATIONAL_DEX_NINCADA] = { .categoryName = {_T, _r, _a, _i, _n, _e, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 5, .weight = 55, +<<<<<<< Updated upstream .description = (const u8*) 0x844c0c2, .unused = 49145, .pokemonScale = 2116, @@ -4077,12 +6444,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 20, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844bf9b, + .unusedDescription = (const u8*) 0x844bff9, + .pokemonScale = 405, + .pokemonOffset = 20, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_NINJASK] = { .categoryName = {_N, _i, _n, _j, _a, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 8, .weight = 120, +<<<<<<< Updated upstream .description = (const u8*) 0x844c123, .unused = 49245, .pokemonScale = 2116, @@ -4091,12 +6467,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65527, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844bffa, + .unusedDescription = (const u8*) 0x844c05d, + .pokemonScale = 383, + .pokemonOffset = 65527, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SHEDINJA] = { .categoryName = {_S, _h, _e, _d, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 8, .weight = 12, +<<<<<<< Updated upstream .description = (const u8*) 0x844c187, .unused = 49330, .pokemonScale = 2116, @@ -4105,12 +6490,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65528, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844c05e, + .unusedDescription = (const u8*) 0x844c0b2, + .pokemonScale = 372, + .pokemonOffset = 65528, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_WHISMUR] = { .categoryName = {_W, _h, _i, _s, _p, _e, _r, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 163, +<<<<<<< Updated upstream .description = (const u8*) 0x844c1dc, .unused = 49436, .pokemonScale = 2116, @@ -4119,12 +6513,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 16, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844c0b3, + .unusedDescription = (const u8*) 0x844c11c, + .pokemonScale = 373, + .pokemonOffset = 16, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_LOUDRED] = { .categoryName = {_B, _i, _g, _SPACE, _V, _o, _i, _c, _e, _END, _SPACE, _SPACE}, .height = 10, .weight = 405, +<<<<<<< Updated upstream .description = (const u8*) 0x844c246, .unused = 49533, .pokemonScale = 2116, @@ -4133,12 +6536,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 8, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844c11d, + .unusedDescription = (const u8*) 0x844c17d, + .pokemonScale = 356, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_EXPLOUD] = { .categoryName = {_L, _o, _u, _d, _SPACE, _N, _o, _i, _s, _e, _END, _SPACE}, .height = 15, .weight = 840, +<<<<<<< Updated upstream .description = (const u8*) 0x844c2a7, .unused = 49652, .pokemonScale = 2116, @@ -4147,26 +6559,40 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844c17e, + .unusedDescription = (const u8*) 0x844c1f4, + .pokemonScale = 284, + .pokemonOffset = 1, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MAKUHITA] = { .categoryName = {_G, _u, _t, _s, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 10, .weight = 864, +<<<<<<< Updated upstream .description = (const u8*) 0x844c31e, .unused = 49757, .pokemonScale = 2116, .pokemonOffset = 0, +======= + .description = (const u8*) 0x844c1f5, + .unusedDescription = (const u8*) 0x844c25d, + .pokemonScale = 256, + .pokemonOffset = 9, +>>>>>>> Stashed changes .trainerScale = 256, - .trainerOffset = 9, - .unknown1 = 256, - .unknown2 = 65534, + .trainerOffset = 65534, }, [NATIONAL_DEX_HARIYAMA] = { .categoryName = {_A, _r, _m, _SPACE, _T, _h, _r, _u, _s, _t, _END, _SPACE}, .height = 23, .weight = 2538, +<<<<<<< Updated upstream .description = (const u8*) 0x844c382, .unused = 49857, .pokemonScale = 2116, @@ -4175,12 +6601,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 375, .unknown2 = 6, +======= + .description = (const u8*) 0x844c25e, + .unusedDescription = (const u8*) 0x844c2c1, + .pokemonScale = 268, + .pokemonOffset = 65535, + .trainerScale = 375, + .trainerOffset = 6, +>>>>>>> Stashed changes }, [NATIONAL_DEX_AZURILL] = { .categoryName = {_P, _o, _l, _k, _a, _SPACE, _D, _o, _t, _END, _SPACE, _SPACE}, .height = 2, .weight = 20, +<<<<<<< Updated upstream .description = (const u8*) 0x844c3e8, .unused = 49970, .pokemonScale = 2116, @@ -4189,12 +6624,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 21, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844c2c2, + .unusedDescription = (const u8*) 0x844c332, + .pokemonScale = 603, + .pokemonOffset = 21, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_NOSEPASS] = { .categoryName = {_C, _o, _m, _p, _a, _s, _s, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 10, .weight = 970, +<<<<<<< Updated upstream .description = (const u8*) 0x844c459, .unused = 50063, .pokemonScale = 2116, @@ -4203,12 +6647,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 9, .unknown1 = 289, .unknown2 = 1, +======= + .description = (const u8*) 0x844c333, + .unusedDescription = (const u8*) 0x844c38f, + .pokemonScale = 256, + .pokemonOffset = 9, + .trainerScale = 289, + .trainerOffset = 1, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SKITTY] = { .categoryName = {_K, _i, _t, _t, _e, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 110, +<<<<<<< Updated upstream .description = (const u8*) 0x844c4b6, .unused = 50176, .pokemonScale = 2116, @@ -4217,12 +6670,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 18, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844c390, + .unusedDescription = (const u8*) 0x844c400, + .pokemonScale = 492, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_DELCATTY] = { .categoryName = {_P, _r, _i, _m, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 11, .weight = 326, +<<<<<<< Updated upstream .description = (const u8*) 0x844c527, .unused = 50280, .pokemonScale = 2116, @@ -4231,12 +6693,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 9, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844c401, + .unusedDescription = (const u8*) 0x844c468, + .pokemonScale = 322, + .pokemonOffset = 9, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SABLEYE] = { .categoryName = {_D, _a, _r, _k, _n, _e, _s, _s, _END, _SPACE, _SPACE, _SPACE}, .height = 5, .weight = 110, +<<<<<<< Updated upstream .description = (const u8*) 0x844c58f, .unused = 50375, .pokemonScale = 2116, @@ -4245,12 +6716,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 15, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844c469, + .unusedDescription = (const u8*) 0x844c4c7, + .pokemonScale = 451, + .pokemonOffset = 15, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MAWILE] = { .categoryName = {_D, _e, _c, _e, _i, _v, _e, _r, _END, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 115, +<<<<<<< Updated upstream .description = (const u8*) 0x844c5e9, .unused = 50482, .pokemonScale = 2116, @@ -4259,12 +6739,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 15, .unknown1 = 256, .unknown2 = 65533, +======= + .description = (const u8*) 0x844c4c8, + .unusedDescription = (const u8*) 0x844c532, + .pokemonScale = 466, + .pokemonOffset = 15, + .trainerScale = 256, + .trainerOffset = 65533, +>>>>>>> Stashed changes }, [NATIONAL_DEX_ARON] = { .categoryName = {_I, _r, _o, _n, _SPACE, _A, _r, _m, _o, _r, _END, _SPACE}, .height = 4, .weight = 600, +<<<<<<< Updated upstream .description = (const u8*) 0x844c654, .unused = 50581, .pokemonScale = 2116, @@ -4273,12 +6762,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 21, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844c533, + .unusedDescription = (const u8*) 0x844c595, + .pokemonScale = 419, + .pokemonOffset = 21, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_LAIRON] = { .categoryName = {_I, _r, _o, _n, _SPACE, _A, _r, _m, _o, _r, _END, _SPACE}, .height = 9, .weight = 1200, +<<<<<<< Updated upstream .description = (const u8*) 0x844c6c6, .unused = 50684, .pokemonScale = 2116, @@ -4287,12 +6785,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 11, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844c596, + .unusedDescription = (const u8*) 0x844c5fc, + .pokemonScale = 275, + .pokemonOffset = 11, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_AGGRON] = { .categoryName = {_I, _r, _o, _n, _SPACE, _A, _r, _m, _o, _r, _END, _SPACE}, .height = 21, .weight = 3600, +<<<<<<< Updated upstream .description = (const u8*) 0x844c738, .unused = 50801, .pokemonScale = 2116, @@ -4301,12 +6808,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 374, .unknown2 = 7, +======= + .description = (const u8*) 0x844c5fd, + .unusedDescription = (const u8*) 0x844c671, + .pokemonScale = 274, + .pokemonOffset = 65535, + .trainerScale = 374, + .trainerOffset = 7, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MEDITITE] = { .categoryName = {_M, _e, _d, _i, _t, _a, _t, _e, _END, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 112, +<<<<<<< Updated upstream .description = (const u8*) 0x844c7a1, .unused = 50902, .pokemonScale = 2116, @@ -4315,12 +6831,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 17, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844c672, + .unusedDescription = (const u8*) 0x844c6d6, + .pokemonScale = 465, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MEDICHAM] = { .categoryName = {_M, _e, _d, _i, _t, _a, _t, _e, _END, _SPACE, _SPACE, _SPACE}, .height = 13, .weight = 315, +<<<<<<< Updated upstream .description = (const u8*) 0x844c7fe, .unused = 51008, .pokemonScale = 2116, @@ -4329,12 +6854,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844c6d7, + .unusedDescription = (const u8*) 0x844c740, + .pokemonScale = 298, + .pokemonOffset = 2, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_ELECTRIKE] = { .categoryName = {_L, _i, _g, _h, _t, _n, _i, _n, _g, _END, _SPACE, _SPACE}, .height = 6, .weight = 152, +<<<<<<< Updated upstream .description = (const u8*) 0x844c868, .unused = 51109, .pokemonScale = 2116, @@ -4343,12 +6877,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 16, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844c741, + .unusedDescription = (const u8*) 0x844c7a5, + .pokemonScale = 290, + .pokemonOffset = 16, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MANECTRIC] = { .categoryName = {_D, _i, _s, _c, _h, _a, _r, _g, _e, _END, _SPACE, _SPACE}, .height = 15, .weight = 402, +<<<<<<< Updated upstream .description = (const u8*) 0x844c8cd, .unused = 51211, .pokemonScale = 2116, @@ -4357,12 +6900,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 257, .unknown2 = 65534, +======= + .description = (const u8*) 0x844c7a6, + .unusedDescription = (const u8*) 0x844c80b, + .pokemonScale = 256, + .pokemonOffset = 1, + .trainerScale = 257, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_PLUSLE] = { .categoryName = {_C, _h, _e, _e, _r, _i, _n, _g, _END, _SPACE, _SPACE, _SPACE}, .height = 4, .weight = 42, +<<<<<<< Updated upstream .description = (const u8*) 0x844c91e, .unused = 51314, .pokemonScale = 2116, @@ -4371,12 +6923,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65527, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844c80c, + .unusedDescription = (const u8*) 0x844c872, + .pokemonScale = 515, + .pokemonOffset = 65527, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MINUN] = { .categoryName = {_C, _h, _e, _e, _r, _i, _n, _g, _END, _SPACE, _SPACE, _SPACE}, .height = 4, .weight = 42, +<<<<<<< Updated upstream .description = (const u8*) 0x844c98d, .unused = 51409, .pokemonScale = 2116, @@ -4385,12 +6946,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65529, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844c873, + .unusedDescription = (const u8*) 0x844c8d1, + .pokemonScale = 512, + .pokemonOffset = 65529, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_VOLBEAT] = { .categoryName = {_F, _i, _r, _e, _f, _l, _y, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 7, .weight = 177, +<<<<<<< Updated upstream .description = (const u8*) 0x844ca0a, .unused = 51505, .pokemonScale = 2116, @@ -4399,12 +6969,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65532, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844c8d2, + .unusedDescription = (const u8*) 0x844c931, + .pokemonScale = 442, + .pokemonOffset = 65532, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_ILLUMISE] = { .categoryName = {_F, _i, _r, _e, _f, _l, _y, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 177, +<<<<<<< Updated upstream .description = (const u8*) 0x844ca76, .unused = 51611, .pokemonScale = 2116, @@ -4413,12 +6992,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65532, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844c932, + .unusedDescription = (const u8*) 0x844c99b, + .pokemonScale = 572, + .pokemonOffset = 65532, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_ROSELIA] = { .categoryName = {_T, _h, _o, _r, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 3, .weight = 20, +<<<<<<< Updated upstream .description = (const u8*) 0x844cae0, .unused = 51714, .pokemonScale = 2116, @@ -4427,12 +7015,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 20, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844c99c, + .unusedDescription = (const u8*) 0x844ca02, + .pokemonScale = 677, + .pokemonOffset = 20, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GULPIN] = { .categoryName = {_S, _t, _o, _m, _a, _c, _h, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 4, .weight = 103, +<<<<<<< Updated upstream .description = (const u8*) 0x844cb42, .unused = 51820, .pokemonScale = 2116, @@ -4441,12 +7038,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 22, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844ca03, + .unusedDescription = (const u8*) 0x844ca6c, + .pokemonScale = 593, + .pokemonOffset = 22, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SWALOT] = { .categoryName = {_P, _o, _i, _s, _o, _n, _SPACE, _B, _a, _g, _END, _SPACE}, .height = 17, .weight = 800, +<<<<<<< Updated upstream .description = (const u8*) 0x844cbac, .unused = 51925, .pokemonScale = 2116, @@ -4455,54 +7061,77 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 5, .unknown1 = 345, .unknown2 = 4, +======= + .description = (const u8*) 0x844ca6d, + .unusedDescription = (const u8*) 0x844cad5, + .pokemonScale = 256, + .pokemonOffset = 5, + .trainerScale = 345, + .trainerOffset = 4, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CARVANHA] = { .categoryName = {_S, _a, _v, _a, _g, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 8, .weight = 208, +<<<<<<< Updated upstream .description = (const u8*) 0x844cc15, .unused = 52018, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844cad6, + .unusedDescription = (const u8*) 0x844cb32, + .pokemonScale = 362, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 362, - .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 65534, + .trainerScale = 256, + .trainerOffset = 65534, }, [NATIONAL_DEX_SHARPEDO] = { .categoryName = {_B, _r, _u, _t, _a, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 18, .weight = 888, +<<<<<<< Updated upstream .description = (const u8*) 0x844cc77, .unused = 52124, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844cb33, + .unusedDescription = (const u8*) 0x844cb9c, + .pokemonScale = 265, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 265, - .trainerOffset = 0, - .unknown1 = 342, - .unknown2 = 4, + .trainerScale = 342, + .trainerOffset = 4, }, [NATIONAL_DEX_WAILMER] = { .categoryName = {_B, _a, _l, _l, _SPACE, _W, _h, _a, _l, _e, _END, _SPACE}, .height = 20, .weight = 1300, +<<<<<<< Updated upstream .description = (const u8*) 0x844cce1, .unused = 52223, .pokemonScale = 2116, .pokemonOffset = 0, .trainerScale = 256, +======= + .description = (const u8*) 0x844cb9d, + .unusedDescription = (const u8*) 0x844cbff, + .pokemonScale = 256, + .pokemonOffset = 10, + .trainerScale = 493, +>>>>>>> Stashed changes .trainerOffset = 10, - .unknown1 = 493, - .unknown2 = 10, }, [NATIONAL_DEX_WAILORD] = { .categoryName = {_F, _l, _o, _a, _t, _SPACE, _W, _h, _a, _l, _e, _END}, .height = 145, .weight = 3980, +<<<<<<< Updated upstream .description = (const u8*) 0x844cd50, .unused = 52317, .pokemonScale = 2116, @@ -4511,12 +7140,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 1428, .unknown2 = 20, +======= + .description = (const u8*) 0x844cc00, + .unusedDescription = (const u8*) 0x844cc5d, + .pokemonScale = 276, + .pokemonOffset = 65535, + .trainerScale = 1428, + .trainerOffset = 20, +>>>>>>> Stashed changes }, [NATIONAL_DEX_NUMEL] = { .categoryName = {_N, _u, _m, _b, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 7, .weight = 240, +<<<<<<< Updated upstream .description = (const u8*) 0x844cdbc, .unused = 52410, .pokemonScale = 2116, @@ -4525,12 +7163,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 14, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844cc5e, + .unusedDescription = (const u8*) 0x844ccba, + .pokemonScale = 310, + .pokemonOffset = 14, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CAMERUPT] = { .categoryName = {_E, _r, _u, _p, _t, _i, _o, _n, _END, _SPACE, _SPACE, _SPACE}, .height = 19, .weight = 2200, +<<<<<<< Updated upstream .description = (const u8*) 0x844ce34, .unused = 52517, .pokemonScale = 2116, @@ -4539,12 +7186,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 6, .unknown1 = 345, .unknown2 = 4, +======= + .description = (const u8*) 0x844ccbb, + .unusedDescription = (const u8*) 0x844cd25, + .pokemonScale = 256, + .pokemonOffset = 6, + .trainerScale = 345, + .trainerOffset = 4, +>>>>>>> Stashed changes }, [NATIONAL_DEX_TORKOAL] = { .categoryName = {_C, _o, _a, _l, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 5, .weight = 804, +<<<<<<< Updated upstream .description = (const u8*) 0x844ce9f, .unused = 52620, .pokemonScale = 2116, @@ -4553,12 +7209,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 9, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844cd26, + .unusedDescription = (const u8*) 0x844cd8c, + .pokemonScale = 392, + .pokemonOffset = 9, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SPOINK] = { .categoryName = {_B, _o, _u, _n, _c, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 7, .weight = 306, +<<<<<<< Updated upstream .description = (const u8*) 0x844cefc, .unused = 52724, .pokemonScale = 2116, @@ -4567,12 +7232,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 15, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844cd8d, + .unusedDescription = (const u8*) 0x844cdf4, + .pokemonScale = 423, + .pokemonOffset = 15, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GRUMPIG] = { .categoryName = {_M, _a, _n, _i, _p, _u, _l, _a, _t, _e, _END, _SPACE}, .height = 9, .weight = 715, +<<<<<<< Updated upstream .description = (const u8*) 0x844cf5a, .unused = 52833, .pokemonScale = 2116, @@ -4581,12 +7255,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 9, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844cdf5, + .unusedDescription = (const u8*) 0x844ce61, + .pokemonScale = 358, + .pokemonOffset = 9, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SPINDA] = { .categoryName = {_S, _p, _o, _t, _SPACE, _P, _a, _n, _d, _a, _END, _SPACE}, .height = 11, .weight = 50, +<<<<<<< Updated upstream .description = (const u8*) 0x844cfc7, .unused = 52930, .pokemonScale = 2116, @@ -4595,12 +7278,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 9, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844ce62, + .unusedDescription = (const u8*) 0x844cec2, + .pokemonScale = 321, + .pokemonOffset = 9, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_TRAPINCH] = { .categoryName = {_A, _n, _t, _SPACE, _P, _i, _t, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 7, .weight = 150, +<<<<<<< Updated upstream .description = (const u8*) 0x844d028, .unused = 53030, .pokemonScale = 2116, @@ -4609,12 +7301,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 15, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844cec3, + .unusedDescription = (const u8*) 0x844cf26, + .pokemonScale = 298, + .pokemonOffset = 15, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_VIBRAVA] = { .categoryName = {_V, _i, _b, _r, _a, _t, _i, _o, _n, _END, _SPACE, _SPACE}, .height = 11, .weight = 153, +<<<<<<< Updated upstream .description = (const u8*) 0x844d087, .unused = 53123, .pokemonScale = 2116, @@ -4623,26 +7324,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 15, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844cf27, + .unusedDescription = (const u8*) 0x844cf83, + .pokemonScale = 370, + .pokemonOffset = 15, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_FLYGON] = { .categoryName = {_M, _y, _s, _t, _i, _c, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 20, .weight = 820, +<<<<<<< Updated upstream .description = (const u8*) 0x844d101, .unused = 53220, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844cf84, + .unusedDescription = (const u8*) 0x844cfe4, + .pokemonScale = 280, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 280, - .trainerOffset = 0, - .unknown1 = 299, - .unknown2 = 2, + .trainerScale = 299, + .trainerOffset = 2, }, [NATIONAL_DEX_CACNEA] = { .categoryName = {_C, _a, _c, _t, _u, _s, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 4, .weight = 513, +<<<<<<< Updated upstream .description = (const u8*) 0x844d162, .unused = 53324, .pokemonScale = 2116, @@ -4651,12 +7365,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 19, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844cfe5, + .unusedDescription = (const u8*) 0x844d04c, + .pokemonScale = 455, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CACTURNE] = { .categoryName = {_S, _c, _a, _r, _e, _c, _r, _o, _w, _END, _SPACE, _SPACE}, .height = 13, .weight = 774, +<<<<<<< Updated upstream .description = (const u8*) 0x844d1ca, .unused = 53412, .pokemonScale = 2116, @@ -4665,12 +7388,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 3, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844d04d, + .unusedDescription = (const u8*) 0x844d0a4, + .pokemonScale = 327, + .pokemonOffset = 3, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SWABLU] = { .categoryName = {_C, _o, _t, _t, _o, _n, _SPACE, _B, _i, _r, _d, _END}, .height = 4, .weight = 12, +<<<<<<< Updated upstream .description = (const u8*) 0x844d234, .unused = 53497, .pokemonScale = 2116, @@ -4679,40 +7411,58 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65528, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844d0a5, + .unusedDescription = (const u8*) 0x844d0f9, + .pokemonScale = 422, + .pokemonOffset = 65528, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_ALTARIA] = { .categoryName = {_H, _u, _m, _m, _i, _n, _g, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 11, .weight = 206, +<<<<<<< Updated upstream .description = (const u8*) 0x844d298, .unused = 53594, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844d0fa, + .unusedDescription = (const u8*) 0x844d15a, + .pokemonScale = 327, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 327, - .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 65534, + .trainerScale = 256, + .trainerOffset = 65534, }, [NATIONAL_DEX_ZANGOOSE] = { .categoryName = {_C, _a, _t, _SPACE, _F, _e, _r, _r, _e, _t, _END, _SPACE}, .height = 13, .weight = 403, +<<<<<<< Updated upstream .description = (const u8*) 0x844d300, .unused = 53711, .pokemonScale = 2116, .pokemonOffset = 0, +======= + .description = (const u8*) 0x844d15b, + .unusedDescription = (const u8*) 0x844d1cf, + .pokemonScale = 256, + .pokemonOffset = 2, +>>>>>>> Stashed changes .trainerScale = 256, - .trainerOffset = 2, - .unknown1 = 256, - .unknown2 = 65534, + .trainerOffset = 65534, }, [NATIONAL_DEX_SEVIPER] = { .categoryName = {_F, _a, _n, _g, _SPACE, _S, _n, _a, _k, _e, _END, _SPACE}, .height = 27, .weight = 525, +<<<<<<< Updated upstream .description = (const u8*) 0x844d375, .unused = 53815, .pokemonScale = 2116, @@ -4721,12 +7471,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 6, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844d1d0, + .unusedDescription = (const u8*) 0x844d237, + .pokemonScale = 275, + .pokemonOffset = 6, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_LUNATONE] = { .categoryName = {_M, _e, _t, _e, _o, _r, _i, _t, _e, _END, _SPACE, _SPACE}, .height = 10, .weight = 1680, +<<<<<<< Updated upstream .description = (const u8*) 0x844d3e8, .unused = 53928, .pokemonScale = 2116, @@ -4735,12 +7494,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844d238, + .unusedDescription = (const u8*) 0x844d2a8, + .pokemonScale = 300, + .pokemonOffset = 1, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SOLROCK] = { .categoryName = {_M, _e, _t, _e, _o, _r, _i, _t, _e, _END, _SPACE, _SPACE}, .height = 12, .weight = 1540, +<<<<<<< Updated upstream .description = (const u8*) 0x844d459, .unused = 54031, .pokemonScale = 2116, @@ -4749,26 +7517,41 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65533, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844d2a9, + .unusedDescription = (const u8*) 0x844d30f, + .pokemonScale = 328, + .pokemonOffset = 65533, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_BARBOACH] = { .categoryName = {_W, _h, _i, _s, _k, _e, _r, _s, _END, _SPACE, _SPACE, _SPACE}, .height = 4, .weight = 19, +<<<<<<< Updated upstream .description = (const u8*) 0x844d4c0, .unused = 54119, .pokemonScale = 2116, .pokemonOffset = 0, .trainerScale = 581, +======= + .description = (const u8*) 0x844d310, + .unusedDescription = (const u8*) 0x844d367, + .pokemonScale = 581, + .pokemonOffset = 65534, + .trainerScale = 256, +>>>>>>> Stashed changes .trainerOffset = 65534, - .unknown1 = 256, - .unknown2 = 65534, }, [NATIONAL_DEX_WHISCASH] = { .categoryName = {_W, _h, _i, _s, _k, _e, _r, _s, _END, _SPACE, _SPACE, _SPACE}, .height = 9, .weight = 236, +<<<<<<< Updated upstream .description = (const u8*) 0x844d517, .unused = 54220, .pokemonScale = 2116, @@ -4777,12 +7560,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844d368, + .unusedDescription = (const u8*) 0x844d3cc, + .pokemonScale = 317, + .pokemonOffset = 1, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CORPHISH] = { .categoryName = {_R, _u, _f, _f, _i, _a, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 115, +<<<<<<< Updated upstream .description = (const u8*) 0x844d581, .unused = 54324, .pokemonScale = 2116, @@ -4791,12 +7583,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 18, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844d3cd, + .unusedDescription = (const u8*) 0x844d434, + .pokemonScale = 484, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CRAWDAUNT] = { .categoryName = {_R, _o, _g, _u, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 11, .weight = 328, +<<<<<<< Updated upstream .description = (const u8*) 0x844d5ee, .unused = 54439, .pokemonScale = 2116, @@ -4805,12 +7606,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 7, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844d435, + .unusedDescription = (const u8*) 0x844d4a7, + .pokemonScale = 365, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_BALTOY] = { .categoryName = {_C, _l, _a, _y, _SPACE, _D, _o, _l, _l, _END, _SPACE, _SPACE}, .height = 5, .weight = 215, +<<<<<<< Updated upstream .description = (const u8*) 0x844d64e, .unused = 54552, .pokemonScale = 2116, @@ -4819,12 +7629,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 18, .unknown1 = 256, .unknown2 = 65533, +======= + .description = (const u8*) 0x844d4a8, + .unusedDescription = (const u8*) 0x844d518, + .pokemonScale = 384, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 65533, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CLAYDOL] = { .categoryName = {_C, _l, _a, _y, _SPACE, _D, _o, _l, _l, _END, _SPACE, _SPACE}, .height = 15, .weight = 1080, +<<<<<<< Updated upstream .description = (const u8*) 0x844d6be, .unused = 54661, .pokemonScale = 2116, @@ -4833,12 +7652,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 3, .unknown1 = 280, .unknown2 = 0, +======= + .description = (const u8*) 0x844d519, + .unusedDescription = (const u8*) 0x844d585, + .pokemonScale = 256, + .pokemonOffset = 3, + .trainerScale = 280, + .trainerOffset = 0, +>>>>>>> Stashed changes }, [NATIONAL_DEX_LILEEP] = { .categoryName = {_S, _e, _a, _SPACE, _L, _i, _l, _y, _END, _SPACE, _SPACE, _SPACE}, .height = 10, .weight = 238, +<<<<<<< Updated upstream .description = (const u8*) 0x844d72b, .unused = 54771, .pokemonScale = 2116, @@ -4847,26 +7675,41 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 8, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844d586, + .unusedDescription = (const u8*) 0x844d5f3, + .pokemonScale = 305, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CRADILY] = { .categoryName = {_B, _a, _r, _n, _a, _c, _l, _e, _END, _SPACE, _SPACE, _SPACE}, .height = 15, .weight = 604, +<<<<<<< Updated upstream .description = (const u8*) 0x844d799, .unused = 54871, .pokemonScale = 2116, .pokemonOffset = 0, .trainerScale = 275, +======= + .description = (const u8*) 0x844d5f4, + .unusedDescription = (const u8*) 0x844d657, + .pokemonScale = 275, + .pokemonOffset = 65535, + .trainerScale = 269, +>>>>>>> Stashed changes .trainerOffset = 65535, - .unknown1 = 269, - .unknown2 = 65535, }, [NATIONAL_DEX_ANORITH] = { .categoryName = {_O, _l, _d, _SPACE, _S, _h, _r, _i, _m, _p, _END, _SPACE}, .height = 7, .weight = 125, +<<<<<<< Updated upstream .description = (const u8*) 0x844d7ff, .unused = 54968, .pokemonScale = 2116, @@ -4875,12 +7718,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 4, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844d658, + .unusedDescription = (const u8*) 0x844d6b8, + .pokemonScale = 296, + .pokemonOffset = 4, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_ARMALDO] = { .categoryName = {_P, _l, _a, _t, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 15, .weight = 682, +<<<<<<< Updated upstream .description = (const u8*) 0x844d872, .unused = 55076, .pokemonScale = 2116, @@ -4889,12 +7741,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 271, .unknown2 = 65535, +======= + .description = (const u8*) 0x844d6b9, + .unusedDescription = (const u8*) 0x844d724, + .pokemonScale = 312, + .pokemonOffset = 2, + .trainerScale = 271, + .trainerOffset = 65535, +>>>>>>> Stashed changes }, [NATIONAL_DEX_FEEBAS] = { .categoryName = {_F, _i, _s, _h, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 74, +<<<<<<< Updated upstream .description = (const u8*) 0x844d8cf, .unused = 55181, .pokemonScale = 2116, @@ -4903,12 +7764,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 3, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844d725, + .unusedDescription = (const u8*) 0x844d78d, + .pokemonScale = 423, + .pokemonOffset = 3, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_MILOTIC] = { .categoryName = {_T, _e, _n, _d, _e, _r, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 62, .weight = 1620, +<<<<<<< Updated upstream .description = (const u8*) 0x844d938, .unused = 55282, .pokemonScale = 2116, @@ -4917,12 +7787,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 382, .unknown2 = 7, +======= + .description = (const u8*) 0x844d78e, + .unusedDescription = (const u8*) 0x844d7f2, + .pokemonScale = 282, + .pokemonOffset = 65535, + .trainerScale = 382, + .trainerOffset = 7, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CASTFORM] = { .categoryName = {_W, _e, _a, _t, _h, _e, _r, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 3, .weight = 8, +<<<<<<< Updated upstream .description = (const u8*) 0x844d99c, .unused = 55389, .pokemonScale = 2116, @@ -4931,12 +7810,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65531, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844d7f3, + .unusedDescription = (const u8*) 0x844d85d, + .pokemonScale = 435, + .pokemonOffset = 65531, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_KECLEON] = { .categoryName = {_C, _o, _l, _o, _r, _SPACE, _S, _w, _a, _p, _END, _SPACE}, .height = 10, .weight = 220, +<<<<<<< Updated upstream .description = (const u8*) 0x844da07, .unused = 55492, .pokemonScale = 2116, @@ -4945,12 +7833,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 8, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844d85e, + .unusedDescription = (const u8*) 0x844d8c4, + .pokemonScale = 316, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SHUPPET] = { .categoryName = {_P, _u, _p, _p, _e, _t, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 23, +<<<<<<< Updated upstream .description = (const u8*) 0x844da6e, .unused = 55593, .pokemonScale = 2116, @@ -4959,12 +7856,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65533, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844d8c5, + .unusedDescription = (const u8*) 0x844d929, + .pokemonScale = 440, + .pokemonOffset = 65533, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_BANETTE] = { .categoryName = {_M, _a, _r, _i, _o, _n, _e, _t, _t, _e, _END, _SPACE}, .height = 11, .weight = 125, +<<<<<<< Updated upstream .description = (const u8*) 0x844dad3, .unused = 55697, .pokemonScale = 2116, @@ -4973,12 +7879,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 9, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844d92a, + .unusedDescription = (const u8*) 0x844d991, + .pokemonScale = 262, + .pokemonOffset = 9, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_DUSKULL] = { .categoryName = {_R, _e, _q, _u, _i, _e, _m, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 8, .weight = 150, +<<<<<<< Updated upstream .description = (const u8*) 0x844db40, .unused = 55798, .pokemonScale = 2116, @@ -4987,26 +7902,41 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 13, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844d992, + .unusedDescription = (const u8*) 0x844d9f6, + .pokemonScale = 376, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_DUSCLOPS] = { .categoryName = {_B, _e, _c, _k, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 16, .weight = 306, +<<<<<<< Updated upstream .description = (const u8*) 0x844dba9, .unused = 55904, .pokemonScale = 2116, .pokemonOffset = 0, .trainerScale = 256, +======= + .description = (const u8*) 0x844d9f7, + .unusedDescription = (const u8*) 0x844da60, + .pokemonScale = 256, + .pokemonOffset = 2, + .trainerScale = 299, +>>>>>>> Stashed changes .trainerOffset = 2, - .unknown1 = 299, - .unknown2 = 2, }, [NATIONAL_DEX_TROPIUS] = { .categoryName = {_F, _r, _u, _i, _t, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 20, .weight = 1000, +<<<<<<< Updated upstream .description = (const u8*) 0x844dc13, .unused = 56014, .pokemonScale = 2116, @@ -5015,12 +7945,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 371, .unknown2 = 6, +======= + .description = (const u8*) 0x844da61, + .unusedDescription = (const u8*) 0x844dace, + .pokemonScale = 283, + .pokemonOffset = 65535, + .trainerScale = 371, + .trainerOffset = 6, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CHIMECHO] = { .categoryName = {_W, _i, _n, _d, _SPACE, _C, _h, _i, _m, _e, _END, _SPACE}, .height = 6, .weight = 10, +<<<<<<< Updated upstream .description = (const u8*) 0x844dc81, .unused = 56116, .pokemonScale = 2116, @@ -5029,12 +7968,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65532, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844dacf, + .unusedDescription = (const u8*) 0x844db34, + .pokemonScale = 505, + .pokemonOffset = 65532, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_ABSOL] = { .categoryName = {_D, _i, _s, _a, _s, _t, _e, _r, _END, _SPACE, _SPACE, _SPACE}, .height = 12, .weight = 470, +<<<<<<< Updated upstream .description = (const u8*) 0x844dcf2, .unused = 56222, .pokemonScale = 2116, @@ -5043,12 +7991,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844db35, + .unusedDescription = (const u8*) 0x844db9e, + .pokemonScale = 301, + .pokemonOffset = 1, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_WYNAUT] = { .categoryName = {_B, _r, _i, _g, _h, _t, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 6, .weight = 140, +<<<<<<< Updated upstream .description = (const u8*) 0x844dd5c, .unused = 56316, .pokemonScale = 2116, @@ -5057,12 +8014,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 17, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844db9f, + .unusedDescription = (const u8*) 0x844dbfc, + .pokemonScale = 453, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SNORUNT] = { .categoryName = {_S, _n, _o, _w, _SPACE, _H, _a, _t, _END, _SPACE, _SPACE, _SPACE}, .height = 7, .weight = 168, +<<<<<<< Updated upstream .description = (const u8*) 0x844ddb7, .unused = 56407, .pokemonScale = 2116, @@ -5071,12 +8037,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 14, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844dbfd, + .unusedDescription = (const u8*) 0x844dc57, + .pokemonScale = 380, + .pokemonOffset = 14, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GLALIE] = { .categoryName = {_F, _a, _c, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 15, .weight = 2565, +<<<<<<< Updated upstream .description = (const u8*) 0x844de29, .unused = 56514, .pokemonScale = 2116, @@ -5085,12 +8060,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 3, .unknown1 = 344, .unknown2 = 2, +======= + .description = (const u8*) 0x844dc58, + .unusedDescription = (const u8*) 0x844dcc2, + .pokemonScale = 256, + .pokemonOffset = 3, + .trainerScale = 344, + .trainerOffset = 2, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SPHEAL] = { .categoryName = {_C, _l, _a, _p, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 8, .weight = 395, +<<<<<<< Updated upstream .description = (const u8*) 0x844de94, .unused = 56615, .pokemonScale = 2116, @@ -5099,12 +8083,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 15, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844dcc3, + .unusedDescription = (const u8*) 0x844dd27, + .pokemonScale = 315, + .pokemonOffset = 15, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SEALEO] = { .categoryName = {_B, _a, _l, _l, _SPACE, _R, _o, _l, _l, _END, _SPACE, _SPACE}, .height = 11, .weight = 876, +<<<<<<< Updated upstream .description = (const u8*) 0x844def7, .unused = 56721, .pokemonScale = 2116, @@ -5113,12 +8106,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 12, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844dd28, + .unusedDescription = (const u8*) 0x844dd91, + .pokemonScale = 338, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_WALREIN] = { .categoryName = {_I, _c, _e, _SPACE, _B, _r, _e, _a, _k, _END, _SPACE, _SPACE}, .height = 14, .weight = 1506, +<<<<<<< Updated upstream .description = (const u8*) 0x844df61, .unused = 56826, .pokemonScale = 2116, @@ -5127,12 +8129,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 277, .unknown2 = 0, +======= + .description = (const u8*) 0x844dd92, + .unusedDescription = (const u8*) 0x844ddfa, + .pokemonScale = 305, + .pokemonOffset = 2, + .trainerScale = 277, + .trainerOffset = 0, +>>>>>>> Stashed changes }, [NATIONAL_DEX_CLAMPERL] = { .categoryName = {_B, _i, _v, _a, _l, _v, _e, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 4, .weight = 525, +<<<<<<< Updated upstream .description = (const u8*) 0x844dfd3, .unused = 56916, .pokemonScale = 2116, @@ -5141,12 +8152,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 22, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844ddfb, + .unusedDescription = (const u8*) 0x844de54, + .pokemonScale = 691, + .pokemonOffset = 22, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_HUNTAIL] = { .categoryName = {_D, _e, _e, _p, _SPACE, _S, _e, _a, _END, _SPACE, _SPACE, _SPACE}, .height = 17, .weight = 270, +<<<<<<< Updated upstream .description = (const u8*) 0x844e029, .unused = 57030, .pokemonScale = 2116, @@ -5155,12 +8175,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844de55, + .unusedDescription = (const u8*) 0x844dec6, + .pokemonScale = 307, + .pokemonOffset = 1, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GOREBYSS] = { .categoryName = {_S, _o, _u, _t, _h, _SPACE, _S, _e, _a, _END, _SPACE, _SPACE}, .height = 18, .weight = 226, +<<<<<<< Updated upstream .description = (const u8*) 0x844e09b, .unused = 57140, .pokemonScale = 2116, @@ -5169,12 +8198,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 5, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844dec7, + .unusedDescription = (const u8*) 0x844df34, + .pokemonScale = 278, + .pokemonOffset = 5, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_RELICANTH] = { .categoryName = {_L, _o, _n, _g, _e, _v, _i, _t, _y, _END, _SPACE, _SPACE}, .height = 10, .weight = 234, +<<<<<<< Updated upstream .description = (const u8*) 0x844e109, .unused = 57244, .pokemonScale = 2116, @@ -5183,12 +8221,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 5, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844df35, + .unusedDescription = (const u8*) 0x844df9c, + .pokemonScale = 316, + .pokemonOffset = 5, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_LUVDISC] = { .categoryName = {_R, _e, _n, _d, _e, _z, _v, _o, _u, _s, _END, _SPACE}, .height = 6, .weight = 87, +<<<<<<< Updated upstream .description = (const u8*) 0x844e16c, .unused = 57343, .pokemonScale = 2116, @@ -5197,12 +8244,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844df9d, + .unusedDescription = (const u8*) 0x844dfff, + .pokemonScale = 371, + .pokemonOffset = 2, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_BAGON] = { .categoryName = {_R, _o, _c, _k, _SPACE, _H, _e, _a, _d, _END, _SPACE, _SPACE}, .height = 6, .weight = 421, +<<<<<<< Updated upstream .description = (const u8*) 0x844e1cf, .unused = 57442, .pokemonScale = 2116, @@ -5211,12 +8267,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 17, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844e000, + .unusedDescription = (const u8*) 0x844e062, + .pokemonScale = 448, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SHELGON] = { .categoryName = {_E, _n, _d, _u, _r, _a, _n, _c, _e, _END, _SPACE, _SPACE}, .height = 11, .weight = 1105, +<<<<<<< Updated upstream .description = (const u8*) 0x844e22e, .unused = 57562, .pokemonScale = 2116, @@ -5225,12 +8290,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 10, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844e063, + .unusedDescription = (const u8*) 0x844e0da, + .pokemonScale = 311, + .pokemonOffset = 10, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_SALAMENCE] = { .categoryName = {_D, _r, _a, _g, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 15, .weight = 1026, +<<<<<<< Updated upstream .description = (const u8*) 0x844e2a6, .unused = 57661, .pokemonScale = 2116, @@ -5239,12 +8313,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 307, .unknown2 = 0, +======= + .description = (const u8*) 0x844e0db, + .unusedDescription = (const u8*) 0x844e13d, + .pokemonScale = 272, + .pokemonOffset = 2, + .trainerScale = 307, + .trainerOffset = 0, +>>>>>>> Stashed changes }, [NATIONAL_DEX_BELDUM] = { .categoryName = {_I, _r, _o, _n, _SPACE, _B, _a, _l, _l, _END, _SPACE, _SPACE}, .height = 6, .weight = 952, +<<<<<<< Updated upstream .description = (const u8*) 0x844e309, .unused = 57752, .pokemonScale = 2116, @@ -5253,12 +8336,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844e13e, + .unusedDescription = (const u8*) 0x844e198, + .pokemonScale = 414, + .pokemonOffset = 65535, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_METANG] = { .categoryName = {_I, _r, _o, _n, _SPACE, _C, _l, _a, _w, _END, _SPACE, _SPACE}, .height = 12, .weight = 2025, +<<<<<<< Updated upstream .description = (const u8*) 0x844e364, .unused = 57840, .pokemonScale = 2116, @@ -5267,12 +8359,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 3, .unknown1 = 272, .unknown2 = 65534, +======= + .description = (const u8*) 0x844e199, + .unusedDescription = (const u8*) 0x844e1f0, + .pokemonScale = 256, + .pokemonOffset = 3, + .trainerScale = 272, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_METAGROSS] = { .categoryName = {_I, _r, _o, _n, _SPACE, _L, _e, _g, _END, _SPACE, _SPACE, _SPACE}, .height = 16, .weight = 5500, +<<<<<<< Updated upstream .description = (const u8*) 0x844e3d2, .unused = 57948, .pokemonScale = 2116, @@ -5281,54 +8382,77 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 3, .unknown1 = 461, .unknown2 = 4, +======= + .description = (const u8*) 0x844e1f1, + .unusedDescription = (const u8*) 0x844e25c, + .pokemonScale = 272, + .pokemonOffset = 3, + .trainerScale = 461, + .trainerOffset = 4, +>>>>>>> Stashed changes }, [NATIONAL_DEX_REGIROCK] = { .categoryName = {_R, _o, _c, _k, _SPACE, _P, _e, _a, _k, _END, _SPACE, _SPACE}, .height = 17, .weight = 2300, +<<<<<<< Updated upstream .description = (const u8*) 0x844e432, .unused = 58059, .pokemonScale = 2116, .pokemonOffset = 0, .trainerScale = 256, +======= + .description = (const u8*) 0x844e25d, + .unusedDescription = (const u8*) 0x844e2cb, + .pokemonScale = 256, + .pokemonOffset = 1, + .trainerScale = 309, +>>>>>>> Stashed changes .trainerOffset = 1, - .unknown1 = 309, - .unknown2 = 1, }, [NATIONAL_DEX_REGICE] = { .categoryName = {_I, _c, _e, _b, _e, _r, _g, _END, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 18, .weight = 1750, +<<<<<<< Updated upstream .description = (const u8*) 0x844e4a1, .unused = 58163, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844e2cc, + .unusedDescription = (const u8*) 0x844e333, + .pokemonScale = 265, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 265, - .trainerOffset = 0, - .unknown1 = 317, - .unknown2 = 3, + .trainerScale = 317, + .trainerOffset = 3, }, [NATIONAL_DEX_REGISTEEL] = { .categoryName = {_I, _r, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 19, .weight = 2050, +<<<<<<< Updated upstream .description = (const u8*) 0x844e503, .unused = 58276, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844e334, + .unusedDescription = (const u8*) 0x844e3a4, + .pokemonScale = 256, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 256, - .trainerOffset = 0, - .unknown1 = 359, - .unknown2 = 6, + .trainerScale = 359, + .trainerOffset = 6, }, [NATIONAL_DEX_LATIAS] = { .categoryName = {_E, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 14, .weight = 400, +<<<<<<< Updated upstream .description = (const u8*) 0x844e574, .unused = 58373, .pokemonScale = 2116, @@ -5337,26 +8461,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 2, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844e3a5, + .unusedDescription = (const u8*) 0x844e405, + .pokemonScale = 291, + .pokemonOffset = 2, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_LATIOS] = { .categoryName = {_E, _o, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 20, .weight = 600, +<<<<<<< Updated upstream .description = (const u8*) 0x844e5e2, .unused = 58486, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844e406, + .unusedDescription = (const u8*) 0x844e476, + .pokemonScale = 273, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 273, - .trainerOffset = 0, - .unknown1 = 313, - .unknown2 = 3, + .trainerScale = 313, + .trainerOffset = 3, }, [NATIONAL_DEX_KYOGRE] = { .categoryName = {_S, _e, _a, _SPACE, _B, _a, _s, _i, _n, _END, _SPACE, _SPACE}, .height = 45, .weight = 3520, +<<<<<<< Updated upstream .description = (const u8*) 0x844e653, .unused = 58588, .pokemonScale = 2116, @@ -5365,26 +8502,39 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 1, .unknown1 = 639, .unknown2 = 13, +======= + .description = (const u8*) 0x844e477, + .unusedDescription = (const u8*) 0x844e4dc, + .pokemonScale = 272, + .pokemonOffset = 1, + .trainerScale = 639, + .trainerOffset = 13, +>>>>>>> Stashed changes }, [NATIONAL_DEX_GROUDON] = { .categoryName = {_C, _o, _n, _t, _i, _n, _e, _n, _t, _END, _SPACE, _SPACE}, .height = 35, .weight = 9500, +<<<<<<< Updated upstream .description = (const u8*) 0x844e6be, .unused = 58676, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844e4dd, + .unusedDescription = (const u8*) 0x844e534, + .pokemonScale = 276, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 276, - .trainerOffset = 0, - .unknown1 = 530, - .unknown2 = 12, + .trainerScale = 530, + .trainerOffset = 12, }, [NATIONAL_DEX_RAYQUAZA] = { .categoryName = {_S, _k, _y, _SPACE, _H, _i, _g, _h, _END, _SPACE, _SPACE, _SPACE}, .height = 70, .weight = 2065, +<<<<<<< Updated upstream .description = (const u8*) 0x844e71c, .unused = 58771, .pokemonScale = 2116, @@ -5393,12 +8543,21 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65535, .unknown1 = 483, .unknown2 = 9, +======= + .description = (const u8*) 0x844e535, + .unusedDescription = (const u8*) 0x844e593, + .pokemonScale = 286, + .pokemonOffset = 65535, + .trainerScale = 483, + .trainerOffset = 9, +>>>>>>> Stashed changes }, [NATIONAL_DEX_JIRACHI] = { .categoryName = {_W, _i, _s, _h, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 3, .weight = 11, +<<<<<<< Updated upstream .description = (const u8*) 0x844e785, .unused = 58868, .pokemonScale = 2116, @@ -5407,20 +8566,32 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerOffset = 65528, .unknown1 = 256, .unknown2 = 65534, +======= + .description = (const u8*) 0x844e594, + .unusedDescription = (const u8*) 0x844e5f4, + .pokemonScale = 608, + .pokemonOffset = 65528, + .trainerScale = 256, + .trainerOffset = 65534, +>>>>>>> Stashed changes }, [NATIONAL_DEX_DEOXYS] = { .categoryName = {_D, _N, _A, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 17, .weight = 608, +<<<<<<< Updated upstream .description = (const u8*) 0x844e7e6, .unused = 58972, .pokemonScale = 2116, +======= + .description = (const u8*) 0x844e5f5, + .unusedDescription = (const u8*) 0x844e65c, + .pokemonScale = 293, +>>>>>>> Stashed changes .pokemonOffset = 0, - .trainerScale = 293, - .trainerOffset = 0, - .unknown1 = 337, - .unknown2 = 2, + .trainerScale = 337, + .trainerOffset = 2, }, [NATIONAL_DEX_TURTWIG] = { @@ -5428,13 +8599,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 102, .description = DEX_ENTRY_TURTWIG, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GROTLE] = { @@ -5442,13 +8611,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 11, .weight = 970, .description = DEX_ENTRY_GROTLE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_TORTERRA] = { @@ -5456,13 +8623,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 22, .weight = 3100, .description = DEX_ENTRY_TORTERRA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CHIMCHAR] = { @@ -5470,13 +8635,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 62, .description = DEX_ENTRY_CHIMCHAR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MONFERNO] = { @@ -5484,13 +8647,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 9, .weight = 220, .description = DEX_ENTRY_MONFERNO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_INFERNAPE] = { @@ -5498,13 +8659,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 550, .description = DEX_ENTRY_INFERNAPE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PIPLUP] = { @@ -5512,13 +8671,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 52, .description = DEX_ENTRY_PIPLUP, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PRINPLUP] = { @@ -5526,13 +8683,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 230, .description = DEX_ENTRY_PRINPLUP, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_EMPOLEON] = { @@ -5540,13 +8695,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 17, .weight = 845, .description = DEX_ENTRY_EMPOLEON, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_STARLY] = { @@ -5554,13 +8707,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 20, .description = DEX_ENTRY_STARLY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_STARAVIA] = { @@ -5568,13 +8719,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 155, .description = DEX_ENTRY_STARAVIA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_STARAPTOR] = { @@ -5582,13 +8731,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 249, .description = DEX_ENTRY_STARAPTOR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BIDOOF] = { @@ -5596,13 +8743,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 200, .description = DEX_ENTRY_BIDOOF, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BIBAREL] = { @@ -5610,13 +8755,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 315, .description = DEX_ENTRY_BIBAREL, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_KRICKETOT] = { @@ -5624,13 +8767,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 22, .description = DEX_ENTRY_KRICKETOT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_KRICKETUNE] = { @@ -5638,13 +8779,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 255, .description = DEX_ENTRY_KRICKETUNE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SHINX] = { @@ -5652,13 +8791,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 95, .description = DEX_ENTRY_SHINX, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_LUXIO] = { @@ -5666,13 +8803,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 9, .weight = 305, .description = DEX_ENTRY_LUXIO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_LUXRAY] = { @@ -5680,13 +8815,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 14, .weight = 420, .description = DEX_ENTRY_LUXRAY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BUDEW] = { @@ -5694,13 +8827,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 2, .weight = 12, .description = DEX_ENTRY_BUDEW, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_ROSERADE] = { @@ -5708,13 +8839,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 9, .weight = 145, .description = DEX_ENTRY_ROSERADE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CRANIDOS] = { @@ -5722,13 +8851,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 9, .weight = 315, .description = DEX_ENTRY_CRANIDOS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_RAMPARDOS] = { @@ -5736,13 +8863,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 16, .weight = 1025, .description = DEX_ENTRY_RAMPARDOS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SHIELDON] = { @@ -5750,13 +8875,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 570, .description = DEX_ENTRY_SHIELDON, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BASTIODON] = { @@ -5764,13 +8887,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 13, .weight = 1495, .description = DEX_ENTRY_BASTIODON, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BURMY] = { @@ -5778,13 +8899,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 2, .weight = 34, .description = DEX_ENTRY_BURMY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_WORMADAM] = { @@ -5792,13 +8911,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 65, .description = DEX_ENTRY_WORMADAM, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MOTHIM] = { @@ -5806,13 +8923,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 9, .weight = 233, .description = DEX_ENTRY_MOTHIM, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_COMBEE] = { @@ -5820,13 +8935,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 55, .description = DEX_ENTRY_COMBEE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_VESPIQUEN] = { @@ -5834,13 +8947,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 385, .description = DEX_ENTRY_VESPIQUEN, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PACHIRISU] = { @@ -5848,13 +8959,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 39, .description = DEX_ENTRY_PACHIRISU, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BUIZEL] = { @@ -5862,13 +8971,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 7, .weight = 295, .description = DEX_ENTRY_BUIZEL, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_FLOATZEL] = { @@ -5876,13 +8983,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 11, .weight = 335, .description = DEX_ENTRY_FLOATZEL, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CHERUBI] = { @@ -5890,13 +8995,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 33, .description = DEX_ENTRY_CHERUBI, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CHERRIM] = { @@ -5904,13 +9007,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 1, .weight = 1, .description = DEX_ENTRY_CHERRIM, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SHELLOS] = { @@ -5918,13 +9019,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 63, .description = DEX_ENTRY_SHELLOS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GASTRODON] = { @@ -5932,13 +9031,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 9, .weight = 299, .description = DEX_ENTRY_GASTRODON, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_AMBIPOM] = { @@ -5946,13 +9043,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 203, .description = DEX_ENTRY_AMBIPOM, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DRIFLOON] = { @@ -5960,13 +9055,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 12, .description = DEX_ENTRY_DRIFLOON, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DRIFBLIM] = { @@ -5974,13 +9067,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 23, .weight = 150, .description = DEX_ENTRY_DRIFBLIM, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BUNEARY] = { @@ -5988,13 +9079,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 55, .description = DEX_ENTRY_BUNEARY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_LOPUNNY] = { @@ -6002,13 +9091,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 333, .description = DEX_ENTRY_LOPUNNY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MISMAGIUS] = { @@ -6016,13 +9103,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 9, .weight = 44, .description = DEX_ENTRY_MISMAGIUS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_HONCHKROW] = { @@ -6030,13 +9115,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 9, .weight = 273, .description = DEX_ENTRY_HONCHKROW, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GLAMEOW] = { @@ -6044,13 +9127,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 39, .description = DEX_ENTRY_GLAMEOW, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PURUGLY] = { @@ -6058,13 +9139,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 438, .description = DEX_ENTRY_PURUGLY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CHINGLING] = { @@ -6072,13 +9151,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 2, .weight = 6, .description = DEX_ENTRY_CHINGLING, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_STUNKY] = { @@ -6086,13 +9163,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 192, .description = DEX_ENTRY_STUNKY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SKUNTANK] = { @@ -6100,13 +9175,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 380, .description = DEX_ENTRY_SKUNTANK, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BRONZOR] = { @@ -6114,13 +9187,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 605, .description = DEX_ENTRY_BRONZOR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BRONZONG] = { @@ -6128,13 +9199,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 13, .weight = 1870, .description = DEX_ENTRY_BRONZONG, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BONSLY] = { @@ -6142,13 +9211,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 150, .description = DEX_ENTRY_BONSLY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MIME_JR] = { @@ -6156,13 +9223,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 130, .description = DEX_ENTRY_MIME_JR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_HAPPINY] = { @@ -6170,13 +9235,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 244, .description = DEX_ENTRY_HAPPINY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CHATOT] = { @@ -6184,13 +9247,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 19, .description = DEX_ENTRY_CHATOT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SPIRITOMB] = { @@ -6198,13 +9259,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 1080, .description = DEX_ENTRY_SPIRITOMB, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GIBLE] = { @@ -6212,13 +9271,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 7, .weight = 205, .description = DEX_ENTRY_GIBLE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GABITE] = { @@ -6226,13 +9283,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 14, .weight = 560, .description = DEX_ENTRY_GABITE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GARCHOMP] = { @@ -6240,13 +9295,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 19, .weight = 950, .description = DEX_ENTRY_GARCHOMP, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MUNCHLAX] = { @@ -6254,13 +9307,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 1050, .description = DEX_ENTRY_MUNCHLAX, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_RIOLU] = { @@ -6268,13 +9319,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 7, .weight = 202, .description = DEX_ENTRY_RIOLU, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_LUCARIO] = { @@ -6282,13 +9331,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 540, .description = DEX_ENTRY_LUCARIO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_HIPPOPOTAS] = { @@ -6296,13 +9343,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 495, .description = DEX_ENTRY_HIPPOPOTAS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_HIPPOWDON] = { @@ -6310,13 +9355,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 20, .weight = 3000, .description = DEX_ENTRY_HIPPOWDON, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SKORUPI] = { @@ -6324,13 +9367,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 120, .description = DEX_ENTRY_SKORUPI, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DRAPION] = { @@ -6338,13 +9379,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 13, .weight = 615, .description = DEX_ENTRY_DRAPION, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CROAGUNK] = { @@ -6352,13 +9391,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 230, .description = DEX_ENTRY_CROAGUNK, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_TOXICROAK] = { @@ -6366,13 +9403,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 13, .weight = 444, .description = DEX_ENTRY_TOXICROAK, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CARNIVINE] = { @@ -6380,13 +9415,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 14, .weight = 270, .description = DEX_ENTRY_CARNIVINE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_FINNEON] = { @@ -6394,13 +9427,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 96, .description = DEX_ENTRY_FINNEON, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_LUMINEON] = { @@ -6408,13 +9439,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 240, .description = DEX_ENTRY_LUMINEON, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MANTYKE] = { @@ -6422,13 +9451,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 650, .description = DEX_ENTRY_MANTYKE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SNOVER] = { @@ -6436,13 +9463,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 505, .description = DEX_ENTRY_SNOVER, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_ABOMASNOW] = { @@ -6450,13 +9475,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 22, .weight = 1355, .description = DEX_ENTRY_ABOMASNOW, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_WEAVILE] = { @@ -6464,13 +9487,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 11, .weight = 340, .description = DEX_ENTRY_WEAVILE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MAGNEZONE] = { @@ -6478,13 +9499,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 1800, .description = DEX_ENTRY_MAGNEZONE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_LICKILICKY] = { @@ -6492,13 +9511,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 17, .weight = 1400, .description = DEX_ENTRY_LICKILICKY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_RHYPERIOR] = { @@ -6506,13 +9523,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 24, .weight = 2828, .description = DEX_ENTRY_RHYPERIOR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_TANGROWTH] = { @@ -6520,13 +9535,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 20, .weight = 1286, .description = DEX_ENTRY_TANGROWTH, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_ELECTIVIRE] = { @@ -6534,13 +9547,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 18, .weight = 1386, .description = DEX_ENTRY_ELECTIVIRE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MAGMORTAR] = { @@ -6548,13 +9559,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 16, .weight = 680, .description = DEX_ENTRY_MAGMORTAR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_TOGEKISS] = { @@ -6562,13 +9571,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 380, .description = DEX_ENTRY_TOGEKISS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_YANMEGA] = { @@ -6576,13 +9583,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 19, .weight = 515, .description = DEX_ENTRY_YANMEGA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_LEAFEON] = { @@ -6590,13 +9595,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 255, .description = DEX_ENTRY_LEAFEON, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GLACEON] = { @@ -6604,13 +9607,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 259, .description = DEX_ENTRY_GLACEON, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GLISCOR] = { @@ -6618,13 +9619,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 20, .weight = 425, .description = DEX_ENTRY_GLISCOR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MAMOSWINE] = { @@ -6632,13 +9631,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 25, .weight = 2910, .description = DEX_ENTRY_MAMOSWINE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PORYGON_Z] = { @@ -6646,13 +9643,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 9, .weight = 340, .description = DEX_ENTRY_PORYGON_Z, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GALLADE] = { @@ -6660,13 +9655,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 16, .weight = 520, .description = DEX_ENTRY_GALLADE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PROBOPASS] = { @@ -6674,13 +9667,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 14, .weight = 3400, .description = DEX_ENTRY_PROBOPASS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DUSKNOIR] = { @@ -6688,13 +9679,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 22, .weight = 1066, .description = DEX_ENTRY_DUSKNOIR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_FROSLASS] = { @@ -6702,13 +9691,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 13, .weight = 266, .description = DEX_ENTRY_FROSLASS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_ROTOM] = { @@ -6716,13 +9703,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 3, .description = DEX_ENTRY_ROTOM, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_UXIE] = { @@ -6730,13 +9715,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 3, .description = DEX_ENTRY_UXIE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MESPRIT] = { @@ -6744,13 +9727,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 3, .description = DEX_ENTRY_MESPRIT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_AZELF] = { @@ -6758,13 +9739,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 3, .description = DEX_ENTRY_AZELF, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DIALGA] = { @@ -6772,13 +9751,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 54, .weight = 6830, .description = DEX_ENTRY_DIALGA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PALKIA] = { @@ -6786,13 +9763,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 42, .weight = 3360, .description = DEX_ENTRY_PALKIA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_HEATRAN] = { @@ -6800,13 +9775,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 17, .weight = 4300, .description = DEX_ENTRY_HEATRAN, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_REGIGIGAS] = { @@ -6814,13 +9787,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 37, .weight = 4200, .description = DEX_ENTRY_REGIGIGAS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, - .trainerScale = 256, + .trainerScale = 512, .trainerOffset = 0, - .unknown1 = 512, - .unknown2 = 0, }, [NATIONAL_DEX_GIRATINA] = { @@ -6828,13 +9799,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 45, .weight = 7500, .description = DEX_ENTRY_GIRATINA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CRESSELIA] = { @@ -6842,13 +9811,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 856, .description = DEX_ENTRY_CRESSELIA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PHIONE] = { @@ -6856,13 +9823,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 31, .description = DEX_ENTRY_PHIONE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MANAPHY] = { @@ -6870,13 +9835,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 14, .description = DEX_ENTRY_MANAPHY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DARKRAI] = { @@ -6884,13 +9847,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 505, .description = DEX_ENTRY_DARKRAI, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SHAYMIN] = { @@ -6898,13 +9859,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 2, .weight = 21, .description = DEX_ENTRY_SHAYMIN, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_ARCEUS] = { @@ -6912,13 +9871,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 32, .weight = 3200, .description = DEX_ENTRY_ARCEUS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_VICTINI] = { @@ -6926,13 +9883,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 40, .description = DEX_ENTRY_VICTINI, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SNIVY] = { @@ -6940,13 +9895,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 81, .description = DEX_ENTRY_SNIVY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SERVINE] = { @@ -6954,13 +9907,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 160, .description = DEX_ENTRY_SERVINE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SERPERIOR] = { @@ -6968,13 +9919,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 33, .weight = 630, .description = DEX_ENTRY_SERPERIOR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_TEPIG] = { @@ -6982,13 +9931,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 99, .description = DEX_ENTRY_TEPIG, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PIGNITE] = { @@ -6996,13 +9943,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 555, .description = DEX_ENTRY_PIGNITE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_EMBOAR] = { @@ -7010,13 +9955,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 16, .weight = 1500, .description = DEX_ENTRY_EMBOAR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_OSHAWOTT] = { @@ -7024,13 +9967,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 59, .description = DEX_ENTRY_OSHAWOTT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DEWOTT] = { @@ -7038,13 +9979,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 245, .description = DEX_ENTRY_DEWOTT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SAMUROTT] = { @@ -7052,13 +9991,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 946, .description = DEX_ENTRY_SAMUROTT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PATRAT] = { @@ -7066,13 +10003,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 116, .description = DEX_ENTRY_PATRAT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_WATCHOG] = { @@ -7080,13 +10015,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 11, .weight = 270, .description = DEX_ENTRY_WATCHOG, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_LILLIPUP] = { @@ -7094,13 +10027,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 41, .description = DEX_ENTRY_LILLIPUP, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_HERDIER] = { @@ -7108,13 +10039,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 9, .weight = 147, .description = DEX_ENTRY_HERDIER, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_STOUTLAND] = { @@ -7122,13 +10051,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 610, .description = DEX_ENTRY_STOUTLAND, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PURRLOIN] = { @@ -7136,13 +10063,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 101, .description = DEX_ENTRY_PURRLOIN, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_LIEPARD] = { @@ -7150,13 +10075,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 11, .weight = 375, .description = DEX_ENTRY_LIEPARD, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PANSAGE] = { @@ -7164,13 +10087,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 105, .description = DEX_ENTRY_PANSAGE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SIMISAGE] = { @@ -7178,13 +10099,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 11, .weight = 305, .description = DEX_ENTRY_SIMISAGE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PANSEAR] = { @@ -7192,13 +10111,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 110, .description = DEX_ENTRY_PANSEAR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SIMISEAR] = { @@ -7206,13 +10123,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 280, .description = DEX_ENTRY_SIMISEAR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PANPOUR] = { @@ -7220,13 +10135,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 135, .description = DEX_ENTRY_PANPOUR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SIMIPOUR] = { @@ -7234,13 +10147,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 290, .description = DEX_ENTRY_SIMIPOUR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MUNNA] = { @@ -7248,13 +10159,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 233, .description = DEX_ENTRY_MUNNA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MUSHARNA] = { @@ -7262,13 +10171,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 11, .weight = 605, .description = DEX_ENTRY_MUSHARNA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PIDOVE] = { @@ -7276,13 +10183,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 21, .description = DEX_ENTRY_PIDOVE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_TRANQUILL] = { @@ -7290,13 +10195,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 150, .description = DEX_ENTRY_TRANQUILL, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_UNFEZANT] = { @@ -7304,13 +10207,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 290, .description = DEX_ENTRY_UNFEZANT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BLITZLE] = { @@ -7318,13 +10219,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 298, .description = DEX_ENTRY_BLITZLE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_ZEBSTRIKA] = { @@ -7332,13 +10231,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 16, .weight = 795, .description = DEX_ENTRY_ZEBSTRIKA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_ROGGENROLA] = { @@ -7346,13 +10243,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 180, .description = DEX_ENTRY_ROGGENROLA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BOLDORE] = { @@ -7360,13 +10255,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 9, .weight = 1020, .description = DEX_ENTRY_BOLDORE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GIGALITH] = { @@ -7374,13 +10267,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 17, .weight = 2600, .description = DEX_ENTRY_GIGALITH, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_WOOBAT] = { @@ -7388,13 +10279,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 21, .description = DEX_ENTRY_WOOBAT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SWOOBAT] = { @@ -7402,13 +10291,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 9, .weight = 105, .description = DEX_ENTRY_SWOOBAT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DRILBUR] = { @@ -7416,13 +10303,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 187, .description = DEX_ENTRY_DRILBUR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_EXCADRILL] = { @@ -7430,13 +10315,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 7, .weight = 404, .description = DEX_ENTRY_EXCADRILL, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_AUDINO] = { @@ -7444,13 +10327,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 11, .weight = 310, .description = DEX_ENTRY_AUDINO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_TIMBURR] = { @@ -7458,13 +10339,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 125, .description = DEX_ENTRY_TIMBURR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GURDURR] = { @@ -7472,13 +10351,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 400, .description = DEX_ENTRY_GURDURR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CONKELDURR] = { @@ -7486,13 +10363,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 14, .weight = 870, .description = DEX_ENTRY_CONKELDURR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_TYMPOLE] = { @@ -7500,13 +10375,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 45, .description = DEX_ENTRY_TYMPOLE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PALPITOAD] = { @@ -7514,13 +10387,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 170, .description = DEX_ENTRY_PALPITOAD, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SEISMITOAD] = { @@ -7528,13 +10399,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 620, .description = DEX_ENTRY_SEISMITOAD, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_THROH] = { @@ -7542,13 +10411,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 13, .weight = 555, .description = DEX_ENTRY_THROH, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SAWK] = { @@ -7556,13 +10423,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 14, .weight = 510, .description = DEX_ENTRY_SAWK, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SEWADDLE] = { @@ -7570,13 +10435,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 25, .description = DEX_ENTRY_SEWADDLE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SWADLOON] = { @@ -7584,13 +10447,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 73, .description = DEX_ENTRY_SWADLOON, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_LEAVANNY] = { @@ -7598,13 +10459,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 205, .description = DEX_ENTRY_LEAVANNY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_VENIPEDE] = { @@ -7612,13 +10471,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 53, .description = DEX_ENTRY_VENIPEDE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_WHIRLIPEDE] = { @@ -7626,13 +10483,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 585, .description = DEX_ENTRY_WHIRLIPEDE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SCOLIPEDE] = { @@ -7640,13 +10495,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 25, .weight = 2005, .description = DEX_ENTRY_SCOLIPEDE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_COTTONEE] = { @@ -7654,13 +10507,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 6, .description = DEX_ENTRY_COTTONEE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_WHIMSICOTT] = { @@ -7668,13 +10519,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 7, .weight = 66, .description = DEX_ENTRY_WHIMSICOTT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PETILIL] = { @@ -7682,13 +10531,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 66, .description = DEX_ENTRY_PETILIL, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_LILLIGANT] = { @@ -7696,13 +10543,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 11, .weight = 163, .description = DEX_ENTRY_LILLIGANT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BASCULIN] = { @@ -7710,13 +10555,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 180, .description = DEX_ENTRY_BASCULIN, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SANDILE] = { @@ -7724,13 +10567,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 7, .weight = 152, .description = DEX_ENTRY_SANDILE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_KROKOROK] = { @@ -7738,13 +10579,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 334, .description = DEX_ENTRY_KROKOROK, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_KROOKODILE] = { @@ -7752,13 +10591,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 963, .description = DEX_ENTRY_KROOKODILE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DARUMAKA] = { @@ -7766,13 +10603,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 375, .description = DEX_ENTRY_DARUMAKA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DARMANITAN] = { @@ -7780,13 +10615,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 13, .weight = 929, .description = DEX_ENTRY_DARMANITAN, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MARACTUS] = { @@ -7794,13 +10627,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 1720, .description = DEX_ENTRY_MARACTUS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DWEBBLE] = { @@ -7808,13 +10639,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 145, .description = DEX_ENTRY_DWEBBLE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CRUSTLE] = { @@ -7822,13 +10651,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 14, .weight = 1720, .description = DEX_ENTRY_CRUSTLE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SCRAGGY] = { @@ -7836,13 +10663,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 118, .description = DEX_ENTRY_SCRAGGY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SCRAFTY] = { @@ -7850,13 +10675,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 11, .weight = 300, .description = DEX_ENTRY_SCRAFTY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SIGILYPH] = { @@ -7864,13 +10687,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 14, .weight = 140, .description = DEX_ENTRY_SIGILYPH, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_YAMASK] = { @@ -7878,13 +10699,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 15, .description = DEX_ENTRY_YAMASK, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_COFAGRIGUS] = { @@ -7892,13 +10711,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 17, .weight = 765, .description = DEX_ENTRY_COFAGRIGUS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_TIRTOUGA] = { @@ -7906,13 +10723,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 7, .weight = 165, .description = DEX_ENTRY_TIRTOUGA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CARRACOSTA] = { @@ -7920,13 +10735,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 810, .description = DEX_ENTRY_CARRACOSTA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_ARCHEN] = { @@ -7934,13 +10747,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 95, .description = DEX_ENTRY_ARCHEN, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_ARCHEOPS] = { @@ -7948,13 +10759,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 14, .weight = 320, .description = DEX_ENTRY_ARCHEOPS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_TRUBBISH] = { @@ -7962,13 +10771,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 310, .description = DEX_ENTRY_TRUBBISH, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GARBODOR] = { @@ -7976,13 +10783,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 19, .weight = 1073, .description = DEX_ENTRY_GARBODOR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_ZORUA] = { @@ -7990,13 +10795,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 7, .weight = 125, .description = DEX_ENTRY_ZORUA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_ZOROARK] = { @@ -8004,13 +10807,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 16, .weight = 811, .description = DEX_ENTRY_ZOROARK, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MINCCINO] = { @@ -8018,13 +10819,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 58, .description = DEX_ENTRY_MINCCINO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CINCCINO] = { @@ -8032,13 +10831,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 75, .description = DEX_ENTRY_CINCCINO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GOTHITA] = { @@ -8046,13 +10843,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 58, .description = DEX_ENTRY_GOTHITA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GOTHORITA] = { @@ -8060,13 +10855,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 7, .weight = 180, .description = DEX_ENTRY_GOTHORITA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GOTHITELLE] = { @@ -8074,13 +10867,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 440, .description = DEX_ENTRY_GOTHITELLE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SOLOSIS] = { @@ -8088,13 +10879,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 10, .description = DEX_ENTRY_SOLOSIS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DUOSION] = { @@ -8102,13 +10891,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 80, .description = DEX_ENTRY_DUOSION, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_REUNICLUS] = { @@ -8116,13 +10903,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 201, .description = DEX_ENTRY_REUNICLUS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DUCKLETT] = { @@ -8130,13 +10915,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 55, .description = DEX_ENTRY_DUCKLETT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SWANNA] = { @@ -8144,13 +10927,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 13, .weight = 242, .description = DEX_ENTRY_SWANNA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_VANILLITE] = { @@ -8158,13 +10939,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 1720, .description = DEX_ENTRY_VANILLITE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_VANILLISH] = { @@ -8172,13 +10951,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 11, .weight = 410, .description = DEX_ENTRY_VANILLISH, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_VANILLUXE] = { @@ -8186,13 +10963,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 13, .weight = 575, .description = DEX_ENTRY_VANILLUXE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DEERLING] = { @@ -8200,13 +10975,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 195, .description = DEX_ENTRY_DEERLING, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SAWSBUCK] = { @@ -8214,13 +10987,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 19, .weight = 925, .description = DEX_ENTRY_SAWSBUCK, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_EMOLGA] = { @@ -8228,13 +10999,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 50, .description = DEX_ENTRY_EMOLGA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_KARRABLAST] = { @@ -8242,13 +11011,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 59, .description = DEX_ENTRY_KARRABLAST, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_ESCAVALIER] = { @@ -8256,13 +11023,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 330, .description = DEX_ENTRY_ESCAVALIER, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_FOONGUS] = { @@ -8270,13 +11035,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 2, .weight = 10, .description = DEX_ENTRY_FOONGUS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_AMOONGUSS] = { @@ -8284,13 +11047,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 105, .description = DEX_ENTRY_AMOONGUSS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_FRILLISH] = { @@ -8298,13 +11059,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 330, .description = DEX_ENTRY_FRILLISH, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_JELLICENT] = { @@ -8312,13 +11071,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 22, .weight = 1350, .description = DEX_ENTRY_JELLICENT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_ALOMOMOLA] = { @@ -8326,13 +11083,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 316, .description = DEX_ENTRY_ALOMOMOLA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_JOLTIK] = { @@ -8340,13 +11095,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 1, .weight = 6, .description = DEX_ENTRY_JOLTIK, - .unused = 19633, - .pokemonScale = 2116, - .pokemonOffset = 0, - .trainerScale = 800, - .trainerOffset = 23, - .unknown1 = 256, - .unknown2 = 65534, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 800, + .pokemonOffset = 23, + .trainerScale = 256, + .trainerOffset = 65534, }, [NATIONAL_DEX_GALVANTULA] = { @@ -8354,13 +11107,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 143, .description = DEX_ENTRY_GALVANTULA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_FERROSEED] = { @@ -8368,13 +11119,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 188, .description = DEX_ENTRY_FERROSEED, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_FERROTHORN] = { @@ -8382,13 +11131,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 1100, .description = DEX_ENTRY_FERROTHORN, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_KLINK] = { @@ -8396,13 +11143,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 210, .description = DEX_ENTRY_KLINK, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_KLANG] = { @@ -8410,13 +11155,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 560, .description = DEX_ENTRY_KLANG, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_KLINKLANG] = { @@ -8424,13 +11167,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 810, .description = DEX_ENTRY_KLINKLANG, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_TYNAMO] = { @@ -8438,13 +11179,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 2, .weight = 3, .description = DEX_ENTRY_TYNAMO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_EELEKTRIK] = { @@ -8452,13 +11191,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 220, .description = DEX_ENTRY_EELEKTRIK, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_EELEKTROSS] = { @@ -8466,13 +11203,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 21, .weight = 805, .description = DEX_ENTRY_EELEKTROSS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_ELGYEM] = { @@ -8480,13 +11215,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 90, .description = DEX_ENTRY_ELGYEM, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BEHEEYEM] = { @@ -8494,13 +11227,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 345, .description = DEX_ENTRY_BEHEEYEM, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_LITWICK] = { @@ -8508,13 +11239,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 31, .description = DEX_ENTRY_LITWICK, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_LAMPENT] = { @@ -8522,13 +11251,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 130, .description = DEX_ENTRY_LAMPENT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CHANDELURE] = { @@ -8536,13 +11263,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 343, .description = DEX_ENTRY_CHANDELURE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_AXEW] = { @@ -8550,13 +11275,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 180, .description = DEX_ENTRY_AXEW, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_FRAXURE] = { @@ -8564,13 +11287,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 0, .weight = 0, .description = DEX_ENTRY_FRAXURE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_HAXORUS] = { @@ -8578,13 +11299,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 18, .weight = 1055, .description = DEX_ENTRY_HAXORUS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CUBCHOO] = { @@ -8592,13 +11311,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 85, .description = DEX_ENTRY_CUBCHOO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BEARTIC] = { @@ -8606,13 +11323,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 26, .weight = 2600, .description = DEX_ENTRY_BEARTIC, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CRYOGONAL] = { @@ -8620,13 +11335,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 11, .weight = 1480, .description = DEX_ENTRY_CRYOGONAL, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SHELMET] = { @@ -8634,13 +11347,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 77, .description = DEX_ENTRY_SHELMET, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_ACCELGOR] = { @@ -8648,13 +11359,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 253, .description = DEX_ENTRY_ACCELGOR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_STUNFISK] = { @@ -8662,13 +11371,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 7, .weight = 110, .description = DEX_ENTRY_STUNFISK, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MIENFOO] = { @@ -8676,13 +11383,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 9, .weight = 200, .description = DEX_ENTRY_MIENFOO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MIENSHAO] = { @@ -8690,13 +11395,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 14, .weight = 355, .description = DEX_ENTRY_MIENSHAO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DRUDDIGON] = { @@ -8704,13 +11407,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 16, .weight = 1390, .description = DEX_ENTRY_DRUDDIGON, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GOLETT] = { @@ -8718,13 +11419,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 920, .description = DEX_ENTRY_GOLETT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GOLURK] = { @@ -8732,13 +11431,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 28, .weight = 3300, .description = DEX_ENTRY_GOLURK, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PAWNIARD] = { @@ -8746,13 +11443,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 102, .description = DEX_ENTRY_PAWNIARD, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BISHARP] = { @@ -8760,13 +11455,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 16, .weight = 700, .description = DEX_ENTRY_BISHARP, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BOUFFALANT] = { @@ -8774,13 +11467,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 16, .weight = 946, .description = DEX_ENTRY_BOUFFALANT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_RUFFLET] = { @@ -8788,13 +11479,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 105, .description = DEX_ENTRY_RUFFLET, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BRAVIARY] = { @@ -8802,13 +11491,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 410, .description = DEX_ENTRY_BRAVIARY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_VULLABY] = { @@ -8816,13 +11503,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 90, .description = DEX_ENTRY_VULLABY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MANDIBUZZ] = { @@ -8830,13 +11515,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 395, .description = DEX_ENTRY_MANDIBUZZ, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_HEATMOR] = { @@ -8844,13 +11527,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 14, .weight = 580, .description = DEX_ENTRY_HEATMOR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DURANT] = { @@ -8858,13 +11539,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 330, .description = DEX_ENTRY_DURANT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DEINO] = { @@ -8872,13 +11551,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 173, .description = DEX_ENTRY_DEINO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_ZWEILOUS] = { @@ -8886,13 +11563,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 14, .weight = 500, .description = DEX_ENTRY_ZWEILOUS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_HYDREIGON] = { @@ -8900,13 +11575,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 18, .weight = 1600, .description = DEX_ENTRY_HYDREIGON, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_LARVESTA] = { @@ -8914,13 +11587,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 11, .weight = 288, .description = DEX_ENTRY_LARVESTA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_VOLCARONA] = { @@ -8928,13 +11599,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 16, .weight = 460, .description = DEX_ENTRY_VOLCARONA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_COBALION] = { @@ -8942,13 +11611,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 21, .weight = 2500, .description = DEX_ENTRY_COBALION, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_TERRAKION] = { @@ -8956,13 +11623,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 19, .weight = 2600, .description = DEX_ENTRY_TERRAKION, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_VIRIZION] = { @@ -8970,13 +11635,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 20, .weight = 2000, .description = DEX_ENTRY_VIRIZION, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_TORNADUS] = { @@ -8984,13 +11647,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 630, .description = DEX_ENTRY_TORNADUS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_THUNDURUS] = { @@ -8998,13 +11659,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 610, .description = DEX_ENTRY_THUNDURUS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_RESHIRAM] = { @@ -9012,13 +11671,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 32, .weight = 3300, .description = DEX_ENTRY_RESHIRAM, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_ZEKROM] = { @@ -9026,13 +11683,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 29, .weight = 3450, .description = DEX_ENTRY_ZEKROM, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_LANDORUS] = { @@ -9040,13 +11695,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 680, .description = DEX_ENTRY_LANDORUS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_KYUREM] = { @@ -9054,13 +11707,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 30, .weight = 3250, .description = DEX_ENTRY_KYUREM, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_KELDEO] = { @@ -9068,13 +11719,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 14, .weight = 485, .description = DEX_ENTRY_KELDEO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MELOETTA] = { @@ -9082,13 +11731,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 65, .description = DEX_ENTRY_MELOETTA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GENESECT] = { @@ -9096,13 +11743,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 825, .description = DEX_ENTRY_GENESECT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CHESPIN] = { @@ -9110,13 +11755,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 90, .description = DEX_ENTRY_CHESPIN, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_QUILLADIN] = { @@ -9124,13 +11767,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 7, .weight = 290, .description = DEX_ENTRY_QUILLADIN, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CHESNAUGHT] = { @@ -9138,13 +11779,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 16, .weight = 900, .description = DEX_ENTRY_CHESNAUGHT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_FENNEKIN] = { @@ -9152,13 +11791,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 94, .description = DEX_ENTRY_FENNEKIN, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BRAIXEN] = { @@ -9166,13 +11803,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 145, .description = DEX_ENTRY_BRAIXEN, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DELPHOX] = { @@ -9180,13 +11815,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 390, .description = DEX_ENTRY_DELPHOX, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_FROAKIE] = { @@ -9194,13 +11827,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 70, .description = DEX_ENTRY_FROAKIE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_FROGADIER] = { @@ -9208,13 +11839,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 109, .description = DEX_ENTRY_FROGADIER, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GRENINJA] = { @@ -9222,13 +11851,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 400, .description = DEX_ENTRY_GRENINJA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BUNNELBY] = { @@ -9236,13 +11863,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 50, .description = DEX_ENTRY_BUNNELBY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DIGGERSBY] = { @@ -9250,13 +11875,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 424, .description = DEX_ENTRY_DIGGERSBY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_FLETCHLING] = { @@ -9264,13 +11887,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 17, .description = DEX_ENTRY_FLETCHLING, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_FLETCHINDER] = { @@ -9278,13 +11899,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 7, .weight = 160, .description = DEX_ENTRY_FLETCHINDER, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_TALONFLAME] = { @@ -9292,13 +11911,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 245, .description = DEX_ENTRY_TALONFLAME, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SCATTERBUG] = { @@ -9306,13 +11923,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 25, .description = DEX_ENTRY_SCATTERBUG, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SPEWPA] = { @@ -9320,13 +11935,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 84, .description = DEX_ENTRY_SPEWPA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_VIVILLON] = { @@ -9334,13 +11947,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 170, .description = DEX_ENTRY_VIVILLON, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_LITLEO] = { @@ -9348,13 +11959,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 135, .description = DEX_ENTRY_LITLEO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PYROAR] = { @@ -9362,13 +11971,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 815, .description = DEX_ENTRY_PYROAR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_FLABEBE] = { @@ -9376,13 +11983,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 1, .weight = 1, .description = DEX_ENTRY_FLABEBE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_FLOETTE] = { @@ -9390,13 +11995,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 2, .weight = 9, .description = DEX_ENTRY_FLOETTE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_FLORGES] = { @@ -9404,13 +12007,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 11, .weight = 100, .description = DEX_ENTRY_FLORGES, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SKIDDO] = { @@ -9418,13 +12019,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 9, .weight = 310, .description = DEX_ENTRY_SKIDDO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GOGOAT] = { @@ -9432,13 +12031,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 17, .weight = 910, .description = DEX_ENTRY_GOGOAT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PANCHAM] = { @@ -9446,13 +12043,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 80, .description = DEX_ENTRY_PANCHAM, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PANGORO] = { @@ -9460,13 +12055,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 21, .weight = 1360, .description = DEX_ENTRY_PANGORO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_FURFROU] = { @@ -9474,13 +12067,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 280, .description = DEX_ENTRY_FURFROU, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_ESPURR] = { @@ -9488,13 +12079,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 35, .description = DEX_ENTRY_ESPURR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MEOWSTIC] = { @@ -9502,13 +12091,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 85, .description = DEX_ENTRY_MEOWSTIC, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_HONEDGE] = { @@ -9516,13 +12103,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 20, .description = DEX_ENTRY_HONEDGE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DOUBLADE] = { @@ -9530,13 +12115,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 45, .description = DEX_ENTRY_DOUBLADE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_AEGISLASH] = { @@ -9544,13 +12127,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 17, .weight = 530, .description = DEX_ENTRY_AEGISLASH, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SPRITZEE] = { @@ -9558,13 +12139,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 2, .weight = 5, .description = DEX_ENTRY_SPRITZEE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_AROMATISSE] = { @@ -9572,13 +12151,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 155, .description = DEX_ENTRY_AROMATISSE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SWIRLIX] = { @@ -9586,13 +12163,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 35, .description = DEX_ENTRY_SWIRLIX, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SLURPUFF] = { @@ -9600,13 +12175,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 50, .description = DEX_ENTRY_SLURPUFF, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_INKAY] = { @@ -9614,13 +12187,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 35, .description = DEX_ENTRY_INKAY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_MALAMAR] = { @@ -9628,13 +12199,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 470, .description = DEX_ENTRY_MALAMAR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BINACLE] = { @@ -9642,13 +12211,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 310, .description = DEX_ENTRY_BINACLE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BARBARACLE] = { @@ -9656,13 +12223,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 13, .weight = 960, .description = DEX_ENTRY_BARBARACLE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SKRELP] = { @@ -9670,13 +12235,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 73, .description = DEX_ENTRY_SKRELP, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DRAGALGE] = { @@ -9684,13 +12247,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 18, .weight = 815, .description = DEX_ENTRY_DRAGALGE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CLAUNCHER] = { @@ -9698,13 +12259,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 83, .description = DEX_ENTRY_CLAUNCHER, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CLAWITZER] = { @@ -9712,13 +12271,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 13, .weight = 353, .description = DEX_ENTRY_CLAWITZER, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_HELIOPTILE] = { @@ -9726,13 +12283,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 60, .description = DEX_ENTRY_HELIOPTILE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_HELIOLISK] = { @@ -9740,13 +12295,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 210, .description = DEX_ENTRY_HELIOLISK, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_TYRUNT] = { @@ -9754,13 +12307,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 260, .description = DEX_ENTRY_TYRUNT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_TYRANTRUM] = { @@ -9768,13 +12319,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 25, .weight = 2700, .description = DEX_ENTRY_TYRANTRUM, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_AMAURA] = { @@ -9782,13 +12331,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 13, .weight = 252, .description = DEX_ENTRY_AMAURA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_AURORUS] = { @@ -9796,13 +12343,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 27, .weight = 2250, .description = DEX_ENTRY_AURORUS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SYLVEON] = { @@ -9810,13 +12355,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 235, .description = DEX_ENTRY_SYLVEON, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_HAWLUCHA] = { @@ -9824,13 +12367,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 215, .description = DEX_ENTRY_HAWLUCHA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DEDENNE] = { @@ -9838,13 +12379,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 2, .weight = 22, .description = DEX_ENTRY_DEDENNE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_CARBINK] = { @@ -9852,13 +12391,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 57, .description = DEX_ENTRY_CARBINK, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GOOMY] = { @@ -9866,13 +12403,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 28, .description = DEX_ENTRY_GOOMY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_SLIGGOO] = { @@ -9880,13 +12415,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 175, .description = DEX_ENTRY_SLIGGOO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GOODRA] = { @@ -9894,13 +12427,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 20, .weight = 1505, .description = DEX_ENTRY_GOODRA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_KLEFKI] = { @@ -9908,13 +12439,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 2, .weight = 30, .description = DEX_ENTRY_KLEFKI, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PHANTUMP] = { @@ -9922,13 +12451,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 70, .description = DEX_ENTRY_PHANTUMP, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_TREVENANT] = { @@ -9936,13 +12463,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 710, .description = DEX_ENTRY_TREVENANT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_PUMPKABOO] = { @@ -9950,13 +12475,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 50, .description = DEX_ENTRY_PUMPKABOO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_GOURGEIST] = { @@ -9964,13 +12487,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 9, .weight = 125, .description = DEX_ENTRY_GOURGEIST, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_BERGMITE] = { @@ -9978,13 +12499,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 995, .description = DEX_ENTRY_BERGMITE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_AVALUGG] = { @@ -9992,13 +12511,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 20, .weight = 5050, .description = DEX_ENTRY_AVALUGG, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_NOIBAT] = { @@ -10006,13 +12523,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 80, .description = DEX_ENTRY_NOIBAT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_NOIVERN] = { @@ -10020,13 +12535,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 850, .description = DEX_ENTRY_NOIVERN, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_XERNEAS] = { @@ -10034,13 +12547,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 30, .weight = 2150, .description = DEX_ENTRY_XERNEAS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_YVELTAL] = { @@ -10048,13 +12559,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 58, .weight = 2030, .description = DEX_ENTRY_YVELTAL, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_ZYGARDE] = { @@ -10062,13 +12571,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 50, .weight = 3050, .description = DEX_ENTRY_ZYGARDE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_DIANCIE] = { @@ -10076,13 +12583,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 7, .weight = 88, .description = DEX_ENTRY_DIANCIE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_HOOPA] = { @@ -10090,13 +12595,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 90, .description = DEX_ENTRY_HOOPA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .unknown1 = 256, - .unknown2 = 0, }, [NATIONAL_DEX_VOLCANION] = { @@ -10104,13 +12607,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 0, .weight = 0, .description = DEX_ENTRY_VOLCANION, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_ROWLET] = { @@ -10118,13 +12619,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 15, .description = DEX_ENTRY_ROWLET, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_DARTRIX] = { @@ -10132,13 +12631,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 7, .weight = 160, .description = DEX_ENTRY_DARTRIX, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_DECIDUEYE] = { @@ -10146,13 +12643,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 16, .weight = 366, .description = DEX_ENTRY_DECIDUEYE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_LITTEN] = { @@ -10160,13 +12655,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 43, .description = DEX_ENTRY_LITTEN, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_TORRACAT] = { @@ -10174,13 +12667,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 7, .weight = 250, .description = DEX_ENTRY_TORRACAT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_INCINEROAR] = { @@ -10188,13 +12679,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 18, .weight = 830, .description = DEX_ENTRY_INCINEROAR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_POPPLIO] = { @@ -10202,13 +12691,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 75, .description = DEX_ENTRY_POPPLIO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_BRIONNE] = { @@ -10216,13 +12703,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 175, .description = DEX_ENTRY_BRIONNE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_PRIMARINA] = { @@ -10230,13 +12715,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 18, .weight = 440, .description = DEX_ENTRY_PRIMARINA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_PIKIPEK] = { @@ -10244,13 +12727,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 12, .description = DEX_ENTRY_PIKIPEK, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_TRUMBEAK] = { @@ -10258,13 +12739,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 148, .description = DEX_ENTRY_TRUMBEAK, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_TOUCANNON] = { @@ -10272,13 +12751,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 11, .weight = 260, .description = DEX_ENTRY_TOUCANNON, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_YUNGOOS] = { @@ -10286,13 +12763,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 60, .description = DEX_ENTRY_YUNGOOS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_GUMSHOOS] = { @@ -10300,13 +12775,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 7, .weight = 142, .description = DEX_ENTRY_GUMSHOOS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_GRUBBIN] = { @@ -10314,13 +12787,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 44, .description = DEX_ENTRY_GRUBBIN, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_CHARJABUG] = { @@ -10328,13 +12799,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 105, .description = DEX_ENTRY_CHARJABUG, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_VIKAVOLT] = { @@ -10342,13 +12811,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 450, .description = DEX_ENTRY_VIKAVOLT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_CRABRAWLER] = { @@ -10356,13 +12823,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 70, .description = DEX_ENTRY_CRABRAWLER, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_CRABOMINABLE] = { @@ -10370,13 +12835,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 17, .weight = 1800, .description = DEX_ENTRY_CRABOMINABLE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_ORICORIO] = { @@ -10384,13 +12847,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 34, .description = DEX_ENTRY_ORICORIO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_CUTIEFLY] = { @@ -10398,13 +12859,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 1, .weight = 2, .description = DEX_ENTRY_CUTIEFLY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_RIBOMBEE] = { @@ -10412,13 +12871,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 2, .weight = 5, .description = DEX_ENTRY_RIBOMBEE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_ROCKRUFF] = { @@ -10426,13 +12883,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 92, .description = DEX_ENTRY_ROCKRUFF, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_LYCANROC] = { @@ -10440,13 +12895,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 8, .weight = 250, .description = DEX_ENTRY_LYCANROC, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_WISHIWASHI] = { @@ -10454,13 +12907,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 2, .weight = 3, .description = DEX_ENTRY_WISHIWASHI, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_MAREANIE] = { @@ -10468,13 +12919,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 80, .description = DEX_ENTRY_MAREANIE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_TOXAPEX] = { @@ -10482,13 +12931,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 7, .weight = 145, .description = DEX_ENTRY_TOXAPEX, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_MUDBRAY] = { @@ -10496,13 +12943,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 1100, .description = DEX_ENTRY_MUDBRAY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_MUDSDALE] = { @@ -10510,13 +12955,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 25, .weight = 9200, .description = DEX_ENTRY_MUDSDALE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_DEWPIDER] = { @@ -10524,13 +12967,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 40, .description = DEX_ENTRY_DEWPIDER, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_ARAQUANID] = { @@ -10538,13 +12979,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 18, .weight = 820, .description = DEX_ENTRY_ARAQUANID, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_FOMANTIS] = { @@ -10552,13 +12991,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 15, .description = DEX_ENTRY_FOMANTIS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_LURANTIS] = { @@ -10566,13 +13003,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 9, .weight = 185, .description = DEX_ENTRY_LURANTIS, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_MORELULL] = { @@ -10580,13 +13015,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 2, .weight = 15, .description = DEX_ENTRY_MORELULL, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_SHIINOTIC] = { @@ -10594,13 +13027,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 115, .description = DEX_ENTRY_SHIINOTIC, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_SALANDIT] = { @@ -10608,13 +13039,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 48, .description = DEX_ENTRY_SALANDIT, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_SALAZZLE] = { @@ -10622,13 +13051,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 222, .description = DEX_ENTRY_SALAZZLE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_STUFFUL] = { @@ -10636,13 +13063,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 68, .description = DEX_ENTRY_STUFFUL, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_BEWEAR] = { @@ -10650,13 +13075,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 21, .weight = 1350, .description = DEX_ENTRY_BEWEAR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_BOUNSWEET] = { @@ -10664,13 +13087,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 32, .description = DEX_ENTRY_BOUNSWEET, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_STEENEE] = { @@ -10678,13 +13099,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 7, .weight = 82, .description = DEX_ENTRY_STEENEE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_TSAREENA] = { @@ -10692,13 +13111,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 214, .description = DEX_ENTRY_TSAREENA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_COMFEY] = { @@ -10706,13 +13123,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 1, .weight = 3, .description = DEX_ENTRY_COMFEY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_ORANGURU] = { @@ -10720,13 +13135,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 760, .description = DEX_ENTRY_ORANGURU, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_PASSIMIAN] = { @@ -10734,13 +13147,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 20, .weight = 828, .description = DEX_ENTRY_PASSIMIAN, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_WIMPOD] = { @@ -10748,13 +13159,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 120, .description = DEX_ENTRY_WIMPOD, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_GOLISOPOD] = { @@ -10762,13 +13171,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 20, .weight = 1080, .description = DEX_ENTRY_GOLISOPOD, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_SANDYGAST] = { @@ -10776,13 +13183,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 5, .weight = 700, .description = DEX_ENTRY_SANDYGAST, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_PALOSSAND] = { @@ -10790,13 +13195,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 13, .weight = 2500, .description = DEX_ENTRY_PALOSSAND, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_PYUKUMUKU] = { @@ -10804,13 +13207,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 12, .description = DEX_ENTRY_PYUKUMUKU, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_TYPE_NULL] = { @@ -10818,13 +13219,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 19, .weight = 1205, .description = DEX_ENTRY_TYPE_NULL, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_SILVALLY] = { @@ -10832,13 +13231,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 23, .weight = 1005, .description = DEX_ENTRY_SILVALLY, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_MINIOR] = { @@ -10846,13 +13243,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 400, .description = DEX_ENTRY_MINIOR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_KOMALA] = { @@ -10860,13 +13255,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 4, .weight = 199, .description = DEX_ENTRY_KOMALA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_TURTONATOR] = { @@ -10874,13 +13267,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 20, .weight = 2120, .description = DEX_ENTRY_TURTONATOR, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_TOGEDEMARU] = { @@ -10888,13 +13279,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 33, .description = DEX_ENTRY_TOGEDEMARU, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_MIMIKYU] = { @@ -10902,13 +13291,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 2, .weight = 7, .description = DEX_ENTRY_MIMIKYU, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_BRUXISH] = { @@ -10916,13 +13303,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 9, .weight = 190, .description = DEX_ENTRY_BRUXISH, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_DRAMPA] = { @@ -10930,13 +13315,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 30, .weight = 1850, .description = DEX_ENTRY_DRAMPA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_DHELMISE] = { @@ -10944,13 +13327,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 39, .weight = 2100, .description = DEX_ENTRY_DHELMISE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_JANGMO_O] = { @@ -10958,13 +13339,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 297, .description = DEX_ENTRY_JANGMO_O, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_HAKAMO_O] = { @@ -10972,13 +13351,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 470, .description = DEX_ENTRY_HAKAMO_O, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_KOMMO_O] = { @@ -10986,13 +13363,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 16, .weight = 782, .description = DEX_ENTRY_KOMMO_O, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_TAPU_KOKO] = { @@ -11000,13 +13375,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 18, .weight = 205, .description = DEX_ENTRY_TAPU_KOKO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_TAPU_LELE] = { @@ -11014,13 +13387,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 186, .description = DEX_ENTRY_TAPU_LELE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_TAPU_BULU] = { @@ -11028,13 +13399,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 19, .weight = 455, .description = DEX_ENTRY_TAPU_BULU, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_TAPU_FINI] = { @@ -11042,13 +13411,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 13, .weight = 212, .description = DEX_ENTRY_TAPU_FINI, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_COSMOG] = { @@ -11056,13 +13423,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 2, .weight = 1, .description = DEX_ENTRY_COSMOG, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_COSMOEM] = { @@ -11070,13 +13435,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 1, .weight = 9999, .description = DEX_ENTRY_COSMOEM, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_SOLGALEO] = { @@ -11084,13 +13447,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 34, .weight = 2300, .description = DEX_ENTRY_SOLGALEO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_LUNALA] = { @@ -11098,13 +13459,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 40, .weight = 1200, .description = DEX_ENTRY_LUNALA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_NIHILEGO] = { @@ -11112,13 +13471,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 12, .weight = 555, .description = DEX_ENTRY_NIHILEGO, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_BUZZWOLE] = { @@ -11126,13 +13483,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 24, .weight = 3336, .description = DEX_ENTRY_BUZZWOLE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_PHEROMOSA] = { @@ -11140,13 +13495,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 18, .weight = 250, .description = DEX_ENTRY_PHEROMOSA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_XURKITREE] = { @@ -11154,13 +13507,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 38, .weight = 1000, .description = DEX_ENTRY_XURKITREE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_CELESTEELA] = { @@ -11168,13 +13519,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 92, .weight = 9999, .description = DEX_ENTRY_CELESTEELA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_KARTANA] = { @@ -11182,13 +13531,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 3, .weight = 1, .description = DEX_ENTRY_KARTANA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_GUZZLORD] = { @@ -11196,13 +13543,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 55, .weight = 8880, .description = DEX_ENTRY_GUZZLORD, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_NECROZMA] = { @@ -11210,13 +13555,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 24, .weight = 2300, .description = DEX_ENTRY_NECROZMA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_MAGEARNA] = { @@ -11224,13 +13567,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 10, .weight = 805, .description = DEX_ENTRY_MAGEARNA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_MARSHADOW] = { @@ -11238,13 +13579,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 70, .weight = 222, .description = DEX_ENTRY_MARSHADOW, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_POIPOLE] = { @@ -11252,13 +13591,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 6, .weight = 18, .description = DEX_ENTRY_POIPOLE, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_NAGANADEL] = { @@ -11266,13 +13603,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 36, .weight = 1500, .description = DEX_ENTRY_NAGANADEL, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_STAKATAKA] = { @@ -11280,13 +13615,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 55, .weight = 8200, .description = DEX_ENTRY_STAKATAKA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_BLACEPHALON] = { @@ -11294,13 +13627,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 18, .weight = 130, .description = DEX_ENTRY_BLACEPHALON, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_ZERAORA] = { @@ -11308,13 +13639,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 15, .weight = 445, .description = DEX_ENTRY_ZERAORA, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_MELTAN] = { @@ -11322,13 +13651,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 2, .weight = 80, .description = DEX_ENTRY_MELTAN, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, }, [NATIONAL_DEX_MELMETAL] = @@ -11337,13 +13664,11 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .height = 25, .weight = 8000, .description = DEX_ENTRY_MELMETAL, - .unused = 19633, - .pokemonScale = 2116, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - .unknown1 = 0, - .unknown2 = 0, } }; diff --git a/src/Pokedex_Orders.c b/src/Pokedex_Orders.c index 7fc3f5c..b9a0e38 100644 --- a/src/Pokedex_Orders.c +++ b/src/Pokedex_Orders.c @@ -3,6 +3,7 @@ const u16 gPokedexOrder_Regional[] = { +<<<<<<< Updated upstream NATIONAL_DEX_BULBASAUR, NATIONAL_DEX_IVYSAUR, NATIONAL_DEX_VENUSAUR, @@ -154,2449 +155,3553 @@ const u16 gPokedexOrder_Regional[] = NATIONAL_DEX_DRAGONITE, NATIONAL_DEX_MEWTWO, NATIONAL_DEX_MEW, +======= + SPECIES_SNORUNT, + SPECIES_GLALIE, + SPECIES_FROSLASS, + SPECIES_VANILLITE, + SPECIES_VANILLISH, + SPECIES_VANILLUXE, + SPECIES_DELIBIRD, + SPECIES_MINIOR_SHIELD, + SPECIES_SNEASEL, + SPECIES_WEAVILE, + SPECIES_ZUBAT, + SPECIES_GOLBAT, + SPECIES_CROBAT, + SPECIES_MAKUHITA, + SPECIES_HARIYAMA, + SPECIES_SPHEAL, + SPECIES_SEALEO, + SPECIES_WALREIN, + SPECIES_SMOOCHUM, + SPECIES_JYNX, + SPECIES_ROGGENROLA, + SPECIES_BOLDORE, + SPECIES_GIGALITH, + SPECIES_SWINUB, + SPECIES_PILOSWINE, + SPECIES_MAMOSWINE, + SPECIES_BERGMITE, + SPECIES_AVALUGG, + SPECIES_DRILBUR, + SPECIES_EXCADRILL, + SPECIES_MAWILE, + SPECIES_SANDSHREW_A, + SPECIES_SANDSLASH_A, + SPECIES_STARLY, + SPECIES_STARAVIA, + SPECIES_STARAPTOR, + SPECIES_HOOTHOOT, + SPECIES_NOCTOWL, + SPECIES_PATRAT, + SPECIES_WATCHOG, + SPECIES_RATTATA, + SPECIES_RATICATE, + SPECIES_BUDEW, + SPECIES_ROSELIA, + SPECIES_ROSERADE, + SPECIES_SWABLU, + SPECIES_ALTARIA, + SPECIES_ELECTRIKE, + SPECIES_MANECTRIC, + SPECIES_AZURILL, + SPECIES_MARILL, + SPECIES_AZUMARILL, + SPECIES_STUFFUL, + SPECIES_BEWEAR, + SPECIES_SCRAGGY, + SPECIES_SCRAFTY, + SPECIES_RIOLU, + SPECIES_LUCARIO, + SPECIES_POOCHYENA, + SPECIES_MIGHTYENA, + SPECIES_WINGULL, + SPECIES_PELIPPER, + SPECIES_SENTRET, + SPECIES_FURRET, + SPECIES_BIDOOF, + SPECIES_BIBAREL, + SPECIES_BUIZEL, + SPECIES_FLOATZEL, + SPECIES_SHELLOS, + SPECIES_GASTRODON, + SPECIES_DEWPIDER, + SPECIES_ARAQUANID, + SPECIES_SURSKIT, + SPECIES_MASQUERAIN, + SPECIES_KRABBY, + SPECIES_KINGLER, + SPECIES_BURMY, + SPECIES_WORMADAM, + SPECIES_MOTHIM, + SPECIES_FLABEBE, + SPECIES_FLOETTE, + SPECIES_FLORGES, + SPECIES_CUTIEFLY, + SPECIES_RIBOMBEE, + SPECIES_ORICORIO, + SPECIES_PANSAGE, + SPECIES_SIMISAGE, + SPECIES_PANSEAR, + SPECIES_SIMISEAR, + SPECIES_PANPOUR, + SPECIES_SIMIPOUR, + SPECIES_COMBEE, + SPECIES_VESPIQUEN, + SPECIES_COMFEY, + SPECIES_CHERUBI, + SPECIES_CHERRIM, + SPECIES_CATERPIE, + SPECIES_METAPOD, + SPECIES_BUTTERFREE, + SPECIES_WEEDLE, + SPECIES_KAKUNA, + SPECIES_BEEDRILL, + SPECIES_SEEDOT, + SPECIES_NUZLEAF, + SPECIES_SHIFTRY, + SPECIES_PUMPKABOO, + SPECIES_GOURGEIST, + SPECIES_GASTLY, + SPECIES_HAUNTER, + SPECIES_GENGAR, + SPECIES_SHUPPET, + SPECIES_BANETTE, + SPECIES_DUSKULL, + SPECIES_DUSCLOPS, + SPECIES_DUSKNOIR, + SPECIES_PHANTUMP, + SPECIES_TREVENANT, + SPECIES_NINCADA, + SPECIES_NINJASK, + SPECIES_SHEDINJA, + SPECIES_PIKIPEK, + SPECIES_TRUMBEAK, + SPECIES_TOUCANNON, + SPECIES_LILLIPUP, + SPECIES_HERDIER, + SPECIES_STOUTLAND, + SPECIES_EKANS, + SPECIES_ARBOK, + SPECIES_NUMEL, + SPECIES_CAMERUPT, + SPECIES_MANKEY, + SPECIES_PRIMEAPE, + SPECIES_RALTS, + SPECIES_KIRLIA, + SPECIES_GARDEVOIR, + SPECIES_GALLADE, + SPECIES_LITLEO, + SPECIES_PYROAR, + SPECIES_WOOBAT, + SPECIES_SWOOBAT, + SPECIES_SLUGMA, + SPECIES_MAGCARGO, + SPECIES_SALANDIT, + SPECIES_SALAZZLE, + SPECIES_GEODUDE, + SPECIES_GRAVELER, + SPECIES_GOLEM, + SPECIES_TORKOAL, + SPECIES_MAGBY, + SPECIES_MAGMAR, + SPECIES_MAGMORTAR, + SPECIES_VULPIX, + SPECIES_NINETALES, + SPECIES_TAILLOW, + SPECIES_SWELLOW, + SPECIES_MURKROW, + SPECIES_HONCHKROW, + SPECIES_BUNNELBY, + SPECIES_DIGGERSBY, + SPECIES_NIDORAN_M, + SPECIES_NIDORINO, + SPECIES_NIDOKING, + SPECIES_NIDORAN_F, + SPECIES_NIDORINA, + SPECIES_NIDOQUEEN, + SPECIES_GROWLITHE, + SPECIES_ARCANINE, + SPECIES_HOUNDOUR, + SPECIES_HOUNDOOM, + SPECIES_DEDENNE, + SPECIES_PURRLOIN, + SPECIES_LIEPARD, + SPECIES_ARON, + SPECIES_LAIRON, + SPECIES_AGGRON, + SPECIES_NOSEPASS, + SPECIES_PROBOPASS, + SPECIES_NOIBAT, + SPECIES_NOIVERN, + SPECIES_PHANPY, + SPECIES_DONPHAN, + SPECIES_GLIGAR, + SPECIES_GLISCOR, + SPECIES_DUNSPARCE, + SPECIES_ZIGZAGOON, + SPECIES_LINOONE, + SPECIES_LEDYBA, + SPECIES_LEDIAN, + SPECIES_SPINARAK, + SPECIES_ARIADOS, + SPECIES_SHINX, + SPECIES_LUXIO, + SPECIES_LUXRAY, + SPECIES_DEERLING, + SPECIES_SAWSBUCK, + SPECIES_SUNKERN, + SPECIES_SUNFLORA, + SPECIES_KRICKETOT, + SPECIES_KRICKETUNE, + SPECIES_SMEARGLE, + SPECIES_YUNGOOS, + SPECIES_GUMSHOOS, + SPECIES_DODUO, + SPECIES_DODRIO, + SPECIES_BUNEARY, + SPECIES_LOPUNNY, + SPECIES_ABRA, + SPECIES_KADABRA, + SPECIES_ALAKAZAM, + SPECIES_MAREEP, + SPECIES_FLAAFFY, + SPECIES_AMPHAROS, + SPECIES_ESPURR, + SPECIES_MEOWSTIC, + SPECIES_DROWZEE, + SPECIES_HYPNO, + SPECIES_MIME_JR, + SPECIES_MR_MIME, + SPECIES_MAGIKARP, + SPECIES_GYARADOS, + SPECIES_BRONZOR, + SPECIES_BRONZONG, + SPECIES_ONIX, + SPECIES_STEELIX, + SPECIES_CRYOGONAL, + SPECIES_CARBINK, + SPECIES_SNOVER, + SPECIES_ABOMASNOW, + SPECIES_CUBCHOO, + SPECIES_BEARTIC, + SPECIES_STANTLER, + SPECIES_CRABRAWLER, + SPECIES_CRABOMINABLE, + SPECIES_SPEAROW, + SPECIES_FEAROW, + SPECIES_GRUBBIN, + SPECIES_CHARJABUG, + SPECIES_VIKAVOLT, + SPECIES_SHROOMISH, + SPECIES_BRELOOM, + SPECIES_SKORUPI, + SPECIES_DRAPION, + SPECIES_HAPPINY, + SPECIES_CHANSEY, + SPECIES_BLISSEY, + SPECIES_KARRABLAST, + SPECIES_ESCAVALIER, + SPECIES_LOTAD, + SPECIES_LOMBRE, + SPECIES_LUDICOLO, + SPECIES_TYMPOLE, + SPECIES_PALPITOAD, + SPECIES_SEISMITOAD, + SPECIES_MILTANK, + SPECIES_LICKITUNG, + SPECIES_GOOMY, + SPECIES_SLIGGOO, + SPECIES_GOODRA, + SPECIES_SHELMET, + SPECIES_ACCELGOR, + SPECIES_EXEGGCUTE, + SPECIES_EXEGGUTOR, + SPECIES_MEOWTH, + SPECIES_PERSIAN, + SPECIES_YANMA, + SPECIES_YANMEGA, + SPECIES_VENONAT, + SPECIES_VENOMOTH, + SPECIES_SPOINK, + SPECIES_GRUMPIG, + SPECIES_MEDITITE, + SPECIES_MEDICHAM, + SPECIES_ABSOL, + SPECIES_GLAMEOW, + SPECIES_PURUGLY, +>>>>>>> Stashed changes }; const u16 gRegionalDexCount = ARRAY_COUNT(gPokedexOrder_Regional); const u16 gPokedexOrder_Alphabetical[] = { - NATIONAL_DEX_ABOMASNOW, - NATIONAL_DEX_ABRA, - NATIONAL_DEX_ABSOL, - NATIONAL_DEX_ACCELGOR, - NATIONAL_DEX_AEGISLASH, - NATIONAL_DEX_AERODACTYL, - NATIONAL_DEX_AGGRON, - NATIONAL_DEX_AIPOM, - NATIONAL_DEX_ALAKAZAM, - NATIONAL_DEX_ALOMOMOLA, - NATIONAL_DEX_ALTARIA, - NATIONAL_DEX_AMAURA, - NATIONAL_DEX_AMBIPOM, - NATIONAL_DEX_AMOONGUSS, - NATIONAL_DEX_AMPHAROS, - NATIONAL_DEX_ANORITH, - NATIONAL_DEX_ARAQUANID, - NATIONAL_DEX_ARBOK, - NATIONAL_DEX_ARCANINE, - NATIONAL_DEX_ARCEUS, - NATIONAL_DEX_ARCHEN, - NATIONAL_DEX_ARCHEOPS, - NATIONAL_DEX_ARIADOS, - NATIONAL_DEX_ARMALDO, - NATIONAL_DEX_AROMATISSE, - NATIONAL_DEX_ARON, - NATIONAL_DEX_ARTICUNO, - NATIONAL_DEX_AUDINO, - NATIONAL_DEX_AURORUS, - NATIONAL_DEX_AVALUGG, - NATIONAL_DEX_AXEW, - NATIONAL_DEX_AZELF, - NATIONAL_DEX_AZUMARILL, - NATIONAL_DEX_AZURILL, - NATIONAL_DEX_BAGON, - NATIONAL_DEX_BALTOY, - NATIONAL_DEX_BANETTE, - NATIONAL_DEX_BARBARACLE, - NATIONAL_DEX_BARBOACH, - NATIONAL_DEX_BASCULIN, - NATIONAL_DEX_BASTIODON, - NATIONAL_DEX_BAYLEEF, - NATIONAL_DEX_BEARTIC, - NATIONAL_DEX_BEAUTIFLY, - NATIONAL_DEX_BEEDRILL, - NATIONAL_DEX_BEHEEYEM, - NATIONAL_DEX_BELDUM, - NATIONAL_DEX_BELLOSSOM, - NATIONAL_DEX_BELLSPROUT, - NATIONAL_DEX_BERGMITE, - NATIONAL_DEX_BEWEAR, - NATIONAL_DEX_BIBAREL, - NATIONAL_DEX_BIDOOF, - NATIONAL_DEX_BINACLE, - NATIONAL_DEX_BISHARP, - NATIONAL_DEX_BLACEPHALON, - NATIONAL_DEX_BLASTOISE, - NATIONAL_DEX_BLAZIKEN, - NATIONAL_DEX_BLISSEY, - NATIONAL_DEX_BLITZLE, - NATIONAL_DEX_BOLDORE, - NATIONAL_DEX_BONSLY, - NATIONAL_DEX_BOUFFALANT, - NATIONAL_DEX_BOUNSWEET, - NATIONAL_DEX_BRAIXEN, - NATIONAL_DEX_BRAVIARY, - NATIONAL_DEX_BRELOOM, - NATIONAL_DEX_BRIONNE, - NATIONAL_DEX_BRONZONG, - NATIONAL_DEX_BRONZOR, - NATIONAL_DEX_BRUXISH, - NATIONAL_DEX_BUDEW, - NATIONAL_DEX_BUIZEL, - NATIONAL_DEX_BULBASAUR, - NATIONAL_DEX_BUNEARY, - NATIONAL_DEX_BUNNELBY, - NATIONAL_DEX_BURMY, - NATIONAL_DEX_BUTTERFREE, - NATIONAL_DEX_BUZZWOLE, - NATIONAL_DEX_CACNEA, - NATIONAL_DEX_CACTURNE, - NATIONAL_DEX_CAMERUPT, - NATIONAL_DEX_CARBINK, - NATIONAL_DEX_CARNIVINE, - NATIONAL_DEX_CARRACOSTA, - NATIONAL_DEX_CARVANHA, - NATIONAL_DEX_CASCOON, - NATIONAL_DEX_CASTFORM, - NATIONAL_DEX_CATERPIE, - NATIONAL_DEX_CELEBI, - NATIONAL_DEX_CELESTEELA, - NATIONAL_DEX_CHANDELURE, - NATIONAL_DEX_CHANSEY, - NATIONAL_DEX_CHARIZARD, - NATIONAL_DEX_CHARJABUG, - NATIONAL_DEX_CHARMANDER, - NATIONAL_DEX_CHARMELEON, - NATIONAL_DEX_CHATOT, - NATIONAL_DEX_CHERRIM, - NATIONAL_DEX_CHERUBI, - NATIONAL_DEX_CHESNAUGHT, - NATIONAL_DEX_CHESPIN, - NATIONAL_DEX_CHIKORITA, - NATIONAL_DEX_CHIMCHAR, - NATIONAL_DEX_CHIMECHO, - NATIONAL_DEX_CHINCHOU, - NATIONAL_DEX_CHINGLING, - NATIONAL_DEX_CINCCINO, - NATIONAL_DEX_CLAMPERL, - NATIONAL_DEX_CLAUNCHER, - NATIONAL_DEX_CLAWITZER, - NATIONAL_DEX_CLAYDOL, - NATIONAL_DEX_CLEFABLE, - NATIONAL_DEX_CLEFAIRY, - NATIONAL_DEX_CLEFFA, - NATIONAL_DEX_CLOYSTER, - NATIONAL_DEX_COBALION, - NATIONAL_DEX_COFAGRIGUS, - NATIONAL_DEX_COMBEE, - NATIONAL_DEX_COMBUSKEN, - NATIONAL_DEX_COMFEY, - NATIONAL_DEX_CONKELDURR, - NATIONAL_DEX_CORPHISH, - NATIONAL_DEX_CORSOLA, - NATIONAL_DEX_COSMOEM, - NATIONAL_DEX_COSMOG, - NATIONAL_DEX_COTTONEE, - NATIONAL_DEX_CRABOMINABLE, - NATIONAL_DEX_CRABRAWLER, - NATIONAL_DEX_CRADILY, - NATIONAL_DEX_CRANIDOS, - NATIONAL_DEX_CRAWDAUNT, - NATIONAL_DEX_CRESSELIA, - NATIONAL_DEX_CROAGUNK, - NATIONAL_DEX_CROBAT, - NATIONAL_DEX_CROCONAW, - NATIONAL_DEX_CRUSTLE, - NATIONAL_DEX_CRYOGONAL, - NATIONAL_DEX_CUBCHOO, - NATIONAL_DEX_CUBONE, - NATIONAL_DEX_CUTIEFLY, - NATIONAL_DEX_CYNDAQUIL, - NATIONAL_DEX_DARKRAI, - NATIONAL_DEX_DARMANITAN, - NATIONAL_DEX_DARTRIX, - NATIONAL_DEX_DARUMAKA, - NATIONAL_DEX_DECIDUEYE, - NATIONAL_DEX_DEDENNE, - NATIONAL_DEX_DEERLING, - NATIONAL_DEX_DEINO, - NATIONAL_DEX_DELCATTY, - NATIONAL_DEX_DELIBIRD, - NATIONAL_DEX_DELPHOX, - NATIONAL_DEX_DEOXYS, - NATIONAL_DEX_DEWGONG, - NATIONAL_DEX_DEWOTT, - NATIONAL_DEX_DEWPIDER, - NATIONAL_DEX_DHELMISE, - NATIONAL_DEX_DIALGA, - NATIONAL_DEX_DIANCIE, - NATIONAL_DEX_DIGGERSBY, - NATIONAL_DEX_DIGLETT, - NATIONAL_DEX_DITTO, - NATIONAL_DEX_DODRIO, - NATIONAL_DEX_DODUO, - NATIONAL_DEX_DONPHAN, - NATIONAL_DEX_DOUBLADE, - NATIONAL_DEX_DRAGALGE, - NATIONAL_DEX_DRAGONAIR, - NATIONAL_DEX_DRAGONITE, - NATIONAL_DEX_DRAMPA, - NATIONAL_DEX_DRAPION, - NATIONAL_DEX_DRATINI, - NATIONAL_DEX_DRIFBLIM, - NATIONAL_DEX_DRIFLOON, - NATIONAL_DEX_DRILBUR, - NATIONAL_DEX_DROWZEE, - NATIONAL_DEX_DRUDDIGON, - NATIONAL_DEX_DUCKLETT, - NATIONAL_DEX_DUGTRIO, - NATIONAL_DEX_DUNSPARCE, - NATIONAL_DEX_DUOSION, - NATIONAL_DEX_DURANT, - NATIONAL_DEX_DUSCLOPS, - NATIONAL_DEX_DUSKNOIR, - NATIONAL_DEX_DUSKULL, - NATIONAL_DEX_DUSTOX, - NATIONAL_DEX_DWEBBLE, - NATIONAL_DEX_EELEKTRIK, - NATIONAL_DEX_EELEKTROSS, - NATIONAL_DEX_EEVEE, - NATIONAL_DEX_EKANS, - NATIONAL_DEX_ELECTABUZZ, - NATIONAL_DEX_ELECTIVIRE, - NATIONAL_DEX_ELECTRIKE, - NATIONAL_DEX_ELECTRODE, - NATIONAL_DEX_ELEKID, - NATIONAL_DEX_ELGYEM, - NATIONAL_DEX_EMBOAR, - NATIONAL_DEX_EMOLGA, - NATIONAL_DEX_EMPOLEON, - NATIONAL_DEX_ENTEI, - NATIONAL_DEX_ESCAVALIER, - NATIONAL_DEX_ESPEON, - NATIONAL_DEX_ESPURR, - NATIONAL_DEX_EXCADRILL, - NATIONAL_DEX_EXEGGCUTE, - NATIONAL_DEX_EXEGGUTOR, - NATIONAL_DEX_EXPLOUD, - NATIONAL_DEX_FARFETCHD, - NATIONAL_DEX_FEAROW, - NATIONAL_DEX_FEEBAS, - NATIONAL_DEX_FENNEKIN, - NATIONAL_DEX_FERALIGATR, - NATIONAL_DEX_FERROSEED, - NATIONAL_DEX_FERROTHORN, - NATIONAL_DEX_FINNEON, - NATIONAL_DEX_FLAAFFY, - NATIONAL_DEX_FLABEBE, - NATIONAL_DEX_FLAREON, - NATIONAL_DEX_FLETCHINDER, - NATIONAL_DEX_FLETCHLING, - NATIONAL_DEX_FLOATZEL, - NATIONAL_DEX_FLOETTE, - NATIONAL_DEX_FLORGES, - NATIONAL_DEX_FLYGON, - NATIONAL_DEX_FOMANTIS, - NATIONAL_DEX_FOONGUS, - NATIONAL_DEX_FORRETRESS, - NATIONAL_DEX_FRAXURE, - NATIONAL_DEX_FRILLISH, - NATIONAL_DEX_FROAKIE, - NATIONAL_DEX_FROGADIER, - NATIONAL_DEX_FROSLASS, - NATIONAL_DEX_FURFROU, - NATIONAL_DEX_FURRET, - NATIONAL_DEX_GABITE, - NATIONAL_DEX_GALLADE, - NATIONAL_DEX_GALVANTULA, - NATIONAL_DEX_GARBODOR, - NATIONAL_DEX_GARCHOMP, - NATIONAL_DEX_GARDEVOIR, - NATIONAL_DEX_GASTLY, - NATIONAL_DEX_GASTRODON, - NATIONAL_DEX_GENESECT, - NATIONAL_DEX_GENGAR, - NATIONAL_DEX_GEODUDE, - NATIONAL_DEX_GIBLE, - NATIONAL_DEX_GIGALITH, - NATIONAL_DEX_GIRAFARIG, - NATIONAL_DEX_GIRATINA, - NATIONAL_DEX_GLACEON, - NATIONAL_DEX_GLALIE, - NATIONAL_DEX_GLAMEOW, - NATIONAL_DEX_GLIGAR, - NATIONAL_DEX_GLISCOR, - NATIONAL_DEX_GLOOM, - NATIONAL_DEX_GOGOAT, - NATIONAL_DEX_GOLBAT, - NATIONAL_DEX_GOLDEEN, - NATIONAL_DEX_GOLDUCK, - NATIONAL_DEX_GOLEM, - NATIONAL_DEX_GOLETT, - NATIONAL_DEX_GOLISOPOD, - NATIONAL_DEX_GOLURK, - NATIONAL_DEX_GOODRA, - NATIONAL_DEX_GOOMY, - NATIONAL_DEX_GOREBYSS, - NATIONAL_DEX_GOTHITA, - NATIONAL_DEX_GOTHITELLE, - NATIONAL_DEX_GOTHORITA, - NATIONAL_DEX_GOURGEIST, - NATIONAL_DEX_GRANBULL, - NATIONAL_DEX_GRAVELER, - NATIONAL_DEX_GRENINJA, - NATIONAL_DEX_GRIMER, - NATIONAL_DEX_GROTLE, - NATIONAL_DEX_GROUDON, - NATIONAL_DEX_GROVYLE, - NATIONAL_DEX_GROWLITHE, - NATIONAL_DEX_GRUBBIN, - NATIONAL_DEX_GRUMPIG, - NATIONAL_DEX_GULPIN, - NATIONAL_DEX_GUMSHOOS, - NATIONAL_DEX_GURDURR, - NATIONAL_DEX_GUZZLORD, - NATIONAL_DEX_GYARADOS, - NATIONAL_DEX_HAKAMO_O, - NATIONAL_DEX_HAPPINY, - NATIONAL_DEX_HARIYAMA, - NATIONAL_DEX_HAUNTER, - NATIONAL_DEX_HAWLUCHA, - NATIONAL_DEX_HAXORUS, - NATIONAL_DEX_HEATMOR, - NATIONAL_DEX_HEATRAN, - NATIONAL_DEX_HELIOLISK, - NATIONAL_DEX_HELIOPTILE, - NATIONAL_DEX_HERACROSS, - NATIONAL_DEX_HERDIER, - NATIONAL_DEX_HIPPOPOTAS, - NATIONAL_DEX_HIPPOWDON, - NATIONAL_DEX_HITMONCHAN, - NATIONAL_DEX_HITMONLEE, - NATIONAL_DEX_HITMONTOP, - NATIONAL_DEX_HONCHKROW, - NATIONAL_DEX_HONEDGE, - NATIONAL_DEX_HOOPA, - NATIONAL_DEX_HOOTHOOT, - NATIONAL_DEX_HOPPIP, - NATIONAL_DEX_HORSEA, - NATIONAL_DEX_HOUNDOOM, - NATIONAL_DEX_HOUNDOUR, - NATIONAL_DEX_HO_OH, - NATIONAL_DEX_HUNTAIL, - NATIONAL_DEX_HYDREIGON, - NATIONAL_DEX_HYPNO, - NATIONAL_DEX_IGGLYBUFF, - NATIONAL_DEX_ILLUMISE, - NATIONAL_DEX_INCINEROAR, - NATIONAL_DEX_INFERNAPE, - NATIONAL_DEX_INKAY, - NATIONAL_DEX_IVYSAUR, - NATIONAL_DEX_JANGMO_O, - NATIONAL_DEX_JELLICENT, - NATIONAL_DEX_JIGGLYPUFF, - NATIONAL_DEX_JIRACHI, - NATIONAL_DEX_JOLTEON, - NATIONAL_DEX_JOLTIK, - NATIONAL_DEX_JUMPLUFF, - NATIONAL_DEX_JYNX, - NATIONAL_DEX_KABUTO, - NATIONAL_DEX_KABUTOPS, - NATIONAL_DEX_KADABRA, - NATIONAL_DEX_KAKUNA, - NATIONAL_DEX_KANGASKHAN, - NATIONAL_DEX_KARRABLAST, - NATIONAL_DEX_KARTANA, - NATIONAL_DEX_KECLEON, - NATIONAL_DEX_KELDEO, - NATIONAL_DEX_KINGDRA, - NATIONAL_DEX_KINGLER, - NATIONAL_DEX_KIRLIA, - NATIONAL_DEX_KLANG, - NATIONAL_DEX_KLEFKI, - NATIONAL_DEX_KLINK, - NATIONAL_DEX_KLINKLANG, - NATIONAL_DEX_KOFFING, - NATIONAL_DEX_KOMALA, - NATIONAL_DEX_KOMMO_O, - NATIONAL_DEX_KRABBY, - NATIONAL_DEX_KRICKETOT, - NATIONAL_DEX_KRICKETUNE, - NATIONAL_DEX_KROKOROK, - NATIONAL_DEX_KROOKODILE, - NATIONAL_DEX_KYOGRE, - NATIONAL_DEX_KYUREM, - NATIONAL_DEX_LAIRON, - NATIONAL_DEX_LAMPENT, - NATIONAL_DEX_LANDORUS, - NATIONAL_DEX_LANTURN, - NATIONAL_DEX_LAPRAS, - NATIONAL_DEX_LARVESTA, - NATIONAL_DEX_LARVITAR, - NATIONAL_DEX_LATIAS, - NATIONAL_DEX_LATIOS, - NATIONAL_DEX_LEAFEON, - NATIONAL_DEX_LEAVANNY, - NATIONAL_DEX_LEDIAN, - NATIONAL_DEX_LEDYBA, - NATIONAL_DEX_LICKILICKY, - NATIONAL_DEX_LICKITUNG, - NATIONAL_DEX_LIEPARD, - NATIONAL_DEX_LILEEP, - NATIONAL_DEX_LILLIGANT, - NATIONAL_DEX_LILLIPUP, - NATIONAL_DEX_LINOONE, - NATIONAL_DEX_LITLEO, - NATIONAL_DEX_LITTEN, - NATIONAL_DEX_LITWICK, - NATIONAL_DEX_LOMBRE, - NATIONAL_DEX_LOPUNNY, - NATIONAL_DEX_LOTAD, - NATIONAL_DEX_LOUDRED, - NATIONAL_DEX_LUCARIO, - NATIONAL_DEX_LUDICOLO, - NATIONAL_DEX_LUGIA, - NATIONAL_DEX_LUMINEON, - NATIONAL_DEX_LUNALA, - NATIONAL_DEX_LUNATONE, - NATIONAL_DEX_LURANTIS, - NATIONAL_DEX_LUVDISC, - NATIONAL_DEX_LUXIO, - NATIONAL_DEX_LUXRAY, - NATIONAL_DEX_LYCANROC, - NATIONAL_DEX_MACHAMP, - NATIONAL_DEX_MACHOKE, - NATIONAL_DEX_MACHOP, - NATIONAL_DEX_MAGBY, - NATIONAL_DEX_MAGCARGO, - NATIONAL_DEX_MAGEARNA, - NATIONAL_DEX_MAGIKARP, - NATIONAL_DEX_MAGMAR, - NATIONAL_DEX_MAGMORTAR, - NATIONAL_DEX_MAGNEMITE, - NATIONAL_DEX_MAGNETON, - NATIONAL_DEX_MAGNEZONE, - NATIONAL_DEX_MAKUHITA, - NATIONAL_DEX_MALAMAR, - NATIONAL_DEX_MAMOSWINE, - NATIONAL_DEX_MANAPHY, - NATIONAL_DEX_MANDIBUZZ, - NATIONAL_DEX_MANECTRIC, - NATIONAL_DEX_MANKEY, - NATIONAL_DEX_MANTINE, - NATIONAL_DEX_MANTYKE, - NATIONAL_DEX_MARACTUS, - NATIONAL_DEX_MAREANIE, - NATIONAL_DEX_MAREEP, - NATIONAL_DEX_MARILL, - NATIONAL_DEX_MAROWAK, - NATIONAL_DEX_MARSHADOW, - NATIONAL_DEX_MARSHTOMP, - NATIONAL_DEX_MASQUERAIN, - NATIONAL_DEX_MAWILE, - NATIONAL_DEX_MEDICHAM, - NATIONAL_DEX_MEDITITE, - NATIONAL_DEX_MEGANIUM, - NATIONAL_DEX_MELMETAL, - NATIONAL_DEX_MELOETTA, - NATIONAL_DEX_MELTAN, - NATIONAL_DEX_MEOWSTIC, - NATIONAL_DEX_MEOWTH, - NATIONAL_DEX_MESPRIT, - NATIONAL_DEX_METAGROSS, - NATIONAL_DEX_METANG, - NATIONAL_DEX_METAPOD, - NATIONAL_DEX_MEW, - NATIONAL_DEX_MEWTWO, - NATIONAL_DEX_MIENFOO, - NATIONAL_DEX_MIENSHAO, - NATIONAL_DEX_MIGHTYENA, - NATIONAL_DEX_MILOTIC, - NATIONAL_DEX_MILTANK, - NATIONAL_DEX_MIME_JR, - NATIONAL_DEX_MIMIKYU, - NATIONAL_DEX_MINCCINO, - NATIONAL_DEX_MINIOR, - NATIONAL_DEX_MINUN, - NATIONAL_DEX_MISDREAVUS, - NATIONAL_DEX_MISMAGIUS, - NATIONAL_DEX_MOLTRES, - NATIONAL_DEX_MONFERNO, - NATIONAL_DEX_MORELULL, - NATIONAL_DEX_MOTHIM, - NATIONAL_DEX_MR_MIME, - NATIONAL_DEX_MUDBRAY, - NATIONAL_DEX_MUDKIP, - NATIONAL_DEX_MUDSDALE, - NATIONAL_DEX_MUK, - NATIONAL_DEX_MUNCHLAX, - NATIONAL_DEX_MUNNA, - NATIONAL_DEX_MURKROW, - NATIONAL_DEX_MUSHARNA, - NATIONAL_DEX_NAGANADEL, - NATIONAL_DEX_NATU, - NATIONAL_DEX_NECROZMA, - NATIONAL_DEX_NIDOKING, - NATIONAL_DEX_NIDOQUEEN, - NATIONAL_DEX_NIDORAN_F, - NATIONAL_DEX_NIDORAN_M, - NATIONAL_DEX_NIDORINA, - NATIONAL_DEX_NIDORINO, - NATIONAL_DEX_NIHILEGO, - NATIONAL_DEX_NINCADA, - NATIONAL_DEX_NINETALES, - NATIONAL_DEX_NINJASK, - NATIONAL_DEX_NOCTOWL, - NATIONAL_DEX_NOIBAT, - NATIONAL_DEX_NOIVERN, - NATIONAL_DEX_NOSEPASS, - NATIONAL_DEX_NUMEL, - NATIONAL_DEX_NUZLEAF, - NATIONAL_DEX_OCTILLERY, - NATIONAL_DEX_ODDISH, - NATIONAL_DEX_OMANYTE, - NATIONAL_DEX_OMASTAR, - NATIONAL_DEX_ONIX, - NATIONAL_DEX_ORANGURU, - NATIONAL_DEX_ORICORIO, - NATIONAL_DEX_OSHAWOTT, - NATIONAL_DEX_PACHIRISU, - NATIONAL_DEX_PALKIA, - NATIONAL_DEX_PALOSSAND, - NATIONAL_DEX_PALPITOAD, - NATIONAL_DEX_PANCHAM, - NATIONAL_DEX_PANGORO, - NATIONAL_DEX_PANPOUR, - NATIONAL_DEX_PANSAGE, - NATIONAL_DEX_PANSEAR, - NATIONAL_DEX_PARAS, - NATIONAL_DEX_PARASECT, - NATIONAL_DEX_PASSIMIAN, - NATIONAL_DEX_PATRAT, - NATIONAL_DEX_PAWNIARD, - NATIONAL_DEX_PELIPPER, - NATIONAL_DEX_PERSIAN, - NATIONAL_DEX_PETILIL, - NATIONAL_DEX_PHANPY, - NATIONAL_DEX_PHANTUMP, - NATIONAL_DEX_PHEROMOSA, - NATIONAL_DEX_PHIONE, - NATIONAL_DEX_PICHU, - NATIONAL_DEX_PIDGEOT, - NATIONAL_DEX_PIDGEOTTO, - NATIONAL_DEX_PIDGEY, - NATIONAL_DEX_PIDOVE, - NATIONAL_DEX_PIGNITE, - NATIONAL_DEX_PIKACHU, - NATIONAL_DEX_PIKIPEK, - NATIONAL_DEX_PILOSWINE, - NATIONAL_DEX_PINECO, - NATIONAL_DEX_PINSIR, - NATIONAL_DEX_PIPLUP, - NATIONAL_DEX_PLUSLE, - NATIONAL_DEX_POIPOLE, - NATIONAL_DEX_POLITOED, - NATIONAL_DEX_POLIWAG, - NATIONAL_DEX_POLIWHIRL, - NATIONAL_DEX_POLIWRATH, - NATIONAL_DEX_PONYTA, - NATIONAL_DEX_POOCHYENA, - NATIONAL_DEX_POPPLIO, - NATIONAL_DEX_PORYGON, - NATIONAL_DEX_PORYGON2, - NATIONAL_DEX_PORYGON_Z, - NATIONAL_DEX_PRIMARINA, - NATIONAL_DEX_PRIMEAPE, - NATIONAL_DEX_PRINPLUP, - NATIONAL_DEX_PROBOPASS, - NATIONAL_DEX_PSYDUCK, - NATIONAL_DEX_PUMPKABOO, - NATIONAL_DEX_PUPITAR, - NATIONAL_DEX_PURRLOIN, - NATIONAL_DEX_PURUGLY, - NATIONAL_DEX_PYROAR, - NATIONAL_DEX_PYUKUMUKU, - NATIONAL_DEX_QUAGSIRE, - NATIONAL_DEX_QUILAVA, - NATIONAL_DEX_QUILLADIN, - NATIONAL_DEX_QWILFISH, - NATIONAL_DEX_RAICHU, - NATIONAL_DEX_RAIKOU, - NATIONAL_DEX_RALTS, - NATIONAL_DEX_RAMPARDOS, - NATIONAL_DEX_RAPIDASH, - NATIONAL_DEX_RATICATE, - NATIONAL_DEX_RATTATA, - NATIONAL_DEX_RAYQUAZA, - NATIONAL_DEX_REGICE, - NATIONAL_DEX_REGIGIGAS, - NATIONAL_DEX_REGIROCK, - NATIONAL_DEX_REGISTEEL, - NATIONAL_DEX_RELICANTH, - NATIONAL_DEX_REMORAID, - NATIONAL_DEX_RESHIRAM, - NATIONAL_DEX_REUNICLUS, - NATIONAL_DEX_RHYDON, - NATIONAL_DEX_RHYHORN, - NATIONAL_DEX_RHYPERIOR, - NATIONAL_DEX_RIBOMBEE, - NATIONAL_DEX_RIOLU, - NATIONAL_DEX_ROCKRUFF, - NATIONAL_DEX_ROGGENROLA, - NATIONAL_DEX_ROSELIA, - NATIONAL_DEX_ROSERADE, - NATIONAL_DEX_ROTOM, - NATIONAL_DEX_ROWLET, - NATIONAL_DEX_RUFFLET, - NATIONAL_DEX_SABLEYE, - NATIONAL_DEX_SALAMENCE, - NATIONAL_DEX_SALANDIT, - NATIONAL_DEX_SALAZZLE, - NATIONAL_DEX_SAMUROTT, - NATIONAL_DEX_SANDILE, - NATIONAL_DEX_SANDSHREW, - NATIONAL_DEX_SANDSLASH, - NATIONAL_DEX_SANDYGAST, - NATIONAL_DEX_SAWK, - NATIONAL_DEX_SAWSBUCK, - NATIONAL_DEX_SCATTERBUG, - NATIONAL_DEX_SCEPTILE, - NATIONAL_DEX_SCIZOR, - NATIONAL_DEX_SCOLIPEDE, - NATIONAL_DEX_SCRAFTY, - NATIONAL_DEX_SCRAGGY, - NATIONAL_DEX_SCYTHER, - NATIONAL_DEX_SEADRA, - NATIONAL_DEX_SEAKING, - NATIONAL_DEX_SEALEO, - NATIONAL_DEX_SEEDOT, - NATIONAL_DEX_SEEL, - NATIONAL_DEX_SEISMITOAD, - NATIONAL_DEX_SENTRET, - NATIONAL_DEX_SERPERIOR, - NATIONAL_DEX_SERVINE, - NATIONAL_DEX_SEVIPER, - NATIONAL_DEX_SEWADDLE, - NATIONAL_DEX_SHARPEDO, - NATIONAL_DEX_SHAYMIN, - NATIONAL_DEX_SHEDINJA, - NATIONAL_DEX_SHELGON, - NATIONAL_DEX_SHELLDER, - NATIONAL_DEX_SHELLOS, - NATIONAL_DEX_SHELMET, - NATIONAL_DEX_SHIELDON, - NATIONAL_DEX_SHIFTRY, - NATIONAL_DEX_SHIINOTIC, - NATIONAL_DEX_SHINX, - NATIONAL_DEX_SHROOMISH, - NATIONAL_DEX_SHUCKLE, - NATIONAL_DEX_SHUPPET, - NATIONAL_DEX_SIGILYPH, - NATIONAL_DEX_SILCOON, - NATIONAL_DEX_SILVALLY, - NATIONAL_DEX_SIMIPOUR, - NATIONAL_DEX_SIMISAGE, - NATIONAL_DEX_SIMISEAR, - NATIONAL_DEX_SKARMORY, - NATIONAL_DEX_SKIDDO, - NATIONAL_DEX_SKIPLOOM, - NATIONAL_DEX_SKITTY, - NATIONAL_DEX_SKORUPI, - NATIONAL_DEX_SKRELP, - NATIONAL_DEX_SKUNTANK, - NATIONAL_DEX_SLAKING, - NATIONAL_DEX_SLAKOTH, - NATIONAL_DEX_SLIGGOO, - NATIONAL_DEX_SLOWBRO, - NATIONAL_DEX_SLOWKING, - NATIONAL_DEX_SLOWPOKE, - NATIONAL_DEX_SLUGMA, - NATIONAL_DEX_SLURPUFF, - NATIONAL_DEX_SMEARGLE, - NATIONAL_DEX_SMOOCHUM, - NATIONAL_DEX_SNEASEL, - NATIONAL_DEX_SNIVY, - NATIONAL_DEX_SNORLAX, - NATIONAL_DEX_SNORUNT, - NATIONAL_DEX_SNOVER, - NATIONAL_DEX_SNUBBULL, - NATIONAL_DEX_SOLGALEO, - NATIONAL_DEX_SOLOSIS, - NATIONAL_DEX_SOLROCK, - NATIONAL_DEX_SPEAROW, - NATIONAL_DEX_SPEWPA, - NATIONAL_DEX_SPHEAL, - NATIONAL_DEX_SPINARAK, - NATIONAL_DEX_SPINDA, - NATIONAL_DEX_SPIRITOMB, - NATIONAL_DEX_SPOINK, - NATIONAL_DEX_SPRITZEE, - NATIONAL_DEX_SQUIRTLE, - NATIONAL_DEX_STAKATAKA, - NATIONAL_DEX_STANTLER, - NATIONAL_DEX_STARAPTOR, - NATIONAL_DEX_STARAVIA, - NATIONAL_DEX_STARLY, - NATIONAL_DEX_STARMIE, - NATIONAL_DEX_STARYU, - NATIONAL_DEX_STEELIX, - NATIONAL_DEX_STEENEE, - NATIONAL_DEX_STOUTLAND, - NATIONAL_DEX_STUFFUL, - NATIONAL_DEX_STUNFISK, - NATIONAL_DEX_STUNKY, - NATIONAL_DEX_SUDOWOODO, - NATIONAL_DEX_SUICUNE, - NATIONAL_DEX_SUNFLORA, - NATIONAL_DEX_SUNKERN, - NATIONAL_DEX_SURSKIT, - NATIONAL_DEX_SWABLU, - NATIONAL_DEX_SWADLOON, - NATIONAL_DEX_SWALOT, - NATIONAL_DEX_SWAMPERT, - NATIONAL_DEX_SWANNA, - NATIONAL_DEX_SWELLOW, - NATIONAL_DEX_SWINUB, - NATIONAL_DEX_SWIRLIX, - NATIONAL_DEX_SWOOBAT, - NATIONAL_DEX_SYLVEON, - NATIONAL_DEX_TAILLOW, - NATIONAL_DEX_TALONFLAME, - NATIONAL_DEX_TANGELA, - NATIONAL_DEX_TANGROWTH, - NATIONAL_DEX_TAPU_BULU, - NATIONAL_DEX_TAPU_FINI, - NATIONAL_DEX_TAPU_KOKO, - NATIONAL_DEX_TAPU_LELE, - NATIONAL_DEX_TAUROS, - NATIONAL_DEX_TEDDIURSA, - NATIONAL_DEX_TENTACOOL, - NATIONAL_DEX_TENTACRUEL, - NATIONAL_DEX_TEPIG, - NATIONAL_DEX_TERRAKION, - NATIONAL_DEX_THROH, - NATIONAL_DEX_THUNDURUS, - NATIONAL_DEX_TIMBURR, - NATIONAL_DEX_TIRTOUGA, - NATIONAL_DEX_TOGEDEMARU, - NATIONAL_DEX_TOGEKISS, - NATIONAL_DEX_TOGEPI, - NATIONAL_DEX_TOGETIC, - NATIONAL_DEX_TORCHIC, - NATIONAL_DEX_TORKOAL, - NATIONAL_DEX_TORNADUS, - NATIONAL_DEX_TORRACAT, - NATIONAL_DEX_TORTERRA, - NATIONAL_DEX_TOTODILE, - NATIONAL_DEX_TOUCANNON, - NATIONAL_DEX_TOXAPEX, - NATIONAL_DEX_TOXICROAK, - NATIONAL_DEX_TRANQUILL, - NATIONAL_DEX_TRAPINCH, - NATIONAL_DEX_TREECKO, - NATIONAL_DEX_TREVENANT, - NATIONAL_DEX_TROPIUS, - NATIONAL_DEX_TRUBBISH, - NATIONAL_DEX_TRUMBEAK, - NATIONAL_DEX_TSAREENA, - NATIONAL_DEX_TURTONATOR, - NATIONAL_DEX_TURTWIG, - NATIONAL_DEX_TYMPOLE, - NATIONAL_DEX_TYNAMO, - NATIONAL_DEX_TYPE_NULL, - NATIONAL_DEX_TYPHLOSION, - NATIONAL_DEX_TYRANITAR, - NATIONAL_DEX_TYRANTRUM, - NATIONAL_DEX_TYROGUE, - NATIONAL_DEX_TYRUNT, - NATIONAL_DEX_UMBREON, - NATIONAL_DEX_UNFEZANT, - NATIONAL_DEX_UNOWN, - NATIONAL_DEX_URSARING, - NATIONAL_DEX_UXIE, - NATIONAL_DEX_VANILLISH, - NATIONAL_DEX_VANILLITE, - NATIONAL_DEX_VANILLUXE, - NATIONAL_DEX_VAPOREON, - NATIONAL_DEX_VENIPEDE, - NATIONAL_DEX_VENOMOTH, - NATIONAL_DEX_VENONAT, - NATIONAL_DEX_VENUSAUR, - NATIONAL_DEX_VESPIQUEN, - NATIONAL_DEX_VIBRAVA, - NATIONAL_DEX_VICTINI, - NATIONAL_DEX_VICTREEBEL, - NATIONAL_DEX_VIGOROTH, - NATIONAL_DEX_VIKAVOLT, - NATIONAL_DEX_VILEPLUME, - NATIONAL_DEX_VIRIZION, - NATIONAL_DEX_VIVILLON, - NATIONAL_DEX_VOLBEAT, - NATIONAL_DEX_VOLCANION, - NATIONAL_DEX_VOLCARONA, - NATIONAL_DEX_VOLTORB, - NATIONAL_DEX_VULLABY, - NATIONAL_DEX_VULPIX, - NATIONAL_DEX_WAILMER, - NATIONAL_DEX_WAILORD, - NATIONAL_DEX_WALREIN, - NATIONAL_DEX_WARTORTLE, - NATIONAL_DEX_WATCHOG, - NATIONAL_DEX_WEAVILE, - NATIONAL_DEX_WEEDLE, - NATIONAL_DEX_WEEPINBELL, - NATIONAL_DEX_WEEZING, - NATIONAL_DEX_WHIMSICOTT, - NATIONAL_DEX_WHIRLIPEDE, - NATIONAL_DEX_WHISCASH, - NATIONAL_DEX_WHISMUR, - NATIONAL_DEX_WIGGLYTUFF, - NATIONAL_DEX_WIMPOD, - NATIONAL_DEX_WINGULL, - NATIONAL_DEX_WISHIWASHI, - NATIONAL_DEX_WOBBUFFET, - NATIONAL_DEX_WOOBAT, - NATIONAL_DEX_WOOPER, - NATIONAL_DEX_WORMADAM, - NATIONAL_DEX_WURMPLE, - NATIONAL_DEX_WYNAUT, - NATIONAL_DEX_XATU, - NATIONAL_DEX_XERNEAS, - NATIONAL_DEX_XURKITREE, - NATIONAL_DEX_YAMASK, - NATIONAL_DEX_YANMA, - NATIONAL_DEX_YANMEGA, - NATIONAL_DEX_YUNGOOS, - NATIONAL_DEX_YVELTAL, - NATIONAL_DEX_ZANGOOSE, - NATIONAL_DEX_ZAPDOS, - NATIONAL_DEX_ZEBSTRIKA, - NATIONAL_DEX_ZEKROM, - NATIONAL_DEX_ZERAORA, - NATIONAL_DEX_ZIGZAGOON, - NATIONAL_DEX_ZOROARK, - NATIONAL_DEX_ZORUA, - NATIONAL_DEX_ZUBAT, - NATIONAL_DEX_ZWEILOUS, - NATIONAL_DEX_ZYGARDE, + SPECIES_ABOMASNOW, + SPECIES_ABRA, + SPECIES_ABSOL, + SPECIES_ACCELGOR, + SPECIES_AEGISLASH, + SPECIES_AERODACTYL, + SPECIES_AGGRON, + SPECIES_AIPOM, + SPECIES_ALAKAZAM, + SPECIES_ALOMOMOLA, + SPECIES_ALTARIA, + SPECIES_AMAURA, + SPECIES_AMBIPOM, + SPECIES_AMOONGUSS, + SPECIES_AMPHAROS, + SPECIES_ANORITH, + SPECIES_ARAQUANID, + SPECIES_ARBOK, + SPECIES_ARCANINE, + SPECIES_ARCEUS, + SPECIES_ARCHEN, + SPECIES_ARCHEOPS, + SPECIES_ARIADOS, + SPECIES_ARMALDO, + SPECIES_AROMATISSE, + SPECIES_ARON, + SPECIES_ARTICUNO, + SPECIES_AUDINO, + SPECIES_AURORUS, + SPECIES_AVALUGG, + SPECIES_AXEW, + SPECIES_AZELF, + SPECIES_AZUMARILL, + SPECIES_AZURILL, + SPECIES_BAGON, + SPECIES_BALTOY, + SPECIES_BANETTE, + SPECIES_BARBARACLE, + SPECIES_BARBOACH, + SPECIES_BASCULIN_RED, + SPECIES_BASTIODON, + SPECIES_BAYLEEF, + SPECIES_BEARTIC, + SPECIES_BEAUTIFLY, + SPECIES_BEEDRILL, + SPECIES_BEHEEYEM, + SPECIES_BELDUM, + SPECIES_BELLOSSOM, + SPECIES_BELLSPROUT, + SPECIES_BERGMITE, + SPECIES_BEWEAR, + SPECIES_BIBAREL, + SPECIES_BIDOOF, + SPECIES_BINACLE, + SPECIES_BISHARP, + SPECIES_BLACEPHALON, + SPECIES_BLASTOISE, + SPECIES_BLAZIKEN, + SPECIES_BLISSEY, + SPECIES_BLITZLE, + SPECIES_BOLDORE, + SPECIES_BONSLY, + SPECIES_BOUFFALANT, + SPECIES_BOUNSWEET, + SPECIES_BRAIXEN, + SPECIES_BRAVIARY, + SPECIES_BRELOOM, + SPECIES_BRIONNE, + SPECIES_BRONZONG, + SPECIES_BRONZOR, + SPECIES_BRUXISH, + SPECIES_BUDEW, + SPECIES_BUIZEL, + SPECIES_BULBASAUR, + SPECIES_BUNEARY, + SPECIES_BUNNELBY, + SPECIES_BURMY, + SPECIES_BUTTERFREE, + SPECIES_BUZZWOLE, + SPECIES_CACNEA, + SPECIES_CACTURNE, + SPECIES_CAMERUPT, + SPECIES_CARBINK, + SPECIES_CARNIVINE, + SPECIES_CARRACOSTA, + SPECIES_CARVANHA, + SPECIES_CASCOON, + SPECIES_CASTFORM, + SPECIES_CATERPIE, + SPECIES_CELEBI, + SPECIES_CELESTEELA, + SPECIES_CHANDELURE, + SPECIES_CHANSEY, + SPECIES_CHARIZARD, + SPECIES_CHARJABUG, + SPECIES_CHARMANDER, + SPECIES_CHARMELEON, + SPECIES_CHATOT, + SPECIES_CHERRIM, + SPECIES_CHERUBI, + SPECIES_CHESNAUGHT, + SPECIES_CHESPIN, + SPECIES_CHIKORITA, + SPECIES_CHIMCHAR, + SPECIES_CHIMECHO, + SPECIES_CHINCHOU, + SPECIES_CHINGLING, + SPECIES_CINCCINO, + SPECIES_CLAMPERL, + SPECIES_CLAUNCHER, + SPECIES_CLAWITZER, + SPECIES_CLAYDOL, + SPECIES_CLEFABLE, + SPECIES_CLEFAIRY, + SPECIES_CLEFFA, + SPECIES_CLOYSTER, + SPECIES_COBALION, + SPECIES_COFAGRIGUS, + SPECIES_COMBEE, + SPECIES_COMBUSKEN, + SPECIES_COMFEY, + SPECIES_CONKELDURR, + SPECIES_CORPHISH, + SPECIES_CORSOLA, + SPECIES_COSMOEM, + SPECIES_COSMOG, + SPECIES_COTTONEE, + SPECIES_CRABOMINABLE, + SPECIES_CRABRAWLER, + SPECIES_CRADILY, + SPECIES_CRANIDOS, + SPECIES_CRAWDAUNT, + SPECIES_CRESSELIA, + SPECIES_CROAGUNK, + SPECIES_CROBAT, + SPECIES_CROCONAW, + SPECIES_CRUSTLE, + SPECIES_CRYOGONAL, + SPECIES_CUBCHOO, + SPECIES_CUBONE, + SPECIES_CUTIEFLY, + SPECIES_CYNDAQUIL, + SPECIES_DARKRAI, + SPECIES_DARMANITAN, + SPECIES_DARTRIX, + SPECIES_DARUMAKA, + SPECIES_DECIDUEYE, + SPECIES_DEDENNE, + SPECIES_DEERLING, + SPECIES_DEINO, + SPECIES_DELCATTY, + SPECIES_DELIBIRD, + SPECIES_DELPHOX, + SPECIES_DEOXYS, + SPECIES_DEWGONG, + SPECIES_DEWOTT, + SPECIES_DEWPIDER, + SPECIES_DHELMISE, + SPECIES_DIALGA, + SPECIES_DIANCIE, + SPECIES_DIGGERSBY, + SPECIES_DIGLETT, + SPECIES_DITTO, + SPECIES_DODRIO, + SPECIES_DODUO, + SPECIES_DONPHAN, + SPECIES_DOUBLADE, + SPECIES_DRAGALGE, + SPECIES_DRAGONAIR, + SPECIES_DRAGONITE, + SPECIES_DRAMPA, + SPECIES_DRAPION, + SPECIES_DRATINI, + SPECIES_DRIFBLIM, + SPECIES_DRIFLOON, + SPECIES_DRILBUR, + SPECIES_DROWZEE, + SPECIES_DRUDDIGON, + SPECIES_DUCKLETT, + SPECIES_DUGTRIO, + SPECIES_DUNSPARCE, + SPECIES_DUOSION, + SPECIES_DURANT, + SPECIES_DUSCLOPS, + SPECIES_DUSKNOIR, + SPECIES_DUSKULL, + SPECIES_DUSTOX, + SPECIES_DWEBBLE, + SPECIES_EELEKTRIK, + SPECIES_EELEKTROSS, + SPECIES_EEVEE, + SPECIES_EKANS, + SPECIES_ELECTABUZZ, + SPECIES_ELECTIVIRE, + SPECIES_ELECTRIKE, + SPECIES_ELECTRODE, + SPECIES_ELEKID, + SPECIES_ELGYEM, + SPECIES_EMBOAR, + SPECIES_EMOLGA, + SPECIES_EMPOLEON, + SPECIES_ENTEI, + SPECIES_ESCAVALIER, + SPECIES_ESPEON, + SPECIES_ESPURR, + SPECIES_EXCADRILL, + SPECIES_EXEGGCUTE, + SPECIES_EXEGGUTOR, + SPECIES_EXPLOUD, + SPECIES_FARFETCHD, + SPECIES_FEAROW, + SPECIES_FEEBAS, + SPECIES_FENNEKIN, + SPECIES_FERALIGATR, + SPECIES_FERROSEED, + SPECIES_FERROTHORN, + SPECIES_FINNEON, + SPECIES_FLAAFFY, + SPECIES_FLABEBE, + SPECIES_FLAREON, + SPECIES_FLETCHINDER, + SPECIES_FLETCHLING, + SPECIES_FLOATZEL, + SPECIES_FLOETTE, + SPECIES_FLORGES, + SPECIES_FLYGON, + SPECIES_FOMANTIS, + SPECIES_FOONGUS, + SPECIES_FORRETRESS, + SPECIES_FRAXURE, + SPECIES_FRILLISH, + SPECIES_FROAKIE, + SPECIES_FROGADIER, + SPECIES_FROSLASS, + SPECIES_FURFROU, + SPECIES_FURRET, + SPECIES_GABITE, + SPECIES_GALLADE, + SPECIES_GALVANTULA, + SPECIES_GARBODOR, + SPECIES_GARCHOMP, + SPECIES_GARDEVOIR, + SPECIES_GASTLY, + SPECIES_GASTRODON, + SPECIES_GENESECT, + SPECIES_GENGAR, + SPECIES_GEODUDE, + SPECIES_GIBLE, + SPECIES_GIGALITH, + SPECIES_GIRAFARIG, + SPECIES_GIRATINA, + SPECIES_GLACEON, + SPECIES_GLALIE, + SPECIES_GLAMEOW, + SPECIES_GLIGAR, + SPECIES_GLISCOR, + SPECIES_GLOOM, + SPECIES_GOGOAT, + SPECIES_GOLBAT, + SPECIES_GOLDEEN, + SPECIES_GOLDUCK, + SPECIES_GOLEM, + SPECIES_GOLETT, + SPECIES_GOLISOPOD, + SPECIES_GOLURK, + SPECIES_GOODRA, + SPECIES_GOOMY, + SPECIES_GOREBYSS, + SPECIES_GOTHITA, + SPECIES_GOTHITELLE, + SPECIES_GOTHORITA, + SPECIES_GOURGEIST, + SPECIES_GRANBULL, + SPECIES_GRAVELER, + SPECIES_GRENINJA, + SPECIES_GRIMER, + SPECIES_GROTLE, + SPECIES_GROUDON, + SPECIES_GROVYLE, + SPECIES_GROWLITHE, + SPECIES_GRUBBIN, + SPECIES_GRUMPIG, + SPECIES_GULPIN, + SPECIES_GUMSHOOS, + SPECIES_GURDURR, + SPECIES_GUZZLORD, + SPECIES_GYARADOS, + SPECIES_HAKAMO_O, + SPECIES_HAPPINY, + SPECIES_HARIYAMA, + SPECIES_HAUNTER, + SPECIES_HAWLUCHA, + SPECIES_HAXORUS, + SPECIES_HEATMOR, + SPECIES_HEATRAN, + SPECIES_HELIOLISK, + SPECIES_HELIOPTILE, + SPECIES_HERACROSS, + SPECIES_HERDIER, + SPECIES_HIPPOPOTAS, + SPECIES_HIPPOWDON, + SPECIES_HITMONCHAN, + SPECIES_HITMONLEE, + SPECIES_HITMONTOP, + SPECIES_HONCHKROW, + SPECIES_HONEDGE, + SPECIES_HOOPA, + SPECIES_HOOTHOOT, + SPECIES_HOPPIP, + SPECIES_HORSEA, + SPECIES_HOUNDOOM, + SPECIES_HOUNDOUR, + SPECIES_HO_OH, + SPECIES_HUNTAIL, + SPECIES_HYDREIGON, + SPECIES_HYPNO, + SPECIES_IGGLYBUFF, + SPECIES_ILLUMISE, + SPECIES_INCINEROAR, + SPECIES_INFERNAPE, + SPECIES_INKAY, + SPECIES_IVYSAUR, + SPECIES_JANGMO_O, + SPECIES_JELLICENT, + SPECIES_JIGGLYPUFF, + SPECIES_JIRACHI, + SPECIES_JOLTEON, + SPECIES_JOLTIK, + SPECIES_JUMPLUFF, + SPECIES_JYNX, + SPECIES_KABUTO, + SPECIES_KABUTOPS, + SPECIES_KADABRA, + SPECIES_KAKUNA, + SPECIES_KANGASKHAN, + SPECIES_KARRABLAST, + SPECIES_KARTANA, + SPECIES_KECLEON, + SPECIES_KELDEO, + SPECIES_KINGDRA, + SPECIES_KINGLER, + SPECIES_KIRLIA, + SPECIES_KLANG, + SPECIES_KLEFKI, + SPECIES_KLINK, + SPECIES_KLINKLANG, + SPECIES_KOFFING, + SPECIES_KOMALA, + SPECIES_KOMMO_O, + SPECIES_KRABBY, + SPECIES_KRICKETOT, + SPECIES_KRICKETUNE, + SPECIES_KROKOROK, + SPECIES_KROOKODILE, + SPECIES_KYOGRE, + SPECIES_KYUREM, + SPECIES_LAIRON, + SPECIES_LAMPENT, + SPECIES_LANDORUS, + SPECIES_LANTURN, + SPECIES_LAPRAS, + SPECIES_LARVESTA, + SPECIES_LARVITAR, + SPECIES_LATIAS, + SPECIES_LATIOS, + SPECIES_LEAFEON, + SPECIES_LEAVANNY, + SPECIES_LEDIAN, + SPECIES_LEDYBA, + SPECIES_LICKILICKY, + SPECIES_LICKITUNG, + SPECIES_LIEPARD, + SPECIES_LILEEP, + SPECIES_LILLIGANT, + SPECIES_LILLIPUP, + SPECIES_LINOONE, + SPECIES_LITLEO, + SPECIES_LITTEN, + SPECIES_LITWICK, + SPECIES_LOMBRE, + SPECIES_LOPUNNY, + SPECIES_LOTAD, + SPECIES_LOUDRED, + SPECIES_LUCARIO, + SPECIES_LUDICOLO, + SPECIES_LUGIA, + SPECIES_LUMINEON, + SPECIES_LUNALA, + SPECIES_LUNATONE, + SPECIES_LURANTIS, + SPECIES_LUVDISC, + SPECIES_LUXIO, + SPECIES_LUXRAY, + SPECIES_LYCANROC, + SPECIES_MACHAMP, + SPECIES_MACHOKE, + SPECIES_MACHOP, + SPECIES_MAGBY, + SPECIES_MAGCARGO, + SPECIES_MAGEARNA, + SPECIES_MAGIKARP, + SPECIES_MAGMAR, + SPECIES_MAGMORTAR, + SPECIES_MAGNEMITE, + SPECIES_MAGNETON, + SPECIES_MAGNEZONE, + SPECIES_MAKUHITA, + SPECIES_MALAMAR, + SPECIES_MAMOSWINE, + SPECIES_MANAPHY, + SPECIES_MANDIBUZZ, + SPECIES_MANECTRIC, + SPECIES_MANKEY, + SPECIES_MANTINE, + SPECIES_MANTYKE, + SPECIES_MARACTUS, + SPECIES_MAREANIE, + SPECIES_MAREEP, + SPECIES_MARILL, + SPECIES_MAROWAK, + SPECIES_MARSHADOW, + SPECIES_MARSHTOMP, + SPECIES_MASQUERAIN, + SPECIES_MAWILE, + SPECIES_MEDICHAM, + SPECIES_MEDITITE, + SPECIES_MEGANIUM, + SPECIES_MELMETAL, + SPECIES_MELOETTA, + SPECIES_MELTAN, + SPECIES_MEOWSTIC, + SPECIES_MEOWTH, + SPECIES_MESPRIT, + SPECIES_METAGROSS, + SPECIES_METANG, + SPECIES_METAPOD, + SPECIES_MEW, + SPECIES_MEWTWO, + SPECIES_MIENFOO, + SPECIES_MIENSHAO, + SPECIES_MIGHTYENA, + SPECIES_MILOTIC, + SPECIES_MILTANK, + SPECIES_MIME_JR, + SPECIES_MIMIKYU, + SPECIES_MINCCINO, + SPECIES_MINIOR_SHIELD, + SPECIES_MINUN, + SPECIES_MISDREAVUS, + SPECIES_MISMAGIUS, + SPECIES_MOLTRES, + SPECIES_MONFERNO, + SPECIES_MORELULL, + SPECIES_MOTHIM, + SPECIES_MR_MIME, + SPECIES_MUDBRAY, + SPECIES_MUDKIP, + SPECIES_MUDSDALE, + SPECIES_MUK, + SPECIES_MUNCHLAX, + SPECIES_MUNNA, + SPECIES_MURKROW, + SPECIES_MUSHARNA, + SPECIES_NAGANADEL, + SPECIES_NATU, + SPECIES_NECROZMA, + SPECIES_NIDOKING, + SPECIES_NIDOQUEEN, + SPECIES_NIDORAN_F, + SPECIES_NIDORAN_M, + SPECIES_NIDORINA, + SPECIES_NIDORINO, + SPECIES_NIHILEGO, + SPECIES_NINCADA, + SPECIES_NINETALES, + SPECIES_NINJASK, + SPECIES_NOCTOWL, + SPECIES_NOIBAT, + SPECIES_NOIVERN, + SPECIES_NOSEPASS, + SPECIES_NUMEL, + SPECIES_NUZLEAF, + SPECIES_OCTILLERY, + SPECIES_ODDISH, + SPECIES_OMANYTE, + SPECIES_OMASTAR, + SPECIES_ONIX, + SPECIES_ORANGURU, + SPECIES_ORICORIO, + SPECIES_OSHAWOTT, + SPECIES_PACHIRISU, + SPECIES_PALKIA, + SPECIES_PALOSSAND, + SPECIES_PALPITOAD, + SPECIES_PANCHAM, + SPECIES_PANGORO, + SPECIES_PANPOUR, + SPECIES_PANSAGE, + SPECIES_PANSEAR, + SPECIES_PARAS, + SPECIES_PARASECT, + SPECIES_PASSIMIAN, + SPECIES_PATRAT, + SPECIES_PAWNIARD, + SPECIES_PELIPPER, + SPECIES_PERSIAN, + SPECIES_PETILIL, + SPECIES_PHANPY, + SPECIES_PHANTUMP, + SPECIES_PHEROMOSA, + SPECIES_PHIONE, + SPECIES_PICHU, + SPECIES_PIDGEOT, + SPECIES_PIDGEOTTO, + SPECIES_PIDGEY, + SPECIES_PIDOVE, + SPECIES_PIGNITE, + SPECIES_PIKACHU, + SPECIES_PIKIPEK, + SPECIES_PILOSWINE, + SPECIES_PINECO, + SPECIES_PINSIR, + SPECIES_PIPLUP, + SPECIES_PLUSLE, + SPECIES_POIPOLE, + SPECIES_POLITOED, + SPECIES_POLIWAG, + SPECIES_POLIWHIRL, + SPECIES_POLIWRATH, + SPECIES_PONYTA, + SPECIES_POOCHYENA, + SPECIES_POPPLIO, + SPECIES_PORYGON, + SPECIES_PORYGON2, + SPECIES_PORYGON_Z, + SPECIES_PRIMARINA, + SPECIES_PRIMEAPE, + SPECIES_PRINPLUP, + SPECIES_PROBOPASS, + SPECIES_PSYDUCK, + SPECIES_PUMPKABOO, + SPECIES_PUPITAR, + SPECIES_PURRLOIN, + SPECIES_PURUGLY, + SPECIES_PYROAR, + SPECIES_PYUKUMUKU, + SPECIES_QUAGSIRE, + SPECIES_QUILAVA, + SPECIES_QUILLADIN, + SPECIES_QWILFISH, + SPECIES_RAICHU, + SPECIES_RAIKOU, + SPECIES_RALTS, + SPECIES_RAMPARDOS, + SPECIES_RAPIDASH, + SPECIES_RATICATE, + SPECIES_RATTATA, + SPECIES_RAYQUAZA, + SPECIES_REGICE, + SPECIES_REGIGIGAS, + SPECIES_REGIROCK, + SPECIES_REGISTEEL, + SPECIES_RELICANTH, + SPECIES_REMORAID, + SPECIES_RESHIRAM, + SPECIES_REUNICLUS, + SPECIES_RHYDON, + SPECIES_RHYHORN, + SPECIES_RHYPERIOR, + SPECIES_RIBOMBEE, + SPECIES_RIOLU, + SPECIES_ROCKRUFF, + SPECIES_ROGGENROLA, + SPECIES_ROSELIA, + SPECIES_ROSERADE, + SPECIES_ROTOM, + SPECIES_ROWLET, + SPECIES_RUFFLET, + SPECIES_SABLEYE, + SPECIES_SALAMENCE, + SPECIES_SALANDIT, + SPECIES_SALAZZLE, + SPECIES_SAMUROTT, + SPECIES_SANDILE, + SPECIES_SANDSHREW, + SPECIES_SANDSLASH, + SPECIES_SANDYGAST, + SPECIES_SAWK, + SPECIES_SAWSBUCK, + SPECIES_SCATTERBUG, + SPECIES_SCEPTILE, + SPECIES_SCIZOR, + SPECIES_SCOLIPEDE, + SPECIES_SCRAFTY, + SPECIES_SCRAGGY, + SPECIES_SCYTHER, + SPECIES_SEADRA, + SPECIES_SEAKING, + SPECIES_SEALEO, + SPECIES_SEEDOT, + SPECIES_SEEL, + SPECIES_SEISMITOAD, + SPECIES_SENTRET, + SPECIES_SERPERIOR, + SPECIES_SERVINE, + SPECIES_SEVIPER, + SPECIES_SEWADDLE, + SPECIES_SHARPEDO, + SPECIES_SHAYMIN, + SPECIES_SHEDINJA, + SPECIES_SHELGON, + SPECIES_SHELLDER, + SPECIES_SHELLOS, + SPECIES_SHELMET, + SPECIES_SHIELDON, + SPECIES_SHIFTRY, + SPECIES_SHIINOTIC, + SPECIES_SHINX, + SPECIES_SHROOMISH, + SPECIES_SHUCKLE, + SPECIES_SHUPPET, + SPECIES_SIGILYPH, + SPECIES_SILCOON, + SPECIES_SILVALLY, + SPECIES_SIMIPOUR, + SPECIES_SIMISAGE, + SPECIES_SIMISEAR, + SPECIES_SKARMORY, + SPECIES_SKIDDO, + SPECIES_SKIPLOOM, + SPECIES_SKITTY, + SPECIES_SKORUPI, + SPECIES_SKRELP, + SPECIES_SKUNTANK, + SPECIES_SLAKING, + SPECIES_SLAKOTH, + SPECIES_SLIGGOO, + SPECIES_SLOWBRO, + SPECIES_SLOWKING, + SPECIES_SLOWPOKE, + SPECIES_SLUGMA, + SPECIES_SLURPUFF, + SPECIES_SMEARGLE, + SPECIES_SMOOCHUM, + SPECIES_SNEASEL, + SPECIES_SNIVY, + SPECIES_SNORLAX, + SPECIES_SNORUNT, + SPECIES_SNOVER, + SPECIES_SNUBBULL, + SPECIES_SOLGALEO, + SPECIES_SOLOSIS, + SPECIES_SOLROCK, + SPECIES_SPEAROW, + SPECIES_SPEWPA, + SPECIES_SPHEAL, + SPECIES_SPINARAK, + SPECIES_SPINDA, + SPECIES_SPIRITOMB, + SPECIES_SPOINK, + SPECIES_SPRITZEE, + SPECIES_SQUIRTLE, + SPECIES_STAKATAKA, + SPECIES_STANTLER, + SPECIES_STARAPTOR, + SPECIES_STARAVIA, + SPECIES_STARLY, + SPECIES_STARMIE, + SPECIES_STARYU, + SPECIES_STEELIX, + SPECIES_STEENEE, + SPECIES_STOUTLAND, + SPECIES_STUFFUL, + SPECIES_STUNFISK, + SPECIES_STUNKY, + SPECIES_SUDOWOODO, + SPECIES_SUICUNE, + SPECIES_SUNFLORA, + SPECIES_SUNKERN, + SPECIES_SURSKIT, + SPECIES_SWABLU, + SPECIES_SWADLOON, + SPECIES_SWALOT, + SPECIES_SWAMPERT, + SPECIES_SWANNA, + SPECIES_SWELLOW, + SPECIES_SWINUB, + SPECIES_SWIRLIX, + SPECIES_SWOOBAT, + SPECIES_SYLVEON, + SPECIES_TAILLOW, + SPECIES_TALONFLAME, + SPECIES_TANGELA, + SPECIES_TANGROWTH, + SPECIES_TAPU_BULU, + SPECIES_TAPU_FINI, + SPECIES_TAPU_KOKO, + SPECIES_TAPU_LELE, + SPECIES_TAUROS, + SPECIES_TEDDIURSA, + SPECIES_TENTACOOL, + SPECIES_TENTACRUEL, + SPECIES_TEPIG, + SPECIES_TERRAKION, + SPECIES_THROH, + SPECIES_THUNDURUS, + SPECIES_TIMBURR, + SPECIES_TIRTOUGA, + SPECIES_TOGEDEMARU, + SPECIES_TOGEKISS, + SPECIES_TOGEPI, + SPECIES_TOGETIC, + SPECIES_TORCHIC, + SPECIES_TORKOAL, + SPECIES_TORNADUS, + SPECIES_TORRACAT, + SPECIES_TORTERRA, + SPECIES_TOTODILE, + SPECIES_TOUCANNON, + SPECIES_TOXAPEX, + SPECIES_TOXICROAK, + SPECIES_TRANQUILL, + SPECIES_TRAPINCH, + SPECIES_TREECKO, + SPECIES_TREVENANT, + SPECIES_TROPIUS, + SPECIES_TRUBBISH, + SPECIES_TRUMBEAK, + SPECIES_TSAREENA, + SPECIES_TURTONATOR, + SPECIES_TURTWIG, + SPECIES_TYMPOLE, + SPECIES_TYNAMO, + SPECIES_TYPE_NULL, + SPECIES_TYPHLOSION, + SPECIES_TYRANITAR, + SPECIES_TYRANTRUM, + SPECIES_TYROGUE, + SPECIES_TYRUNT, + SPECIES_UMBREON, + SPECIES_UNFEZANT, + SPECIES_UNOWN, + SPECIES_URSARING, + SPECIES_UXIE, + SPECIES_VANILLISH, + SPECIES_VANILLITE, + SPECIES_VANILLUXE, + SPECIES_VAPOREON, + SPECIES_VENIPEDE, + SPECIES_VENOMOTH, + SPECIES_VENONAT, + SPECIES_VENUSAUR, + SPECIES_VESPIQUEN, + SPECIES_VIBRAVA, + SPECIES_VICTINI, + SPECIES_VICTREEBEL, + SPECIES_VIGOROTH, + SPECIES_VIKAVOLT, + SPECIES_VILEPLUME, + SPECIES_VIRIZION, + SPECIES_VIVILLON, + SPECIES_VOLBEAT, + SPECIES_VOLCANION, + SPECIES_VOLCARONA, + SPECIES_VOLTORB, + SPECIES_VULLABY, + SPECIES_VULPIX, + SPECIES_WAILMER, + SPECIES_WAILORD, + SPECIES_WALREIN, + SPECIES_WARTORTLE, + SPECIES_WATCHOG, + SPECIES_WEAVILE, + SPECIES_WEEDLE, + SPECIES_WEEPINBELL, + SPECIES_WEEZING, + SPECIES_WHIMSICOTT, + SPECIES_WHIRLIPEDE, + SPECIES_WHISCASH, + SPECIES_WHISMUR, + SPECIES_WIGGLYTUFF, + SPECIES_WIMPOD, + SPECIES_WINGULL, + SPECIES_WISHIWASHI, + SPECIES_WOBBUFFET, + SPECIES_WOOBAT, + SPECIES_WOOPER, + SPECIES_WORMADAM, + SPECIES_WURMPLE, + SPECIES_WYNAUT, + SPECIES_XATU, + SPECIES_XERNEAS, + SPECIES_XURKITREE, + SPECIES_YAMASK, + SPECIES_YANMA, + SPECIES_YANMEGA, + SPECIES_YUNGOOS, + SPECIES_YVELTAL, + SPECIES_ZANGOOSE, + SPECIES_ZAPDOS, + SPECIES_ZEBSTRIKA, + SPECIES_ZEKROM, + SPECIES_ZERAORA, + SPECIES_ZIGZAGOON, + SPECIES_ZOROARK, + SPECIES_ZORUA, + SPECIES_ZUBAT, + SPECIES_ZWEILOUS, + SPECIES_ZYGARDE, }; +const u16 gPokedexOrderAlphabeticalCount = ARRAY_COUNT(gPokedexOrder_Alphabetical); + const u16 gPokedexOrder_Weight[] = { - NATIONAL_DEX_GASTLY, - NATIONAL_DEX_HAUNTER, - NATIONAL_DEX_FLABEBE, - NATIONAL_DEX_COSMOG, - NATIONAL_DEX_KARTANA, - NATIONAL_DEX_CUTIEFLY, - NATIONAL_DEX_ROTOM, - NATIONAL_DEX_UXIE, - NATIONAL_DEX_MESPRIT, - NATIONAL_DEX_AZELF, - NATIONAL_DEX_TYNAMO, - NATIONAL_DEX_WISHIWASHI, - NATIONAL_DEX_COMFEY, - NATIONAL_DEX_HOPPIP, - NATIONAL_DEX_SPRITZEE, - NATIONAL_DEX_RIBOMBEE, - NATIONAL_DEX_CHINGLING, - NATIONAL_DEX_COTTONEE, - NATIONAL_DEX_JOLTIK, - NATIONAL_DEX_MIMIKYU, - NATIONAL_DEX_DIGLETT, - NATIONAL_DEX_CASTFORM, - NATIONAL_DEX_FLOETTE, - NATIONAL_DEX_KOFFING, - NATIONAL_DEX_IGGLYBUFF, - NATIONAL_DEX_SKIPLOOM, - NATIONAL_DEX_MISDREAVUS, - NATIONAL_DEX_CHIMECHO, - NATIONAL_DEX_SOLOSIS, - NATIONAL_DEX_FOONGUS, - NATIONAL_DEX_JIRACHI, - NATIONAL_DEX_SHEDINJA, - NATIONAL_DEX_SWABLU, - NATIONAL_DEX_BUDEW, - NATIONAL_DEX_DRIFLOON, - NATIONAL_DEX_PIKIPEK, - NATIONAL_DEX_PYUKUMUKU, - NATIONAL_DEX_MANAPHY, - NATIONAL_DEX_TOGEPI, - NATIONAL_DEX_YAMASK, - NATIONAL_DEX_ROWLET, - NATIONAL_DEX_FOMANTIS, - NATIONAL_DEX_MORELULL, - NATIONAL_DEX_SURSKIT, - NATIONAL_DEX_FLETCHLING, - NATIONAL_DEX_PIDGEY, - NATIONAL_DEX_SUNKERN, - NATIONAL_DEX_POIPOLE, - NATIONAL_DEX_BARBOACH, - NATIONAL_DEX_CHATOT, - NATIONAL_DEX_SPEAROW, - NATIONAL_DEX_PICHU, - NATIONAL_DEX_NATU, - NATIONAL_DEX_AZURILL, - NATIONAL_DEX_ROSELIA, - NATIONAL_DEX_STARLY, - NATIONAL_DEX_HONEDGE, - NATIONAL_DEX_MURKROW, - NATIONAL_DEX_SHAYMIN, - NATIONAL_DEX_PIDOVE, - NATIONAL_DEX_WOOBAT, - NATIONAL_DEX_KRICKETOT, - NATIONAL_DEX_DEDENNE, - NATIONAL_DEX_TAILLOW, - NATIONAL_DEX_SHUPPET, - NATIONAL_DEX_EXEGGCUTE, - NATIONAL_DEX_TORCHIC, - NATIONAL_DEX_SEWADDLE, - NATIONAL_DEX_SCATTERBUG, - NATIONAL_DEX_LOTAD, - NATIONAL_DEX_GOOMY, - NATIONAL_DEX_CATERPIE, - NATIONAL_DEX_CLEFFA, - NATIONAL_DEX_JUMPLUFF, - NATIONAL_DEX_KLEFKI, - NATIONAL_DEX_PHIONE, - NATIONAL_DEX_LITWICK, - NATIONAL_DEX_WEEDLE, - NATIONAL_DEX_TOGETIC, - NATIONAL_DEX_BOUNSWEET, - NATIONAL_DEX_DRATINI, - NATIONAL_DEX_CHERUBI, - NATIONAL_DEX_TOGEDEMARU, - NATIONAL_DEX_BURMY, - NATIONAL_DEX_ORICORIO, - NATIONAL_DEX_RATTATA, - NATIONAL_DEX_ESPURR, - NATIONAL_DEX_SWIRLIX, - NATIONAL_DEX_INKAY, - NATIONAL_DEX_WURMPLE, - NATIONAL_DEX_MASQUERAIN, - NATIONAL_DEX_QWILFISH, - NATIONAL_DEX_PACHIRISU, - NATIONAL_DEX_GLAMEOW, - NATIONAL_DEX_BELLSPROUT, - NATIONAL_DEX_SHELLDER, - NATIONAL_DEX_DITTO, - NATIONAL_DEX_MEW, - NATIONAL_DEX_SEEDOT, - NATIONAL_DEX_VICTINI, - NATIONAL_DEX_DEWPIDER, - NATIONAL_DEX_LILLIPUP, - NATIONAL_DEX_MEOWTH, - NATIONAL_DEX_PLUSLE, - NATIONAL_DEX_MINUN, - NATIONAL_DEX_LITTEN, - NATIONAL_DEX_MISMAGIUS, - NATIONAL_DEX_GRUBBIN, - NATIONAL_DEX_SHROOMISH, - NATIONAL_DEX_TYMPOLE, - NATIONAL_DEX_DOUBLADE, - NATIONAL_DEX_SALANDIT, - NATIONAL_DEX_UNOWN, - NATIONAL_DEX_CORSOLA, - NATIONAL_DEX_CELEBI, - NATIONAL_DEX_TREECKO, - NATIONAL_DEX_SPINDA, - NATIONAL_DEX_EMOLGA, - NATIONAL_DEX_BUNNELBY, - NATIONAL_DEX_SLURPUFF, - NATIONAL_DEX_PUMPKABOO, - NATIONAL_DEX_PIPLUP, - NATIONAL_DEX_VENIPEDE, - NATIONAL_DEX_ODDISH, - NATIONAL_DEX_PARAS, - NATIONAL_DEX_JIGGLYPUFF, - NATIONAL_DEX_NINCADA, - NATIONAL_DEX_COMBEE, - NATIONAL_DEX_BUNEARY, - NATIONAL_DEX_DUCKLETT, - NATIONAL_DEX_VANILLITE, - NATIONAL_DEX_CARBINK, - NATIONAL_DEX_BELLOSSOM, - NATIONAL_DEX_MINCCINO, - NATIONAL_DEX_GOTHITA, - NATIONAL_DEX_OSHAWOTT, - NATIONAL_DEX_KARRABLAST, - NATIONAL_DEX_PIKACHU, - NATIONAL_DEX_MAGNEMITE, - NATIONAL_DEX_SENTRET, - NATIONAL_DEX_SMOOCHUM, - NATIONAL_DEX_HELIOPTILE, - NATIONAL_DEX_YUNGOOS, - NATIONAL_DEX_CHIMCHAR, - NATIONAL_DEX_SHELLOS, - NATIONAL_DEX_WEEPINBELL, - NATIONAL_DEX_CHIKORITA, - NATIONAL_DEX_KRABBY, - NATIONAL_DEX_CUBONE, - NATIONAL_DEX_EEVEE, - NATIONAL_DEX_SWINUB, - NATIONAL_DEX_WORMADAM, - NATIONAL_DEX_MELOETTA, - NATIONAL_DEX_RALTS, - NATIONAL_DEX_WHIMSICOTT, - NATIONAL_DEX_PETILIL, - NATIONAL_DEX_STUFFUL, - NATIONAL_DEX_BULBASAUR, - NATIONAL_DEX_EKANS, - NATIONAL_DEX_NIDORAN_F, - NATIONAL_DEX_FINNEON, - NATIONAL_DEX_FROAKIE, - NATIONAL_DEX_PHANTUMP, - NATIONAL_DEX_CRABRAWLER, - NATIONAL_DEX_PINECO, - NATIONAL_DEX_SWADLOON, - NATIONAL_DEX_SKRELP, - NATIONAL_DEX_FEEBAS, - NATIONAL_DEX_CLEFAIRY, - NATIONAL_DEX_ZUBAT, - NATIONAL_DEX_OMANYTE, - NATIONAL_DEX_CINCCINO, - NATIONAL_DEX_POPPLIO, - NATIONAL_DEX_MUDKIP, - NATIONAL_DEX_SHELMET, - NATIONAL_DEX_MAREEP, - NATIONAL_DEX_SNUBBULL, - NATIONAL_DEX_CYNDAQUIL, - NATIONAL_DEX_HORSEA, - NATIONAL_DEX_DUOSION, - NATIONAL_DEX_PANCHAM, - NATIONAL_DEX_NOIBAT, - NATIONAL_DEX_MAREANIE, - NATIONAL_DEX_MELTAN, - NATIONAL_DEX_SNIVY, - NATIONAL_DEX_STEENEE, - NATIONAL_DEX_CLAUNCHER, - NATIONAL_DEX_SPEWPA, - NATIONAL_DEX_CHARMANDER, - NATIONAL_DEX_SPINARAK, - NATIONAL_DEX_MARILL, - NATIONAL_DEX_SUNFLORA, - NATIONAL_DEX_WOOPER, - NATIONAL_DEX_DRILBUR, - NATIONAL_DEX_CUBCHOO, - NATIONAL_DEX_MEOWSTIC, - NATIONAL_DEX_GLOOM, - NATIONAL_DEX_LUVDISC, - NATIONAL_DEX_TEDDIURSA, - NATIONAL_DEX_DIANCIE, - NATIONAL_DEX_SQUIRTLE, - NATIONAL_DEX_NIDORAN_M, - NATIONAL_DEX_ELGYEM, - NATIONAL_DEX_VULLABY, - NATIONAL_DEX_CHESPIN, - NATIONAL_DEX_HOOPA, - NATIONAL_DEX_ROCKRUFF, - NATIONAL_DEX_CHERRIM, - NATIONAL_DEX_FENNEKIN, - NATIONAL_DEX_WEEZING, - NATIONAL_DEX_TOTODILE, - NATIONAL_DEX_WINGULL, - NATIONAL_DEX_SHINX, - NATIONAL_DEX_ARCHEN, - NATIONAL_DEX_METAPOD, - NATIONAL_DEX_VULPIX, - NATIONAL_DEX_TEPIG, - NATIONAL_DEX_KAKUNA, - NATIONAL_DEX_MAGIKARP, - NATIONAL_DEX_SILCOON, - NATIONAL_DEX_FLORGES, - NATIONAL_DEX_PURRLOIN, - NATIONAL_DEX_TURTWIG, - NATIONAL_DEX_PAWNIARD, - NATIONAL_DEX_GULPIN, - NATIONAL_DEX_VOLTORB, - NATIONAL_DEX_PANSAGE, - NATIONAL_DEX_SWOOBAT, - NATIONAL_DEX_AMOONGUSS, - NATIONAL_DEX_RUFFLET, - NATIONAL_DEX_CHARJABUG, - NATIONAL_DEX_LEDYBA, - NATIONAL_DEX_HOUNDOUR, - NATIONAL_DEX_FROGADIER, - NATIONAL_DEX_SKITTY, - NATIONAL_DEX_SABLEYE, - NATIONAL_DEX_PANSEAR, - NATIONAL_DEX_STUNFISK, - NATIONAL_DEX_MEDITITE, - NATIONAL_DEX_KABUTO, - NATIONAL_DEX_AIPOM, - NATIONAL_DEX_CASCOON, - NATIONAL_DEX_MAWILE, - NATIONAL_DEX_CORPHISH, - NATIONAL_DEX_SHIINOTIC, - NATIONAL_DEX_PATRAT, - NATIONAL_DEX_SCRAGGY, - NATIONAL_DEX_SANDSHREW, - NATIONAL_DEX_WIGGLYTUFF, - NATIONAL_DEX_CHINCHOU, - NATIONAL_DEX_REMORAID, - NATIONAL_DEX_NINJASK, - NATIONAL_DEX_SKORUPI, - NATIONAL_DEX_WIMPOD, - NATIONAL_DEX_POLIWAG, - NATIONAL_DEX_VENOMOTH, - NATIONAL_DEX_ANORITH, - NATIONAL_DEX_BANETTE, - NATIONAL_DEX_TIMBURR, - NATIONAL_DEX_ZORUA, - NATIONAL_DEX_GOURGEIST, - NATIONAL_DEX_IVYSAUR, - NATIONAL_DEX_MIME_JR, - NATIONAL_DEX_LAMPENT, - NATIONAL_DEX_BLACEPHALON, - NATIONAL_DEX_FLAAFFY, - NATIONAL_DEX_PANPOUR, - NATIONAL_DEX_LITLEO, - NATIONAL_DEX_POOCHYENA, - NATIONAL_DEX_DUNSPARCE, - NATIONAL_DEX_WYNAUT, - NATIONAL_DEX_SIGILYPH, - NATIONAL_DEX_GUMSHOOS, - NATIONAL_DEX_GALVANTULA, - NATIONAL_DEX_ROSERADE, - NATIONAL_DEX_DWEBBLE, - NATIONAL_DEX_BRAIXEN, - NATIONAL_DEX_TOXAPEX, - NATIONAL_DEX_HERDIER, - NATIONAL_DEX_TRUMBEAK, - NATIONAL_DEX_FARFETCHD, - NATIONAL_DEX_GOLDEEN, - NATIONAL_DEX_XATU, - NATIONAL_DEX_TRAPINCH, - NATIONAL_DEX_DUSKULL, - NATIONAL_DEX_DRIFBLIM, - NATIONAL_DEX_BONSLY, - NATIONAL_DEX_TRANQUILL, - NATIONAL_DEX_ELECTRIKE, - NATIONAL_DEX_SANDILE, - NATIONAL_DEX_VIBRAVA, - NATIONAL_DEX_VICTREEBEL, - NATIONAL_DEX_STARAVIA, - NATIONAL_DEX_AROMATISSE, - NATIONAL_DEX_BAYLEEF, - NATIONAL_DEX_DELIBIRD, - NATIONAL_DEX_SERVINE, - NATIONAL_DEX_FLETCHINDER, - NATIONAL_DEX_DARTRIX, - NATIONAL_DEX_WHISMUR, - NATIONAL_DEX_LILLIGANT, - NATIONAL_DEX_DRAGONAIR, - NATIONAL_DEX_TIRTOUGA, - NATIONAL_DEX_SNORUNT, - NATIONAL_DEX_PALPITOAD, - NATIONAL_DEX_VIVILLON, - NATIONAL_DEX_DEINO, - NATIONAL_DEX_ZIGZAGOON, - NATIONAL_DEX_SLIGGOO, - NATIONAL_DEX_BRIONNE, - NATIONAL_DEX_VOLBEAT, - NATIONAL_DEX_ILLUMISE, - NATIONAL_DEX_ROGGENROLA, - NATIONAL_DEX_BASCULIN, - NATIONAL_DEX_GOTHORITA, - NATIONAL_DEX_AXEW, - NATIONAL_DEX_RATICATE, - NATIONAL_DEX_LURANTIS, - NATIONAL_DEX_VILEPLUME, - NATIONAL_DEX_TAPU_LELE, - NATIONAL_DEX_FERROSEED, - NATIONAL_DEX_CHARMELEON, - NATIONAL_DEX_GROWLITHE, - NATIONAL_DEX_QUILAVA, - NATIONAL_DEX_BRUXISH, - NATIONAL_DEX_STUNKY, - NATIONAL_DEX_NIDORINO, - NATIONAL_DEX_ABRA, - NATIONAL_DEX_MACHOP, - NATIONAL_DEX_COMBUSKEN, - NATIONAL_DEX_DEERLING, - NATIONAL_DEX_PSYDUCK, - NATIONAL_DEX_SWELLOW, - NATIONAL_DEX_NINETALES, - NATIONAL_DEX_KOMALA, - NATIONAL_DEX_NIDORINA, - NATIONAL_DEX_POLIWHIRL, - NATIONAL_DEX_GEODUDE, - NATIONAL_DEX_BIDOOF, - NATIONAL_DEX_MIENFOO, - NATIONAL_DEX_REUNICLUS, - NATIONAL_DEX_KIRLIA, - NATIONAL_DEX_RIOLU, - NATIONAL_DEX_AMBIPOM, - NATIONAL_DEX_SHUCKLE, - NATIONAL_DEX_GIBLE, - NATIONAL_DEX_LEAVANNY, - NATIONAL_DEX_TAPU_KOKO, - NATIONAL_DEX_ALTARIA, - NATIONAL_DEX_CARVANHA, - NATIONAL_DEX_TYROGUE, - NATIONAL_DEX_KLINK, - NATIONAL_DEX_HELIOLISK, - NATIONAL_DEX_HOOTHOOT, - NATIONAL_DEX_TAPU_FINI, - NATIONAL_DEX_MAGBY, - NATIONAL_DEX_TSAREENA, - NATIONAL_DEX_BALTOY, - NATIONAL_DEX_HAWLUCHA, - NATIONAL_DEX_GROVYLE, - NATIONAL_DEX_KECLEON, - NATIONAL_DEX_MONFERNO, - NATIONAL_DEX_EELEKTRIK, - NATIONAL_DEX_SALAZZLE, - NATIONAL_DEX_MARSHADOW, - NATIONAL_DEX_WARTORTLE, - NATIONAL_DEX_LANTURN, - NATIONAL_DEX_GOREBYSS, - NATIONAL_DEX_PRINPLUP, - NATIONAL_DEX_CROAGUNK, - NATIONAL_DEX_MOTHIM, - NATIONAL_DEX_MUNNA, - NATIONAL_DEX_RELICANTH, - NATIONAL_DEX_ELEKID, - NATIONAL_DEX_SYLVEON, - NATIONAL_DEX_WHISCASH, - NATIONAL_DEX_LILEEP, - NATIONAL_DEX_SLAKOTH, - NATIONAL_DEX_NUMEL, - NATIONAL_DEX_LUMINEON, - NATIONAL_DEX_SWANNA, - NATIONAL_DEX_HAPPINY, - NATIONAL_DEX_JOLTEON, - NATIONAL_DEX_DEWOTT, - NATIONAL_DEX_TALONFLAME, - NATIONAL_DEX_STARAPTOR, - NATIONAL_DEX_SEADRA, - NATIONAL_DEX_FLAREON, - NATIONAL_DEX_CROCONAW, - NATIONAL_DEX_TORRACAT, - NATIONAL_DEX_LYCANROC, - NATIONAL_DEX_PHEROMOSA, - NATIONAL_DEX_AMAURA, - NATIONAL_DEX_ACCELGOR, - NATIONAL_DEX_KRICKETUNE, - NATIONAL_DEX_LEAFEON, - NATIONAL_DEX_GLACEON, - NATIONAL_DEX_TYRUNT, - NATIONAL_DEX_TOUCANNON, - NATIONAL_DEX_ESPEON, - NATIONAL_DEX_FROSLASS, - NATIONAL_DEX_UMBREON, - NATIONAL_DEX_HUNTAIL, - NATIONAL_DEX_CARNIVINE, - NATIONAL_DEX_WATCHOG, - NATIONAL_DEX_HONCHKROW, - NATIONAL_DEX_MANKEY, - NATIONAL_DEX_SNEASEL, - NATIONAL_DEX_MARSHTOMP, - NATIONAL_DEX_NUZLEAF, - NATIONAL_DEX_PELIPPER, - NATIONAL_DEX_SIMISEAR, - NATIONAL_DEX_MARACTUS, - NATIONAL_DEX_FURFROU, - NATIONAL_DEX_BEAUTIFLY, - NATIONAL_DEX_AZUMARILL, - NATIONAL_DEX_WOBBUFFET, - NATIONAL_DEX_OCTILLERY, - NATIONAL_DEX_LARVESTA, - NATIONAL_DEX_VAPOREON, - NATIONAL_DEX_SIMIPOUR, - NATIONAL_DEX_UNFEZANT, - NATIONAL_DEX_QUILLADIN, - NATIONAL_DEX_BEEDRILL, - NATIONAL_DEX_SANDSLASH, - NATIONAL_DEX_PARASECT, - NATIONAL_DEX_BUIZEL, - NATIONAL_DEX_JANGMO_O, - NATIONAL_DEX_BLITZLE, - NATIONAL_DEX_GASTRODON, - NATIONAL_DEX_PIDGEOTTO, - NATIONAL_DEX_RAICHU, - NATIONAL_DEX_VENONAT, - NATIONAL_DEX_PONYTA, - NATIONAL_DEX_GRIMER, - NATIONAL_DEX_MUK, - NATIONAL_DEX_ELECTABUZZ, - NATIONAL_DEX_SCRAFTY, - NATIONAL_DEX_LUXIO, - NATIONAL_DEX_SIMISAGE, - NATIONAL_DEX_SPOINK, - NATIONAL_DEX_DUSCLOPS, - NATIONAL_DEX_AUDINO, - NATIONAL_DEX_TRUBBISH, - NATIONAL_DEX_SKIDDO, - NATIONAL_DEX_BINACLE, - NATIONAL_DEX_MEDICHAM, - NATIONAL_DEX_BIBAREL, - NATIONAL_DEX_CRANIDOS, - NATIONAL_DEX_DUSTOX, - NATIONAL_DEX_ALOMOMOLA, - NATIONAL_DEX_BUTTERFREE, - NATIONAL_DEX_PERSIAN, - NATIONAL_DEX_PRIMEAPE, - NATIONAL_DEX_ARCHEOPS, - NATIONAL_DEX_DROWZEE, - NATIONAL_DEX_FURRET, - NATIONAL_DEX_PORYGON2, - NATIONAL_DEX_LINOONE, - NATIONAL_DEX_LOMBRE, - NATIONAL_DEX_DELCATTY, - NATIONAL_DEX_CRAWDAUNT, - NATIONAL_DEX_ESCAVALIER, - NATIONAL_DEX_FRILLISH, - NATIONAL_DEX_DURANT, - NATIONAL_DEX_DUGTRIO, - NATIONAL_DEX_LOPUNNY, - NATIONAL_DEX_KROKOROK, - NATIONAL_DEX_ARIADOS, - NATIONAL_DEX_PHANPY, - NATIONAL_DEX_FLOATZEL, - NATIONAL_DEX_POLITOED, - NATIONAL_DEX_WEAVILE, - NATIONAL_DEX_PORYGON_Z, - NATIONAL_DEX_CHANDELURE, - NATIONAL_DEX_STARYU, - NATIONAL_DEX_BEHEEYEM, - NATIONAL_DEX_CHANSEY, - NATIONAL_DEX_TANGELA, - NATIONAL_DEX_OMASTAR, - NATIONAL_DEX_SLUGMA, - NATIONAL_DEX_HOUNDOOM, - NATIONAL_DEX_CLAWITZER, - NATIONAL_DEX_MIENSHAO, - NATIONAL_DEX_LEDIAN, - NATIONAL_DEX_SLOWPOKE, - NATIONAL_DEX_FRAXURE, - NATIONAL_DEX_PORYGON, - NATIONAL_DEX_DECIDUEYE, - NATIONAL_DEX_MIGHTYENA, - NATIONAL_DEX_LIEPARD, - NATIONAL_DEX_DARUMAKA, - NATIONAL_DEX_FEAROW, - NATIONAL_DEX_SUDOWOODO, - NATIONAL_DEX_YANMA, - NATIONAL_DEX_SKUNTANK, - NATIONAL_DEX_TOGEKISS, - NATIONAL_DEX_VESPIQUEN, - NATIONAL_DEX_SEAKING, - NATIONAL_DEX_DELPHOX, - NATIONAL_DEX_DODUO, - NATIONAL_DEX_BRELOOM, - NATIONAL_DEX_PIDGEOT, - NATIONAL_DEX_SPHEAL, - NATIONAL_DEX_MANDIBUZZ, - NATIONAL_DEX_CLEFABLE, - NATIONAL_DEX_LATIAS, - NATIONAL_DEX_GURDURR, - NATIONAL_DEX_GRENINJA, - NATIONAL_DEX_MINIOR, - NATIONAL_DEX_MANECTRIC, - NATIONAL_DEX_ZANGOOSE, - NATIONAL_DEX_EXCADRILL, - NATIONAL_DEX_GENGAR, - NATIONAL_DEX_KABUTOPS, - NATIONAL_DEX_LOUDRED, - NATIONAL_DEX_JYNX, - NATIONAL_DEX_NOCTOWL, - NATIONAL_DEX_VANILLISH, - NATIONAL_DEX_BRAVIARY, - NATIONAL_DEX_GIRAFARIG, - NATIONAL_DEX_LUXRAY, - NATIONAL_DEX_BAGON, - NATIONAL_DEX_DIGGERSBY, - NATIONAL_DEX_GLISCOR, - NATIONAL_DEX_PURUGLY, - NATIONAL_DEX_GOTHITELLE, - NATIONAL_DEX_PRIMARINA, - NATIONAL_DEX_TOXICROAK, - NATIONAL_DEX_MAGMAR, - NATIONAL_DEX_ZERAORA, - NATIONAL_DEX_MAROWAK, - NATIONAL_DEX_VIKAVOLT, - NATIONAL_DEX_TENTACOOL, - NATIONAL_DEX_TAPU_BULU, - NATIONAL_DEX_VOLCARONA, - NATIONAL_DEX_VIGOROTH, - NATIONAL_DEX_BLISSEY, - NATIONAL_DEX_ABSOL, - NATIONAL_DEX_MALAMAR, - NATIONAL_DEX_HAKAMO_O, - NATIONAL_DEX_ALAKAZAM, - NATIONAL_DEX_HITMONTOP, - NATIONAL_DEX_GARDEVOIR, - NATIONAL_DEX_KELDEO, - NATIONAL_DEX_GRANBULL, - NATIONAL_DEX_HIPPOPOTAS, - NATIONAL_DEX_HITMONLEE, - NATIONAL_DEX_ZWEILOUS, - NATIONAL_DEX_HITMONCHAN, - NATIONAL_DEX_SKARMORY, - NATIONAL_DEX_SNOVER, - NATIONAL_DEX_DARKRAI, - NATIONAL_DEX_SAWK, - NATIONAL_DEX_KLANG, - NATIONAL_DEX_CACNEA, - NATIONAL_DEX_YANMEGA, - NATIONAL_DEX_BLAZIKEN, - NATIONAL_DEX_GALLADE, - NATIONAL_DEX_SCEPTILE, - NATIONAL_DEX_SEVIPER, - NATIONAL_DEX_CLAMPERL, - NATIONAL_DEX_ZAPDOS, - NATIONAL_DEX_AEGISLASH, - NATIONAL_DEX_POLIWRATH, - NATIONAL_DEX_HERACROSS, - NATIONAL_DEX_LUCARIO, - NATIONAL_DEX_MR_MIME, - NATIONAL_DEX_GOLBAT, - NATIONAL_DEX_TENTACRUEL, - NATIONAL_DEX_PINSIR, - NATIONAL_DEX_MAGCARGO, - NATIONAL_DEX_LUDICOLO, - NATIONAL_DEX_INFERNAPE, - NATIONAL_DEX_ARTICUNO, - NATIONAL_DEX_PIGNITE, - NATIONAL_DEX_THROH, - NATIONAL_DEX_NIHILEGO, - NATIONAL_DEX_PILOSWINE, - NATIONAL_DEX_SCYTHER, - NATIONAL_DEX_GABITE, - NATIONAL_DEX_KADABRA, - NATIONAL_DEX_SHIELDON, - NATIONAL_DEX_VANILLUXE, - NATIONAL_DEX_SMEARGLE, - NATIONAL_DEX_HEATMOR, - NATIONAL_DEX_WHIRLIPEDE, - NATIONAL_DEX_AERODACTYL, - NATIONAL_DEX_SHIFTRY, - NATIONAL_DEX_NIDOQUEEN, - NATIONAL_DEX_MAGNETON, - NATIONAL_DEX_KINGLER, - NATIONAL_DEX_MOLTRES, - NATIONAL_DEX_ARON, - NATIONAL_DEX_LATIOS, - NATIONAL_DEX_CRADILY, - NATIONAL_DEX_BRONZOR, - NATIONAL_DEX_MUSHARNA, - NATIONAL_DEX_DEOXYS, - NATIONAL_DEX_STOUTLAND, - NATIONAL_DEX_THUNDURUS, - NATIONAL_DEX_AMPHAROS, - NATIONAL_DEX_DRAPION, - NATIONAL_DEX_NIDOKING, - NATIONAL_DEX_SEISMITOAD, - NATIONAL_DEX_SERPERIOR, - NATIONAL_DEX_TORNADUS, - NATIONAL_DEX_GLIGAR, - NATIONAL_DEX_ARBOK, - NATIONAL_DEX_MANTYKE, - NATIONAL_DEX_LICKITUNG, - NATIONAL_DEX_ELECTRODE, - NATIONAL_DEX_MAGMORTAR, - NATIONAL_DEX_LANDORUS, - NATIONAL_DEX_ARMALDO, - NATIONAL_DEX_BISHARP, - NATIONAL_DEX_SANDYGAST, - NATIONAL_DEX_MACHOKE, - NATIONAL_DEX_TREVENANT, - NATIONAL_DEX_STANTLER, - NATIONAL_DEX_GRUMPIG, - NATIONAL_DEX_LARVITAR, - NATIONAL_DEX_CROBAT, - NATIONAL_DEX_QUAGSIRE, - NATIONAL_DEX_MILTANK, - NATIONAL_DEX_HYPNO, - NATIONAL_DEX_ORANGURU, - NATIONAL_DEX_COFAGRIGUS, - NATIONAL_DEX_GOLDUCK, - NATIONAL_DEX_CACTURNE, - NATIONAL_DEX_KOMMO_O, - NATIONAL_DEX_SLOWBRO, - NATIONAL_DEX_TYPHLOSION, - NATIONAL_DEX_SLOWKING, - NATIONAL_DEX_ZEBSTRIKA, - NATIONAL_DEX_KANGASKHAN, - NATIONAL_DEX_STARMIE, - NATIONAL_DEX_SWALOT, - NATIONAL_DEX_TORKOAL, - NATIONAL_DEX_EELEKTROSS, - NATIONAL_DEX_MAGEARNA, - NATIONAL_DEX_CARRACOSTA, - NATIONAL_DEX_KLINKLANG, - NATIONAL_DEX_ZOROARK, - NATIONAL_DEX_PYROAR, - NATIONAL_DEX_DRAGALGE, - NATIONAL_DEX_SWAMPERT, - NATIONAL_DEX_FLYGON, - NATIONAL_DEX_ARAQUANID, - NATIONAL_DEX_GENESECT, - NATIONAL_DEX_PASSIMIAN, - NATIONAL_DEX_INCINEROAR, - NATIONAL_DEX_EXPLOUD, - NATIONAL_DEX_EMPOLEON, - NATIONAL_DEX_NOIVERN, - NATIONAL_DEX_DODRIO, - NATIONAL_DEX_BLASTOISE, - NATIONAL_DEX_CRESSELIA, - NATIONAL_DEX_MAKUHITA, - NATIONAL_DEX_CONKELDURR, - NATIONAL_DEX_SEALEO, - NATIONAL_DEX_TAUROS, - NATIONAL_DEX_FERALIGATR, - NATIONAL_DEX_SHARPEDO, - NATIONAL_DEX_SEEL, - NATIONAL_DEX_CHESNAUGHT, - NATIONAL_DEX_CHARIZARD, - NATIONAL_DEX_GOGOAT, - NATIONAL_DEX_GOLETT, - NATIONAL_DEX_SAWSBUCK, - NATIONAL_DEX_DARMANITAN, - NATIONAL_DEX_SAMUROTT, - NATIONAL_DEX_BOUFFALANT, - NATIONAL_DEX_RAPIDASH, - NATIONAL_DEX_GARCHOMP, - NATIONAL_DEX_BELDUM, - NATIONAL_DEX_BARBARACLE, - NATIONAL_DEX_KROOKODILE, - NATIONAL_DEX_NOSEPASS, - NATIONAL_DEX_GROTLE, - NATIONAL_DEX_BERGMITE, - NATIONAL_DEX_VENUSAUR, - NATIONAL_DEX_TROPIUS, - NATIONAL_DEX_XURKITREE, - NATIONAL_DEX_MEGANIUM, - NATIONAL_DEX_SILVALLY, - NATIONAL_DEX_BOLDORE, - NATIONAL_DEX_RAMPARDOS, - NATIONAL_DEX_SALAMENCE, - NATIONAL_DEX_GRAVELER, - NATIONAL_DEX_MUNCHLAX, - NATIONAL_DEX_HAXORUS, - NATIONAL_DEX_DUSKNOIR, - NATIONAL_DEX_GARBODOR, - NATIONAL_DEX_CLAYDOL, - NATIONAL_DEX_SPIRITOMB, - NATIONAL_DEX_GOLISOPOD, - NATIONAL_DEX_FERROTHORN, - NATIONAL_DEX_MUDBRAY, - NATIONAL_DEX_SHELGON, - NATIONAL_DEX_RHYHORN, - NATIONAL_DEX_SCIZOR, - NATIONAL_DEX_DEWGONG, - NATIONAL_DEX_EXEGGUTOR, - NATIONAL_DEX_RHYDON, - NATIONAL_DEX_DONPHAN, - NATIONAL_DEX_LAIRON, - NATIONAL_DEX_LUNALA, - NATIONAL_DEX_TYPE_NULL, - NATIONAL_DEX_MEWTWO, - NATIONAL_DEX_FORRETRESS, - NATIONAL_DEX_URSARING, - NATIONAL_DEX_TANGROWTH, - NATIONAL_DEX_MACHAMP, - NATIONAL_DEX_WAILMER, - NATIONAL_DEX_SLAKING, - NATIONAL_DEX_CLOYSTER, - NATIONAL_DEX_JELLICENT, - NATIONAL_DEX_BEWEAR, - NATIONAL_DEX_ABOMASNOW, - NATIONAL_DEX_PANGORO, - NATIONAL_DEX_ELECTIVIRE, - NATIONAL_DEX_DRUDDIGON, - NATIONAL_DEX_LICKILICKY, - NATIONAL_DEX_CRYOGONAL, - NATIONAL_DEX_BASTIODON, - NATIONAL_DEX_EMBOAR, - NATIONAL_DEX_NAGANADEL, - NATIONAL_DEX_GOODRA, - NATIONAL_DEX_WALREIN, - NATIONAL_DEX_KINGDRA, - NATIONAL_DEX_PUPITAR, - NATIONAL_DEX_SOLROCK, - NATIONAL_DEX_ARCANINE, - NATIONAL_DEX_HYDREIGON, - NATIONAL_DEX_MILOTIC, - NATIONAL_DEX_LUNATONE, - NATIONAL_DEX_REGICE, - NATIONAL_DEX_RAIKOU, - NATIONAL_DEX_MAGNEZONE, - NATIONAL_DEX_CRABOMINABLE, - NATIONAL_DEX_DRAMPA, - NATIONAL_DEX_SUICUNE, - NATIONAL_DEX_BRONZONG, - NATIONAL_DEX_VOLCANION, - NATIONAL_DEX_ENTEI, - NATIONAL_DEX_HO_OH, - NATIONAL_DEX_CRUSTLE, - NATIONAL_DEX_VIRIZION, - NATIONAL_DEX_SCOLIPEDE, - NATIONAL_DEX_TYRANITAR, - NATIONAL_DEX_METANG, - NATIONAL_DEX_YVELTAL, - NATIONAL_DEX_REGISTEEL, - NATIONAL_DEX_RAYQUAZA, - NATIONAL_DEX_ONIX, - NATIONAL_DEX_DRAGONITE, - NATIONAL_DEX_DHELMISE, - NATIONAL_DEX_TURTONATOR, - NATIONAL_DEX_XERNEAS, - NATIONAL_DEX_LUGIA, - NATIONAL_DEX_LAPRAS, - NATIONAL_DEX_MANTINE, - NATIONAL_DEX_CAMERUPT, - NATIONAL_DEX_AURORUS, - NATIONAL_DEX_REGIROCK, - NATIONAL_DEX_SOLGALEO, - NATIONAL_DEX_NECROZMA, - NATIONAL_DEX_GYARADOS, - NATIONAL_DEX_COBALION, - NATIONAL_DEX_PALOSSAND, - NATIONAL_DEX_HARIYAMA, - NATIONAL_DEX_GLALIE, - NATIONAL_DEX_GIGALITH, - NATIONAL_DEX_BEARTIC, - NATIONAL_DEX_TERRAKION, - NATIONAL_DEX_TYRANTRUM, - NATIONAL_DEX_RHYPERIOR, - NATIONAL_DEX_MAMOSWINE, - NATIONAL_DEX_GOLEM, - NATIONAL_DEX_HIPPOWDON, - NATIONAL_DEX_ZYGARDE, - NATIONAL_DEX_TORTERRA, - NATIONAL_DEX_ARCEUS, - NATIONAL_DEX_KYUREM, - NATIONAL_DEX_GOLURK, - NATIONAL_DEX_RESHIRAM, - NATIONAL_DEX_BUZZWOLE, - NATIONAL_DEX_PALKIA, - NATIONAL_DEX_PROBOPASS, - NATIONAL_DEX_ZEKROM, - NATIONAL_DEX_KYOGRE, - NATIONAL_DEX_AGGRON, - NATIONAL_DEX_WAILORD, - NATIONAL_DEX_STEELIX, - NATIONAL_DEX_REGIGIGAS, - NATIONAL_DEX_HEATRAN, - NATIONAL_DEX_SNORLAX, - NATIONAL_DEX_AVALUGG, - NATIONAL_DEX_METAGROSS, - NATIONAL_DEX_DIALGA, - NATIONAL_DEX_GIRATINA, - NATIONAL_DEX_MELMETAL, - NATIONAL_DEX_STAKATAKA, - NATIONAL_DEX_GUZZLORD, - NATIONAL_DEX_MUDSDALE, - NATIONAL_DEX_GROUDON, - NATIONAL_DEX_COSMOEM, - NATIONAL_DEX_CELESTEELA, + SPECIES_GASTLY, + SPECIES_HAUNTER, + SPECIES_FLABEBE, + SPECIES_COSMOG, + SPECIES_KARTANA, + SPECIES_CUTIEFLY, + SPECIES_ROTOM, + SPECIES_UXIE, + SPECIES_MESPRIT, + SPECIES_AZELF, + SPECIES_TYNAMO, + SPECIES_WISHIWASHI, + SPECIES_COMFEY, + SPECIES_HOPPIP, + SPECIES_SPRITZEE, + SPECIES_RIBOMBEE, + SPECIES_CHINGLING, + SPECIES_COTTONEE, + SPECIES_JOLTIK, + SPECIES_MIMIKYU, + SPECIES_DIGLETT, + SPECIES_CASTFORM, + SPECIES_FLOETTE, + SPECIES_KOFFING, + SPECIES_IGGLYBUFF, + SPECIES_SKIPLOOM, + SPECIES_MISDREAVUS, + SPECIES_CHIMECHO, + SPECIES_SOLOSIS, + SPECIES_FOONGUS, + SPECIES_JIRACHI, + SPECIES_SHEDINJA, + SPECIES_SWABLU, + SPECIES_BUDEW, + SPECIES_DRIFLOON, + SPECIES_PIKIPEK, + SPECIES_PYUKUMUKU, + SPECIES_MANAPHY, + SPECIES_TOGEPI, + SPECIES_YAMASK, + SPECIES_ROWLET, + SPECIES_FOMANTIS, + SPECIES_MORELULL, + SPECIES_SURSKIT, + SPECIES_FLETCHLING, + SPECIES_PIDGEY, + SPECIES_SUNKERN, + SPECIES_POIPOLE, + SPECIES_BARBOACH, + SPECIES_CHATOT, + SPECIES_SPEAROW, + SPECIES_PICHU, + SPECIES_NATU, + SPECIES_AZURILL, + SPECIES_ROSELIA, + SPECIES_STARLY, + SPECIES_HONEDGE, + SPECIES_MURKROW, + SPECIES_SHAYMIN, + SPECIES_PIDOVE, + SPECIES_WOOBAT, + SPECIES_KRICKETOT, + SPECIES_DEDENNE, + SPECIES_TAILLOW, + SPECIES_SHUPPET, + SPECIES_EXEGGCUTE, + SPECIES_TORCHIC, + SPECIES_SEWADDLE, + SPECIES_SCATTERBUG, + SPECIES_LOTAD, + SPECIES_GOOMY, + SPECIES_CATERPIE, + SPECIES_CLEFFA, + SPECIES_JUMPLUFF, + SPECIES_KLEFKI, + SPECIES_PHIONE, + SPECIES_LITWICK, + SPECIES_WEEDLE, + SPECIES_TOGETIC, + SPECIES_BOUNSWEET, + SPECIES_DRATINI, + SPECIES_CHERUBI, + SPECIES_TOGEDEMARU, + SPECIES_BURMY, + SPECIES_ORICORIO, + SPECIES_RATTATA, + SPECIES_ESPURR, + SPECIES_SWIRLIX, + SPECIES_INKAY, + SPECIES_WURMPLE, + SPECIES_MASQUERAIN, + SPECIES_QWILFISH, + SPECIES_PACHIRISU, + SPECIES_GLAMEOW, + SPECIES_BELLSPROUT, + SPECIES_SHELLDER, + SPECIES_DITTO, + SPECIES_MEW, + SPECIES_SEEDOT, + SPECIES_VICTINI, + SPECIES_DEWPIDER, + SPECIES_LILLIPUP, + SPECIES_MEOWTH, + SPECIES_PLUSLE, + SPECIES_MINUN, + SPECIES_LITTEN, + SPECIES_MISMAGIUS, + SPECIES_GRUBBIN, + SPECIES_SHROOMISH, + SPECIES_TYMPOLE, + SPECIES_DOUBLADE, + SPECIES_SALANDIT, + SPECIES_UNOWN, + SPECIES_CORSOLA, + SPECIES_CELEBI, + SPECIES_TREECKO, + SPECIES_SPINDA, + SPECIES_EMOLGA, + SPECIES_BUNNELBY, + SPECIES_SLURPUFF, + SPECIES_PUMPKABOO, + SPECIES_PIPLUP, + SPECIES_VENIPEDE, + SPECIES_ODDISH, + SPECIES_PARAS, + SPECIES_JIGGLYPUFF, + SPECIES_NINCADA, + SPECIES_COMBEE, + SPECIES_BUNEARY, + SPECIES_DUCKLETT, + SPECIES_VANILLITE, + SPECIES_CARBINK, + SPECIES_BELLOSSOM, + SPECIES_MINCCINO, + SPECIES_GOTHITA, + SPECIES_OSHAWOTT, + SPECIES_KARRABLAST, + SPECIES_PIKACHU, + SPECIES_MAGNEMITE, + SPECIES_SENTRET, + SPECIES_SMOOCHUM, + SPECIES_HELIOPTILE, + SPECIES_YUNGOOS, + SPECIES_CHIMCHAR, + SPECIES_SHELLOS, + SPECIES_WEEPINBELL, + SPECIES_CHIKORITA, + SPECIES_KRABBY, + SPECIES_CUBONE, + SPECIES_EEVEE, + SPECIES_SWINUB, + SPECIES_WORMADAM, + SPECIES_MELOETTA, + SPECIES_RALTS, + SPECIES_WHIMSICOTT, + SPECIES_PETILIL, + SPECIES_STUFFUL, + SPECIES_BULBASAUR, + SPECIES_EKANS, + SPECIES_NIDORAN_F, + SPECIES_FINNEON, + SPECIES_FROAKIE, + SPECIES_PHANTUMP, + SPECIES_CRABRAWLER, + SPECIES_PINECO, + SPECIES_SWADLOON, + SPECIES_SKRELP, + SPECIES_FEEBAS, + SPECIES_CLEFAIRY, + SPECIES_ZUBAT, + SPECIES_OMANYTE, + SPECIES_CINCCINO, + SPECIES_POPPLIO, + SPECIES_MUDKIP, + SPECIES_SHELMET, + SPECIES_MAREEP, + SPECIES_SNUBBULL, + SPECIES_CYNDAQUIL, + SPECIES_HORSEA, + SPECIES_DUOSION, + SPECIES_PANCHAM, + SPECIES_NOIBAT, + SPECIES_MAREANIE, + SPECIES_MELTAN, + SPECIES_SNIVY, + SPECIES_STEENEE, + SPECIES_CLAUNCHER, + SPECIES_SPEWPA, + SPECIES_CHARMANDER, + SPECIES_SPINARAK, + SPECIES_MARILL, + SPECIES_SUNFLORA, + SPECIES_WOOPER, + SPECIES_DRILBUR, + SPECIES_CUBCHOO, + SPECIES_MEOWSTIC, + SPECIES_GLOOM, + SPECIES_LUVDISC, + SPECIES_TEDDIURSA, + SPECIES_DIANCIE, + SPECIES_SQUIRTLE, + SPECIES_NIDORAN_M, + SPECIES_ELGYEM, + SPECIES_VULLABY, + SPECIES_CHESPIN, + SPECIES_HOOPA, + SPECIES_ROCKRUFF, + SPECIES_CHERRIM, + SPECIES_FENNEKIN, + SPECIES_WEEZING, + SPECIES_TOTODILE, + SPECIES_WINGULL, + SPECIES_SHINX, + SPECIES_ARCHEN, + SPECIES_METAPOD, + SPECIES_VULPIX, + SPECIES_TEPIG, + SPECIES_KAKUNA, + SPECIES_MAGIKARP, + SPECIES_SILCOON, + SPECIES_FLORGES, + SPECIES_PURRLOIN, + SPECIES_TURTWIG, + SPECIES_PAWNIARD, + SPECIES_GULPIN, + SPECIES_VOLTORB, + SPECIES_PANSAGE, + SPECIES_SWOOBAT, + SPECIES_AMOONGUSS, + SPECIES_RUFFLET, + SPECIES_CHARJABUG, + SPECIES_LEDYBA, + SPECIES_HOUNDOUR, + SPECIES_FROGADIER, + SPECIES_SKITTY, + SPECIES_SABLEYE, + SPECIES_PANSEAR, + SPECIES_STUNFISK, + SPECIES_MEDITITE, + SPECIES_KABUTO, + SPECIES_AIPOM, + SPECIES_CASCOON, + SPECIES_MAWILE, + SPECIES_CORPHISH, + SPECIES_SHIINOTIC, + SPECIES_PATRAT, + SPECIES_SCRAGGY, + SPECIES_SANDSHREW, + SPECIES_WIGGLYTUFF, + SPECIES_CHINCHOU, + SPECIES_REMORAID, + SPECIES_NINJASK, + SPECIES_SKORUPI, + SPECIES_WIMPOD, + SPECIES_POLIWAG, + SPECIES_VENOMOTH, + SPECIES_ANORITH, + SPECIES_BANETTE, + SPECIES_TIMBURR, + SPECIES_ZORUA, + SPECIES_GOURGEIST, + SPECIES_IVYSAUR, + SPECIES_MIME_JR, + SPECIES_LAMPENT, + SPECIES_BLACEPHALON, + SPECIES_FLAAFFY, + SPECIES_PANPOUR, + SPECIES_LITLEO, + SPECIES_POOCHYENA, + SPECIES_DUNSPARCE, + SPECIES_WYNAUT, + SPECIES_SIGILYPH, + SPECIES_GUMSHOOS, + SPECIES_GALVANTULA, + SPECIES_ROSERADE, + SPECIES_DWEBBLE, + SPECIES_BRAIXEN, + SPECIES_TOXAPEX, + SPECIES_HERDIER, + SPECIES_TRUMBEAK, + SPECIES_FARFETCHD, + SPECIES_GOLDEEN, + SPECIES_XATU, + SPECIES_TRAPINCH, + SPECIES_DUSKULL, + SPECIES_DRIFBLIM, + SPECIES_BONSLY, + SPECIES_TRANQUILL, + SPECIES_ELECTRIKE, + SPECIES_SANDILE, + SPECIES_VIBRAVA, + SPECIES_VICTREEBEL, + SPECIES_STARAVIA, + SPECIES_AROMATISSE, + SPECIES_BAYLEEF, + SPECIES_DELIBIRD, + SPECIES_SERVINE, + SPECIES_FLETCHINDER, + SPECIES_DARTRIX, + SPECIES_WHISMUR, + SPECIES_LILLIGANT, + SPECIES_DRAGONAIR, + SPECIES_TIRTOUGA, + SPECIES_SNORUNT, + SPECIES_PALPITOAD, + SPECIES_VIVILLON, + SPECIES_DEINO, + SPECIES_ZIGZAGOON, + SPECIES_SLIGGOO, + SPECIES_BRIONNE, + SPECIES_VOLBEAT, + SPECIES_ILLUMISE, + SPECIES_ROGGENROLA, + SPECIES_BASCULIN_RED, + SPECIES_GOTHORITA, + SPECIES_AXEW, + SPECIES_RATICATE, + SPECIES_LURANTIS, + SPECIES_VILEPLUME, + SPECIES_TAPU_LELE, + SPECIES_FERROSEED, + SPECIES_CHARMELEON, + SPECIES_GROWLITHE, + SPECIES_QUILAVA, + SPECIES_BRUXISH, + SPECIES_STUNKY, + SPECIES_NIDORINO, + SPECIES_ABRA, + SPECIES_MACHOP, + SPECIES_COMBUSKEN, + SPECIES_DEERLING, + SPECIES_PSYDUCK, + SPECIES_SWELLOW, + SPECIES_NINETALES, + SPECIES_KOMALA, + SPECIES_NIDORINA, + SPECIES_POLIWHIRL, + SPECIES_GEODUDE, + SPECIES_BIDOOF, + SPECIES_MIENFOO, + SPECIES_REUNICLUS, + SPECIES_KIRLIA, + SPECIES_RIOLU, + SPECIES_AMBIPOM, + SPECIES_SHUCKLE, + SPECIES_GIBLE, + SPECIES_LEAVANNY, + SPECIES_TAPU_KOKO, + SPECIES_ALTARIA, + SPECIES_CARVANHA, + SPECIES_TYROGUE, + SPECIES_KLINK, + SPECIES_HELIOLISK, + SPECIES_HOOTHOOT, + SPECIES_TAPU_FINI, + SPECIES_MAGBY, + SPECIES_TSAREENA, + SPECIES_BALTOY, + SPECIES_HAWLUCHA, + SPECIES_GROVYLE, + SPECIES_KECLEON, + SPECIES_MONFERNO, + SPECIES_EELEKTRIK, + SPECIES_SALAZZLE, + SPECIES_MARSHADOW, + SPECIES_WARTORTLE, + SPECIES_LANTURN, + SPECIES_GOREBYSS, + SPECIES_PRINPLUP, + SPECIES_CROAGUNK, + SPECIES_MOTHIM, + SPECIES_MUNNA, + SPECIES_RELICANTH, + SPECIES_ELEKID, + SPECIES_SYLVEON, + SPECIES_WHISCASH, + SPECIES_LILEEP, + SPECIES_SLAKOTH, + SPECIES_NUMEL, + SPECIES_LUMINEON, + SPECIES_SWANNA, + SPECIES_HAPPINY, + SPECIES_JOLTEON, + SPECIES_DEWOTT, + SPECIES_TALONFLAME, + SPECIES_STARAPTOR, + SPECIES_SEADRA, + SPECIES_FLAREON, + SPECIES_CROCONAW, + SPECIES_TORRACAT, + SPECIES_LYCANROC, + SPECIES_PHEROMOSA, + SPECIES_AMAURA, + SPECIES_ACCELGOR, + SPECIES_KRICKETUNE, + SPECIES_LEAFEON, + SPECIES_GLACEON, + SPECIES_TYRUNT, + SPECIES_TOUCANNON, + SPECIES_ESPEON, + SPECIES_FROSLASS, + SPECIES_UMBREON, + SPECIES_HUNTAIL, + SPECIES_CARNIVINE, + SPECIES_WATCHOG, + SPECIES_HONCHKROW, + SPECIES_MANKEY, + SPECIES_SNEASEL, + SPECIES_MARSHTOMP, + SPECIES_NUZLEAF, + SPECIES_PELIPPER, + SPECIES_SIMISEAR, + SPECIES_MARACTUS, + SPECIES_FURFROU, + SPECIES_BEAUTIFLY, + SPECIES_AZUMARILL, + SPECIES_WOBBUFFET, + SPECIES_OCTILLERY, + SPECIES_LARVESTA, + SPECIES_VAPOREON, + SPECIES_SIMIPOUR, + SPECIES_UNFEZANT, + SPECIES_QUILLADIN, + SPECIES_BEEDRILL, + SPECIES_SANDSLASH, + SPECIES_PARASECT, + SPECIES_BUIZEL, + SPECIES_JANGMO_O, + SPECIES_BLITZLE, + SPECIES_GASTRODON, + SPECIES_PIDGEOTTO, + SPECIES_RAICHU, + SPECIES_VENONAT, + SPECIES_PONYTA, + SPECIES_GRIMER, + SPECIES_MUK, + SPECIES_ELECTABUZZ, + SPECIES_SCRAFTY, + SPECIES_LUXIO, + SPECIES_SIMISAGE, + SPECIES_SPOINK, + SPECIES_DUSCLOPS, + SPECIES_AUDINO, + SPECIES_TRUBBISH, + SPECIES_SKIDDO, + SPECIES_BINACLE, + SPECIES_MEDICHAM, + SPECIES_BIBAREL, + SPECIES_CRANIDOS, + SPECIES_DUSTOX, + SPECIES_ALOMOMOLA, + SPECIES_BUTTERFREE, + SPECIES_PERSIAN, + SPECIES_PRIMEAPE, + SPECIES_ARCHEOPS, + SPECIES_DROWZEE, + SPECIES_FURRET, + SPECIES_PORYGON2, + SPECIES_LINOONE, + SPECIES_LOMBRE, + SPECIES_DELCATTY, + SPECIES_CRAWDAUNT, + SPECIES_ESCAVALIER, + SPECIES_FRILLISH, + SPECIES_DURANT, + SPECIES_DUGTRIO, + SPECIES_LOPUNNY, + SPECIES_KROKOROK, + SPECIES_ARIADOS, + SPECIES_PHANPY, + SPECIES_FLOATZEL, + SPECIES_POLITOED, + SPECIES_WEAVILE, + SPECIES_PORYGON_Z, + SPECIES_CHANDELURE, + SPECIES_STARYU, + SPECIES_BEHEEYEM, + SPECIES_CHANSEY, + SPECIES_TANGELA, + SPECIES_OMASTAR, + SPECIES_SLUGMA, + SPECIES_HOUNDOOM, + SPECIES_CLAWITZER, + SPECIES_MIENSHAO, + SPECIES_LEDIAN, + SPECIES_SLOWPOKE, + SPECIES_FRAXURE, + SPECIES_PORYGON, + SPECIES_DECIDUEYE, + SPECIES_MIGHTYENA, + SPECIES_LIEPARD, + SPECIES_DARUMAKA, + SPECIES_FEAROW, + SPECIES_SUDOWOODO, + SPECIES_YANMA, + SPECIES_SKUNTANK, + SPECIES_TOGEKISS, + SPECIES_VESPIQUEN, + SPECIES_SEAKING, + SPECIES_DELPHOX, + SPECIES_DODUO, + SPECIES_BRELOOM, + SPECIES_PIDGEOT, + SPECIES_SPHEAL, + SPECIES_MANDIBUZZ, + SPECIES_CLEFABLE, + SPECIES_LATIAS, + SPECIES_GURDURR, + SPECIES_GRENINJA, + SPECIES_MINIOR_SHIELD, + SPECIES_MANECTRIC, + SPECIES_ZANGOOSE, + SPECIES_EXCADRILL, + SPECIES_GENGAR, + SPECIES_KABUTOPS, + SPECIES_LOUDRED, + SPECIES_JYNX, + SPECIES_NOCTOWL, + SPECIES_VANILLISH, + SPECIES_BRAVIARY, + SPECIES_GIRAFARIG, + SPECIES_LUXRAY, + SPECIES_BAGON, + SPECIES_DIGGERSBY, + SPECIES_GLISCOR, + SPECIES_PURUGLY, + SPECIES_GOTHITELLE, + SPECIES_PRIMARINA, + SPECIES_TOXICROAK, + SPECIES_MAGMAR, + SPECIES_ZERAORA, + SPECIES_MAROWAK, + SPECIES_VIKAVOLT, + SPECIES_TENTACOOL, + SPECIES_TAPU_BULU, + SPECIES_VOLCARONA, + SPECIES_VIGOROTH, + SPECIES_BLISSEY, + SPECIES_ABSOL, + SPECIES_MALAMAR, + SPECIES_HAKAMO_O, + SPECIES_ALAKAZAM, + SPECIES_HITMONTOP, + SPECIES_GARDEVOIR, + SPECIES_KELDEO, + SPECIES_GRANBULL, + SPECIES_HIPPOPOTAS, + SPECIES_HITMONLEE, + SPECIES_ZWEILOUS, + SPECIES_HITMONCHAN, + SPECIES_SKARMORY, + SPECIES_SNOVER, + SPECIES_DARKRAI, + SPECIES_SAWK, + SPECIES_KLANG, + SPECIES_CACNEA, + SPECIES_YANMEGA, + SPECIES_BLAZIKEN, + SPECIES_GALLADE, + SPECIES_SCEPTILE, + SPECIES_SEVIPER, + SPECIES_CLAMPERL, + SPECIES_ZAPDOS, + SPECIES_AEGISLASH, + SPECIES_POLIWRATH, + SPECIES_HERACROSS, + SPECIES_LUCARIO, + SPECIES_MR_MIME, + SPECIES_GOLBAT, + SPECIES_TENTACRUEL, + SPECIES_PINSIR, + SPECIES_MAGCARGO, + SPECIES_LUDICOLO, + SPECIES_INFERNAPE, + SPECIES_ARTICUNO, + SPECIES_PIGNITE, + SPECIES_THROH, + SPECIES_NIHILEGO, + SPECIES_PILOSWINE, + SPECIES_SCYTHER, + SPECIES_GABITE, + SPECIES_KADABRA, + SPECIES_SHIELDON, + SPECIES_VANILLUXE, + SPECIES_SMEARGLE, + SPECIES_HEATMOR, + SPECIES_WHIRLIPEDE, + SPECIES_AERODACTYL, + SPECIES_SHIFTRY, + SPECIES_NIDOQUEEN, + SPECIES_MAGNETON, + SPECIES_KINGLER, + SPECIES_MOLTRES, + SPECIES_ARON, + SPECIES_LATIOS, + SPECIES_CRADILY, + SPECIES_BRONZOR, + SPECIES_MUSHARNA, + SPECIES_DEOXYS, + SPECIES_STOUTLAND, + SPECIES_THUNDURUS, + SPECIES_AMPHAROS, + SPECIES_DRAPION, + SPECIES_NIDOKING, + SPECIES_SEISMITOAD, + SPECIES_SERPERIOR, + SPECIES_TORNADUS, + SPECIES_GLIGAR, + SPECIES_ARBOK, + SPECIES_MANTYKE, + SPECIES_LICKITUNG, + SPECIES_ELECTRODE, + SPECIES_MAGMORTAR, + SPECIES_LANDORUS, + SPECIES_ARMALDO, + SPECIES_BISHARP, + SPECIES_SANDYGAST, + SPECIES_MACHOKE, + SPECIES_TREVENANT, + SPECIES_STANTLER, + SPECIES_GRUMPIG, + SPECIES_LARVITAR, + SPECIES_CROBAT, + SPECIES_QUAGSIRE, + SPECIES_MILTANK, + SPECIES_HYPNO, + SPECIES_ORANGURU, + SPECIES_COFAGRIGUS, + SPECIES_GOLDUCK, + SPECIES_CACTURNE, + SPECIES_KOMMO_O, + SPECIES_SLOWBRO, + SPECIES_TYPHLOSION, + SPECIES_SLOWKING, + SPECIES_ZEBSTRIKA, + SPECIES_KANGASKHAN, + SPECIES_STARMIE, + SPECIES_SWALOT, + SPECIES_TORKOAL, + SPECIES_EELEKTROSS, + SPECIES_MAGEARNA, + SPECIES_CARRACOSTA, + SPECIES_KLINKLANG, + SPECIES_ZOROARK, + SPECIES_PYROAR, + SPECIES_DRAGALGE, + SPECIES_SWAMPERT, + SPECIES_FLYGON, + SPECIES_ARAQUANID, + SPECIES_GENESECT, + SPECIES_PASSIMIAN, + SPECIES_INCINEROAR, + SPECIES_EXPLOUD, + SPECIES_EMPOLEON, + SPECIES_NOIVERN, + SPECIES_DODRIO, + SPECIES_BLASTOISE, + SPECIES_CRESSELIA, + SPECIES_MAKUHITA, + SPECIES_CONKELDURR, + SPECIES_SEALEO, + SPECIES_TAUROS, + SPECIES_FERALIGATR, + SPECIES_SHARPEDO, + SPECIES_SEEL, + SPECIES_CHESNAUGHT, + SPECIES_CHARIZARD, + SPECIES_GOGOAT, + SPECIES_GOLETT, + SPECIES_SAWSBUCK, + SPECIES_DARMANITAN, + SPECIES_SAMUROTT, + SPECIES_BOUFFALANT, + SPECIES_RAPIDASH, + SPECIES_GARCHOMP, + SPECIES_BELDUM, + SPECIES_BARBARACLE, + SPECIES_KROOKODILE, + SPECIES_NOSEPASS, + SPECIES_GROTLE, + SPECIES_BERGMITE, + SPECIES_VENUSAUR, + SPECIES_TROPIUS, + SPECIES_XURKITREE, + SPECIES_MEGANIUM, + SPECIES_SILVALLY, + SPECIES_BOLDORE, + SPECIES_RAMPARDOS, + SPECIES_SALAMENCE, + SPECIES_GRAVELER, + SPECIES_MUNCHLAX, + SPECIES_HAXORUS, + SPECIES_DUSKNOIR, + SPECIES_GARBODOR, + SPECIES_CLAYDOL, + SPECIES_SPIRITOMB, + SPECIES_GOLISOPOD, + SPECIES_FERROTHORN, + SPECIES_MUDBRAY, + SPECIES_SHELGON, + SPECIES_RHYHORN, + SPECIES_SCIZOR, + SPECIES_DEWGONG, + SPECIES_EXEGGUTOR, + SPECIES_RHYDON, + SPECIES_DONPHAN, + SPECIES_LAIRON, + SPECIES_LUNALA, + SPECIES_TYPE_NULL, + SPECIES_MEWTWO, + SPECIES_FORRETRESS, + SPECIES_URSARING, + SPECIES_TANGROWTH, + SPECIES_MACHAMP, + SPECIES_WAILMER, + SPECIES_SLAKING, + SPECIES_CLOYSTER, + SPECIES_JELLICENT, + SPECIES_BEWEAR, + SPECIES_ABOMASNOW, + SPECIES_PANGORO, + SPECIES_ELECTIVIRE, + SPECIES_DRUDDIGON, + SPECIES_LICKILICKY, + SPECIES_CRYOGONAL, + SPECIES_BASTIODON, + SPECIES_EMBOAR, + SPECIES_NAGANADEL, + SPECIES_GOODRA, + SPECIES_WALREIN, + SPECIES_KINGDRA, + SPECIES_PUPITAR, + SPECIES_SOLROCK, + SPECIES_ARCANINE, + SPECIES_HYDREIGON, + SPECIES_MILOTIC, + SPECIES_LUNATONE, + SPECIES_REGICE, + SPECIES_RAIKOU, + SPECIES_MAGNEZONE, + SPECIES_CRABOMINABLE, + SPECIES_DRAMPA, + SPECIES_SUICUNE, + SPECIES_BRONZONG, + SPECIES_VOLCANION, + SPECIES_ENTEI, + SPECIES_HO_OH, + SPECIES_CRUSTLE, + SPECIES_VIRIZION, + SPECIES_SCOLIPEDE, + SPECIES_TYRANITAR, + SPECIES_METANG, + SPECIES_YVELTAL, + SPECIES_REGISTEEL, + SPECIES_RAYQUAZA, + SPECIES_ONIX, + SPECIES_DRAGONITE, + SPECIES_DHELMISE, + SPECIES_TURTONATOR, + SPECIES_XERNEAS, + SPECIES_LUGIA, + SPECIES_LAPRAS, + SPECIES_MANTINE, + SPECIES_CAMERUPT, + SPECIES_AURORUS, + SPECIES_REGIROCK, + SPECIES_SOLGALEO, + SPECIES_NECROZMA, + SPECIES_GYARADOS, + SPECIES_COBALION, + SPECIES_PALOSSAND, + SPECIES_HARIYAMA, + SPECIES_GLALIE, + SPECIES_GIGALITH, + SPECIES_BEARTIC, + SPECIES_TERRAKION, + SPECIES_TYRANTRUM, + SPECIES_RHYPERIOR, + SPECIES_MAMOSWINE, + SPECIES_GOLEM, + SPECIES_HIPPOWDON, + SPECIES_ZYGARDE, + SPECIES_TORTERRA, + SPECIES_ARCEUS, + SPECIES_KYUREM, + SPECIES_GOLURK, + SPECIES_RESHIRAM, + SPECIES_BUZZWOLE, + SPECIES_PALKIA, + SPECIES_PROBOPASS, + SPECIES_ZEKROM, + SPECIES_KYOGRE, + SPECIES_AGGRON, + SPECIES_WAILORD, + SPECIES_STEELIX, + SPECIES_REGIGIGAS, + SPECIES_HEATRAN, + SPECIES_SNORLAX, + SPECIES_AVALUGG, + SPECIES_METAGROSS, + SPECIES_DIALGA, + SPECIES_GIRATINA, + SPECIES_MELMETAL, + SPECIES_STAKATAKA, + SPECIES_GUZZLORD, + SPECIES_MUDSDALE, + SPECIES_GROUDON, + SPECIES_COSMOEM, + SPECIES_CELESTEELA, }; +const u16 gPokedexOrderWeightCount = ARRAY_COUNT(gPokedexOrder_Weight); + const u16 gPokedexOrder_Height[] = { - NATIONAL_DEX_JOLTIK, - NATIONAL_DEX_FLABEBE, - NATIONAL_DEX_CUTIEFLY, - NATIONAL_DEX_COMFEY, - NATIONAL_DEX_COSMOEM, - NATIONAL_DEX_DIGLETT, - NATIONAL_DEX_NATU, - NATIONAL_DEX_AZURILL, - NATIONAL_DEX_BUDEW, - NATIONAL_DEX_BURMY, - NATIONAL_DEX_CHINGLING, - NATIONAL_DEX_SHAYMIN, - NATIONAL_DEX_FOONGUS, - NATIONAL_DEX_TYNAMO, - NATIONAL_DEX_FLOETTE, - NATIONAL_DEX_SPRITZEE, - NATIONAL_DEX_DEDENNE, - NATIONAL_DEX_KLEFKI, - NATIONAL_DEX_RIBOMBEE, - NATIONAL_DEX_WISHIWASHI, - NATIONAL_DEX_MORELULL, - NATIONAL_DEX_MIMIKYU, - NATIONAL_DEX_COSMOG, - NATIONAL_DEX_MELTAN, - NATIONAL_DEX_CATERPIE, - NATIONAL_DEX_WEEDLE, - NATIONAL_DEX_PIDGEY, - NATIONAL_DEX_RATTATA, - NATIONAL_DEX_SPEAROW, - NATIONAL_DEX_PARAS, - NATIONAL_DEX_MAGNEMITE, - NATIONAL_DEX_SHELLDER, - NATIONAL_DEX_DITTO, - NATIONAL_DEX_EEVEE, - NATIONAL_DEX_PICHU, - NATIONAL_DEX_CLEFFA, - NATIONAL_DEX_IGGLYBUFF, - NATIONAL_DEX_TOGEPI, - NATIONAL_DEX_SUNKERN, - NATIONAL_DEX_WURMPLE, - NATIONAL_DEX_TAILLOW, - NATIONAL_DEX_ROSELIA, - NATIONAL_DEX_CASTFORM, - NATIONAL_DEX_JIRACHI, - NATIONAL_DEX_STARLY, - NATIONAL_DEX_KRICKETOT, - NATIONAL_DEX_COMBEE, - NATIONAL_DEX_SHELLOS, - NATIONAL_DEX_ROTOM, - NATIONAL_DEX_UXIE, - NATIONAL_DEX_MESPRIT, - NATIONAL_DEX_AZELF, - NATIONAL_DEX_MANAPHY, - NATIONAL_DEX_PIDOVE, - NATIONAL_DEX_DRILBUR, - NATIONAL_DEX_SEWADDLE, - NATIONAL_DEX_COTTONEE, - NATIONAL_DEX_DWEBBLE, - NATIONAL_DEX_SOLOSIS, - NATIONAL_DEX_KLINK, - NATIONAL_DEX_LITWICK, - NATIONAL_DEX_DURANT, - NATIONAL_DEX_FROAKIE, - NATIONAL_DEX_FLETCHLING, - NATIONAL_DEX_SCATTERBUG, - NATIONAL_DEX_SPEWPA, - NATIONAL_DEX_ESPURR, - NATIONAL_DEX_CARBINK, - NATIONAL_DEX_GOOMY, - NATIONAL_DEX_ROWLET, - NATIONAL_DEX_PIKIPEK, - NATIONAL_DEX_DEWPIDER, - NATIONAL_DEX_FOMANTIS, - NATIONAL_DEX_BOUNSWEET, - NATIONAL_DEX_PYUKUMUKU, - NATIONAL_DEX_MINIOR, - NATIONAL_DEX_TOGEDEMARU, - NATIONAL_DEX_KARTANA, - NATIONAL_DEX_PIKACHU, - NATIONAL_DEX_NIDORAN_F, - NATIONAL_DEX_MEOWTH, - NATIONAL_DEX_GEODUDE, - NATIONAL_DEX_KRABBY, - NATIONAL_DEX_EXEGGCUTE, - NATIONAL_DEX_CUBONE, - NATIONAL_DEX_HORSEA, - NATIONAL_DEX_OMANYTE, - NATIONAL_DEX_MEW, - NATIONAL_DEX_BELLOSSOM, - NATIONAL_DEX_MARILL, - NATIONAL_DEX_HOPPIP, - NATIONAL_DEX_WOOPER, - NATIONAL_DEX_SWINUB, - NATIONAL_DEX_SMOOCHUM, - NATIONAL_DEX_TORCHIC, - NATIONAL_DEX_MUDKIP, - NATIONAL_DEX_ZIGZAGOON, - NATIONAL_DEX_RALTS, - NATIONAL_DEX_SHROOMISH, - NATIONAL_DEX_ARON, - NATIONAL_DEX_PLUSLE, - NATIONAL_DEX_MINUN, - NATIONAL_DEX_GULPIN, - NATIONAL_DEX_CACNEA, - NATIONAL_DEX_SWABLU, - NATIONAL_DEX_BARBOACH, - NATIONAL_DEX_CLAMPERL, - NATIONAL_DEX_TURTWIG, - NATIONAL_DEX_PIPLUP, - NATIONAL_DEX_PACHIRISU, - NATIONAL_DEX_CHERUBI, - NATIONAL_DEX_DRIFLOON, - NATIONAL_DEX_BUNEARY, - NATIONAL_DEX_STUNKY, - NATIONAL_DEX_FINNEON, - NATIONAL_DEX_PHIONE, - NATIONAL_DEX_VICTINI, - NATIONAL_DEX_LILLIPUP, - NATIONAL_DEX_PURRLOIN, - NATIONAL_DEX_ROGGENROLA, - NATIONAL_DEX_WOOBAT, - NATIONAL_DEX_VENIPEDE, - NATIONAL_DEX_MINCCINO, - NATIONAL_DEX_GOTHITA, - NATIONAL_DEX_VANILLITE, - NATIONAL_DEX_EMOLGA, - NATIONAL_DEX_SHELMET, - NATIONAL_DEX_CHESPIN, - NATIONAL_DEX_FENNEKIN, - NATIONAL_DEX_BUNNELBY, - NATIONAL_DEX_SWIRLIX, - NATIONAL_DEX_INKAY, - NATIONAL_DEX_PHANTUMP, - NATIONAL_DEX_PUMPKABOO, - NATIONAL_DEX_LITTEN, - NATIONAL_DEX_POPPLIO, - NATIONAL_DEX_YUNGOOS, - NATIONAL_DEX_GRUBBIN, - NATIONAL_DEX_MAREANIE, - NATIONAL_DEX_KOMALA, - NATIONAL_DEX_SQUIRTLE, - NATIONAL_DEX_NIDORAN_M, - NATIONAL_DEX_JIGGLYPUFF, - NATIONAL_DEX_ODDISH, - NATIONAL_DEX_MANKEY, - NATIONAL_DEX_VOLTORB, - NATIONAL_DEX_KABUTO, - NATIONAL_DEX_CYNDAQUIL, - NATIONAL_DEX_SPINARAK, - NATIONAL_DEX_CHINCHOU, - NATIONAL_DEX_MURKROW, - NATIONAL_DEX_UNOWN, - NATIONAL_DEX_QWILFISH, - NATIONAL_DEX_PHANPY, - NATIONAL_DEX_TREECKO, - NATIONAL_DEX_POOCHYENA, - NATIONAL_DEX_LINOONE, - NATIONAL_DEX_LOTAD, - NATIONAL_DEX_SEEDOT, - NATIONAL_DEX_SURSKIT, - NATIONAL_DEX_NINCADA, - NATIONAL_DEX_SABLEYE, - NATIONAL_DEX_TORKOAL, - NATIONAL_DEX_BALTOY, - NATIONAL_DEX_CHIMCHAR, - NATIONAL_DEX_BIDOOF, - NATIONAL_DEX_SHINX, - NATIONAL_DEX_SHIELDON, - NATIONAL_DEX_WORMADAM, - NATIONAL_DEX_CHERRIM, - NATIONAL_DEX_GLAMEOW, - NATIONAL_DEX_BRONZOR, - NATIONAL_DEX_BONSLY, - NATIONAL_DEX_CHATOT, - NATIONAL_DEX_TEPIG, - NATIONAL_DEX_OSHAWOTT, - NATIONAL_DEX_PATRAT, - NATIONAL_DEX_TYMPOLE, - NATIONAL_DEX_SWADLOON, - NATIONAL_DEX_PETILIL, - NATIONAL_DEX_YAMASK, - NATIONAL_DEX_ARCHEN, - NATIONAL_DEX_CINCCINO, - NATIONAL_DEX_DUCKLETT, - NATIONAL_DEX_KARRABLAST, - NATIONAL_DEX_ELGYEM, - NATIONAL_DEX_CUBCHOO, - NATIONAL_DEX_PAWNIARD, - NATIONAL_DEX_RUFFLET, - NATIONAL_DEX_VULLABY, - NATIONAL_DEX_BINACLE, - NATIONAL_DEX_SKRELP, - NATIONAL_DEX_CLAUNCHER, - NATIONAL_DEX_HELIOPTILE, - NATIONAL_DEX_NOIBAT, - NATIONAL_DEX_HOOPA, - NATIONAL_DEX_CHARJABUG, - NATIONAL_DEX_ROCKRUFF, - NATIONAL_DEX_STUFFUL, - NATIONAL_DEX_WIMPOD, - NATIONAL_DEX_SANDYGAST, - NATIONAL_DEX_CHARMANDER, - NATIONAL_DEX_KAKUNA, - NATIONAL_DEX_SANDSHREW, - NATIONAL_DEX_CLEFAIRY, - NATIONAL_DEX_VULPIX, - NATIONAL_DEX_POLIWAG, - NATIONAL_DEX_KOFFING, - NATIONAL_DEX_GOLDEEN, - NATIONAL_DEX_TOTODILE, - NATIONAL_DEX_TOGETIC, - NATIONAL_DEX_MAREEP, - NATIONAL_DEX_SKIPLOOM, - NATIONAL_DEX_PINECO, - NATIONAL_DEX_SNUBBULL, - NATIONAL_DEX_SHUCKLE, - NATIONAL_DEX_TEDDIURSA, - NATIONAL_DEX_CORSOLA, - NATIONAL_DEX_REMORAID, - NATIONAL_DEX_HOUNDOUR, - NATIONAL_DEX_PORYGON2, - NATIONAL_DEX_ELEKID, - NATIONAL_DEX_LARVITAR, - NATIONAL_DEX_CELEBI, - NATIONAL_DEX_SILCOON, - NATIONAL_DEX_WINGULL, - NATIONAL_DEX_WHISMUR, - NATIONAL_DEX_SKITTY, - NATIONAL_DEX_MAWILE, - NATIONAL_DEX_MEDITITE, - NATIONAL_DEX_ELECTRIKE, - NATIONAL_DEX_ILLUMISE, - NATIONAL_DEX_CORPHISH, - NATIONAL_DEX_FEEBAS, - NATIONAL_DEX_SHUPPET, - NATIONAL_DEX_CHIMECHO, - NATIONAL_DEX_WYNAUT, - NATIONAL_DEX_LUVDISC, - NATIONAL_DEX_BAGON, - NATIONAL_DEX_BELDUM, - NATIONAL_DEX_STARAVIA, - NATIONAL_DEX_MIME_JR, - NATIONAL_DEX_HAPPINY, - NATIONAL_DEX_MUNCHLAX, - NATIONAL_DEX_SNIVY, - NATIONAL_DEX_PANSAGE, - NATIONAL_DEX_PANSEAR, - NATIONAL_DEX_PANPOUR, - NATIONAL_DEX_MUNNA, - NATIONAL_DEX_TRANQUILL, - NATIONAL_DEX_TIMBURR, - NATIONAL_DEX_DARUMAKA, - NATIONAL_DEX_SCRAGGY, - NATIONAL_DEX_TRUBBISH, - NATIONAL_DEX_DUOSION, - NATIONAL_DEX_DEERLING, - NATIONAL_DEX_AMOONGUSS, - NATIONAL_DEX_FERROSEED, - NATIONAL_DEX_KLANG, - NATIONAL_DEX_KLINKLANG, - NATIONAL_DEX_LAMPENT, - NATIONAL_DEX_AXEW, - NATIONAL_DEX_MELOETTA, - NATIONAL_DEX_FROGADIER, - NATIONAL_DEX_LITLEO, - NATIONAL_DEX_PANCHAM, - NATIONAL_DEX_MEOWSTIC, - NATIONAL_DEX_BRIONNE, - NATIONAL_DEX_TRUMBEAK, - NATIONAL_DEX_CRABRAWLER, - NATIONAL_DEX_ORICORIO, - NATIONAL_DEX_SALANDIT, - NATIONAL_DEX_JANGMO_O, - NATIONAL_DEX_POIPOLE, - NATIONAL_DEX_BULBASAUR, - NATIONAL_DEX_METAPOD, - NATIONAL_DEX_RATICATE, - NATIONAL_DEX_DUGTRIO, - NATIONAL_DEX_GROWLITHE, - NATIONAL_DEX_BELLSPROUT, - NATIONAL_DEX_HOOTHOOT, - NATIONAL_DEX_MISDREAVUS, - NATIONAL_DEX_SLUGMA, - NATIONAL_DEX_TYROGUE, - NATIONAL_DEX_MAGBY, - NATIONAL_DEX_MARSHTOMP, - NATIONAL_DEX_CASCOON, - NATIONAL_DEX_SWELLOW, - NATIONAL_DEX_VOLBEAT, - NATIONAL_DEX_NUMEL, - NATIONAL_DEX_SPOINK, - NATIONAL_DEX_TRAPINCH, - NATIONAL_DEX_ANORITH, - NATIONAL_DEX_SNORUNT, - NATIONAL_DEX_BUIZEL, - NATIONAL_DEX_GIBLE, - NATIONAL_DEX_RIOLU, - NATIONAL_DEX_CROAGUNK, - NATIONAL_DEX_EXCADRILL, - NATIONAL_DEX_WHIMSICOTT, - NATIONAL_DEX_SANDILE, - NATIONAL_DEX_TIRTOUGA, - NATIONAL_DEX_ZORUA, - NATIONAL_DEX_GOTHORITA, - NATIONAL_DEX_STUNFISK, - NATIONAL_DEX_QUILLADIN, - NATIONAL_DEX_FLETCHINDER, - NATIONAL_DEX_DIANCIE, - NATIONAL_DEX_DARTRIX, - NATIONAL_DEX_TORRACAT, - NATIONAL_DEX_GUMSHOOS, - NATIONAL_DEX_TOXAPEX, - NATIONAL_DEX_STEENEE, - NATIONAL_DEX_MARSHADOW, - NATIONAL_DEX_RAICHU, - NATIONAL_DEX_NIDORINA, - NATIONAL_DEX_ZUBAT, - NATIONAL_DEX_GLOOM, - NATIONAL_DEX_PSYDUCK, - NATIONAL_DEX_MACHOP, - NATIONAL_DEX_FARFETCHD, - NATIONAL_DEX_STARYU, - NATIONAL_DEX_JOLTEON, - NATIONAL_DEX_PORYGON, - NATIONAL_DEX_SENTRET, - NATIONAL_DEX_FLAAFFY, - NATIONAL_DEX_AZUMARILL, - NATIONAL_DEX_JUMPLUFF, - NATIONAL_DEX_AIPOM, - NATIONAL_DEX_SUNFLORA, - NATIONAL_DEX_MAGCARGO, - NATIONAL_DEX_KIRLIA, - NATIONAL_DEX_MASQUERAIN, - NATIONAL_DEX_SLAKOTH, - NATIONAL_DEX_NINJASK, - NATIONAL_DEX_SHEDINJA, - NATIONAL_DEX_CARVANHA, - NATIONAL_DEX_DUSKULL, - NATIONAL_DEX_SPHEAL, - NATIONAL_DEX_PRINPLUP, - NATIONAL_DEX_HIPPOPOTAS, - NATIONAL_DEX_SKORUPI, - NATIONAL_DEX_GLACEON, - NATIONAL_DEX_SERVINE, - NATIONAL_DEX_DEWOTT, - NATIONAL_DEX_BLITZLE, - NATIONAL_DEX_PALPITOAD, - NATIONAL_DEX_GALVANTULA, - NATIONAL_DEX_ACCELGOR, - NATIONAL_DEX_DEINO, - NATIONAL_DEX_HONEDGE, - NATIONAL_DEX_DOUBLADE, - NATIONAL_DEX_AROMATISSE, - NATIONAL_DEX_SLURPUFF, - NATIONAL_DEX_TYRUNT, - NATIONAL_DEX_HAWLUCHA, - NATIONAL_DEX_SLIGGOO, - NATIONAL_DEX_LYCANROC, - NATIONAL_DEX_NIDORINO, - NATIONAL_DEX_ABRA, - NATIONAL_DEX_TENTACOOL, - NATIONAL_DEX_GRIMER, - NATIONAL_DEX_MAGIKARP, - NATIONAL_DEX_FLAREON, - NATIONAL_DEX_CHIKORITA, - NATIONAL_DEX_QUILAVA, - NATIONAL_DEX_ESPEON, - NATIONAL_DEX_SNEASEL, - NATIONAL_DEX_OCTILLERY, - NATIONAL_DEX_DELIBIRD, - NATIONAL_DEX_GROVYLE, - NATIONAL_DEX_COMBUSKEN, - NATIONAL_DEX_LAIRON, - NATIONAL_DEX_GRUMPIG, - NATIONAL_DEX_WHISCASH, - NATIONAL_DEX_MONFERNO, - NATIONAL_DEX_LUXIO, - NATIONAL_DEX_ROSERADE, - NATIONAL_DEX_CRANIDOS, - NATIONAL_DEX_MOTHIM, - NATIONAL_DEX_GASTRODON, - NATIONAL_DEX_MISMAGIUS, - NATIONAL_DEX_HONCHKROW, - NATIONAL_DEX_PORYGON_Z, - NATIONAL_DEX_HERDIER, - NATIONAL_DEX_BOLDORE, - NATIONAL_DEX_SWOOBAT, - NATIONAL_DEX_MIENFOO, - NATIONAL_DEX_SKIDDO, - NATIONAL_DEX_GOURGEIST, - NATIONAL_DEX_LURANTIS, - NATIONAL_DEX_BRUXISH, - NATIONAL_DEX_IVYSAUR, - NATIONAL_DEX_WARTORTLE, - NATIONAL_DEX_BEEDRILL, - NATIONAL_DEX_SANDSLASH, - NATIONAL_DEX_WIGGLYTUFF, - NATIONAL_DEX_PARASECT, - NATIONAL_DEX_VENONAT, - NATIONAL_DEX_PERSIAN, - NATIONAL_DEX_PRIMEAPE, - NATIONAL_DEX_POLIWHIRL, - NATIONAL_DEX_WEEPINBELL, - NATIONAL_DEX_GRAVELER, - NATIONAL_DEX_PONYTA, - NATIONAL_DEX_MAGNETON, - NATIONAL_DEX_DROWZEE, - NATIONAL_DEX_MAROWAK, - NATIONAL_DEX_RHYHORN, - NATIONAL_DEX_TANGELA, - NATIONAL_DEX_VAPOREON, - NATIONAL_DEX_OMASTAR, - NATIONAL_DEX_LEDYBA, - NATIONAL_DEX_UMBREON, - NATIONAL_DEX_MIGHTYENA, - NATIONAL_DEX_BEAUTIFLY, - NATIONAL_DEX_NUZLEAF, - NATIONAL_DEX_LOUDRED, - NATIONAL_DEX_MAKUHITA, - NATIONAL_DEX_NOSEPASS, - NATIONAL_DEX_LUNATONE, - NATIONAL_DEX_LILEEP, - NATIONAL_DEX_KECLEON, - NATIONAL_DEX_RELICANTH, - NATIONAL_DEX_BIBAREL, - NATIONAL_DEX_KRICKETUNE, - NATIONAL_DEX_PURUGLY, - NATIONAL_DEX_SKUNTANK, - NATIONAL_DEX_SPIRITOMB, - NATIONAL_DEX_MANTYKE, - NATIONAL_DEX_SNOVER, - NATIONAL_DEX_LEAFEON, - NATIONAL_DEX_PIGNITE, - NATIONAL_DEX_SIMISEAR, - NATIONAL_DEX_SIMIPOUR, - NATIONAL_DEX_BASCULIN, - NATIONAL_DEX_KROKOROK, - NATIONAL_DEX_MARACTUS, - NATIONAL_DEX_REUNICLUS, - NATIONAL_DEX_ESCAVALIER, - NATIONAL_DEX_FERROTHORN, - NATIONAL_DEX_BEHEEYEM, - NATIONAL_DEX_CHANDELURE, - NATIONAL_DEX_FRAXURE, - NATIONAL_DEX_GOLETT, - NATIONAL_DEX_BRAIXEN, - NATIONAL_DEX_DIGGERSBY, - NATIONAL_DEX_HELIOLISK, - NATIONAL_DEX_SYLVEON, - NATIONAL_DEX_BERGMITE, - NATIONAL_DEX_MUDBRAY, - NATIONAL_DEX_SHIINOTIC, - NATIONAL_DEX_MAGEARNA, - NATIONAL_DEX_CHARMELEON, - NATIONAL_DEX_BUTTERFREE, - NATIONAL_DEX_PIDGEOTTO, - NATIONAL_DEX_NINETALES, - NATIONAL_DEX_SEEL, - NATIONAL_DEX_CHANSEY, - NATIONAL_DEX_STARMIE, - NATIONAL_DEX_ELECTABUZZ, - NATIONAL_DEX_CROCONAW, - NATIONAL_DEX_ARIADOS, - NATIONAL_DEX_POLITOED, - NATIONAL_DEX_GLIGAR, - NATIONAL_DEX_PILOSWINE, - NATIONAL_DEX_DONPHAN, - NATIONAL_DEX_DELCATTY, - NATIONAL_DEX_SPINDA, - NATIONAL_DEX_VIBRAVA, - NATIONAL_DEX_ALTARIA, - NATIONAL_DEX_CRAWDAUNT, - NATIONAL_DEX_BANETTE, - NATIONAL_DEX_SEALEO, - NATIONAL_DEX_SHELGON, - NATIONAL_DEX_GROTLE, - NATIONAL_DEX_FLOATZEL, - NATIONAL_DEX_WEAVILE, - NATIONAL_DEX_WATCHOG, - NATIONAL_DEX_LIEPARD, - NATIONAL_DEX_SIMISAGE, - NATIONAL_DEX_MUSHARNA, - NATIONAL_DEX_AUDINO, - NATIONAL_DEX_LILLIGANT, - NATIONAL_DEX_SCRAFTY, - NATIONAL_DEX_VANILLISH, - NATIONAL_DEX_CRYOGONAL, - NATIONAL_DEX_LARVESTA, - NATIONAL_DEX_FLORGES, - NATIONAL_DEX_TOUCANNON, - NATIONAL_DEX_FEAROW, - NATIONAL_DEX_VILEPLUME, - NATIONAL_DEX_SLOWPOKE, - NATIONAL_DEX_MUK, - NATIONAL_DEX_ELECTRODE, - NATIONAL_DEX_LICKITUNG, - NATIONAL_DEX_WEEZING, - NATIONAL_DEX_SEADRA, - NATIONAL_DEX_BAYLEEF, - NATIONAL_DEX_LANTURN, - NATIONAL_DEX_SUDOWOODO, - NATIONAL_DEX_YANMA, - NATIONAL_DEX_FORRETRESS, - NATIONAL_DEX_SMEARGLE, - NATIONAL_DEX_MILTANK, - NATIONAL_DEX_PUPITAR, - NATIONAL_DEX_DUSTOX, - NATIONAL_DEX_LOMBRE, - NATIONAL_DEX_PELIPPER, - NATIONAL_DEX_BRELOOM, - NATIONAL_DEX_SOLROCK, - NATIONAL_DEX_ABSOL, - NATIONAL_DEX_METANG, - NATIONAL_DEX_INFERNAPE, - NATIONAL_DEX_STARAPTOR, - NATIONAL_DEX_VESPIQUEN, - NATIONAL_DEX_AMBIPOM, - NATIONAL_DEX_DRIFBLIM, - NATIONAL_DEX_LOPUNNY, - NATIONAL_DEX_LUCARIO, - NATIONAL_DEX_LUMINEON, - NATIONAL_DEX_MAGNEZONE, - NATIONAL_DEX_STOUTLAND, - NATIONAL_DEX_UNFEZANT, - NATIONAL_DEX_GURDURR, - NATIONAL_DEX_LEAVANNY, - NATIONAL_DEX_WHIRLIPEDE, - NATIONAL_DEX_CARRACOSTA, - NATIONAL_DEX_FRILLISH, - NATIONAL_DEX_ALOMOMOLA, - NATIONAL_DEX_EELEKTRIK, - NATIONAL_DEX_MANDIBUZZ, - NATIONAL_DEX_TALONFLAME, - NATIONAL_DEX_VIVILLON, - NATIONAL_DEX_FURFROU, - NATIONAL_DEX_SALAZZLE, - NATIONAL_DEX_TSAREENA, - NATIONAL_DEX_HAKAMO_O, - NATIONAL_DEX_TAPU_LELE, - NATIONAL_DEX_NIHILEGO, - NATIONAL_DEX_NIDOQUEEN, - NATIONAL_DEX_CLEFABLE, - NATIONAL_DEX_POLIWRATH, - NATIONAL_DEX_KADABRA, - NATIONAL_DEX_GASTLY, - NATIONAL_DEX_KINGLER, - NATIONAL_DEX_SEAKING, - NATIONAL_DEX_MR_MIME, - NATIONAL_DEX_MAGMAR, - NATIONAL_DEX_KABUTOPS, - NATIONAL_DEX_WOBBUFFET, - NATIONAL_DEX_SHIFTRY, - NATIONAL_DEX_MEDICHAM, - NATIONAL_DEX_CACTURNE, - NATIONAL_DEX_ZANGOOSE, - NATIONAL_DEX_BASTIODON, - NATIONAL_DEX_BRONZONG, - NATIONAL_DEX_DRAPION, - NATIONAL_DEX_TOXICROAK, - NATIONAL_DEX_FROSLASS, - NATIONAL_DEX_THROH, - NATIONAL_DEX_DARMANITAN, - NATIONAL_DEX_SWANNA, - NATIONAL_DEX_VANILLUXE, - NATIONAL_DEX_BARBARACLE, - NATIONAL_DEX_CLAWITZER, - NATIONAL_DEX_AMAURA, - NATIONAL_DEX_PALOSSAND, - NATIONAL_DEX_TAPU_FINI, - NATIONAL_DEX_NIDOKING, - NATIONAL_DEX_GOLEM, - NATIONAL_DEX_DODUO, - NATIONAL_DEX_HITMONCHAN, - NATIONAL_DEX_JYNX, - NATIONAL_DEX_TAUROS, - NATIONAL_DEX_LEDIAN, - NATIONAL_DEX_AMPHAROS, - NATIONAL_DEX_QUAGSIRE, - NATIONAL_DEX_GRANBULL, - NATIONAL_DEX_HOUNDOOM, - NATIONAL_DEX_STANTLER, - NATIONAL_DEX_HITMONTOP, - NATIONAL_DEX_VIGOROTH, - NATIONAL_DEX_WALREIN, - NATIONAL_DEX_LATIAS, - NATIONAL_DEX_LUXRAY, - NATIONAL_DEX_GABITE, - NATIONAL_DEX_CARNIVINE, - NATIONAL_DEX_PROBOPASS, - NATIONAL_DEX_CONKELDURR, - NATIONAL_DEX_SAWK, - NATIONAL_DEX_CRUSTLE, - NATIONAL_DEX_SIGILYPH, - NATIONAL_DEX_ARCHEOPS, - NATIONAL_DEX_MIENSHAO, - NATIONAL_DEX_HEATMOR, - NATIONAL_DEX_ZWEILOUS, - NATIONAL_DEX_KELDEO, - NATIONAL_DEX_PIDGEOT, - NATIONAL_DEX_VENOMOTH, - NATIONAL_DEX_ALAKAZAM, - NATIONAL_DEX_MACHOKE, - NATIONAL_DEX_CLOYSTER, - NATIONAL_DEX_GENGAR, - NATIONAL_DEX_HITMONLEE, - NATIONAL_DEX_SCYTHER, - NATIONAL_DEX_PINSIR, - NATIONAL_DEX_XATU, - NATIONAL_DEX_GIRAFARIG, - NATIONAL_DEX_DUNSPARCE, - NATIONAL_DEX_HERACROSS, - NATIONAL_DEX_BLISSEY, - NATIONAL_DEX_SWAMPERT, - NATIONAL_DEX_LUDICOLO, - NATIONAL_DEX_EXPLOUD, - NATIONAL_DEX_MANECTRIC, - NATIONAL_DEX_CLAYDOL, - NATIONAL_DEX_CRADILY, - NATIONAL_DEX_ARMALDO, - NATIONAL_DEX_GLALIE, - NATIONAL_DEX_SALAMENCE, - NATIONAL_DEX_TOGEKISS, - NATIONAL_DEX_CRESSELIA, - NATIONAL_DEX_DARKRAI, - NATIONAL_DEX_SAMUROTT, - NATIONAL_DEX_SEISMITOAD, - NATIONAL_DEX_KROOKODILE, - NATIONAL_DEX_GOTHITELLE, - NATIONAL_DEX_BRAVIARY, - NATIONAL_DEX_TORNADUS, - NATIONAL_DEX_THUNDURUS, - NATIONAL_DEX_LANDORUS, - NATIONAL_DEX_GENESECT, - NATIONAL_DEX_DELPHOX, - NATIONAL_DEX_GRENINJA, - NATIONAL_DEX_PYROAR, - NATIONAL_DEX_MALAMAR, - NATIONAL_DEX_TREVENANT, - NATIONAL_DEX_NOIVERN, - NATIONAL_DEX_VIKAVOLT, - NATIONAL_DEX_ORANGURU, - NATIONAL_DEX_ZERAORA, - NATIONAL_DEX_BLASTOISE, - NATIONAL_DEX_GOLBAT, - NATIONAL_DEX_MACHAMP, - NATIONAL_DEX_TENTACRUEL, - NATIONAL_DEX_SLOWBRO, - NATIONAL_DEX_HAUNTER, - NATIONAL_DEX_HYPNO, - NATIONAL_DEX_ZAPDOS, - NATIONAL_DEX_NOCTOWL, - NATIONAL_DEX_GARDEVOIR, - NATIONAL_DEX_DUSCLOPS, - NATIONAL_DEX_METAGROSS, - NATIONAL_DEX_RAMPARDOS, - NATIONAL_DEX_MAGMORTAR, - NATIONAL_DEX_GALLADE, - NATIONAL_DEX_EMBOAR, - NATIONAL_DEX_ZEBSTRIKA, - NATIONAL_DEX_ZOROARK, - NATIONAL_DEX_DRUDDIGON, - NATIONAL_DEX_BISHARP, - NATIONAL_DEX_BOUFFALANT, - NATIONAL_DEX_VOLCARONA, - NATIONAL_DEX_CHESNAUGHT, - NATIONAL_DEX_DECIDUEYE, - NATIONAL_DEX_KOMMO_O, - NATIONAL_DEX_CHARIZARD, - NATIONAL_DEX_GOLDUCK, - NATIONAL_DEX_VICTREEBEL, - NATIONAL_DEX_RAPIDASH, - NATIONAL_DEX_DEWGONG, - NATIONAL_DEX_ARTICUNO, - NATIONAL_DEX_TYPHLOSION, - NATIONAL_DEX_SKARMORY, - NATIONAL_DEX_SCEPTILE, - NATIONAL_DEX_SWALOT, - NATIONAL_DEX_HUNTAIL, - NATIONAL_DEX_REGIROCK, - NATIONAL_DEX_DEOXYS, - NATIONAL_DEX_EMPOLEON, - NATIONAL_DEX_LICKILICKY, - NATIONAL_DEX_HEATRAN, - NATIONAL_DEX_GIGALITH, - NATIONAL_DEX_COFAGRIGUS, - NATIONAL_DEX_GOGOAT, - NATIONAL_DEX_AEGISLASH, - NATIONAL_DEX_VOLCANION, - NATIONAL_DEX_CRABOMINABLE, - NATIONAL_DEX_DODRIO, - NATIONAL_DEX_AERODACTYL, - NATIONAL_DEX_DRATINI, - NATIONAL_DEX_MEGANIUM, - NATIONAL_DEX_FURRET, - NATIONAL_DEX_CROBAT, - NATIONAL_DEX_SCIZOR, - NATIONAL_DEX_URSARING, - NATIONAL_DEX_KINGDRA, - NATIONAL_DEX_SHARPEDO, - NATIONAL_DEX_GOREBYSS, - NATIONAL_DEX_REGICE, - NATIONAL_DEX_ELECTIVIRE, - NATIONAL_DEX_HAXORUS, - NATIONAL_DEX_HYDREIGON, - NATIONAL_DEX_DRAGALGE, - NATIONAL_DEX_INCINEROAR, - NATIONAL_DEX_PRIMARINA, - NATIONAL_DEX_ARAQUANID, - NATIONAL_DEX_TAPU_KOKO, - NATIONAL_DEX_PHEROMOSA, - NATIONAL_DEX_BLACEPHALON, - NATIONAL_DEX_ARCANINE, - NATIONAL_DEX_RHYDON, - NATIONAL_DEX_RAIKOU, - NATIONAL_DEX_BLAZIKEN, - NATIONAL_DEX_CAMERUPT, - NATIONAL_DEX_REGISTEEL, - NATIONAL_DEX_GARCHOMP, - NATIONAL_DEX_YANMEGA, - NATIONAL_DEX_GARBODOR, - NATIONAL_DEX_SAWSBUCK, - NATIONAL_DEX_TERRAKION, - NATIONAL_DEX_TYPE_NULL, - NATIONAL_DEX_TAPU_BULU, - NATIONAL_DEX_VENUSAUR, - NATIONAL_DEX_EKANS, - NATIONAL_DEX_EXEGGUTOR, - NATIONAL_DEX_MOLTRES, - NATIONAL_DEX_MEWTWO, - NATIONAL_DEX_SLOWKING, - NATIONAL_DEX_SUICUNE, - NATIONAL_DEX_TYRANITAR, - NATIONAL_DEX_SLAKING, - NATIONAL_DEX_WAILMER, - NATIONAL_DEX_FLYGON, - NATIONAL_DEX_TROPIUS, - NATIONAL_DEX_LATIOS, - NATIONAL_DEX_HIPPOWDON, - NATIONAL_DEX_TANGROWTH, - NATIONAL_DEX_GLISCOR, - NATIONAL_DEX_VIRIZION, - NATIONAL_DEX_GOODRA, - NATIONAL_DEX_AVALUGG, - NATIONAL_DEX_PASSIMIAN, - NATIONAL_DEX_GOLISOPOD, - NATIONAL_DEX_TURTONATOR, - NATIONAL_DEX_SNORLAX, - NATIONAL_DEX_MANTINE, - NATIONAL_DEX_ENTEI, - NATIONAL_DEX_AGGRON, - NATIONAL_DEX_EELEKTROSS, - NATIONAL_DEX_COBALION, - NATIONAL_DEX_PANGORO, - NATIONAL_DEX_BEWEAR, - NATIONAL_DEX_KANGASKHAN, - NATIONAL_DEX_DRAGONITE, - NATIONAL_DEX_TORTERRA, - NATIONAL_DEX_ABOMASNOW, - NATIONAL_DEX_DUSKNOIR, - NATIONAL_DEX_JELLICENT, - NATIONAL_DEX_FERALIGATR, - NATIONAL_DEX_HARIYAMA, - NATIONAL_DEX_SILVALLY, - NATIONAL_DEX_RHYPERIOR, - NATIONAL_DEX_BUZZWOLE, - NATIONAL_DEX_NECROZMA, - NATIONAL_DEX_LAPRAS, - NATIONAL_DEX_MAMOSWINE, - NATIONAL_DEX_SCOLIPEDE, - NATIONAL_DEX_TYRANTRUM, - NATIONAL_DEX_MUDSDALE, - NATIONAL_DEX_MELMETAL, - NATIONAL_DEX_BEARTIC, - NATIONAL_DEX_SEVIPER, - NATIONAL_DEX_AURORUS, - NATIONAL_DEX_GOLURK, - NATIONAL_DEX_ZEKROM, - NATIONAL_DEX_KYUREM, - NATIONAL_DEX_XERNEAS, - NATIONAL_DEX_DRAMPA, - NATIONAL_DEX_ARCEUS, - NATIONAL_DEX_RESHIRAM, - NATIONAL_DEX_SERPERIOR, - NATIONAL_DEX_SOLGALEO, - NATIONAL_DEX_ARBOK, - NATIONAL_DEX_GROUDON, - NATIONAL_DEX_NAGANADEL, - NATIONAL_DEX_REGIGIGAS, - NATIONAL_DEX_HO_OH, - NATIONAL_DEX_XURKITREE, - NATIONAL_DEX_DHELMISE, - NATIONAL_DEX_DRAGONAIR, - NATIONAL_DEX_LUNALA, - NATIONAL_DEX_PALKIA, - NATIONAL_DEX_KYOGRE, - NATIONAL_DEX_GIRATINA, - NATIONAL_DEX_ZYGARDE, - NATIONAL_DEX_LUGIA, - NATIONAL_DEX_DIALGA, - NATIONAL_DEX_GUZZLORD, - NATIONAL_DEX_STAKATAKA, - NATIONAL_DEX_YVELTAL, - NATIONAL_DEX_MILOTIC, - NATIONAL_DEX_GYARADOS, - NATIONAL_DEX_RAYQUAZA, - NATIONAL_DEX_ONIX, - NATIONAL_DEX_STEELIX, - NATIONAL_DEX_CELESTEELA, - NATIONAL_DEX_WAILORD, + SPECIES_JOLTIK, + SPECIES_FLABEBE, + SPECIES_CUTIEFLY, + SPECIES_COMFEY, + SPECIES_COSMOEM, + SPECIES_DIGLETT, + SPECIES_NATU, + SPECIES_AZURILL, + SPECIES_BUDEW, + SPECIES_BURMY, + SPECIES_CHINGLING, + SPECIES_SHAYMIN, + SPECIES_FOONGUS, + SPECIES_TYNAMO, + SPECIES_FLOETTE, + SPECIES_SPRITZEE, + SPECIES_DEDENNE, + SPECIES_KLEFKI, + SPECIES_RIBOMBEE, + SPECIES_WISHIWASHI, + SPECIES_MORELULL, + SPECIES_MIMIKYU, + SPECIES_COSMOG, + SPECIES_MELTAN, + SPECIES_CATERPIE, + SPECIES_WEEDLE, + SPECIES_PIDGEY, + SPECIES_RATTATA, + SPECIES_SPEAROW, + SPECIES_PARAS, + SPECIES_MAGNEMITE, + SPECIES_SHELLDER, + SPECIES_DITTO, + SPECIES_EEVEE, + SPECIES_PICHU, + SPECIES_CLEFFA, + SPECIES_IGGLYBUFF, + SPECIES_TOGEPI, + SPECIES_SUNKERN, + SPECIES_WURMPLE, + SPECIES_TAILLOW, + SPECIES_ROSELIA, + SPECIES_CASTFORM, + SPECIES_JIRACHI, + SPECIES_STARLY, + SPECIES_KRICKETOT, + SPECIES_COMBEE, + SPECIES_SHELLOS, + SPECIES_ROTOM, + SPECIES_UXIE, + SPECIES_MESPRIT, + SPECIES_AZELF, + SPECIES_MANAPHY, + SPECIES_PIDOVE, + SPECIES_DRILBUR, + SPECIES_SEWADDLE, + SPECIES_COTTONEE, + SPECIES_DWEBBLE, + SPECIES_SOLOSIS, + SPECIES_KLINK, + SPECIES_LITWICK, + SPECIES_DURANT, + SPECIES_FROAKIE, + SPECIES_FLETCHLING, + SPECIES_SCATTERBUG, + SPECIES_SPEWPA, + SPECIES_ESPURR, + SPECIES_CARBINK, + SPECIES_GOOMY, + SPECIES_ROWLET, + SPECIES_PIKIPEK, + SPECIES_DEWPIDER, + SPECIES_FOMANTIS, + SPECIES_BOUNSWEET, + SPECIES_PYUKUMUKU, + SPECIES_MINIOR_SHIELD, + SPECIES_TOGEDEMARU, + SPECIES_KARTANA, + SPECIES_PIKACHU, + SPECIES_NIDORAN_F, + SPECIES_MEOWTH, + SPECIES_GEODUDE, + SPECIES_KRABBY, + SPECIES_EXEGGCUTE, + SPECIES_CUBONE, + SPECIES_HORSEA, + SPECIES_OMANYTE, + SPECIES_MEW, + SPECIES_BELLOSSOM, + SPECIES_MARILL, + SPECIES_HOPPIP, + SPECIES_WOOPER, + SPECIES_SWINUB, + SPECIES_SMOOCHUM, + SPECIES_TORCHIC, + SPECIES_MUDKIP, + SPECIES_ZIGZAGOON, + SPECIES_RALTS, + SPECIES_SHROOMISH, + SPECIES_ARON, + SPECIES_PLUSLE, + SPECIES_MINUN, + SPECIES_GULPIN, + SPECIES_CACNEA, + SPECIES_SWABLU, + SPECIES_BARBOACH, + SPECIES_CLAMPERL, + SPECIES_TURTWIG, + SPECIES_PIPLUP, + SPECIES_PACHIRISU, + SPECIES_CHERUBI, + SPECIES_DRIFLOON, + SPECIES_BUNEARY, + SPECIES_STUNKY, + SPECIES_FINNEON, + SPECIES_PHIONE, + SPECIES_VICTINI, + SPECIES_LILLIPUP, + SPECIES_PURRLOIN, + SPECIES_ROGGENROLA, + SPECIES_WOOBAT, + SPECIES_VENIPEDE, + SPECIES_MINCCINO, + SPECIES_GOTHITA, + SPECIES_VANILLITE, + SPECIES_EMOLGA, + SPECIES_SHELMET, + SPECIES_CHESPIN, + SPECIES_FENNEKIN, + SPECIES_BUNNELBY, + SPECIES_SWIRLIX, + SPECIES_INKAY, + SPECIES_PHANTUMP, + SPECIES_PUMPKABOO, + SPECIES_LITTEN, + SPECIES_POPPLIO, + SPECIES_YUNGOOS, + SPECIES_GRUBBIN, + SPECIES_MAREANIE, + SPECIES_KOMALA, + SPECIES_SQUIRTLE, + SPECIES_NIDORAN_M, + SPECIES_JIGGLYPUFF, + SPECIES_ODDISH, + SPECIES_MANKEY, + SPECIES_VOLTORB, + SPECIES_KABUTO, + SPECIES_CYNDAQUIL, + SPECIES_SPINARAK, + SPECIES_CHINCHOU, + SPECIES_MURKROW, + SPECIES_UNOWN, + SPECIES_QWILFISH, + SPECIES_PHANPY, + SPECIES_TREECKO, + SPECIES_POOCHYENA, + SPECIES_LINOONE, + SPECIES_LOTAD, + SPECIES_SEEDOT, + SPECIES_SURSKIT, + SPECIES_NINCADA, + SPECIES_SABLEYE, + SPECIES_TORKOAL, + SPECIES_BALTOY, + SPECIES_CHIMCHAR, + SPECIES_BIDOOF, + SPECIES_SHINX, + SPECIES_SHIELDON, + SPECIES_WORMADAM, + SPECIES_CHERRIM, + SPECIES_GLAMEOW, + SPECIES_BRONZOR, + SPECIES_BONSLY, + SPECIES_CHATOT, + SPECIES_TEPIG, + SPECIES_OSHAWOTT, + SPECIES_PATRAT, + SPECIES_TYMPOLE, + SPECIES_SWADLOON, + SPECIES_PETILIL, + SPECIES_YAMASK, + SPECIES_ARCHEN, + SPECIES_CINCCINO, + SPECIES_DUCKLETT, + SPECIES_KARRABLAST, + SPECIES_ELGYEM, + SPECIES_CUBCHOO, + SPECIES_PAWNIARD, + SPECIES_RUFFLET, + SPECIES_VULLABY, + SPECIES_BINACLE, + SPECIES_SKRELP, + SPECIES_CLAUNCHER, + SPECIES_HELIOPTILE, + SPECIES_NOIBAT, + SPECIES_HOOPA, + SPECIES_CHARJABUG, + SPECIES_ROCKRUFF, + SPECIES_STUFFUL, + SPECIES_WIMPOD, + SPECIES_SANDYGAST, + SPECIES_CHARMANDER, + SPECIES_KAKUNA, + SPECIES_SANDSHREW, + SPECIES_CLEFAIRY, + SPECIES_VULPIX, + SPECIES_POLIWAG, + SPECIES_KOFFING, + SPECIES_GOLDEEN, + SPECIES_TOTODILE, + SPECIES_TOGETIC, + SPECIES_MAREEP, + SPECIES_SKIPLOOM, + SPECIES_PINECO, + SPECIES_SNUBBULL, + SPECIES_SHUCKLE, + SPECIES_TEDDIURSA, + SPECIES_CORSOLA, + SPECIES_REMORAID, + SPECIES_HOUNDOUR, + SPECIES_PORYGON2, + SPECIES_ELEKID, + SPECIES_LARVITAR, + SPECIES_CELEBI, + SPECIES_SILCOON, + SPECIES_WINGULL, + SPECIES_WHISMUR, + SPECIES_SKITTY, + SPECIES_MAWILE, + SPECIES_MEDITITE, + SPECIES_ELECTRIKE, + SPECIES_ILLUMISE, + SPECIES_CORPHISH, + SPECIES_FEEBAS, + SPECIES_SHUPPET, + SPECIES_CHIMECHO, + SPECIES_WYNAUT, + SPECIES_LUVDISC, + SPECIES_BAGON, + SPECIES_BELDUM, + SPECIES_STARAVIA, + SPECIES_MIME_JR, + SPECIES_HAPPINY, + SPECIES_MUNCHLAX, + SPECIES_SNIVY, + SPECIES_PANSAGE, + SPECIES_PANSEAR, + SPECIES_PANPOUR, + SPECIES_MUNNA, + SPECIES_TRANQUILL, + SPECIES_TIMBURR, + SPECIES_DARUMAKA, + SPECIES_SCRAGGY, + SPECIES_TRUBBISH, + SPECIES_DUOSION, + SPECIES_DEERLING, + SPECIES_AMOONGUSS, + SPECIES_FERROSEED, + SPECIES_KLANG, + SPECIES_KLINKLANG, + SPECIES_LAMPENT, + SPECIES_AXEW, + SPECIES_MELOETTA, + SPECIES_FROGADIER, + SPECIES_LITLEO, + SPECIES_PANCHAM, + SPECIES_MEOWSTIC, + SPECIES_BRIONNE, + SPECIES_TRUMBEAK, + SPECIES_CRABRAWLER, + SPECIES_ORICORIO, + SPECIES_SALANDIT, + SPECIES_JANGMO_O, + SPECIES_POIPOLE, + SPECIES_BULBASAUR, + SPECIES_METAPOD, + SPECIES_RATICATE, + SPECIES_DUGTRIO, + SPECIES_GROWLITHE, + SPECIES_BELLSPROUT, + SPECIES_HOOTHOOT, + SPECIES_MISDREAVUS, + SPECIES_SLUGMA, + SPECIES_TYROGUE, + SPECIES_MAGBY, + SPECIES_MARSHTOMP, + SPECIES_CASCOON, + SPECIES_SWELLOW, + SPECIES_VOLBEAT, + SPECIES_NUMEL, + SPECIES_SPOINK, + SPECIES_TRAPINCH, + SPECIES_ANORITH, + SPECIES_SNORUNT, + SPECIES_BUIZEL, + SPECIES_GIBLE, + SPECIES_RIOLU, + SPECIES_CROAGUNK, + SPECIES_EXCADRILL, + SPECIES_WHIMSICOTT, + SPECIES_SANDILE, + SPECIES_TIRTOUGA, + SPECIES_ZORUA, + SPECIES_GOTHORITA, + SPECIES_STUNFISK, + SPECIES_QUILLADIN, + SPECIES_FLETCHINDER, + SPECIES_DIANCIE, + SPECIES_DARTRIX, + SPECIES_TORRACAT, + SPECIES_GUMSHOOS, + SPECIES_TOXAPEX, + SPECIES_STEENEE, + SPECIES_MARSHADOW, + SPECIES_RAICHU, + SPECIES_NIDORINA, + SPECIES_ZUBAT, + SPECIES_GLOOM, + SPECIES_PSYDUCK, + SPECIES_MACHOP, + SPECIES_FARFETCHD, + SPECIES_STARYU, + SPECIES_JOLTEON, + SPECIES_PORYGON, + SPECIES_SENTRET, + SPECIES_FLAAFFY, + SPECIES_AZUMARILL, + SPECIES_JUMPLUFF, + SPECIES_AIPOM, + SPECIES_SUNFLORA, + SPECIES_MAGCARGO, + SPECIES_KIRLIA, + SPECIES_MASQUERAIN, + SPECIES_SLAKOTH, + SPECIES_NINJASK, + SPECIES_SHEDINJA, + SPECIES_CARVANHA, + SPECIES_DUSKULL, + SPECIES_SPHEAL, + SPECIES_PRINPLUP, + SPECIES_HIPPOPOTAS, + SPECIES_SKORUPI, + SPECIES_GLACEON, + SPECIES_SERVINE, + SPECIES_DEWOTT, + SPECIES_BLITZLE, + SPECIES_PALPITOAD, + SPECIES_GALVANTULA, + SPECIES_ACCELGOR, + SPECIES_DEINO, + SPECIES_HONEDGE, + SPECIES_DOUBLADE, + SPECIES_AROMATISSE, + SPECIES_SLURPUFF, + SPECIES_TYRUNT, + SPECIES_HAWLUCHA, + SPECIES_SLIGGOO, + SPECIES_LYCANROC, + SPECIES_NIDORINO, + SPECIES_ABRA, + SPECIES_TENTACOOL, + SPECIES_GRIMER, + SPECIES_MAGIKARP, + SPECIES_FLAREON, + SPECIES_CHIKORITA, + SPECIES_QUILAVA, + SPECIES_ESPEON, + SPECIES_SNEASEL, + SPECIES_OCTILLERY, + SPECIES_DELIBIRD, + SPECIES_GROVYLE, + SPECIES_COMBUSKEN, + SPECIES_LAIRON, + SPECIES_GRUMPIG, + SPECIES_WHISCASH, + SPECIES_MONFERNO, + SPECIES_LUXIO, + SPECIES_ROSERADE, + SPECIES_CRANIDOS, + SPECIES_MOTHIM, + SPECIES_GASTRODON, + SPECIES_MISMAGIUS, + SPECIES_HONCHKROW, + SPECIES_PORYGON_Z, + SPECIES_HERDIER, + SPECIES_BOLDORE, + SPECIES_SWOOBAT, + SPECIES_MIENFOO, + SPECIES_SKIDDO, + SPECIES_GOURGEIST, + SPECIES_LURANTIS, + SPECIES_BRUXISH, + SPECIES_IVYSAUR, + SPECIES_WARTORTLE, + SPECIES_BEEDRILL, + SPECIES_SANDSLASH, + SPECIES_WIGGLYTUFF, + SPECIES_PARASECT, + SPECIES_VENONAT, + SPECIES_PERSIAN, + SPECIES_PRIMEAPE, + SPECIES_POLIWHIRL, + SPECIES_WEEPINBELL, + SPECIES_GRAVELER, + SPECIES_PONYTA, + SPECIES_MAGNETON, + SPECIES_DROWZEE, + SPECIES_MAROWAK, + SPECIES_RHYHORN, + SPECIES_TANGELA, + SPECIES_VAPOREON, + SPECIES_OMASTAR, + SPECIES_LEDYBA, + SPECIES_UMBREON, + SPECIES_MIGHTYENA, + SPECIES_BEAUTIFLY, + SPECIES_NUZLEAF, + SPECIES_LOUDRED, + SPECIES_MAKUHITA, + SPECIES_NOSEPASS, + SPECIES_LUNATONE, + SPECIES_LILEEP, + SPECIES_KECLEON, + SPECIES_RELICANTH, + SPECIES_BIBAREL, + SPECIES_KRICKETUNE, + SPECIES_PURUGLY, + SPECIES_SKUNTANK, + SPECIES_SPIRITOMB, + SPECIES_MANTYKE, + SPECIES_SNOVER, + SPECIES_LEAFEON, + SPECIES_PIGNITE, + SPECIES_SIMISEAR, + SPECIES_SIMIPOUR, + SPECIES_BASCULIN_RED, + SPECIES_KROKOROK, + SPECIES_MARACTUS, + SPECIES_REUNICLUS, + SPECIES_ESCAVALIER, + SPECIES_FERROTHORN, + SPECIES_BEHEEYEM, + SPECIES_CHANDELURE, + SPECIES_FRAXURE, + SPECIES_GOLETT, + SPECIES_BRAIXEN, + SPECIES_DIGGERSBY, + SPECIES_HELIOLISK, + SPECIES_SYLVEON, + SPECIES_BERGMITE, + SPECIES_MUDBRAY, + SPECIES_SHIINOTIC, + SPECIES_MAGEARNA, + SPECIES_CHARMELEON, + SPECIES_BUTTERFREE, + SPECIES_PIDGEOTTO, + SPECIES_NINETALES, + SPECIES_SEEL, + SPECIES_CHANSEY, + SPECIES_STARMIE, + SPECIES_ELECTABUZZ, + SPECIES_CROCONAW, + SPECIES_ARIADOS, + SPECIES_POLITOED, + SPECIES_GLIGAR, + SPECIES_PILOSWINE, + SPECIES_DONPHAN, + SPECIES_DELCATTY, + SPECIES_SPINDA, + SPECIES_VIBRAVA, + SPECIES_ALTARIA, + SPECIES_CRAWDAUNT, + SPECIES_BANETTE, + SPECIES_SEALEO, + SPECIES_SHELGON, + SPECIES_GROTLE, + SPECIES_FLOATZEL, + SPECIES_WEAVILE, + SPECIES_WATCHOG, + SPECIES_LIEPARD, + SPECIES_SIMISAGE, + SPECIES_MUSHARNA, + SPECIES_AUDINO, + SPECIES_LILLIGANT, + SPECIES_SCRAFTY, + SPECIES_VANILLISH, + SPECIES_CRYOGONAL, + SPECIES_LARVESTA, + SPECIES_FLORGES, + SPECIES_TOUCANNON, + SPECIES_FEAROW, + SPECIES_VILEPLUME, + SPECIES_SLOWPOKE, + SPECIES_MUK, + SPECIES_ELECTRODE, + SPECIES_LICKITUNG, + SPECIES_WEEZING, + SPECIES_SEADRA, + SPECIES_BAYLEEF, + SPECIES_LANTURN, + SPECIES_SUDOWOODO, + SPECIES_YANMA, + SPECIES_FORRETRESS, + SPECIES_SMEARGLE, + SPECIES_MILTANK, + SPECIES_PUPITAR, + SPECIES_DUSTOX, + SPECIES_LOMBRE, + SPECIES_PELIPPER, + SPECIES_BRELOOM, + SPECIES_SOLROCK, + SPECIES_ABSOL, + SPECIES_METANG, + SPECIES_INFERNAPE, + SPECIES_STARAPTOR, + SPECIES_VESPIQUEN, + SPECIES_AMBIPOM, + SPECIES_DRIFBLIM, + SPECIES_LOPUNNY, + SPECIES_LUCARIO, + SPECIES_LUMINEON, + SPECIES_MAGNEZONE, + SPECIES_STOUTLAND, + SPECIES_UNFEZANT, + SPECIES_GURDURR, + SPECIES_LEAVANNY, + SPECIES_WHIRLIPEDE, + SPECIES_CARRACOSTA, + SPECIES_FRILLISH, + SPECIES_ALOMOMOLA, + SPECIES_EELEKTRIK, + SPECIES_MANDIBUZZ, + SPECIES_TALONFLAME, + SPECIES_VIVILLON, + SPECIES_FURFROU, + SPECIES_SALAZZLE, + SPECIES_TSAREENA, + SPECIES_HAKAMO_O, + SPECIES_TAPU_LELE, + SPECIES_NIHILEGO, + SPECIES_NIDOQUEEN, + SPECIES_CLEFABLE, + SPECIES_POLIWRATH, + SPECIES_KADABRA, + SPECIES_GASTLY, + SPECIES_KINGLER, + SPECIES_SEAKING, + SPECIES_MR_MIME, + SPECIES_MAGMAR, + SPECIES_KABUTOPS, + SPECIES_WOBBUFFET, + SPECIES_SHIFTRY, + SPECIES_MEDICHAM, + SPECIES_CACTURNE, + SPECIES_ZANGOOSE, + SPECIES_BASTIODON, + SPECIES_BRONZONG, + SPECIES_DRAPION, + SPECIES_TOXICROAK, + SPECIES_FROSLASS, + SPECIES_THROH, + SPECIES_DARMANITAN, + SPECIES_SWANNA, + SPECIES_VANILLUXE, + SPECIES_BARBARACLE, + SPECIES_CLAWITZER, + SPECIES_AMAURA, + SPECIES_PALOSSAND, + SPECIES_TAPU_FINI, + SPECIES_NIDOKING, + SPECIES_GOLEM, + SPECIES_DODUO, + SPECIES_HITMONCHAN, + SPECIES_JYNX, + SPECIES_TAUROS, + SPECIES_LEDIAN, + SPECIES_AMPHAROS, + SPECIES_QUAGSIRE, + SPECIES_GRANBULL, + SPECIES_HOUNDOOM, + SPECIES_STANTLER, + SPECIES_HITMONTOP, + SPECIES_VIGOROTH, + SPECIES_WALREIN, + SPECIES_LATIAS, + SPECIES_LUXRAY, + SPECIES_GABITE, + SPECIES_CARNIVINE, + SPECIES_PROBOPASS, + SPECIES_CONKELDURR, + SPECIES_SAWK, + SPECIES_CRUSTLE, + SPECIES_SIGILYPH, + SPECIES_ARCHEOPS, + SPECIES_MIENSHAO, + SPECIES_HEATMOR, + SPECIES_ZWEILOUS, + SPECIES_KELDEO, + SPECIES_PIDGEOT, + SPECIES_VENOMOTH, + SPECIES_ALAKAZAM, + SPECIES_MACHOKE, + SPECIES_CLOYSTER, + SPECIES_GENGAR, + SPECIES_HITMONLEE, + SPECIES_SCYTHER, + SPECIES_PINSIR, + SPECIES_XATU, + SPECIES_GIRAFARIG, + SPECIES_DUNSPARCE, + SPECIES_HERACROSS, + SPECIES_BLISSEY, + SPECIES_SWAMPERT, + SPECIES_LUDICOLO, + SPECIES_EXPLOUD, + SPECIES_MANECTRIC, + SPECIES_CLAYDOL, + SPECIES_CRADILY, + SPECIES_ARMALDO, + SPECIES_GLALIE, + SPECIES_SALAMENCE, + SPECIES_TOGEKISS, + SPECIES_CRESSELIA, + SPECIES_DARKRAI, + SPECIES_SAMUROTT, + SPECIES_SEISMITOAD, + SPECIES_KROOKODILE, + SPECIES_GOTHITELLE, + SPECIES_BRAVIARY, + SPECIES_TORNADUS, + SPECIES_THUNDURUS, + SPECIES_LANDORUS, + SPECIES_GENESECT, + SPECIES_DELPHOX, + SPECIES_GRENINJA, + SPECIES_PYROAR, + SPECIES_MALAMAR, + SPECIES_TREVENANT, + SPECIES_NOIVERN, + SPECIES_VIKAVOLT, + SPECIES_ORANGURU, + SPECIES_ZERAORA, + SPECIES_BLASTOISE, + SPECIES_GOLBAT, + SPECIES_MACHAMP, + SPECIES_TENTACRUEL, + SPECIES_SLOWBRO, + SPECIES_HAUNTER, + SPECIES_HYPNO, + SPECIES_ZAPDOS, + SPECIES_NOCTOWL, + SPECIES_GARDEVOIR, + SPECIES_DUSCLOPS, + SPECIES_METAGROSS, + SPECIES_RAMPARDOS, + SPECIES_MAGMORTAR, + SPECIES_GALLADE, + SPECIES_EMBOAR, + SPECIES_ZEBSTRIKA, + SPECIES_ZOROARK, + SPECIES_DRUDDIGON, + SPECIES_BISHARP, + SPECIES_BOUFFALANT, + SPECIES_VOLCARONA, + SPECIES_CHESNAUGHT, + SPECIES_DECIDUEYE, + SPECIES_KOMMO_O, + SPECIES_CHARIZARD, + SPECIES_GOLDUCK, + SPECIES_VICTREEBEL, + SPECIES_RAPIDASH, + SPECIES_DEWGONG, + SPECIES_ARTICUNO, + SPECIES_TYPHLOSION, + SPECIES_SKARMORY, + SPECIES_SCEPTILE, + SPECIES_SWALOT, + SPECIES_HUNTAIL, + SPECIES_REGIROCK, + SPECIES_DEOXYS, + SPECIES_EMPOLEON, + SPECIES_LICKILICKY, + SPECIES_HEATRAN, + SPECIES_GIGALITH, + SPECIES_COFAGRIGUS, + SPECIES_GOGOAT, + SPECIES_AEGISLASH, + SPECIES_VOLCANION, + SPECIES_CRABOMINABLE, + SPECIES_DODRIO, + SPECIES_AERODACTYL, + SPECIES_DRATINI, + SPECIES_MEGANIUM, + SPECIES_FURRET, + SPECIES_CROBAT, + SPECIES_SCIZOR, + SPECIES_URSARING, + SPECIES_KINGDRA, + SPECIES_SHARPEDO, + SPECIES_GOREBYSS, + SPECIES_REGICE, + SPECIES_ELECTIVIRE, + SPECIES_HAXORUS, + SPECIES_HYDREIGON, + SPECIES_DRAGALGE, + SPECIES_INCINEROAR, + SPECIES_PRIMARINA, + SPECIES_ARAQUANID, + SPECIES_TAPU_KOKO, + SPECIES_PHEROMOSA, + SPECIES_BLACEPHALON, + SPECIES_ARCANINE, + SPECIES_RHYDON, + SPECIES_RAIKOU, + SPECIES_BLAZIKEN, + SPECIES_CAMERUPT, + SPECIES_REGISTEEL, + SPECIES_GARCHOMP, + SPECIES_YANMEGA, + SPECIES_GARBODOR, + SPECIES_SAWSBUCK, + SPECIES_TERRAKION, + SPECIES_TYPE_NULL, + SPECIES_TAPU_BULU, + SPECIES_VENUSAUR, + SPECIES_EKANS, + SPECIES_EXEGGUTOR, + SPECIES_MOLTRES, + SPECIES_MEWTWO, + SPECIES_SLOWKING, + SPECIES_SUICUNE, + SPECIES_TYRANITAR, + SPECIES_SLAKING, + SPECIES_WAILMER, + SPECIES_FLYGON, + SPECIES_TROPIUS, + SPECIES_LATIOS, + SPECIES_HIPPOWDON, + SPECIES_TANGROWTH, + SPECIES_GLISCOR, + SPECIES_VIRIZION, + SPECIES_GOODRA, + SPECIES_AVALUGG, + SPECIES_PASSIMIAN, + SPECIES_GOLISOPOD, + SPECIES_TURTONATOR, + SPECIES_SNORLAX, + SPECIES_MANTINE, + SPECIES_ENTEI, + SPECIES_AGGRON, + SPECIES_EELEKTROSS, + SPECIES_COBALION, + SPECIES_PANGORO, + SPECIES_BEWEAR, + SPECIES_KANGASKHAN, + SPECIES_DRAGONITE, + SPECIES_TORTERRA, + SPECIES_ABOMASNOW, + SPECIES_DUSKNOIR, + SPECIES_JELLICENT, + SPECIES_FERALIGATR, + SPECIES_HARIYAMA, + SPECIES_SILVALLY, + SPECIES_RHYPERIOR, + SPECIES_BUZZWOLE, + SPECIES_NECROZMA, + SPECIES_LAPRAS, + SPECIES_MAMOSWINE, + SPECIES_SCOLIPEDE, + SPECIES_TYRANTRUM, + SPECIES_MUDSDALE, + SPECIES_MELMETAL, + SPECIES_BEARTIC, + SPECIES_SEVIPER, + SPECIES_AURORUS, + SPECIES_GOLURK, + SPECIES_ZEKROM, + SPECIES_KYUREM, + SPECIES_XERNEAS, + SPECIES_DRAMPA, + SPECIES_ARCEUS, + SPECIES_RESHIRAM, + SPECIES_SERPERIOR, + SPECIES_SOLGALEO, + SPECIES_ARBOK, + SPECIES_GROUDON, + SPECIES_NAGANADEL, + SPECIES_REGIGIGAS, + SPECIES_HO_OH, + SPECIES_XURKITREE, + SPECIES_DHELMISE, + SPECIES_DRAGONAIR, + SPECIES_LUNALA, + SPECIES_PALKIA, + SPECIES_KYOGRE, + SPECIES_GIRATINA, + SPECIES_ZYGARDE, + SPECIES_LUGIA, + SPECIES_DIALGA, + SPECIES_GUZZLORD, + SPECIES_STAKATAKA, + SPECIES_YVELTAL, + SPECIES_MILOTIC, + SPECIES_GYARADOS, + SPECIES_RAYQUAZA, + SPECIES_ONIX, + SPECIES_STEELIX, + SPECIES_CELESTEELA, + SPECIES_WAILORD, }; +const u16 gPokedexOrderHeightCount = ARRAY_COUNT(gPokedexOrder_Height); + const u16 gPokedexOrder_Type[] = { + SPECIES_RATTATA, + SPECIES_RATICATE, + SPECIES_MEOWTH, + SPECIES_PERSIAN, + SPECIES_LICKITUNG, + SPECIES_CHANSEY, + SPECIES_KANGASKHAN, + SPECIES_TAUROS, + SPECIES_DITTO, + SPECIES_EEVEE, + SPECIES_PORYGON, + SPECIES_SNORLAX, + SPECIES_SENTRET, + SPECIES_FURRET, + SPECIES_AIPOM, + SPECIES_DUNSPARCE, + SPECIES_TEDDIURSA, + SPECIES_URSARING, + SPECIES_PORYGON2, + SPECIES_STANTLER, + SPECIES_SMEARGLE, + SPECIES_MILTANK, + SPECIES_BLISSEY, + SPECIES_ZIGZAGOON, + SPECIES_LINOONE, + SPECIES_SLAKOTH, + SPECIES_VIGOROTH, + SPECIES_SLAKING, + SPECIES_WHISMUR, + SPECIES_LOUDRED, + SPECIES_EXPLOUD, + SPECIES_SKITTY, + SPECIES_DELCATTY, + SPECIES_SPINDA, + SPECIES_ZANGOOSE, + SPECIES_CASTFORM, + SPECIES_KECLEON, + SPECIES_BIDOOF, + SPECIES_AMBIPOM, + SPECIES_BUNEARY, + SPECIES_LOPUNNY, + SPECIES_GLAMEOW, + SPECIES_PURUGLY, + SPECIES_HAPPINY, + SPECIES_MUNCHLAX, + SPECIES_LICKILICKY, + SPECIES_PORYGON_Z, + SPECIES_REGIGIGAS, + SPECIES_ARCEUS, + SPECIES_PATRAT, + SPECIES_WATCHOG, + SPECIES_LILLIPUP, + SPECIES_HERDIER, + SPECIES_STOUTLAND, + SPECIES_AUDINO, + SPECIES_MINCCINO, + SPECIES_CINCCINO, + SPECIES_BOUFFALANT, + SPECIES_BUNNELBY, + SPECIES_FURFROU, + SPECIES_YUNGOOS, + SPECIES_GUMSHOOS, + SPECIES_TYPE_NULL, + SPECIES_SILVALLY, + SPECIES_KOMALA, + SPECIES_MELOETTA_PIROUETTE, + SPECIES_STUFFUL, + SPECIES_BEWEAR, + SPECIES_PIDGEY, + SPECIES_PIDGEOTTO, + SPECIES_PIDGEOT, + SPECIES_SPEAROW, + SPECIES_FEAROW, + SPECIES_FARFETCHD, + SPECIES_DODUO, + SPECIES_DODRIO, + SPECIES_HOOTHOOT, + SPECIES_NOCTOWL, + SPECIES_TAILLOW, + SPECIES_SWELLOW, + SPECIES_SWABLU, + SPECIES_STARLY, + SPECIES_STARAVIA, + SPECIES_STARAPTOR, + SPECIES_CHATOT, + SPECIES_PIDOVE, + SPECIES_TRANQUILL, + SPECIES_UNFEZANT, + SPECIES_RUFFLET, + SPECIES_BRAVIARY, + SPECIES_FLETCHLING, + SPECIES_PIKIPEK, + SPECIES_TRUMBEAK, + SPECIES_TOUCANNON, + SPECIES_DIGGERSBY, + SPECIES_BIBAREL, + SPECIES_DEERLING, + SPECIES_SAWSBUCK, + SPECIES_GIRAFARIG, + SPECIES_MELOETTA, + SPECIES_ORANGURU, + SPECIES_DRAMPA, + SPECIES_JIGGLYPUFF, + SPECIES_WIGGLYTUFF, + SPECIES_IGGLYBUFF, + SPECIES_AZURILL, + SPECIES_MANKEY, + SPECIES_PRIMEAPE, + SPECIES_MACHOP, + SPECIES_MACHOKE, + SPECIES_MACHAMP, + SPECIES_HITMONLEE, + SPECIES_HITMONCHAN, + SPECIES_TYROGUE, + SPECIES_HITMONTOP, + SPECIES_MAKUHITA, + SPECIES_HARIYAMA, + SPECIES_RIOLU, + SPECIES_TIMBURR, + SPECIES_GURDURR, + SPECIES_CONKELDURR, + SPECIES_THROH, + SPECIES_SAWK, + SPECIES_MIENFOO, + SPECIES_MIENSHAO, + SPECIES_PANCHAM, + SPECIES_CRABRAWLER, + SPECIES_PASSIMIAN, + SPECIES_HAWLUCHA, + SPECIES_MARSHADOW, + SPECIES_LUCARIO, + SPECIES_MEDITITE, + SPECIES_MEDICHAM, + SPECIES_CRABOMINABLE, + SPECIES_PANGORO, + SPECIES_TORNADUS, + SPECIES_NOIBAT, + SPECIES_NOIVERN, + SPECIES_EKANS, + SPECIES_ARBOK, + SPECIES_NIDORAN_F, + SPECIES_NIDORINA, + SPECIES_NIDORAN_M, + SPECIES_NIDORINO, + SPECIES_GRIMER, + SPECIES_MUK, + SPECIES_KOFFING, + SPECIES_WEEZING, + SPECIES_GULPIN, + SPECIES_SWALOT, + SPECIES_SEVIPER, + SPECIES_TRUBBISH, + SPECIES_GARBODOR, + SPECIES_POIPOLE, + SPECIES_CROAGUNK, + SPECIES_TOXICROAK, + SPECIES_ZUBAT, + SPECIES_GOLBAT, + SPECIES_CROBAT, + SPECIES_NIDOQUEEN, + SPECIES_NIDOKING, + SPECIES_SKORUPI, + SPECIES_SALANDIT, + SPECIES_SALAZZLE, + SPECIES_SKRELP, + SPECIES_MAREANIE, + SPECIES_TOXAPEX, + SPECIES_DRAGALGE, + SPECIES_NAGANADEL, + SPECIES_STUNKY, + SPECIES_SKUNTANK, + SPECIES_DRAPION, + SPECIES_SANDSHREW, + SPECIES_SANDSLASH, + SPECIES_DIGLETT, + SPECIES_DUGTRIO, + SPECIES_CUBONE, + SPECIES_MAROWAK, + SPECIES_PHANPY, + SPECIES_DONPHAN, + SPECIES_TRAPINCH, + SPECIES_GROUDON, + SPECIES_HIPPOPOTAS, + SPECIES_HIPPOWDON, + SPECIES_DRILBUR, + SPECIES_MUDBRAY, + SPECIES_MUDSDALE, + SPECIES_GLIGAR, + SPECIES_GLISCOR, + SPECIES_LANDORUS, + SPECIES_RHYHORN, + SPECIES_RHYDON, + SPECIES_RHYPERIOR, + SPECIES_GOLETT, + SPECIES_GOLURK, + SPECIES_EXCADRILL, + SPECIES_STUNFISK, + SPECIES_BALTOY, + SPECIES_CLAYDOL, + SPECIES_VIBRAVA, + SPECIES_FLYGON, + SPECIES_SANDILE, + SPECIES_KROKOROK, + SPECIES_KROOKODILE, + SPECIES_SUDOWOODO, + SPECIES_NOSEPASS, + SPECIES_REGIROCK, + SPECIES_CRANIDOS, + SPECIES_RAMPARDOS, + SPECIES_BONSLY, + SPECIES_ROGGENROLA, + SPECIES_BOLDORE, + SPECIES_GIGALITH, + SPECIES_ROCKRUFF, + SPECIES_LYCANROC, + SPECIES_TERRAKION, + SPECIES_AERODACTYL, + SPECIES_ARCHEN, + SPECIES_ARCHEOPS, + SPECIES_MINIOR_SHIELD, + SPECIES_NIHILEGO, + SPECIES_GEODUDE, + SPECIES_GRAVELER, + SPECIES_GOLEM, + SPECIES_ONIX, + SPECIES_LARVITAR, + SPECIES_PUPITAR, + SPECIES_ANORITH, + SPECIES_ARMALDO, + SPECIES_SHIELDON, + SPECIES_BASTIODON, + SPECIES_PROBOPASS, + SPECIES_STAKATAKA, + SPECIES_OMANYTE, + SPECIES_OMASTAR, + SPECIES_KABUTO, + SPECIES_KABUTOPS, + SPECIES_BINACLE, + SPECIES_BARBARACLE, + SPECIES_LILEEP, + SPECIES_CRADILY, + SPECIES_LUNATONE, + SPECIES_SOLROCK, + SPECIES_AMAURA, + SPECIES_AURORUS, + SPECIES_TYRUNT, + SPECIES_TYRANTRUM, + SPECIES_TYRANITAR, + SPECIES_CARBINK, + SPECIES_DIANCIE, + SPECIES_CATERPIE, + SPECIES_METAPOD, + SPECIES_PINSIR, + SPECIES_PINECO, + SPECIES_WURMPLE, + SPECIES_SILCOON, + SPECIES_CASCOON, + SPECIES_VOLBEAT, + SPECIES_ILLUMISE, + SPECIES_KRICKETOT, + SPECIES_KRICKETUNE, + SPECIES_BURMY, + SPECIES_KARRABLAST, + SPECIES_SHELMET, + SPECIES_ACCELGOR, + SPECIES_SCATTERBUG, + SPECIES_SPEWPA, + SPECIES_GRUBBIN, + SPECIES_HERACROSS, + SPECIES_BUZZWOLE, + SPECIES_PHEROMOSA, + SPECIES_BUTTERFREE, + SPECIES_SCYTHER, + SPECIES_LEDYBA, + SPECIES_LEDIAN, + SPECIES_YANMA, + SPECIES_BEAUTIFLY, + SPECIES_MASQUERAIN, + SPECIES_NINJASK, + SPECIES_MOTHIM, + SPECIES_COMBEE, + SPECIES_VESPIQUEN, + SPECIES_YANMEGA, + SPECIES_VIVILLON, + SPECIES_WEEDLE, + SPECIES_KAKUNA, + SPECIES_BEEDRILL, + SPECIES_VENONAT, + SPECIES_VENOMOTH, + SPECIES_SPINARAK, + SPECIES_ARIADOS, + SPECIES_DUSTOX, + SPECIES_VENIPEDE, + SPECIES_WHIRLIPEDE, + SPECIES_SCOLIPEDE, + SPECIES_NINCADA, + SPECIES_WORMADAM_SANDY, + SPECIES_SHUCKLE, + SPECIES_DWEBBLE, + SPECIES_CRUSTLE, + SPECIES_SHEDINJA, + SPECIES_FORRETRESS, + SPECIES_SCIZOR, + SPECIES_WORMADAM_TRASH, + SPECIES_ESCAVALIER, + SPECIES_DURANT, + SPECIES_GENESECT, + SPECIES_LARVESTA, + SPECIES_VOLCARONA, + SPECIES_SURSKIT, + SPECIES_WIMPOD, + SPECIES_GOLISOPOD, + SPECIES_PARAS, + SPECIES_PARASECT, + SPECIES_WORMADAM, + SPECIES_SEWADDLE, + SPECIES_SWADLOON, + SPECIES_LEAVANNY, + SPECIES_JOLTIK, + SPECIES_GALVANTULA, + SPECIES_CHARJABUG, + SPECIES_VIKAVOLT, + SPECIES_CUTIEFLY, + SPECIES_RIBOMBEE, + SPECIES_MISDREAVUS, + SPECIES_SHUPPET, + SPECIES_BANETTE, + SPECIES_DUSKULL, + SPECIES_DUSCLOPS, + SPECIES_MISMAGIUS, + SPECIES_DUSKNOIR, + SPECIES_YAMASK, + SPECIES_COFAGRIGUS, + SPECIES_DRIFLOON, + SPECIES_DRIFBLIM, + SPECIES_GASTLY, + SPECIES_HAUNTER, + SPECIES_GENGAR, + SPECIES_SANDYGAST, + SPECIES_PALOSSAND, + SPECIES_LITWICK, + SPECIES_LAMPENT, + SPECIES_CHANDELURE, + SPECIES_PHANTUMP, + SPECIES_TREVENANT, + SPECIES_PUMPKABOO, + SPECIES_GOURGEIST, + SPECIES_DHELMISE, + SPECIES_GIRATINA, + SPECIES_SPIRITOMB, + SPECIES_MIMIKYU, + SPECIES_REGISTEEL, + SPECIES_KLINK, + SPECIES_KLANG, + SPECIES_KLINKLANG, + SPECIES_MELTAN, + SPECIES_MELMETAL, + SPECIES_COBALION, + SPECIES_SKARMORY, + SPECIES_CELESTEELA, + SPECIES_STEELIX, + SPECIES_ARON, + SPECIES_LAIRON, + SPECIES_AGGRON, + SPECIES_HONEDGE, + SPECIES_DOUBLADE, + SPECIES_AEGISLASH, + SPECIES_BELDUM, + SPECIES_METANG, + SPECIES_METAGROSS, + SPECIES_JIRACHI, + SPECIES_BRONZOR, + SPECIES_BRONZONG, + SPECIES_DIALGA, + SPECIES_MAWILE, + SPECIES_KLEFKI, + SPECIES_MAGEARNA, + SPECIES_CHARMANDER, + SPECIES_CHARMELEON, + SPECIES_VULPIX, + SPECIES_NINETALES, + SPECIES_GROWLITHE, + SPECIES_ARCANINE, + SPECIES_PONYTA, + SPECIES_RAPIDASH, + SPECIES_MAGMAR, + SPECIES_FLAREON, + SPECIES_CYNDAQUIL, + SPECIES_QUILAVA, + SPECIES_TYPHLOSION, + SPECIES_SLUGMA, + SPECIES_MAGBY, + SPECIES_ENTEI, + SPECIES_TORCHIC, + SPECIES_TORKOAL, + SPECIES_CHIMCHAR, + SPECIES_MAGMORTAR, + SPECIES_TEPIG, + SPECIES_PANSEAR, + SPECIES_SIMISEAR, + SPECIES_DARUMAKA, + SPECIES_DARMANITAN, + SPECIES_HEATMOR, + SPECIES_FENNEKIN, + SPECIES_BRAIXEN, + SPECIES_LITTEN, + SPECIES_TORRACAT, + SPECIES_LITLEO, + SPECIES_PYROAR, + SPECIES_COMBUSKEN, + SPECIES_BLAZIKEN, + SPECIES_MONFERNO, + SPECIES_INFERNAPE, + SPECIES_PIGNITE, + SPECIES_EMBOAR, + SPECIES_CHARIZARD, + SPECIES_MOLTRES, + SPECIES_HO_OH, + SPECIES_FLETCHINDER, + SPECIES_TALONFLAME, + SPECIES_ORICORIO, + SPECIES_NUMEL, + SPECIES_CAMERUPT, + SPECIES_MAGCARGO, + SPECIES_BLACEPHALON, + SPECIES_HEATRAN, + SPECIES_VOLCANION, + SPECIES_DARMANITANZEN, + SPECIES_DELPHOX, + SPECIES_TURTONATOR, + SPECIES_INCINEROAR, + SPECIES_SQUIRTLE, + SPECIES_WARTORTLE, + SPECIES_BLASTOISE, + SPECIES_PSYDUCK, + SPECIES_GOLDUCK, + SPECIES_POLIWAG, + SPECIES_POLIWHIRL, + SPECIES_SEEL, + SPECIES_SHELLDER, + SPECIES_KRABBY, + SPECIES_KINGLER, + SPECIES_HORSEA, + SPECIES_SEADRA, + SPECIES_GOLDEEN, + SPECIES_SEAKING, + SPECIES_STARYU, + SPECIES_MAGIKARP, + SPECIES_VAPOREON, + SPECIES_TOTODILE, + SPECIES_CROCONAW, + SPECIES_FERALIGATR, + SPECIES_POLITOED, + SPECIES_REMORAID, + SPECIES_OCTILLERY, + SPECIES_SUICUNE, + SPECIES_MUDKIP, + SPECIES_WAILMER, + SPECIES_WAILORD, + SPECIES_CORPHISH, + SPECIES_FEEBAS, + SPECIES_MILOTIC, + SPECIES_CLAMPERL, + SPECIES_HUNTAIL, + SPECIES_GOREBYSS, + SPECIES_LUVDISC, + SPECIES_KYOGRE, + SPECIES_PIPLUP, + SPECIES_PRINPLUP, + SPECIES_BUIZEL, + SPECIES_FLOATZEL, + SPECIES_SHELLOS, + SPECIES_FINNEON, + SPECIES_LUMINEON, + SPECIES_PHIONE, + SPECIES_MANAPHY, + SPECIES_OSHAWOTT, + SPECIES_DEWOTT, + SPECIES_SAMUROTT, + SPECIES_PANPOUR, + SPECIES_SIMIPOUR, + SPECIES_TYMPOLE, + SPECIES_BASCULIN_RED, + SPECIES_ALOMOMOLA, + SPECIES_FROAKIE, + SPECIES_FROGADIER, + SPECIES_CLAUNCHER, + SPECIES_CLAWITZER, + SPECIES_POPPLIO, + SPECIES_BRIONNE, + SPECIES_WISHIWASHI, + SPECIES_PYUKUMUKU, + SPECIES_POLIWRATH, + SPECIES_KELDEO, + SPECIES_GYARADOS, + SPECIES_MANTINE, + SPECIES_WINGULL, + SPECIES_PELIPPER, + SPECIES_MANTYKE, + SPECIES_DUCKLETT, + SPECIES_SWANNA, + SPECIES_TENTACOOL, + SPECIES_TENTACRUEL, + SPECIES_QWILFISH, + SPECIES_WOOPER, + SPECIES_QUAGSIRE, + SPECIES_MARSHTOMP, + SPECIES_SWAMPERT, + SPECIES_BARBOACH, + SPECIES_WHISCASH, + SPECIES_GASTRODON, + SPECIES_PALPITOAD, + SPECIES_SEISMITOAD, + SPECIES_CORSOLA, + SPECIES_RELICANTH, + SPECIES_TIRTOUGA, + SPECIES_CARRACOSTA, + SPECIES_DEWPIDER, + SPECIES_ARAQUANID, + SPECIES_FRILLISH, + SPECIES_JELLICENT, + SPECIES_EMPOLEON, + SPECIES_LOTAD, + SPECIES_LOMBRE, + SPECIES_LUDICOLO, + SPECIES_CHINCHOU, + SPECIES_LANTURN, + SPECIES_SLOWPOKE, + SPECIES_SLOWBRO, + SPECIES_STARMIE, + SPECIES_SLOWKING, + SPECIES_BRUXISH, + SPECIES_DEWGONG, + SPECIES_CLOYSTER, + SPECIES_LAPRAS, + SPECIES_KINGDRA, + SPECIES_PALKIA, + SPECIES_CARVANHA, + SPECIES_SHARPEDO, + SPECIES_CRAWDAUNT, + SPECIES_GRENINJA, + SPECIES_MARILL, + SPECIES_AZUMARILL, + SPECIES_PRIMARINA, + SPECIES_TAPU_FINI, + SPECIES_TANGELA, + SPECIES_CHIKORITA, + SPECIES_BAYLEEF, + SPECIES_MEGANIUM, + SPECIES_BELLOSSOM, + SPECIES_SUNKERN, + SPECIES_SUNFLORA, + SPECIES_TREECKO, + SPECIES_GROVYLE, + SPECIES_SCEPTILE, + SPECIES_SEEDOT, + SPECIES_SHROOMISH, + SPECIES_CACNEA, + SPECIES_TURTWIG, + SPECIES_GROTLE, + SPECIES_CHERUBI, + SPECIES_CHERRIM, + SPECIES_CARNIVINE, + SPECIES_TANGROWTH, + SPECIES_LEAFEON, + SPECIES_SHAYMIN, + SPECIES_SNIVY, + SPECIES_SERVINE, + SPECIES_SERPERIOR, + SPECIES_PANSAGE, + SPECIES_SIMISAGE, + SPECIES_PETILIL, + SPECIES_LILLIGANT, + SPECIES_MARACTUS, + SPECIES_CHESPIN, + SPECIES_QUILLADIN, + SPECIES_SKIDDO, + SPECIES_GOGOAT, + SPECIES_FOMANTIS, + SPECIES_LURANTIS, + SPECIES_BOUNSWEET, + SPECIES_STEENEE, + SPECIES_TSAREENA, + SPECIES_BRELOOM, + SPECIES_VIRIZION, + SPECIES_CHESNAUGHT, + SPECIES_HOPPIP, + SPECIES_SKIPLOOM, + SPECIES_JUMPLUFF, + SPECIES_TROPIUS, + SPECIES_SHAYMIN_SKY, + SPECIES_ROWLET, + SPECIES_DARTRIX, + SPECIES_BULBASAUR, + SPECIES_IVYSAUR, + SPECIES_VENUSAUR, + SPECIES_ODDISH, + SPECIES_GLOOM, + SPECIES_VILEPLUME, + SPECIES_BELLSPROUT, + SPECIES_WEEPINBELL, + SPECIES_VICTREEBEL, + SPECIES_ROSELIA, + SPECIES_BUDEW, + SPECIES_ROSERADE, + SPECIES_FOONGUS, + SPECIES_AMOONGUSS, + SPECIES_TORTERRA, + SPECIES_DECIDUEYE, + SPECIES_FERROSEED, + SPECIES_FERROTHORN, + SPECIES_KARTANA, + SPECIES_EXEGGCUTE, + SPECIES_EXEGGUTOR, + SPECIES_SNOVER, + SPECIES_ABOMASNOW, + SPECIES_NUZLEAF, + SPECIES_SHIFTRY, + SPECIES_CACTURNE, + SPECIES_COTTONEE, + SPECIES_WHIMSICOTT, + SPECIES_MORELULL, + SPECIES_SHIINOTIC, + SPECIES_TAPU_BULU, + SPECIES_PIKACHU, + SPECIES_RAICHU, + SPECIES_VOLTORB, + SPECIES_ELECTRODE, + SPECIES_ELECTABUZZ, + SPECIES_JOLTEON, + SPECIES_PICHU, + SPECIES_MAREEP, + SPECIES_FLAAFFY, + SPECIES_AMPHAROS, + SPECIES_ELEKID, + SPECIES_RAIKOU, + SPECIES_ELECTRIKE, + SPECIES_MANECTRIC, + SPECIES_PLUSLE, + SPECIES_MINUN, + SPECIES_SHINX, + SPECIES_LUXIO, + SPECIES_LUXRAY, + SPECIES_PACHIRISU, + SPECIES_ELECTIVIRE, + SPECIES_BLITZLE, + SPECIES_ZEBSTRIKA, + SPECIES_TYNAMO, + SPECIES_EELEKTRIK, + SPECIES_EELEKTROSS, + SPECIES_XURKITREE, + SPECIES_ZERAORA, + SPECIES_HELIOPTILE, + SPECIES_HELIOLISK, + SPECIES_ZAPDOS, + SPECIES_ROTOM_FAN, + SPECIES_EMOLGA, + SPECIES_THUNDURUS, + SPECIES_ROTOM, + SPECIES_MAGNEMITE, + SPECIES_MAGNETON, + SPECIES_MAGNEZONE, + SPECIES_TOGEDEMARU, + SPECIES_ROTOM_HEAT, + SPECIES_ROTOM_WASH, + SPECIES_ROTOM_MOW, + SPECIES_ROTOM_FROST, + SPECIES_DEDENNE, + SPECIES_TAPU_KOKO, + SPECIES_ABRA, + SPECIES_KADABRA, + SPECIES_ALAKAZAM, + SPECIES_DROWZEE, + SPECIES_HYPNO, + SPECIES_MEWTWO, + SPECIES_MEW, + SPECIES_ESPEON, + SPECIES_UNOWN, + SPECIES_WOBBUFFET, + SPECIES_SPOINK, + SPECIES_GRUMPIG, + SPECIES_CHIMECHO, + SPECIES_WYNAUT, + SPECIES_DEOXYS, + SPECIES_CHINGLING, + SPECIES_UXIE, + SPECIES_MESPRIT, + SPECIES_AZELF, + SPECIES_CRESSELIA, + SPECIES_MUNNA, + SPECIES_MUSHARNA, + SPECIES_GOTHITA, + SPECIES_GOTHORITA, + SPECIES_GOTHITELLE, + SPECIES_SOLOSIS, + SPECIES_DUOSION, + SPECIES_REUNICLUS, + SPECIES_ELGYEM, + SPECIES_BEHEEYEM, + SPECIES_ESPURR, + SPECIES_MEOWSTIC, + SPECIES_COSMOG, + SPECIES_COSMOEM, + SPECIES_NECROZMA, + SPECIES_GALLADE, + SPECIES_NATU, + SPECIES_XATU, + SPECIES_LUGIA, + SPECIES_WOOBAT, + SPECIES_SWOOBAT, + SPECIES_SIGILYPH, + SPECIES_HOOPA, + SPECIES_LUNALA, + SPECIES_SOLGALEO, + SPECIES_VICTINI, + SPECIES_CELEBI, + SPECIES_MR_MIME, + SPECIES_RALTS, + SPECIES_KIRLIA, + SPECIES_GARDEVOIR, + SPECIES_MIME_JR, + SPECIES_TAPU_LELE, + SPECIES_SNORUNT, + SPECIES_GLALIE, + SPECIES_REGICE, + SPECIES_GLACEON, + SPECIES_VANILLITE, + SPECIES_VANILLISH, + SPECIES_VANILLUXE, + SPECIES_CUBCHOO, + SPECIES_BEARTIC, + SPECIES_CRYOGONAL, + SPECIES_BERGMITE, + SPECIES_AVALUGG, + SPECIES_ARTICUNO, + SPECIES_DELIBIRD, + SPECIES_SWINUB, + SPECIES_PILOSWINE, + SPECIES_MAMOSWINE, + SPECIES_FROSLASS, + SPECIES_SPHEAL, + SPECIES_SEALEO, + SPECIES_WALREIN, + SPECIES_JYNX, + SPECIES_SMOOCHUM, + SPECIES_DRATINI, + SPECIES_DRAGONAIR, + SPECIES_BAGON, + SPECIES_SHELGON, + SPECIES_AXEW, + SPECIES_FRAXURE, + SPECIES_HAXORUS, + SPECIES_DRUDDIGON, + SPECIES_GOOMY, + SPECIES_SLIGGOO, + SPECIES_GOODRA, + SPECIES_JANGMO_O, + SPECIES_HAKAMO_O, + SPECIES_KOMMO_O, + SPECIES_DRAGONITE, + SPECIES_ALTARIA, + SPECIES_SALAMENCE, + SPECIES_RAYQUAZA, + SPECIES_GIBLE, + SPECIES_GABITE, + SPECIES_GARCHOMP, + SPECIES_ZYGARDE, + SPECIES_RESHIRAM, + SPECIES_ZEKROM, + SPECIES_LATIAS, + SPECIES_LATIOS, + SPECIES_KYUREM, + SPECIES_UMBREON, + SPECIES_POOCHYENA, + SPECIES_MIGHTYENA, + SPECIES_ABSOL, + SPECIES_DARKRAI, + SPECIES_PURRLOIN, + SPECIES_LIEPARD, + SPECIES_ZORUA, + SPECIES_ZOROARK, + SPECIES_SCRAGGY, + SPECIES_SCRAFTY, + SPECIES_MURKROW, + SPECIES_HONCHKROW, + SPECIES_VULLABY, + SPECIES_MANDIBUZZ, + SPECIES_YVELTAL, + SPECIES_SABLEYE, + SPECIES_PAWNIARD, + SPECIES_BISHARP, + SPECIES_HOUNDOUR, + SPECIES_HOUNDOOM, + SPECIES_INKAY, + SPECIES_MALAMAR, + SPECIES_SNEASEL, + SPECIES_WEAVILE, + SPECIES_DEINO, + SPECIES_ZWEILOUS, + SPECIES_HYDREIGON, + SPECIES_GUZZLORD, + SPECIES_CLEFAIRY, + SPECIES_CLEFABLE, + SPECIES_CLEFFA, + SPECIES_TOGEPI, + SPECIES_SNUBBULL, + SPECIES_GRANBULL, + SPECIES_FLABEBE, + SPECIES_FLOETTE, + SPECIES_FLORGES, + SPECIES_SPRITZEE, + SPECIES_AROMATISSE, + SPECIES_SWIRLIX, + SPECIES_SLURPUFF, + SPECIES_SYLVEON, + SPECIES_XERNEAS, + SPECIES_COMFEY, + SPECIES_TOGETIC, + SPECIES_TOGEKISS, }; + +const u16 gPokedexOrderTypeCount = ARRAY_COUNT(gPokedexOrder_Type); diff --git a/src/updated_code.c b/src/updated_code.c index 220380d..2ee498d 100644 --- a/src/updated_code.c +++ b/src/updated_code.c @@ -6,10 +6,21 @@ //Backsprite battle start +extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; extern const u16 gSpeciesIdToCryId[]; extern const u16 gSpeciesToNationalPokedexNum[]; -extern const u16 gRegionalDexCount; + extern const u16 gPokedexOrder_Regional[]; +extern const u16 gRegionalDexCount; +extern const u16 gPokedexOrder_Alphabetical[]; +extern const u16 gPokedexOrderAlphabeticalCount; +extern const u16 gPokedexOrder_Weight[]; +extern const u16 gPokedexOrderWeightCount; +extern const u16 gPokedexOrder_Height[]; +extern const u16 gPokedexOrderHeightCount; +extern const u16 gPokedexOrder_Type[]; +extern const u16 gPokedexOrderTypeCount; + extern const struct AlternateDexEntries gAlternateDexEntries[]; extern const struct CompressedSpriteSheet gMonBackPicTable[]; extern const struct CompressedSpriteSheet gMonFrontPicTable[]; @@ -27,6 +38,7 @@ void __attribute__((long_call)) break_func(); //This file's functions u16 TryGetFemaleGenderedSpecies(u16 species, u32 personality); +static u16 LoadNationalPokedexView(void); u16 SpeciesToCryId(u16 species) { @@ -288,15 +300,127 @@ bool16 HasAllMons(void) return TRUE; } -u16 NatDexNumToRegionalDexNum(u16 natDexNum) +u16 SpeciesToRegionalDexNum(u16 species) { u16 i; for (i = 0; i < gRegionalDexCount; ++i) { - if (gPokedexOrder_Regional[i] == natDexNum) + if (gPokedexOrder_Regional[i] == species) return i + 1; } return 0; } + +extern const u16 gPokedexOrder_Regional[]; +extern const u16 gRegionalDexCount; +extern const u16 gPokedexOrder_Alphabetical[]; +extern const u16 gPokedexOrderAlphabeticalCount; +extern const u16 gPokedexOrder_Weight[]; +extern const u16 gPokedexOrderWeightCount; +extern const u16 gPokedexOrder_Height[]; +extern const u16 gPokedexOrderHeightCount; +extern const u16 gPokedexOrder_Type[]; +extern const u16 gPokedexOrderTypeCount; + +u16 LoadPokedexViews(u8 type) +{ + u16 i, counter, count, lastMeaningfulIndex; + const u16* dexList; + bool8 showUnseenSpecies = FALSE; + + switch (type) { + case 0: + dexList = gPokedexOrder_Regional; + count = gRegionalDexCount; + showUnseenSpecies = TRUE; + break; + case 1: + dexList = gPokedexOrder_Alphabetical; + count = gPokedexOrderAlphabeticalCount; + break; + case 2: + dexList = gPokedexOrder_Type; + count = gPokedexOrderTypeCount; + break; + case 3: + dexList = gPokedexOrder_Weight; + count = gPokedexOrderWeightCount; + break; + case 4: + dexList = gPokedexOrder_Height; + count = gPokedexOrderHeightCount; + break; + case 5: + default: + return LoadNationalPokedexView(); + } + + for (i = 0, counter = 0, lastMeaningfulIndex = 0; i < count; ++i) + { + u16 species = dexList[i]; + bool8 seen = DexFlagCheck(species, FLAG_GET_SEEN, TRUE); + bool8 caught = DexFlagCheck(species, FLAG_GET_CAUGHT, TRUE); + + if (!seen) + { + if (showUnseenSpecies) + { + gPokedexScreenDataPtr->listItem[counter].name = (void*) 0x8415F66; //----- + gPokedexScreenDataPtr->listItem[counter++].id = species | (0 << 16); //Unseen + } + } + else + { + lastMeaningfulIndex = counter + 1; + gPokedexScreenDataPtr->listItem[counter].name = gSpeciesNames[species]; + + if (caught) + gPokedexScreenDataPtr->listItem[counter++].id = species | (3 << 16); //Caught + else + gPokedexScreenDataPtr->listItem[counter++].id = species | (1 << 16); //Seen + } + } + + if (lastMeaningfulIndex == 0) + { + //Fix empty list + lastMeaningfulIndex = 1; + gPokedexScreenDataPtr->listItem[0].name = (void*) 0x8415F66; //----- + gPokedexScreenDataPtr->listItem[0].id = gPokedexOrder_Regional[0] | (0 << 16); //Unseen + } + + return lastMeaningfulIndex; +} + +static u16 LoadNationalPokedexView(void) +{ + u16 i, lastMeaningfulIndex; + + for (i = 1, lastMeaningfulIndex = 0; i < NATIONAL_DEX_COUNT; ++i) + { + bool8 seen = DexFlagCheck(i, FLAG_GET_SEEN, FALSE); + bool8 caught = DexFlagCheck(i, FLAG_GET_CAUGHT, FALSE); + u16 species = NationalPokedexNumToSpecies(i); + u16 listIndex = i - 1; + + if (!seen) + { + gPokedexScreenDataPtr->listItem[listIndex].name = (void*) 0x8415F66; //----- + gPokedexScreenDataPtr->listItem[listIndex].id = species | (0 << 16); //Unseen + } + else + { + lastMeaningfulIndex = i; + gPokedexScreenDataPtr->listItem[listIndex].name = gSpeciesNames[species]; + + if (caught) + gPokedexScreenDataPtr->listItem[listIndex].id = species | (3 << 16); //Caught + else + gPokedexScreenDataPtr->listItem[listIndex].id = species | (1 << 16); //Seen + } + } + + return lastMeaningfulIndex; +}