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
---
 src/code_801C620.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/code_801C620.c')

diff --git a/src/code_801C620.c b/src/code_801C620.c
index 66269c9..c2c2c44 100644
--- a/src/code_801C620.c
+++ b/src/code_801C620.c
@@ -1,12 +1,7 @@
 #include "global.h"
 #include "input.h"
 #include "memory.h"
-
-struct unkData
-{
-    u8 unk0[24];
-};
-
+#include "text.h"
 
 struct subStruct_203B240
 {
@@ -16,6 +11,7 @@ struct subStruct_203B240
 
 struct unkStruct_203B240
 {
+    // size: 0x94
     s32 unk0;
     u8 unk4;
     u8 fill5[3];
@@ -25,8 +21,10 @@ struct unkStruct_203B240
     u8 fill14[0x20 - 0x18];
     u32 unk20;
     u32 unk24;
-    struct unkData unk28[4];
+    struct UnkTextStruct2 unk28[4];
     u32 unk88;
+    u32 unk8C;
+    u32 unk90;
 };
 
 extern struct unkStruct_203B240 *gUnknown_203B240;
@@ -38,8 +36,7 @@ extern u8 gAvailablePokemonNames[0x58];
 
 extern void ResetSprites(u32);
 extern void sub_801317C(u32 *);
-extern void sub_80140B4(struct unkData *);
-extern void sub_800641C(struct unkData *,u32, u32);
+extern void sub_80140B4(struct UnkTextStruct2 *);
 
 
 extern void sub_8014FF0(u32, u32, char *, u32, u32);
@@ -62,7 +59,7 @@ void sub_801C848();
 u32 sub_801C620(u8 param_1)
 {
   ResetSprites(1);
-  gUnknown_203B240 = MemoryAlloc(0x94,8);
+  gUnknown_203B240 = MemoryAlloc(sizeof(struct unkStruct_203B240),8);
   gUnknown_203B240->unk4 = param_1;
   sub_801317C(&gUnknown_203B240->unk88);
   gUnknown_203B240->unk24 = 0;
-- 
cgit v1.2.3