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_area_1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/friend_area_1.c') diff --git a/src/friend_area_1.c b/src/friend_area_1.c index c3dd57f..bd089c0 100644 --- a/src/friend_area_1.c +++ b/src/friend_area_1.c @@ -26,7 +26,7 @@ u32 SaveFriendAreas(u8 *r0, u32 r1) return temp[2]; } -u32 ReadSavedFriendAreas(u8 *r0, u32 r1) +u32 ReadSavedFriendAreas(u8 *r0, s32 r1) { u32 temp[5]; s32 counter; -- cgit v1.2.3