From b7d1fe09f016ba8becfdcfaa2890cf3684dc85c4 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sat, 5 Sep 2020 13:42:43 -0500 Subject: start dumping unformatted_type_names --- src/event_flag.c | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/event_flag.c (limited to 'src/event_flag.c') diff --git a/src/event_flag.c b/src/event_flag.c new file mode 100644 index 0000000..85c320f --- /dev/null +++ b/src/event_flag.c @@ -0,0 +1,6 @@ +#include "global.h" + +void nullsub_140(void) +{ + +} -- cgit v1.2.3 From 722560add4e0caaab9f65a3c49d08ad83f2ef2b2 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sun, 20 Sep 2020 01:54:59 -0500 Subject: more decomping of functions --- src/event_flag.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/event_flag.c') diff --git a/src/event_flag.c b/src/event_flag.c index 85c320f..0515308 100644 --- a/src/event_flag.c +++ b/src/event_flag.c @@ -1,5 +1,17 @@ #include "global.h" +extern void sub_800226C(u8 r0, u8 r1, u32* r2, u8 u3); + +void sub_8002758(u32 *r0) +{ + sub_800226C(0, 0x1, r0, 0x9); +} + +u8 sub_800276C(void) +{ + return 0; +} + void nullsub_140(void) { -- cgit v1.2.3 From 1a649b9146fae34c623e8029e8effed973ea4ecb Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 25 Sep 2020 00:10:54 -0500 Subject: split, decomp, rinse, repeat --- src/event_flag.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'src/event_flag.c') diff --git a/src/event_flag.c b/src/event_flag.c index 0515308..1a4afc1 100644 --- a/src/event_flag.c +++ b/src/event_flag.c @@ -1,6 +1,38 @@ #include "global.h" +#include "memory.h" + +struct UnkEventStruct +{ + /* 0x0 */ u32 unk0; + /* 0x4 */ s16 unk4; + /* 0x6 */ u16 unk6; + /* 0x8 */ u16 unk8; + /* 0xA */ s16 unkA; +}; + +struct UnkEventStruct2 +{ + /* 0x0 */ u32 unk0; + /* 0x4 */ u32 unk4; +}; extern void sub_800226C(u8 r0, u8 r1, u32* r2, u8 u3); +extern void sub_800160C(struct UnkEventStruct2 *r0, u32 r1, u32 r2); + +extern u8 gUnknown_2000A88; + + +//u8 sub_8002718(struct UnkEventStruct *r0) +//{ +// struct UnkEventStruct2 temp; +// sub_800160C(&temp, 0, 0); +// MemoryCopy8(&gUnknown_2000A88, (u8 *)r0, (0x80 << 3)); +// +// // TODO fix this comparison to make it match +// if(r0->unkA != temp.unk4) +// return 0; +// return 1; +//} void sub_8002758(u32 *r0) { -- 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/event_flag.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/event_flag.c') diff --git a/src/event_flag.c b/src/event_flag.c index 1a4afc1..501b1af 100644 --- a/src/event_flag.c +++ b/src/event_flag.c @@ -13,7 +13,9 @@ struct UnkEventStruct struct UnkEventStruct2 { /* 0x0 */ u32 unk0; - /* 0x4 */ u32 unk4; + /* 0x4 */ u32 *unk4; + /* 0x8 */ u16 unk8; + /* 0xA */ s16 unkA; }; extern void sub_800226C(u8 r0, u8 r1, u32* r2, u8 u3); @@ -22,6 +24,7 @@ extern void sub_800160C(struct UnkEventStruct2 *r0, u32 r1, u32 r2); extern u8 gUnknown_2000A88; +// TODO fix stack allocation from 0xC to 0x8 to make this match //u8 sub_8002718(struct UnkEventStruct *r0) //{ // struct UnkEventStruct2 temp; @@ -29,7 +32,7 @@ extern u8 gUnknown_2000A88; // MemoryCopy8(&gUnknown_2000A88, (u8 *)r0, (0x80 << 3)); // // // TODO fix this comparison to make it match -// if(r0->unkA != temp.unk4) +// if(temp.unkA != *(temp.unk4)) // return 0; // return 1; //} -- cgit v1.2.3