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/adventure_log.c | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

(limited to 'src/adventure_log.c')

diff --git a/src/adventure_log.c b/src/adventure_log.c
index 4c9b10f..f7c2250 100644
--- a/src/adventure_log.c
+++ b/src/adventure_log.c
@@ -2,15 +2,7 @@
 #include "input.h"
 #include "gba/io_reg.h"
 #include "memory.h"
-
-struct unkData
-{
-    u8 unk0[14];
-    u16 unkD;
-    u16 unk10;
-    u16 unk12;
-    u8 *unk14;
-};
+#include "text.h"
 
 struct AdventureLog
 {
@@ -22,8 +14,8 @@ struct AdventureLog
     u16 unk20;
     u8 fill22[0x34 - 0x22];
     u32 unk34;
-    struct unkData *unk38;
-    struct unkData unk3C[3];
+    struct UnkTextStruct2 *unk38;
+    struct UnkTextStruct2 unk3C[3];
     u8 fill84[0x9C - 0x84];
     u8 unk9C;
     /* 0x9D */ u8 currPage_u8;
@@ -33,19 +25,19 @@ struct AdventureLog
 
 extern struct AdventureLog *gAdventureLog;
 
-const struct unkData gUnknown_80E1FF0 = {
+const struct UnkTextStruct2 gUnknown_80E1FF0 = {
    0x00, 0x00, 0x00, 0x00,
    0x03, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00,
+   0x00, 0x00,
    0x00, 0x00,
    NULL
 };
-const struct unkData gUnknown_80E2008 = {
+const struct UnkTextStruct2 gUnknown_80E2008 = {
     0x00, 0x00, 0x00, 0x00,
     0x06, 0x00, 0x00, 0x00,
     0x02, 0x00, 0x02, 0x00,
-    0x1A, 0x00, 0x04,
+    0x1A, 0x04,
     0x06, 0x00,
     NULL
 };
@@ -55,8 +47,6 @@ const u8 gAdventureLogHeaderText[] = "Adventure Log";
 const u8 gUnknown_80E2030[] = "~95~95~95~95~95~95~95~95~95~95~95~95~95~95~95 "; // string of ???????
 const u8 fill_adven[] = "pksdir0";
 
-extern void sub_8006518(struct unkData *);
-extern void sub_800641C(void *, u32, u32);
 void sub_8032084();
 void DisplayAdventureLog();
 extern void sub_8013818(void *, u32, u32, u32);
@@ -145,7 +135,7 @@ void sub_8032084(void)
   sVar2 = sub_80095E4(gAdventureLog->unk1A,0xc) + 2 << 0x10;
   // TODO needs asr r3, r0, r16
   //        and lsr r0, r0, r16
-  gAdventureLog->unk3C[gAdventureLog->unk34].unkD = sVar2;
+  gAdventureLog->unk3C[gAdventureLog->unk34].unkE = sVar2;
   // Good past here except regs for this store
   gAdventureLog->unk3C[gAdventureLog->unk34].unk10 = sVar2 + 2;
   ResetUnusedInputStruct();
-- 
cgit v1.2.3