summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-11-03 22:35:38 -0700
committerMarcus Huderle <huderlem@gmail.com>2017-11-03 22:35:38 -0700
commita5754b95e8a1803c87641e5bc485a3690fbcaef7 (patch)
treecfe2fa3e45384d5bf643a7c5e13a6f8810aa8f34 /include
parent34fad4a4556cddf8a6416ab11cd18927ebdb3228 (diff)
Fix non-matching sub_80EEF34 and start more decomp
Diffstat (limited to 'include')
-rw-r--r--include/pokenav.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/include/pokenav.h b/include/pokenav.h
index 70cc4135f..98806983c 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -30,15 +30,22 @@ struct UnkPokenavStruct_Sub2 {
/*0x26*/ u16 unk26;
};
+struct UnkPokenavStruct_Sub3 {
+ /*0x00*/s16 unk0;
+};
+
struct UnkUsePokeblockSub {
/*0*/ u8 fil0[2];
/*2*/ u8 partyIdx:5;
};
struct UnkPokenavStruct {
- /*0x0000*/ u8 filler0000[0x30c];
- /*0x0000*/ u16 unk030C;
- /*0x0000*/ u8 filler030E[0x6a9e];
+ /*0x0000*/ u8 filler0000[0x30C];
+ /*0x030C*/ union { // TODO: what?
+ u16 val;
+ struct UnkPokenavStruct_Sub3 unk030C;
+ } unk030C;
+ /*0x0310*/ u8 filler030E[0x6a9c];
/*0x6DAC*/ u8 unk6DAC;
/*0x6DAD*/ u8 filler6DAD[0x8fd];
/*0x76AA*/ u8 unk76AA;