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/friend_rescue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/friend_rescue.c') diff --git a/src/friend_rescue.c b/src/friend_rescue.c index bbff322..ef1d729 100644 --- a/src/friend_rescue.c +++ b/src/friend_rescue.c @@ -3,6 +3,7 @@ #include "pokemon.h" #include "constants/species.h" #include "memory.h" +#include "text.h" extern void sub_80338C4(u32); extern s32 sub_80144A4(s32 *); @@ -18,7 +19,6 @@ extern struct WonderMailStruct_203B33C *gUnknown_203B33C; extern u8 sub_8039880(void); void ResetUnusedInputStruct(void); -void sub_800641C(void *, u32, u32); extern void sub_8035300(void); extern void sub_8035404(u32); -- cgit v1.2.3