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