Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed types in sub_8087144 (again) #204

Merged
merged 2 commits into from
Jul 25, 2024
Merged

Fixed types in sub_8087144 (again) #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0fc9aa
Fixed types in sub_8087144 (again)
AnonymousRandomPerson Jul 25, 2024
358b9f1
Changed sub_8085B4C parameters to arrays
AnonymousRandomPerson Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions include/code_8086A3C.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,4 @@

#include "dungeon_util_1.h"

typedef struct struct_8087144 {
struct_8085B80 unk0;
u8 fill16[32];
} struct_8087144;

#endif // GUARD_CODE_8086A3C_H
2 changes: 1 addition & 1 deletion include/dungeon_util_1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ void sub_8085930(s32 direction);
void sub_80859F0(s32 direction);
bool8 IsMovingClient(Entity *entity);
void sub_8085B0C(Entity *pokemon);
void sub_8085B4C(struct_8085B80 *a0, s16 **a1, Entity **a2, s32 a3);
void sub_8085B4C(struct_8085B80 a0[], s16 *a1[], Entity *a2[], s32 a3);

#endif
8 changes: 4 additions & 4 deletions src/code_8086A3C.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ extern void SkarmoryEntry(Entity *);
extern void sub_8086A54(Entity *);
extern void sub_8087144();
extern void sub_8072008(Entity *pokemon, Entity *r1, u32 r2, u8 r3, u32);
extern bool8 sub_8085B80(struct_8087144 *);
extern bool8 sub_8085B80(struct_8085B80 *);

extern const u8 gUnknown_810739C[];
extern const u8 gUnknown_81073D4[];
Expand Down Expand Up @@ -399,7 +399,7 @@ void sub_8087144(void)
s16 puStack_5c[28];
s16 *puStack_64[3];
Entity *pEStack_58[3];
struct_8087144 auStack_4c;
struct_8085B80 auStack_4c[3];

iVar2 = GetEntityFromClientType(5);
iVar3 = GetEntityFromClientType(6);
Expand All @@ -417,12 +417,12 @@ void sub_8087144(void)
sub_8086A54(iVar2);
sub_8086A54(iVar3);
sub_8086A54(iVar4);
sub_8085B4C(&auStack_4c.unk0,puStack_64,pEStack_58,3);
sub_8085B4C(auStack_4c,puStack_64,pEStack_58,3);
iVar2->info->unk15F = 1;
iVar3->info->unk15F = 1;
iVar4->info->unk15F = 1;
while( TRUE ) {
if (!sub_8085B80(&auStack_4c)) break;
if (!sub_8085B80(auStack_4c)) break;
sub_803E46C(0x46);
}
iVar2->info->unk15F = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/dungeon_util_1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ void sub_8085B0C(Entity *pokemon)
}
}

void sub_8085B4C(struct_8085B80 *a0, s16 **a1, Entity **a2, s32 a3)
void sub_8085B4C(struct_8085B80 a0[], s16 *a1[], Entity *a2[], s32 a3)
{
s32 i;

Expand Down