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/makuhita_dojo.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'src/makuhita_dojo.c')

diff --git a/src/makuhita_dojo.c b/src/makuhita_dojo.c
index d35a659..b01e1a6 100644
--- a/src/makuhita_dojo.c
+++ b/src/makuhita_dojo.c
@@ -4,11 +4,7 @@
 #include "input.h"
 #include "constants/species.h"
 #include "memory.h"
-
-struct unkData
-{
-    u8 unk0[24];
-};
+#include "text.h"
 
 struct unkStruct_203B318
 {
@@ -28,16 +24,13 @@ struct unkStruct_203B318
     u8 unk66;
     u8 unk67;
     struct OpenedFile** unk68;
-    struct unkData unk6C[4];
+    struct UnkTextStruct2 unk6C[4];
 };
 
 extern u8 gUnknown_202E5D8[];
 extern u8 gUnknown_202E1C8[];
 extern struct unkStruct_203B318 *gUnknown_203B318;
-extern struct unkData gUnknown_80E0760;
-
-extern void sub_800641C(struct unkData *, u32, u32);
-extern void sub_8006518(struct unkData *);
+extern struct UnkTextStruct2 gUnknown_80E0760;
 
 extern void sub_8030208();
 extern void sub_8030258();
@@ -56,7 +49,7 @@ u32 CreateMakuhitaShop(u32 param_1)
   
   ResetUnusedInputStruct();
   sub_800641C(0,1,1);
-  gUnknown_203B318 = MemoryAlloc(0xcc,8);
+  gUnknown_203B318 = MemoryAlloc(sizeof(struct unkStruct_203B318),8);
   gUnknown_203B318->unk10 = -1;
   gUnknown_203B318->unk0 = param_1;
   switch(param_1) {
-- 
cgit v1.2.3