From 424db9c41bbe0fa23910606f4c85a5d5db0c19d1 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Wed, 16 Sep 2020 00:15:52 -0500 Subject: split out pokemon funcs and decomp another nullsub --- src/pokemon.c | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 src/pokemon.c (limited to 'src/pokemon.c') diff --git a/src/pokemon.c b/src/pokemon.c new file mode 100644 index 0000000..40606df --- /dev/null +++ b/src/pokemon.c @@ -0,0 +1,2 @@ +#include "global.h" +#include "pokemon.h" -- cgit v1.2.3 From cd050a5e7d66e28485a5b4e57ecdfb3d8c5f1e3c Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Wed, 23 Sep 2020 22:56:31 -0500 Subject: found more MonsterParameter funcs that weren't in the split and decomped a few of them --- src/pokemon.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'src/pokemon.c') diff --git a/src/pokemon.c b/src/pokemon.c index 40606df..ae2b801 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1,2 +1,25 @@ #include "global.h" #include "pokemon.h" +#include "file_system.h" + +extern u32 *gUnknown_203B45C; +extern u32 gUnknown_202F400; +extern struct FileArchive gUnknown_8300500; +extern const char gUnknown_81075F4; +extern struct OpenedFile *gMonsterParametersFile; +extern u16 gUnknown_20384E8; +extern struct gPokemon gMonsterParameters; + +void LoadMonsterParameters(void) +{ + gUnknown_203B45C = &gUnknown_202F400; + gMonsterParametersFile = OpenFileAndGetFileDataPtr(&gUnknown_81075F4, &gUnknown_8300500); + gMonsterParameters.unk0 = gMonsterParametersFile->data; + gUnknown_20384E8 = 0; +} + +u32 *sub_808CE00(void) +{ + return &gUnknown_202F400; + +} -- cgit v1.2.3 From 96fdd3aae0ba1d923b358128012979a9a1a0eb38 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Thu, 1 Oct 2020 13:32:53 -0500 Subject: successful decomp of one pokemon data func and struct.. making headway --- src/pokemon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/pokemon.c') diff --git a/src/pokemon.c b/src/pokemon.c index ae2b801..55316d6 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -14,7 +14,8 @@ void LoadMonsterParameters(void) { gUnknown_203B45C = &gUnknown_202F400; gMonsterParametersFile = OpenFileAndGetFileDataPtr(&gUnknown_81075F4, &gUnknown_8300500); - gMonsterParameters.unk0 = gMonsterParametersFile->data; + // TODO verify this... other parts imply this is an array + gMonsterParameters.species = gMonsterParametersFile->data; gUnknown_20384E8 = 0; } -- cgit v1.2.3 From 22f19f8d55bdc749775438b34cdaa209d07bd8c1 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sun, 1 Nov 2020 12:27:21 -0600 Subject: more work on funcs --- src/pokemon.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/pokemon.c') diff --git a/src/pokemon.c b/src/pokemon.c index 55316d6..454751e 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -10,6 +10,22 @@ extern struct OpenedFile *gMonsterParametersFile; extern u16 gUnknown_20384E8; extern struct gPokemon gMonsterParameters; +extern u64 gUnknown_8107544[]; +extern u32 gUnknown_810697C; +extern void sub_8086448(); +extern void sub_80866C4(u32 *r0); + +void sub_808CD9C(u8 r0) +{ + sub_8086448(); + sub_80866C4(&gUnknown_810697C); +} + +u64 *sub_808CDB0(u8 r0) +{ + return &gUnknown_8107544[r0]; +} + void LoadMonsterParameters(void) { gUnknown_203B45C = &gUnknown_202F400; @@ -24,3 +40,4 @@ u32 *sub_808CE00(void) return &gUnknown_202F400; } + -- cgit v1.2.3