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 --- src/kangaskhan_storage.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/kangaskhan_storage.c') diff --git a/src/kangaskhan_storage.c b/src/kangaskhan_storage.c index 6d7cdd1..f77d129 100644 --- a/src/kangaskhan_storage.c +++ b/src/kangaskhan_storage.c @@ -7,15 +7,13 @@ #include "memory.h" extern struct unkStruct_203B208 *gUnknown_203B208; -extern struct unkData gUnknown_80DB748; -extern struct unkData gUnknown_80DB778; -extern struct unkData gUnknown_80DB790; -extern struct unkData gUnknown_80DB760; +extern struct UnkTextStruct2 gUnknown_80DB748; +extern struct UnkTextStruct2 gUnknown_80DB778; +extern struct UnkTextStruct2 gUnknown_80DB790; +extern struct UnkTextStruct2 gUnknown_80DB760; extern u8 gUnknown_202E5D8[]; extern u8 gUnknown_202E1C8[]; -extern void sub_800641C(struct unkData *, u32, u32); -extern void sub_8006518(struct unkData *); void UpdateKangaskhanStorageState(u32); extern void sub_8017828(); -- cgit v1.2.3