Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-08-09 19:07:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix pokedex

Browse Source
This commit is contained in:
Marijn van der Werf 2017-06-25 04:15:32 +02:00
parent 2b0e563282
commit 863dca624f
1 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/pokedex.c
View File

@ -3852,10 +3852,10 @@ static void sub_8090750(u8 taskId)
else
sub_8091154(dexNum, 13, 3);
sub_80911C8(dexNum, 16, 3);
MenuPrint(gDexText_UnknownPoke, 11, 5);
MenuPrint(gDexText_UnknownPoke, CATEGORY_LEFT, 5);
MenuPrint(gDexText_UnknownHeight, 16, 7);
MenuPrint(gDexText_UnknownWeight, 16, 9);
sub_8091304(gPokedexEntries[dexNum].categoryName, 11, 5);
sub_8091304(gPokedexEntries[dexNum].categoryName, CATEGORY_LEFT, 5);
sub_8091458(gPokedexEntries[dexNum].height, 16, 7);
sub_8091564(gPokedexEntries[dexNum].weight, 16, 9);
MenuPrint(gPokedexEntries[dexNum].descriptionPage1, 2, 13);
@ -4261,6 +4261,7 @@ static void sub_8091304(const u8 *name, u8 left, u8 top)
sub_8072B80(str, left, top, gDexText_UnknownPoke);
}
#if ENGLISH
void unref_sub_80913A4(u16 a, u8 left, u8 top)
{
u8 str[6];
@ -4297,6 +4298,51 @@ void unref_sub_80913A4(u16 a, u8 left, u8 top)
str[5] = EOS;
MenuPrint(str, left, top);
}
#elif GERMAN
void unref_sub_80913A4(u16 arg0, u8 left, u8 top) {
u8 buffer[8];
int offset;
u8 result;
u8 r6 = 0;
offset = 0;
buffer[r6++] = 0xFC;
buffer[r6++] = 0x13;
r6++;
result = (arg0 / 1000);
if (result == 0)
{
offset = 6;
}
else
{
buffer[r6++] = result + CHAR_0;
}
result = (arg0 % 1000) / 100;
if (result == 0 && offset != 0)
{
offset += 6;
}
else
{
buffer[r6++] = result + CHAR_0;
}
buffer[r6++] = (((arg0 % 1000) % 100) / 10) + CHAR_0;
buffer[r6++] = CHAR_COMMA;
buffer[r6++] = (((arg0 % 1000) % 100) % 10) + CHAR_0;
buffer[r6++] = EOS;
buffer[2] = offset;
MenuPrint(buffer, left, top);
}
#endif
#ifdef UNITS_IMPERIAL
#define CHAR_PRIME (0xB4)
@ -4678,9 +4724,15 @@ int sub_8091AF8(u8 a, u8 b, u8 abcGroup, u8 bodyColor, u8 type1, u8 type2)
return resultsCount;
}
#if ENGLISH
#define SUB_8091E20_WIDTH (208)
#elif GERMAN
#define SUB_8091E20_WIDTH (216)
#endif
void sub_8091E20(const u8 *str)
{
sub_8072AB0(str, 9, 120, 208, 32, 1);
sub_8072AB0(str, 9, 120, SUB_8091E20_WIDTH, 32, 1);
}
u8 sub_8091E3C(void)