diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-19 01:04:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-19 01:04:35 -0400 |
| commit | 5d6e7a31da8f018c1a69e9e57eca0657ec19c283 (patch) | |
| tree | 3ce548fbada787a8d2dc686ef6612f06e2b9fc3a /src/use_pokeblock.c | |
| parent | 9effc97f69d46af00e45420661a775c5977049c8 (diff) | |
| parent | 3d96e954c845659f5184e99856ddf61ce1375b2f (diff) | |
Merge pull request #788 from kazblox/master
Fix NONMATCHINGs and actual English Debug support
Diffstat (limited to 'src/use_pokeblock.c')
| -rw-r--r-- | src/use_pokeblock.c | 60 |
1 files changed, 12 insertions, 48 deletions
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index e13369c0b..8fff9edee 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -40,7 +40,7 @@ static const u8 gUnknown_0840612C[] = { 0, 4, 3, 2, 1 }; -static const u8 *const sContextStatNames[] = { +static const u8 *const sContestStatNames[] = { OtherText_Coolness, OtherText_Toughness, OtherText_Smartness, @@ -683,12 +683,19 @@ static void Pokeblock_MenuWindowTextPrint(const u8 *message) Menu_PrintText(message, 1, 17); } -#ifdef NONMATCHING -static void Pokeblock_BufferEnhancedStatText(u8 *dest, u8 statID, s16 a2) +void Pokeblock_BufferEnhancedStatText(u8 *dest, u8 statId, s16 enhanced) { - if (a2 != 0) + if (enhanced) { - StringCopy(dest, sContextStatNames[statID]); + // This is a joke. + if (enhanced > 0) + enhanced = 0; + + if (enhanced < 0) + // matches, but can also be a variety of values too + { u8 unk = -unk; } // see water.c for a similar behavior + + StringCopy(dest, sContestStatNames[statId]); StringAppend(dest, gOtherText_WasEnhanced); } else @@ -696,49 +703,6 @@ static void Pokeblock_BufferEnhancedStatText(u8 *dest, u8 statID, s16 a2) StringCopy(dest, gOtherText_NothingChanged); } } -#else -NAKED -static void Pokeblock_BufferEnhancedStatText(u8 *dest, u8 a1, s16 a2) -{ - asm_unified("\tpush {r4,lr}\n" - "\tadds r4, r0, 0\n" - "\tlsls r1, 24\n" - "\tlsrs r3, r1, 24\n" - "\tlsls r2, 16\n" - "\tlsrs r0, r2, 16\n" - "\tasrs r2, 16\n" - "\tcmp r2, 0\n" - "\tbeq _08136DFC\n" - "\tcmp r2, 0\n" - "\tble _08136DD8\n" - "\tmovs r0, 0\n" - "_08136DD8:\n" - "\tlsls r0, 16\n" - "\tldr r1, _08136DF4 @ =sContextStatNames\n" - "\tlsls r0, r3, 2\n" - "\tadds r0, r1\n" - "\tldr r1, [r0]\n" - "\tadds r0, r4, 0\n" - "\tbl StringCopy\n" - "\tldr r1, _08136DF8 @ =gOtherText_WasEnhanced\n" - "\tadds r0, r4, 0\n" - "\tbl StringAppend\n" - "\tb _08136E04\n" - "\t.align 2, 0\n" - "_08136DF4: .4byte sContextStatNames\n" - "_08136DF8: .4byte gOtherText_WasEnhanced\n" - "_08136DFC:\n" - "\tldr r1, _08136E0C @ =gOtherText_NothingChanged\n" - "\tadds r0, r4, 0\n" - "\tbl StringCopy\n" - "_08136E04:\n" - "\tpop {r4}\n" - "\tpop {r0}\n" - "\tbx r0\n" - "\t.align 2, 0\n" - "_08136E0C: .4byte gOtherText_NothingChanged"); -} -#endif static void Pokeblock_GetMonContestStats(struct Pokemon *pokemon, u8 *data) { |