From 377bd14ea67d6177250fb401e12d7dfcf44e2cf6 Mon Sep 17 00:00:00 2001 From: Seth Barberee 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 --- include/wonder_mail.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'include/wonder_mail.h') diff --git a/include/wonder_mail.h b/include/wonder_mail.h index b56fe32..0d58a20 100644 --- a/include/wonder_mail.h +++ b/include/wonder_mail.h @@ -2,28 +2,31 @@ #define GUARD_WONDER_MAIL_H #include "file_system.h" +#include "text.h" + +#define PASSWORD_BUFFER_SIZE 0x36 + struct WonderMailStruct_203B2C0 { + // size: 0x548 u32 unk0; - u32 unk4; - u8 unk8[0x36]; + u32 state; + u8 passwordBuffer[PASSWORD_BUFFER_SIZE]; u8 unk3E; u32 unk40; u32 linkError; u16 unk48[232]; u8 unk218; - u8 padding7[3]; u32 unk21C; u8 padding[0x7C]; u32 unk29C; u8 padding6[0x6C]; u32 unk30C; u8 padding8[0x4C]; - u32 unk35C; - u8 padding5[0x5C]; - u32 unk3BC; - u8 padding4[0x60]; + struct UnkTextStruct2 unk35C[4]; + struct UnkTextStruct2 unk3BC[4]; + u32 unkfill; // unkStruct_41C? struct OpenedFile *faceFile; u8 *faceData; u16 unk428; @@ -51,10 +54,9 @@ struct unkStruct_41C struct WonderMailStruct_203B2C4 { // size: 0x564 - u8 unk0; - u8 padding[3]; + u8 state; u32 unk4; // wonder mail link status?? - u8 unk8[0x36]; // Probably a buffer for entry + u8 passwordBuffer[PASSWORD_BUFFER_SIZE]; // Probably a buffer for entry u8 unk3E; u32 unk40; u32 linkError; // another link status @@ -64,10 +66,8 @@ struct WonderMailStruct_203B2C4 u8 filler220[0x30C - 0x220]; u32 unk30C; u8 filler310[0x35C - 0x310]; - u32 unk35C; - u8 filler360[0x3BC - 0x360]; - u32 unk3BC; - u8 filler3C0[0x41C - 0x3C0]; + struct UnkTextStruct2 unk35C[4]; + struct UnkTextStruct2 unk3BC[4]; struct unkStruct_41C unk41C; /* 0x420 */ struct OpenedFile *faceFile; /* 0x424 */ u8 *faceData; -- cgit v1.2.3