Generate zukan_enc_platinum.narc

Named a bunch of variables
Created make_pokedex_enc_platinum tool
Added pokedex categories to encounter json files
Changed wildEncountersArchiveID to decimal

include/overlay021/ov21_021D0D80.h

@@ -44,7 +44,7 @@ int *ov21_021D13A0(UnkStruct_ov21_021D0F60 *param0);
 int *ov21_021D13B4(UnkStruct_ov21_021D0F60 *param0);
 int *ov21_021D13C8(UnkStruct_ov21_021D0F60 *param0);
 BOOL *ov21_021D13DC(UnkStruct_ov21_021D0F60 *param0);
-UnkStruct_ov21_021D3320 *ov21_021D13EC(UnkStruct_ov21_021D0F60 *param0);
+pokedexStruct *ov21_021D13EC(UnkStruct_ov21_021D0F60 *param0);
 UnkStruct_ov21_021D13FC *ov21_021D13FC(UnkStruct_ov21_021D0F60 *param0);
 UnkStruct_ov21_021E68F4 *ov21_021D1410(UnkStruct_ov21_021D0F60 *param0, int param1);
 UnkStruct_ov21_021E68F4 *ov21_021D1430(UnkStruct_ov21_021D0F60 *param0, int param1);
@@ -55,23 +55,23 @@ void ov21_021D154C(TouchScreenHitTable *hitTable, int param1, int param2, int pa
 void ov21_021D1558(UnkStruct_ov21_021D157C *param0, BGL *param1, int param2, NNSG2dScreenData *param3, int param4, int param5, int param6, int param7, int param8);
 BOOL ov21_021D157C(UnkStruct_ov21_021D157C *param0);
 void ov21_021D1650(Window *param0, int param1, int param2, int param3);
-Window *ov21_021D16D8(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3);
+Window *ov21_021D16D8(UnkStruct_ov21_021D13FC *param0, const pokedexStruct *param1, int param2, int param3);
 Window *ov21_021D170C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2);
 Window *ov21_021D172C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2);
-void ov21_021D1778(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, fx32 param4, fx32 param5);
+void ov21_021D1778(UnkStruct_ov21_021D13FC *param0, const pokedexStruct *param1, int param2, int param3, fx32 param4, fx32 param5);
 void ov21_021D1848(UnkStruct_ov21_021D13FC *param0, int param1, int param2);
 void ov21_021D1858(UnkStruct_ov21_021D22F8 *param0, int param1, int param2);
-void ov21_021D1890(UnkStruct_ov21_021D13FC *param0, UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5);
-u32 ov21_021D19D8(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6, int param7);
-u32 ov21_021D1A34(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6);
-u32 ov21_021D1A78(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6);
-u32 ov21_021D1AC0(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6);
-u32 ov21_021D1B08(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6);
-u32 ov21_021D1B4C(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6);
-u32 ov21_021D1B94(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6);
-u32 ov21_021D1BD8(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6);
-u32 ov21_021D1C30(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6);
-u32 ov21_021D1C88(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6);
+void ov21_021D1890(UnkStruct_ov21_021D13FC *param0, pokedexStruct *param1, int param2, int param3, int param4, int param5);
+u32 ov21_021D19D8(UnkStruct_ov21_021D13FC *param0, const pokedexStruct *param1, int param2, int param3, int param4, int param5, int param6, int param7);
+u32 ov21_021D1A34(UnkStruct_ov21_021D13FC *param0, const pokedexStruct *param1, int param2, int param3, int param4, int param5, int param6);
+u32 ov21_021D1A78(UnkStruct_ov21_021D13FC *param0, const pokedexStruct *param1, int param2, int param3, int param4, int param5, int param6);
+u32 ov21_021D1AC0(UnkStruct_ov21_021D13FC *param0, const pokedexStruct *param1, int param2, int param3, int param4, int param5, int param6);
+u32 ov21_021D1B08(UnkStruct_ov21_021D13FC *param0, const pokedexStruct *param1, int param2, int param3, int param4, int param5, int param6);
+u32 ov21_021D1B4C(UnkStruct_ov21_021D13FC *param0, const pokedexStruct *param1, int param2, int param3, int param4, int param5, int param6);
+u32 ov21_021D1B94(UnkStruct_ov21_021D13FC *param0, const pokedexStruct *param1, int param2, int param3, int param4, int param5, int param6);
+u32 ov21_021D1BD8(UnkStruct_ov21_021D13FC *param0, const pokedexStruct *param1, int param2, int param3, int param4, int param5, int param6);
+u32 ov21_021D1C30(UnkStruct_ov21_021D13FC *param0, const pokedexStruct *param1, int param2, int param3, int param4, int param5, int param6);
+u32 ov21_021D1C88(UnkStruct_ov21_021D13FC *param0, const pokedexStruct *param1, int param2, int param3, int param4, int param5, int param6);
 Strbuf *ov21_021D1CE0(int param0, int param1);
 
 #endif // POKEPLATINUM_OV21_021D0D80_H

include/overlay021/ov21_021D57B4.h

@@ -7,13 +7,13 @@
 
 #include "cell_actor.h"
 
-void ov21_021D57B4(UnkStruct_ov21_021D5844 *param0, int param1, int param2, int param3);
-void ov21_021D5844(UnkStruct_ov21_021D5844 *param0);
+void ov21_021D57B4(pokedexEncStruct *dexEncData, int param1, int param2, int param3);
+void Free_pokedexEncData(pokedexEncStruct *dexEncData);
 UnkStruct_ov21_021D5868 *ov21_021D5868(int param0, int *param1);
 UnkStruct_ov21_021D5890 *ov21_021D5890(int param0, int *param1);
 void ov21_021D58C0(u8 *param0, u8 param1, u8 param2, const UnkStruct_ov21_021D5890 *param3);
-u32 ov21_021D5948(u8 *param0, int param1, int param2, const UnkStruct_ov21_021D5890 *param3, const UnkStruct_ov21_021D5844 *param4, const u8 *param5, u32 param6);
+u32 ov21_021D5948(u8 *param0, int param1, int param2, const UnkStruct_ov21_021D5890 *param3, const pokedexEncStruct *dexEncData, const u8 *param5, u32 param6);
 void ov21_021D59D8(CellActor *param0, int param1, int param2, int param3, int param4, const UnkStruct_ov21_021D5868 *param5, int param6, int param7);
-int ov21_021D5A20(CellActor **param0, int param1, int param2, int param3, int param4, int param5, int param6, const UnkStruct_ov21_021D5868 *param7, const UnkStruct_ov21_021D5844 *param8, int param9, int param10, const u8 *param11, u32 param12, u32 *param13);
+int ov21_021D5A20(CellActor **param0, int param1, int param2, int param3, int param4, int param5, int param6, const UnkStruct_ov21_021D5868 *param7, const pokedexEncStruct *dexEncData, int param9, int param10, const u8 *param11, u32 param12, u32 *param13);
 
 #endif // POKEPLATINUM_OV21_021D57B4_H

include/overlay021/ov21_021DC9BC.h

@@ -4,7 +4,7 @@
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
-void ov21_021DC9BC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
+void ov21_021DC9BC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int heapID);
 void ov21_021DCA14(UnkStruct_ov21_021E68F4 *param0);
 int ov21_021DCA28(const UnkStruct_ov21_021E68F4 *param0);
 void ov21_021DCA30(UnkStruct_ov21_021E68F4 *param0, int param1);

include/overlay021/pokedex_sort.h

@@ -0,0 +1,61 @@
+#ifndef POKEPLATINUM_OV21_021D3208_H
+#define POKEPLATINUM_OV21_021D3208_H
+
+#include "overlay021/struct_ov21_021D3208.h"
+#include "overlay021/struct_ov21_021D3320.h"
+#include "overlay021/struct_ov21_021D37DC.h"
+
+#include "strbuf.h"
+
+void Pokedex_Sort_PopulatePokedexStruct(pokedexStruct *param0, UnkStruct_ov21_021D3208 *param1, int param2);
+void ov21_021D3320(pokedexStruct *param0);
+u32 ov21_021D334C(const pokedexStruct *param0, int param1, int param2);
+u32 ov21_021D335C(const pokedexStruct *param0, int param1);
+u32 ov21_021D3374(const pokedexStruct *param0, int param1);
+u32 ov21_021D338C(const pokedexStruct *param0, int param1);
+u32 ov21_021D33A4(const pokedexStruct *param0, int param1);
+u32 ov21_021D33BC(const pokedexStruct *param0, int param1);
+u32 ov21_021D33D4(const pokedexStruct *param0, u32 param1);
+u32 ov21_021D33E0(const pokedexStruct *param0, int param1);
+u32 ov21_021D33F8(const pokedexStruct *param0);
+u32 ov21_021D3404(const pokedexStruct *param0, int param1);
+u32 ov21_021D3410(const pokedexStruct *param0, u32 param1, int param2);
+u32 ov21_021D341C(const pokedexStruct *param0, u32 param1);
+BOOL Pokedex_Sort_PokedexUnlocked(const pokedexStruct *param0);
+void ov21_021D3434(pokedexStruct *param0, u32 param1);
+u32 ov21_021D3440(const pokedexStruct *param0);
+void ov21_021D344C(pokedexStruct *param0, u32 param1);
+u32 ov21_021D3458(const pokedexStruct *param0);
+BOOL Pokedex_Sort(pokedexStruct *pokedexS, int sortCategory, int firstLetterFilter, int typeFilter1, int typeFilter2, int bodyShapeFilter, int isNationalDex, int heapID, BOOL isFiltered);
+BOOL Pokedex_Sort_Unfiltered(pokedexStruct *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7);
+BOOL ov21_021D36A4(const pokedexStruct *param0, int param1);
+BOOL ov21_021D36C0(pokedexStruct *param0, int param1);
+int ov21_021D36D8(const pokedexStruct *param0);
+BOOL Pokedex_Sort_IsValidDexIndex(const pokedexStruct *pokedexS, int dexIndex);
+BOOL ov21_021D36FC(pokedexStruct *param0, int param1);
+BOOL ov21_021D371C(pokedexStruct *param0, int param1);
+int ov21_021D375C(const pokedexStruct *param0);
+int Pokedex_Sort_CompletionNumEncountered(const pokedexStruct *param0);
+int ov21_021D3770(const pokedexStruct *param0, u32 param1);
+BOOL ov21_021D3794(pokedexStruct *param0, int param1);
+int Pokedex_Sort_CurrentSpecies(const pokedexStruct *param0);
+int Pokedex_Sort_CurrentCaughtStatus(const pokedexStruct *param0);
+const speciesCaughtStatusStruct *Pokedex_Sort_SpeciesCaughtStatus(const pokedexStruct *param0, int dexIndex);
+BOOL ov21_021D37F8(const pokedexStruct *param0, int param1);
+BOOL ov21_021D3810(pokedexStruct *param0, int param1);
+BOOL ov21_021D3844(pokedexStruct *param0, int param1);
+BOOL ov21_021D387C(pokedexStruct *param0, int param1);
+int ov21_021D3898(const pokedexStruct *param0);
+int ov21_021D38A4(const pokedexStruct *param0);
+int Pokedex_Sort_SeenIndexToSpecies(const pokedexStruct *param0, int param1);
+void ov21_021D38C0(pokedexStruct *param0);
+int Pokedex_Sort_NumEncountered(const pokedexStruct *param0);
+int Pokedex_Sort_NumCaught(const pokedexStruct *param0);
+Strbuf *Pokedex_Sort_TrainerName(const pokedexStruct *param0);
+u32 Pokedex_Sort_TrainerGender(const pokedexStruct *param0);
+BOOL ov21_021D392C(const pokedexStruct *param0, int param1);
+BOOL Pokedex_Sort_CanDetectForms(const pokedexStruct *param0);
+void ov21_021D3960(pokedexStruct *param0);
+u32 ov21_021D3998(const pokedexStruct *param0);
+
+#endif // POKEPLATINUM_OV21_021D3208_H

include/overlay021/struct_ov21_021D0D80.h

@@ -9,11 +9,11 @@
 typedef struct {
     const PokedexData *unk_00;
     const TrainerInfo *unk_04;
-    int unk_08;
-    BOOL unk_0C;
-    BOOL unk_10;
-    BOOL unk_14;
-    BOOL unk_18;
+    int timeOfDay;
+    BOOL pokedexSFlag_1;
+    BOOL pokedexSFlag_2;
+    BOOL pokedexSFlag_3;
+    BOOL pokedexSFlag_4;
     UnkStruct_0209ACBC *unk_1C;
 } UnkStruct_ov21_021D0D80;
 

include/overlay021/struct_ov21_021D0D80_1.h

@@ -9,11 +9,11 @@
 typedef struct {
     const PokedexData *unk_00;
     const TrainerInfo *unk_04;
-    int unk_08;
-    BOOL unk_0C;
-    BOOL unk_10;
-    BOOL unk_14;
-    BOOL unk_18;
+    int timeOfDay;
+    BOOL pokedexSFlag_1;
+    BOOL pokedexSFlag_2;
+    BOOL pokedexSFlag_3;
+    BOOL pokedexSFlag_4;
     UnkStruct_0209ACBC *unk_1C;
 } UnkStruct_ov21_021D0D80_1;
 

include/overlay021/struct_ov21_021D3208.h

@@ -6,13 +6,13 @@
 #include "trainer_info.h"
 
 typedef struct {
-    const PokedexData *unk_00;
+    const PokedexData *dexData;
     const TrainerInfo *unk_04;
-    int unk_08;
-    BOOL unk_0C;
-    BOOL unk_10;
-    BOOL unk_14;
-    BOOL unk_18;
+    int timeOfDay;
+    BOOL pokedexSFlag_1;
+    BOOL pokedexSFlag_2;
+    BOOL pokedexSFlag_3;
+    BOOL pokedexSFlag_4;
     u32 unk_1C;
     u32 unk_20;
 } UnkStruct_ov21_021D3208;

include/overlay021/struct_ov21_021D3320.h

@@ -9,25 +9,25 @@
 #include "strbuf.h"
 
 typedef struct {
-    const PokedexData *unk_00;
-    UnkStruct_ov21_021D3A60 unk_04;
-    int unk_1730;
-    BOOL unk_1734;
-    int unk_1738;
-    int unk_173C;
+    const PokedexData *dexData;
+    pokedexCompletionStruct pokedexCompletion;
+    int isNationalDex;
+    BOOL nationalDexUnlocked;
+    int numEncountered;
+    int numCaught;
     int unk_1740;
-    int unk_1744;
-    HeightWeightData *unk_1748;
-    u32 unk_174C;
-    u32 unk_1750;
-    Strbuf *unk_1754;
+    int timeOfDay;
+    HeightWeightData *HWData;
+    u32 TrainerGameCode;
+    u32 TrainerGender;
+    Strbuf *trainerName;
     int unk_1758;
     u16 unk_175C;
     u16 unk_175E;
-    BOOL unk_1760;
-    BOOL unk_1764;
-    BOOL unk_1768;
-    BOOL unk_176C;
-} UnkStruct_ov21_021D3320;
+    BOOL pokedexSFlag_1;
+    BOOL pokedexSFlag_2;
+    BOOL pokedexSFlag_3;
+    BOOL pokedexSFlag_4;
+} pokedexStruct;
 
 #endif // POKEPLATINUM_STRUCT_OV21_021D3320_H

include/overlay021/struct_ov21_021D37DC.h

@@ -2,8 +2,8 @@
 #define POKEPLATINUM_STRUCT_OV21_021D37DC_H
 
 typedef struct {
-    int unk_00;
-    int unk_04;
-} UnkStruct_ov21_021D37DC;
+    int species;
+    int caughtStatus;// 2 for caught, 1 for seen, 0 otherwise
+} speciesCaughtStatusStruct;
 
 #endif // POKEPLATINUM_STRUCT_OV21_021D37DC_H

include/overlay021/struct_ov21_021D3A60.h

@@ -6,12 +6,12 @@
 #include "overlay021/struct_ov21_021D37DC.h"
 
 typedef struct {
-    UnkStruct_ov21_021D37DC unk_00[NATIONAL_DEX_COUNT];
+    speciesCaughtStatusStruct caughtStatusArray[NATIONAL_DEX_COUNT];
     int unk_F68;
-    int unk_F6C;
-    int unk_F70[NATIONAL_DEX_COUNT];
+    int numEncountered;// number of pokemon seen
+    int encounteredIndexArray[NATIONAL_DEX_COUNT];// dex number for appearing in dex, dexLength+1 otherwise
     int unk_1724;
-    int unk_1728;
-} UnkStruct_ov21_021D3A60;
+    int numSpecies;
+} pokedexCompletionStruct;
 
 #endif // POKEPLATINUM_STRUCT_OV21_021D3A60_H

include/overlay021/struct_ov21_021D5844.h

@@ -2,8 +2,8 @@
 #define POKEPLATINUM_STRUCT_OV21_021D5844_H
 
 typedef struct {
-    int *unk_00;
-    int unk_04;
-} UnkStruct_ov21_021D5844;
+    int *pokedexEncArray;
+    int pokedexEncLength;
+} pokedexEncStruct;
 
 #endif // POKEPLATINUM_STRUCT_OV21_021D5844_H

include/overlay021/struct_ov21_021D5B68.h

@@ -5,7 +5,7 @@
 
 typedef struct {
     int *unk_00;
-    UnkStruct_ov21_021D3320 *unk_04;
+    pokedexStruct *unk_04;
     int unk_08;
     int unk_0C;
     int unk_10;

include/overlay021/struct_ov21_021DE6D4.h

@@ -6,7 +6,7 @@
 
 typedef struct {
     int *unk_00;
-    UnkStruct_ov21_021D3320 *unk_04;
+    pokedexStruct *unk_04;
     int unk_08;
     int unk_0C;
     const UnkStruct_ov21_021E68F4 *unk_10;

include/overlay021/struct_ov21_021E6A68.h

@@ -3,7 +3,7 @@
 
 typedef struct {
     int unk_00;
-    int unk_04;
+    int heapID;
     void *unk_08;
     BOOL unk_0C;
     BOOL unk_10;

include/overlay021/struct_ov21_021E6B20.h

@@ -3,7 +3,7 @@
 
 typedef struct {
     int unk_00;
-    int unk_04;
+    int heapID;
     void *unk_08;
 } UnkStruct_ov21_021E6B20;
 

include/pokedex_heightweight.h

@@ -7,11 +7,11 @@ HeightWeightData *Pokedex_HeightWeightData(int heapID);
 void Pokedex_HeightWeightData_Free(HeightWeightData *HWData);
 void Pokedex_HeightWeightData_Load(HeightWeightData *HWData, int trainerIsGirl, int param2);
 void Pokedex_HeightWeightData_Release(HeightWeightData *HWData);
-int Pokedex_HeightWeightData_Height(const HeightWeightData *HWData, int dexNumber);
-int Pokedex_HeightWeightData_Weight(const HeightWeightData *HWData, int dexNumber);
-short Pokedex_HeightWeightData_TrainerPos(const HeightWeightData *HWData, int dexNumber);
-short Pokedex_HeightWeightData_PokemonPos(const HeightWeightData *HWData, int dexNumber);
-short Pokedex_HeightWeightData_TrainerScale(const HeightWeightData *HWData, int dexNumber);
-short Pokedex_HeightWeightData_PokemonScale(const HeightWeightData *HWData, int dexNumber);
+int Pokedex_HeightWeightData_Height(const HeightWeightData *HWData, int species);
+int Pokedex_HeightWeightData_Weight(const HeightWeightData *HWData, int species);
+short Pokedex_HeightWeightData_TrainerPos(const HeightWeightData *HWData, int species);
+short Pokedex_HeightWeightData_PokemonPos(const HeightWeightData *HWData, int species);
+short Pokedex_HeightWeightData_TrainerScale(const HeightWeightData *HWData, int species);
+short Pokedex_HeightWeightData_PokemonScale(const HeightWeightData *HWData, int species);
 
 #endif // POKEPLATINUM_Pokedex_HeightWeight_H