diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-05 17:48:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-05 17:48:21 -0400 |
| commit | 124e2eb02c4adc46265e5b34b47ac0c625a24ec3 (patch) | |
| tree | 5c0af98d9e49a767f455fff1ceec5d07cb8539b8 /src/pokenav.c | |
| parent | 123d5cc8b26d2a93fa3981beaccb84377c6ae20f (diff) | |
| parent | 813c1846c94fa14b55bf75cf4c14465f1fb26635 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'src/pokenav.c')
| -rw-r--r-- | src/pokenav.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/pokenav.c b/src/pokenav.c index 24253e878..3a386d865 100644 --- a/src/pokenav.c +++ b/src/pokenav.c @@ -2,18 +2,28 @@ #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; |