Merge pull request #263 from h2o-DS/zukan_data.narc

Decompile zukan_data NARC

consts/pokemon.json

@@ -175,6 +175,26 @@
                 "FOOTPRINT_MEDIUM",
                 "FOOTPRINT_LARGE"
             ]
+        },
+        "@PokemonBodyShape": {
+            "type": "enum",
+            "values": [
+                "SHAPE_QUADRUPED",
+                "SHAPE_BIPEDAL_TAILLESS",
+                "SHAPE_BIPEDAL_TAILED",
+                "SHAPE_SERPENTINE",
+                "SHAPE_MULTI_WINGED",
+                "SHAPE_WINGED",
+                "SHAPE_INSECTOID",
+                "SHAPE_HEAD_BASE",
+                "SHAPE_HEAD_ARMS",
+                "SHAPE_HEAD_LEGS",
+                "SHAPE_TENTACLES",
+                "SHAPE_FINS",
+                "SHAPE_HEAD",
+                "SHAPE_MULTI_BODY",
+                "NUMBER_OF_BODY_SHAPES"
+            ]
         }
     }
 }

include/overlay062/ov62_02231690.h

@@ -25,7 +25,7 @@ int ov62_022316D0(UnkStruct_0208C06C *param0);
 int ov62_02231710(UnkStruct_0208C06C *param0, int param1);
 void ov62_022317CC(UnkStruct_0208C06C *param0, int param1);
 void ov62_022318E8(UnkStruct_0208C06C *param0);
-u16 *ov62_02231948(int param0, int param1, int *param2);
+u16 *ov62_Pokedex_Alphabetical(int heapID, int unused, int *pokedexLength);
 void ov62_0223196C(UnkStruct_0208C06C *param0, BOOL param1);
 BOOL ov62_02231974(UnkStruct_0208C06C *param0);
 void ov62_0223197C(UnkStruct_0208C06C *param0, int param1);

include/overlay094/ov94_022414B8.h

@@ -26,7 +26,7 @@ void ov94_0224226C(Window *param0, MessageLoader *param1, int param2, int param3
 void ov94_022422B8(Window *param0, MessageLoader *param1, int param2, int param3, int param4, u32 param5, int param6);
 void ov94_022422D4(MessageLoader *param0, MessageLoader *param1, StringTemplate *param2, Window param3[], int param4, int param5, int param6);
 void ov94_02242368(MessageLoader *param0, MessageLoader *param1, StringTemplate *param2, Window param3[], int param4, int param5, int param6);
-u16 *ov94_02242524(int param0, int param1, int *param2);
+u16 *ov94_Pokedex_Alphabetical(int heapID, int unused, int *pokedexLength);
 u8 *ov94_02242548(int param0);
 void ov94_022425A8(UnkStruct_ov94_0223BA88 *param0, UnkStruct_ov94_0223FD4C *param1);
 BmpList *ov94_022426A8(UnkStruct_ov94_0223FD4C *param0, ResourceMetadata **param1, Window *param2, MessageLoader *param3);

include/pokedex_data_index.h

@@ -0,0 +1,9 @@
+#ifndef POKEPLATINUM_POKEDEX_DATA_INDEX_H
+#define POKEPLATINUM_POKEDEX_DATA_INDEX_H
+
+void Pokedex_SetupGiratina(u32 param0);
+u32 Pokedex_Data_NARC_Index(void);
+u32 Weight_Message_Bank_Index(void);
+u32 Height_Message_Bank_Index(void);
+
+#endif // POKEPLATINUM_POKEDEX_DATA_INDEX_H

include/pokedex_heightweight.h

@@ -0,0 +1,17 @@
+#ifndef POKEPLATINUM_Pokedex_HeightWeight_H
+#define POKEPLATINUM_Pokedex_HeightWeight_H
+
+#include "struct_decls/struct_02098700_decl.h"
+
+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);
+
+#endif // POKEPLATINUM_Pokedex_HeightWeight_H

include/unk_02006E3C.h

@@ -21,7 +21,7 @@ void *sub_02006FA0(u32 param0, u32 param1, BOOL param2, NNSG2dCellDataBank **par
 void *sub_02006FBC(u32 param0, u32 param1, BOOL param2, NNSG2dAnimBankData **param3, u32 param4);
 void *sub_02006FD8(u32 param0, u32 param1, u32 param2);
 void *sub_02006FE8(u32 param0, u32 param1, BOOL param2, u32 param3, int param4);
-void *sub_02007068(u32 param0, u32 param1, BOOL param2, u32 param3, int param4, u32 *param5);
+void *sub_02007068(u32 narcIndex, u32 fileIndex, BOOL param2, u32 heapID, int param4, u32 *fileSize);
 u32 sub_020070E8(NARC *param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7);
 void sub_0200710C(NARC *param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7);
 void sub_02007130(NARC *param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5);

platinum.us/main.lsf

@@ -341,8 +341,8 @@ Static main
 	Object main.nef.p/src_unk_02098218.c.o
 	Object main.nef.p/src_unk_020985E4.c.o
 	Object main.nef.p/src_unk_020986CC.c.o
-	Object main.nef.p/src_unk_02098700.c.o
-	Object main.nef.p/src_unk_02098988.c.o
+	Object main.nef.p/src_pokedex_heightweight.c.o
+	Object main.nef.p/src_pokedex_data_index.c.o
 	Object main.nef.p/src_unk_020F6824.c.o
 	Object main.nef.p/src_unk_020989DC.c.o
 	Object main.nef.p/src_unk_02098FFC.c.o

res/pokemon/000/data.json

@@ -46,5 +46,20 @@
     "learnset": {
         "tms": [],
         "level_up": {}
+    },
+    "pokedex_data": {
+        "height": 7,
+        "weight": 69,
+        "body_shape": "SHAPE_QUADRUPED",
+        "trainer_scale_f": 272,
+        "pokemon_scale_f": 337,
+        "trainer_scale_m": 256,
+        "pokemon_scale_m": 337,
+        "trainer_pos_f": 8,
+        "pokemon_pos_f": 22,
+        "trainer_pos_m": 9,
+        "pokemon_pos_m": 22,
+        "entry_text": null,
+        "category": "????? Pokémon"
     }
 }

res/pokemon/abomasnow/data.json

@@ -123,5 +123,20 @@
     "footprint": {
         "has_footprint": true,
         "footprint_size": "FOOTPRINT_MEDIUM"
+    },
+    "pokedex_data": {
+        "height": 22,
+        "weight": 1355,
+        "body_shape": "SHAPE_BIPEDAL_TAILED",
+        "trainer_scale_f": 335,
+        "pokemon_scale_f": 256,
+        "trainer_scale_m": 328,
+        "pokemon_scale_m": 256,
+        "trainer_pos_f": 15,
+        "pokemon_pos_f": 4,
+        "trainer_pos_m": 15,
+        "pokemon_pos_m": 4,
+        "entry_text": "They appear when the snow flowers\nbloom. When the petals fall, they\nretreat to places unknown again.",
+        "category": "Frost Tree Pokémon"
     }
 }

res/pokemon/abra/data.json

@@ -114,5 +114,20 @@
     "footprint": {
         "has_footprint": true,
         "footprint_size": "FOOTPRINT_MEDIUM"
+    },
+    "pokedex_data": {
+        "height": 9,
+        "weight": 195,
+        "body_shape": "SHAPE_BIPEDAL_TAILED",
+        "trainer_scale_f": 272,
+        "pokemon_scale_f": 364,
+        "trainer_scale_m": 256,
+        "pokemon_scale_m": 364,
+        "trainer_pos_f": 8,
+        "pokemon_pos_f": 25,
+        "trainer_pos_m": 9,
+        "pokemon_pos_m": 25,
+        "entry_text": "Using its psychic power is such a\nstrain on its brain that it needs\nto sleep for 18 hours a day.",
+        "category": "Psi Pokémon"
     }
 }

res/pokemon/absol/data.json

@@ -141,5 +141,20 @@
     "footprint": {
         "has_footprint": true,
         "footprint_size": "FOOTPRINT_MEDIUM"
+    },
+    "pokedex_data": {
+        "height": 12,
+        "weight": 470,
+        "body_shape": "SHAPE_QUADRUPED",
+        "trainer_scale_f": 272,
+        "pokemon_scale_f": 300,
+        "trainer_scale_m": 256,
+        "pokemon_scale_m": 300,
+        "trainer_pos_f": 8,
+        "pokemon_pos_f": 14,
+        "trainer_pos_m": 9,
+        "pokemon_pos_m": 14,
+        "entry_text": "Rumored to sense disasters with its\nhorn, it became a target. It fled\ndeep into the mountains.",
+        "category": "Disaster Pokémon"
     }
 }

res/pokemon/aerodactyl/data.json

@@ -126,5 +126,20 @@
     "footprint": {
         "has_footprint": true,
         "footprint_size": "FOOTPRINT_MEDIUM"
+    },
+    "pokedex_data": {
+        "height": 18,
+        "weight": 590,
+        "body_shape": "SHAPE_WINGED",
+        "trainer_scale_f": 272,
+        "pokemon_scale_f": 221,
+        "trainer_scale_m": 256,
+        "pokemon_scale_m": 221,
+        "trainer_pos_f": 8,
+        "pokemon_pos_f": 4,
+        "trainer_pos_m": 9,
+        "pokemon_pos_m": 4,
+        "entry_text": "A Pokémon that roamed the skies\nin the dinosaur era. Its teeth are\nlike saw blades.",
+        "category": "Fossil Pokémon"
     }
 }

res/pokemon/aggron/data.json

@@ -150,5 +150,20 @@
     "footprint": {
         "has_footprint": true,
         "footprint_size": "FOOTPRINT_LARGE"
+    },
+    "pokedex_data": {
+        "height": 21,
+        "weight": 3600,
+        "body_shape": "SHAPE_BIPEDAL_TAILED",
+        "trainer_scale_f": 350,
+        "pokemon_scale_f": 256,
+        "trainer_scale_m": 355,
+        "pokemon_scale_m": 256,
+        "trainer_pos_f": 15,
+        "pokemon_pos_f": 6,
+        "trainer_pos_m": 15,
+        "pokemon_pos_m": 6,
+        "entry_text": "While seeking iron for food, it\ndigs tunnels by breaking through\nbedrock with its steel horns.",
+        "category": "Iron Armor Pokémon"
     }
 }

res/pokemon/aipom/data.json

@@ -133,5 +133,20 @@
     "footprint": {
         "has_footprint": true,
         "footprint_size": "FOOTPRINT_MEDIUM"
+    },
+    "pokedex_data": {
+        "height": 8,
+        "weight": 115,
+        "body_shape": "SHAPE_BIPEDAL_TAILED",
+        "trainer_scale_f": 256,
+        "pokemon_scale_f": 323,
+        "trainer_scale_m": 256,
+        "pokemon_scale_m": 323,
+        "trainer_pos_f": 8,
+        "pokemon_pos_f": 15,
+        "trainer_pos_m": 9,
+        "pokemon_pos_m": 15,
+        "entry_text": "It lives high among the treetops.\nIt can use its tail as freely and\ncleverly as its hands.",
+        "category": "Long Tail Pokémon"
     }
 }

res/pokemon/alakazam/data.json

@@ -125,5 +125,20 @@
     "footprint": {
         "has_footprint": true,
         "footprint_size": "FOOTPRINT_MEDIUM"
+    },
+    "pokedex_data": {
+        "height": 15,
+        "weight": 480,
+        "body_shape": "SHAPE_BIPEDAL_TAILLESS",
+        "trainer_scale_f": 272,
+        "pokemon_scale_f": 238,
+        "trainer_scale_m": 256,
+        "pokemon_scale_m": 238,
+        "trainer_pos_f": 8,
+        "pokemon_pos_f": 7,
+        "trainer_pos_m": 9,
+        "pokemon_pos_m": 7,
+        "entry_text": "The spoons clutched in its hands\nare said to have been created by\nits psychic powers.",
+        "category": "Psi Pokémon"
     }
 }

res/pokemon/altaria/data.json

@@ -122,5 +122,20 @@
     "footprint": {
         "has_footprint": true,
         "footprint_size": "FOOTPRINT_LARGE"
+    },
+    "pokedex_data": {
+        "height": 11,
+        "weight": 206,
+        "body_shape": "SHAPE_WINGED",
+        "trainer_scale_f": 272,
+        "pokemon_scale_f": 320,
+        "trainer_scale_m": 256,
+        "pokemon_scale_m": 320,
+        "trainer_pos_f": 8,
+        "pokemon_pos_f": 0,
+        "trainer_pos_m": 9,
+        "pokemon_pos_m": 0,
+        "entry_text": "If it bonds with a person, it will\ngently envelop the friend with its\nsoft wings, then hum.",
+        "category": "Humming Pokémon"
     }
 }

res/pokemon/ambipom/data.json

@@ -130,5 +130,20 @@
     "footprint": {
         "has_footprint": true,
         "footprint_size": "FOOTPRINT_MEDIUM"
+    },
+    "pokedex_data": {
+        "height": 12,
+        "weight": 203,
+        "body_shape": "SHAPE_BIPEDAL_TAILED",
+        "trainer_scale_f": 272,
+        "pokemon_scale_f": 282,
+        "trainer_scale_m": 256,
+        "pokemon_scale_m": 282,
+        "trainer_pos_f": 8,
+        "pokemon_pos_f": 7,
+        "trainer_pos_m": 9,
+        "pokemon_pos_m": 7,
+        "entry_text": "Split into two, the tails are so\nadept at handling and doing things,\nAMBIPOM rarely uses its hands.",
+        "category": "Long Tail Pokémon"
     }
 }

res/pokemon/ampharos/data.json

@@ -113,5 +113,20 @@
     "footprint": {
         "has_footprint": true,
         "footprint_size": "FOOTPRINT_MEDIUM"
+    },
+    "pokedex_data": {
+        "height": 14,
+        "weight": 615,
+        "body_shape": "SHAPE_BIPEDAL_TAILED",
+        "trainer_scale_f": 272,
+        "pokemon_scale_f": 243,
+        "trainer_scale_m": 256,
+        "pokemon_scale_m": 243,
+        "trainer_pos_f": 8,
+        "pokemon_pos_f": 8,
+        "trainer_pos_m": 9,
+        "pokemon_pos_m": 8,
+        "entry_text": "The tip of its tail shines brightly.\nIn the olden days, people sent\nsignals using the tail’s light.",
+        "category": "Light Pokémon"
     }
 }

res/pokemon/anorith/data.json

@@ -113,5 +113,20 @@
     "footprint": {
         "has_footprint": false,
         "footprint_size": "FOOTPRINT_LARGE"
+    },
+    "pokedex_data": {
+        "height": 7,
+        "weight": 125,
+        "body_shape": "SHAPE_INSECTOID",
+        "trainer_scale_f": 272,
+        "pokemon_scale_f": 343,
+        "trainer_scale_m": 256,
+        "pokemon_scale_m": 343,
+        "trainer_pos_f": 8,
+        "pokemon_pos_f": 3,
+        "trainer_pos_m": 9,
+        "pokemon_pos_m": 3,
+        "entry_text": "A Pokémon ancestor that was\nreanimated from a fossil. It lived\nin the sea and hunted with claws.",
+        "category": "Old Shrimp Pokémon"
     }
 }