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, 23 insertions, 23 deletions

diff --git a/asm/friend_rescue.s b/asm/friend_rescue.s
index d02ddc6..ebe5fab 100644
--- a/asm/friend_rescue.s
+++ b/asm/friend_rescue.s
@@ -1542,7 +1542,7 @@ _080335C0:
 	adds r0, r4
 	ldr r1, _080335F0
 	add r2, sp, 0x14
-	bl sub_800D158
+	bl ExpandPlaceholdersBuffer
 	ldr r0, [r5]
 	adds r0, r4
 	b _0803388E
@@ -2543,7 +2543,7 @@ sub_8033D74:
 	movs r0, 0x17
 	bl sub_80338C4
 	movs r0, 0
-	bl sub_8012574
+	bl PrepareSavePakWrite
 _08033D8E:
 	add sp, 0x4
 	pop {r0}
@@ -2558,11 +2558,11 @@ sub_8033D94:
 	bl sub_80144A4
 	cmp r0, 0
 	bne _08033DB6
-	bl sub_8012600
+	bl WriteSavePak
 	lsls r0, 24
 	cmp r0, 0
 	bne _08033DB6
-	bl sub_8012750
+	bl FinishWriteSavePak
 	movs r0, 0x18
 	bl sub_80338C4
 _08033DB6:
@@ -3410,11 +3410,11 @@ sub_8034478:
 	bl sub_80144A4
 	cmp r0, 0
 	bne _0803449A
-	bl sub_8012600
+	bl WriteSavePak
 	lsls r0, 24
 	cmp r0, 0
 	bne _0803449A
-	bl sub_8012750
+	bl FinishWriteSavePak
 	movs r0, 0x2
 	bl sub_80338C4
 _0803449A:
@@ -3434,7 +3434,7 @@ sub_80344A0:
 	movs r0, 0x2C
 	bl sub_80338C4
 	movs r0, 0
-	bl sub_8012574
+	bl PrepareSavePakWrite
 _080344BA:
 	add sp, 0x4
 	pop {r0}
@@ -3710,11 +3710,11 @@ sub_80346D8:
 	bl sub_80144A4
 	cmp r0, 0
 	bne _080346FA
-	bl sub_8012600
+	bl WriteSavePak
 	lsls r0, 24
 	cmp r0, 0
 	bne _080346FA
-	bl sub_8012750
+	bl FinishWriteSavePak
 	movs r0, 0x2
 	bl sub_80338C4
 _080346FA:
@@ -3734,7 +3734,7 @@ sub_8034700:
 	movs r0, 0x38
 	bl sub_80338C4
 	movs r0, 0
-	bl sub_8012574
+	bl PrepareSavePakWrite
 _0803471A:
 	add sp, 0x4
 	pop {r0}
@@ -3859,7 +3859,7 @@ sub_80347E4:
 	movs r0, 0x41
 	bl sub_80338C4
 	movs r0, 0
-	bl sub_8012574
+	bl PrepareSavePakWrite
 _080347FE:
 	add sp, 0x4
 	pop {r0}
@@ -3874,11 +3874,11 @@ sub_8034804:
 	bl sub_80144A4
 	cmp r0, 0
 	bne _08034826
-	bl sub_8012600
+	bl WriteSavePak
 	lsls r0, 24
 	cmp r0, 0
 	bne _08034826
-	bl sub_8012750
+	bl FinishWriteSavePak
 	movs r0, 0x42
 	bl sub_80338C4
 _08034826:
@@ -4536,7 +4536,7 @@ sub_8034D54:
 	movs r0, 0x65
 	bl sub_80338C4
 	movs r0, 0
-	bl sub_8012574
+	bl PrepareSavePakWrite
 _08034D6E:
 	add sp, 0x4
 	pop {r0}
@@ -4699,11 +4699,11 @@ sub_8034EC8:
 	bl sub_80144A4
 	cmp r0, 0
 	bne _08034EEA
-	bl sub_8012600
+	bl WriteSavePak
 	lsls r0, 24
 	cmp r0, 0
 	bne _08034EEA
-	bl sub_8012750
+	bl FinishWriteSavePak
 	movs r0, 0x2
 	bl sub_80338C4
 _08034EEA:
@@ -4720,11 +4720,11 @@ sub_8034EF0:
 	bl sub_80144A4
 	cmp r0, 0
 	bne _08034F12
-	bl sub_8012600
+	bl WriteSavePak
 	lsls r0, 24
 	cmp r0, 0
 	bne _08034F12
-	bl sub_8012750
+	bl FinishWriteSavePak
 	movs r0, 0x2
 	bl sub_80338C4
 _08034F12:
@@ -4744,7 +4744,7 @@ sub_8034F18:
 	movs r0, 0x65
 	bl sub_80338C4
 	movs r0, 0
-	bl sub_8012574
+	bl PrepareSavePakWrite
 _08034F32:
 	add sp, 0x4
 	pop {r0}
@@ -4762,7 +4762,7 @@ sub_8034F38:
 	movs r0, 0x71
 	bl sub_80338C4
 	movs r0, 0
-	bl sub_8012574
+	bl PrepareSavePakWrite
 _08034F52:
 	add sp, 0x4
 	pop {r0}
@@ -4880,7 +4880,7 @@ sub_8035018:
 	movs r0, 0x76
 	bl sub_80338C4
 	movs r0, 0
-	bl sub_8012574
+	bl PrepareSavePakWrite
 _08035032:
 	add sp, 0x4
 	pop {r0}
@@ -4895,11 +4895,11 @@ sub_8035038:
 	bl sub_80144A4
 	cmp r0, 0
 	bne _0803508E
-	bl sub_8012600
+	bl WriteSavePak
 	lsls r0, 24
 	cmp r0, 0
 	bne _0803508E
-	bl sub_8012750
+	bl FinishWriteSavePak
 	ldr r0, _0803506C
 	ldr r0, [r0]
 	ldr r1, _08035070