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/rescue_team_info.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/rescue_team_info.c') diff --git a/src/rescue_team_info.c b/src/rescue_team_info.c index 205ce18..0f3b0f9 100644 --- a/src/rescue_team_info.c +++ b/src/rescue_team_info.c @@ -2,7 +2,7 @@ #include "rescue_team_info.h" extern struct RescueTeamData *gRescueTeamInfoRef; -extern struct RescueTeamData gRescueTeamInfo; +EWRAM_DATA struct RescueTeamData gRescueTeamInfo; extern void sub_809485C(u32 *r0, u8 *r1, u32 r2); extern void sub_809486C(u32 *r0, u8 *r1, u32 r2); @@ -131,7 +131,7 @@ u8 sub_80921B8(void) return gRescueTeamInfoRef->unk10; } -u32 sub_80921C4(u8 *param_1, u32 param_2) +u32 SaveRescueTeamInfo(u8 *param_1, u32 param_2) { u32 auStack36[4]; @@ -160,7 +160,7 @@ u32 sub_80921C4(u8 *param_1, u32 param_2) return auStack36[2]; } -u32 sub_809222C(u8 *param_1, u32 param_2) +u32 ReadRescueTeamInfo(u8 *param_1, u32 param_2) { u32 auStack32 [4]; u8 byteArray[4]; -- cgit v1.2.3