diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-06 12:27:27 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-06 12:27:27 -0600 |
| commit | b3551bc2f328c286c6ecc45ea288665d46b44260 (patch) | |
| tree | 073770933fd52f710691952c4ddb8d27b258937d /src/pokenav_after.c | |
| parent | 818dfa314e1658ab797af686fedd464c9fda6557 (diff) | |
fix some code and formatting anomalies
Diffstat (limited to 'src/pokenav_after.c')
| -rw-r--r-- | src/pokenav_after.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/pokenav_after.c b/src/pokenav_after.c index 84ed7b14b..330305ea3 100644 --- a/src/pokenav_after.c +++ b/src/pokenav_after.c @@ -6,16 +6,10 @@ #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 +void sub_80F700C(u8 *arg0, u16 arg1) +{ + const struct Trainer *trainer = &gTrainers[gUnknown_083DFEC4->unkCEE8[arg1].unk0]; + u8 *ptr = arg0; ptr = arg0; if (arg1 < gUnknown_083DFEC4->unkD158) @@ -23,7 +17,7 @@ void sub_80F700C(u8 *arg0, u16 arg1) { #if ENGLISH ptr = StringCopy(ptr, gTrainerClassNames[trainer->trainerClass]); #elif GERMAN - ptr = StringCopy(ptr, de_sub_8041024(0, trainerIndex)); + ptr = StringCopy(ptr, de_sub_8041024(0, gUnknown_083DFEC4->unkCEE8[arg1].unk0)); #endif ptr[0] = 0xFC; |