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, 35 insertions, 83 deletions

diff --git a/data/dungeon/pokemon_found.inc b/data/dungeon/pokemon_found.inc
index 9b5508b..220f1c7 100644
--- a/data/dungeon/pokemon_found.inc
+++ b/data/dungeon/pokemon_found.inc
@@ -1,5 +1,7 @@
 @ Start of Pokemon Found (0x84b6064)
 
+.include "include/constants/species.h"
+
 .include "data/dungeon/TinyWoods/pokemon_found.inc"
 .include "data/dungeon/ThunderwaveCave/pokemon_found.inc"
 .include "data/dungeon/MtSteel/pokemon_found.inc"
@@ -9,66 +11,16 @@
 .include "data/dungeon/MtThunderPeak/pokemon_found.inc"
 .include "data/dungeon/GreatCanyon/pokemon_found.inc"
 .include "data/dungeon/LapisCave/pokemon_found.inc"
+.include "data/dungeon/MtBlaze/pokemon_found.inc"
+.include "data/dungeon/MtBlazePeak/pokemon_found.inc"
+.include "data/dungeon/FrostyForest/pokemon_found.inc"
+.include "data/dungeon/FrostyGrotto/pokemon_found.inc"
+.include "data/dungeon/MtFreeze/pokemon_found.inc"
+.include "data/dungeon/MtFreezePeak/pokemon_found.inc"
 
 
-.byte 0x12, 0x20, 0x29, 0x0b, 0x29, 0x0b, 0x00, 0x00
-.byte 0xf3, 0x20, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00
-.byte 0x09, 0x23, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00
-.byte 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
-.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 
-.byte 0xf3, 0x20, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00
-.byte 0x09, 0x23, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00
-.byte 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
-.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-.byte 0xee, 0x1e, 0x18, 0x05, 0x18, 0x05, 0x00, 0x00
-.byte 0xf3, 0x20, 0xe3, 0x0b, 0xe3, 0x0b, 0x00, 0x00
-.byte 0x09, 0x23, 0x7a, 0x19, 0x7a, 0x19, 0x00, 0x00
-.byte 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
-.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-.byte 0xee, 0x1e, 0xd0, 0x07
-.byte 0xd0, 0x07, 0x00, 0x00, 0xf3, 0x20, 0x3b, 0x12, 0x3b, 0x12, 0x00, 0x00, 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0x1e, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00, 0xf3, 0x20, 0x3b, 0x12, 0x3b, 0x12, 0x00, 0x00, 0x5d, 0x1f, 0x10, 0x27
-.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x14, 0x96, 0x0d
-.byte 0x96, 0x0d, 0x00, 0x00, 0xee, 0x1e, 0xaf, 0x12, 0xaf, 0x12, 0x00, 0x00, 0xf3, 0x20, 0x7a, 0x19, 0x7a, 0x19, 0x00, 0x00, 0x5d, 0x1f, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x14, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00, 0xf3, 0x20, 0x70, 0x17
-.byte 0x70, 0x17, 0x00, 0x00, 0x5d, 0x1f, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x22, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0x3b, 0x24, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x92, 0x40, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x1c, 0x6a, 0x18, 0x6a, 0x18, 0x00, 0x00, 0x43, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x1c, 0x47, 0x10, 0x47, 0x10, 0x00, 0x00, 0x43, 0x17, 0x0b, 0x1a
-.byte 0x0b, 0x1a, 0x00, 0x00, 0x44, 0x1b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x84, 0x32, 0x95, 0x05, 0x95, 0x05, 0x00, 0x00, 0xa2, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0xf6, 0x1c, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00, 0x44, 0x1b, 0x10, 0x27
-.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x32, 0xae, 0x08
-.byte 0xae, 0x08, 0x00, 0x00, 0xf6, 0x1c, 0xb4, 0x15, 0xb4, 0x15, 0x00, 0x00, 0x44, 0x1b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x32, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00, 0x1f, 0x23, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00, 0x4a, 0x23, 0x10, 0x27
-.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x32, 0x40, 0x06
-.byte 0x40, 0x06, 0x00, 0x00, 0x1f, 0x23, 0xc0, 0x12, 0xc0, 0x12, 0x00, 0x00, 0x4a, 0x23, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x29, 0x10, 0x27
-.byte 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6f, 0x20, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x93, 0x23, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x42, 0x10, 0x27
-.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe5, 0x24, 0x57, 0x04
-.byte 0x57, 0x04, 0x00, 0x00, 0x66, 0x25, 0xb4, 0x15, 0xb4, 0x15, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x27, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x24, 0xc7, 0x0a, 0xc7, 0x0a, 0x00, 0x00, 0xe5, 0x24, 0x78, 0x0d, 0x78, 0x0d, 0x00, 0x00, 0x10, 0x23, 0x83, 0x11
-.byte 0x83, 0x11, 0x00, 0x00, 0x66, 0x25, 0x49, 0x1c, 0x49, 0x1c, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x27, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x24, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00, 0x66, 0x25, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x90, 0x27, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x24, 0x29, 0x0b
-.byte 0x29, 0x0b, 0x00, 0x00, 0x39, 0x29, 0x52, 0x16, 0x52, 0x16, 0x00, 0x00, 0x68, 0x25, 0x7b, 0x21, 0x7b, 0x21, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x2d, 0x10, 0x27
-.byte 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x29, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00, 0x68, 0x25, 0x40, 0x1f
-.byte 0x40, 0x1f, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x2d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x3a, 0x1f, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00, 0x68, 0x25, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x2d, 0x10, 0x27
-.byte 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3a, 0x1f, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0x69, 0x27, 0x10, 0x27
-.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x86, 0x29, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x6e, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x41, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86, 0x29, 0x10, 0x27
-.byte 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x26, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00, 0x1b, 0x28, 0x88, 0x13
+.byte 0x14, 0x26, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00, 0x1b, 0x28, 0x88, 0x13
 .byte 0x88, 0x13, 0x00, 0x00, 0x1f, 0x28, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00, 0x22, 0x2a, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x28, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00, 0x1f, 0x28, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00, 0x22, 0x2a, 0x10, 0x27
 .byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x28, 0xc4, 0x09
@@ -1616,33 +1568,33 @@ DungeonPokemonFoundTable:
 .4byte LapisCave_11F_12F_Pokemon
 .4byte LapisCave_13F_Pokemon
 .4byte LapisCave_14F_Pokemon
+.4byte MtBlaze_1F_3F_Pokemon
+.4byte MtBlaze_4F_Pokemon
+.4byte MtBlaze_5F_Pokemon
+.4byte MtBlaze_6F_Pokemon
+.4byte MtBlaze_7F_Pokemon
+.4byte MtBlaze_8F_9F_Pokemon
+.4byte MtBlaze_10F_12F_Pokemon
+.4byte MtBlazePeak_1F_2F_Pokemon
+.4byte MtBlazePeak_3F_Pokemon
+.4byte FrostyForest_1F_2F_Pokemon
+.4byte FrostyForest_3F_Pokemon
+.4byte FrostyForest_4F_Pokemon
+.4byte FrostyForest_5F_6F_Pokemon
+.4byte FrostyForest_7F_Pokemon
+.4byte FrostyForest_8F_9F_Pokemon
+.4byte FrostyGrotto_1F_4F_Pokemon
+.4byte FrostyGrotto_5F_Pokemon
+.4byte MtFreeze_1F_2F_Pokemon
+.4byte MtFreeze_3F_5F_Pokemon
+.4byte MtFreeze_6F_Pokemon
+.4byte MtFreeze_7F_Pokemon
+.4byte MtFreeze_8F_11F_Pokemon
+.4byte MtFreeze_12F_Pokemon
+.4byte MtFreeze_13F_15F_Pokemon
+.4byte MtFreezePeak_1F_4F_Pokemon
+.4byte MtFreezePeak_5F_Pokemon
 
-.byte 0xbc, 0x6c, 0x4b, 0x08
-.byte 0xf4, 0x6c, 0x4b, 0x08
-.byte 0x24, 0x6d, 0x4b, 0x08
-.byte 0x5c, 0x6d, 0x4b, 0x08
-.byte 0x8c, 0x6d, 0x4b, 0x08
-.byte 0xbc, 0x6d, 0x4b, 0x08
-.byte 0xf4, 0x6d, 0x4b, 0x08
-.byte 0x24, 0x6e, 0x4b, 0x08
-.byte 0x4c, 0x6e, 0x4b, 0x08
-.byte 0x6c, 0x6e, 0x4b, 0x08
-.byte 0x94, 0x6e, 0x4b, 0x08
-.byte 0xc4, 0x6e, 0x4b, 0x08
-.byte 0xfc, 0x6e, 0x4b, 0x08
-.byte 0x2c, 0x6f, 0x4b, 0x08
-.byte 0x5c, 0x6f, 0x4b, 0x08
-.byte 0x94, 0x6f, 0x4b, 0x08
-.byte 0xbc, 0x6f, 0x4b, 0x08
-.byte 0xdc, 0x6f, 0x4b, 0x08
-.byte 0x0c, 0x70, 0x4b, 0x08
-.byte 0x4c, 0x70, 0x4b, 0x08
-.byte 0x7c, 0x70, 0x4b, 0x08
-.byte 0xb4, 0x70, 0x4b, 0x08
-.byte 0xe4, 0x70, 0x4b, 0x08
-.byte 0x14, 0x71, 0x4b, 0x08
-.byte 0x3c, 0x71, 0x4b, 0x08
-.byte 0x5c, 0x71, 0x4b, 0x08
 .byte 0x94, 0x71, 0x4b, 0x08
 .byte 0xcc, 0x71, 0x4b, 0x08
 .byte 0xfc, 0x71, 0x4b, 0x08