Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-09-30 21:40:45 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

PR feedback - cleanup and C99 style, revert confusing name

Browse Source
This commit is contained in:
RavePossum
2024-05-29 00:07:41 -04:00
parent cb76e5c281
commit 08e70de0c8
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/overlay005/field_control.c
View File

@@ -371,10 +371,8 @@ BOOL FieldInput_Process_Underground (FieldInput *input, FieldSystem *fieldSystem
ov23_02242814();
u8 interactCheck = FALSE;
if (input->interact) {
ov23_02242830(interactCheck);
ov23_02242830(FALSE);
return FALSE;
}
@@ -433,13 +431,12 @@ BOOL FieldInput_Process_Colosseum (FieldInput *input, FieldSystem *fieldSystem)
static int Field_CheckTrainerInfo (void)
{
// C99-style declaration doesn't match
int netId;
TrainerInfo *info;
int ret = 0;
for (netId = 1; netId < 5; netId++) {
info = CommInfo_TrainerInfo(netId);
TrainerInfo *info = CommInfo_TrainerInfo(netId);
if (info != NULL) {
ret++;
@@ -514,10 +511,10 @@ int FieldInput_Process_BattleTower (const FieldInput *input, FieldSystem *fieldS
return TRUE;
}
int bgEvent = sub_0203CA6C(fieldSystem, (void *)sub_0203A440(fieldSystem), sub_0203A448(fieldSystem));
int v2 = sub_0203CA6C(fieldSystem, (void *)sub_0203A440(fieldSystem), sub_0203A448(fieldSystem));
if (bgEvent != 0xffff) {
sub_0203E880(fieldSystem, bgEvent, NULL);
if (v2 != 0xffff) {
sub_0203E880(fieldSystem, v2, NULL);
return TRUE;
}