From 0747fe684c46d010d8917c4257dd1f1a52241385 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Jun 2020 20:54:34 -0400 Subject: GetBoxMonDataInternal --- include/proto.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 include/proto.h (limited to 'include/proto.h') diff --git a/include/proto.h b/include/proto.h new file mode 100644 index 00000000..37655429 --- /dev/null +++ b/include/proto.h @@ -0,0 +1,13 @@ +#ifndef POKEDIAMOND_PROTO_H +#define POKEDIAMOND_PROTO_H + +// For homeless function declarations + +u16 * FUN_0200AA50(u16 species, u32 heap_id); +void FUN_02021A74(u16 * dest, u16 * src); +void FUN_02021A20(void * ptr); +void FUN_02021E28(u16 * dest, u16 * src); +u32 FUN_0206E7B8(u16 item, u32 a1, u32 a2); +u32 GetArceusTypeByPlate(u16 plate); + +#endif //POKEDIAMOND_PROTO_H -- cgit v1.2.3 From e81dfc98e26bece01763110254648d7c20cb198d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 13 Jun 2020 11:26:10 -0400 Subject: through SetBoxMonDataInternal --- include/proto.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/proto.h') diff --git a/include/proto.h b/include/proto.h index 37655429..c8f50d33 100644 --- a/include/proto.h +++ b/include/proto.h @@ -7,6 +7,7 @@ u16 * FUN_0200AA50(u16 species, u32 heap_id); void FUN_02021A74(u16 * dest, u16 * src); void FUN_02021A20(void * ptr); void FUN_02021E28(u16 * dest, u16 * src); +void FUN_02021EF0(const u16 * src, u16 * dest, u32 count); u32 FUN_0206E7B8(u16 item, u32 a1, u32 a2); u32 GetArceusTypeByPlate(u16 plate); -- cgit v1.2.3 From c5eb6d2669cdb27cc9f5ad35fae73577edf8aac6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 13 Jun 2020 21:04:04 -0400 Subject: through FUN_020690E8 --- include/proto.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/proto.h') diff --git a/include/proto.h b/include/proto.h index c8f50d33..3a6081b4 100644 --- a/include/proto.h +++ b/include/proto.h @@ -2,6 +2,7 @@ #define POKEDIAMOND_PROTO_H // For homeless function declarations +struct UnkStruct_02069038; u16 * FUN_0200AA50(u16 species, u32 heap_id); void FUN_02021A74(u16 * dest, u16 * src); @@ -10,5 +11,7 @@ void FUN_02021E28(u16 * dest, u16 * src); void FUN_02021EF0(const u16 * src, u16 * dest, u32 count); u32 FUN_0206E7B8(u16 item, u32 a1, u32 a2); u32 GetArceusTypeByPlate(u16 plate); +int FUN_02014C3C(u8); +void FUN_02014C54(int, int, struct UnkStruct_02069038 *, u8); #endif //POKEDIAMOND_PROTO_H -- cgit v1.2.3 From d6543eb215c80769469bf352330aa9d6387f859a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Jun 2020 12:45:27 -0400 Subject: GetMonEvolution --- include/proto.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/proto.h') diff --git a/include/proto.h b/include/proto.h index 3a6081b4..d9a5ec2a 100644 --- a/include/proto.h +++ b/include/proto.h @@ -2,7 +2,10 @@ #define POKEDIAMOND_PROTO_H // For homeless function declarations + +// Declare these here so that we don't have to include pokemon.h struct UnkStruct_02069038; +struct PlayerParty; u16 * FUN_0200AA50(u16 species, u32 heap_id); void FUN_02021A74(u16 * dest, u16 * src); @@ -13,5 +16,7 @@ u32 FUN_0206E7B8(u16 item, u32 a1, u32 a2); u32 GetArceusTypeByPlate(u16 plate); int FUN_02014C3C(u8); void FUN_02014C54(int, int, struct UnkStruct_02069038 *, u8); +u32 IsNighttime(void); // is day or night +u32 PartyHasMon(struct PlayerParty *, u16); #endif //POKEDIAMOND_PROTO_H -- cgit v1.2.3 From 8ce183851366b01c1bda5b2272f95e27ae7ef2fd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Jun 2020 17:03:39 -0400 Subject: through FUN_02069CF4 --- include/proto.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/proto.h') diff --git a/include/proto.h b/include/proto.h index d9a5ec2a..d26b7750 100644 --- a/include/proto.h +++ b/include/proto.h @@ -17,6 +17,5 @@ u32 GetArceusTypeByPlate(u16 plate); int FUN_02014C3C(u8); void FUN_02014C54(int, int, struct UnkStruct_02069038 *, u8); u32 IsNighttime(void); // is day or night -u32 PartyHasMon(struct PlayerParty *, u16); #endif //POKEDIAMOND_PROTO_H -- cgit v1.2.3 From 925f63ba7497576698c14f0598113294d19b37d9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Jun 2020 18:09:26 -0400 Subject: through FUN_0206A054 --- include/proto.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'include/proto.h') diff --git a/include/proto.h b/include/proto.h index d26b7750..8c35cca5 100644 --- a/include/proto.h +++ b/include/proto.h @@ -6,6 +6,7 @@ // Declare these here so that we don't have to include pokemon.h struct UnkStruct_02069038; struct PlayerParty; +struct BoxPokemon; u16 * FUN_0200AA50(u16 species, u32 heap_id); void FUN_02021A74(u16 * dest, u16 * src); @@ -13,9 +14,13 @@ void FUN_02021A20(void * ptr); void FUN_02021E28(u16 * dest, u16 * src); void FUN_02021EF0(const u16 * src, u16 * dest, u32 count); u32 FUN_0206E7B8(u16 item, u32 a1, u32 a2); -u32 GetArceusTypeByPlate(u16 plate); int FUN_02014C3C(u8); void FUN_02014C54(int, int, struct UnkStruct_02069038 *, u8); u32 IsNighttime(void); // is day or night +int FUN_02005F14(int); +void FUN_02005E80(int); +void FUN_02005E90(int, int, int, int); +void FUN_020056AC(int, int, int, int, int); +void FUN_020808AC(struct BoxPokemon *, int, int, int, int); #endif //POKEDIAMOND_PROTO_H -- cgit v1.2.3 From c2f8c12c6f92c2e43e117c9a156ebe58120e0a80 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Jun 2020 08:55:45 -0400 Subject: Finish pokemon.c --- include/proto.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'include/proto.h') diff --git a/include/proto.h b/include/proto.h index 8c35cca5..24ddff07 100644 --- a/include/proto.h +++ b/include/proto.h @@ -7,6 +7,15 @@ struct UnkStruct_02069038; struct PlayerParty; struct BoxPokemon; +struct SaveBlock2; +struct String +{ + u16 len; + u16 pos; + u32 magic; + u16 unk8; + u16 data[0]; +}; u16 * FUN_0200AA50(u16 species, u32 heap_id); void FUN_02021A74(u16 * dest, u16 * src); @@ -23,4 +32,11 @@ void FUN_02005E90(int, int, int, int); void FUN_020056AC(int, int, int, int, int); void FUN_020808AC(struct BoxPokemon *, int, int, int, int); +struct String * FUN_020239A0(struct SaveBlock2 *, u32 heap_id); +u32 FUN_020239BC(struct SaveBlock2 *); +u32 FUN_020239CC(struct SaveBlock2 *); +struct String * FUN_020219F4(u32 count, u32 heap_id); +int FUN_02021CE0(struct String *, struct String *); +int FUN_0206AE00(int x); + #endif //POKEDIAMOND_PROTO_H -- cgit v1.2.3 From 9e33176367974197195a9c9f8e58ede7569d665d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Jun 2020 10:14:29 -0400 Subject: Resolve compiler warnings --- include/proto.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'include/proto.h') diff --git a/include/proto.h b/include/proto.h index 24ddff07..6f022d90 100644 --- a/include/proto.h +++ b/include/proto.h @@ -3,19 +3,7 @@ // For homeless function declarations -// Declare these here so that we don't have to include pokemon.h -struct UnkStruct_02069038; -struct PlayerParty; -struct BoxPokemon; -struct SaveBlock2; -struct String -{ - u16 len; - u16 pos; - u32 magic; - u16 unk8; - u16 data[0]; -}; +#include "pokemon.h" // for struct definitions u16 * FUN_0200AA50(u16 species, u32 heap_id); void FUN_02021A74(u16 * dest, u16 * src); @@ -32,11 +20,4 @@ void FUN_02005E90(int, int, int, int); void FUN_020056AC(int, int, int, int, int); void FUN_020808AC(struct BoxPokemon *, int, int, int, int); -struct String * FUN_020239A0(struct SaveBlock2 *, u32 heap_id); -u32 FUN_020239BC(struct SaveBlock2 *); -u32 FUN_020239CC(struct SaveBlock2 *); -struct String * FUN_020219F4(u32 count, u32 heap_id); -int FUN_02021CE0(struct String *, struct String *); -int FUN_0206AE00(int x); - #endif //POKEDIAMOND_PROTO_H -- cgit v1.2.3