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/text.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include/text.h') diff --git a/include/text.h b/include/text.h index 01e701d..eda4f9a 100644 --- a/include/text.h +++ b/include/text.h @@ -13,9 +13,10 @@ struct UnkTextStruct1 { struct UnkTextStruct2 { u8 fill00[0x0c]; s16 unk0c; - u8 fill0e[2]; + s16 unkE; s16 unk10; - u8 fill12[0x06]; + s16 unk12; + const u8 *unk14; }; void LoadCharmaps(void); @@ -26,4 +27,5 @@ void sub_800898C(void); void sub_80089AC(const struct UnkTextStruct2 *a0, void *a1); void sub_8009388(void); void sub_800641C(struct UnkTextStruct2 *a0, u8 a1, u8 a2); +void sub_8006518(struct UnkTextStruct2 *); #endif -- cgit v1.2.3