From 377bd14ea67d6177250fb401e12d7dfcf44e2cf6 Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Wed, 9 Jun 2021 22:54:21 -0500
Subject: 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
---
 asm/code_2.s | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'asm/code_2.s')

diff --git a/asm/code_2.s b/asm/code_2.s
index 27e8270..23a31d1 100644
--- a/asm/code_2.s
+++ b/asm/code_2.s
@@ -923,7 +923,7 @@ _08000DAC:
 	bl sub_8001170
 	lsls r0, 24
 	lsrs r6, r0, 24
-	bl sub_8097758
+	bl IncrementNumAdventures
 	cmp r5, 0x9
 	bne _08000E00
 	ldr r4, _08000DF4
@@ -1086,7 +1086,7 @@ sub_8000EDC:
 	beq _08000F68
 	ldr r0, [r4, 0x74]
 	ldr r1, [sp]
-	bl sub_801277C
+	bl PrepareQuickSaveRead
 	adds r7, r4, 0
 	adds r7, 0x7C
 	b _08000F2E
@@ -1096,14 +1096,14 @@ _08000F28:
 	movs r0, 0
 	bl xxx_update_stuff
 _08000F2E:
-	bl sub_80127A8
+	bl ReadQuickSave
 	lsls r0, 24
 	cmp r0, 0
 	bne _08000F28
-	bl sub_8012828
+	bl IsQuickSaveValid
 	lsls r0, 24
 	lsrs r5, r0, 24
-	bl sub_8012834
+	bl FinishQuickSaveRead
 	bl sub_8011830
 	cmp r5, 0
 	beq _08000F58
@@ -1169,13 +1169,13 @@ _08000FB8:
 	ldr r0, [r4, 0x74]
 	ldr r1, [sp]
 	movs r2, 0x1
-	bl sub_8012850
+	bl PrepareQuickSaveWrite
 	b _08000FFA
 _08000FD8:
 	ldr r0, [r4, 0x74]
 	ldr r1, [sp]
 	movs r2, 0
-	bl sub_8012850
+	bl PrepareQuickSaveWrite
 	b _08000FFA
 _08000FE4:
 	cmp r0, 0x1
@@ -1188,13 +1188,13 @@ _08000FF4:
 	movs r0, 0
 	bl xxx_update_stuff
 _08000FFA:
-	bl sub_80128B0
+	bl WriteQuickSave
 	cmp r0, 0x2
 	beq _08001006
 	cmp r0, 0x3
 	bne _08000FE4
 _08001006:
-	bl sub_80129FC
+	bl FinishQuickSaveWrite
 	b _0800101C
 _0800100C:
 	bl sub_808ED00
-- 
cgit v1.2.3