Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-09-29 04:17:52 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #204 from AnonymousRandomPerson/master

Browse Source 
Fixed types in sub_8087144 (again)
This commit is contained in:
Seth Barberee
2024-07-25 14:24:49 -07:00
committed by GitHub
parent f0a15e4779 358b9f104d
commit f28d769122
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/code_8086A3C.h
View File

@@ -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
include/dungeon_util_1.h
View File

@@ -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
src/code_8086A3C.c
View File

@@ -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[];
@@ -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);
@@ -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;

2
src/dungeon_util_1.c
View File

@@ -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;