Dungeon pokemon/Floor ID JSON Part 1 (#39)

* move Thunderwave and Tiny Woods pokemon to json

* rule tweaking to actually build tool before parsing JSON

* delete .inc pokemon for tiny Woods and Thunderwave

* silence git complaining about br_ips and ips_patch

* use defines for species and pass the header file for species

* convert sinister woods

* convert MtThunderPeak

* convert silent chasm

* add trial floor_id w/ tiny woods

* change make rule name to fix compile

* MtSteel converted and bugfix

* convert few floor headers and great canyon pokemon

* code cleanup

* unify unkData into UnkTextStruct2

* more code cleanup and some text decomp

* doc more funcs and decomp/split some stuff

* document more save stuff

* more save work and move some data

* pika sniped UpdateNatureTotal

* decomp a litle and convert a few more dungeons

* better scanning for json files

* mt freeze and peak

1 files changed, 19 insertions, 19 deletions

diff --git a/src/pokemon_mid.c b/src/pokemon_mid.c
index e8405c8..9653217 100644
--- a/src/pokemon_mid.c
+++ b/src/pokemon_mid.c
@@ -10,12 +10,12 @@ extern const char gUnknown_8107630[];
 extern const char gUnknown_8107638[];
 extern const char gUnknown_810763C[];
 
-extern void sub_800D158(u8 *buffer, const char *r2, ...);
+extern void ExpandPlaceholdersBuffer(u8 *buffer, const char *r2, ...);
 extern s16 sub_808E770(u32);
 extern s32 GetUnownIndex(s32);
 extern void sub_80922B4(u8 *, u8 *, s32);
 
-extern void sub_800D158(u8 *buffer, const char *r2, ...);
+extern void ExpandPlaceholdersBuffer(u8 *buffer, const char *r2, ...);
 
 void CopySpeciesNametoBuffer(u8 * buffer, s16 index)
 {
@@ -25,13 +25,13 @@ void CopySpeciesNametoBuffer(u8 * buffer, s16 index)
 void CopyYellowSpeciesNametoBuffer(u8 *buffer, s16 index)
 {
     s32 new_index = index;
-    sub_800D158(buffer, gUnknown_8107600, gMonsterParameters[new_index].species); // #c6%s#r
+    ExpandPlaceholdersBuffer(buffer, gUnknown_8107600, gMonsterParameters[new_index].species); // #c6%s#r
 }
 
 void CopyCyanSpeciesNametoBuffer(u8 *buffer, s16 index)
 {
     s32 new_index = index;
-    sub_800D158(buffer, gUnknown_8107608, gMonsterParameters[new_index].species); // #c5%s#r
+    ExpandPlaceholdersBuffer(buffer, gUnknown_8107608, gMonsterParameters[new_index].species); // #c5%s#r
 }
 
 void sub_808D930(u8 *buffer, s16 index)
@@ -46,10 +46,10 @@ void sub_808D930(u8 *buffer, s16 index)
     preload = gUnknown_8107630; // %s%c
     unownString = GetMonSpecies(SPECIES_UNOWN);
     unownIndex = GetUnownIndex(newIndex);
-    sub_800D158(buffer,preload,unownString,gUnownLetters[unownIndex]); // ABCDEFGHIJKLMNOPQRSTUVWXYZ!? 
+    ExpandPlaceholdersBuffer(buffer,preload,unownString,gUnownLetters[unownIndex]); // ABCDEFGHIJKLMNOPQRSTUVWXYZ!? 
   }
   else {
-    sub_800D158(buffer,gUnknown_8107638, gMonsterParameters[newIndex].species); // %s
+    ExpandPlaceholdersBuffer(buffer,gUnknown_8107638, gMonsterParameters[newIndex].species); // %s
   }
 }
 
@@ -58,37 +58,37 @@ char * GetMonSpecies(s16 index)
     return gMonsterParameters[index].species;
 }
 
-void sub_808D9AC(u8 *param_1, u8 *param_2, s32 param_3)
+void sub_808D9AC(u8 *buffer, struct PokemonStruct *pokemon, s32 colorNum)
 {
   u8 auStack32 [20];
 
-  sub_80922B4(auStack32, param_2 + 0x4c, 10);
-  if (param_3 == 0) {
-    param_3 = 5;
+  sub_80922B4(auStack32, pokemon->name, 10);
+  if (colorNum == 0) {
+    colorNum = 5;
   }
-  sub_800D158(param_1,gUnknown_810763C,param_3,auStack32); // #c%c%s#r
+  ExpandPlaceholdersBuffer(buffer,gUnknown_810763C,colorNum,auStack32); // #c%c%s#r
 }
 
-void sub_808D9DC(u8 *param_1, u8 *param_2, s32 param_3)
+void sub_808D9DC(u8 *buffer, u8 *param_2, s32 colorNum)
 {
   u8 auStack32 [20];
 
   sub_80922B4(auStack32, param_2 + 0x58, 10);
-  if (param_3 == 0) {
-    param_3 = 6;
+  if (colorNum == 0) {
+    colorNum = 6;
   }
-  sub_800D158(param_1,gUnknown_810763C,param_3,auStack32); // #c%c%s#r
+  ExpandPlaceholdersBuffer(buffer,gUnknown_810763C,colorNum,auStack32); // #c%c%s#r
 }
 
-void sub_808DA0C(u8 *param_1, u8 *param_2)
+void sub_808DA0C(u8 *buffer, u8 *param_2)
 {
   u8 auStack32 [20];
 
   sub_80922B4(auStack32, param_2 + 0x58, 10);
-  sub_800D158(param_1,gUnknown_8107638,auStack32); // %s
+  ExpandPlaceholdersBuffer(buffer,gUnknown_8107638,auStack32); // %s
 }
 
-void sub_808DA34(u8 *param_1, u8 *param_2)
+void sub_808DA34(u8 *buffer, struct PokemonStruct *pokemon)
 {
-  sub_80922B4(param_1, param_2 + 0x4c, 10);
+  sub_80922B4(buffer, pokemon->name, 10);
 }