Merge pull request #144 from bbepis/pokedex-research

Determine required pokedex expansion constants

include/constants/forms.h

@@ -0,0 +1,21 @@
+#ifndef POKEPLATINUM_CONSTANTS_FORMS_H
+#define POKEPLATINUM_CONSTANTS_FORMS_H
+
+#include "species.h"
+
+#define MOVESET_FORM_DEOXYS_ATTACK    NATIONAL_DEX_COUNT + 1
+#define MOVESET_FORM_DEOXYS_DEFENSE   NATIONAL_DEX_COUNT + 2
+#define MOVESET_FORM_DEOXYS_SPEED     NATIONAL_DEX_COUNT + 3
+#define MOVESET_FORM_WORMADAM_SANDY   NATIONAL_DEX_COUNT + 4
+#define MOVESET_FORM_WORMADAM_TRASH   NATIONAL_DEX_COUNT + 5
+#define MOVESET_FORM_GIRATINA_ORIGIN  NATIONAL_DEX_COUNT + 6
+#define MOVESET_FORM_SHAYMIN_SKY      NATIONAL_DEX_COUNT + 7
+#define MOVESET_FORM_ROTOM_HEAT       NATIONAL_DEX_COUNT + 8
+#define MOVESET_FORM_ROTOM_WASH       NATIONAL_DEX_COUNT + 9
+#define MOVESET_FORM_ROTOM_FROST      NATIONAL_DEX_COUNT + 10
+#define MOVESET_FORM_ROTOM_FAN        NATIONAL_DEX_COUNT + 11
+#define MOVESET_FORM_ROTOM_MOW        NATIONAL_DEX_COUNT + 12
+
+#define MOVESET_MAX                   MOVESET_FORM_ROTOM_MOW
+
+#endif

include/constants/species.h

@@ -14,4 +14,6 @@
 
 #define MAX_SPECIES             SPECIES_BAD_EGG
 
+#define LOCAL_DEX_COUNT 210
+
 #endif // POKEPLATINUM_CONSTANTS_SPECIES_H

include/overlay006/battle_params.h

@@ -2,7 +2,7 @@
 #define POKEPLATINUM_BATTLE_PARAMS_H
 
 #include "trainer_info.h"
-#include "struct_decls/struct_02026324_decl.h"
+#include "struct_decls/pokedexdata_decl.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_decls/struct_02027F8C_decl.h"
 #include "struct_decls/struct_0202B628_decl.h"
@@ -29,7 +29,7 @@ typedef struct {
     TrainerInfo * unk_D0[4];
     UnkStruct_0207D3C0 * unk_E0;
     UnkStruct_0207D99C * unk_E4;
-    UnkStruct_02026324 * unk_E8;
+    PokedexData * unk_E8;
     PCBoxes * unk_EC;
     ChatotCry * unk_F0[4];
     UnkStruct_02056B24 * unk_100;

include/overlay016/ov16_0223DF00.h

@@ -16,7 +16,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "strbuf.h"
 #include "trainer_info.h"
-#include "struct_decls/struct_02026324_decl.h"
+#include "struct_decls/pokedexdata_decl.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_defs/chatot_cry.h"
 #include "struct_defs/struct_0205AA50.h"
@@ -101,7 +101,7 @@ UnkStruct_0200C440 * ov16_0223E054(BattleSystem * param0);
 MessageLoader * BattleSystem_MessageLoader(BattleSystem * param0);
 MessageLoader * ov16_0223E060(BattleSystem * param0);
 PaletteData * BattleSystem_PaletteSys(BattleSystem * param0);
-UnkStruct_02026324 * ov16_0223E068(BattleSystem * param0);
+PokedexData * ov16_0223E068(BattleSystem * param0);
 u8 * ov16_0223E06C(BattleSystem * param0);
 u8 * ov16_0223E074(BattleSystem * param0);
 u16 * ov16_0223E080(BattleSystem * param0);

include/overlay021/struct_ov21_021D0D80.h

@@ -2,11 +2,11 @@
 #define POKEPLATINUM_STRUCT_OV21_021D0D80_H
 
 #include "trainer_info.h"
-#include "struct_decls/struct_02026324_decl.h"
+#include "struct_decls/pokedexdata_decl.h"
 #include "struct_decls/struct_0209ACBC_decl.h"
 
 typedef struct {
-    const UnkStruct_02026324 * unk_00;
+    const PokedexData * unk_00;
     const TrainerInfo * unk_04;
     int unk_08;
     BOOL unk_0C;

include/overlay021/struct_ov21_021D0D80_1.h

@@ -2,11 +2,11 @@
 #define POKEPLATINUM_STRUCT_OV21_021D0D80_1_H
 
 #include "trainer_info.h"
-#include "struct_decls/struct_02026324_decl.h"
+#include "struct_decls/pokedexdata_decl.h"
 #include "struct_decls/struct_0209ACBC_decl.h"
 
 typedef struct {
-    const UnkStruct_02026324 * unk_00;
+    const PokedexData * unk_00;
     const TrainerInfo * unk_04;
     int unk_08;
     BOOL unk_0C;

include/overlay021/struct_ov21_021D3208.h

@@ -2,10 +2,10 @@
 #define POKEPLATINUM_STRUCT_OV21_021D3208_H
 
 #include "trainer_info.h"
-#include "struct_decls/struct_02026324_decl.h"
+#include "struct_decls/pokedexdata_decl.h"
 
 typedef struct {
-    const UnkStruct_02026324 * unk_00;
+    const PokedexData * unk_00;
     const TrainerInfo * unk_04;
     int unk_08;
     BOOL unk_0C;

include/overlay021/struct_ov21_021D3320.h

@@ -2,12 +2,12 @@
 #define POKEPLATINUM_STRUCT_OV21_021D3320_H
 
 #include "strbuf.h"
-#include "struct_decls/struct_02026324_decl.h"
+#include "struct_decls/pokedexdata_decl.h"
 #include "struct_decls/struct_02098700_decl.h"
 #include "overlay021/struct_ov21_021D3A60.h"
 
 typedef struct {
-    const UnkStruct_02026324 * unk_00;
+    const PokedexData * unk_00;
     UnkStruct_ov21_021D3A60 unk_04;
     int unk_1730;
     BOOL unk_1734;

include/overlay021/struct_ov21_021D3A60.h

@@ -2,12 +2,13 @@
 #define POKEPLATINUM_STRUCT_OV21_021D3A60_H
 
 #include "overlay021/struct_ov21_021D37DC.h"
+#include "constants/species.h"
 
 typedef struct {
-    UnkStruct_ov21_021D37DC unk_00[493];
+    UnkStruct_ov21_021D37DC unk_00[NATIONAL_DEX_COUNT];
     int unk_F68;
     int unk_F6C;
-    int unk_F70[493];
+    int unk_F70[NATIONAL_DEX_COUNT];
     int unk_1724;
     int unk_1728;
 } UnkStruct_ov21_021D3A60;

include/overlay088/struct_ov88_0223C370.h

@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_OV88_0223C370_H
 
 #include "trainer_info.h"
-#include "struct_decls/struct_02026324_decl.h"
+#include "struct_decls/pokedexdata_decl.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_decls/struct_02027F8C_decl.h"
 #include "struct_decls/struct_0202B628_decl.h"
@@ -23,7 +23,7 @@ typedef struct {
     AnimationControlFlags * unk_18;
     UnkStruct_0202B628 * unk_1C;
     UnkStruct_0202CD88 * unk_20;
-    UnkStruct_02026324 * unk_24;
+    PokedexData * unk_24;
     int unk_28;
     int unk_2C;
     int unk_30;

include/overlay094/ov94_022414B8.h

@@ -5,7 +5,7 @@
 #include "message.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
-#include "struct_decls/struct_02026324_decl.h"
+#include "struct_decls/pokedexdata_decl.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay094/struct_ov94_0223BA88.h"
 #include "overlay094/struct_ov94_0223BA88_sub3.h"
@@ -28,7 +28,7 @@ u16 * ov94_02242524(int param0, int param1, int * param2);
 u8 * ov94_02242548(int param0);
 void ov94_022425A8(UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223FD4C * param1);
 UnkStruct_0200112C * ov94_022426A8(UnkStruct_ov94_0223FD4C * param0, ResourceMetadata ** param1, Window * param2, MessageLoader * param3);
-UnkStruct_0200112C * ov94_022427C0(UnkStruct_ov94_0223FD4C * param0, ResourceMetadata ** param1, Window * param2, MessageLoader * param3, MessageLoader * param4, UnkStruct_ov94_0223FD4C_sub3 * param5, UnkStruct_02026324 * param6);
+UnkStruct_0200112C * ov94_022427C0(UnkStruct_ov94_0223FD4C * param0, ResourceMetadata ** param1, Window * param2, MessageLoader * param3, MessageLoader * param4, UnkStruct_ov94_0223FD4C_sub3 * param5, PokedexData * param6);
 UnkStruct_0200112C * ov94_02242840(ResourceMetadata ** param0, Window * param1, MessageLoader * param2);
 UnkStruct_0200112C * ov94_022428B0(ResourceMetadata ** param0, Window * param1, MessageLoader * param2, int param3);
 void ov94_02242934(UnkStruct_ov94_0223BA88_sub3 * param0, int param1, int param2);

include/struct_decls/pokedexdata_decl.h

@@ -0,0 +1,6 @@
+#ifndef POKEPLATINUM_POKEDEXDATA_DECL_H
+#define POKEPLATINUM_POKEDEXDATA_DECL_H
+
+typedef struct PokedexData PokedexData;
+
+#endif // POKEPLATINUM_POKEDEXDATA_DECL_H

include/struct_defs/battle_system.h

@@ -16,7 +16,7 @@
 #include "struct_decls/sys_task.h"
 #include "strbuf.h"
 #include "trainer_info.h"
-#include "struct_decls/struct_02026324_decl.h"
+#include "struct_decls/pokedexdata_decl.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_decls/struct_02027F8C_decl.h"
 #include "struct_defs/chatot_cry.h"
@@ -62,7 +62,7 @@ struct BattleSystem {
     TrainerInfo *trainerInfo[4];
     UnkStruct_0207D3C0 * unk_58;
     UnkStruct_0207D99C * unk_5C;
-    UnkStruct_02026324 *pokedex;
+    PokedexData *pokedex;
     PCBoxes *pcBoxes;
     Party *parties[4];
     ChatotCry * unk_78[4];

include/struct_defs/struct_0203E0FC.h

@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02025CCC_decl.h"
 #include "trainer_info.h"
-#include "struct_decls/struct_02026324_decl.h"
+#include "struct_decls/pokedexdata_decl.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_decls/struct_0202B370_decl.h"
 #include "struct_decls/struct_0202B628_decl.h"
@@ -20,7 +20,7 @@ typedef struct {
     UnkStruct_02025CCC * unk_04;
     Party * unk_08;
     PCBoxes * unk_0C;
-    UnkStruct_02026324 * unk_10;
+    PokedexData * unk_10;
     UnkStruct_0202B370 * unk_14;
     UnkStruct_0202C878 * unk_18;
     TrainerInfo * unk_1C;

include/struct_defs/struct_0203E274.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_STRUCT_0203E274_H
 #define POKEPLATINUM_STRUCT_0203E274_H
 
-#include "struct_decls/struct_02026324_decl.h"
+#include "struct_decls/pokedexdata_decl.h"
 
 typedef struct {
     int unk_00;
     BOOL unk_04;
-    const UnkStruct_02026324 * unk_08;
+    const PokedexData * unk_08;
 } UnkStruct_0203E274;
 
 #endif // POKEPLATINUM_STRUCT_0203E274_H

include/struct_defs/struct_0207AE68_t.h

@@ -11,7 +11,7 @@
 #include "struct_decls/pokemon_animation_sys_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "strbuf.h"
-#include "struct_decls/struct_02026324_decl.h"
+#include "struct_decls/pokedexdata_decl.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_decls/struct_0202CD88_decl.h"
 #include "struct_decls/struct_02056B24_decl.h"
@@ -41,7 +41,7 @@ struct UnkStruct_0207AE68_t {
     UnkStruct_02098D38 * unk_3C;
     void * unk_40;
     PokemonAnimationSys * unk_44;
-    UnkStruct_02026324 * unk_48;
+    PokedexData * unk_48;
     UnkStruct_0207D3C0 * unk_4C;
     UnkStruct_0202CD88 * unk_50;
     UnkStruct_02056B24 * unk_54;

include/unk_02002F38.h

@@ -9,8 +9,8 @@ void sub_02002F5C(PaletteData * param0, int param1, void * param2, void * param3
 void sub_02002F70(PaletteData * param0, int param1, u32 param2, u32 param3);
 void sub_02002FA0(PaletteData * param0, int param1);
 void sub_02002FBC(PaletteData * param0, const void * param1, int param2, u16 param3, u16 param4);
-void sub_02002FEC(PaletteData * param0, u32 param1, u32 param2, u32 param3, int param4, u32 param5, u16 param6, u16 param7);
-void PaletteSys_LoadPalette(PaletteData * param0, u32 param1, u32 param2, u32 param3, int param4, u32 param5, u16 param6);
+void sub_02002FEC(PaletteData * param0, u32 bankID, u32 memberIndex, u32 param3, int param4, u32 param5, u16 param6, u16 param7);
+void PaletteSys_LoadPalette(PaletteData * param0, u32 bankID, u32 memberIndex, u32 param3, int param4, u32 param5, u16 param6);
 void sub_02003070(PaletteData * param0, int param1, u16 param2, u32 param3);
 void sub_020030E4(u32 param0, u32 param1, u32 param2, u32 param3, u16 param4, void * param5);
 void sub_02003120(PaletteData * param0, int param1, u16 param2, int param3, u16 param4, u16 param5);

include/unk_02006E3C.h

@@ -16,7 +16,7 @@ u32 sub_02006F00(u32 param0, u32 param1, BOOL param2, int param3, u32 param4, NN
 void sub_02006F28(u32 param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy * param8);
 void * sub_02006F50(u32 param0, u32 param1, BOOL param2, NNSG2dCharacterData ** param3, u32 param4);
 void * sub_02006F6C(u32 param0, u32 param1, BOOL param2, NNSG2dScreenData ** param3, u32 param4);
-void * sub_02006F88(u32 param0, u32 param1, NNSG2dPaletteData ** param2, u32 param3);
+void * sub_02006F88(u32 bankID, u32 memberIndex, NNSG2dPaletteData ** param2, u32 param3);
 void * sub_02006FA0(u32 param0, u32 param1, BOOL param2, NNSG2dCellDataBank ** param3, u32 param4);
 void * sub_02006FBC(u32 param0, u32 param1, BOOL param2, NNSG2dAnimBankData ** param3, u32 param4);
 void * sub_02006FD8(u32 param0, u32 param1, u32 param2);

include/unk_0202631C.h

@@ -1,52 +1,52 @@
 #ifndef POKEPLATINUM_UNK_0202631C_H
 #define POKEPLATINUM_UNK_0202631C_H
 
-#include "struct_decls/struct_02026324_decl.h"
+#include "struct_decls/pokedexdata_decl.h"
 #include "pokemon.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 int Pokedex_SaveSize(void);
-UnkStruct_02026324 * sub_02026324(u32 param0);
-void sub_02026338(const UnkStruct_02026324 * param0, UnkStruct_02026324 * param1);
-void Pokedex_Init(UnkStruct_02026324 * param0);
-u16 sub_02026DD0(const UnkStruct_02026324 * param0);
-u16 sub_02026E0C(const UnkStruct_02026324 * param0);
-u16 sub_02026E48(const UnkStruct_02026324 * param0);
-u16 sub_02026E64(const UnkStruct_02026324 * param0);
-u16 sub_02026EAC(const UnkStruct_02026324 * param0);
-BOOL sub_02026EF4(const UnkStruct_02026324 * param0);
-BOOL sub_02026F0C(const UnkStruct_02026324 * param0);
-u16 sub_02026F20(const UnkStruct_02026324 * param0);
-u16 sub_02026F58(const UnkStruct_02026324 * param0);
-BOOL Pokedex_CaughtSpecies(const UnkStruct_02026324 * param0, u16 param1);
-BOOL sub_02026FE8(const UnkStruct_02026324 * param0, u16 param1);
-u32 sub_0202702C(const UnkStruct_02026324 * param0, u8 param1);
-u32 sub_02027058(const UnkStruct_02026324 * param0, u16 param1, int param2);
-u32 sub_020270AC(const UnkStruct_02026324 * param0, int param1);
-u32 sub_020270DC(const UnkStruct_02026324 * param0);
-u32 sub_020270F8(const UnkStruct_02026324 * param0, int param1);
-u32 sub_02027130(const UnkStruct_02026324 * param0);
-u32 sub_02027154(const UnkStruct_02026324 * param0, int param1);
-u32 sub_0202718C(const UnkStruct_02026324 * param0);
-u32 sub_020271B0(const UnkStruct_02026324 * param0, int param1);
-u32 sub_020271E8(const UnkStruct_02026324 * param0);
-u32 sub_02027208(const UnkStruct_02026324 * param0, int param1);
-u32 sub_02027240(const UnkStruct_02026324 * param0);
-u32 sub_02027264(const UnkStruct_02026324 * param0, int param1);
-u32 sub_02027288(const UnkStruct_02026324 * param0);
-void sub_020272A4(UnkStruct_02026324 * param0, Pokemon * param1);
-void sub_0202736C(UnkStruct_02026324 * param0, Pokemon * param1);
-void sub_02027454(UnkStruct_02026324 * param0);
-BOOL sub_02027474(const UnkStruct_02026324 * param0);
-BOOL sub_02027494(const UnkStruct_02026324 * param0);
-void sub_020274B0(UnkStruct_02026324 * param0);
-BOOL sub_020274D0(const UnkStruct_02026324 * param0, u16 param1, u32 param2);
-void sub_02027508(UnkStruct_02026324 * param0);
-BOOL sub_02027514(const UnkStruct_02026324 * param0);
-BOOL sub_02027520(const UnkStruct_02026324 * param0);
-void sub_02027540(UnkStruct_02026324 * param0);
-UnkStruct_02026324 * sub_02027560(SaveData * param0);
-u32 sub_0202756C(const UnkStruct_02026324 * param0, int param1, int param2);
-u32 sub_020276C8(const UnkStruct_02026324 * param0, int param1);
+PokedexData * sub_02026324(u32 param0);
+void sub_02026338(const PokedexData * param0, PokedexData * param1);
+void Pokedex_Init(PokedexData * param0);
+u16 sub_02026DD0(const PokedexData * param0);
+u16 sub_02026E0C(const PokedexData * param0);
+u16 sub_02026E48(const PokedexData * param0);
+u16 sub_02026E64(const PokedexData * param0);
+u16 sub_02026EAC(const PokedexData * param0);
+BOOL sub_02026EF4(const PokedexData * param0);
+BOOL sub_02026F0C(const PokedexData * param0);
+u16 sub_02026F20(const PokedexData * param0);
+u16 sub_02026F58(const PokedexData * param0);
+BOOL Pokedex_CaughtSpecies(const PokedexData * param0, u16 param1);
+BOOL sub_02026FE8(const PokedexData * param0, u16 param1);
+u32 sub_0202702C(const PokedexData * param0, u8 param1);
+u32 sub_02027058(const PokedexData * param0, u16 param1, int param2);
+u32 sub_020270AC(const PokedexData * param0, int param1);
+u32 sub_020270DC(const PokedexData * param0);
+u32 sub_020270F8(const PokedexData * param0, int param1);
+u32 sub_02027130(const PokedexData * param0);
+u32 sub_02027154(const PokedexData * param0, int param1);
+u32 sub_0202718C(const PokedexData * param0);
+u32 sub_020271B0(const PokedexData * param0, int param1);
+u32 sub_020271E8(const PokedexData * param0);
+u32 sub_02027208(const PokedexData * param0, int param1);
+u32 sub_02027240(const PokedexData * param0);
+u32 sub_02027264(const PokedexData * param0, int param1);
+u32 sub_02027288(const PokedexData * param0);
+void sub_020272A4(PokedexData * param0, Pokemon * param1);
+void sub_0202736C(PokedexData * param0, Pokemon * param1);
+void sub_02027454(PokedexData * param0);
+BOOL sub_02027474(const PokedexData * param0);
+BOOL sub_02027494(const PokedexData * param0);
+void sub_020274B0(PokedexData * param0);
+BOOL sub_020274D0(const PokedexData * param0, u16 param1, u32 param2);
+void sub_02027508(PokedexData * param0);
+BOOL sub_02027514(const PokedexData * param0);
+BOOL sub_02027520(const PokedexData * param0);
+void sub_02027540(PokedexData * param0);
+PokedexData * sub_02027560(SaveData * param0);
+u32 sub_0202756C(const PokedexData * param0, int param1, int param2);
+u32 sub_020276C8(const PokedexData * param0, int param1);
 
 #endif // POKEPLATINUM_UNK_0202631C_H

include/unk_0202CD50.h

@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_UNK_0202CD50_H
 #define POKEPLATINUM_UNK_0202CD50_H
 
-#include "struct_decls/struct_02026324_decl.h"
+#include "struct_decls/pokedexdata_decl.h"
 #include "struct_decls/struct_0202CD88_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
@@ -15,6 +15,6 @@ u32 sub_0202CF70(UnkStruct_0202CD88 * param0, int param1, u32 param2);
 u32 sub_0202CFB8(UnkStruct_0202CD88 * param0, int param1);
 void sub_0202CFEC(UnkStruct_0202CD88 * param0, int param1);
 u32 sub_0202D034(UnkStruct_0202CD88 * param0);
-void sub_0202D040(UnkStruct_0202CD88 * param0, const UnkStruct_02026324 * param1, u16 const param2);
+void sub_0202D040(UnkStruct_0202CD88 * param0, const PokedexData * param1, u16 const param2);
 
 #endif // POKEPLATINUM_UNK_0202CD50_H