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/unk_menu_203B364.c | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'src/unk_menu_203B364.c')

diff --git a/src/unk_menu_203B364.c b/src/unk_menu_203B364.c
index 4d8a716..c4dcd62 100644
--- a/src/unk_menu_203B364.c
+++ b/src/unk_menu_203B364.c
@@ -3,15 +3,7 @@
 #include "menu.h"
 #include "main_menu.h"
 #include "memory.h"
-
-struct unkData
-{
-    u8 unk0[14];
-    u16 unkD;
-    u16 unk10;
-    u16 unk12;
-    u8 *unk14;
-};
+#include "text.h"
 
 struct unkStruct_203B360
 {
@@ -20,7 +12,7 @@ struct unkStruct_203B360
     u32 unk4;
     u32 unk8;
     u8 fill8[0x148 - 0xC];
-    struct unkData unk148[4];
+    struct UnkTextStruct2 unk148[4];
     u16 unk1A8;
     u16 unk1AA;
     u16 unk1AC;
@@ -29,15 +21,14 @@ struct unkStruct_203B360
 };
 
 extern struct unkStruct_203B360 *gUnknown_203B364;
-extern struct unkData gUnknown_80E6F20;
-extern struct unkData gUnknown_80E6F38;
+extern struct UnkTextStruct2 gUnknown_80E6F20;
+extern struct UnkTextStruct2 gUnknown_80E6F38;
 extern struct MenuItem gUnknown_80E7090[];
 extern struct MenuItem gUnknown_80E6F50[];
 
 extern void sub_8038440();
 extern void sub_8035CF4(u32 *, u32, u32);
-extern void sub_800641C(void *, u32, u32);
-extern void SetMenuItems(void *, struct unkData *, u32, struct unkData *, struct MenuItem *, u32, u32, u32);
+extern void SetMenuItems(void *, struct UnkTextStruct2 *, u32, struct UnkTextStruct2 *, struct MenuItem *, u32, u32, u32);
 extern u8 sub_80130A8(u32 *);
 extern void sub_8013114(u32 *, u32 *);
 extern void sub_80384D0();
-- 
cgit v1.2.3