fix merge conflicts

1 files changed, 1 insertions, 16 deletions

diff --git a/src/pokenav.c b/src/pokenav.c
index f50f039f8..24253e878 100644
--- a/src/pokenav.c
+++ b/src/pokenav.c
@@ -1,24 +1,9 @@
 #include "global.h"
+#include "pokenav.h"
 #include "battle.h"
 #include "data2.h"
 #include "string_util.h"
 
-struct UnkPokenavStruct_Sub {
-    /*0x0*/ u16 unk0;
-    /*0x2*/ u8 filler2[6];
-};
-
-
-struct UnkPokenavStruct {
-    /*0x0000*/ u8 filler0000[0xCEE8];
-    /*0xCEE8*/ struct UnkPokenavStruct_Sub unkCEE8[78];
-    /*0xD158*/ u16 unkD158;
-
-};
-
-extern struct UnkPokenavStruct *gUnknown_083DFEC4;
-
-
 void sub_80F700C(u8 *arg0, u16 arg1) {
     struct Trainer *trainer;
     u8 *ptr;