Merge branch 'master' into cable_car

1 files changed, 0 insertions, 42 deletions

diff --git a/src/field/pokenav.c b/src/field/pokenav.c
deleted file mode 100644
index 21d7bb4e3..000000000
--- a/src/field/pokenav.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "global.h"
-#include "main.h"
-#include "pokenav.h"
-#include "battle.h"
-#include "data2.h"
-#include "de_rom_8040FE0.h"
-#include "string_util.h"
-
-void sub_80F700C(u8 *arg0, u16 arg1) {
-    struct Trainer *trainer;
-    u8 *ptr;
-
-#if ENGLISH
-    trainer = (struct Trainer *) &gTrainers[gUnknown_083DFEC4->unkCEE8[arg1].unk0];
-#elif GERMAN
-    const u16 trainerIndex = gUnknown_083DFEC4->unkCEE8[arg1].unk0;
-    trainer = (struct Trainer *) &gTrainers[trainerIndex];
-#endif
-
-    ptr = arg0;
-    if (arg1 < gUnknown_083DFEC4->unkD158)
-    {
-#if ENGLISH
-        ptr = StringCopy(ptr, gTrainerClassNames[trainer->trainerClass]);
-#elif GERMAN
-        ptr = StringCopy(ptr, de_sub_8041024(0, trainerIndex));
-#endif
-
-        ptr[0] = 0xFC;
-        ptr[1] = 0x13;
-        ptr[2] = 0x4B;
-        ptr += 3;
-        ptr = StringCopy(ptr, trainer->trainerName);
-    }
-
-    ptr[0] = 0xFC;
-    ptr[1] = 0x13;
-    ptr[2] = 0x80;
-    ptr[3] = 0xFF;
-}
-
-IWRAM_DATA MainCallback gUnknown_03000744;