dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into battle

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-08-29 03:00:08 +08:00
parent 2bd15329e0 6c0fd9884c
commit 4b5195c9cb
39 changed files with 322 additions and 4955 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trainer_tower.c
+4 -4
View File
@@ -423,7 +423,7 @@ const struct WindowTemplate gUnknown_847A218[] = {
const u32 gUnknown_847A228 = 0x70; // unused
const struct TextColor gUnknown_847A22C = {0, 2, 3};
const u8 gUnknown_847A22C[3] = {0, 2, 3};
void (*const gUnknown_847A230[])(void) = {
sub_815DD44,
@@ -1433,14 +1433,14 @@ void PrintTrainerTowerRecords(void)
sub_815DC8C();
FillWindowPixelRect(0, 0, 0, 0, 0xd8, 0x90);
sub_815EC0C();
AddTextPrinterParameterized3(0, 2, 0x4a, 0, &gUnknown_847A22C, 0, gUnknown_83FE982);
AddTextPrinterParameterized3(0, 2, 0x4a, 0, gUnknown_847A22C, 0, gUnknown_83FE982);
for (i = 0; i < 4; i++)
{
PRINT_TOWER_TIME(sub_815EDDC(&gSaveBlock1Ptr->unkArray[i].unk4));
StringExpandPlaceholders(gStringVar4, gUnknown_83FE998);
AddTextPrinterParameterized3(windowId, 2, 0x18, 0x24 + 0x14 * i, &gUnknown_847A22C, 0, gUnknown_83FE9C4[i]);
AddTextPrinterParameterized3(windowId, 2, 0x60, 0x24 + 0x14 * i, &gUnknown_847A22C, 0, gStringVar4);
AddTextPrinterParameterized3(windowId, 2, 0x18, 0x24 + 0x14 * i, gUnknown_847A22C, 0, gUnknown_83FE9C4[i]);
AddTextPrinterParameterized3(windowId, 2, 0x60, 0x24 + 0x14 * i, gUnknown_847A22C, 0, gStringVar4);
}
PutWindowTilemap(windowId);