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

(limited to 'src/post_office_guide.c')

diff --git a/src/post_office_guide.c b/src/post_office_guide.c
index dd28446..2c0f1d6 100644
--- a/src/post_office_guide.c
+++ b/src/post_office_guide.c
@@ -5,6 +5,7 @@
 #include "constants/species.h"
 #include "menu.h"
 #include "memory.h"
+#include "text.h"
 
 struct PostOfficeHelper
 {
@@ -23,12 +24,6 @@ struct PostOfficeHelper
 extern struct PostOfficeHelper *gPostOfficeHelper;
 
 
-struct unkData
-{
-    u8 unk0[20];
-    const u8 *unk20;
-};
-
 struct unkStruct_203B330
 {
     // size: 0x78
@@ -38,8 +33,8 @@ struct unkStruct_203B330
     u8 unkD;
     u8 fillE[2];
     u32 unk10;
-    struct unkData *unk14;
-    struct unkData unk18[3];
+    struct UnkTextStruct2 *unk14;
+    struct UnkTextStruct2 unk18[3];
 };
 extern struct unkStruct_203B330 *gUnknown_203B330;
 
@@ -137,25 +132,25 @@ ALIGNED(4) const char GettingHelp_Text[] = _("Getting Help");
 
 ALIGNED(4) const u8 wonder_mail_fill[] = _("pksdir0");
 
-const struct unkData gUnknown_80E1EFC = 
+const struct UnkTextStruct2 gUnknown_80E1EFC = 
 {
     0, 0, 0, 0,
     3, 0, 0, 0,
     0, 0, 0, 0,
-    0, 0, 0, 0,
-    0, 0, 0, 0,
+    0, 0,
+    0, 0,
     NULL
 };
 
 const u8 gUnkData_80E1F14[] = {1, 0, 8, 0};
 
-const struct unkData gUnknown_80E1F18 = 
+const struct UnkTextStruct2 gUnknown_80E1F18 = 
 {
     0, 0, 0, 0,
     6, 0, 0, 0,
     2, 0, 2, 0,
-    0x14, 0, 4, 0,
-    4, 0, 0, 0,
+    0x14, 4,
+    4, 0,
     gUnkData_80E1F14
 };
 
@@ -168,8 +163,6 @@ extern void sub_8031AE8();
 
 extern u8 gUnknown_202E5D8[];
 extern u8 gAvailablePokemonNames[];
-extern void sub_800641C(struct unkData *, u32, u32);
-extern void sub_8006518(struct unkData *);
 extern void sub_8031A2C(void);
 extern void sub_801317C(void *);
 
@@ -184,7 +177,7 @@ extern void HandlePostOfficeHelpGetHelpMenuSelection();
 extern void sub_8031988();
 extern s32 sub_80144A4(s32 *);
 extern s32 sub_80969D0(u8);
-extern void sub_8012D08(struct unkData *, s32);
+extern void sub_8012D08(struct UnkTextStruct2 *, s32);
 
 
 u32 CreateHelperPelipperMenu(s16 speciesID)
-- 
cgit v1.2.3