Game-Decompilation/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2024-11-23 05:49:44 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Decorate TextPrinters with consts and macros

Browse Source
This commit is contained in:
Rachel 2024-10-19 18:32:10 -07:00
parent 9e5a7ee991
commit b6ff10c33f
177 changed files with 1616 additions and 1596 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/overlay017/ov17_0223F118.h
View File

@ -14,10 +14,11 @@
#include "overlay017/struct_ov17_0223F744.h"
#include "strbuf.h"
#include "text.h"
GenericPointerData *ov17_0223F140(int param0);
void ov17_0223F1E0(GenericPointerData *param0);
void ov17_0223F1E8(int param0, BGL *param1, SpriteGfxHandler *param2, UnkStruct_02012744 *param3, UnkStruct_ov17_0223F2E4 *param4, const Strbuf *param5, int param6, u32 param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14);
void ov17_0223F1E8(int param0, BGL *param1, SpriteGfxHandler *param2, UnkStruct_02012744 *param3, UnkStruct_ov17_0223F2E4 *param4, const Strbuf *param5, enum Font param6, TextColor param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14);
void ov17_0223F2E4(UnkStruct_ov17_0223F2E4 *param0);
void ov17_0223F2F8(UnkStruct_ov17_0223F2E4 *param0, int param1, int param2, int param3);
Strbuf *ov17_0223F310(u32 param0, u32 param1);

5
include/overlay094/ov94_022414B8.h
View File

@ -14,13 +14,14 @@
#include "message.h"
#include "string_template.h"
#include "text.h"
int ov94_022414B8(UnkStruct_ov94_0223FD4C *param0, int param1);
int ov94_02241548(UnkStruct_ov94_0223FD4C *param0, int param1);
int ov94_02241568(UnkStruct_ov94_0223FD4C *param0, int param1);
int ov94_02241B80(UnkStruct_ov94_0223BA88_sub3 *param0, int param1);
void ov94_02242158(Window *param0, MessageLoader *param1, int param2, int param3, int param4, u32 param5);
void ov94_0224218C(Window *param0, MessageLoader *param1, MessageLoader *param2, int param3, int param4, int param5, u32 param6);
void ov94_02242158(Window *param0, MessageLoader *param1, int param2, int param3, int param4, TextColor param5);
void ov94_0224218C(Window *param0, MessageLoader *param1, MessageLoader *param2, int param3, int param4, int param5, TextColor param6);
void ov94_02242204(Window *param0, MessageLoader *param1, int param2, int param3, int param4, int param5, u32 param6);
void ov94_0224226C(Window *param0, MessageLoader *param1, int param2, int param3, int param4, u32 param5, int param6, int param7);
void ov94_022422B8(Window *param0, MessageLoader *param1, int param2, int param3, int param4, u32 param5, int param6);

5
include/overlay096/ov96_0223BCE0.h
View File

@ -6,12 +6,13 @@
#include "overlay096/struct_ov96_0223BF40_decl.h"
#include "strbuf.h"
#include "text.h"
int ov96_0223BCE0(UnkStruct_ov96_0223BF40 *param0, int param1);
int ov96_0223BDBC(UnkStruct_ov96_0223BF40 *param0, int param1);
int ov96_0223BDEC(UnkStruct_ov96_0223BF40 *param0, int param1);
void ov96_0223D8A4(Window *param0, Strbuf *param1, int param2, int param3, int param4, u32 param5);
void ov96_0223D8D8(Window *param0, Strbuf *param1, int param2, int param3, int param4, u32 param5);
void ov96_0223D8A4(Window *param0, Strbuf *param1, int param2, int param3, int param4, TextColor param5);
void ov96_0223D8D8(Window *param0, Strbuf *param1, int param2, int param3, int param4, TextColor param5);
void ov96_0223D948(UnkStruct_ov96_0223BF40 *param0);
#endif // POKEPLATINUM_OV96_0223BCE0_H

3
include/overlay097/struct_ov97_02237808.h
View File

@ -4,6 +4,7 @@
#include "struct_defs/struct_0205AA50.h"
#include "string_template.h"
#include "text.h"
typedef struct {
int unk_00;
@ -23,7 +24,7 @@ typedef struct {
int unk_38;
int unk_3C;
int unk_40;
u32 unk_44;
TextColor unk_44;
u8 unk_48;
int unk_4C;
int unk_50;

4
include/overlay117/ov117_02263AF0.h
View File

@ -16,7 +16,9 @@
#include "overlay117/struct_ov117_02265EC8.h"
#include "overlay117/struct_ov117_02266274.h"
#include "font.h"
#include "strbuf.h"
#include "text.h"
void ov117_02263AF0(BGL *param0, int param1, int param2, UnkStruct_ov117_02263DAC *param3);
int ov117_02263CF4(int param0);
@ -48,7 +50,7 @@ void ov117_02265ABC(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265C3C *
void ov117_02265B3C(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265C3C *param1);
void ov117_02265B58(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265C3C *param1, int param2, int param3, int param4);
void ov117_02265C1C(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265C3C *param1);
void ov117_02265DB8(BGL *param0, SpriteGfxHandler *param1, UnkStruct_02012744 *param2, UnkStruct_ov117_02265EB0 *param3, const Strbuf *param4, int param5, u32 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14);
void ov117_02265DB8(BGL *param0, SpriteGfxHandler *param1, UnkStruct_02012744 *param2, UnkStruct_ov117_02265EB0 *param3, const Strbuf *param4, enum Font param5, TextColor param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14);
void ov117_02265EB0(UnkStruct_ov117_02265EB0 *param0);
void ov117_02265EC8(UnkStruct_ov117_02265EC8 *param0);
void ov117_02265F34(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265EC8 *param1);

11
include/text.h
View File

@ -17,10 +17,17 @@ typedef u32 TextColor;
#define TEXT_COLOR(letter, shadow, bg) ((TextColor)(((letter & TEXT_COLOR_MASK) << TEXT_COLOR_FG_SHIFT) \
| ((shadow & TEXT_COLOR_MASK) << TEXT_COLOR_SHADOW_SHIFT) \
| ((bg & TEXT_COLOR_MASK) << TEXT_COLOR_BG_SHIFT)))
#define GET_TEXT_FG_COLOR(color) (((color) >> TEXT_COLOR_FG_SHIFT) & TEXT_COLOR_MASK)
#define GET_TEXT_SHADOW_COLOR(color) (((color) >> TEXT_COLOR_SHADOW_SHIFT) & TEXT_COLOR_MASK)
#define GET_TEXT_BG_COLOR(color) (((color) >> TEXT_COLOR_BG_SHIFT) & TEXT_COLOR_MASK)
#define MAX_TEXT_PRINTERS 8
#define TEXT_SPEED_INSTANT 0
#define TEXT_SPEED_FAST 1
#define TEXT_SPEED_QUICK 2
#define TEXT_SPEED_NORMAL 4
#define TEXT_SPEED_SLOW 8
#define TEXT_SPEED_NO_TRANSFER 0xFF
void Text_SetFontAttributesPtr(const FontAttributes *fontAttributes);
@ -28,8 +35,8 @@ void Text_ResetAllPrinters(void);
u8 Text_IsPrinterActive(u8 printerID);
void Text_RemovePrinter(u8 printerID);
u8 Text_AddPrinterWithParams(Window *window, u32 fontID, const Strbuf *strbuf, u32 xOffset, u32 yOffset, u32 renderDelay, TextPrinterCallback callback);
u8 Text_AddPrinterWithParamsAndColor(Window *window, u32 fontID, const Strbuf *strbuf, u32 xOffset, u32 yOffset, u32 renderDelay, u32 color, TextPrinterCallback callback);
u8 Text_AddPrinterWithParamsColorAndSpacing(Window *window, u32 fontID, const Strbuf *strbuf, u32 xOffset, u32 yOffset, u32 renderDelay, u32 color, u32 letterSpacing, u32 lineSpacing, TextPrinterCallback callback);
u8 Text_AddPrinterWithParamsAndColor(Window *window, u32 fontID, const Strbuf *strbuf, u32 xOffset, u32 yOffset, u32 renderDelay, TextColor color, TextPrinterCallback callback);
u8 Text_AddPrinterWithParamsColorAndSpacing(Window *window, u32 fontID, const Strbuf *strbuf, u32 xOffset, u32 yOffset, u32 renderDelay, TextColor color, u32 letterSpacing, u32 lineSpacing, TextPrinterCallback callback);
u8 Text_AddPrinter(const TextPrinterTemplate *template, u32 renderDelay, TextPrinterCallback callback);
void Text_GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor);
void Text_DecompressGlyph(u8 *src, u8 *dst);

4
include/unk_020149F0.h
View File

@ -4,9 +4,11 @@
#include "struct_decls/struct_020149F0_decl.h"
#include "struct_defs/struct_0205AA50.h"
#include "text.h"
UnkStruct_020149F0 *sub_020149F0(u32 param0);
void sub_02014A20(UnkStruct_020149F0 *param0);
void sub_02014A40(UnkStruct_020149F0 *param0, u32 param1);
void sub_02014A40(UnkStruct_020149F0 *param0, TextColor param1);
void sub_02014A58(const UnkStruct_020149F0 *param0, Window *param1, u32 param2, u32 param3);
#endif // POKEPLATINUM_UNK_020149F0_H

2
src/battle/battle_script.c
View File

@ -12264,7 +12264,7 @@ static void BattleScript_LoadPartyLevelUpIcon(BattleSystem *param0, BattleScript
Strbuf_Free(v6);
Window_Init(&v9);
BGL_AddFramelessWindow(v8, &v9, 12, 4, 0, 0);
Text_AddPrinterWithParamsAndColor(&v9, 0, v7, 0, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&v9, FONT_SYSTEM, v7, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
v10 = sub_02012898(&v9, NNS_G2D_VRAM_TYPE_2DMAIN, 5);
sub_0201ED94(v10, 1, NNS_G2D_VRAM_TYPE_2DMAIN, &v11);

8
src/battle/healthbar.c
View File

@ -60,7 +60,7 @@
#define HEALTHBAR_NAME_WINDOW_OFFSET 0
#define HEALTHBAR_NAME_BYTE_SIZE (HEALTHBAR_NAME_BLOCK_COUNT_X * HEALTHBAR_NAME_BLOCK_COUNT_Y * HEALTHBAR_WINDOW_BLOCK_SIZE)
#define HEALTHBAR_NAME_BACKGROUND_COLOR 0xF
#define HEALTHBAR_NAME_FONT_COLOR TEXT_COLOR(14, 2, HEALTHBAR_NAME_BACKGROUND_COLOR)
#define HEALTHBAR_NAME_TEXT_COLOR TEXT_COLOR(14, 2, HEALTHBAR_NAME_BACKGROUND_COLOR)
#define VRAM_TRANSFER_DST(vram, transferTable, index_0, index_1, imgProxy) ( \
(void *)((u32)vram + transferTable[index_0][index_1].pos + imgProxy->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN]))
@ -1102,7 +1102,7 @@ static void Healthbar_DrawBattlerName(Healthbar *healthbar)
StringTemplate_Format(strFormatter, nickname, template);
BGL_AddFramelessWindow(bgl, &window, HEALTHBAR_NAME_BLOCK_COUNT_X, HEALTHBAR_NAME_BLOCK_COUNT_Y, HEALTHBAR_NAME_WINDOW_OFFSET, HEALTHBAR_NAME_BACKGROUND_COLOR);
Text_AddPrinterWithParamsColorAndSpacing(&window, FONT_SYSTEM, nickname, 0, 0, 0xFF, HEALTHBAR_NAME_FONT_COLOR, 0, 0, NULL);
Text_AddPrinterWithParamsColorAndSpacing(&window, FONT_SYSTEM, nickname, 0, 0, TEXT_SPEED_NO_TRANSFER, HEALTHBAR_NAME_TEXT_COLOR, 0, 0, NULL);
buf = window.unk_0C;
// copy the window's data into VRAM over the painted healthbar
@ -1315,7 +1315,7 @@ static void Healthbar_DrawBallCount(Healthbar *param0, u32 param1)
}
BGL_AddFramelessWindow(v0, &v3, 13, 2, 0, 0xf);
Text_AddPrinterWithParamsColorAndSpacing(&v3, 0, v5, 0, 0, 0xff, ((u32)(((0xe & 0xff) << 16) | ((2 & 0xff) << 8) | ((0xf & 0xff) << 0))), 0, 0, NULL);
Text_AddPrinterWithParamsColorAndSpacing(&v3, FONT_SYSTEM, v5, 0, 0, TEXT_SPEED_NO_TRANSFER, HEALTHBAR_NAME_TEXT_COLOR, 0, 0, NULL);
v1 = v3.unk_0C;
@ -1363,7 +1363,7 @@ static void Healthbar_DrawBallsLeftMessage(Healthbar *param0, u32 param1)
StringTemplate_SetNumber(v7, 0, param0->unk_27, 2, 1, 1);
StringTemplate_Format(v7, v5, v6);
BGL_AddFramelessWindow(v0, &v3, 13, 2, 0, 0xf);
Text_AddPrinterWithParamsColorAndSpacing(&v3, 0, v5, 0, 0, 0xff, ((u32)(((0xe & 0xff) << 16) | ((2 & 0xff) << 8) | ((0xf & 0xff) << 0))), 0, 0, NULL);
Text_AddPrinterWithParamsColorAndSpacing(&v3, FONT_SYSTEM, v5, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(14, 2, 15), 0, 0, NULL);
v1 = v3.unk_0C;

2
src/battle/ov16_0223B140.c
View File

@ -1746,7 +1746,7 @@ static void ov16_0223D10C(OverlayManager *param0, BattleParams *param1)
v6 = Strbuf_Init(0x100, 5);
MessageLoader_GetStrbuf(v5, 923, v6);
Text_AddPrinterWithParams(v0->unk_08, 1, v6, 0, 0, NULL, NULL);
Text_AddPrinterWithParams(v0->unk_08, FONT_MESSAGE, v6, 0, 0, NULL, NULL);
Strbuf_Free(v6);
MessageLoader_Free(v5);

10
src/battle/ov16_0223DF00.c
View File

@ -1749,7 +1749,7 @@ u8 ov16_0223F9FC(BattleSystem *param0, int param1, int param2, int param3, int p
}
BGL_FillWindow(v0, 0xff);
v1 = Text_AddPrinterWithParams(v0, 1, v2, 0, 0, param4, BattleMessage_Callback);
v1 = Text_AddPrinterWithParams(v0, FONT_MESSAGE, v2, 0, 0, param4, BattleMessage_Callback);
Strbuf_Free(v2);
}
} else {
@ -1783,7 +1783,7 @@ u8 ov16_0223F9FC(BattleSystem *param0, int param1, int param2, int param3, int p
BGL_FillWindow(v0, 0xff);
v1 = Text_AddPrinterWithParams(v0, 1, v4, 0, 0, param4, BattleMessage_Callback);
v1 = Text_AddPrinterWithParams(v0, FONT_MESSAGE, v4, 0, 0, param4, BattleMessage_Callback);
Strbuf_Free(v4);
MessageLoader_Free(v3);
}
@ -1791,7 +1791,7 @@ u8 ov16_0223F9FC(BattleSystem *param0, int param1, int param2, int param3, int p
} else {
TrainerData_LoadMessage(param1, param3, param0->msgBuffer, 5);
BGL_FillWindow(v0, 0xff);
v1 = Text_AddPrinterWithParams(v0, 1, param0->msgBuffer, 0, 0, param4, BattleMessage_Callback);
v1 = Text_AddPrinterWithParams(v0, FONT_MESSAGE, param0->msgBuffer, 0, 0, param4, BattleMessage_Callback);
}
return v1;
@ -1807,7 +1807,7 @@ u8 BattleMessage_Print(BattleSystem *battleSys, MessageLoader *msgLoader, Battle
BGL_FillWindow(textWindow, 0xFF);
return Text_AddPrinterWithParams(textWindow, 1, battleSys->msgBuffer, 0, 0, renderDelay, BattleMessage_Callback);
return Text_AddPrinterWithParams(textWindow, FONT_MESSAGE, battleSys->msgBuffer, 0, 0, renderDelay, BattleMessage_Callback);
}
u8 BattleMessage_PrintToWindow(BattleSystem *param0, Window *param1, MessageLoader *param2, BattleMessage *param3, int param4, int param5, int param6, int param7, int param8)
@ -1828,7 +1828,7 @@ u8 BattleMessage_PrintToWindow(BattleSystem *param0, Window *param1, MessageLoad
v0 = 0;
}
return Text_AddPrinterWithParams(param1, 0, param0->msgBuffer, param4 + v0, param5, param8, BattleMessage_Callback);
return Text_AddPrinterWithParams(param1, FONT_SYSTEM, param0->msgBuffer, param4 + v0, param5, param8, BattleMessage_Callback);
}
/**

98
src/battle/ov16_0226871C.c
View File

@ -331,7 +331,7 @@ static void ov16_0226B318(UnkStruct_ov16_02268A14 *param0, int param1);
void ov16_0226947C(UnkStruct_ov16_02268A14 *param0, int param1, int param2);
static void ov16_022694A8(SysTask *param0, void *param1);
static void ov16_0226B314(UnkStruct_ov16_02268A14 *param0, int param1);
static void ov16_0226A98C(UnkStruct_ov16_02268A14 *param0, UnkStruct_ov16_0226A98C *param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov16_0226AEA0 *param10);
static void ov16_0226A98C(UnkStruct_ov16_02268A14 *param0, UnkStruct_ov16_0226A98C *param1, const Strbuf *param2, enum Font param3, TextColor param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov16_0226AEA0 *param10);
static void ov16_0226AAC0(UnkStruct_ov16_02268A14 *param0);
static void ov16_0226A698(UnkStruct_ov16_02268A14 *param0);
static void ov16_0226A718(UnkStruct_ov16_02268A14 *param0);
@ -341,7 +341,7 @@ static void ov16_0226A928(SysTask *param0, void *param1);
static void ov16_0226B988(SysTask *param0, void *param1);
static void ov16_0226BA88(SysTask *param0, void *param1);
static void ov16_0226BB94(void *param0);
static u32 ov16_0226B924(int param0, int param1);
static TextColor ov16_0226B924(int param0, int param1);
void ov16_0226BCCC(UnkStruct_ov16_02268A14 *param0, int param1);
BOOL ov16_0226BCD0(UnkStruct_ov16_02268A14 *param0);
static void ov16_0226BCE4(SysTask *param0, void *param1);
@ -359,7 +359,7 @@ static void ov16_0226B31C(UnkStruct_ov16_02268A14 *param0, const s16 *param1, co
static UnkStruct_ov16_0226ABD4 *ov16_0226ABD4(UnkStruct_ov16_02268A14 *param0, int param1);
static void ov16_0226ABE8(UnkStruct_ov16_02268A14 *param0);
static void ov16_0226A95C(const Strbuf *param0, int param1, int *param2, int *param3);
static void ov16_0226AEA0(UnkStruct_ov16_02268A14 *param0, const Strbuf *param1, int param2, UnkStruct_ov16_0226AEA0 *param3, u32 param4);
static void ov16_0226AEA0(UnkStruct_ov16_02268A14 *param0, const Strbuf *param1, enum Font param2, UnkStruct_ov16_0226AEA0 *param3, TextColor param4);
static void ov16_0226AAF8(UnkStruct_ov16_02268A14 *param0);
static int ov16_0226C100(UnkStruct_ov16_02268A14 *param0, int param1);
static void ov16_0226BD74(SysTask *param0, void *param1);
@ -1782,10 +1782,10 @@ static void ov16_02269668(UnkStruct_ov16_02268A14 *param0, int param1, int param
param0->unk_66F = 0;
}
ov16_0226A98C(param0, &param0->unk_4CC[0], v0, 2, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((3 & 0xff) << 0))), 2, 20023, 128, 84, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[1], v1, 2, ((u32)(((4 & 0xff) << 16) | ((5 & 0xff) << 8) | ((6 & 0xff) << 0))), 2, 20023, 40, 170, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[2], v2, 2, ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((9 & 0xff) << 0))), 2, 20023, 216, 170, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[3], v3, 2, ((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((12 & 0xff) << 0))), 2, 20023, 128, 178, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[0], v0, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 84, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[1], v1, FONT_SUBSCREEN, TEXT_COLOR(4, 5, 6), 2, 20023, 40, 170, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[2], v2, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 2, 20023, 216, 170, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[3], v3, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 178, 1, NULL);
Strbuf_Free(v0);
Strbuf_Free(v1);
@ -1883,7 +1883,7 @@ static void ov16_022699AC(UnkStruct_ov16_02268A14 *param0, int param1, int param
int v1;
MessageLoader *v2;
UnkStruct_ov16_0226ABD4 *v3;
u32 v4;
TextColor v4;
v0 = &param0->unk_1A.val2;
GF_ASSERT(v0 != NULL);
@ -1896,17 +1896,17 @@ static void ov16_022699AC(UnkStruct_ov16_02268A14 *param0, int param1, int param
ov16_0226AF0C(param0);
{
ov16_0226A98C(param0, &param0->unk_4CC[0], NULL, 2, ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((9 & 0xff) << 0))), 3, 20023, 64, 46, 1, &v3->unk_28[0]);
ov16_0226A98C(param0, &param0->unk_4CC[1], NULL, 2, ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((9 & 0xff) << 0))), 3, 20023, 192, 46, 1, &v3->unk_28[1]);
ov16_0226A98C(param0, &param0->unk_4CC[2], NULL, 2, ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((9 & 0xff) << 0))), 3, 20023, 64, 110, 1, &v3->unk_28[2]);
ov16_0226A98C(param0, &param0->unk_4CC[3], NULL, 2, ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((9 & 0xff) << 0))), 3, 20023, 192, 110, 1, &v3->unk_28[3]);
ov16_0226A98C(param0, &param0->unk_4CC[0], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 64, 46, 1, &v3->unk_28[0]);
ov16_0226A98C(param0, &param0->unk_4CC[1], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 192, 46, 1, &v3->unk_28[1]);
ov16_0226A98C(param0, &param0->unk_4CC[2], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 64, 110, 1, &v3->unk_28[2]);
ov16_0226A98C(param0, &param0->unk_4CC[3], NULL, FONT_SUBSCREEN, TEXT_COLOR(7, 8, 9), 3, 20023, 192, 110, 1, &v3->unk_28[3]);
}
{
for (v1 = 0; v1 < 4; v1++) {
v4 = ov16_0226B924(v0->unk_08[v1], v0->unk_0C[v1]);
ov16_0226A98C(param0, &param0->unk_4CC[9 + v1], NULL, 0, v4, 4, 20023, Unk_ov16_022702D4[v1][0], Unk_ov16_022702D4[v1][1], 0, &v3->unk_78[v1]);
ov16_0226A98C(param0, &param0->unk_4CC[5 + v1], NULL, 0, v4, 4, 20023, Unk_ov16_02270284[v1][0], Unk_ov16_02270284[v1][1], 0, &v3->unk_C8[v1]);
ov16_0226A98C(param0, &param0->unk_4CC[9 + v1], NULL, FONT_SYSTEM, v4, 4, 20023, Unk_ov16_022702D4[v1][0], Unk_ov16_022702D4[v1][1], 0, &v3->unk_78[v1]);
ov16_0226A98C(param0, &param0->unk_4CC[5 + v1], NULL, FONT_SYSTEM, v4, 4, 20023, Unk_ov16_02270284[v1][0], Unk_ov16_02270284[v1][1], 0, &v3->unk_C8[v1]);
}
}
@ -1914,7 +1914,7 @@ static void ov16_022699AC(UnkStruct_ov16_02268A14 *param0, int param1, int param
Strbuf *v5;
v5 = MessageLoader_GetNewStrbuf(v2, 929);
ov16_0226A98C(param0, &param0->unk_4CC[4], v5, 2, ((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((12 & 0xff) << 0))), 2, 20023, 128, 178, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[4], v5, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 178, 1, NULL);
Strbuf_Free(v5);
}
@ -1972,8 +1972,8 @@ static void ov16_02269C7C(UnkStruct_ov16_02268A14 *param0, int param1, int param
v1 = MessageLoader_GetNewStrbuf(v0, 940);
v2 = MessageLoader_GetNewStrbuf(v0, 941);
ov16_0226A98C(param0, &param0->unk_4CC[0], v1, 2, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((3 & 0xff) << 0))), 2, 20023, 128, 68, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[1], v2, 2, ((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((12 & 0xff) << 0))), 2, 20023, 128, 140, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[0], v1, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[1], v2, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
@ -1988,8 +1988,8 @@ static void ov16_02269D14(UnkStruct_ov16_02268A14 *param0, int param1, int param
v1 = MessageLoader_GetNewStrbuf(v0, 1181);
v2 = MessageLoader_GetNewStrbuf(v0, 1182);
ov16_0226A98C(param0, &param0->unk_4CC[0], v1, 2, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((3 & 0xff) << 0))), 2, 20023, 128, 68, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[1], v2, 2, ((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((12 & 0xff) << 0))), 2, 20023, 128, 140, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[0], v1, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[1], v2, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
@ -2014,8 +2014,8 @@ static void ov16_02269DB0(UnkStruct_ov16_02268A14 *param0, int param1, int param
StringTemplate_Format(v5, v3, v1);
StringTemplate_Format(v5, v4, v2);
ov16_0226A98C(param0, &param0->unk_4CC[0], v3, 2, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((3 & 0xff) << 0))), 2, 20023, 128, 68, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[1], v4, 2, ((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((12 & 0xff) << 0))), 2, 20023, 128, 140, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
@ -2055,7 +2055,7 @@ static void ov16_02269E94(UnkStruct_ov16_02268A14 *param0, int param1, int param
sub_0201C3C0(v5, 5);
}
ov16_0226A98C(param0, &param0->unk_4CC[0], v1, 2, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((3 & 0xff) << 0))), 2, 20023, 128, 178, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[0], v1, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 178, 1, NULL);
Strbuf_Free(v1);
}
@ -2078,8 +2078,8 @@ static void ov16_02269F68(UnkStruct_ov16_02268A14 *param0, int param1, int param
StringTemplate_Format(v5, v3, v1);
StringTemplate_Format(v5, v4, v2);
ov16_0226A98C(param0, &param0->unk_4CC[0], v3, 2, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((3 & 0xff) << 0))), 2, 20023, 128, 68, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[1], v4, 2, ((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((12 & 0xff) << 0))), 2, 20023, 128, 140, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
@ -2106,8 +2106,8 @@ static void ov16_0226A04C(UnkStruct_ov16_02268A14 *param0, int param1, int param
StringTemplate_Format(v5, v3, v1);
StringTemplate_Format(v5, v4, v2);
ov16_0226A98C(param0, &param0->unk_4CC[0], v3, 2, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((3 & 0xff) << 0))), 2, 20023, 128, 68, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[1], v4, 2, ((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((12 & 0xff) << 0))), 2, 20023, 128, 140, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[0], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 68, 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[1], v4, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, 128, 140, 1, NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
@ -2125,7 +2125,7 @@ static void ov16_0226A12C(UnkStruct_ov16_02268A14 *param0, int param1, int param
Pokemon *v6;
BoxPokemon *v7;
StringTemplate *v8;
u32 v9;
TextColor v9;
u8 v10[6];
u8 v11[6];
int v12;
@ -2165,12 +2165,12 @@ static void ov16_0226A12C(UnkStruct_ov16_02268A14 *param0, int param1, int param
StringTemplate_Format(v8, v4, v5);
if (v1 & 1) {
v9 = ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((3 & 0xff) << 0)));
v9 = TEXT_COLOR(1, 2, 3);
} else {
v9 = ((u32)(((4 & 0xff) << 16) | ((5 & 0xff) << 8) | ((6 & 0xff) << 0)));
v9 = TEXT_COLOR(4, 5, 6);
}
ov16_0226A98C(param0, &param0->unk_4CC[0 + v1], v4, 2, v9, 6, 20023, Unk_ov16_02270328[v1][0], Unk_ov16_02270328[v1][1], 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[0 + v1], v4, FONT_SUBSCREEN, v9, 6, 20023, Unk_ov16_02270328[v1][0], Unk_ov16_02270328[v1][1], 1, NULL);
Strbuf_Free(v5);
{
@ -2196,7 +2196,7 @@ static void ov16_0226A12C(UnkStruct_ov16_02268A14 *param0, int param1, int param
Strbuf *v13;
v13 = MessageLoader_GetNewStrbuf(v2, 930);
ov16_0226A98C(param0, &param0->unk_4CC[4], v13, 2, ((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((12 & 0xff) << 0))), 2, 20023, Unk_ov16_02270328[4][0], Unk_ov16_02270328[4][1], 1, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[4], v13, FONT_SUBSCREEN, TEXT_COLOR(10, 11, 12), 2, 20023, Unk_ov16_02270328[4][0], Unk_ov16_02270328[4][1], 1, NULL);
Strbuf_Free(v13);
}
}
@ -2606,7 +2606,7 @@ static void ov16_0226A95C(const Strbuf *param0, int param1, int *param2, int *pa
*param3 = v1;
}
static void ov16_0226A98C(UnkStruct_ov16_02268A14 *param0, UnkStruct_ov16_0226A98C *param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov16_0226AEA0 *param10)
static void ov16_0226A98C(UnkStruct_ov16_02268A14 *param0, UnkStruct_ov16_0226A98C *param1, const Strbuf *param2, enum Font param3, TextColor param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov16_0226AEA0 *param10)
{
UnkStruct_020127E8 v0;
Window v1;
@ -2632,7 +2632,7 @@ static void ov16_0226A98C(UnkStruct_ov16_02268A14 *param0, UnkStruct_ov16_0226A9
if (param10 == NULL) {
Window_Init(&v1);
BGL_AddFramelessWindow(v5, &v1, v8, 16 / 8, 0, 0);
Text_AddPrinterWithParamsColorAndSpacing(&v1, param3, param2, 0, 0, 0xff, param4, 0, 0, NULL);
Text_AddPrinterWithParamsColorAndSpacing(&v1, param3, param2, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL);
} else {
v1 = param10->unk_00;
}
@ -2790,7 +2790,7 @@ void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const UnkStruct_
Strbuf *v8;
Strbuf *v9;
StringTemplate *v10;
u32 v11;
TextColor v11;
MessageLoader *v12;
v12 = BattleSystem_MessageLoader(param0->unk_00);
@ -2811,7 +2811,7 @@ void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const UnkStruct_
if ((v0->unk_28[v4].unk_00.unk_0C == NULL) || ((param2->unk_00[v4] != v0->unk_00.unk_00[v4]) && (param2->unk_00[v4] != 0))) {
v6 = MessageUtil_MoveName(param2->unk_00[v4], 5);
ov16_0226AEA0(param0, v6, 2, &v0->unk_28[v4], ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((9 & 0xff) << 0))));
ov16_0226AEA0(param0, v6, FONT_SUBSCREEN, &v0->unk_28[v4], TEXT_COLOR(7, 8, 9));
Strbuf_Free(v6);
}
@ -2823,11 +2823,11 @@ void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const UnkStruct_
v11 = ov16_0226B924(param2->unk_08[v4], param2->unk_10[v4]);
if ((v0->unk_78[v4].unk_00.unk_0C == NULL) || (param2->unk_00[v4] != v0->unk_00.unk_00[v4]) || (param2->unk_08[v4] != v0->unk_00.unk_08[v4])) {
ov16_0226AEA0(param0, v7, 0, &v0->unk_78[v4], v11);
ov16_0226AEA0(param0, v7, FONT_SYSTEM, &v0->unk_78[v4], v11);
}
if ((v0->unk_C8[v4].unk_00.unk_0C == NULL) || (param2->unk_00[v4] != v0->unk_00.unk_00[v4]) || (param2->unk_08[v4] != v0->unk_00.unk_08[v4])) {
ov16_0226AEA0(param0, v9, 0, &v0->unk_C8[v4], v11);
ov16_0226AEA0(param0, v9, FONT_SYSTEM, &v0->unk_C8[v4], v11);
}
}
}
@ -2839,7 +2839,7 @@ void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const UnkStruct_
v0->unk_00 = *param2;
}
static void ov16_0226AEA0(UnkStruct_ov16_02268A14 *param0, const Strbuf *param1, int param2, UnkStruct_ov16_0226AEA0 *param3, u32 param4)
static void ov16_0226AEA0(UnkStruct_ov16_02268A14 *param0, const Strbuf *param1, enum Font param2, UnkStruct_ov16_0226AEA0 *param3, TextColor param4)
{
int v0, v1;
@ -2854,7 +2854,7 @@ static void ov16_0226AEA0(UnkStruct_ov16_02268A14 *param0, const Strbuf *param1,
Window_Init(&param3->unk_00);
BGL_AddFramelessWindow(BattleSystem_BGL(param0->unk_00), &param3->unk_00, v1, 16 / 8, 0, 0);
Text_AddPrinterWithParamsColorAndSpacing(&param3->unk_00, param2, param1, 0, 0, 0xff, param4, 0, 0, NULL);
Text_AddPrinterWithParamsColorAndSpacing(&param3->unk_00, param2, param1, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL);
}
static void ov16_0226AF0C(UnkStruct_ov16_02268A14 *param0)
@ -3476,38 +3476,38 @@ static void ov16_0226B780(SysTask *param0, void *param1)
}
}
static u32 ov16_0226B924(int param0, int param1)
static TextColor ov16_0226B924(int param0, int param1)
{
if (param0 == 0) {
return (u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((0 & 0xff) << 0));
return TEXT_COLOR(7, 8, 0);
}
if (param1 == param0) {
return (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0));
return TEXT_COLOR(1, 2, 0);
}
if (param1 <= 2) {
if (param0 == 1) {
return (u32)(((5 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0));
return TEXT_COLOR(5, 6, 0);
}
} else if (param1 <= 7) {
switch (param0) {
case 1:
return (u32)(((5 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0));
return TEXT_COLOR(5, 6, 0);
case 2:
return (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0));
return TEXT_COLOR(3, 4, 0);
}
} else {
if (param0 <= param1 / 4) {
return (u32)(((5 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0));
return TEXT_COLOR(5, 6, 0);
}
if (param0 <= param1 / 2) {
return (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0));
return TEXT_COLOR(3, 4, 0);
}
}
return (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0));
return TEXT_COLOR(1, 2, 0);
}
static void ov16_0226B988(SysTask *param0, void *param1)
@ -4628,7 +4628,7 @@ void ov16_0226CEB0(UnkStruct_ov16_02268A14 *param0, int param1)
v8 = MessageLoader_GetNewStrbuf(v9, v11[param1][v10]);
ov16_0226A98C(param0, &param0->unk_4CC[1 + v10], v8, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 4, 20023, 1 * 8 + 8, 6 * 8 + 16 + 16 * v10, 0, NULL);
ov16_0226A98C(param0, &param0->unk_4CC[1 + v10], v8, FONT_SYSTEM, TEXT_COLOR(1, 2, 0), 4, 20023, 1 * 8 + 8, 6 * 8 + 16 + 16 * v10, 0, NULL);
Strbuf_Free(v8);
}
}

24
src/choose_starter/choose_starter_app.c
View File

@ -252,12 +252,12 @@ static void SetupBGL(BGL *bgl, enum HeapId heapID);
static void ov78_021D12EC(BGL *param0);
static void MakeMessageWindow(ChooseStarterApp *app, enum HeapId heapID);
static void ov78_021D13A0(ChooseStarterApp *param0);
static u8 ov78_021D1FB4(Window *param0, int param1, int param2, int param3, u32 param4, u32 param5);
static u8 ov78_021D1FB4(Window *param0, int param1, int param2, int param3, TextColor param4, u32 param5);
static u8 ov78_021D201C(Window *param0, int param1, int param2, int param3, u32 param4, u32 param5, Strbuf **param6);
static void ov78_021D2090(ChooseStarterApp *param0);
static void MakeSubplaneWindow(ChooseStarterApp *param0, int param1);
static void ov78_021D2884(ChooseStarterApp *param0);
static void ov78_021D28A8(Window *param0, int param1, int param2, int param3, u32 param4);
static void ov78_021D28A8(Window *param0, int param1, int param2, int param3, TextColor param4);
static void ov78_021D2904(ChooseStarterApp *param0);
static void MakeConfirmationWindow(ChooseStarterApp *param0, int param1);
static void MakeSprite(ChooseStarterApp *app, enum HeapId heapID);
@ -1185,7 +1185,7 @@ static void ov78_021D1CA8(ChooseStarterApp *param0, int param1)
}
break;
case 3:
param0->unk_708 = ov78_021D201C(param0->messageWindow, param1, 360, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), param0->unk_704, &param0->unk_AC);
param0->unk_708 = ov78_021D201C(param0->messageWindow, param1, 360, 0, TEXT_COLOR(1, 2, 15), param0->unk_704, &param0->unk_AC);
param0->unk_04++;
break;
case 4:
@ -1195,7 +1195,7 @@ static void ov78_021D1CA8(ChooseStarterApp *param0, int param1)
}
break;
case 5:
param0->unk_708 = ov78_021D201C(param0->messageWindow, param1, 360, 7, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), param0->unk_704, &param0->unk_AC);
param0->unk_708 = ov78_021D201C(param0->messageWindow, param1, 360, 7, TEXT_COLOR(1, 2, 15), param0->unk_704, &param0->unk_AC);
param0->unk_04++;
break;
case 6:
@ -1258,7 +1258,7 @@ static void ov78_021D1E44(ChooseStarterApp *param0, int param1)
}
break;
case 2:
ov78_021D1FB4(param0->messageWindow, param1, 360, 1 + param0->cursorPosition, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), 0xff);
ov78_021D1FB4(param0->messageWindow, param1, 360, 1 + param0->cursorPosition, TEXT_COLOR(1, 2, 15), TEXT_SPEED_NO_TRANSFER);
param0->unk_B8 = sub_02002100(param0->bgl, &param0->unk_B0, (512 + (18 + 12) + 128), 1, param1);
param0->unk_08 = 0;
param0->unk_04++;
@ -1284,13 +1284,13 @@ static void ov78_021D1E44(ChooseStarterApp *param0, int param1)
param0->unk_04 = 7;
ov78_021D2508(&param0->unk_6A8, 0);
sub_02007DEC(param0->sprites[param0->cursorPosition], 6, 1);
param0->unk_708 = ov78_021D1FB4(param0->messageWindow, param1, 360, 7, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), 0xff);
param0->unk_708 = ov78_021D1FB4(param0->messageWindow, param1, 360, 7, TEXT_COLOR(1, 2, 15), TEXT_SPEED_NO_TRANSFER);
}
break;
}
}
static u8 ov78_021D1FB4(Window *param0, int param1, int param2, int param3, u32 param4, u32 param5)
static u8 ov78_021D1FB4(Window *param0, int param1, int param2, int param3, TextColor param4, u32 param5)
{
MessageLoader *v0;
Strbuf *v1;
@ -1301,7 +1301,7 @@ static u8 ov78_021D1FB4(Window *param0, int param1, int param2, int param3, u32
v1 = MessageLoader_GetNewStrbuf(v0, param3);
BGL_FillWindow(param0, 15);
v2 = Text_AddPrinterWithParamsAndColor(param0, 1, v1, 0, 0, param5, param4, NULL);
v2 = Text_AddPrinterWithParamsAndColor(param0, FONT_MESSAGE, v1, 0, 0, param5, param4, NULL);
sub_0200E060(param0, 0, 512, 0);
Strbuf_Free(v1);
@ -1322,7 +1322,7 @@ static u8 ov78_021D201C(Window *param0, int param1, int param2, int param3, u32
*param6 = MessageLoader_GetNewStrbuf(v0, param3);
BGL_FillWindow(param0, 15);
v1 = Text_AddPrinterWithParamsAndColor(param0, 1, *param6, 0, 0, param5, param4, NULL);
v1 = Text_AddPrinterWithParamsAndColor(param0, FONT_MESSAGE, *param6, 0, 0, param5, param4, NULL);
sub_0200E060(param0, 0, 512, 0);
MessageLoader_Free(v0);
@ -1757,7 +1757,7 @@ static void MakeSubplaneWindow(ChooseStarterApp *param0, int param1)
}
BGL_AddWindow(param0->bgl, param0->unk_9C[v0], 3, v1, v2, 11, 4, 5, 1 + (64 * v0));
ov78_021D28A8(param0->unk_9C[v0], param1, 360, 4 + v0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0xa & 0xff) << 0))));
ov78_021D28A8(param0->unk_9C[v0], param1, 360, 4 + v0, TEXT_COLOR(1, 2, 10));
}
}
@ -1771,7 +1771,7 @@ static void ov78_021D2884(ChooseStarterApp *param0)
}
}
static void ov78_021D28A8(Window *param0, int param1, int param2, int param3, u32 param4)
static void ov78_021D28A8(Window *param0, int param1, int param2, int param3, TextColor param4)
{
MessageLoader *v0;
Strbuf *v1;
@ -1781,7 +1781,7 @@ static void ov78_021D28A8(Window *param0, int param1, int param2, int param3, u3
v1 = MessageLoader_GetNewStrbuf(v0, param3);
BGL_FillWindow(param0, (((param4) >> 0) & 0xff));
Text_AddPrinterWithParamsAndColor(param0, 0, v1, 1, 0, 0xff, param4, NULL);
Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, v1, 1, 0, TEXT_SPEED_NO_TRANSFER, param4, NULL);
Strbuf_Free(v1);
MessageLoader_Free(v0);
}

2
src/error_message_reset.c
View File

@ -153,7 +153,7 @@ void ErrorMessageReset_PrintErrorAndReset(void)
BGL_WindowColor(&window, 15, 0, 0, 26 * 8, 18 * 8);
Window_Show(&window, 0, (512 - 9), 2);
MessageLoader_GetStrbuf(errorMsgData, v4, errorString);
Text_AddPrinterWithParams(&window, 0, errorString, 0, 0, 0, NULL);
Text_AddPrinterWithParams(&window, FONT_SYSTEM, errorString, 0, 0, TEXT_SPEED_INSTANT, NULL);
Strbuf_Free(errorString);
GXLayers_TurnBothDispOn();

4
src/field_menu.c
View File

@ -682,7 +682,7 @@ static void sub_0203B094(TaskManager *taskMan)
v5 = MessageLoader_GetNewStrbuf(v2, 10);
}
Text_AddPrinterWithParams(&menu->unk_10, 0, v5, 0, 0, 0xff, NULL);
Text_AddPrinterWithParams(&menu->unk_10, FONT_SYSTEM, v5, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL);
Strbuf_Free(v5);
v3 = StringTemplate_Default(11);
@ -700,7 +700,7 @@ static void sub_0203B094(TaskManager *taskMan)
}
StringTemplate_Format(v3, v4, v5);
Text_AddPrinterWithParams(&menu->unk_10, 0, v4, 0, 16, 0xff, NULL);
Text_AddPrinterWithParams(&menu->unk_10, FONT_SYSTEM, v4, 0, 16, TEXT_SPEED_NO_TRANSFER, NULL);
Strbuf_Free(v4);
Strbuf_Free(v5);

7
src/game_options.c
View File

@ -7,6 +7,7 @@
#include "heap.h"
#include "save_player.h"
#include "savedata.h"
#include "text.h"
Options *Options_New(u32 heapID)
{
@ -68,11 +69,11 @@ u8 Options_TextFrameDelay(const Options *options)
int speed = Options_TextSpeed(options);
if (speed == OPTIONS_TEXT_SPEED_SLOW) {
return 8;
return TEXT_SPEED_SLOW;
} else if (speed == OPTIONS_TEXT_SPEED_NORMAL) {
return 4;
return TEXT_SPEED_NORMAL;
} else {
return 1;
return TEXT_SPEED_FAST;
}
}

4
src/overlay005/encounter_effect_core.c
View File

@ -2905,7 +2905,7 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
BGL_AddWindow(encEffect->fieldSystem->unk_08, &v0->unk_2E0, 2, 0, 10, 16, 2, 2, 1);
BGL_FillWindow(&v0->unk_2E0, 0);
v7 = EncounterEffect_GetGymLeaderName(param->trainerID, heapID);
Text_AddPrinterWithParamsAndColor(&v0->unk_2E0, 0, v7, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&v0->unk_2E0, FONT_SYSTEM, v7, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v7);
ov5_021DE47C(&v0->unk_44, 8, 3);
@ -3340,7 +3340,7 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
BGL_AddWindow(encEffect->fieldSystem->unk_08, &v0->unk_358, 2, 21, 13, 11, 2, 2, 1);
BGL_FillWindow(&v0->unk_358, 0);
v9 = EncounterEffect_GetGymLeaderName(param->trainerID, heapID);
Text_AddPrinterWithParamsAndColor(&v0->unk_358, 0, v9, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&v0->unk_358, FONT_SYSTEM, v9, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v9);
}

12
src/overlay005/ov5_021DC018.c
View File

@ -612,7 +612,7 @@ static void ov5_021DCA90(UnkStruct_ov5_021DC1A4 *param0, u16 param1, u32 param2)
BGL_FillWindow(param0->unk_18, 15);
MessageLoader_GetStrbuf(param0->unk_8C, param1, v0);
StringTemplate_Format(param0->unk_90, v1, v0);
Text_AddPrinterWithParams(param0->unk_18, 1, v1, 0, 0, param2, NULL);
Text_AddPrinterWithParams(param0->unk_18, FONT_MESSAGE, v1, 0, 0, param2, NULL);
Strbuf_Free(v0);
Strbuf_Free(v1);
@ -667,7 +667,7 @@ static void ov5_021DCC00(UnkStruct_ov5_021DC1A4 *param0, u16 param1, u8 param2,
MessageLoader_GetStrbuf(param0->unk_8C, param1, v0);
StringTemplate_Format(param0->unk_90, v1, v0);
Text_AddPrinterWithParams(&param0->unk_08, 0, v1, param2, param3, 0xff, NULL);
Text_AddPrinterWithParams(&param0->unk_08, FONT_SYSTEM, v1, param2, param3, TEXT_SPEED_NO_TRANSFER, NULL);
Strbuf_Free(v0);
Strbuf_Free(v1);
@ -826,7 +826,7 @@ Window *ov5_021DCEB0(FieldSystem *fieldSystem, u8 param1, u8 param2)
v1 = MessageLoader_Init(0, 26, 543, 4);
v2 = MessageLoader_GetNewStrbuf(v1, 18);
Text_AddPrinterWithParams(v0, 0, v2, 0, 0, 0xff, NULL);
Text_AddPrinterWithParams(v0, FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL);
MessageLoader_Free(v1);
Strbuf_Free(v2);
}
@ -864,7 +864,7 @@ void ov5_021DCF6C(FieldSystem *fieldSystem, Window *param1)
v5 = (10 * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
Text_AddPrinterWithParams(param1, 0, v2, v5, 16, 0xff, NULL);
Text_AddPrinterWithParams(param1, FONT_SYSTEM, v2, v5, 16, TEXT_SPEED_NO_TRANSFER, NULL);
Strbuf_Free(v3);
Strbuf_Free(v2);
StringTemplate_Free(v1);
@ -913,7 +913,7 @@ void ov5_021DD098(FieldSystem *fieldSystem, Window *param1)
v5 = (10 * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
Text_AddPrinterWithParams(param1, 0, v2, v5, 0, 0xff, NULL);
Text_AddPrinterWithParams(param1, FONT_SYSTEM, v2, v5, 0, TEXT_SPEED_NO_TRANSFER, NULL);
Strbuf_Free(v3);
Strbuf_Free(v2);
StringTemplate_Free(v1);
@ -956,7 +956,7 @@ void ov5_021DD1A4(FieldSystem *fieldSystem, Window *param1)
v5 = (10 * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
Text_AddPrinterWithParams(param1, 0, v2, v5, 0, 0xff, NULL);
Text_AddPrinterWithParams(param1, FONT_SYSTEM, v2, v5, 0, TEXT_SPEED_NO_TRANSFER, NULL);
Strbuf_Free(v3);
Strbuf_Free(v2);
StringTemplate_Free(v1);

2
src/overlay005/ov5_021DD42C.c
View File

@ -171,5 +171,5 @@ static void ov5_021DD6B4(UnkStruct_ov5_021DD648 *param0, int param1, int param2,
static void ov5_021DD6DC(UnkStruct_ov5_021DD648 *param0, int param1)
{
*(param0->unk_14) = Text_AddPrinterWithParams(param0->unk_0C, param1, param0->unk_00, 0, 0, 0, NULL);
*(param0->unk_14) = Text_AddPrinterWithParams(param0->unk_0C, param1, param0->unk_00, 0, 0, TEXT_SPEED_INSTANT, NULL);
}

4
src/overlay005/ov5_021DD6FC.c
View File

@ -213,8 +213,8 @@ static void ov5_021DD954(UnkStruct_ov5_021DD9C8 *param0, const Strbuf *param1)
{
u32 v0;
v0 = (u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0));
Text_AddPrinterWithParamsAndColor(&param0->unk_20, 0, param1, param0->unk_30, (8 * 2), 0, v0, NULL);
v0 = TEXT_COLOR(3, 2, 0);
Text_AddPrinterWithParamsAndColor(&param0->unk_20, FONT_SYSTEM, param1, param0->unk_30, (8 * 2), TEXT_SPEED_INSTANT, v0, NULL);
}
static void ov5_021DD980(UnkStruct_ov5_021DD9C8 *param0)

6
src/overlay005/ov5_021E1D20.c
View File

@ -143,7 +143,7 @@ static void ov5_021E1E20(const UnkStruct_ov5_021E1FF4 *param0)
v2 = 0;
v0 = MessageUtil_ExpandedStrbuf(param0->unk_14, param0->unk_18, Unk_ov5_021F9CCC[0], param0->unk_04);
Text_AddPrinterWithParams(param0->unk_10, 0, v0, 0, v2, 0xff, NULL);
Text_AddPrinterWithParams(param0->unk_10, FONT_SYSTEM, v0, 0, v2, TEXT_SPEED_NO_TRANSFER, NULL);
Strbuf_Free(v0);
for (v4 = 1; v4 < NELEMS(Unk_ov5_021F9CCC); v4++) {
@ -154,13 +154,13 @@ static void ov5_021E1E20(const UnkStruct_ov5_021E1FF4 *param0)
v2 += v3;
v0 = MessageLoader_GetNewStrbuf(param0->unk_18, Unk_ov5_021F9CCC[v4]);
Text_AddPrinterWithParams(param0->unk_10, 0, v0, 0, v2, 0xff, NULL);
Text_AddPrinterWithParams(param0->unk_10, FONT_SYSTEM, v0, 0, v2, TEXT_SPEED_NO_TRANSFER, NULL);
Strbuf_Free(v0);
v0 = MessageUtil_ExpandedStrbuf(param0->unk_14, param0->unk_18, Unk_ov5_021F9CBC[v4 - 1], param0->unk_04);
v1 = 13 * 8 - Font_CalcStrbufWidth(FONT_SYSTEM, v0, Font_GetAttribute(FONT_SYSTEM, FONTATTR_LETTER_SPACING));
Text_AddPrinterWithParams(param0->unk_10, 0, v0, v1, v2, 0xff, NULL);
Text_AddPrinterWithParams(param0->unk_10, FONT_SYSTEM, v0, v1, v2, TEXT_SPEED_NO_TRANSFER, NULL);
Strbuf_Free(v0);
}
}

10
src/overlay006/ov6_02247A0C.c
View File

@ -156,26 +156,26 @@ void *ov6_02247A90(void *param0)
v4 = ov6_02247CF4(v3, 0, 1, (15 * 8));
Text_AddPrinterWithParams(&v0->unk_00, 0, v3, v4, (8 * 0), 0xff, NULL);
Text_AddPrinterWithParams(&v0->unk_00, FONT_SYSTEM, v3, v4, (8 * 0), TEXT_SPEED_NO_TRANSFER, NULL);
Strbuf_Free(v2);
v2 = MessageLoader_GetNewStrbuf(v0->unk_10, 1);
v4 = ov6_02247CF4(v2, 0, 1, (15 * 8));
Text_AddPrinterWithParams(&v0->unk_00, 0, v2, v4, (8 * 2), 0xff, NULL);
Text_AddPrinterWithParams(&v0->unk_00, FONT_SYSTEM, v2, v4, (8 * 2), TEXT_SPEED_NO_TRANSFER, NULL);
Strbuf_Free(v2);
for (v6 = 0; v6 < 5; v6++) {
v2 = MessageLoader_GetNewStrbuf(v0->unk_10, Unk_ov6_022496F4[v6].unk_00);
v4 = ov6_02247CF4(v2, 0, 0, Unk_ov6_022496F4[v6].unk_04);
Text_AddPrinterWithParams(&v0->unk_00, 0, v2, v4, Unk_ov6_022496F4[v6].unk_06, 0xff, NULL);
Text_AddPrinterWithParams(&v0->unk_00, FONT_SYSTEM, v2, v4, Unk_ov6_022496F4[v6].unk_06, TEXT_SPEED_NO_TRANSFER, NULL);
Strbuf_Free(v2);
}
for (v6 = 0; v6 < 4; v6++) {
v2 = MessageLoader_GetNewStrbuf(v0->unk_10, Unk_ov6_022496D4[v6].unk_00);
v4 = ov6_02247CF4(v2, 0, 2, Unk_ov6_022496D4[v6].unk_04);
Text_AddPrinterWithParams(&v0->unk_00, 0, v2, v4, Unk_ov6_022496D4[v6].unk_06, 0xff, NULL);
Text_AddPrinterWithParams(&v0->unk_00, FONT_SYSTEM, v2, v4, Unk_ov6_022496D4[v6].unk_06, TEXT_SPEED_NO_TRANSFER, NULL);
Strbuf_Free(v2);
}
@ -186,7 +186,7 @@ void *ov6_02247A90(void *param0)
StringTemplate_SetNumber(v0->unk_14, 0, v5, 4, 1, 1);
StringTemplate_Format(v0->unk_14, v3, v2);
v4 = ov6_02247CF4(v3, 0, 2, Unk_ov6_0224971C[v7][v6].unk_04);
Text_AddPrinterWithParams(&v0->unk_00, 0, v3, v4, Unk_ov6_0224971C[v7][v6].unk_06, 0xff, NULL);
Text_AddPrinterWithParams(&v0->unk_00, FONT_SYSTEM, v3, v4, Unk_ov6_0224971C[v7][v6].unk_06, TEXT_SPEED_NO_TRANSFER, NULL);
Strbuf_Free(v2);
}
}

16
src/overlay007/communication_club.c
View File

@ -196,7 +196,7 @@ static inline void CommClubMan_PrintMessageFastSpeed(int msgId, BOOL format)
RenderControlFlags_SetCanABSpeedUpPrint(TRUE);
RenderControlFlags_SetAutoScrollFlags(0);
RenderControlFlags_SetSpeedUpOnTouch(FALSE);
sCommClubMan->printMsgIndex = Text_AddPrinterWithParams(&sCommClubMan->msgWindow, FONT_MESSAGE, sCommClubMan->strBuff[5], 0, 0, 1, NULL);
sCommClubMan->printMsgIndex = Text_AddPrinterWithParams(&sCommClubMan->msgWindow, FONT_MESSAGE, sCommClubMan->strBuff[5], 0, 0, TEXT_SPEED_FAST, NULL);
}
static void CommClubMan_CreateList(UnkStruct_ov84_02240FA8 param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5)
@ -346,20 +346,20 @@ static void ov7_02249C94(BmpList *param0, u32 param1, u8 param2)
MessageLoader_GetStrbuf(sCommClubMan->msgLoader, pl_msg_00000353_00063, sCommClubMan->strBuff[1]);
StringTemplate_Format(sCommClubMan->unk_50, sCommClubMan->strBuff[0], sCommClubMan->strBuff[1]);
Text_AddPrinterWithParams(&sCommClubMan->unk_20, 0, sCommClubMan->strBuff[0], 8, param2 * 16, 0xff, NULL);
Text_AddPrinterWithParams(&sCommClubMan->unk_20, FONT_SYSTEM, sCommClubMan->strBuff[0], 8, param2 * 16, TEXT_SPEED_NO_TRANSFER, NULL);
StringTemplate_SetNumber(sCommClubMan->unk_50, 2, TrainerInfo_ID(sCommClubMan->unk_7C) % 0x10000, 5, 2, 1);
// ID {ID Number}
MessageLoader_GetStrbuf(sCommClubMan->msgLoader, pl_msg_00000353_00065, sCommClubMan->strBuff[3]);
StringTemplate_Format(sCommClubMan->unk_50, sCommClubMan->strBuff[2], sCommClubMan->strBuff[3]);
Text_AddPrinterWithParams(&sCommClubMan->unk_20, 0, sCommClubMan->strBuff[2], 11 * 8, param2 * 16, 0xff, NULL);
Text_AddPrinterWithParams(&sCommClubMan->unk_20, FONT_SYSTEM, sCommClubMan->strBuff[2], 11 * 8, param2 * 16, TEXT_SPEED_NO_TRANSFER, NULL);
} else {
StringTemplate_SetNumber(sCommClubMan->unk_50, 0, cnt + 1, 2, 2, 1);
MessageLoader_GetStrbuf(sCommClubMan->msgLoader, pl_msg_00000353_00064, sCommClubMan->strBuff[1]);
StringTemplate_Format(sCommClubMan->unk_50, sCommClubMan->strBuff[0], sCommClubMan->strBuff[1]);
Text_AddPrinterWithParams(&sCommClubMan->unk_20, 0, sCommClubMan->strBuff[0], 8, param2 * 16, 0xff, NULL);
Text_AddPrinterWithParams(&sCommClubMan->unk_20, FONT_SYSTEM, sCommClubMan->strBuff[0], 8, param2 * 16, TEXT_SPEED_NO_TRANSFER, NULL);
}
}
@ -430,7 +430,7 @@ static void CommClubMan_DisplayPersonalTrainerInfo(CommClubManager *param0)
StringTemplate_SetNumber(sCommClubMan->unk_54, 1, TrainerInfo_ID(sCommClubMan->trainerInfoPersonal) % 0x10000, 5, 2, 1);
MessageLoader_GetStrbuf(sCommClubMan->msgLoader, pl_msg_00000353_00062, sCommClubMan->strBuff[6]);
StringTemplate_Format(sCommClubMan->unk_54, sCommClubMan->strBuff[7], sCommClubMan->strBuff[6]);
Text_AddPrinterWithParams(&sCommClubMan->unk_30, 0, sCommClubMan->strBuff[7], 2, 2, 0, NULL);
Text_AddPrinterWithParams(&sCommClubMan->unk_30, FONT_SYSTEM, sCommClubMan->strBuff[7], 2, 2, TEXT_SPEED_INSTANT, NULL);
}
static void ov7_02249F54(SysTask *task, void *data)
@ -664,13 +664,13 @@ static void ov7_0224A438(BmpList *param0, u32 param1, u8 param2)
MessageLoader_GetStrbuf(sCommClubMan->msgLoader, pl_msg_00000353_00066, sCommClubMan->strBuff[1]);
StringTemplate_Format(sCommClubMan->unk_50, sCommClubMan->strBuff[0], sCommClubMan->strBuff[1]);
Text_AddPrinterWithParams(&sCommClubMan->unk_20, 0, sCommClubMan->strBuff[0], 8, param2 * 16, 0, NULL);
Text_AddPrinterWithParams(&sCommClubMan->unk_20, FONT_SYSTEM, sCommClubMan->strBuff[0], 8, param2 * 16, TEXT_SPEED_INSTANT, NULL);
StringTemplate_SetNumber(sCommClubMan->unk_50, 2, TrainerInfo_ID_LowHalf(CommInfo_TrainerInfo(v0)), 5, 2, 1);
MessageLoader_GetStrbuf(sCommClubMan->msgLoader, pl_msg_00000353_00065, sCommClubMan->strBuff[3]);
StringTemplate_Format(sCommClubMan->unk_50, sCommClubMan->strBuff[2], sCommClubMan->strBuff[3]);
Text_AddPrinterWithParams(&sCommClubMan->unk_20, 0, sCommClubMan->strBuff[2], 9 * 8, param2 * 16, 0, NULL);
Text_AddPrinterWithParams(&sCommClubMan->unk_20, FONT_SYSTEM, sCommClubMan->strBuff[2], 9 * 8, param2 * 16, TEXT_SPEED_INSTANT, NULL);
}
}
@ -780,7 +780,7 @@ static void ov7_0224A64C(CommClubManager *commClubMan)
MessageLoader_GetStrbuf(sCommClubMan->msgLoader, msg, sCommClubMan->strBuff[7]);
StringTemplate_Format(sCommClubMan->unk_54, sCommClubMan->strBuff[6], sCommClubMan->strBuff[7]);
Text_AddPrinterWithParams(&sCommClubMan->unk_30, 0, sCommClubMan->strBuff[6], 2, 2, 0, NULL);
Text_AddPrinterWithParams(&sCommClubMan->unk_30, FONT_SYSTEM, sCommClubMan->strBuff[6], 2, 2, TEXT_SPEED_INSTANT, NULL);
}
static void CommClubMan_PrintPlayerContactMsg(int netId, CommClubManager *commClubMan)

6
src/overlay007/ov7_0224B4E8.c
View File

@ -344,11 +344,11 @@ static void ov7_0224B8DC(UnkStruct_ov7_0224B4E8 *param0)
MessageLoader_GetStrbuf(v0, 95, v2);
StringTemplate_Format(v1, v3, v2);
Text_AddPrinterWithParams(v4, 0, v3, v10 + v12, 0, 0xff, NULL);
Text_AddPrinterWithParams(v4, FONT_SYSTEM, v3, v10 + v12, 0, TEXT_SPEED_NO_TRANSFER, NULL);
for (v5 = 0; v5 < 9; v5++) {
MessageLoader_GetStrbuf(v0, 75 + v5, v2);
Text_AddPrinterWithParams(v4, 0, v2, v10, v9 + v11 * v5, 0xff, NULL);
Text_AddPrinterWithParams(v4, FONT_SYSTEM, v2, v10, v9 + v11 * v5, TEXT_SPEED_NO_TRANSFER, NULL);
}
for (v5 = 0; v5 < 9; v5++) {
@ -409,7 +409,7 @@ static void ov7_0224B8DC(UnkStruct_ov7_0224B4E8 *param0)
int v14 = Font_CalcStrbufWidth(FONT_SYSTEM, v3, 0);
int v15 = v13 - v14;
Text_AddPrinterWithParams(v4, 0, v3, v15, v9 + v11 * v5, 0xff, NULL);
Text_AddPrinterWithParams(v4, FONT_SYSTEM, v3, v15, v9 + v11 * v5, TEXT_SPEED_NO_TRANSFER, NULL);
}
}

4
src/overlay007/ov7_0224BE9C.c
View File

@ -427,7 +427,7 @@ static void ov7_0224C468(UnkStruct_ov7_0224C3EC *param0, Strbuf *param1, u32 par
BGL_FillWindow(param0->unk_04, 15);
param0->unk_10 = Strbuf_Clone(param1, param2);
param0->unk_0C = Text_AddPrinterWithParamsAndColor(param0->unk_04, 1, param0->unk_10, 0, 0, param0->unk_08, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
param0->unk_0C = Text_AddPrinterWithParamsAndColor(param0->unk_04, FONT_MESSAGE, param0->unk_10, 0, 0, param0->unk_08, TEXT_COLOR(1, 2, 15), NULL);
sub_0201A954(param0->unk_04);
}
@ -553,7 +553,7 @@ static void ov7_0224C6DC(UnkStruct_ov7_0224C620 *param0, u32 param1, u32 param2,
for (v0 = 0; v0 < 3; v0++) {
StringTemplate_Format(param0->unk_08, param0->unk_0C, param0->unk_10[v0]);
Text_AddPrinterWithParamsAndColor(param0->unk_04, 0, param0->unk_0C, 0, 16 * v0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(param0->unk_04, FONT_SYSTEM, param0->unk_0C, 0, 16 * v0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL);
}
Window_Show(param0->unk_04, 0, (1 + (18 + 12)), 11);

18
src/overlay007/ov7_0224CD28.c
View File

@ -688,7 +688,7 @@ static void ov7_0224D85C(BmpList *param0, u32 param1, u8 param2)
MessageLoader_Free(v3);
}
Text_AddPrinterWithParamsAndColor(&v0->unk_08[1], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&v0->unk_08[1], FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
ov7_0224EB7C(v0, (u16)param1);
@ -750,7 +750,7 @@ static void ov7_0224D9B8(BmpList *param0, u32 param1, u8 param2)
v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0);
Text_AddPrinterWithParamsAndColor(&v0->unk_08[0], 0, v1, (19 * 8) - v4, param2, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&v0->unk_08[0], FONT_SYSTEM, v1, (19 * 8) - v4, param2, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v2);
Strbuf_Free(v1);
}
@ -759,7 +759,7 @@ static void ov7_0224D9B8(BmpList *param0, u32 param1, u8 param2)
Strbuf *v6 = MessageLoader_GetNewStrbuf(v0->unk_88, 8);
BGL_WindowColor(&v0->unk_08[0], 15, 0, param2, 19 * 8, 16);
Text_AddPrinterWithParamsAndColor(&v0->unk_08[0], 0, v6, 0, param2, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&v0->unk_08[0], FONT_SYSTEM, v6, 0, param2, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v6);
}
}
@ -789,7 +789,7 @@ static void ov7_0224DAF8(UnkStruct_ov7_0224D008 *param0, u8 param1)
v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v0, 0);
Text_AddPrinterWithParams(&param0->unk_08[2], 0, v0, (9 * 8) - v3 - 8, 0, 0xff, NULL);
Text_AddPrinterWithParams(&param0->unk_08[2], FONT_SYSTEM, v0, (9 * 8) - v3 - 8, 0, TEXT_SPEED_NO_TRANSFER, NULL);
} else {
if (param1 == 0) {
BGL_FillWindow(&param0->unk_08[2], 15);
@ -797,7 +797,7 @@ static void ov7_0224DAF8(UnkStruct_ov7_0224D008 *param0, u8 param1)
v1 = MessageLoader_GetNewStrbuf(param0->unk_88, 18);
Text_AddPrinterWithParams(&param0->unk_08[2], 0, v1, 0, 0, 0xff, NULL);
Text_AddPrinterWithParams(&param0->unk_08[2], FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL);
Strbuf_Free(v1);
} else {
BGL_WindowColor(&param0->unk_08[2], 15, 0, 16, (9 * 8), 16);
@ -812,7 +812,7 @@ static void ov7_0224DAF8(UnkStruct_ov7_0224D008 *param0, u8 param1)
v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v0, 0);
Text_AddPrinterWithParams(&param0->unk_08[2], 0, v0, (9 * 8) - v3, 16, 0xff, NULL);
Text_AddPrinterWithParams(&param0->unk_08[2], FONT_SYSTEM, v0, (9 * 8) - v3, 16, TEXT_SPEED_NO_TRANSFER, NULL);
}
Strbuf_Free(v1);
@ -955,7 +955,7 @@ static void ov7_0224DED4(UnkStruct_ov7_0224D008 *param0)
StringTemplate_SetNumber(param0->unk_8C, 0, v2, 3, 1, 1);
StringTemplate_Format(param0->unk_8C, v0, v1);
Text_AddPrinterWithParams(&param0->unk_08[4], 0, v0, 0, 0, 0xff, NULL);
Text_AddPrinterWithParams(&param0->unk_08[4], FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL);
Strbuf_Free(v1);
Strbuf_Free(v0);
sub_0201A9A4(&param0->unk_08[4]);
@ -1087,7 +1087,7 @@ static void ov7_0224E28C(UnkStruct_ov7_0224D008 *param0, u8 param1)
StringTemplate_SetNumber(param0->unk_8C, 0, param0->unk_2AC, 2, 2, 1);
StringTemplate_Format(param0->unk_8C, v0, v1);
Text_AddPrinterWithParams(&param0->unk_08[3], 0, v0, 0, 8, 0xff, NULL);
Text_AddPrinterWithParams(&param0->unk_08[3], FONT_SYSTEM, v0, 0, 8, TEXT_SPEED_NO_TRANSFER, NULL);
Strbuf_Free(v1);
if (param0->unk_2A9 == 3) {
@ -1101,7 +1101,7 @@ static void ov7_0224E28C(UnkStruct_ov7_0224D008 *param0, u8 param1)
v2 = Font_CalcStrbufWidth(FONT_SYSTEM, v0, 0);
Text_AddPrinterWithParams(&param0->unk_08[3], 0, v0, (12 * 8) - v2, 8, 0xff, NULL);
Text_AddPrinterWithParams(&param0->unk_08[3], FONT_SYSTEM, v0, (12 * 8) - v2, 8, TEXT_SPEED_NO_TRANSFER, NULL);
Strbuf_Free(v1);
Strbuf_Free(v0);
sub_0201A9A4(&param0->unk_08[3]);

20
src/overlay010/ov10_0221F800.c
View File

@ -483,7 +483,7 @@ static void ov10_0221F930(UnkStruct_ov10_0221FB28 *param0)
case 1:
ov10_022229D4(param0);
MessageLoader_GetStrbuf(param0->unk_BA0, 0, param0->unk_BA8);
param0->unk_BAC = Text_AddPrinterWithParams(&param0->unk_B7C, 1, param0->unk_BA8, 0, 0, 0, NULL);
param0->unk_BAC = Text_AddPrinterWithParams(&param0->unk_B7C, FONT_MESSAGE, param0->unk_BA8, 0, 0, TEXT_SPEED_INSTANT, NULL);
sub_0201C3C0(param0->unk_0C, 0);
param0->unk_BB0 = 2;
break;
@ -504,7 +504,7 @@ static void ov10_0221F930(UnkStruct_ov10_0221FB28 *param0)
BGL_WindowColor(&param0->unk_B8C, 15, 0, 0, 27 * 8, 4 * 8);
sub_0200E060(&param0->unk_B8C, 0, 1, 15);
param0->unk_BAC = Text_AddPrinterWithParams(&param0->unk_B8C, 1, param0->unk_BA8, 0, 0, 0, NULL);
param0->unk_BAC = Text_AddPrinterWithParams(&param0->unk_B8C, FONT_MESSAGE, param0->unk_BA8, 0, 0, TEXT_SPEED_INSTANT, NULL);
param0->unk_BB4 = sub_02002054(param0->unk_0C, &Unk_ov10_02222A68, (1 + (18 + 12)), 14, 1, param0->unk_00->unk_24);
sub_0201C3C0(param0->unk_0C, 0);
@ -527,7 +527,7 @@ static void ov10_0221F930(UnkStruct_ov10_0221FB28 *param0)
case 5:
ov10_022229D4(param0);
MessageLoader_GetStrbuf(param0->unk_BA0, 5, param0->unk_BA8);
param0->unk_BAC = Text_AddPrinterWithParams(&param0->unk_B7C, 1, param0->unk_BA8, 0, 0, 0, NULL);
param0->unk_BAC = Text_AddPrinterWithParams(&param0->unk_B7C, FONT_MESSAGE, param0->unk_BA8, 0, 0, TEXT_SPEED_INSTANT, NULL);
sub_0201C3C0(param0->unk_0C, 0);
param0->unk_BB0 = 6;
break;
@ -1023,7 +1023,7 @@ static u8 ov10_02220700(UnkStruct_ov10_0221FB28 *param0)
case 0:
ov10_022229D4(param0);
MessageLoader_GetStrbuf(param0->unk_BA0, 8, param0->unk_BA8);
param0->unk_BAC = Text_AddPrinterWithParams(&param0->unk_B7C, 1, param0->unk_BA8, 0, 0, 0, NULL);
param0->unk_BAC = Text_AddPrinterWithParams(&param0->unk_B7C, FONT_MESSAGE, param0->unk_BA8, 0, 0, TEXT_SPEED_INSTANT, NULL);
ov10_02222A28(param0);
param0->unk_B76++;
break;
@ -1044,7 +1044,7 @@ static u8 ov10_02220700(UnkStruct_ov10_0221FB28 *param0)
ov10_02222A48(param0);
BGL_WindowColor(&param0->unk_B7C, 15, 0, 0, 27 * 8, 4 * 8);
param0->unk_BAC = Text_AddPrinterWithParams(&param0->unk_B7C, 1, param0->unk_BA8, 0, 0, 0, NULL);
param0->unk_BAC = Text_AddPrinterWithParams(&param0->unk_B7C, FONT_MESSAGE, param0->unk_BA8, 0, 0, TEXT_SPEED_INSTANT, NULL);
}
param0->unk_B75 = 0;
@ -1076,7 +1076,7 @@ static u8 ov10_022208B0(UnkStruct_ov10_0221FB28 *param0)
case 0:
ov10_022229D4(param0);
MessageLoader_GetStrbuf(param0->unk_BA0, 9, param0->unk_BA8);
param0->unk_BAC = Text_AddPrinterWithParams(&param0->unk_B7C, 1, param0->unk_BA8, 0, 0, 0, NULL);
param0->unk_BAC = Text_AddPrinterWithParams(&param0->unk_B7C, FONT_MESSAGE, param0->unk_BA8, 0, 0, TEXT_SPEED_INSTANT, NULL);
CommTiming_StartSync(62);
if (param0->unk_BBC == 0) {
@ -1578,7 +1578,7 @@ static void ov10_0222130C(UnkStruct_ov10_0221FB28 *param0, u32 param1, Strbuf *p
v0 = &param0->unk_10[0];
BGL_AddFramelessWindow(param0->unk_0C, v0, 8, 2, 0, 0);
Text_AddPrinterWithParamsAndColor(v0, 0, param2, 0, 0, 0xff, (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, param2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 4, 0), NULL);
v1.unk_00 = param0->unk_B38;
v1.unk_04 = v0;
@ -2273,15 +2273,15 @@ static void ov10_02222400(UnkStruct_ov10_0221FB28 *param0, MessageLoader *param1
StringTemplate_SetNickname(param3, 0, Pokemon_GetBoxPokemon(v0));
StringTemplate_Format(param3, param4, v2);
Strbuf_Free(v2);
Text_AddPrinterWithParamsAndColor(v1, 0, param4, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, param4, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
if (param0->unk_214[param5].unk_0E == 0) {
if (param0->unk_214[param5].unk_0D == 0) {
MessageLoader_GetStrbuf(param1, 27, param4);
Text_AddPrinterWithParamsAndColor(v1, 0, param4, 64, 0, 0xff, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, param4, 64, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 4, 0), NULL);
} else if (param0->unk_214[param5].unk_0D == 1) {
MessageLoader_GetStrbuf(param1, 28, param4);
Text_AddPrinterWithParamsAndColor(v1, 0, param4, 64, 0, 0xff, ((u32)(((5 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, param4, 64, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(5, 6, 0), NULL);
}
}
}

132
src/overlay013/ov13_02221A88.c
View File

@ -323,9 +323,9 @@ static void ov13_02221C54(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
StringTemplate_Format(param0->unk_1FA8, v2, v3);
if (param2 == 0) {
Text_AddPrinterWithParamsAndColor(v0, param2, v2, param4, param5, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, param2, v2, param4, param5, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
} else {
Text_AddPrinterWithParamsAndColor(v0, param2, v2, param4, param5, 0xff, ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((9 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, param2, v2, param4, param5, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(7, 8, 9), NULL);
}
Strbuf_Free(v3);
@ -337,9 +337,9 @@ static void ov13_02221C54(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
v4 = sub_0201C294(v0) * 8 - Font_CalcStrbufWidth(FONT_SYSTEM, v3, 0);
if (param2 == 0) {
Text_AddPrinterWithParamsAndColor(v0, 0, v3, v4, param5, 0xff, ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v3, v4, param5, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(7, 8, 0), NULL);
} else {
Text_AddPrinterWithParamsAndColor(v0, 0, v3, v4, param5, 0xff, ((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v3, v4, param5, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(10, 11, 0), NULL);
}
Strbuf_Free(v3);
@ -348,9 +348,9 @@ static void ov13_02221C54(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
v4 = sub_0201C294(v0) * 8 - Font_CalcStrbufWidth(FONT_SYSTEM, v3, 0);
if (param2 == 0) {
Text_AddPrinterWithParamsAndColor(v0, 0, v3, v4, param5, 0xff, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v3, v4, param5, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 4, 0), NULL);
} else {
Text_AddPrinterWithParamsAndColor(v0, 0, v3, v4, param5, 0xff, ((u32)(((12 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v3, v4, param5, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(12, 13, 0), NULL);
}
Strbuf_Free(v3);
@ -422,7 +422,7 @@ static void ov13_02221FA8(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
StringTemplate_SetAbilityName(param0->unk_1FA8, 0, v0->unk_18);
StringTemplate_Format(param0->unk_1FA8, v1, v2);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[param1], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[param1], FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v2);
Strbuf_Free(v1);
sub_0201A9A4(&param0->unk_206C[param1]);
@ -447,12 +447,12 @@ static void ov13_02222030(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
Strbuf_Free(v2);
}
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[param1], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[param1], FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
sub_0201A9A4(&param0->unk_206C[param1]);
}
static void ov13_022220CC(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2, u32 param3, u16 param4, u16 param5, u32 param6)
static void ov13_022220CC(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2, u32 param3, u16 param4, u16 param5, TextColor param6)
{
Window *v0;
Strbuf *v1;
@ -472,7 +472,7 @@ static void ov13_022220CC(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
v3 = 0;
}
Text_AddPrinterWithParamsAndColor(v0, param4, v1, v3, param5, 0xff, param6, NULL);
Text_AddPrinterWithParamsAndColor(v0, param4, v1, v3, param5, TEXT_SPEED_NO_TRANSFER, param6, NULL);
Strbuf_Free(v2);
Strbuf_Free(v1);
sub_0201A9A4(v0);
@ -484,7 +484,7 @@ static void ov13_02222170(UnkStruct_ov13_022213F0 *param0, u16 param1, u8 param2
v0 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 14);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[param1], 0, v0, param2, param3, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[param1], FONT_SYSTEM, v0, param2, param3, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v0);
sub_0201A9A4(&param0->unk_206C[param1]);
}
@ -498,7 +498,7 @@ static void ov13_022221C8(UnkStruct_ov13_022213F0 *param0, u32 param1)
v0 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, param1);
Text_AddPrinterWithParamsAndColor(&param0->unk_204C[0], 1, v0, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_204C[0], FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v0);
sub_0201A9A4(&param0->unk_204C[0]);
}
@ -513,7 +513,7 @@ static void ov13_0222222C(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, param2);
v2 = Font_CalcStrbufWidth(FONT_SUBSCREEN, v1, 0);
Text_AddPrinterWithParamsAndColor(v0, 2, v1, (sub_0201C294(v0) * 8 - v2) / 2, 6, 0xff, ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((9 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SUBSCREEN, v1, (sub_0201C294(v0) * 8 - v2) / 2, 6, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(7, 8, 9), NULL);
Strbuf_Free(v1);
sub_0201A9A4(v0);
}
@ -530,7 +530,7 @@ static void ov13_02222290(UnkStruct_ov13_022213F0 *param0, u32 param1)
v4 = 22 * param0->unk_2071;
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 23);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[19], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[19], FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 24);
@ -538,13 +538,13 @@ static void ov13_02222290(UnkStruct_ov13_022213F0 *param0, u32 param1)
StringTemplate_SetNumber(param0->unk_1FA8, 0, v0->unk_16_0, 3, 0, 1);
StringTemplate_Format(param0->unk_1FA8, v2, v1);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[11 + v4], 0, v2, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[11 + v4], FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 25);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[20], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[20], FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 26);
@ -562,7 +562,7 @@ static void ov13_02222290(UnkStruct_ov13_022213F0 *param0, u32 param1)
v3 = sub_0201C294(&param0->unk_206C[12 + v4]) * 8 - Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[12 + v4], 0, v2, v3, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[12 + v4], FONT_SYSTEM, v2, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
sub_0201A9A4(&param0->unk_206C[19]);
@ -584,7 +584,7 @@ static void ov13_02222464(UnkStruct_ov13_022213F0 *param0, u32 param1)
v3 = 22 * param0->unk_2071;
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 32);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[14], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[14], FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 33);
@ -596,7 +596,7 @@ static void ov13_02222464(UnkStruct_ov13_022213F0 *param0, u32 param1)
v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
v5 = sub_0201C294(&param0->unk_206C[5 + v3]) * 8 - v4;
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[5 + v3], 0, v2, v5, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[5 + v3], FONT_SYSTEM, v2, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
sub_0201A9A4(&param0->unk_206C[14]);
@ -616,7 +616,7 @@ static void ov13_02222560(UnkStruct_ov13_022213F0 *param0, u32 param1)
v3 = 22 * param0->unk_2071;
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 34);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[15], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[15], FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 35);
@ -628,7 +628,7 @@ static void ov13_02222560(UnkStruct_ov13_022213F0 *param0, u32 param1)
v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
v5 = sub_0201C294(&param0->unk_206C[6 + v3]) * 8 - v4;
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[6 + v3], 0, v2, v5, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[6 + v3], FONT_SYSTEM, v2, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
sub_0201A9A4(&param0->unk_206C[15]);
@ -648,7 +648,7 @@ static void ov13_0222265C(UnkStruct_ov13_022213F0 *param0, u32 param1)
v3 = 22 * param0->unk_2071;
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 40);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[16], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[16], FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 41);
@ -660,7 +660,7 @@ static void ov13_0222265C(UnkStruct_ov13_022213F0 *param0, u32 param1)
v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
v5 = sub_0201C294(&param0->unk_206C[7 + v3]) * 8 - v4;
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[7 + v3], 0, v2, v5, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[7 + v3], FONT_SYSTEM, v2, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
@ -681,7 +681,7 @@ static void ov13_0222275C(UnkStruct_ov13_022213F0 *param0, u32 param1)
v3 = 22 * param0->unk_2071;
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 36);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[17], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[17], FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 37);
@ -693,7 +693,7 @@ static void ov13_0222275C(UnkStruct_ov13_022213F0 *param0, u32 param1)
v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
v5 = sub_0201C294(&param0->unk_206C[8 + v3]) * 8 - v4;
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[8 + v3], 0, v2, v5, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[8 + v3], FONT_SYSTEM, v2, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
sub_0201A9A4(&param0->unk_206C[17]);
@ -713,7 +713,7 @@ static void ov13_0222285C(UnkStruct_ov13_022213F0 *param0, u32 param1)
v3 = 22 * param0->unk_2071;
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 38);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[18], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[18], FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 39);
@ -725,7 +725,7 @@ static void ov13_0222285C(UnkStruct_ov13_022213F0 *param0, u32 param1)
v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
v5 = sub_0201C294(&param0->unk_206C[9 + v3]) * 8 - v4;
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[9 + v3], 0, v2, v5, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[9 + v3], FONT_SYSTEM, v2, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
sub_0201A9A4(&param0->unk_206C[18]);
@ -745,14 +745,14 @@ static void ov13_0222295C(UnkStruct_ov13_022213F0 *param0, u32 param1)
v6 = 22 * param0->unk_2071;
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 28);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[13], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[13], FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 31);
v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0);
v5 = (sub_0201C294(&param0->unk_206C[4]) * 8 - v3) / 2;
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[4 + v6], 0, v1, v5, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[4 + v6], FONT_SYSTEM, v1, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 29);
@ -763,7 +763,7 @@ static void ov13_0222295C(UnkStruct_ov13_022213F0 *param0, u32 param1)
v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[4 + v6], 0, v2, v5 - v4, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[4 + v6], FONT_SYSTEM, v2, v5 - v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
@ -772,7 +772,7 @@ static void ov13_0222295C(UnkStruct_ov13_022213F0 *param0, u32 param1)
StringTemplate_SetNumber(param0->unk_1FA8, 0, v0->unk_12, 3, 0, 1);
StringTemplate_Format(param0->unk_1FA8, v2, v1);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[4 + v6], 0, v2, v5 + v3, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[4 + v6], FONT_SYSTEM, v2, v5 + v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
sub_0201A9A4(&param0->unk_206C[13]);
@ -791,7 +791,7 @@ static void ov13_02222AF4(UnkStruct_ov13_022213F0 *param0, u32 param1)
v1 = MessageLoader_Init(1, 26, 612, param0->unk_00->unk_0C);
v2 = MessageLoader_GetNewStrbuf(v1, v0->unk_18);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[2 + v3], 0, v2, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[2 + v3], FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v2);
MessageLoader_Free(v1);
sub_0201A9A4(&param0->unk_206C[2 + v3]);
@ -805,7 +805,7 @@ static void ov13_02222B6C(UnkStruct_ov13_022213F0 *param0, u32 param1)
v0 = &param0->unk_206C[param1];
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 51);
Text_AddPrinterWithParamsAndColor(v0, 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
sub_0201A9A4(v0);
}
@ -825,7 +825,7 @@ static void ov13_02222BB4(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0);
v4 = sub_0201C294(v0) * 8 - v3;
Text_AddPrinterWithParamsAndColor(v0, 0, v1, v4, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
} else {
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 52);
@ -837,7 +837,7 @@ static void ov13_02222BB4(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
v4 = sub_0201C294(v0) * 8 - v3;
Text_AddPrinterWithParamsAndColor(v0, 0, v2, v4, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
}
@ -853,7 +853,7 @@ static void ov13_02222C9C(UnkStruct_ov13_022213F0 *param0, u32 param1)
v0 = &param0->unk_206C[param1];
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 48);
Text_AddPrinterWithParamsAndColor(v0, 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
sub_0201A9A4(v0);
}
@ -873,7 +873,7 @@ static void ov13_02222CE4(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0);
v4 = sub_0201C294(v0) * 8 - v3;
Text_AddPrinterWithParamsAndColor(v0, 0, v1, v4, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
} else {
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 49);
@ -885,7 +885,7 @@ static void ov13_02222CE4(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
v4 = sub_0201C294(v0) * 8 - v3;
Text_AddPrinterWithParamsAndColor(v0, 0, v2, v4, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
}
@ -903,7 +903,7 @@ static void ov13_02222DCC(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
v0 = MessageLoader_Init(1, 26, 646, param0->unk_00->unk_0C);
v2 = MessageLoader_GetNewStrbuf(v0, param2);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v2);
MessageLoader_Free(v0);
sub_0201A9A4(v1);
@ -923,7 +923,7 @@ static void ov13_02222E2C(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
v0 = MessageLoader_Init(0, 26, 210, param0->unk_00->unk_0C);
v2 = MessageLoader_GetNewStrbuf(v0, v4);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v2);
MessageLoader_Free(v0);
@ -942,7 +942,7 @@ static void ov13_02222E94(UnkStruct_ov13_022213F0 *param0, u32 param1)
v2 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0);
v3 = (sub_0201C294(v0) * 8 - v2) / 2;
Text_AddPrinterWithParamsAndColor(v0, 0, v1, v3, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
sub_0201A9A4(v0);
}
@ -967,7 +967,7 @@ static void ov13_02222EF8(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
{
u32 v2 = Font_CalcCenterAlignment(FONT_SYSTEM, v1, 0, 7 * 8);
Text_AddPrinterWithParamsAndColor(v0, 0, v1, v2, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v2, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
}
Strbuf_Free(v1);
@ -987,7 +987,7 @@ static void ov13_02222F74(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0);
v5 = (sub_0201C294(v0) * 8 - v3) / 2;
Text_AddPrinterWithParamsAndColor(v0, 0, v1, v5, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 44);
@ -998,7 +998,7 @@ static void ov13_02222F74(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
Text_AddPrinterWithParamsAndColor(v0, 0, v2, v5 - v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v2, v5 - v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
@ -1007,7 +1007,7 @@ static void ov13_02222F74(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
StringTemplate_SetNumber(param0->unk_1FA8, 0, param3, 3, 0, 1);
StringTemplate_Format(param0->unk_1FA8, v2, v1);
Text_AddPrinterWithParamsAndColor(v0, 0, v2, v5 + v3, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v2, v5 + v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
sub_0201A9A4(v0);
@ -1029,7 +1029,7 @@ static void ov13_022230A8(UnkStruct_ov13_022213F0 *param0, u32 param1)
v2 = Font_CalcStrbufWidth(FONT_SUBSCREEN, v1, 0);
Text_AddPrinterWithParamsAndColor(v0, 2, v1, (12 * 8 - v2) / 2, 6, 0xff, ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((9 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SUBSCREEN, v1, (12 * 8 - v2) / 2, 6, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(7, 8, 9), NULL);
Strbuf_Free(v1);
sub_0201A9A4(v0);
}
@ -1049,7 +1049,7 @@ void ov13_02223118(UnkStruct_ov13_022213F0 *param0)
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 60);
Text_AddPrinterWithParamsAndColor(v0, 0, v1, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
sub_0201A9A4(v0);
}
@ -1065,20 +1065,20 @@ static void ov13_0222317C(UnkStruct_ov13_022213F0 *param0, UnkStruct_ov13_022236
v2 = Strbuf_Init((2 + 1) * 2, param0->unk_00->unk_0C);
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 43);
Text_AddPrinterWithParamsAndColor(v0, 0, v1, 40, 24, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 40, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 46);
v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0);
Text_AddPrinterWithParamsAndColor(v0, 0, v1, 80, 24, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 80, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 45);
StringTemplate_SetNumber(param0->unk_1FA8, 0, param1->unk_03, 2, 0, 1);
StringTemplate_Format(param0->unk_1FA8, v2, v1);
Text_AddPrinterWithParamsAndColor(v0, 0, v2, 80 + v3, 24, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v2, 80 + v3, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 44);
@ -1088,7 +1088,7 @@ static void ov13_0222317C(UnkStruct_ov13_022213F0 *param0, UnkStruct_ov13_022236
v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
Text_AddPrinterWithParamsAndColor(v0, 0, v2, 80 - v3, 24, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v2, 80 - v3, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
sub_0201A9A4(v0);
@ -1116,7 +1116,7 @@ static void ov13_022232C8(UnkStruct_ov13_022213F0 *param0, UnkStruct_ov13_022236
v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
Text_AddPrinterWithParamsAndColor(v0, 0, v2, 80 - v3, 24, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v2, 80 - v3, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
sub_0201A9A4(v0);
@ -1231,16 +1231,16 @@ static void ov13_02223550(UnkStruct_ov13_022213F0 *param0, u32 param1)
v7 = (sub_0201C294(v0) * 8 - v4 - v5 - v6) / 2;
Text_AddPrinterWithParamsAndColor(v0, 2, v2, v7, 8, 0xff, ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((9 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SUBSCREEN, v2, v7, 8, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(7, 8, 9), NULL);
Strbuf_Free(v2);
if (v3 != NULL) {
if (v1->unk_17_0 == 0) {
Text_AddPrinterWithParamsAndColor(
v0, 0, v3, v7 + v4 + v6, 8, 0xff, ((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
v0, FONT_SYSTEM, v3, v7 + v4 + v6, 8, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(10, 11, 0), NULL);
} else {
Text_AddPrinterWithParamsAndColor(
v0, 0, v3, v7 + v4 + v6, 8, 0xff, ((u32)(((12 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
v0, FONT_SYSTEM, v3, v7 + v4 + v6, 8, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(12, 13, 0), NULL);
}
Strbuf_Free(v3);
@ -1272,7 +1272,7 @@ static void ov13_022236B8(UnkStruct_ov13_022213F0 *param0)
continue;
}
ov13_022220CC(param0, v0->unk_00, 1 + v2 + v1, Unk_ov13_02228EB0[v1], 2, 8, ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((9 & 0xff) << 0))));
ov13_022220CC(param0, v0->unk_00, 1 + v2 + v1, Unk_ov13_02228EB0[v1], FONT_SUBSCREEN, 8, TEXT_COLOR(7, 8, 9));
ov13_0222317C(param0, v0, 1 + v2 + v1);
}
@ -1356,7 +1356,7 @@ static void ov13_02223A10(UnkStruct_ov13_022213F0 *param0)
ov13_02221C54(param0, 6, 0, param0->unk_00->unk_11, 0, 0);
ov13_02222170(param0, 7, 0, 0);
ov13_022220CC(param0, v0->unk_00, 0 + v1, Unk_ov13_02228EB0[param0->unk_00->unk_34], 0, 0, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov13_022220CC(param0, v0->unk_00, 0 + v1, Unk_ov13_02228EB0[param0->unk_00->unk_34], FONT_SYSTEM, 0, TEXT_COLOR(15, 14, 0));
ov13_02222B6C(param0, 8);
ov13_02222BB4(param0, 2 + v1, v0->unk_06);
ov13_02222C9C(param0, 9);
@ -1390,11 +1390,11 @@ static void ov13_02223B74(UnkStruct_ov13_022213F0 *param0)
continue;
}
ov13_022220CC(param0, v0->unk_00, 1 + v1, Unk_ov13_02228EB0[v1], 2, 8, ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((9 & 0xff) << 0))));
ov13_022220CC(param0, v0->unk_00, 1 + v1, Unk_ov13_02228EB0[v1], FONT_SUBSCREEN, 8, TEXT_COLOR(7, 8, 9));
ov13_0222317C(param0, v0, 1 + v1);
}
ov13_022220CC(param0, param0->unk_00->unk_24, 5, Unk_ov13_02228EB0[4], 2, 8, ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((9 & 0xff) << 0))));
ov13_022220CC(param0, param0->unk_00->unk_24, 5, Unk_ov13_02228EB0[4], FONT_SUBSCREEN, 8, TEXT_COLOR(7, 8, 9));
{
UnkStruct_ov13_022236B8 v2;
@ -1435,7 +1435,7 @@ static void ov13_02223C9C(UnkStruct_ov13_022213F0 *param0)
if (param0->unk_00->unk_34 < 4) {
UnkStruct_ov13_022236B8 *v0 = &param0->unk_04[param0->unk_00->unk_11].unk_30[param0->unk_00->unk_34];
ov13_022220CC(param0, v0->unk_00, 1, Unk_ov13_02228EB0[param0->unk_00->unk_34], 0, 0, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov13_022220CC(param0, v0->unk_00, 1, Unk_ov13_02228EB0[param0->unk_00->unk_34], FONT_SYSTEM, 0, TEXT_COLOR(15, 14, 0));
ov13_02222BB4(param0, 6, v0->unk_06);
ov13_02222CE4(param0, 7, v0->unk_07);
ov13_02222DCC(param0, 8, v0->unk_00);
@ -1444,7 +1444,7 @@ static void ov13_02223C9C(UnkStruct_ov13_022213F0 *param0)
} else {
u32 v1 = MoveTable_LoadParam(param0->unk_00->unk_24, MOVEATTRIBUTE_PP);
ov13_022220CC(param0, param0->unk_00->unk_24, 1, Unk_ov13_02228EB0[4], 0, 0, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov13_022220CC(param0, param0->unk_00->unk_24, 1, Unk_ov13_02228EB0[4], FONT_SYSTEM, 0, TEXT_COLOR(15, 14, 0));
ov13_02222DCC(param0, 8, param0->unk_00->unk_24);
ov13_02222BB4(param0, 6, MoveTable_LoadParam(param0->unk_00->unk_24, MOVEATTRIBUTE_ACCURACY));
ov13_02222CE4(param0, 7, MoveTable_LoadParam(param0->unk_00->unk_24, MOVEATTRIBUTE_POWER));
@ -1475,7 +1475,7 @@ static void ov13_02223E68(UnkStruct_ov13_022213F0 *param0)
continue;
}
ov13_022220CC(param0, v0->unk_00, 1 + v1, Unk_ov13_02228EB0[v1], 2, 8, ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((9 & 0xff) << 0))));
ov13_022220CC(param0, v0->unk_00, 1 + v1, Unk_ov13_02228EB0[v1], FONT_SUBSCREEN, 8, TEXT_COLOR(7, 8, 9));
ov13_0222317C(param0, v0, 1 + v1);
}
@ -1515,7 +1515,7 @@ static void ov13_02223F7C(UnkStruct_ov13_022213F0 *param0)
{
u32 v1 = Font_CalcCenterAlignment(FONT_SYSTEM, v0, 0, 12 * 8);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[4], 0, v0, v1, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_206C[4], FONT_SYSTEM, v0, v1, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
}
Strbuf_Free(v0);
@ -1525,13 +1525,13 @@ static void ov13_02223F7C(UnkStruct_ov13_022213F0 *param0)
if (param0->unk_00->unk_34 < 4) {
UnkStruct_ov13_022236B8 *v2 = &param0->unk_04[param0->unk_00->unk_11].unk_30[param0->unk_00->unk_34];
ov13_022220CC(param0, v2->unk_00, 1, Unk_ov13_02228EB0[param0->unk_00->unk_34], 0, 0, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov13_022220CC(param0, v2->unk_00, 1, Unk_ov13_02228EB0[param0->unk_00->unk_34], FONT_SYSTEM, 0, TEXT_COLOR(15, 14, 0));
ov13_02222E2C(param0, 5, v2->unk_00);
ov13_02222F74(param0, 3, v2->unk_02, v2->unk_03);
} else {
u32 v3 = MoveTable_LoadParam(param0->unk_00->unk_24, MOVEATTRIBUTE_PP);
ov13_022220CC(param0, param0->unk_00->unk_24, 1, Unk_ov13_02228EB0[4], 0, 0, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov13_022220CC(param0, param0->unk_00->unk_24, 1, Unk_ov13_02228EB0[4], FONT_SYSTEM, 0, TEXT_COLOR(15, 14, 0));
ov13_02222E2C(param0, 5, param0->unk_00->unk_24);
ov13_02222F74(param0, 3, v3, v3);
}
@ -1549,7 +1549,7 @@ void ov13_022240E0(UnkStruct_ov13_022213F0 *param0)
void ov13_02224108(UnkStruct_ov13_022213F0 *param0)
{
RenderControlFlags_SetCanABSpeedUpPrint(1);
param0->unk_2077 = Text_AddPrinterWithParams(&param0->unk_204C[1], 1, param0->unk_1FAC, 0, 0, BattleSystem_TextSpeed(param0->unk_00->unk_08), NULL);
param0->unk_2077 = Text_AddPrinterWithParams(&param0->unk_204C[1], FONT_MESSAGE, param0->unk_1FAC, 0, 0, BattleSystem_TextSpeed(param0->unk_00->unk_08), NULL);
}
void ov13_02224144(UnkStruct_ov13_022213F0 *param0)

58
src/overlay013/ov13_02227288.c
View File

@ -138,7 +138,7 @@ void ov13_02227350(UnkStruct_ov13_02227244 *param0, u32 param1)
}
}
static void ov13_02227374(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5)
static void ov13_02227374(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param2, u32 param3, u32 param4, TextColor param5)
{
Window *v0;
Strbuf *v1;
@ -150,7 +150,7 @@ static void ov13_02227374(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param
v2 = Font_CalcStrbufWidth(param3, v1, 0);
v3 = (sub_0201C294(v0) * 8 - v2) / 2;
Text_AddPrinterWithParamsAndColor(v0, param3, v1, v3, param4, 0xff, param5, NULL);
Text_AddPrinterWithParamsAndColor(v0, param3, v1, v3, param4, TEXT_SPEED_NO_TRANSFER, param5, NULL);
Strbuf_Free(v1);
sub_0201A9A4(v0);
}
@ -163,17 +163,17 @@ static void ov13_022273CC(UnkStruct_ov13_02227244 *param0)
BGL_FillWindow(&param0->unk_2C[v0], 0);
}
ov13_02227374(param0, 0, 0, 2, 8, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))));
ov13_02227374(param0, 0, 1, 2, 24, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))));
ov13_02227374(param0, 1, 2, 2, 8, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))));
ov13_02227374(param0, 1, 3, 2, 24, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))));
ov13_02227374(param0, 2, 7, 2, 8, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))));
ov13_02227374(param0, 3, 6, 2, 8, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))));
ov13_02227374(param0, 0, 0, FONT_SUBSCREEN, 8, TEXT_COLOR(3, 2, 1));
ov13_02227374(param0, 0, 1, FONT_SUBSCREEN, 24, TEXT_COLOR(3, 2, 1));
ov13_02227374(param0, 1, 2, FONT_SUBSCREEN, 8, TEXT_COLOR(3, 2, 1));
ov13_02227374(param0, 1, 3, FONT_SUBSCREEN, 24, TEXT_COLOR(3, 2, 1));
ov13_02227374(param0, 2, 7, FONT_SUBSCREEN, 8, TEXT_COLOR(3, 2, 1));
ov13_02227374(param0, 3, 6, FONT_SUBSCREEN, 8, TEXT_COLOR(3, 2, 1));
if (param0->unk_00->unk_20 != 0) {
Strbuf *v1 = MessageLoader_GetNewStrbuf(param0->unk_10, 8);
Text_AddPrinterWithParamsAndColor(&param0->unk_2C[4], 2, v1, 0, 6, 0xff, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_2C[4], FONT_SUBSCREEN, v1, 0, 6, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 2, 1), NULL);
Strbuf_Free(v1);
sub_0201A9A4(&param0->unk_2C[4]);
}
@ -188,7 +188,7 @@ static const u32 Unk_ov13_02229AB0[][2] = {
{ 0x13, 0x14 }
};
static void ov13_022274A8(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5)
static void ov13_022274A8(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param2, u32 param3, u32 param4, TextColor param5)
{
Window *v0;
Strbuf *v1;
@ -208,14 +208,14 @@ static void ov13_022274A8(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param
v2 = Font_CalcStrbufWidth(param4, param0->unk_18, 0);
v3 = (sub_0201C294(v0) * 8 - v2) / 2;
Text_AddPrinterWithParamsAndColor(v0, param4, param0->unk_18, v3, 8, 0xff, param5, NULL);
Text_AddPrinterWithParamsAndColor(v0, param4, param0->unk_18, v3, 8, TEXT_SPEED_NO_TRANSFER, param5, NULL);
Strbuf_Free(v1);
}
sub_0201A9A4(v0);
}
static void ov13_0222754C(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6)
static void ov13_0222754C(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, TextColor param6)
{
Strbuf *v0;
Window *v1;
@ -229,7 +229,7 @@ static void ov13_0222754C(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param
StringTemplate_SetNumber(param0->unk_14, 0, param0->unk_3C[param0->unk_114D][param1].quantity, 3, 0, 1);
StringTemplate_Format(param0->unk_14, param0->unk_18, v0);
Text_AddPrinterWithParamsAndColor(v1, param4, param0->unk_18, 0, param5, 0xff, param6, NULL);
Text_AddPrinterWithParamsAndColor(v1, param4, param0->unk_18, 0, param5, TEXT_SPEED_NO_TRANSFER, param6, NULL);
Strbuf_Free(v0);
}
@ -249,8 +249,8 @@ static void ov13_022275E0(UnkStruct_ov13_02227244 *param0, u32 param1)
v0 = 12;
}
ov13_022274A8(param0, v1, param1, v0 + param1 * 2, 2, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))));
ov13_0222754C(param0, v1, param1, v0 + 1 + param1 * 2, 0, 4, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov13_022274A8(param0, v1, param1, v0 + param1 * 2, FONT_SUBSCREEN, TEXT_COLOR(3, 2, 1));
ov13_0222754C(param0, v1, param1, v0 + 1 + param1 * 2, FONT_SYSTEM, 4, TEXT_COLOR(1, 2, 0));
}
void ov13_02227650(UnkStruct_ov13_02227244 *param0)
@ -280,13 +280,13 @@ void ov13_02227698(UnkStruct_ov13_02227244 *param0)
v2 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0);
v3 = (sub_0201C294(v0) * 8 - v2) / 2;
Text_AddPrinterWithParamsAndColor(v0, 0, v1, v3, 4, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v3, 4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
v1 = MessageLoader_GetNewStrbuf(param0->unk_10, 29);
StringTemplate_SetNumber(param0->unk_14, 0, param0->unk_1154[param0->unk_114D] + 1, 2, 0, 1);
StringTemplate_Format(param0->unk_14, param0->unk_18, v1);
Text_AddPrinterWithParamsAndColor(v0, 0, param0->unk_18, v3 + v2, 4, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, param0->unk_18, v3 + v2, 4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
v1 = MessageLoader_GetNewStrbuf(param0->unk_10, 30);
@ -294,7 +294,7 @@ void ov13_02227698(UnkStruct_ov13_02227244 *param0)
StringTemplate_Format(param0->unk_14, param0->unk_18, v1);
v2 = Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_18, 0);
Text_AddPrinterWithParamsAndColor(v0, 0, param0->unk_18, v3 - v2, 4, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, param0->unk_18, v3 - v2, 4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
sub_0201A9A4(v0);
}
@ -305,18 +305,18 @@ static void ov13_022277C8(UnkStruct_ov13_02227244 *param0)
switch (param0->unk_114D) {
case 0:
ov13_02227374(param0, 24, 22, 0, 4, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov13_02227374(param0, 24, 23, 0, (4 + 16), ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov13_02227374(param0, 24, 22, FONT_SYSTEM, 4, TEXT_COLOR(1, 2, 0));
ov13_02227374(param0, 24, 23, FONT_SYSTEM, (4 + 16), TEXT_COLOR(1, 2, 0));
break;
case 1:
ov13_02227374(param0, 24, 24, 0, 4, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov13_02227374(param0, 24, 25, 0, (4 + 16), ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov13_02227374(param0, 24, 24, FONT_SYSTEM, 4, TEXT_COLOR(1, 2, 0));
ov13_02227374(param0, 24, 25, FONT_SYSTEM, (4 + 16), TEXT_COLOR(1, 2, 0));
break;
case 2:
ov13_02227374(param0, 24, 26, 0, 12, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov13_02227374(param0, 24, 26, FONT_SYSTEM, 12, TEXT_COLOR(1, 2, 0));
break;
case 3:
ov13_02227374(param0, 24, 27, 0, 12, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov13_02227374(param0, 24, 27, FONT_SYSTEM, 12, TEXT_COLOR(1, 2, 0));
break;
}
}
@ -339,7 +339,7 @@ static void ov13_022278A0(UnkStruct_ov13_02227244 *param0, u32 param1)
StringTemplate_SetItemName(param0->unk_14, 0, param0->unk_3C[param0->unk_114D][param1].item);
StringTemplate_Format(param0->unk_14, param0->unk_18, v1);
BGL_FillWindow(v0, 0);
Text_AddPrinterWithParamsAndColor(v0, 0, param0->unk_18, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, param0->unk_18, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
sub_0201A9A4(v0);
}
@ -353,7 +353,7 @@ static void ov13_02227910(UnkStruct_ov13_02227244 *param0, u32 param1)
v1 = Strbuf_Init(130, param0->unk_00->unk_0C);
Item_LoadDescription(v1, param0->unk_3C[param0->unk_114D][param1].item, param0->unk_00->unk_0C);
Text_AddPrinterWithParamsAndColor(v0, 0, v1, 4, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
sub_0201A9A4(v0);
}
@ -370,9 +370,9 @@ static void ov13_02227974(UnkStruct_ov13_02227244 *param0)
v1 = param0->unk_00->unk_2C[param0->unk_114D] * 6 + param0->unk_00->unk_27[param0->unk_114D];
ov13_022278A0(param0, v1);
ov13_0222754C(param0, v1, 0, 1, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov13_0222754C(param0, v1, 0, 1, FONT_SYSTEM, 0, TEXT_COLOR(1, 2, 0));
ov13_02227910(param0, v1);
ov13_02227374(param0, 3, 31, 2, 6, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))));
ov13_02227374(param0, 3, 31, FONT_SUBSCREEN, 6, TEXT_COLOR(3, 2, 1));
}
void ov13_022279F4(UnkStruct_ov13_02227244 *param0)
@ -385,5 +385,5 @@ void ov13_022279F4(UnkStruct_ov13_02227244 *param0)
void ov13_02227A1C(UnkStruct_ov13_02227244 *param0)
{
RenderControlFlags_SetCanABSpeedUpPrint(1);
param0->unk_32 = Text_AddPrinterWithParams(&param0->unk_1C, 1, param0->unk_18, 0, 0, BattleSystem_TextSpeed(param0->unk_00->unk_00), NULL);
param0->unk_32 = Text_AddPrinterWithParams(&param0->unk_1C, FONT_MESSAGE, param0->unk_18, 0, 0, BattleSystem_TextSpeed(param0->unk_00->unk_00), NULL);
}

4
src/overlay017/ov17_0223F118.c
View File

@ -111,7 +111,7 @@ void ov17_0223F1E0(GenericPointerData *param0)
sub_020242C4(param0);
}
void ov17_0223F1E8(int param0, BGL *param1, SpriteGfxHandler *param2, UnkStruct_02012744 *param3, UnkStruct_ov17_0223F2E4 *param4, const Strbuf *param5, int param6, u32 param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14)
void ov17_0223F1E8(int param0, BGL *param1, SpriteGfxHandler *param2, UnkStruct_02012744 *param3, UnkStruct_ov17_0223F2E4 *param4, const Strbuf *param5, enum Font param6, TextColor param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14)
{
UnkStruct_020127E8 v0;
Window v1;
@ -133,7 +133,7 @@ void ov17_0223F1E8(int param0, BGL *param1, SpriteGfxHandler *param2, UnkStruct_
{
Window_Init(&v1);
BGL_AddFramelessWindow(param1, &v1, v6, 16 / 8, 0, 0);
Text_AddPrinterWithParamsColorAndSpacing(&v1, param6, param5, 0, 0, 0xff, param7, v7, 0, NULL);
Text_AddPrinterWithParamsColorAndSpacing(&v1, param6, param5, 0, 0, TEXT_SPEED_NO_TRANSFER, param7, v7, 0, NULL);
}
v3 = sub_02012898(&v1, NNS_G2D_VRAM_TYPE_2DMAIN, param0);

26
src/overlay017/ov17_0223F7E4.c
View File

@ -761,8 +761,8 @@ static void ov17_0223FBD4(UnkStruct_ov17_0223F7E4 *param0, int param1, int param
v0 = MessageLoader_GetNewStrbuf(param0->unk_04->unk_38, v2);
v1 = MessageLoader_GetNewStrbuf(param0->unk_04->unk_38, v3);
ov17_02240138(param0, &param0->unk_40[0], v0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0, 33008, 128, (8 * 0x10 - 1), 1, NULL);
ov17_02240138(param0, &param0->unk_40[1], v1, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0, 33008, 128, (8 * 0x14 - 1), 1, NULL);
ov17_02240138(param0, &param0->unk_40[0], v0, FONT_SYSTEM, TEXT_COLOR(1, 2, 0), 0, 33008, 128, (8 * 0x10 - 1), 1, NULL);
ov17_02240138(param0, &param0->unk_40[1], v1, FONT_SYSTEM, TEXT_COLOR(1, 2, 0), 0, 33008, 128, (8 * 0x14 - 1), 1, NULL);
Strbuf_Free(v0);
Strbuf_Free(v1);
@ -790,9 +790,9 @@ static void ov17_0223FCAC(UnkStruct_ov17_0223F7E4 *param0, int param1, int param
v1[v2] = 0;
}
ov17_02240138(param0, &param0->unk_40[0 + v2], NULL, 2, ((u32)(((1 & 0xff) << 16) | ((7 & 0xff) << 8) | ((8 & 0xff) << 0))), 0, 33008, Unk_ov17_02253278[v2][0], Unk_ov17_02253278[v2][1], 0, &v8->unk_00[v2]);
ov17_02240138(param0, &param0->unk_40[4 + v2], NULL, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0, 33008, Unk_ov17_02253314[v2][0][0], Unk_ov17_02253314[v2][0][1], 0, &v8->unk_50[v2]);
ov17_02240138(param0, &param0->unk_40[8 + v2], NULL, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0, 33008, Unk_ov17_02253314[v2][1][0], Unk_ov17_02253314[v2][1][1], 0, &v8->unk_A0[v2]);
ov17_02240138(param0, &param0->unk_40[0 + v2], NULL, FONT_SUBSCREEN, TEXT_COLOR(1, 7, 8), 0, 33008, Unk_ov17_02253278[v2][0], Unk_ov17_02253278[v2][1], 0, &v8->unk_00[v2]);
ov17_02240138(param0, &param0->unk_40[4 + v2], NULL, FONT_SYSTEM, TEXT_COLOR(1, 2, 0), 0, 33008, Unk_ov17_02253314[v2][0][0], Unk_ov17_02253314[v2][0][1], 0, &v8->unk_50[v2]);
ov17_02240138(param0, &param0->unk_40[8 + v2], NULL, FONT_SYSTEM, TEXT_COLOR(1, 2, 0), 0, 33008, Unk_ov17_02253314[v2][1][0], Unk_ov17_02253314[v2][1][1], 0, &v8->unk_A0[v2]);
if (v0[v2] == 0) {
sub_020129D0(param0->unk_40[0 + v2].unk_00, 0);
@ -858,12 +858,12 @@ static void ov17_0223FF38(UnkStruct_ov17_0223F7E4 *param0, int param1, int param
v1 = param0->unk_04->unk_24;
for (v0 = 0; v0 < (1 + 2); v0++) {
ov17_02240138(param0, &param0->unk_40[0 + v0], NULL, 2, ((u32)(((1 & 0xff) << 16) | ((9 & 0xff) << 8) | ((0xa & 0xff) << 0))), 0, 33008, Unk_ov17_0225325C[v0][0], Unk_ov17_0225325C[v0][1], 1, &v3->unk_F0[v0]);
ov17_02240138(param0, &param0->unk_40[0 + v0], NULL, FONT_SUBSCREEN, TEXT_COLOR(1, 9, 0xa), 0, 33008, Unk_ov17_0225325C[v0][0], Unk_ov17_0225325C[v0][1], 1, &v3->unk_F0[v0]);
}
v2 = MessageLoader_GetNewStrbuf(param0->unk_04->unk_38, 53);
ov17_02240138(param0, &param0->unk_40[0 + v0], v2, 2, ((u32)(((1 & 0xff) << 16) | ((9 & 0xff) << 8) | ((0xa & 0xff) << 0))), 0, 33008, 128, (0x14 * 8 + 4), 1, NULL);
ov17_02240138(param0, &param0->unk_40[0 + v0], v2, FONT_SUBSCREEN, TEXT_COLOR(1, 9, 0xa), 0, 33008, 128, (0x14 * 8 + 4), 1, NULL);
Strbuf_Free(v2);
param0->unk_128 = ov17_022412C0(param0->unk_04->unk_18, param0->unk_04->unk_1C, param0->unk_04->unk_00->unk_10E);
@ -975,7 +975,7 @@ static void ov17_02240138(UnkStruct_ov17_0223F7E4 *param0, UnkStruct_ov17_022401
if (param10 == NULL) {
Window_Init(&v1);
BGL_AddFramelessWindow(v5, &v1, v8, 16 / 8, 0, 0);
Text_AddPrinterWithParamsColorAndSpacing(&v1, param3, param2, 0, 0, 0xff, param4, 0, 0, NULL);
Text_AddPrinterWithParamsColorAndSpacing(&v1, param3, param2, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL);
} else {
v1 = param10->unk_00;
}
@ -1470,15 +1470,15 @@ void ov17_02240A80(UnkStruct_ov17_0223F7E4 *param0, u16 param1[])
v2 = MessageUtil_MoveName(param1[v1], 21);
ov17_02240BF4(param0, v2, 2, &v0->unk_00[v1], ((u32)(((1 & 0xff) << 16) | ((7 & 0xff) << 8) | ((8 & 0xff) << 0))));
ov17_02240BF4(param0, v2, FONT_SUBSCREEN, &v0->unk_00[v1], TEXT_COLOR(1, 7, 8));
Strbuf_Free(v2);
sub_02095750(v0->unk_12C[v1], &v6, &v7);
v3 = MessageLoader_GetNewStrbuf(param0->unk_04->unk_40, v6);
v4 = MessageLoader_GetNewStrbuf(param0->unk_04->unk_40, v7);
ov17_02240BF4(param0, v3, 0, &v0->unk_50[v1], ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov17_02240BF4(param0, v4, 0, &v0->unk_A0[v1], ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov17_02240BF4(param0, v3, FONT_SYSTEM, &v0->unk_50[v1], TEXT_COLOR(1, 2, 0));
ov17_02240BF4(param0, v4, FONT_SYSTEM, &v0->unk_A0[v1], TEXT_COLOR(1, 2, 0));
Strbuf_Free(v3);
Strbuf_Free(v4);
@ -1486,7 +1486,7 @@ void ov17_02240A80(UnkStruct_ov17_0223F7E4 *param0, u16 param1[])
for (v1 = 0; v1 < (1 + 2); v1++) {
v5 = ov17_0223F310(param0->unk_04->unk_00->unk_C0[v1].unk_00, 21);
ov17_02240BF4(param0, v5, 2, &v0->unk_F0[v1], ((u32)(((1 & 0xff) << 16) | ((9 & 0xff) << 8) | ((0xa & 0xff) << 0))));
ov17_02240BF4(param0, v5, FONT_SUBSCREEN, &v0->unk_F0[v1], TEXT_COLOR(1, 9, 0xa));
Strbuf_Free(v5);
}
@ -1511,7 +1511,7 @@ static void ov17_02240BF4(UnkStruct_ov17_0223F7E4 *param0, const Strbuf *param1,
Window_Init(&param3->unk_00);
BGL_AddFramelessWindow(param0->unk_04->unk_24, &param3->unk_00, v1, 16 / 8, 0, 0);
Text_AddPrinterWithParamsColorAndSpacing(&param3->unk_00, param2, param1, 0, 0, 0xff, param4, 0, 0, NULL);
Text_AddPrinterWithParamsColorAndSpacing(&param3->unk_00, param2, param1, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL);
}
static void ov17_02240C60(const Strbuf *param0, int param1, int *param2, int *param3)

16
src/overlay017/ov17_022413D8.c
View File

@ -1514,12 +1514,12 @@ static void ov17_02242DC0(UnkStruct_ov17_02246F24 *param0, MessageLoader *param1
u32 v1;
if (param6 == 1) {
v1 = 0;
v1 = TEXT_SPEED_INSTANT;
} else {
if (param0->unk_00->unk_155 == 0) {
v1 = Options_TextFrameDelay(param0->unk_00->unk_196C);
} else {
v1 = 1;
v1 = TEXT_SPEED_FAST;
}
}
@ -1529,7 +1529,7 @@ static void ov17_02242DC0(UnkStruct_ov17_02246F24 *param0, MessageLoader *param1
StringTemplate_Format(param0->unk_0C.unk_48, param0->unk_0C.unk_4C, v0);
BGL_FillWindow(&param0->unk_0C.unk_28[0], 0xff);
param0->unk_0C.unk_210 = Text_AddPrinterWithParams(&param0->unk_0C.unk_28[0], 1, param0->unk_0C.unk_4C, 0, 0, v1, NULL);
param0->unk_0C.unk_210 = Text_AddPrinterWithParams(&param0->unk_0C.unk_28[0], FONT_MESSAGE, param0->unk_0C.unk_4C, 0, 0, v1, NULL);
if (v1 == 0) {
param0->unk_0C.unk_210 = 0xff;
@ -1576,20 +1576,20 @@ int ov17_02242ECC(UnkStruct_ov17_02246F24 *param0)
void ov17_02242EE4(UnkStruct_ov17_02246F24 *param0, int param1)
{
Strbuf *v0;
u32 v1;
TextColor v1;
v0 = Strbuf_Init(12, 21);
Pokemon_GetValue(param0->unk_0C.unk_00->unk_00[param1], MON_DATA_NICKNAME_STRBUF, v0);
if (param1 == param0->unk_00->unk_00.unk_113) {
v1 = ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)));
v1 = TEXT_COLOR(1, 2, 0);
} else {
v1 = ((u32)(((5 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0)));
v1 = TEXT_COLOR(5, 6, 0);
}
ov17_0223F1E8(21, param0->unk_0C.unk_24, param0->unk_0C.unk_1C, param0->unk_0C.unk_54, &param0->unk_0C.unk_1C8[param1], v0, 0, v1, 0, 33005, 0, 0, 0, 0, 15);
ov17_0223F1E8(21, param0->unk_0C.unk_24, param0->unk_0C.unk_1C, param0->unk_0C.unk_54, &param0->unk_0C.unk_180[param1], param0->unk_00->unk_00.unk_D8[param1], 0, v1, 0, 33005, 0, 0, 0, 0, 15);
ov17_0223F1E8(21, param0->unk_0C.unk_24, param0->unk_0C.unk_1C, param0->unk_0C.unk_54, &param0->unk_0C.unk_1C8[param1], v0, FONT_SYSTEM, v1, 0, 33005, 0, 0, 0, 0, 15);
ov17_0223F1E8(21, param0->unk_0C.unk_24, param0->unk_0C.unk_1C, param0->unk_0C.unk_54, &param0->unk_0C.unk_180[param1], param0->unk_00->unk_00.unk_D8[param1], FONT_SYSTEM, v1, 0, 33005, 0, 0, 0, 0, 15);
Strbuf_Free(v0);
}

4
src/overlay017/ov17_022476F8.c
View File

@ -211,7 +211,7 @@ static void ov17_02247990(UnkStruct_ov17_02247A48 *param0, MessageLoader *param1
if (param0->unk_00->unk_155 == 0) {
v1 = Options_TextFrameDelay(param0->unk_00->unk_196C);
} else {
v1 = 1;
v1 = TEXT_SPEED_FAST;
}
v0 = MessageLoader_GetNewStrbuf(param1, param2);
@ -220,7 +220,7 @@ static void ov17_02247990(UnkStruct_ov17_02247A48 *param0, MessageLoader *param1
StringTemplate_Format(param0->unk_0C.unk_3C, param0->unk_0C.unk_40, v0);
BGL_FillWindow(&param0->unk_0C.unk_28[0], 0xff);
param0->unk_0C.unk_C4 = Text_AddPrinterWithParams(&param0->unk_0C.unk_28[0], 1, param0->unk_0C.unk_40, 0, 0, v1, NULL);
param0->unk_0C.unk_C4 = Text_AddPrinterWithParams(&param0->unk_0C.unk_28[0], FONT_MESSAGE, param0->unk_0C.unk_40, 0, 0, v1, NULL);
Strbuf_Free(v0);
}

14
src/overlay017/ov17_022492DC.c
View File

@ -537,8 +537,8 @@ static void ov17_02249828(UnkStruct_ov17_022492DC *param0)
v0 = MessageLoader_GetNewStrbuf(v4, v2);
v1 = MessageLoader_GetNewStrbuf(v4, v3);
ov17_02249BC4(param0, &param0->unk_1C[0], v0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0, 33003, 128, (8 * 0x10 - 1), 1);
ov17_02249BC4(param0, &param0->unk_1C[1], v1, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0, 33003, 128, (8 * 0x14 - 1), 1);
ov17_02249BC4(param0, &param0->unk_1C[0], v0, FONT_SYSTEM, TEXT_COLOR(1, 2, 0), 0, 33003, 128, (8 * 0x10 - 1), 1);
ov17_02249BC4(param0, &param0->unk_1C[1], v1, FONT_SYSTEM, TEXT_COLOR(1, 2, 0), 0, 33003, 128, (8 * 0x14 - 1), 1);
Strbuf_Free(v0);
Strbuf_Free(v1);
@ -567,10 +567,10 @@ static void ov17_022498F4(UnkStruct_ov17_022492DC *param0)
v2 = MessageLoader_GetNewStrbuf(v4, 3);
v3 = MessageLoader_GetNewStrbuf(v4, 4);
ov17_02249BC4(param0, &param0->unk_1C[2], v0, 2, ((u32)(((1 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0xb & 0xff) << 0))), 0, 33003, 128, 24, 1);
ov17_02249BC4(param0, &param0->unk_1C[3], v1, 2, ((u32)(((1 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0xb & 0xff) << 0))), 0, 33003, 128, 120, 1);
ov17_02249BC4(param0, &param0->unk_1C[4], v2, 2, ((u32)(((1 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0xb & 0xff) << 0))), 0, 33003, 48, 64, 1);
ov17_02249BC4(param0, &param0->unk_1C[5], v3, 2, ((u32)(((1 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0xb & 0xff) << 0))), 0, 33003, 208, 64, 1);
ov17_02249BC4(param0, &param0->unk_1C[2], v0, FONT_SUBSCREEN, TEXT_COLOR(1, 1, 0xb), 0, 33003, 128, 24, 1);
ov17_02249BC4(param0, &param0->unk_1C[3], v1, FONT_SUBSCREEN, TEXT_COLOR(1, 1, 0xb), 0, 33003, 128, 120, 1);
ov17_02249BC4(param0, &param0->unk_1C[4], v2, FONT_SUBSCREEN, TEXT_COLOR(1, 1, 0xb), 0, 33003, 48, 64, 1);
ov17_02249BC4(param0, &param0->unk_1C[5], v3, FONT_SUBSCREEN, TEXT_COLOR(1, 1, 0xb), 0, 33003, 208, 64, 1);
Strbuf_Free(v0);
Strbuf_Free(v1);
@ -704,7 +704,7 @@ static void ov17_02249BC4(UnkStruct_ov17_022492DC *param0, UnkStruct_ov17_02249B
{
Window_Init(&v1);
BGL_AddFramelessWindow(v5, &v1, v8, 16 / 8, 0, 0);
Text_AddPrinterWithParamsColorAndSpacing(&v1, param3, param2, 0, 0, 0xff, param4, 0, 0, NULL);
Text_AddPrinterWithParamsColorAndSpacing(&v1, param3, param2, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL);
}
v3 = sub_02012898(&v1, NNS_G2D_VRAM_TYPE_2DSUB, 23);

12
src/overlay017/ov17_0224A0FC.c
View File

@ -646,13 +646,13 @@ void ov17_0224A674(UnkStruct_ov17_0224A1EC *param0)
v3 = MessageLoader_GetNewStrbuf(param0->unk_84, 7);
for (v0 = 0; v0 < 3; v0++) {
ov17_0223F1E8(23, param0->unk_60, param0->unk_5C, param0->unk_94, &param0->unk_96C[0][v0], v1, 0, ((u32)(((0xb & 0xff) << 16) | ((0xc & 0xff) << 8) | ((0 & 0xff) << 0))), 0, 33001, 0, 0, 1, 1, 12);
ov17_0223F1E8(23, param0->unk_60, param0->unk_5C, param0->unk_94, &param0->unk_96C[0][v0], v1, FONT_SYSTEM, TEXT_COLOR(0xb, 0xc, 0), 0, 33001, 0, 0, 1, 1, 12);
sub_020129D0(param0->unk_96C[0][v0].unk_00, 0);
ov17_0223F1E8(23, param0->unk_60, param0->unk_5C, param0->unk_94, &param0->unk_96C[1][v0], v2, 0, ((u32)(((0xb & 0xff) << 16) | ((0xc & 0xff) << 8) | ((0 & 0xff) << 0))), 0, 33001, 0, 0, 1, 1, 12);
ov17_0223F1E8(23, param0->unk_60, param0->unk_5C, param0->unk_94, &param0->unk_96C[1][v0], v2, FONT_SYSTEM, TEXT_COLOR(0xb, 0xc, 0), 0, 33001, 0, 0, 1, 1, 12);
sub_020129D0(param0->unk_96C[1][v0].unk_00, 0);
ov17_0223F1E8(23, param0->unk_60, param0->unk_5C, param0->unk_94, &param0->unk_96C[2][v0], v3, 0, ((u32)(((0xb & 0xff) << 16) | ((0xc & 0xff) << 8) | ((0 & 0xff) << 0))), 0, 33001, 0, 0, 1, 1, 12);
ov17_0223F1E8(23, param0->unk_60, param0->unk_5C, param0->unk_94, &param0->unk_96C[2][v0], v3, FONT_SYSTEM, TEXT_COLOR(0xb, 0xc, 0), 0, 33001, 0, 0, 1, 1, 12);
sub_020129D0(param0->unk_96C[2][v0].unk_00, 0);
}
@ -1934,7 +1934,7 @@ static void ov17_0224C244(UnkStruct_ov17_0224DF54 *param0, MessageLoader *param1
if (param0->unk_00->unk_155 == 0) {
v1 = Options_TextFrameDelay(param0->unk_00->unk_196C);
} else {
v1 = 1;
v1 = TEXT_SPEED_FAST;
}
v0 = MessageLoader_GetNewStrbuf(param1, param2);
@ -1943,7 +1943,7 @@ static void ov17_0224C244(UnkStruct_ov17_0224DF54 *param0, MessageLoader *param1
StringTemplate_Format(param0->unk_14.unk_88, param0->unk_14.unk_8C, v0);
BGL_FillWindow(&param0->unk_14.unk_64[0], 0xff);
param0->unk_14.unk_A18 = Text_AddPrinterWithParams(&param0->unk_14.unk_64[0], 1, param0->unk_14.unk_8C, 0, 0, v1, NULL);
param0->unk_14.unk_A18 = Text_AddPrinterWithParams(&param0->unk_14.unk_64[0], FONT_MESSAGE, param0->unk_14.unk_8C, 0, 0, v1, NULL);
Strbuf_Free(v0);
}
@ -2115,7 +2115,7 @@ void ov17_0224C5A0(UnkStruct_ov17_0224DF54 *param0, u32 param1, const UnkStruct_
StringTemplate_Format(param0->unk_14.unk_88, param0->unk_14.unk_8C, v2);
BGL_FillWindow(&param0->unk_14.unk_64[1], 0xff);
Text_AddPrinterWithParams(&param0->unk_14.unk_64[1], 1, param0->unk_14.unk_8C, 0, 0, 0, NULL);
Text_AddPrinterWithParams(&param0->unk_14.unk_64[1], FONT_MESSAGE, param0->unk_14.unk_8C, 0, 0, TEXT_SPEED_INSTANT, NULL);
Strbuf_Free(v2);
param0->unk_1B25 = 1;

8
src/overlay017/ov17_02250744.c
View File

@ -245,7 +245,7 @@ static void ov17_022508E4(UnkStruct_ov17_0224FCA0 *param0, MessageLoader *param1
if (param0->unk_00->unk_155 == 0) {
v1 = Options_TextFrameDelay(param0->unk_00->unk_196C);
} else {
v1 = 1;
v1 = TEXT_SPEED_FAST;
}
v0 = MessageLoader_GetNewStrbuf(param1, param2);
@ -254,7 +254,7 @@ static void ov17_022508E4(UnkStruct_ov17_0224FCA0 *param0, MessageLoader *param1
StringTemplate_Format(param0->unk_10.unk_B8, param0->unk_10.unk_BC, v0);
BGL_FillWindow(&param0->unk_10.unk_24[0], 0xff);
param0->unk_10.unk_388 = Text_AddPrinterWithParams(&param0->unk_10.unk_24[0], 1, param0->unk_10.unk_BC, 0, 0, v1, NULL);
param0->unk_10.unk_388 = Text_AddPrinterWithParams(&param0->unk_10.unk_24[0], FONT_MESSAGE, param0->unk_10.unk_BC, 0, 0, v1, NULL);
Strbuf_Free(v0);
}
@ -344,8 +344,8 @@ void ov17_02250B00(UnkStruct_ov17_0224FCA0 *param0)
Pokemon_GetValue(param0->unk_10.unk_00->unk_00[v4], MON_DATA_NICKNAME_STRBUF, v2);
BGL_FillWindow(&param0->unk_10.unk_24[1 + v3], 0x0);
BGL_FillWindow(&param0->unk_10.unk_24[5 + v3], 0x0);
Text_AddPrinterWithParamsAndColor(&param0->unk_10.unk_24[1 + v3], 0, v2, 0, 3, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_10.unk_24[5 + v3], 0, param0->unk_00->unk_00.unk_D8[v4], 0, 3, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_10.unk_24[1 + v3], FONT_SYSTEM, v2, 0, 3, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_10.unk_24[5 + v3], FONT_SYSTEM, param0->unk_00->unk_00.unk_D8[v4], 0, 3, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
}
Strbuf_Free(v2);

2
src/overlay019/ov19_021D79F8.c
View File

@ -223,7 +223,7 @@ static void ov19_021D7C58(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_
v4 = Font_CalcStrbufWidth(FONT_SYSTEM, param1->unk_04, 0);
v3 = 84 - (v4 / 2);
Text_AddPrinterWithParamsAndColor(v2, 0, param1->unk_04, v3, 13, 0xff, (u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(v2, FONT_SYSTEM, param1->unk_04, v3, 13, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(2, 1, 0), NULL);
Heap_FreeToHeap(v2);
}

16
src/overlay019/ov19_021DA92C.c
View File

@ -445,7 +445,7 @@ static void ov19_021DAE60(Window *param0, UnkStruct_ov19_021DA9E0 *param1, u32 p
return;
}
Text_AddPrinterWithParamsAndColor(param0, 0, v0, 0, v1, 0xff, (u32)(((9 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, v0, 0, v1, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(9, 6, 0), NULL);
}
void ov19_021DAF98(UnkStruct_ov19_021DA9E0 *param0)
@ -532,21 +532,21 @@ static void ov19_021DB0E4(UnkStruct_ov19_021DA9E0 *param0)
v1 = ov19_021D5E70(param0->unk_10);
Text_AddPrinterWithParamsAndColor(&param0->unk_04[0], 0, v1->unk_18, 2, 0, 0xff, (u32)(((9 & 0xff) << 16) | ((6 & 0xff) << 8) | ((15 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_04[2], 0, v1->unk_14, 2, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_04[2], 0, v1->unk_14, 2, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_04[0], FONT_SYSTEM, v1->unk_18, 2, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(9, 6, 15), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_04[2], FONT_SYSTEM, v1->unk_14, 2, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_04[2], FONT_SYSTEM, v1->unk_14, 2, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL);
switch (v1->unk_0E) {
case 0:
Text_AddPrinterWithParamsAndColor(&param0->unk_04[2], 0, param0->unk_44, 70, 0, 0xff, (u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((15 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_04[2], FONT_SYSTEM, param0->unk_44, 70, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(7, 8, 15), NULL);
break;
case 1:
Text_AddPrinterWithParamsAndColor(&param0->unk_04[2], 0, param0->unk_48, 70, 0, 0xff, (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((15 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_04[2], FONT_SYSTEM, param0->unk_48, 70, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 4, 15), NULL);
break;
}
if (v1->unk_0F == 0) {
Text_AddPrinterWithParamsAndColor(&param0->unk_04[3], 0, v1->unk_1C, 0, 0, 0xff, (u32)(((9 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_04[3], FONT_SYSTEM, v1->unk_1C, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(9, 6, 0), NULL);
if (v1->unk_08) {
sub_0200C648(param0->unk_18, 2, v1->unk_08, 3, 2, &(param0->unk_04[1]), 0, 0);
@ -616,7 +616,7 @@ void ov19_021DB2B0(UnkStruct_ov19_021DA9E0 *param0)
BGL_FillWindow(&param0->unk_04[3], 0);
if (v0->unk_0F == 0) {
Text_AddPrinterWithParamsAndColor(&param0->unk_04[3], 0, v0->unk_1C, 0, 0, 0xff, (u32)(((9 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_04[3], FONT_SYSTEM, v0->unk_1C, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(9, 6, 0), NULL);
}
ov19_021DACB0(param0);

4
src/overlay019/ov19_021DB2FC.c
View File

@ -114,7 +114,7 @@ void ov19_021DB448(UnkStruct_ov19_021DB6F0 *param0, u32 param1)
BGL_FillWindow(&param0->unk_18[0], 15);
MessageLoader_GetStrbuf(param0->unk_10, param1, param0->unk_30);
StringTemplate_Format(param0->unk_2C, param0->unk_34, param0->unk_30);
Text_AddPrinterWithParams(&(param0->unk_18[0]), 1, param0->unk_34, 0, 0, 0xff, NULL);
Text_AddPrinterWithParams(&(param0->unk_18[0]), FONT_MESSAGE, param0->unk_34, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL);
sub_0201ACCC(&(param0->unk_18[0]));
sub_02019448(param0->unk_00, 1);
@ -181,7 +181,7 @@ void ov19_021DB57C(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF96
ov19_021DB638(param0, v0, param1->unk_22, param1->unk_00[v2] - UnkEnum_021DFB94_56);
} else {
MessageLoader_GetStrbuf(param0->unk_14, 24 + param1->unk_00[v2], param0->unk_30);
Text_AddPrinterWithParamsAndColor(v0, 0, param0->unk_30, 10, v1, 0xff, (u32)(((11 & 0xff) << 16) | ((12 & 0xff) << 8) | ((15 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, param0->unk_30, 10, v1, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(11, 12, 15), NULL);
}
v1 += 16;

4
src/overlay019/ov19_021DB8E4.c
View File

@ -435,7 +435,7 @@ static void ov19_021DBF4C(UnkStruct_ov19_021DBA9C *param0)
v3 = 48 - (v2 / 2);
BGL_FillWindow(v1, 7);
Text_AddPrinterWithParamsAndColor(v1, 0, param0->unk_4BFC, v3, 0, 0xff, (u32)(((2 & 0xff) << 16) | ((8 & 0xff) << 8) | ((7 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, param0->unk_4BFC, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(2, 8, 7), NULL);
sub_0201ACCC(v1);
}
@ -603,7 +603,7 @@ void ov19_021DC29C(UnkStruct_ov19_021DBA9C *param0)
sub_020198C0(param0->unk_04, 1, param0->unk_38->rawData, 0, 24, 32, 7);
BGL_FillWindow(&param0->unk_10[2], 4);
MessageLoader_GetStrbuf(param0->unk_4BF8, v1, param0->unk_4BFC);
Text_AddPrinterWithParamsAndColor(&param0->unk_10[2], 0, param0->unk_4BFC, 0, 0, 0xff, (u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_10[2], FONT_SYSTEM, param0->unk_4BFC, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(2, 1, 4), NULL);
sub_0201A954(&param0->unk_10[2]);
ov19_021DC4F8(param0, v1);

2
src/overlay019/ov19_021DCF88.c
View File

@ -1514,7 +1514,7 @@ static void ov19_021DE350(UnkStruct_ov19_021DCF88 *param0)
for (v1 = 0; v1 < NELEMS(v0); v1++) {
sub_02079AF4(param0->unk_04->unk_00, v2, param0->unk_84);
BGL_WindowColor(&param0->unk_88, 0, v0[v1].unk_00, v0[v1].unk_02, 104, 17);
Text_AddPrinterWithParamsAndColor(&param0->unk_88, 0, param0->unk_84, v0[v1].unk_00 + 4, v0[v1].unk_02 + 2, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_88, FONT_SYSTEM, param0->unk_84, v0[v1].unk_00 + 4, v0[v1].unk_02 + 2, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
if (--v2 < 0) {
v2 = 18 - 1;

16
src/overlay019/ov19_021DEC04.c
View File

@ -480,12 +480,12 @@ static void ov19_021DF2E0(UnkStruct_ov19_021DEC04 *param0)
case 0:
for (v2 = 0; v2 < NELEMS(v0); v2++) {
MessageLoader_GetStrbuf(param0->unk_6C, v0[v2], param0->unk_74);
Text_AddPrinterWithParamsAndColor(v1, 0, param0->unk_74, inline_ov19_021DF3AC(v1, 0, param0->unk_74), 0 + 16 * v2, 0xff, (u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, param0->unk_74, inline_ov19_021DF3AC(v1, 0, param0->unk_74), 0 + 16 * v2, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
}
break;
case 2:
MessageLoader_GetStrbuf(param0->unk_6C, 43, param0->unk_74);
Text_AddPrinterWithParamsAndColor(v1, 0, param0->unk_74, inline_ov19_021DF3AC(v1, 0, param0->unk_74), 0, 0xff, (u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, param0->unk_74, inline_ov19_021DF3AC(v1, 0, param0->unk_74), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
break;
}
@ -520,17 +520,17 @@ static void ov19_021DF3AC(UnkStruct_ov19_021DEC04 *param0, int param1)
if (v1->unk_06 == 0) {
const u16 *v6 = &v1->unk_08;
Text_AddPrinterWithParamsAndColor(v0, 0, v1->unk_2C, inline_ov19_021DF3AC(v0, 0, v1->unk_2C), 0, 0xff, (u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1->unk_2C, inline_ov19_021DF3AC(v0, 0, v1->unk_2C), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
for (v5 = 0; v5 < 7; v5++) {
Strbuf_FormatInt(param0->unk_74, v6[v5], 3, 0, 1);
Text_AddPrinterWithParamsAndColor(v0, 0, param0->unk_74, inline_ov19_021DF3AC(v0, 0, param0->unk_74), (1 + v5) * 16, 0xff, (u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, param0->unk_74, inline_ov19_021DF3AC(v0, 0, param0->unk_74), (1 + v5) * 16, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
}
} else {
MessageLoader_GetStrbuf(param0->unk_6C, 44, param0->unk_74);
for (v5 = 0; v5 < 8; v5++) {
Text_AddPrinterWithParamsAndColor(v0, 0, param0->unk_74, inline_ov19_021DF3AC(v0, 0, param0->unk_74), v5 * 16, 0xff, (u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, param0->unk_74, inline_ov19_021DF3AC(v0, 0, param0->unk_74), v5 * 16, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
}
}
}
@ -559,14 +559,14 @@ static void ov19_021DF4D0(UnkStruct_ov19_021DEC04 *param0, int param1)
for (v5 = 0; v5 < 4; v5++) {
if (v1->unk_20[v5]) {
MessageLoader_GetStrbuf(param0->unk_70, v1->unk_20[v5], param0->unk_74);
Text_AddPrinterWithParamsAndColor(v0, 0, param0->unk_74, inline_ov19_021DF3AC(v0, 0, param0->unk_74), 4 + 24 * v5, 0xff, (u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, param0->unk_74, inline_ov19_021DF3AC(v0, 0, param0->unk_74), 4 + 24 * v5, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
}
}
} else {
MessageLoader_GetStrbuf(param0->unk_6C, 44, param0->unk_74);
for (v5 = 0; v5 < 4; v5++) {
Text_AddPrinterWithParamsAndColor(v0, 0, param0->unk_74, inline_ov19_021DF3AC(v0, 0, param0->unk_74), 4 + 24 * v5, 0xff, (u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, param0->unk_74, inline_ov19_021DF3AC(v0, 0, param0->unk_74), 4 + 24 * v5, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
}
}
}
@ -700,7 +700,7 @@ static void ov19_021DF8C8(UnkStruct_ov19_021DEC04 *param0, int param1)
if (ov19_021D5E34(param0->unk_08)) {
const UnkStruct_ov19_021D5FAC *v1 = ov19_021D5FAC(param0->unk_08, param1);
Text_AddPrinterWithParamsAndColor(v0, 0, v1->unk_28, inline_ov19_021DF3AC(v0, 0, v1->unk_28), 0, 0xff, (u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1->unk_28, inline_ov19_021DF3AC(v0, 0, v1->unk_28), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
}
sub_0201ACCC(v0);

16
src/overlay020/ov20_021D2EA4.c
View File

@ -276,7 +276,7 @@ static u32 ov20_021D32D0(UnkStruct_ov20_021D30F8 *param0)
while (v4) {
switch (ov20_021D3400(&(param0->unk_64), v0)) {
case 0:
Text_AddPrinterWithParamsAndColor(&param0->unk_0C, 1, v0, v1, v2, 0xff, (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((13 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_0C, FONT_MESSAGE, v0, v1, v2, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 4, 13), NULL);
v1 += Font_CalcStrbufWidth(FONT_MESSAGE, v0, 0);
break;
case 1:
@ -414,7 +414,7 @@ static void ov20_021D351C(UnkStruct_ov20_021D30F8 *param0, Window *param1, const
v1 = (v0.unk_00 + (96 / 2)) - (Font_CalcStrbufWidth(FONT_MESSAGE, param0->unk_4C, 0) / 2);
Text_AddPrinterWithParamsAndColor(param1, 1, param0->unk_4C, v0.unk_00, v0.unk_02, 0xff, (u32)(((5 & 0xff) << 16) | ((6 & 0xff) << 8) | ((14 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(param1, FONT_MESSAGE, param0->unk_4C, v0.unk_00, v0.unk_02, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(5, 6, 14), NULL);
}
}
@ -437,22 +437,22 @@ void ov20_021D3578(UnkStruct_ov20_021D30F8 *param0, u32 param1)
StringTemplate_SetBagPocketName(v0, 0, 0);
MessageLoader_GetStrbuf(param0->unk_48, 0 + ov20_021D1F88(param0->unk_04), param0->unk_4C);
StringTemplate_Format(v0, v1, param0->unk_4C);
Text_AddPrinterWithParamsAndColor(&param0->unk_1C, 1, v1, 0, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((9 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_1C, FONT_MESSAGE, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 9), NULL);
Strbuf_Free(v1);
StringTemplate_Free(v0);
} break;
case 2:
MessageLoader_GetStrbuf(param0->unk_48, 6, param0->unk_4C);
Text_AddPrinterWithParamsAndColor(&param0->unk_1C, 1, param0->unk_4C, 0, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((9 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_1C, FONT_MESSAGE, param0->unk_4C, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 9), NULL);
break;
case 1:
MessageLoader_GetStrbuf(param0->unk_48, 7, param0->unk_4C);
Text_AddPrinterWithParamsAndColor(&param0->unk_1C, 1, param0->unk_4C, 0, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((9 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_1C, FONT_MESSAGE, param0->unk_4C, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 9), NULL);
break;
case 3:
MessageLoader_GetStrbuf(param0->unk_48, 8, param0->unk_4C);
Text_AddPrinterWithParamsAndColor(&param0->unk_1C, 1, param0->unk_4C, 0, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((9 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_1C, FONT_MESSAGE, param0->unk_4C, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 9), NULL);
break;
}
@ -539,10 +539,10 @@ void ov20_021D3790(UnkStruct_ov20_021D30F8 *param0, int param1)
BGL_FillWindow(&param0->unk_2C, 9);
MessageLoader_GetStrbuf(param0->unk_48, 9, param0->unk_4C);
Text_AddPrinterWithParamsAndColor(&param0->unk_2C, 0, param0->unk_4C, 14, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((9 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_2C, FONT_SYSTEM, param0->unk_4C, 14, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 9), NULL);
MessageLoader_GetStrbuf(param0->unk_48, 10, param0->unk_4C);
Text_AddPrinterWithParamsAndColor(&param0->unk_2C, 0, param0->unk_4C, 14, 0 + 16, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((9 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_2C, FONT_SYSTEM, param0->unk_4C, 14, 0 + 16, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 9), NULL);
Window_Show(&param0->unk_2C, 0, param0->unk_60, 14);
sub_02014A58(param0->unk_50, &param0->unk_2C, 0, 0 + (param1 * 16));

2
src/overlay020/ov20_021D3864.c
View File

@ -88,7 +88,7 @@ static void ov20_021D390C(BGL *param0, const UnkStruct_ov61_0222C884 *param1, u3
v1 = MessageBank_GetNewStrbufFromNARC(26, 438, param2, 35);
v2 = ((param1->unk_03 * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0)) / 2;
Text_AddPrinterWithParamsAndColor(&v0, 0, v1, v2, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((14 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&v0, FONT_SYSTEM, v1, v2, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 14), NULL);
sub_0201ACCC(&v0);
Strbuf_Free(v1);
BGL_DeleteWindow(&v0);

14
src/overlay020/ov20_021D3A54.c
View File

@ -120,10 +120,10 @@ static u32 ov20_021D3B74(UnkStruct_ov20_021D3E0C *param0, BGL *param1, u32 param
if (sub_02099CA0(param0->unk_08, v0)) {
v5 = MessageLoader_GetNewStrbuf(v4, 0 + v0);
v6 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0));
v6 = TEXT_COLOR(1, 2, 15);
} else {
v5 = MessageLoader_GetNewStrbuf(v4, 12);
v6 = (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((15 & 0xff) << 0));
v6 = TEXT_COLOR(3, 4, 15);
}
GF_ASSERT(param2 < (1024 - 18));
@ -133,7 +133,7 @@ static u32 ov20_021D3B74(UnkStruct_ov20_021D3E0C *param0, BGL *param1, u32 param
v7 = ((9 * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, v5, 0)) / 2;
Text_AddPrinterWithParamsAndColor(&v3, 0, v5, v7, 0, 0xff, v6, NULL);
Text_AddPrinterWithParamsAndColor(&v3, FONT_SYSTEM, v5, v7, 0, TEXT_SPEED_NO_TRANSFER, v6, NULL);
sub_0201A9F4(&v3);
sub_0201ACCC(&v3);
Strbuf_Free(v5);
@ -170,12 +170,12 @@ static u32 ov20_021D3C78(UnkStruct_ov20_021D3E0C *param0, BGL *param1, u32 param
ov20_021D506C(v4, &v5, &v6);
if (sub_02099CDC(param0->unk_08, v4)) {
v2 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0));
v2 = TEXT_COLOR(1, 2, 15);
} else {
v2 = (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((15 & 0xff) << 0));
v2 = TEXT_COLOR(3, 4, 15);
}
Text_AddPrinterWithParamsAndColor(&v0, 0, v1, v5 + 3, v6, 0xff, v2, NULL);
Text_AddPrinterWithParamsAndColor(&v0, FONT_SYSTEM, v1, v5 + 3, v6, TEXT_SPEED_NO_TRANSFER, v2, NULL);
}
sub_0201ACCC(&v0);
@ -210,7 +210,7 @@ static u32 ov20_021D3D44(UnkStruct_ov20_021D3E0C *param0, BGL *param1, u32 param
BGL_AddWindow(param1, &v1, 1, v0[v4].unk_00, v0[v4].unk_02, 8, 2, 11, param2);
BGL_FillWindow(&v1, 15);
Text_AddPrinterWithParamsAndColor(&v1, 0, v3, v5, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&v1, FONT_SYSTEM, v3, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL);
sub_0201A9F4(&v1);
sub_0201ACCC(&v1);
BGL_DeleteWindow(&v1);

4
src/overlay020/ov20_021D40E8.c
View File

@ -325,12 +325,12 @@ static void ov20_021D4658(UnkStruct_ov20_021D4210 *param0, u32 param1, u32 param
ov20_021D2008(param0->unk_04, param1, param0->unk_3C);
if (param2 <= 240) {
Text_AddPrinterWithParamsAndColor(&param0->unk_10, 0, param0->unk_3C, 0 + (param1 & 1) * 112, param2, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_10, FONT_SYSTEM, param0->unk_3C, 0 + (param1 & 1) * 112, param2, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
} else {
u32 v0 = 256 - param2;
BGL_FillWindow(&param0->unk_20, 0);
Text_AddPrinterWithParamsAndColor(&param0->unk_20, 0, param0->unk_3C, 0, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_20, FONT_SYSTEM, param0->unk_3C, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
sub_0201ADDC(&param0->unk_10, param0->unk_20.unk_0C, 0, 0, 12 * 8, 2 * 8, 0 + (param1 & 1) * 112, param2, 12 * 8, v0);
sub_0201ADDC(&param0->unk_10, param0->unk_20.unk_0C, 0, v0, 12 * 8, 2 * 8, 0 + (param1 & 1) * 112, 0, 12 * 8, (2 * 8) - v0);
}

2
src/overlay020/ov20_021D4728.c
View File

@ -192,7 +192,7 @@ static void ov20_021D498C(Window *param0, BGL *param1, const Strbuf *param2, int
v2 = Font_CalcCenterAlignment(2, v5, 0, 88);
for (v0 = 0; v0 < NELEMS(Unk_ov20_021D52EC); v0++) {
v3 = Unk_ov20_021D52EC[v0] + param3;
Text_AddPrinterWithParamsAndColor(param0, 2, v5, v2, v3, 0xFF, (u32)((((1) & 0xFF) << 16) | (((2) & 0xFF) << 8) | (3 & 0xFF)), NULL);
Text_AddPrinterWithParamsAndColor(param0, FONT_SUBSCREEN, v5, v2, v3, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 3), NULL);
}
param3 += 16;
}

4
src/overlay021/ov21_021D0D80.c
View File

@ -669,8 +669,8 @@ void ov21_021D1650(Window *param0, int param1, int param2, int param3)
v1 = ov21_021D561C(param2, GAME_LANGUAGE, param3);
Text_AddPrinterWithParamsAndColor(param0, 2, v0, 22, 0, 0xff, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(param0, 2, v1, 49, 0, 0xff, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(param0, FONT_SUBSCREEN, v0, 22, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 2, 1), NULL);
Text_AddPrinterWithParamsAndColor(param0, FONT_SUBSCREEN, v1, 49, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 2, 1), NULL);
Strbuf_Free(v0);
ov21_021D5600(v1);

6
src/overlay021/ov21_021D4C0C.c
View File

@ -152,7 +152,7 @@ u32 ov21_021D4DAC(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2, u
GF_ASSERT(v0);
v1 = MessageLoader_GetNewStrbuf(v0, param3);
Text_AddPrinterWithParamsAndColor(param1, 2, v1, param4, param5, 0xff, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(param1, FONT_SUBSCREEN, v1, param4, param5, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 2, 1), NULL);
v2 = Font_CalcStrbufWidth(FONT_SUBSCREEN, v1, 0);
Strbuf_Free(v1);
@ -177,14 +177,14 @@ void ov21_021D4E10(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2,
v3 = v3 - v2;
v3 /= 2;
Text_AddPrinterWithParamsAndColor(param1, 2, v1, v3, 0, 0xff, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(param1, FONT_SUBSCREEN, v1, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 2, 1), NULL);
Strbuf_Free(v1);
MessageLoader_Free(v0);
}
void ov21_021D4E80(UnkStruct_ov21_021D4C0C *param0, Window *param1, Strbuf *param2, int param3, int param4)
{
Text_AddPrinterWithParamsAndColor(param1, 2, param2, param3, param4, 0xff, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(param1, FONT_SUBSCREEN, param2, param3, param4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 2, 1), NULL);
}
static BOOL ov21_021D4EA4(UnkStruct_ov21_021D4CA0 *param0)

16
src/overlay021/ov21_021D5AEC.c
View File

@ -739,16 +739,16 @@ static void ov21_021D63DC(UnkStruct_ov21_021D13FC *param0, int param1, int param
MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param1);
MessageLoader_GetStrbuf(v1, 0, v0);
Text_AddPrinterWithParamsAndColor(&param0->unk_04, 0, v0, 8, 152, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_04, FONT_SYSTEM, v0, 8, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
MessageLoader_GetStrbuf(v1, 1, v0);
Text_AddPrinterWithParamsAndColor(&param0->unk_04, 0, v0, 128, 152, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_04, FONT_SYSTEM, v0, 128, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
Strbuf_FormatInt(v0, param2, 3, 2, 1);
Text_AddPrinterWithParamsAndColor(&param0->unk_04, 0, v0, 48, 170, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_04, FONT_SYSTEM, v0, 48, 170, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
Strbuf_FormatInt(v0, param3, 3, 2, 1);
Text_AddPrinterWithParamsAndColor(&param0->unk_04, 0, v0, 180, 170, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_04, FONT_SYSTEM, v0, 180, 170, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
Strbuf_Free(v0);
MessageLoader_Free(v1);
@ -761,9 +761,9 @@ static void ov21_021D64B0(UnkStruct_ov21_021D13FC *param0, int param1, int param
MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param1);
MessageLoader_GetStrbuf(v1, 109, v0);
Text_AddPrinterWithParamsAndColor(&param0->unk_04, 0, v0, 8, 152, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_04, FONT_SYSTEM, v0, 8, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
Strbuf_FormatInt(v0, param2, 3, 2, 1);
Text_AddPrinterWithParamsAndColor(&param0->unk_04, 0, v0, 48, 170, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_04, FONT_SYSTEM, v0, 48, 170, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
Strbuf_Free(v0);
MessageLoader_Free(v1);
sub_0201C3C0(param0->unk_00, 1);
@ -1303,9 +1303,9 @@ static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13
v1 = ov21_021D4D6C(param1->unk_14C, 15, 2);
Strbuf_FormatInt(v2, param4, 3, 2, 1);
Text_AddPrinterWithParamsAndColor(v1, 2, v2, 22, 0, 0xff, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SUBSCREEN, v2, 22, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 2, 1), NULL);
MessageLoader_GetStrbuf(v3, 99, v2);
Text_AddPrinterWithParamsAndColor(v1, 2, v2, 49, 0, 0xff, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SUBSCREEN, v2, 49, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 2, 1), NULL);
if (param0->unk_28[param3]) {
ov21_021D4D1C(param0->unk_28[param3]);

12
src/overlay021/ov21_021D85B0.c
View File

@ -705,7 +705,7 @@ static void ov21_021D8DD4(UnkStruct_ov21_021D879C *param0, int param1, int param
{
u32 v3 = 24 + (208 - Font_CalcMaxLineWidth(FONT_SYSTEM, v1, 0)) / 2;
u32 v4 = 8 + (32 - Strbuf_NumLines(v1) * 16) / 2;
Text_AddPrinterWithParamsAndColor(&v0->unk_04, 0, v1, v3, v4, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&v0->unk_04, FONT_SYSTEM, v1, v3, v4, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
}
Strbuf_Free(v1);
@ -723,7 +723,7 @@ static void ov21_021D8E68(UnkStruct_ov21_021D879C *param0, int param1)
{
u32 v2 = 24 + (208 - Font_CalcMaxLineWidth(FONT_SYSTEM, v1, 0)) / 2;
u32 v3 = 8 + (32 - Strbuf_NumLines(v1) * 16) / 2;
Text_AddPrinterWithParamsAndColor(&v0->unk_04, 0, v1, v2, v3, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&v0->unk_04, FONT_SYSTEM, v1, v2, v3, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
}
Strbuf_Free(v1);
@ -834,7 +834,7 @@ static void ov21_021D9054(UnkStruct_ov21_021D879C *param0, int param1, int param
{
u32 v3 = 88 + Font_CalcCenterAlignment(FONT_SYSTEM, v1, 0, 80);
Text_AddPrinterWithParamsAndColor(&v0->unk_04, 0, v1, v3, 52, 0, ((u32)(((4 & 0xff) << 16) | ((3 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&v0->unk_04, FONT_SYSTEM, v1, v3, 52, TEXT_SPEED_INSTANT, TEXT_COLOR(4, 3, 0), NULL);
}
Strbuf_Free(v1);
@ -886,7 +886,7 @@ static void ov21_021D90B4(UnkStruct_ov21_021D879C *param0, int param1, int param
{
u32 v4 = 88 + Font_CalcCenterAlignment(FONT_SYSTEM, v1, 0, 80);
Text_AddPrinterWithParamsAndColor(&v0->unk_04, 0, v1, v4, 77, 0, ((u32)(((4 & 0xff) << 16) | ((3 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&v0->unk_04, FONT_SYSTEM, v1, v4, 77, TEXT_SPEED_INSTANT, TEXT_COLOR(4, 3, 0), NULL);
}
Strbuf_Free(v1);
@ -962,7 +962,7 @@ static void ov21_021D915C(UnkStruct_ov21_021D879C *param0, int param1, int param
{
u32 v4 = 88 + Font_CalcCenterAlignment(FONT_SYSTEM, v1, 0, 80);
Text_AddPrinterWithParamsAndColor(&v0->unk_04, 0, v1, v4, param3, 0, ((u32)(((4 & 0xff) << 16) | ((3 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&v0->unk_04, FONT_SYSTEM, v1, v4, param3, TEXT_SPEED_INSTANT, TEXT_COLOR(4, 3, 0), NULL);
}
Strbuf_Free(v1);
@ -1083,7 +1083,7 @@ static void ov21_021D93F4(UnkStruct_ov21_021D879C *param0, int param1)
{
u32 v3 = (256 - Font_CalcMaxLineWidth(FONT_SYSTEM, v1, 0)) / 2;
Text_AddPrinterWithParamsAndColor(&v0->unk_04, 0, v1, v3, 128, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&v0->unk_04, FONT_SYSTEM, v1, v3, 128, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
}
Strbuf_Free(v1);

12
src/overlay021/ov21_021DE668.c
View File

@ -421,7 +421,7 @@ static void ov21_021DEB58(UnkStruct_ov21_021DE760 *param0, const UnkStruct_ov21_
v0 = 0;
}
ov21_021DEB8C(&param0->unk_00->unk_04, v0, param2, param1->unk_18, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov21_021DEB8C(&param0->unk_00->unk_04, v0, param2, param1->unk_18, TEXT_COLOR(2, 1, 0));
}
void ov21_021DEB8C(Window *param0, int param1, int param2, int param3, u32 param4)
@ -430,10 +430,10 @@ void ov21_021DEB8C(Window *param0, int param1, int param2, int param3, u32 param
MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param2);
MessageLoader_GetStrbuf(v1, 9, v0);
Text_AddPrinterWithParamsAndColor(param0, 0, v0, 152, 88, 0, param4, NULL);
Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, v0, 152, 88, TEXT_SPEED_INSTANT, param4, NULL);
MessageLoader_GetStrbuf(v1, 10, v0);
Text_AddPrinterWithParamsAndColor(param0, 0, v0, 152, 104, 0, param4, NULL);
Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, v0, 152, 104, TEXT_SPEED_INSTANT, param4, NULL);
Strbuf_Free(v0);
MessageLoader_Free(v1);
@ -450,7 +450,7 @@ static void ov21_021DEC2C(Window *param0, int param1, int param2, u32 param3)
MessageLoader *v1 = MessageLoader_Init(0, 26, heightMessageBankIndex, param1);
MessageLoader_GetStrbuf(v1, param2, v0);
Text_AddPrinterWithParamsAndColor(param0, 0, v0, 184, 88, 0, param3, NULL);
Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, v0, 184, 88, TEXT_SPEED_INSTANT, param3, NULL);
Strbuf_Free(v0);
MessageLoader_Free(v1);
}
@ -463,7 +463,7 @@ static void ov21_021DEC80(Window *param0, int param1, int param2, u32 param3)
MessageLoader *v1 = MessageLoader_Init(0, 26, weightMessageBankIndex, param1);
MessageLoader_GetStrbuf(v1, param2, v0);
Text_AddPrinterWithParamsAndColor(param0, 0, v0, 184, 104, 0, param3, NULL);
Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, v0, 184, 104, TEXT_SPEED_INSTANT, param3, NULL);
Strbuf_Free(v0);
MessageLoader_Free(v1);
}
@ -474,7 +474,7 @@ static void ov21_021DECD4(Window *param0, int param1, int param2, int param3, u3
u32 v1 = Font_CalcMaxLineWidth(FONT_SYSTEM, v0, 0);
u32 v2 = (v1 < 240) ? 128 - v1 / 2 : 8;
Text_AddPrinterWithParamsAndColor(param0, 0, v0, v2, 136, 0, param4, NULL);
Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, v0, v2, 136, TEXT_SPEED_INSTANT, param4, NULL);
ov21_021D5600(v0);
}

8
src/overlay021/ov21_021E0C68.c
View File

@ -435,7 +435,7 @@ static void ov21_021E10D0(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_
v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v0, 0);
v4 /= 2;
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, 0, v0, 176 - v4, 72, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, FONT_SYSTEM, v0, 176 - v4, 72, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
Strbuf_Free(v0);
MessageLoader_Free(v1);
@ -450,7 +450,7 @@ static void ov21_021E1188(UnkStruct_ov21_021E0D7C *param0, int param1, int param
u32 v1 = Font_CalcMaxLineWidth(FONT_SYSTEM, v0, 0);
u32 v2 = (v1 < 240) ? 128 - v1 / 2 : 8;
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, 0, v0, v2, 136, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, FONT_SYSTEM, v0, v2, 136, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
ov21_021D5600(v0);
}
@ -821,7 +821,7 @@ static void ov21_021E18A0(UnkStruct_ov21_021E0D7C *param0, int param1, int param
{
Strbuf *v0 = ov21_021D561C(param2, param3, param1);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, 0, v0, 120, 96, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, FONT_SYSTEM, v0, 120, 96, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
ov21_021D5600(v0);
}
@ -832,6 +832,6 @@ static void ov21_021E18DC(UnkStruct_ov21_021E0D7C *param0, int param1, int param
v1 = 240 - Font_CalcStrbufWidth(FONT_SYSTEM, v0, 0);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, 0, v0, v1, 112, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, FONT_SYSTEM, v0, v1, 112, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
ov21_021D5600(v0);
}

14
src/overlay021/ov21_021E6014.c
View File

@ -460,13 +460,13 @@ static void ov21_021E6600(UnkStruct_ov21_021E6118 *param0, int param1)
{
u32 v2 = Font_CalcCenterAlignment(FONT_SYSTEM, v0, 0, 256);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, 0, v0, v2, 24, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, FONT_SYSTEM, v0, v2, 24, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
}
MessageLoader_GetStrbuf(v1, 9, v0);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, 0, v0, 32, 168, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, FONT_SYSTEM, v0, 32, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
MessageLoader_GetStrbuf(v1, 9, v0);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, 0, v0, 152, 168, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, FONT_SYSTEM, v0, 152, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
Strbuf_Free(v0);
MessageLoader_Free(v1);
}
@ -480,12 +480,12 @@ static void ov21_021E66B0(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_
int heightMessageBankIndex = Height_Message_Bank_Index();
MessageLoader *v1 = MessageLoader_Init(0, 26, heightMessageBankIndex, param2);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, 0, v3, 26, 152, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, FONT_SYSTEM, v3, 26, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
MessageLoader_GetStrbuf(v1, v2, v0);
{
u32 v5 = 32 + 78 - Font_CalcStrbufWidth(FONT_SYSTEM, v0, 0);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, 0, v0, v5, 168, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, FONT_SYSTEM, v0, v5, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
}
Strbuf_Free(v3);
@ -493,7 +493,7 @@ static void ov21_021E66B0(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_
v1 = MessageLoader_Init(0, 26, 697, param2);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, 0, ov21_021D3914(param1->unk_04), 146, 152, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, FONT_SYSTEM, ov21_021D3914(param1->unk_04), 146, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
if (ov21_021D3920(param1->unk_04) == 0) {
MessageLoader_GetStrbuf(v1, 95, v0);
@ -503,7 +503,7 @@ static void ov21_021E66B0(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_
{
u32 v6 = 152 + 78 - Font_CalcStrbufWidth(FONT_SYSTEM, v0, 0);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, 0, v0, v6, 168, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, FONT_SYSTEM, v0, v6, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
}
Strbuf_Free(v0);

14
src/overlay021/ov21_021E737C.c
View File

@ -711,13 +711,13 @@ static void ov21_021E7CF8(UnkStruct_ov21_021E747C *param0, int param1)
{
u32 v2 = Font_CalcCenterAlignment(FONT_SYSTEM, v0, 0, 256);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, 0, v0, v2, 24, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, FONT_SYSTEM, v0, v2, 24, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
}
MessageLoader_GetStrbuf(v1, 10, v0);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, 0, v0, 32, 168, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, FONT_SYSTEM, v0, 32, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
MessageLoader_GetStrbuf(v1, 10, v0);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, 0, v0, 152, 168, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, FONT_SYSTEM, v0, 152, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
Strbuf_Free(v0);
MessageLoader_Free(v1);
}
@ -731,12 +731,12 @@ static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_
int weightMessageBankIndex = Weight_Message_Bank_Index();
MessageLoader *v1 = MessageLoader_Init(0, 26, weightMessageBankIndex, param2);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, 0, v3, 26, 152, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, FONT_SYSTEM, v3, 26, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
MessageLoader_GetStrbuf(v1, v2, v0);
{
u32 v5 = 32 + 78 - Font_CalcStrbufWidth(FONT_SYSTEM, v0, 0);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, 0, v0, v5, 168, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, FONT_SYSTEM, v0, v5, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
}
Strbuf_Free(v3);
@ -744,7 +744,7 @@ static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_
v1 = MessageLoader_Init(0, 26, 697, param2);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, 0, ov21_021D3914(param1->unk_00), 146, 152, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, FONT_SYSTEM, ov21_021D3914(param1->unk_00), 146, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
if (ov21_021D3920(param1->unk_00) == 0) {
MessageLoader_GetStrbuf(v1, 97, v0);
@ -754,7 +754,7 @@ static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_
{
u32 v6 = 152 + 78 - Font_CalcStrbufWidth(FONT_SYSTEM, v0, 0);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, 0, v0, v6, 168, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00->unk_04, FONT_SYSTEM, v0, v6, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
}
Strbuf_Free(v0);

4
src/overlay021/ov21_021E8D48.c
View File

@ -746,7 +746,7 @@ static BOOL ov21_021E9948(PaletteData *param0, Sprite *param1)
static void ov21_021E9968(Window *param0, int param1, int param2)
{
ov21_021DEB8C(param0, param2, param1, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov21_021DEB8C(param0, param2, param1, 0, TEXT_COLOR(2, 1, 0));
ov21_021E998C(param0, param1);
}
@ -756,7 +756,7 @@ static void ov21_021E998C(Window *param0, int param1)
MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param1);
MessageLoader_GetStrbuf(v1, 110, v0);
Text_AddPrinterWithParamsAndColor(param0, 0, v0, 32, 0, 0, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, v0, 32, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(3, 4, 0), NULL);
Strbuf_Free(v0);
MessageLoader_Free(v1);

8
src/overlay022/ov22_02255D44.c
View File

@ -1350,7 +1350,7 @@ static void ov22_022572A0(UnkStruct_ov22_02255D44 *param0, u32 param1, u8 param2
v0 = MessageLoader_Init(0, 26, 385, 13);
v1 = MessageLoader_GetNewStrbuf(v0, param1);
Text_AddPrinterWithParamsAndColor(param0->unk_718, 1, v1, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(param0->unk_718, FONT_MESSAGE, v1, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 15), NULL);
Strbuf_Free(v1);
MessageLoader_Free(v0);
sub_0201A954(param0->unk_718);
@ -1369,7 +1369,7 @@ static void ov22_02257368(UnkStruct_ov22_02255D44 *param0, u32 param1)
v1 = Strbuf_Init(256, 13);
StringTemplate_Format(param0->unk_744, v1, v2);
Text_AddPrinterWithParamsAndColor(param0->unk_718, 1, v1, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(param0->unk_718, FONT_MESSAGE, v1, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 15), NULL);
Strbuf_Free(v1);
Strbuf_Free(v2);
MessageLoader_Free(v0);
@ -1396,10 +1396,10 @@ static u32 ov22_022573EC(UnkStruct_ov22_02255D44 *param0, u32 param1)
if (param0->unk_734->unk_16 == 0) {
v2 = Options_TextFrameDelay(param0->unk_738);
} else {
v2 = 1;
v2 = TEXT_SPEED_FAST;
}
v0 = Text_AddPrinterWithParamsAndColor(param0->unk_718, 1, param0->unk_740, 0, 0, v2, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
v0 = Text_AddPrinterWithParamsAndColor(param0->unk_718, FONT_MESSAGE, param0->unk_740, 0, 0, v2, TEXT_COLOR(1, 2, 15), NULL);
Strbuf_Free(v3);
MessageLoader_Free(v1);

2
src/overlay022/ov22_02259C58.c
View File

@ -442,7 +442,7 @@ static Window *ov22_0225A348(UnkStruct_ov22_0225A0E4 *param0, u32 param1, u32 pa
{
u32 v3 = Font_CalcCenterAlignment(FONT_SUBSCREEN, v1, 0, param4 * 8);
Text_AddPrinterWithParamsAndColor(v2, 2, v1, v3, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((3 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(v2, FONT_SUBSCREEN, v1, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 3), NULL);
}
Strbuf_Free(v1);

22
src/overlay022/ov22_0225A428.c
View File

@ -40,7 +40,7 @@ static void ov22_0225A7B8(UnkStruct_ov22_022597BC *param0);
static void ov22_0225A7C0(Window *param0);
static s32 ov22_0225A7CC(Window *param0, int param1, int param2, int param3, int param4, int param5, u32 param6);
static s32 ov22_0225A814(Window *param0, int param1, int param2, int param3, int param4, int param5, u32 param6, Strbuf **param7);
static s32 ov22_0225A860(Window *param0, int param1, int param2, int param3, int param4, int param5, u32 param6, u32 param7);
static s32 ov22_0225A860(Window *param0, int param1, int param2, int param3, int param4, int param5, TextColor param6, u32 param7);
static s32 ov22_0225A8B4(Window *param0, int param1, int param2, int param3, int param4, int param5, u32 param6, u32 param7, Strbuf **param8);
static void ov22_0225A914(UnkStruct_ov22_0225A914 *param0, CellActorCollection *param1, SpriteResourceCollection **param2, int param3, NARC *param4);
static void ov22_0225A9C8(UnkStruct_ov22_0225A914 *param0, int param1);
@ -85,8 +85,8 @@ void ov22_0225A428(UnkStruct_ov22_0225A428 *param0, UnkStruct_ov22_02256BAC *par
if (param2 & 32) {
ov22_0225A748(&param0->unk_134, param1->unk_00, 2, 1, 27, 2, (18 + 12) + (1 + (27 * 4)), 1);
BGL_FillWindow(param0->unk_134, 15);
ov22_0225A860(param0->unk_134, 26, param1->unk_14, 6, 0, 0, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0)), 0xff);
ov22_0225A860(param0->unk_134, 26, param1->unk_14, param1->unk_18, 72, 0, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0)), 0xff);
ov22_0225A860(param0->unk_134, 26, param1->unk_14, 6, 0, 0, TEXT_COLOR(1, 2, 15), TEXT_SPEED_NO_TRANSFER);
ov22_0225A860(param0->unk_134, 26, param1->unk_14, param1->unk_18, 72, 0, TEXT_COLOR(1, 2, 15), TEXT_SPEED_NO_TRANSFER);
sub_0200E060(param0->unk_134, 0, 1, 1);
}
@ -140,7 +140,7 @@ void ov22_0225A610(UnkStruct_ov22_0225A428 *param0)
void ov22_0225A628(UnkStruct_ov22_0225A428 *param0, int param1, int param2, int param3)
{
GF_ASSERT(param0->unk_138 & 4);
ov22_0225A7CC(param0->unk_2C, param1, param2, param3, 0, 0, 0xff);
ov22_0225A7CC(param0->unk_2C, param1, param2, param3, 0, 0, TEXT_SPEED_NO_TRANSFER);
}
s32 ov22_0225A660(UnkStruct_ov22_0225A428 *param0, int param1, int param2, int param3)
@ -233,7 +233,7 @@ static s32 ov22_0225A7CC(Window *param0, int param1, int param2, int param3, int
s32 v0;
BGL_FillWindow(param0, 15);
v0 = ov22_0225A860(param0, param1, param2, param3, param4, param5, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0)), param6);
v0 = ov22_0225A860(param0, param1, param2, param3, param4, param5, TEXT_COLOR(1, 2, 15), param6);
sub_0200E060(param0, 0, 1, 1);
return v0;
@ -244,13 +244,13 @@ static s32 ov22_0225A814(Window *param0, int param1, int param2, int param3, int
s32 v0;
BGL_FillWindow(param0, 15);
v0 = ov22_0225A8B4(param0, param1, param2, param3, param4, param5, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0)), param6, param7);
v0 = ov22_0225A8B4(param0, param1, param2, param3, param4, param5, TEXT_COLOR(1, 2, 15), param6, param7);
sub_0200E060(param0, 0, 1, 1);
return v0;
}
static s32 ov22_0225A860(Window *param0, int param1, int param2, int param3, int param4, int param5, u32 param6, u32 param7)
static s32 ov22_0225A860(Window *param0, int param1, int param2, int param3, int param4, int param5, TextColor param6, u32 param7)
{
MessageLoader *v0;
Strbuf *v1;
@ -260,7 +260,7 @@ static s32 ov22_0225A860(Window *param0, int param1, int param2, int param3, int
GF_ASSERT(v0);
v1 = MessageLoader_GetNewStrbuf(v0, param3);
v2 = Text_AddPrinterWithParamsAndColor(param0, 1, v1, param4, param5, param7, param6, NULL);
v2 = Text_AddPrinterWithParamsAndColor(param0, FONT_MESSAGE, v1, param4, param5, param7, param6, NULL);
Strbuf_Free(v1);
MessageLoader_Free(v0);
@ -278,7 +278,7 @@ static s32 ov22_0225A8B4(Window *param0, int param1, int param2, int param3, int
v0 = MessageLoader_Init(0, param1, param2, 13);
GF_ASSERT(v0);
*param8 = MessageLoader_GetNewStrbuf(v0, param3);
v1 = Text_AddPrinterWithParamsAndColor(param0, 1, *param8, param4, param5, param7, param6, NULL);
v1 = Text_AddPrinterWithParamsAndColor(param0, FONT_MESSAGE, *param8, param4, param5, param7, param6, NULL);
MessageLoader_Free(v0);
@ -413,8 +413,8 @@ static void ov22_0225AB54(UnkStruct_ov22_0225AB54 *param0, CellActorCollection *
BGL_FillWindow(param0->unk_18, 0);
ov22_0225A860(param0->unk_18, 26, 385, 4, 0, 4, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), 0xff);
ov22_0225A860(param0->unk_18, 26, 385, 5, 0 + 72, 4, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), 0xff);
ov22_0225A860(param0->unk_18, 26, 385, 4, 0, 4, TEXT_COLOR(1, 2, 0), TEXT_SPEED_NO_TRANSFER);
ov22_0225A860(param0->unk_18, 26, 385, 5, 0 + 72, 4, TEXT_COLOR(1, 2, 0), TEXT_SPEED_NO_TRANSFER);
sub_0201A954(param0->unk_18);
}

8
src/overlay022/ov22_0225B660.c
View File

@ -296,7 +296,7 @@ static void ov22_0225BB00(UnkStruct_ov22_0225B85C *param0)
v1 = 128 - (v3 / 2);
v2 = 7;
Text_AddPrinterWithParamsAndColor(param0->unk_200, 0, v7, v1, v2, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(param0->unk_200, FONT_SYSTEM, v7, v1, v2, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v7);
v4 = sub_0202A1F4(param0->unk_00);
@ -310,7 +310,7 @@ static void ov22_0225BB00(UnkStruct_ov22_0225B85C *param0)
v1 = 128 - (v3 / 2);
v2 = 27;
Text_AddPrinterWithParamsAndColor(param0->unk_200, 0, v7, v1, v2, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(param0->unk_200, FONT_SYSTEM, v7, v1, v2, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v7);
Strbuf_Free(v6);
MessageLoader_Free(v8);
@ -358,7 +358,7 @@ static void ov22_0225BC18(UnkStruct_ov22_0225B85C *param0)
v10 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
v8 = 128 - (v10 / 2);
v9 = 7;
Text_AddPrinterWithParamsAndColor(param0->unk_200, 0, v2, v8, v9, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(param0->unk_200, FONT_SYSTEM, v2, v8, v9, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
v3 = MessageLoader_GetNewStrbuf(v7, 44);
StringTemplate_Format(v1, v2, v3);
@ -366,7 +366,7 @@ static void ov22_0225BC18(UnkStruct_ov22_0225B85C *param0)
v10 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
v8 = 128 - (v10 / 2);
v9 = 27;
Text_AddPrinterWithParamsAndColor(param0->unk_200, 0, v2, v8, v9, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(param0->unk_200, FONT_SYSTEM, v2, v8, v9, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v2);
MessageLoader_Free(v7);

2
src/overlay023/ov23_02248C08.c
View File

@ -34,7 +34,7 @@ UnkStruct_ov23_02248D20 *ov23_02248C08(UnkStruct_ov84_02240FA8 *param0, u16 para
v0->unk_1E = param6;
v0->unk_10 = sub_020149F0(param3);
sub_02014A40(v0->unk_10, (u32)(((8 & 0xff) << 16) | ((9 & 0xff) << 8) | ((15 & 0xff) << 0)));
sub_02014A40(v0->unk_10, TEXT_COLOR(8, 9, 15));
v0->unk_1D = param3;

2
src/overlay023/ov23_02248F1C.c
View File

@ -472,7 +472,7 @@ static void ov23_0224966C(BGL *param0, Window *param1, int *param2, int *param3,
case 0:
if ((v0 = ov23_022498C4(param5)) != NULL) {
*param2 = Text_AddPrinterWithParams(
param1, 1, v0, 0, 16, 1, NULL);
param1, FONT_MESSAGE, v0, 0, 16, TEXT_SPEED_FAST, NULL);
*param3 = 1;
}
break;

12
src/overlay023/ov23_022521F0.c
View File

@ -271,14 +271,14 @@ static void ov23_0225265C(BmpList *param0, u32 param1, u8 param2)
BGL_FillWindow(&v0->unk_20, 15);
MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), 23 + v0->unk_2AB, v0->unk_68);
Text_AddPrinterWithParams(&v0->unk_20, 0, v0->unk_68, 1, 1, 0xff, NULL);
Text_AddPrinterWithParams(&v0->unk_20, FONT_SYSTEM, v0->unk_68, 1, 1, TEXT_SPEED_NO_TRANSFER, NULL);
if (param1 != 0xfffffffe) {
StringTemplate_SetUndergroundItemName(v0->unk_70, 2, v0->unk_279[v1]);
StringTemplate_SetNumber(v0->unk_70, 6, v0->unk_27E[v1], 2, 1, 1);
MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), 25, v0->unk_68);
StringTemplate_Format(v0->unk_70, v0->unk_6C, v0->unk_68);
Text_AddPrinterWithParams(&v0->unk_20, 0, v0->unk_6C, 1, 17, 0xff, NULL);
Text_AddPrinterWithParams(&v0->unk_20, FONT_SYSTEM, v0->unk_6C, 1, 17, TEXT_SPEED_NO_TRANSFER, NULL);
} else {
(void)0;
}
@ -351,7 +351,7 @@ static void ov23_02252754(BmpList *param0, u32 param1, u8 param2)
}
MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), 23 + v1->unk_2AB, v1->unk_68);
Text_AddPrinterWithParams(&v1->unk_20, 0, v1->unk_68, 1, 1, 0xff, NULL);
Text_AddPrinterWithParams(&v1->unk_20, FONT_SYSTEM, v1->unk_68, 1, 1, TEXT_SPEED_NO_TRANSFER, NULL);
if (param1 == 0xfffffffe) {
(void)0;
@ -360,7 +360,7 @@ static void ov23_02252754(BmpList *param0, u32 param1, u8 param2)
StringTemplate_SetNumber(v1->unk_70, 6, v8, 2, 1, 1);
MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), 25, v1->unk_68);
StringTemplate_Format(v1->unk_70, v1->unk_6C, v1->unk_68);
Text_AddPrinterWithParams(&v1->unk_20, 0, v1->unk_6C, 1, 17, 0xff, NULL);
Text_AddPrinterWithParams(&v1->unk_20, FONT_SYSTEM, v1->unk_6C, 1, 17, TEXT_SPEED_NO_TRANSFER, NULL);
v1->unk_279[0] = v7;
v1->unk_27E[0] = v8;
@ -368,7 +368,7 @@ static void ov23_02252754(BmpList *param0, u32 param1, u8 param2)
v1->unk_279[0] = v7;
MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), 26, v1->unk_68);
Text_AddPrinterWithParams(&v1->unk_20, 0, v1->unk_68, 1, 17, 0xff, NULL);
Text_AddPrinterWithParams(&v1->unk_20, FONT_SYSTEM, v1->unk_68, 1, 17, TEXT_SPEED_NO_TRANSFER, NULL);
}
sub_0201A9A4(&v1->unk_20);
@ -566,7 +566,7 @@ void ov23_02252D74(UnkStruct_ov23_02250CD4 *param0, int param1)
sub_0201A954(&param0->unk_30);
MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), param1, param0->unk_68);
Text_AddPrinterWithParams(&param0->unk_30, 0, param0->unk_68, 1, 1, 0xff, NULL);
Text_AddPrinterWithParams(&param0->unk_30, FONT_SYSTEM, param0->unk_68, 1, 1, TEXT_SPEED_NO_TRANSFER, NULL);
sub_0201A9A4(&param0->unk_30);
}

32
src/overlay023/ov23_02253598.c
View File

@ -138,31 +138,31 @@ static void ov23_0225360C(Window *param0, MessageLoader *param1, TrainerInfo *pa
v2 = Strbuf_Init(30, HEAP_ID_FIELD);
MessageLoader_GetStrbuf(param1, 0, v1);
Text_AddPrinterWithParams(param0, 0, v1, v7, 1, 0xFF, NULL);
Text_AddPrinterWithParams(param0, FONT_SYSTEM, v1, v7, 1, TEXT_SPEED_NO_TRANSFER, NULL);
MessageLoader_GetStrbuf(param1, 1, v1);
Text_AddPrinterWithParams(param0, 0, v1, v7, v5, 0xFF, NULL);
Text_AddPrinterWithParams(param0, FONT_SYSTEM, v1, v7, v5, TEXT_SPEED_NO_TRANSFER, NULL);
MessageLoader_GetStrbuf(param1, 2, v1);
Text_AddPrinterWithParams(param0, 0, v1, v7 + v10, 1, 0xFF, NULL);
Text_AddPrinterWithParams(param0, FONT_SYSTEM, v1, v7 + v10, 1, TEXT_SPEED_NO_TRANSFER, NULL);
StringTemplate_SetNumber(v0, 6, TrainerInfo_ID_LowHalf(param2), 5, 2, 1);
MessageLoader_GetStrbuf(param1, 5, v1);
StringTemplate_Format(v0, v2, v1);
Text_AddPrinterWithParams(param0, 0, v2, v7 + v12, 1, 0xFF, NULL);
Text_AddPrinterWithParams(param0, FONT_SYSTEM, v2, v7 + v12, 1, TEXT_SPEED_NO_TRANSFER, NULL);
StringTemplate_SetPlayerName(v0, 0, param2);
MessageLoader_GetStrbuf(param1, 4, v1);
StringTemplate_Format(v0, v2, v1);
Text_AddPrinterWithParams(param0, 0, v2, v7 + v9, 1, 0xFF, NULL);
Text_AddPrinterWithParams(param0, FONT_SYSTEM, v2, v7 + v9, 1, TEXT_SPEED_NO_TRANSFER, NULL);
v3 = sub_0202958C(param3);
MessageLoader_GetStrbuf(param1, 20 + v3, v1);
Text_AddPrinterWithParams(param0, 0, v1, v7 + v9, v5, 0xFF, NULL);
Text_AddPrinterWithParams(param0, FONT_SYSTEM, v1, v7 + v9, v5, TEXT_SPEED_NO_TRANSFER, NULL);
for (v3 = 0; v3 < 7; v3++) {
MessageLoader_GetStrbuf(param1, 6 + v3, v1);
Text_AddPrinterWithParams(param0, 0, v1, v7, v6 + v8 * v3, 0xFF, NULL);
Text_AddPrinterWithParams(param0, FONT_SYSTEM, v1, v7, v6 + v8 * v3, TEXT_SPEED_NO_TRANSFER, NULL);
}
for (v3 = 0; v3 < 7; v3++) {
@ -172,7 +172,7 @@ static void ov23_0225360C(Window *param0, MessageLoader *param1, TrainerInfo *pa
StringTemplate_SetNumber(v0, 6, v4, 6, 1, 1);
MessageLoader_GetStrbuf(param1, 13, v1);
StringTemplate_Format(v0, v2, v1);
Text_AddPrinterWithParams(param0, 0, v2, v7 + v12, v6 + v8 * v3, 0xFF, NULL);
Text_AddPrinterWithParams(param0, FONT_SYSTEM, v2, v7 + v12, v6 + v8 * v3, TEXT_SPEED_NO_TRANSFER, NULL);
}
Strbuf_Free(v1);
@ -354,18 +354,18 @@ static void ov23_02253A78(Window *param0, MessageLoader *param1, TrainerInfo *pa
StringTemplate_SetPlayerName(v0, 1, param2);
MessageLoader_GetStrbuf(param1, 12, v1);
StringTemplate_Format(v0, v2, v1);
Text_AddPrinterWithParams(param0, 0, v2, v7, 1, 0xff, NULL);
Text_AddPrinterWithParams(param0, FONT_SYSTEM, v2, v7, 1, TEXT_SPEED_NO_TRANSFER, NULL);
MessageLoader_GetStrbuf(param1, 13, v1);
Text_AddPrinterWithParams(param0, 0, v1, v7, 1 + v8, 0xff, NULL);
Text_AddPrinterWithParams(param0, FONT_SYSTEM, v1, v7, 1 + v8, TEXT_SPEED_NO_TRANSFER, NULL);
StringTemplate_SetNumber(v0, 6, sub_020295B8(param3), 6, 1, 1);
MessageLoader_GetStrbuf(param1, 14, v1);
StringTemplate_Format(v0, v2, v1);
Text_AddPrinterWithParams(param0, 0, v2, v7 + 100, 1 + v8, 0xff, NULL);
Text_AddPrinterWithParams(param0, FONT_SYSTEM, v2, v7 + 100, 1 + v8, TEXT_SPEED_NO_TRANSFER, NULL);
MessageLoader_GetStrbuf(param1, 15, v1);
Text_AddPrinterWithParams(param0, 0, v1, v7, 1 + v8 * 3, 0xff, NULL);
Text_AddPrinterWithParams(param0, FONT_SYSTEM, v1, v7, 1 + v8 * 3, TEXT_SPEED_NO_TRANSFER, NULL);
for (v3 = 0; v3 < 5; v3++) {
TrainerInfo *v13 = sub_020288C8(param4, 4, v3);
@ -374,19 +374,19 @@ static void ov23_02253A78(Window *param0, MessageLoader *param1, TrainerInfo *pa
StringTemplate_SetPlayerName(v0, 0, v13);
MessageLoader_GetStrbuf(param1, 16, v1);
StringTemplate_Format(v0, v2, v1);
Text_AddPrinterWithParams(param0, 0, v2, v7, 1 + v8 * (4 + v3), 0xff, NULL);
Text_AddPrinterWithParams(param0, FONT_SYSTEM, v2, v7, 1 + v8 * (4 + v3), TEXT_SPEED_NO_TRANSFER, NULL);
StringTemplate_SetNumber(v0, 5, TrainerInfo_ID_LowHalf(v13), 5, 2, 1);
MessageLoader_GetStrbuf(param1, 17, v1);
StringTemplate_Format(v0, v2, v1);
Text_AddPrinterWithParams(param0, 0, v2, v7 + v12, 1 + v8 * (4 + v3), 0xff, NULL);
Text_AddPrinterWithParams(param0, FONT_SYSTEM, v2, v7 + v12, 1 + v8 * (4 + v3), TEXT_SPEED_NO_TRANSFER, NULL);
Heap_FreeToHeap(v13);
} else {
MessageLoader_GetStrbuf(param1, 51, v1);
Text_AddPrinterWithParams(param0, 0, v1, v7, 1 + v8 * (4 + v3), 0xff, NULL);
Text_AddPrinterWithParams(param0, FONT_SYSTEM, v1, v7, 1 + v8 * (4 + v3), TEXT_SPEED_NO_TRANSFER, NULL);
MessageLoader_GetStrbuf(param1, 52, v1);
Text_AddPrinterWithParams(param0, 0, v1, v7 + v12, 1 + v8 * (4 + v3), 0xff, NULL);
Text_AddPrinterWithParams(param0, FONT_SYSTEM, v1, v7 + v12, 1 + v8 * (4 + v3), TEXT_SPEED_NO_TRANSFER, NULL);
}
}

2
src/overlay023/ov23_02253D40.c
View File

@ -187,7 +187,7 @@ static int ov23_02253E90(UnkStruct_ov23_02253E2C *param0, BOOL param1, UnkStruct
v0 = ov23_02253E6C(param0);
param0->unk_30 = Text_AddPrinterWithParams(&param0->unk_08, 1, v0, 0, 0, param0->unk_38, NULL);
param0->unk_30 = Text_AddPrinterWithParams(&param0->unk_08, FONT_MESSAGE, v0, 0, 0, param0->unk_38, NULL);
param0->unk_1C = param2;
param0->unk_3C = param3;

6
src/overlay023/ov23_022542CC.c
View File

@ -190,7 +190,7 @@ static void ov23_0225437C(UnkStruct_ov23_022542D8 *param0)
BGL_FillWindow(&param0->unk_14, 15);
v8 = MessageLoader_GetNewStrbuf(v5, 0);
Text_AddPrinterWithParams(&param0->unk_14, 0, v8, 0, 0, 0xff, NULL);
Text_AddPrinterWithParams(&param0->unk_14, FONT_SYSTEM, v8, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL);
Strbuf_Free(v8);
}
@ -438,13 +438,13 @@ static void ov23_022546E0(UnkStruct_ov23_02254594 *param0)
v14 = MessageLoader_GetNewStrbuf(v12, 10);
v15 = Strbuf_Init(6, 4);
Text_AddPrinterWithParams(&param0->unk_18, 0, v13, 0, 0, 0xff, NULL);
Text_AddPrinterWithParams(&param0->unk_18, FONT_SYSTEM, v13, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL);
v16 = StringTemplate_Default(4);
StringTemplate_SetNumber(v16, 0, param0->unk_40, 2, 1, 1);
StringTemplate_SetNumber(v16, 1, param0->unk_41, 2, 1, 1);
StringTemplate_Format(v16, v15, v14);
Text_AddPrinterWithParams(&param0->unk_18, 0, v15, 0, 16, 0xff, NULL);
Text_AddPrinterWithParams(&param0->unk_18, FONT_SYSTEM, v15, 0, 16, TEXT_SPEED_NO_TRANSFER, NULL);
StringTemplate_Free(v16);
Strbuf_Free(v13);

4
src/overlay043/ov43_02256544.c
View File

@ -355,7 +355,7 @@ static void ov43_02256988(UnkStruct_ov43_02256544 *param0, Window *param1, u32 p
v0 = Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_BC, 0);
Text_AddPrinterWithParamsAndColor(param1, 0, param0->unk_BC, ((6 * 8) - v0) / 2, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(param1, FONT_SYSTEM, param0->unk_BC, ((6 * 8) - v0) / 2, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL);
sub_0201ACCC(param1);
}
@ -363,7 +363,7 @@ static void ov43_02256A00(UnkStruct_ov43_02256544 *param0, Window *param1, u32 p
{
BGL_FillWindow(param1, 4);
MessageLoader_GetStrbuf(param0->unk_B8, param2, param0->unk_BC);
Text_AddPrinterWithParamsAndColor(param1, 0, param0->unk_BC, 0, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(param1, FONT_SYSTEM, param0->unk_BC, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL);
sub_0201ACCC(param1);
}

2
src/overlay048/ov48_0225650C.c
View File

@ -164,7 +164,7 @@ static void ov48_02256650(UnkStruct_ov48_0225650C *param0, u32 param1)
if (v1) {
BGL_AddWindow(param0->unk_04, &v0, 6, 18, 20, 8, 2, 0, param1);
BGL_FillWindow(&v0, 4);
Text_AddPrinterWithParamsAndColor(&v0, 0, v1, 0, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL);
sub_0201A9F4(&v0);
sub_0201ACCC(&v0);
BGL_DeleteWindow(&v0);

20
src/overlay052/ov52_02256694.c
View File

@ -330,7 +330,7 @@ static void ov52_02256A7C(UnkStruct_ov52_02256694 *param0)
v0 = ((24 * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_5C, 0)) / 2;
Text_AddPrinterWithParamsAndColor(&param0->unk_20, 0, param0->unk_5C, v0, 8, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_20, FONT_SYSTEM, param0->unk_5C, v0, 8, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL);
MessageLoader_GetStrbuf(param0->unk_58, 10, param0->unk_5C);
v0 = ((24 * 8) - Font_CalcMaxLineWidth(FONT_SYSTEM, param0->unk_5C, 0)) / 2;
@ -339,7 +339,7 @@ static void ov52_02256A7C(UnkStruct_ov52_02256694 *param0)
u32 v1 = 8 + 56;
v1 -= Strbuf_NumLines(param0->unk_5C) * 8;
Text_AddPrinterWithParamsAndColor(&param0->unk_20, 0, param0->unk_5C, v0, v1, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_20, FONT_SYSTEM, param0->unk_5C, v0, v1, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL);
}
sub_0201ACCC(&param0->unk_20);
@ -352,7 +352,7 @@ static void ov52_02256B10(UnkStruct_ov52_02256694 *param0)
{
u32 v0 = (24 * 8 - Font_CalcMaxLineWidth(FONT_SYSTEM, param0->unk_5C, 0)) / 2;
Text_AddPrinterWithParamsAndColor(&param0->unk_20, 0, param0->unk_5C, v0, 16, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_20, FONT_SYSTEM, param0->unk_5C, v0, 16, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL);
}
sub_0201ACCC(&param0->unk_20);
@ -367,9 +367,9 @@ static void ov52_02256B64(UnkStruct_ov52_02256694 *param0)
v0 = ((24 * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_5C, 0)) / 2;
Text_AddPrinterWithParamsAndColor(&param0->unk_20, 0, param0->unk_5C, v0, 8, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_20, FONT_SYSTEM, param0->unk_5C, v0, 8, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL);
MessageLoader_GetStrbuf(param0->unk_58, 3, param0->unk_5C);
Text_AddPrinterWithParamsAndColor(&param0->unk_20, 0, param0->unk_5C, 16, 24, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_20, FONT_SYSTEM, param0->unk_5C, 16, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL);
sub_0201ACCC(&param0->unk_20);
}
@ -382,11 +382,11 @@ static void ov52_02256BDC(UnkStruct_ov52_02256694 *param0)
MessageLoader_GetStrbuf(param0->unk_58, 2, param0->unk_5C);
v0 = ((24 * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_5C, 0)) / 2;
Text_AddPrinterWithParamsAndColor(&param0->unk_20, 0, param0->unk_5C, v0, 8, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_20, FONT_SYSTEM, param0->unk_5C, v0, 8, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL);
MessageLoader_GetStrbuf(param0->unk_58, 4, param0->unk_5C);
v1 = ((24 * 8) - Font_CalcMaxLineWidth(FONT_SYSTEM, param0->unk_5C, 0)) / 2;
Text_AddPrinterWithParamsAndColor(&param0->unk_20, 0, param0->unk_5C, v1, 24, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_20, FONT_SYSTEM, param0->unk_5C, v1, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL);
sub_0201ACCC(&param0->unk_20);
}
@ -406,13 +406,13 @@ static void ov52_02256C64(UnkStruct_ov52_02256694 *param0, const UnkStruct_ov52_
MessageLoader_GetStrbuf(param0->unk_58, 5, param0->unk_5C);
v1 = ((24 * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_5C, 0)) / 2;
Text_AddPrinterWithParamsAndColor(&param0->unk_20, 0, param0->unk_5C, v1, 8, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_20, FONT_SYSTEM, param0->unk_5C, v1, 8, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL);
for (v2 = 0; v2 < 4; v2++) {
MessageLoader_GetStrbuf(param0->unk_58, v0[v2], param0->unk_5C);
Text_AddPrinterWithParamsAndColor(&param0->unk_20, 0, param0->unk_5C, 8, 32 + 16 * v2, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_20, FONT_SYSTEM, param0->unk_5C, 8, 32 + 16 * v2, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL);
Strbuf_FormatInt(param0->unk_5C, param1->unk_00[v2], 2, 2, 1);
Text_AddPrinterWithParamsAndColor(&param0->unk_20, 0, param0->unk_5C, 160, 32 + 16 * v2, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_20, FONT_SYSTEM, param0->unk_5C, 160, 32 + 16 * v2, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL);
}
sub_0201ACCC(&param0->unk_20);

2
src/overlay054/ov54_0225642C.c
View File

@ -134,7 +134,7 @@ static void ov54_022564BC(SysTask *param0, void *param1)
Strbuf *v5 = MessageBank_GetNewStrbufFromNARC(26, 458, 0, 8);
if (v5) {
Text_AddPrinterWithParamsAndColor(&v4, 0, v5, (192 - Font_CalcStrbufWidth(FONT_SYSTEM, v5, 0)) / 2, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&v4, FONT_SYSTEM, v5, (192 - Font_CalcStrbufWidth(FONT_SYSTEM, v5, 0)) / 2, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL);
sub_0201ACCC(&v4);
Strbuf_Free(v5);
}

6
src/overlay056/ov56_022561C0.c
View File

@ -464,13 +464,13 @@ static void ov56_022567FC(UnkStruct_ov56_02256468 *param0, int param1, UnkStruct
BGL_FillWindow(&param0->unk_22C[param1].unk_00, 0x0);
BGL_FillWindow(&param0->unk_22C[param1].unk_10, 0x0);
BGL_FillWindow(&param0->unk_22C[param1].unk_20, 0x0);
Text_AddPrinterWithParamsAndColor(&param0->unk_22C[param1].unk_00, 1, param2->unk_00, 0, 1, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_22C[param1].unk_10, 1, param2->unk_04, 0, 6, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_22C[param1].unk_00, FONT_MESSAGE, param2->unk_00, 0, 1, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_22C[param1].unk_10, FONT_MESSAGE, param2->unk_04, 0, 6, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
sub_0201A9A4(&param0->unk_22C[param1].unk_00);
sub_0201A9A4(&param0->unk_22C[param1].unk_10);
if (param2->unk_08) {
Text_AddPrinterWithParamsAndColor(&param0->unk_22C[param1].unk_20, 1, param2->unk_08, 0, 1, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_22C[param1].unk_20, FONT_MESSAGE, param2->unk_08, 0, 1, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
}
sub_0201A9A4(&param0->unk_22C[param1].unk_20);

30
src/overlay058/ov58_021D0D80.c
View File

@ -272,7 +272,7 @@ int ov58_021D0F08(OverlayManager *param0, int *param1)
*param1 = Unk_ov58_021D3180[v0->unk_368].unk_00(v0, *param1);
}
ov58_021D28E4(v0->unk_2DC, 0, (u32)(((0xe & 0xff) << 16) | ((0xd & 0xff) << 8) | ((0xf & 0xff) << 0)), v0);
ov58_021D28E4(v0->unk_2DC, 0, TEXT_COLOR(14, 13, 15), v0);
if (CommSys_CurNetId() == 0) {
int v1 = ov58_021D2B5C(v0);
@ -741,7 +741,7 @@ static void ov58_021D18AC(UnkStruct_02095EAC *param0, OverlayManager *param1)
{
u32 v0 = Font_CalcCenterAlignment(FONT_MESSAGE, param0->unk_28, 0, (7 - 1) * 8) + 2;
Text_AddPrinterWithParamsAndColor(&param0->unk_34C, 1, param0->unk_28, v0, 0, 0, (u32)(((0x7 & 0xff) << 16) | ((0x1 & 0xff) << 8) | ((0x0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_34C, FONT_MESSAGE, param0->unk_28, v0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(7, 1, 0), NULL);
}
{
@ -752,7 +752,7 @@ static void ov58_021D18AC(UnkStruct_02095EAC *param0, OverlayManager *param1)
BGL_FillWindow(&param0->unk_2DC[v1], 0);
}
ov58_021D28E4(param0->unk_2DC, 0, (u32)(((0xe & 0xff) << 16) | ((0xd & 0xff) << 8) | ((0xf & 0xff) << 0)), param0);
ov58_021D28E4(param0->unk_2DC, 0, TEXT_COLOR(14, 13, 15), param0);
}
}
@ -839,7 +839,7 @@ static void ov58_021D1A80(UnkStruct_02095EAC *param0)
sub_02037B58(CommSys_ConnectedCount());
param0->unk_9458 = 2;
ov58_021D2A98(param0, 1, 1);
ov58_021D2A98(param0, 1, TEXT_SPEED_FAST);
ov58_021D2CB0(param0, 5);
ov58_021D1CDC(param0->unk_2AC, 1);
v2 = 1;
@ -848,7 +848,7 @@ static void ov58_021D1A80(UnkStruct_02095EAC *param0)
if (param0->unk_43E6[0].unk_09 == 2) {
Sound_PlayEffect(1522);
} else {
ov58_021D2A98(param0, 1, 1);
ov58_021D2A98(param0, 1, TEXT_SPEED_FAST);
ov58_021D2CB0(param0, 5);
ov58_021D1CDC(param0->unk_2AC, 1);
v2 = 1;
@ -949,9 +949,9 @@ static void ov58_021D1D40(UnkStruct_02095EAC *param0)
static int ov58_021D1D64(UnkStruct_02095EAC *param0, int param1)
{
if (CommSys_CurNetId() == param0->unk_384) {
ov58_021D2A98(param0, 13, 0);
ov58_021D2A98(param0, 13, TEXT_SPEED_INSTANT);
} else {
ov58_021D2A98(param0, 0, 0);
ov58_021D2A98(param0, 0, TEXT_SPEED_INSTANT);
}
ov58_021D2CB0(param0, 2);
@ -1038,7 +1038,7 @@ static int ov58_021D1E4C(UnkStruct_02095EAC *param0, int param1)
case 1:
if (CommSys_CurNetId() == 0) {
ov58_021D2CB0(param0, 13);
ov58_021D2A98(param0, 4, 1);
ov58_021D2A98(param0, 4, TEXT_SPEED_FAST);
} else {
UnkStruct_02095FE4 v1;
@ -1136,7 +1136,7 @@ static int ov58_021D20A8(UnkStruct_02095EAC *param0, int param1)
{
u8 v0;
ov58_021D2A98(param0, 6, 1);
ov58_021D2A98(param0, 6, TEXT_SPEED_FAST);
ov58_021D2CB0(param0, 11);
ov58_021D1D40(param0);
@ -1227,7 +1227,7 @@ static int ov58_021D223C(UnkStruct_02095EAC *param0, int param1)
{
StringTemplate_SetPlayerName(param0->unk_0C, 0, CommInfo_TrainerInfo(0));
ov58_021D2A98(param0, 3, 1);
ov58_021D2A98(param0, 3, TEXT_SPEED_FAST);
ov58_021D2CB0(param0, 16);
ov58_021D1D40(param0);
@ -1263,7 +1263,7 @@ static int ov58_021D22D8(UnkStruct_02095EAC *param0, int param1)
static int ov58_021D22DC(UnkStruct_02095EAC *param0, int param1)
{
ov58_021D2A98(param0, 5, 1);
ov58_021D2A98(param0, 5, TEXT_SPEED_FAST);
ov58_021D2CB0(param0, 20);
ov58_021D1D40(param0);
@ -1286,7 +1286,7 @@ static int ov58_021D2320(UnkStruct_02095EAC *param0, int param1)
Text_RemovePrinter(param0->unk_30);
}
ov58_021D2A98(param0, 2, 1);
ov58_021D2A98(param0, 2, TEXT_SPEED_FAST);
ov58_021D2CB0(param0, 22);
Sound_PlayEffect(1508);
@ -1652,9 +1652,9 @@ static void ov58_021D28E4(Window *param0, int param1, u32 param2, UnkStruct_0209
TrainerInfo_NameStrbuf(param3->unk_398[v0][0], param3->unk_14[v0]);
if (v1 == v0) {
Text_AddPrinterWithParamsAndColor(&param0[v0], 1, param3->unk_14[v0], 0, 0, 0xff, (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((15 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0[v0], FONT_MESSAGE, param3->unk_14[v0], 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 4, 15), NULL);
} else {
Text_AddPrinterWithParamsAndColor(&param0[v0], 1, param3->unk_14[v0], 0, 0, 0xff, param2, NULL);
Text_AddPrinterWithParamsAndColor(&param0[v0], FONT_MESSAGE, param3->unk_14[v0], 0, 0, TEXT_SPEED_NO_TRANSFER, param2, NULL);
}
}
@ -1730,7 +1730,7 @@ static void ov58_021D2A98(UnkStruct_02095EAC *param0, int param1, int param2)
param2 = 0;
}
param0->unk_30 = Text_AddPrinterWithParams(&param0->unk_33C, 1, param0->unk_2C, 0, 0, param2, NULL);
param0->unk_30 = Text_AddPrinterWithParams(&param0->unk_33C, FONT_MESSAGE, param0->unk_2C, 0, 0, param2, NULL);
if (param2 == 0) {
param0->unk_30 = 0xff;

22
src/overlay059/ov59_021D0D80.c
View File

@ -265,7 +265,7 @@ int ov59_021D0F00(OverlayManager *param0, int *param1)
}
if (v0->unk_4AA4 == 0) {
ov59_021D2418(v0->unk_2FC, 0, (u32)(((1 & 0xff) << 16) | ((3 & 0xff) << 8) | ((0 & 0xff) << 0)), v0);
ov59_021D2418(v0->unk_2FC, 0, TEXT_COLOR(1, 3, 0), v0);
}
ov59_021D26E8(v0);
@ -692,7 +692,7 @@ static void ov59_021D16A0(UnkStruct_020961E8 *param0, OverlayManager *param1)
BGL_FillWindow(&param0->unk_34C, 0xf0f);
BGL_AddWindow(param0->unk_00, &param0->unk_36C, 0, 3, 1, 26, 2, 15, ((1 + (18 + 12) + 9) + 27 * 4));
ov59_021D1784(&param0->unk_36C, param0->unk_48, 0);
ov59_021D1784(&param0->unk_36C, param0->unk_48, TEXT_SPEED_INSTANT);
{
int v0;
@ -700,7 +700,7 @@ static void ov59_021D16A0(UnkStruct_020961E8 *param0, OverlayManager *param1)
BGL_AddWindow(param0->unk_00, &param0->unk_2FC[0], 0, 2, 6, 16, 11, 15, (((1 + (18 + 12) + 9) + 27 * 4) + 26 * 2));
BGL_FillWindow(&param0->unk_2FC[0], 0);
ov59_021D2418(param0->unk_2FC, 0, (u32)(((1 & 0xff) << 16) | ((3 & 0xff) << 8) | ((0 & 0xff) << 0)), param0);
ov59_021D2418(param0->unk_2FC, 0, TEXT_COLOR(1, 3, 0), param0);
}
}
@ -710,7 +710,7 @@ static void ov59_021D1784(Window *param0, Strbuf *param1, int param2)
int v1 = (26 * 8 - v0) / 2;
BGL_FillWindow(param0, 0x0);
Text_AddPrinterWithParamsAndColor(param0, 1, param1, v1, 1, param2, (u32)(((1 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(param0, FONT_MESSAGE, param1, v1, 1, param2, TEXT_COLOR(1, 4, 0), NULL);
}
static void ov59_021D17C8(UnkStruct_020961E8 *param0)
@ -1048,7 +1048,7 @@ static int ov59_021D1D14(UnkStruct_020961E8 *param0, int param1)
void ov59_021D1D40(UnkStruct_020961E8 *param0)
{
MessageLoader_GetStrbuf(param0->unk_28, 18, param0->unk_48);
ov59_021D1784(&param0->unk_36C, param0->unk_48, 0);
ov59_021D1784(&param0->unk_36C, param0->unk_48, TEXT_SPEED_INSTANT);
CellActor_SetAnim(param0->unk_28C[0], 37);
param0->unk_0C.unk_00 = 1;
@ -1487,11 +1487,11 @@ static BOOL ov59_021D2418(Window *param0, int param1, u32 param2, UnkStruct_0209
v2 = MessageUtil_ExpandedStrbuf(param3->unk_24, param3->unk_28, 1, 51);
if (v1 == v0) {
Text_AddPrinterWithParamsAndColor(&param0[0], 0, param3->unk_2C[v0], 5, 1 + v0 * 18, 0xff, (u32)(((2 & 0xff) << 16) | ((3 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0[0], 0, v2, 5 + 13 * 5, 1 + v0 * 18, 0xff, (u32)(((2 & 0xff) << 16) | ((3 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0[0], FONT_SYSTEM, param3->unk_2C[v0], 5, 1 + v0 * 18, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(2, 3, 0), NULL);
Text_AddPrinterWithParamsAndColor(&param0[0], FONT_SYSTEM, v2, 5 + 13 * 5, 1 + v0 * 18, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(2, 3, 0), NULL);
} else {
Text_AddPrinterWithParamsAndColor(&param0[0], 0, param3->unk_2C[v0], 5, 1 + v0 * 18, 0xff, param2, NULL);
Text_AddPrinterWithParamsAndColor(&param0[0], 0, v2, 5 + 13 * 5, 1 + v0 * 18, 0xff, param2, NULL);
Text_AddPrinterWithParamsAndColor(&param0[0], FONT_SYSTEM, param3->unk_2C[v0], 5, 1 + v0 * 18, TEXT_SPEED_NO_TRANSFER, param2, NULL);
Text_AddPrinterWithParamsAndColor(&param0[0], FONT_SYSTEM, v2, 5 + 13 * 5, 1 + v0 * 18, TEXT_SPEED_NO_TRANSFER, param2, NULL);
}
Strbuf_Free(v2);
@ -1581,9 +1581,9 @@ static void ov59_021D2628(UnkStruct_020961E8 *param0, int param1, int param2)
sub_0200E060(&param0->unk_34C, 0, 1, 10);
if (param2 == 0) {
param0->unk_4C = Text_AddPrinterWithParams(&param0->unk_34C, 1, param0->unk_44, 0, 0, ov59_021D28D4(param0), NULL);
param0->unk_4C = Text_AddPrinterWithParams(&param0->unk_34C, FONT_MESSAGE, param0->unk_44, 0, 0, ov59_021D28D4(param0), NULL);
} else {
Text_AddPrinterWithParams(&param0->unk_34C, 1, param0->unk_44, 0, 0, 0, NULL);
Text_AddPrinterWithParams(&param0->unk_34C, FONT_MESSAGE, param0->unk_44, 0, 0, TEXT_SPEED_INSTANT, NULL);
param0->unk_4C = 0xff;
}
}

26
src/overlay061/ov61_0222BF44.c
View File

@ -94,7 +94,7 @@ static void ov61_0222C3B0(UnkStruct_ov61_0222C664 *param0);
static void ov61_0222C664(UnkStruct_ov61_0222C664 *param0);
static void ov61_0222C70C(UnkStruct_ov61_0222C664 *param0);
static int ov61_0222C728(Window *param0, Strbuf *param1, int param2, int param3, u32 param4, int param5);
void ov61_0222C760(Window *param0, Strbuf *param1, int param2, int param3, int param4, u32 param5);
void ov61_0222C760(Window *param0, Strbuf *param1, int param2, int param3, int param4, TextColor param5);
static void ov61_0222C794(UnkStruct_ov61_0222C664 *param0, int param1);
static void ov61_0222C7F8(UnkStruct_ov61_0222C664 *param0, int param1, int param2);
static int ov61_0222C834(int param0);
@ -464,7 +464,7 @@ static void ov61_0222C664(UnkStruct_ov61_0222C664 *param0)
BGL_AddWindow(param0->unk_04, &param0->unk_54, 0, 4, 1, 24, 2, 13, ((((1 + (18 + 12)) + 9) + 27 * 4) + 23 * 16));
BGL_FillWindow(&param0->unk_54, 0x0);
ov61_0222C760(&param0->unk_54, param0->unk_38, 0, 1, 1, (u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)));
ov61_0222C760(&param0->unk_54, param0->unk_38, 0, 1, 1, TEXT_COLOR(15, 14, 0));
BGL_AddWindow(param0->unk_04, &param0->unk_44, 0, 2, 19, 27, 4, 13, ((1 + (18 + 12)) + 9));
BGL_FillWindow(&param0->unk_44, 0x0);
@ -495,10 +495,10 @@ static int ov61_0222C728(Window *param0, Strbuf *param1, int param2, int param3,
return param2;
}
void ov61_0222C760(Window *param0, Strbuf *param1, int param2, int param3, int param4, u32 param5)
void ov61_0222C760(Window *param0, Strbuf *param1, int param2, int param3, int param4, TextColor param5)
{
param2 = ov61_0222C728(param0, param1, param2, param4, param5, 1);
Text_AddPrinterWithParamsAndColor(param0, 1, param1, param2, param3, 0, param5, NULL);
Text_AddPrinterWithParamsAndColor(param0, FONT_MESSAGE, param1, param2, param3, TEXT_SPEED_INSTANT, param5, NULL);
}
static void ov61_0222C794(UnkStruct_ov61_0222C664 *param0, int param1)
@ -510,7 +510,7 @@ static void ov61_0222C794(UnkStruct_ov61_0222C664 *param0, int param1)
BGL_FillWindow(&param0->unk_64, 15);
Window_Show(&param0->unk_64, 1, (1 + (18 + 12)), 11);
param0->unk_40 = Text_AddPrinterWithParams(&param0->unk_64, 1, param0->unk_3C, 0, 0, 0, NULL);
param0->unk_40 = Text_AddPrinterWithParams(&param0->unk_64, FONT_MESSAGE, param0->unk_3C, 0, 0, TEXT_SPEED_INSTANT, NULL);
param0->unk_40 = 0xff;
Strbuf_Free(v0);
@ -578,7 +578,7 @@ static void ov61_0222C8B8(UnkStruct_ov61_0222C664 *param0, MessageLoader *param1
BGL_FillWindow(&param0->unk_44, 0xf0f);
sub_0200E060(&param0->unk_44, 0, 1, 10);
param0->unk_40 = Text_AddPrinterWithParams(&param0->unk_44, 1, param0->unk_34, 0, 0, param3, NULL);
param0->unk_40 = Text_AddPrinterWithParams(&param0->unk_44, FONT_MESSAGE, param0->unk_34, 0, 0, param3, NULL);
param0->unk_8C = 0;
if ((param3 == 0xff) || (param3 == 0)) {
@ -633,7 +633,7 @@ static int ov61_0222C960(UnkStruct_ov61_0222C664 *param0)
param0->unk_90++;
break;
case 1:
ov61_0222C8B8(param0, param0->unk_2C, 17, 1, 0xf0f);
ov61_0222C8B8(param0, param0->unk_2C, 17, TEXT_SPEED_FAST, 0xf0f);
param0->unk_90++;
break;
case 2:
@ -665,7 +665,7 @@ static int ov61_0222CA20(UnkStruct_ov61_0222C664 *param0)
case 0:
sub_02038438(param0->unk_00->unk_00->unk_04);
sub_02039734();
ov61_0222C8B8(param0, param0->unk_28, 1, 1, 0xf0f);
ov61_0222C8B8(param0, param0->unk_28, 1, TEXT_SPEED_FAST, 0xf0f);
ov61_0222C850(param0);
param0->unk_90++;
break;
@ -894,7 +894,7 @@ static int ov61_0222CCE8(UnkStruct_ov61_0222C664 *param0)
break;
}
ov61_0222C8B8(param0, param0->unk_24, v0, 1, 0xf0f);
ov61_0222C8B8(param0, param0->unk_24, v0, TEXT_SPEED_FAST, 0xf0f);
ov61_0222C920(param0, 12, 11);
return 0;
@ -904,7 +904,7 @@ static int ov61_0222CD58(UnkStruct_ov61_0222C664 *param0)
{
switch (param0->unk_90) {
case 0:
ov61_0222C8B8(param0, param0->unk_24, 178, 1, 0xf0f);
ov61_0222C8B8(param0, param0->unk_24, 178, TEXT_SPEED_FAST, 0xf0f);
param0->unk_90++;
break;
case 1:
@ -915,7 +915,7 @@ static int ov61_0222CD58(UnkStruct_ov61_0222C664 *param0)
}
break;
case 2:
ov61_0222C8B8(param0, param0->unk_24, 179, 1, 0xf0f);
ov61_0222C8B8(param0, param0->unk_24, 179, TEXT_SPEED_FAST, 0xf0f);
param0->unk_90++;
break;
case 3:
@ -953,7 +953,7 @@ static int ov61_0222CE2C(UnkStruct_ov61_0222C664 *param0)
switch (param0->unk_90) {
case 0:
ov61_0222C8B8(param0, param0->unk_2C, 26, 1, 0xf0f);
ov61_0222C8B8(param0, param0->unk_2C, 26, TEXT_SPEED_FAST, 0xf0f);
param0->unk_90++;
break;
case 1:
@ -963,7 +963,7 @@ static int ov61_0222CE2C(UnkStruct_ov61_0222C664 *param0)
break;
case 2:
sub_02039794();
ov61_0222C8B8(param0, param0->unk_2C, 27, 1, 0xf0f);
ov61_0222C8B8(param0, param0->unk_2C, 27, TEXT_SPEED_FAST, 0xf0f);
param0->unk_90++;
break;
case 3:

4
src/overlay062/ov62_022300D8.c
View File

@ -741,7 +741,7 @@ void ov62_02230FC8(UnkStruct_0208C06C *param0, UnkStruct_ov62_022307C0_sub1 *par
Window_Init(&v2);
BGL_AddFramelessWindow(param0->unk_14.unk_10, &v2, 20, 2, 0, 0);
Text_AddPrinterWithParamsAndColor(&v2, 0, v0, 0, 0, 0xff, ((u32)(((14 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&v2, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(14, 13, 0), NULL);
sub_02012BE0(param1->unk_14, param1->unk_18, &v2, 102);
Strbuf_Free(v0);
BGL_DeleteWindow(&v2);
@ -818,7 +818,7 @@ void ov62_0223124C(UnkStruct_ov62_022312B0 *param0, UnkStruct_ov62_0223118C *par
Window_Init(&v2);
BGL_AddFramelessWindow(param1->unk_10, &v2, 20, 2, 0, 0);
Text_AddPrinterWithParamsAndColor(&v2, 0, v0, 0, 0, 0xff, ((u32)(((14 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&v2, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(14, 13, 0), NULL);
sub_02012BE0(param0->unk_0C, param0->unk_10, &v2, 102);
Strbuf_Free(v0);
BGL_DeleteWindow(&v2);

68
src/overlay062/ov62_02231690.c
View File

@ -233,7 +233,7 @@ void ov62_0223197C(UnkStruct_0208C06C *param0, int param1)
v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1);
BGL_FillWindow(v1, 0xCC);
Text_AddPrinterWithParamsAndColor(v1, 0, v0, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((12 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 12), NULL);
sub_0201A9A4(v1);
Strbuf_Free(v0);
}
@ -282,7 +282,7 @@ void ov62_02231AAC(UnkStruct_0208C06C *param0, int param1)
v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1);
BGL_FillWindow(v1, 0xCC);
Text_AddPrinterWithParamsAndColor(v1, 0, v0, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((12 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 12), NULL);
sub_0201A9A4(v1);
Strbuf_Free(v0);
}
@ -299,7 +299,7 @@ void ov62_02231B3C(UnkStruct_0208C06C *param0, int param1)
v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1);
BGL_FillWindow(v1, 0xCC);
Text_AddPrinterWithParamsAndColor(v1, 0, v0, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((12 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 12), NULL);
sub_0201A9A4(v1);
Strbuf_Free(v0);
}
@ -345,7 +345,7 @@ void ov62_02231BC4(UnkStruct_0208C06C *param0, int param1)
v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1);
BGL_FillWindow(v1, 0xCC);
Text_AddPrinterWithParamsAndColor(v1, 0, v0, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((12 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 12), NULL);
sub_0201A9A4(v1);
Strbuf_Free(v0);
}
@ -403,7 +403,7 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p
Window_Init(v2);
BGL_AddWindow(param1->unk_14.unk_10, v2, 2, Unk_ov62_02248A28[v0][0], Unk_ov62_02248A28[v0][1], Unk_ov62_02248A28[v0][2], Unk_ov62_02248A28[v0][3], 14, v1);
BGL_FillWindow(v2, 0x00);
Text_AddPrinterWithParamsAndColor(v2, 0, v3, ov62_0223429C(v2, v3), 0, (0xff), ((u32)(((15 & (0xff)) << 16) | ((13 & (0xff)) << 8) | ((0 & (0xff)) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v2, FONT_SYSTEM, v3, ov62_0223429C(v2, v3), 0, (0xff), ((u32)(((15 & (0xff)) << 16) | ((13 & (0xff)) << 8) | ((0 & (0xff)) << 0))), NULL);
sub_0201A9A4(v2);
v1 += (Unk_ov62_02248A28[v0][2] * Unk_ov62_02248A28[v0][3]);
Strbuf_Free(v3);
@ -431,7 +431,7 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p
StringTemplate_Format(v9, v8, v7);
BGL_FillWindow(v10, 0x00);
Text_AddPrinterWithParamsAndColor(v10, 0, v8, ov62_0223429C(v10, v8), 0, (0xff), ((u32)(((15 & (0xff)) << 16) | ((13 & (0xff)) << 8) | ((0 & (0xff)) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, ov62_0223429C(v10, v8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v10);
Strbuf_Free(v6);
@ -452,7 +452,7 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p
StringTemplate_Format(v9, v8, v6);
BGL_FillWindow(v10, 0x00);
Text_AddPrinterWithParamsAndColor(v10, 0, v8, ov62_0223429C(v10, v8), 0, (0xff), ((u32)(((15 & (0xff)) << 16) | ((13 & (0xff)) << 8) | ((0 & (0xff)) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, ov62_0223429C(v10, v8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v10);
Strbuf_Free(v6);
@ -465,7 +465,7 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p
v10 = &param0->unk_0C[3];
v8 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 16);
BGL_FillWindow(v10, 0x00);
Text_AddPrinterWithParamsAndColor(v10, 0, v8, ov62_0223429C(v10, v8), 0, (0xff), ((u32)(((15 & (0xff)) << 16) | ((13 & (0xff)) << 8) | ((0 & (0xff)) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, ov62_0223429C(v10, v8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v10);
Strbuf_Free(v8);
@ -478,7 +478,7 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p
if (v13 == 0) {
v8 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 21);
Text_AddPrinterWithParamsAndColor(v10, 0, v8, 0, 0, (0xff), ((u32)(((15 & (0xff)) << 16) | ((13 & (0xff)) << 8) | ((0 & (0xff)) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v10);
Strbuf_Free(v8);
} else {
@ -487,7 +487,7 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p
StringTemplate_SetCountryName(v9, 0, v13);
StringTemplate_Format(v9, v8, v6);
Text_AddPrinterWithParamsAndColor(v10, 0, v8, 0, 0, (0xff), ((u32)(((15 & (0xff)) << 16) | ((13 & (0xff)) << 8) | ((0 & (0xff)) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v10);
Strbuf_Free(v8);
Strbuf_Free(v6);
@ -499,7 +499,7 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p
StringTemplate_SetCityName(v9, 0, v13, v14);
StringTemplate_Format(v9, v8, v6);
Text_AddPrinterWithParamsAndColor(v10, 0, v8, 4, 0, (0xff), ((u32)(((15 & (0xff)) << 16) | ((13 & (0xff)) << 8) | ((0 & (0xff)) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, 4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v10);
Strbuf_Free(v8);
Strbuf_Free(v6);
@ -514,7 +514,7 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p
v10 = &param0->unk_0C[6];
v8 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 17);
BGL_FillWindow(v10, 0x00);
Text_AddPrinterWithParamsAndColor(v10, 0, v8, ov62_0223429C(v10, v8), 0, (0xff), ((u32)(((15 & (0xff)) << 16) | ((13 & (0xff)) << 8) | ((0 & (0xff)) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, ov62_0223429C(v10, v8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v10);
Strbuf_Free(v8);
@ -529,7 +529,7 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p
}
BGL_FillWindow(v10, 0x00);
Text_AddPrinterWithParamsAndColor(v10, 0, v8, 0, 0, (0xff), ((u32)(((15 & (0xff)) << 16) | ((13 & (0xff)) << 8) | ((0 & (0xff)) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v10);
Strbuf_Free(v8);
@ -802,7 +802,7 @@ static void ov62_022323CC(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *p
StringTemplate_Free(v2);
}
Text_AddPrinterWithParamsAndColor(v3, 0, v0, 0, 16, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v3, FONT_SYSTEM, v0, 0, 16, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v3);
Strbuf_Free(v0);
}
@ -836,7 +836,7 @@ void ov62_022324A0(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1,
for (v0 = 0; v0 < param0->unk_10; v0++) {
v2 = MessageLoader_GetNewStrbuf(param0->unk_34, param2->unk_00[v0].unk_00);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, 0, (param2->unk_08 * 16) * v0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, 0, (param2->unk_08 * 16) * v0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Strbuf_Free(v2);
if (param2->unk_00[v0].unk_00 == 16) {
@ -884,7 +884,7 @@ void ov62_02232594(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1,
if (param3->unk_00) {
for (v0 = 0; v0 < param0->unk_10; v0++) {
v2 = MessageLoader_GetNewStrbuf(param0->unk_34, param3->unk_00[v0].unk_00);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, 0, (param3->unk_08 * 16) * v0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, 0, (param3->unk_08 * 16) * v0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Strbuf_Free(v2);
}
} else {
@ -905,9 +905,9 @@ void ov62_02232594(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1,
v7 = Font_CalcStrbufWidth(FONT_SYSTEM, v5, 0);
Text_AddPrinterWithParamsAndColor(v1, 0, v5, 16 - v7, 4 + (v0 * 24), 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, 0, v6, 16, 4 + (v0 * 24), 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, 0, v4, 22, 4 + (v0 * 24), 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v5, 16 - v7, 4 + (v0 * 24), TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v6, 16, 4 + (v0 * 24), TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v4, 22, 4 + (v0 * 24), TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Strbuf_Free(v4);
Strbuf_Free(v5);
Strbuf_Free(v6);
@ -1016,12 +1016,12 @@ void ov62_02232778(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1,
StringTemplate_SetStrbuf(v7, 0, v4, 0, 1, 2);
StringTemplate_Format(v7, v6, v3);
Text_AddPrinterWithParamsAndColor(v1, 0, v6, 0, v0 * (16 * param0->unk_28->unk_08), (0xff), ((u32)(((15 & (0xff)) << 16) | ((13 & (0xff)) << 8) | ((0 & (0xff)) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v6, 0, v0 * (16 * param0->unk_28->unk_08), TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
if (param0->unk_28->unk_08 == 2) {
if (param6) {
StringTemplate_SetStrbuf(v7, 2, v11, 0, 1, 2);
StringTemplate_Format(v7, v6, param6);
Text_AddPrinterWithParamsAndColor(v1, 0, v6, 16, (v0 * (16 * param0->unk_28->unk_08)) + 16, (0xff), ((u32)(((15 & (0xff)) << 16) | ((13 & (0xff)) << 8) | ((0 & (0xff)) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v6, 16, (v0 * (16 * param0->unk_28->unk_08)) + 16, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
}
}
@ -1069,8 +1069,8 @@ void ov62_02232AAC(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1,
BGL_FillWindow(v1, 0x0);
for (v0 = 0; v0 < param0->unk_10; v0++) {
Text_AddPrinterWithParamsAndColor(v1, 0, param3[v0][0], 0, ((param2->unk_08 * 8) * v0) + 4, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, 0, param3[v0][1], 136, ((param2->unk_08 * 8) * v0) + 4, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, param3[v0][0], 0, ((param2->unk_08 * 8) * v0) + 4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, param3[v0][1], 136, ((param2->unk_08 * 8) * v0) + 4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
}
sub_0201A9A4(v1);
@ -1109,8 +1109,8 @@ int ov62_02232BB4(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, S
continue;
}
Text_AddPrinterWithParamsAndColor(v2, 0, param2[v4 + v3][0], 0, ((param0->unk_28->unk_08 * 8) * v3) + 4, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v2, 0, param2[v4 + v3][1], 136, ((param0->unk_28->unk_08 * 8) * v3) + 4, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v2, FONT_SYSTEM, param2[v4 + v3][0], 0, ((param0->unk_28->unk_08 * 8) * v3) + 4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Text_AddPrinterWithParamsAndColor(v2, FONT_SYSTEM, param2[v4 + v3][1], 136, ((param0->unk_28->unk_08 * 8) * v3) + 4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
}
}
sub_0201A954(v2);
@ -1529,7 +1529,7 @@ int ov62_02232F68(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1)
for (v0 = v5; v0 < v6; v0++) {
v3 = MessageLoader_GetNewStrbuf(param0->unk_34, param0->unk_28->unk_00[v0].unk_00);
Text_AddPrinterWithParamsAndColor(v2, 0, v3, 0, (param0->unk_28->unk_08 * 16) * v4, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v2, FONT_SYSTEM, v3, 0, (param0->unk_28->unk_08 * 16) * v4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Strbuf_Free(v3);
v4++;
}
@ -1588,9 +1588,9 @@ int ov62_02233064(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1)
v10 = Font_CalcStrbufWidth(FONT_SYSTEM, v8, 0);
Text_AddPrinterWithParamsAndColor(v2, 0, v8, 16 - v10, 4 + (v4 * 24), 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v2, 0, v9, 16, 4 + (v4 * 24), 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v2, 0, v7, 22, 4 + (v4 * 24), 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v2, FONT_SYSTEM, v8, 16 - v10, 4 + (v4 * 24), TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Text_AddPrinterWithParamsAndColor(v2, FONT_SYSTEM, v9, 16, 4 + (v4 * 24), TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Text_AddPrinterWithParamsAndColor(v2, FONT_SYSTEM, v7, 22, 4 + (v4 * 24), TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Strbuf_Free(v7);
Strbuf_Free(v8);
Strbuf_Free(v9);
@ -2294,7 +2294,7 @@ static void ov62_02233B50(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *p
Window_Init(v2);
BGL_AddWindow(param1->unk_14.unk_10, v2, 2, v4[v0][0], v4[v0][1], v4[v0][2], v4[v0][3], 14, v1);
BGL_FillWindow(v2, 0x0);
Text_AddPrinterWithParamsAndColor(v2, 0, v3, ov62_0223429C(v2, v3), 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v2, FONT_SYSTEM, v3, ov62_0223429C(v2, v3), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v2);
v1 += (v4[v0][2] * v4[v0][3]);
@ -2323,7 +2323,7 @@ static void ov62_02233B50(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *p
StringTemplate_SetStrbuf(v9, 0, v6, 0, 1, GAME_LANGUAGE);
StringTemplate_Format(v9, v8, v7);
BGL_FillWindow(v10, 0x0);
Text_AddPrinterWithParamsAndColor(v10, 0, v8, ov62_0223429C(v10, v8), 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, ov62_0223429C(v10, v8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v10);
Strbuf_Free(v6);
Strbuf_Free(v7);
@ -2337,7 +2337,7 @@ static void ov62_02233B50(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *p
v8 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 132 + v12);
BGL_FillWindow(v10, 0x0);
Text_AddPrinterWithParamsAndColor(v10, 0, v8, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v10);
Strbuf_Free(v8);
StringTemplate_ClearArgs(v9);
@ -2356,7 +2356,7 @@ static void ov62_02233B50(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *p
StringTemplate_SetStrbuf(v9, 0, v6, 0, 1, GAME_LANGUAGE);
StringTemplate_Format(v9, v8, v7);
BGL_FillWindow(v10, 0x0);
Text_AddPrinterWithParamsAndColor(v10, 0, v8, ov62_0223429C(v10, v8), 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, ov62_0223429C(v10, v8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v10);
Strbuf_Free(v6);
Strbuf_Free(v7);
@ -2404,7 +2404,7 @@ static void ov62_02233B50(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *p
StringTemplate_SetStrbuf(v9, 0, v19, 0, 1, GAME_LANGUAGE);
StringTemplate_Format(v9, v8, v7);
BGL_FillWindow(v10, 0x0);
Text_AddPrinterWithParamsAndColor(v10, 0, v8, ov62_0223429C(v10, v8), 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v10, FONT_SYSTEM, v8, ov62_0223429C(v10, v8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v10);
Strbuf_Free(v17);
Strbuf_Free(v18);

2
src/overlay062/ov62_02234A10.c
View File

@ -49,7 +49,7 @@ static void ov62_02234A10(UnkStruct_0208C06C *param0)
v0 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 192);
v1 = ov62_0223429C(v2, v0);
Text_AddPrinterWithParamsAndColor(v2, 0, v0, v1, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v2, FONT_SYSTEM, v0, v1, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 14, 0), NULL);
Strbuf_Free(v0);
sub_0201A9A4(v2);
GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);

6
src/overlay062/ov62_02235E64.c
View File

@ -298,7 +298,7 @@ static void ov62_022362B8(UnkStruct_0208C06C *param0)
v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 130);
v4 = ov62_0223429C(v1, v2);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Strbuf_Free(v2);
sub_0201A9A4(v1);
@ -312,7 +312,7 @@ static void ov62_022362B8(UnkStruct_0208C06C *param0)
v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 131);
v4 = ov62_0223429C(v1, v2);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Strbuf_Free(v2);
sub_0201A9A4(v1);
}
@ -723,7 +723,7 @@ static void ov62_02236BC8(UnkStruct_0208C06C *param0, int param1)
v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1);
v3 = ov62_0223429C(v1, v2);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, v3, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Strbuf_Free(v2);
sub_0201A9A4(v1);
}

10
src/overlay062/ov62_02237D24.c
View File

@ -1251,7 +1251,7 @@ static void ov62_02239440(UnkStruct_0208C06C *param0, int param1)
v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1);
v3 = ov62_0223429C(v1, v2);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, v3, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Strbuf_Free(v2);
sub_0201A9A4(v1);
}
@ -1394,7 +1394,7 @@ static void ov62_02239724(UnkStruct_0208C06C *param0)
for (v8 = 0; v8 < v7; v8++) {
Strbuf_CopyLineNum(v1, v3, v8);
v9 = (128 - Font_CalcStrbufWidth(0, v1, 0)) / 2;
Text_AddPrinterWithParamsAndColor(v0, 0, v1, v9, 16 * v8, (0xff), ((u32)(((15 & (0xff)) << 16) | ((13 & (0xff)) << 8) | ((0 & (0xff)) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v9, 16 * v8, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
}
sub_0201A9A4(v0);
@ -1443,7 +1443,7 @@ static void ov62_02239854(UnkStruct_0208C06C *param0, int param1)
for (v8 = 0; v8 < v7; v8++) {
Strbuf_CopyLineNum(v1, v3, v8);
v9 = (128 - Font_CalcStrbufWidth(0, v1, 0)) / 2;
Text_AddPrinterWithParamsAndColor(v0, 0, v1, v9, 16 * v8, (0xff), ((u32)(((15 & (0xff)) << 16) | ((13 & (0xff)) << 8) | ((0 & (0xff)) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v9, 16 * v8, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
}
sub_0201A9A4(v0);
@ -1611,9 +1611,9 @@ static void ov62_02239BD8(UnkStruct_0208C06C *param0)
v9 = ov62_0223429C(v1, v0);
v10 = (8 * v8 - 16) / 2;
if (ov62_02239984(param0, v3) == 1) {
Text_AddPrinterWithParamsAndColor(v1, 0, v0, v9, v10, (0xff), ((u32)(((15 & (0xff)) << 16) | ((13 & (0xff)) << 8) | ((0 & (0xff)) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, v9, v10, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
} else {
Text_AddPrinterWithParamsAndColor(v1, 0, v0, v9, v10, (0xff), ((u32)(((12 & (0xff)) << 16) | ((11 & (0xff)) << 8) | ((0 & (0xff)) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, v9, v10, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(12, 11, 0), NULL);
}
sub_0201A9A4(v1);

26
src/overlay062/ov62_02239D60.c
View File

@ -853,10 +853,10 @@ static const u8 Unk_ov62_02248D9C[][4] = {
{ 0x1, 0x15, 0x1E, 0x2 }
};
static const u32 Unk_ov62_02248D90[] = {
0xF0D00,
0XF0100,
0xF0D00
static const TextColor Unk_ov62_02248D90[] = {
TEXT_COLOR(15, 13, 0),
TEXT_COLOR(15, 1, 0),
TEXT_COLOR(15, 13, 0),
};
static const u32 Unk_ov62_02248DA8[] = {
@ -917,7 +917,7 @@ static void ov62_0223AB14(UnkStruct_0208C06C *param0)
v4 = ov62_0223429C(v1, v5);
BGL_FillWindow(v1, Unk_ov62_02248D78[0]);
Text_AddPrinterWithParamsAndColor(v1, 0, v5, v4, 0, 0xff, Unk_ov62_02248D90[0], NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v5, v4, 0, TEXT_SPEED_NO_TRANSFER, Unk_ov62_02248D90[0], NULL);
sub_0201A9A4(v1);
Strbuf_Free(v5);
@ -960,7 +960,7 @@ static void ov62_0223AC0C(UnkStruct_0208C06C *param0, int param1)
v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1);
BGL_FillWindow(v1, Unk_ov62_02248D78[2]);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, 0, Unk_ov62_02248DA8[2], 0xff, Unk_ov62_02248D90[2], NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, 0, Unk_ov62_02248DA8[2], TEXT_SPEED_NO_TRANSFER, Unk_ov62_02248D90[2], NULL);
sub_0201A9A4(v1);
Strbuf_Free(v2);
}
@ -986,7 +986,7 @@ static void ov62_0223AC58(UnkStruct_0208C06C *param0, int param1)
StringTemplate_SetStrbuf(v5, 0, v3, 0, 1, GAME_LANGUAGE);
StringTemplate_Format(v5, v4, v2);
BGL_FillWindow(v1, Unk_ov62_02248D78[2]);
Text_AddPrinterWithParamsAndColor(v1, 0, v4, 0, Unk_ov62_02248DA8[2], 0xff, Unk_ov62_02248D90[2], NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v4, 0, Unk_ov62_02248DA8[2], TEXT_SPEED_NO_TRANSFER, Unk_ov62_02248D90[2], NULL);
sub_0201A9A4(v1);
Strbuf_Free(v2);
Strbuf_Free(v3);
@ -1009,7 +1009,7 @@ static void ov62_0223AD20(UnkStruct_0208C06C *param0)
v3 = ov62_0223429C(v1, v2);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, v3, Unk_ov62_02248DA8[1], 0xff, Unk_ov62_02248D90[1], NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v3, Unk_ov62_02248DA8[1], TEXT_SPEED_NO_TRANSFER, Unk_ov62_02248D90[1], NULL);
sub_0201A9A4(v1);
Strbuf_Free(v2);
}
@ -1062,7 +1062,7 @@ static void ov62_0223ADC0(UnkStruct_0208C06C *param0, int param1)
v3 = ov62_0223429C(v1, v2);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, v3, Unk_ov62_02248DA8[0], 0xff, Unk_ov62_02248D90[0], NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v3, Unk_ov62_02248DA8[0], TEXT_SPEED_NO_TRANSFER, Unk_ov62_02248D90[0], NULL);
sub_0201A9A4(v1);
Strbuf_Free(v2);
}
@ -1482,7 +1482,7 @@ static void ov62_0223B6AC(UnkStruct_0208C06C *param0)
v6 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, v5[v3]);
v4 = ov62_0223429C(v1, v6);
Text_AddPrinterWithParamsAndColor(v1, 0, v6, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v6, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v1);
v2 += (Unk_ov62_02248D5C[v3][2] * Unk_ov62_02248D5C[v3][3]);
Strbuf_Free(v6);
@ -1503,7 +1503,7 @@ static void ov62_0223B768(UnkStruct_0208C06C *param0, int param1)
v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1);
v3 = ov62_0223429C(v1, v2);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, v3, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Strbuf_Free(v2);
sub_0201A9A4(v1);
}
@ -1528,7 +1528,7 @@ static void ov62_0223B7C0(UnkStruct_0208C06C *param0)
{
u32 v6 = (64 - Font_CalcMaxLineWidth(FONT_SYSTEM, v5, 0)) / 2;
Text_AddPrinterWithParamsAndColor(v1, 0, v5, v6, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v5, v6, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
}
sub_0201A9A4(v1);
@ -1584,7 +1584,7 @@ static void ov62_0223B888(UnkStruct_0208C06C *param0)
}
if (v7) {
Text_AddPrinterWithParamsAndColor(v1, 0, v7, v4, v5, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v7, v4, v5, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Strbuf_Free(v7);
}

4
src/overlay062/ov62_0223CAEC.c
View File

@ -347,7 +347,7 @@ static void ov62_0223CF2C (UnkStruct_0208C06C * param0)
v5 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 80 + v3);
v4 = ov62_0223429C(v1, v5);
Text_AddPrinterWithParamsAndColor(v1, 0, v5, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v5, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v1);
Strbuf_Free(v5);
}
@ -399,7 +399,7 @@ static void ov62_0223D004 (UnkStruct_0208C06C * param0)
v5 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 67);
v4 = 0;
Text_AddPrinterWithParamsAndColor(v1, 0, v5, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v5, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v1);
Strbuf_Free(v5);
}

16
src/overlay062/ov62_0223DFA8.c
View File

@ -278,7 +278,7 @@ static void ov62_0223E0FC (UnkStruct_0208C06C * param0, int param1, int param2)
}
BGL_FillWindow(v1, 0xCC);
Text_AddPrinterWithParamsAndColor(v1, 0, v0, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((12 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 12), NULL);
sub_0201A9A4(v1);
Strbuf_Free(v0);
}
@ -844,7 +844,7 @@ static void ov62_0223EE88 (UnkStruct_ov62_022312B0 * param0, UnkStruct_0208C06C
Window_Init(&v2);
BGL_AddFramelessWindow(param1->unk_14.unk_10, &v2, 20, 2, 0, 0);
Text_AddPrinterWithParamsAndColor(&v2, 0, v0, 0, 0, 0xff, ((u32)(((14 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&v2, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(14, 13, 0), NULL);
sub_02012BE0(param0->unk_0C, param0->unk_10, &v2, 102);
Strbuf_Free(v0);
BGL_DeleteWindow(&v2);
@ -1173,7 +1173,7 @@ static void ov62_0223F65C (UnkStruct_0208C06C * param0)
v3 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, v5[v0->unk_0C]);
Text_AddPrinterWithParamsAndColor(v4, 0, v3, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v4, FONT_SYSTEM, v3, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v4);
Strbuf_Free(v3);
@ -1188,7 +1188,7 @@ static void ov62_0223F65C (UnkStruct_0208C06C * param0)
{
u32 v6 = (80 - Font_CalcMaxLineWidth(FONT_SYSTEM, v3, 0)) / 2;
Text_AddPrinterWithParamsAndColor(v4, 0, v3, v6, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v4, FONT_SYSTEM, v3, v6, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
}
sub_0201A9A4(v4);
@ -1785,7 +1785,7 @@ static void ov62_022402FC (UnkStruct_0208C06C * param0, int param1, BOOL param2)
}
BGL_FillWindow(v1, 0xCC);
Text_AddPrinterWithParamsAndColor(v1, 0, v0, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((12 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 12), NULL);
sub_0201A9A4(v1);
Strbuf_Free(v0);
}
@ -2338,7 +2338,7 @@ static void ov62_022408A8 (UnkStruct_0208C06C * param0, int param1)
v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1);
v3 = ov62_0223429C(v1, v2);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, v3, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Strbuf_Free(v2);
sub_0201A9A4(v1);
}
@ -2373,7 +2373,7 @@ static void ov62_02240944 (UnkStruct_0208C06C * param0)
v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 130);
v4 = ov62_0223429C(v1, v2);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Strbuf_Free(v2);
sub_0201A9A4(v1);
@ -2387,7 +2387,7 @@ static void ov62_02240944 (UnkStruct_0208C06C * param0)
v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 131);
v4 = ov62_0223429C(v1, v2);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Strbuf_Free(v2);
sub_0201A9A4(v1);
}

28
src/overlay062/ov62_02241204.c
View File

@ -638,7 +638,7 @@ static void ov62_022417C0 (UnkStruct_0208C06C * param0, int param1)
v8 = ov62_0223429C(v11, v10);
}
Text_AddPrinterWithParamsAndColor(v11, 0, v10, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v11, FONT_SYSTEM, v10, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v11);
Strbuf_Free(v10);
}
@ -667,7 +667,7 @@ static void ov62_022418DC (UnkStruct_0208C06C * param0, int param1)
}
}
Text_AddPrinterWithParamsAndColor(v1, 0, v2, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v1);
Strbuf_Free(v2);
}
@ -690,7 +690,7 @@ static void ov62_02241954 (UnkStruct_0208C06C * param0, int param1)
Strbuf_CopyChars(v2, v3);
}
Text_AddPrinterWithParamsAndColor(v1, 0, v2, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v1);
Strbuf_Free(v2);
}
@ -727,7 +727,7 @@ static void ov62_022419D4 (UnkStruct_0208C06C * param0, int param1, int param2)
StringTemplate_Free(v4);
}
Text_AddPrinterWithParamsAndColor(v1, 0, v2, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v1);
Strbuf_Free(v2);
}
@ -780,7 +780,7 @@ static void ov62_02241AA4 (UnkStruct_0208C06C * param0, int param1)
v8 = ov62_0223429C(v11, v10);
}
Text_AddPrinterWithParamsAndColor(v11, 0, v10, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v11, FONT_SYSTEM, v10, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v11);
Strbuf_Free(v10);
}
@ -827,7 +827,7 @@ static void ov62_02241C38 (UnkStruct_0208C06C * param0)
BGL_FillWindow(v4, 0x0);
v3 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 126);
Text_AddPrinterWithParamsAndColor(v4, 0, v3, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v4, FONT_SYSTEM, v3, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v4);
Strbuf_Free(v3);
@ -840,7 +840,7 @@ static void ov62_02241C38 (UnkStruct_0208C06C * param0)
{
u32 v5 = (80 - Font_CalcMaxLineWidth(FONT_SYSTEM, v3, 0)) / 2;
Text_AddPrinterWithParamsAndColor(v4, 0, v3, v5, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v4, FONT_SYSTEM, v3, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
}
sub_0201A9A4(v4);
@ -3141,7 +3141,7 @@ static void ov62_022448E0 (UnkStruct_ov62_022312B0 * param0, UnkStruct_0208C06C
Window_Init(&v2);
BGL_AddFramelessWindow(param1->unk_14.unk_10, &v2, 20, 2, 0, 0);
Text_AddPrinterWithParamsAndColor(&v2, 0, v0, 0, 0, 0xff, ((u32)(((14 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&v2, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(14, 13, 0), NULL);
sub_02012BE0(param0->unk_0C, param0->unk_10, &v2, 102);
Strbuf_Free(v0);
BGL_DeleteWindow(&v2);
@ -3179,7 +3179,7 @@ static void ov62_022449B8 (UnkStruct_0208C06C * param0, int param1, BOOL param2)
}
BGL_FillWindow(v1, 0xCC);
Text_AddPrinterWithParamsAndColor(v1, 0, v0, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((12 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 12), NULL);
sub_0201A9A4(v1);
Strbuf_Free(v0);
}
@ -3227,7 +3227,7 @@ static void ov62_02244AB4 (UnkStruct_0208C06C * param0, int param1, int param2)
}
BGL_FillWindow(v1, 0xCC);
Text_AddPrinterWithParamsAndColor(v1, 0, v0, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((12 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 12), NULL);
sub_0201A9A4(v1);
Strbuf_Free(v0);
}
@ -3707,7 +3707,7 @@ static void ov62_022455E4 (UnkStruct_0208C06C * param0, int param1)
BGL_FillWindow(v1, 0x0);
v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1);
v3 = ov62_0223429C(v1, v2);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, v3, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Strbuf_Free(v2);
sub_0201A9A4(v1);
}
@ -3742,7 +3742,7 @@ static void ov62_0224568C (UnkStruct_0208C06C * param0)
v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 130);
v4 = ov62_0223429C(v1, v2);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Strbuf_Free(v2);
sub_0201A9A4(v1);
@ -3757,7 +3757,7 @@ static void ov62_0224568C (UnkStruct_0208C06C * param0)
v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 131);
v4 = ov62_0223429C(v1, v2);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Strbuf_Free(v2);
sub_0201A9A4(v1);
}
@ -4721,7 +4721,7 @@ static void ov62_022469A0 (UnkStruct_ov62_02241204 * param0, UnkStruct_0208C06C
StringTemplate_SetStrbuf(v3, 0, v10, 0, 1, GAME_LANGUAGE);
StringTemplate_Format(v3, v2, v1);
BGL_FillWindow(v4, 0xCC);
Text_AddPrinterWithParamsAndColor(v4, 0, v2, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v4, FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
sub_0201A9A4(v4);
Strbuf_Free(v8);
Strbuf_Free(v9);

6
src/overlay062/ov62_02247D74.c
View File

@ -84,7 +84,7 @@ static void ov62_02247DD8(UnkStruct_0208C06C *param0, int param1, int param2)
}
BGL_FillWindow(v1, 0xCC);
Text_AddPrinterWithParamsAndColor(v1, 0, v0, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((12 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 12), NULL);
sub_0201A9A4(v1);
Strbuf_Free(v0);
}
@ -106,7 +106,7 @@ static void ov62_02247E9C(UnkStruct_0208C06C *param0)
v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 130);
v4 = ov62_0223429C(v1, v2);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Strbuf_Free(v2);
sub_0201A9A4(v1);
@ -120,7 +120,7 @@ static void ov62_02247E9C(UnkStruct_0208C06C *param0)
v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 131);
v4 = ov62_0223429C(v1, v2);
Text_AddPrinterWithParamsAndColor(v1, 0, v2, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL);
Strbuf_Free(v2);
sub_0201A9A4(v1);
}

10
src/overlay064/ov64_0222DCE0.c
View File

@ -1115,7 +1115,7 @@ static void ov64_0222E738 (UnkStruct_ov64_0222E21C * param0, u32 param1)
MessageLoader_GetStrbuf(param0->unk_218, param1, param0->unk_234);
StringTemplate_Format(param0->unk_214, param0->unk_230, param0->unk_234);
param0->unk_238 = Text_AddPrinterWithParamsAndColor(&param0->unk_220, 1, param0->unk_230, 0, 4, 2, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
param0->unk_238 = Text_AddPrinterWithParamsAndColor(&param0->unk_220, FONT_MESSAGE, param0->unk_230, 0, 4, TEXT_SPEED_QUICK, TEXT_COLOR(15, 2, 0), NULL);
sub_0201A9A4(&param0->unk_220);
}
@ -1699,7 +1699,7 @@ static void ov64_0222EFBC (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_0222
MessageLoader_GetStrbuf(param1->unk_218, param2, v0);
StringTemplate_Format(param1->unk_214, param0->unk_38, v0);
param0->unk_30 = Text_AddPrinterWithParamsAndColor(&param0->unk_1C, 1, param0->unk_38, 0, 0, param0->unk_34, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
param0->unk_30 = Text_AddPrinterWithParamsAndColor(&param0->unk_1C, FONT_MESSAGE, param0->unk_38, 0, 0, param0->unk_34, TEXT_COLOR(1, 2, 0), NULL);
sub_0200E060(&param0->unk_1C, 1, (1 + 9), 8);
sub_0201A9A4(&param0->unk_1C);
@ -2594,7 +2594,7 @@ static void ov64_0222FE70 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222
MessageLoader_GetStrbuf(param1->unk_218, param2, v0);
StringTemplate_Format(param1->unk_214, param0->unk_D4, v0);
param0->unk_D8 = Text_AddPrinterWithParamsAndColor(&param0->unk_C4, 1, param0->unk_D4, 0, 0, param0->unk_DC, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
param0->unk_D8 = Text_AddPrinterWithParamsAndColor(&param0->unk_C4, FONT_MESSAGE, param0->unk_D4, 0, 0, param0->unk_DC, TEXT_COLOR(1, 2, 0), NULL);
sub_0200E060(&param0->unk_C4, 1, (1 + 9), 8);
sub_0201A9A4(&param0->unk_C4);
@ -2781,7 +2781,7 @@ static void ov64_022302EC (UnkStruct_ov64_02230074 * param0, UnkStruct_ov63_0222
UnkStruct_ov64_022302EC v2;
Strbuf* v3;
int v4, v5;
static const u32 v6[] = {((u32)(((5 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0))), ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))), ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))};
static const u32 v6[] = {TEXT_COLOR(5, 6, 0), TEXT_COLOR(3, 4, 0), TEXT_COLOR(1, 2, 0)};
v1 = sub_0202AD2C(param5, param6, 7);
v0 = sub_0202AD2C(param5, param6, 8);
@ -2801,7 +2801,7 @@ static void ov64_022302EC (UnkStruct_ov64_02230074 * param0, UnkStruct_ov63_0222
v3 = Strbuf_Init(128, param7);
Strbuf_CopyChars(v3, sub_0202AEF0(param5, param6));
Text_AddPrinterWithParamsAndColor(&param0->unk_08, 0, v3, v4, v5, 0xff, v6[v0], NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_08, FONT_SYSTEM, v3, v4, v5, TEXT_SPEED_NO_TRANSFER, v6[v0], NULL);
Strbuf_Free(v3);
}

86
src/overlay065/ov65_0222DCE0.c
View File

@ -171,7 +171,7 @@ static void ov65_02234694(UnkStruct_ov65_0222EBE0 * param0, u32 param1, u32 para
static void ov65_022346C4(UnkStruct_ov65_0222EBE0 * param0, Strbuf *param1, u32 param2, u32 param3);
static void ov65_02234708(UnkStruct_ov65_0222EBE0 * param0, u32 param1, u32 param2, u32 param3, u32 param4);
static void ov65_02234788(UnkStruct_ov65_0222EBE0 * param0, u8 param1, u8 param2, u8 param3, u8 param4);
static u32 ov65_0223484C(u32 param0, int * param1);
static u32 ov65_0223484C(u32 param0, TextColor *param1);
static void ov65_02234900(UnkStruct_ov65_0222EBE0 * param0, Window * param1, u32 param2, u32 param3, u32 param4);
static void ov65_0223498C(UnkStruct_ov65_0222EBE0 * param0, Window * param1, u32 param2, u32 param3, u32 param4);
static void ov65_02234A68(UnkStruct_ov65_0222EBE0 * param0, NARC * param1, u32 param2);
@ -1535,7 +1535,7 @@ static void ov65_0222EE98 (UnkStruct_ov65_0222EBE0 * param0)
{
u32 v2 = Font_CalcCenterAlignment(FONT_SYSTEM, param0->unk_178, 0, 22 * 8);
Text_AddPrinterWithParamsAndColor(&param0->unk_350, 1, param0->unk_178, v2, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_350, FONT_MESSAGE, param0->unk_178, v2, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
}
sub_0201A9A4(&param0->unk_350);
@ -2300,8 +2300,8 @@ static int ov65_0222FCDC (UnkStruct_ov65_0222EBE0 * param0, int param1)
static void ov65_0222FD70 (UnkStruct_ov65_0222EBE0 * param0)
{
int v0, v1, v2;
int v3;
TextColor v0;
int v1, v2, v3;
TrainerInfo * v4 = SaveData_GetTrainerInfo(param0->unk_160);
Strbuf* v5 = TrainerInfo_NameNewStrbuf(v4, 54);
u32 v6;
@ -2316,12 +2316,12 @@ static void ov65_0222FD70 (UnkStruct_ov65_0222EBE0 * param0)
v1 = TrainerInfo_Gender(v4);
if (v1 == 0) {
v0 = ((u32)(((5 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0)));
v0 = TEXT_COLOR(5, 6, 0);
} else {
v0 = ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0)));
v0 = TEXT_COLOR(3, 4, 0);
}
Text_AddPrinterWithParamsAndColor(&param0->unk_340, 0, v5, 32, 0, 0xff, v0, NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_340, FONT_SYSTEM, v5, 32, 0, TEXT_SPEED_NO_TRANSFER, v0, NULL);
Strbuf_Free(v5);
v6 = ov65_0222DD20(param0, &param0->unk_04->unk_00);
@ -2334,9 +2334,9 @@ static void ov65_0222FD70 (UnkStruct_ov65_0222EBE0 * param0)
v1 = sub_0202AD2C(param0->unk_00, ov4_021D2388(), 8);
if (0 == v1) {
v0 = ((u32)(((5 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0)));
v0 = TEXT_COLOR(5, 6, 0);
} else if (1 == v1) {
v0 = ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0)));
v0 = TEXT_COLOR(3, 4, 0);
}
Strbuf_CopyChars(param0->unk_170, sub_0202AEF0(param0->unk_00, ov4_021D2388()));
@ -2345,7 +2345,7 @@ static void ov65_0222FD70 (UnkStruct_ov65_0222EBE0 * param0)
MessageLoader_GetStrbuf(param0->unk_168, v3, param0->unk_170);
}
Text_AddPrinterWithParamsAndColor(&param0->unk_340, 0, param0->unk_170, 102, 0, 0xff, v0, NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_340, FONT_SYSTEM, param0->unk_170, 102, 0, TEXT_SPEED_NO_TRANSFER, v0, NULL);
ov65_0222EA38(param0->unk_15C, &param0->unk_BD0, 1, 2, 1, v6);
if (param0->unk_04->unk_00.unk_21) {
@ -4767,7 +4767,7 @@ static void ov65_02232B58 (UnkStruct_ov65_0222EBE0 * param0, int param1, BOOL pa
RenderControlFlags_SetCanABSpeedUpPrint(1);
RenderControlFlags_SetAutoScrollFlags(0);
param0->unk_180 = Text_AddPrinterWithParams(&param0->unk_330, 1, param0->unk_174, 0, 0, v0, NULL);
param0->unk_180 = Text_AddPrinterWithParams(&param0->unk_330, FONT_MESSAGE, param0->unk_174, 0, 0, v0, NULL);
sub_0201A9A4(&param0->unk_330);
}
@ -5951,18 +5951,18 @@ static void ov65_02233E20 (UnkStruct_ov65_0222EBE0 * param0, u32 param1)
{
MessageLoader_GetStrbuf(param0->unk_168, 52, param0->unk_178);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, FONT_SYSTEM, param0->unk_178, 8, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
}
{
ov65_022346C4(param0, param0->unk_178, 0, v0);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 24, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, FONT_SYSTEM, param0->unk_178, 8, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
ov65_02234694(param0, 65, 113, v0, 120, 24);
}
{
MessageLoader_GetStrbuf(param0->unk_168, 59, param0->unk_178);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 48, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, FONT_SYSTEM, param0->unk_178, 8, 48, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
ov65_02234694(param0, 65, 112, v0, 120, 48);
}
}
@ -6263,25 +6263,25 @@ static void ov65_0223416C (UnkStruct_ov65_0222EBE0 * param0, u32 param1)
{
MessageLoader_GetStrbuf(param0->unk_168, 54, param0->unk_178);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, FONT_SYSTEM, param0->unk_178, 8, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
MessageLoader_GetStrbuf(param0->unk_168, 63, param0->unk_178);
{
u32 v1 = 180 - (Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_178, 0) + 1) / 2;
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, 0, param0->unk_178, v1, 24, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, FONT_SYSTEM, param0->unk_178, v1, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
}
}
{
ov65_022346C4(param0, param0->unk_178, 3, v0);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 48, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, FONT_SYSTEM, param0->unk_178, 8, 48, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
ov65_02234694(param0, 68, 135, v0, 104, 48);
ov65_02234694(param0, 67, 136, v0, 212, 48);
}
{
MessageLoader_GetStrbuf(param0->unk_168, 59, param0->unk_178);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 80, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, FONT_SYSTEM, param0->unk_178, 8, 80, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
ov65_02234694(param0, 68, 134, v0, 104, 80);
ov65_02234694(param0, 67, 138, v0, 212, 80);
@ -6300,14 +6300,14 @@ static void ov65_022342A8 (UnkStruct_ov65_0222EBE0 * param0, u32 param1)
{
MessageLoader_GetStrbuf(param0->unk_168, 55, param0->unk_178);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, FONT_SYSTEM, param0->unk_178, 8, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
v1 = sub_02030698(v2, 124, v0);
v3 = MessageUtil_SpeciesName(v1, param1);
{
u32 v4 = 33 - (Font_CalcStrbufWidth(FONT_SYSTEM, v3, 0) + 1) / 2;
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, 0, v3, v4, 24, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, FONT_SYSTEM, v3, v4, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
}
Strbuf_Free(v3);
@ -6315,13 +6315,13 @@ static void ov65_022342A8 (UnkStruct_ov65_0222EBE0 * param0, u32 param1)
{
ov65_022346C4(param0, param0->unk_178, 4, v0);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 48, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, FONT_SYSTEM, param0->unk_178, 8, 48, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
ov65_02234694(param0, 65, 123, v0, 108, 48);
}
{
MessageLoader_GetStrbuf(param0->unk_168, 59, param0->unk_178);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 80, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, FONT_SYSTEM, param0->unk_178, 8, 80, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
ov65_02234694(param0, 65, 122, v0, 108, 80);
}
}
@ -6334,18 +6334,18 @@ static void ov65_022343CC (UnkStruct_ov65_0222EBE0 * param0, u32 param1)
{
MessageLoader_GetStrbuf(param0->unk_168, 56, param0->unk_178);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, FONT_SYSTEM, param0->unk_178, 8, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
}
{
ov65_022346C4(param0, param0->unk_178, 5, v0);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 24, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, FONT_SYSTEM, param0->unk_178, 8, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
ov65_02234694(param0, 69, 143, v0, 112, 24);
}
{
MessageLoader_GetStrbuf(param0->unk_168, 59, param0->unk_178);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 48, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, FONT_SYSTEM, param0->unk_178, 8, 48, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
ov65_02234694(param0, 69, 142, v0, 112, 48);
}
}
@ -6361,14 +6361,14 @@ static void ov65_0223449C (UnkStruct_ov65_0222EBE0 * param0, u32 param1)
{
MessageLoader_GetStrbuf(param0->unk_168, 70, param0->unk_178);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, FONT_SYSTEM, param0->unk_178, 8, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
}
{
StringTemplate_SetPlazaMinigameName(param0->unk_BE0.unk_00, 0, UnkEnum_ov66_022324D0_00);
MessageLoader_GetStrbuf(param0->unk_168, 71, param0->unk_170);
StringTemplate_Format(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 24, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, FONT_SYSTEM, param0->unk_178, 8, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
ov65_02234708(param0, 72, sub_0202AD2C(v1, v0, 10), 164, 24);
}
@ -6376,7 +6376,7 @@ static void ov65_0223449C (UnkStruct_ov65_0222EBE0 * param0, u32 param1)
StringTemplate_SetPlazaMinigameName(param0->unk_BE0.unk_00, 0, UnkEnum_ov66_022324D0_01);
MessageLoader_GetStrbuf(param0->unk_168, 71, param0->unk_170);
StringTemplate_Format(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 48, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, FONT_SYSTEM, param0->unk_178, 8, 48, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
ov65_02234708(param0, 72, sub_0202AD2C(v1, v0, 11), 164, 48);
}
@ -6384,7 +6384,7 @@ static void ov65_0223449C (UnkStruct_ov65_0222EBE0 * param0, u32 param1)
StringTemplate_SetPlazaMinigameName(param0->unk_BE0.unk_00, 0, UnkEnum_ov66_022324D0_02);
MessageLoader_GetStrbuf(param0->unk_168, 71, param0->unk_170);
StringTemplate_Format(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 72, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, FONT_SYSTEM, param0->unk_178, 8, 72, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
ov65_02234708(param0, 72, sub_0202AD2C(v1, v0, 12), 164, 72);
}
}
@ -6445,7 +6445,7 @@ static void ov65_02234708 (UnkStruct_ov65_0222EBE0 * param0, u32 param1, u32 par
{
u32 v0 = param3 - (Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_178, 0) + 1) / 2;
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, 0, param0->unk_178, v0, param4, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_BE0.unk_1FC, FONT_SYSTEM, param0->unk_178, v0, param4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
}
}
@ -6476,16 +6476,16 @@ static void ov65_02234788 (UnkStruct_ov65_0222EBE0 * param0, u8 param1, u8 param
sub_02019E2C(param0->unk_15C, 6, param1, param2, 16, 6, param3 + 4);
}
static u32 ov65_0223484C (u32 param0, int * param1)
static u32 ov65_0223484C(u32 param0, TextColor *param1)
{
u32 v0;
*param1 = ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)));
*param1 = TEXT_COLOR(1, 2, 0);
switch (param0) {
case 1:
v0 = 36;
*param1 = ((u32)(((2 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)));
*param1 = TEXT_COLOR(2, 14, 0);
break;
case 2:
case 3:
@ -6494,7 +6494,7 @@ static u32 ov65_0223484C (u32 param0, int * param1)
case 6:
case 7:
v0 = 27;
*param1 = ((u32)(((2 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)));
*param1 = TEXT_COLOR(2, 14, 0);
break;
case 9:
v0 = 96;
@ -6516,21 +6516,21 @@ static u32 ov65_0223484C (u32 param0, int * param1)
break;
case 8:
v0 = 29;
*param1 = ((u32)(((2 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)));
*param1 = TEXT_COLOR(2, 14, 0);
break;
case 15:
v0 = 28;
break;
case 18:
v0 = 31;
*param1 = ((u32)(((2 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)));
*param1 = TEXT_COLOR(2, 14, 0);
break;
case 19:
v0 = 30;
break;
case 20:
v0 = 33;
*param1 = ((u32)(((2 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)));
*param1 = TEXT_COLOR(2, 14, 0);
break;
case 21:
v0 = 32;
@ -6539,7 +6539,7 @@ static u32 ov65_0223484C (u32 param0, int * param1)
case 24:
case 26:
v0 = 35;
*param1 = ((u32)(((2 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)));
*param1 = TEXT_COLOR(2, 14, 0);
break;
case 23:
case 25:
@ -6560,7 +6560,7 @@ static u32 ov65_0223484C (u32 param0, int * param1)
static void ov65_02234900 (UnkStruct_ov65_0222EBE0 * param0, Window * param1, u32 param2, u32 param3, u32 param4)
{
int v0;
int v1;
TextColor v1;
int v2;
BGL_FillWindow(param1, 0);
@ -6569,16 +6569,16 @@ static void ov65_02234900 (UnkStruct_ov65_0222EBE0 * param0, Window * param1, u3
v0 = sub_0202AD2C(param0->unk_00, param2 - 1, 8);
if (v0 == 0) {
v1 = ((u32)(((5 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0)));
v1 = TEXT_COLOR(5, 6, 0);
} else {
v1 = ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0)));
v1 = TEXT_COLOR(3, 4, 0);
}
ov65_02234F68(param0, param2 - 1);
MessageLoader_GetStrbuf(param0->unk_168, 42, param0->unk_170);
StringTemplate_Format(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170);
Text_AddPrinterWithParamsAndColor(param1, 1, param0->unk_178, 0, v2, 0xff, v1, NULL);
Text_AddPrinterWithParamsAndColor(param1, FONT_MESSAGE, param0->unk_178, 0, v2, TEXT_SPEED_NO_TRANSFER, v1, NULL);
sub_0201A9A4(param1);
}
@ -6719,7 +6719,7 @@ static void ov65_02234A68 (UnkStruct_ov65_0222EBE0 * param0, NARC * param1, u32
{
v8 = -((Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_178, 0) + 1) / 2);
Text_AddPrinterWithParamsAndColor(&v3, 2, v4, 0, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&v3, FONT_SUBSCREEN, v4, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
}
Strbuf_Free(v4);

12
src/overlay065/ov65_0223648C.c
View File

@ -827,11 +827,11 @@ static void ov65_02236C7C(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207D
MessageLoader_GetStrbuf(param0->unk_08, Unk_ov65_02239E5C[param1->unk_00], param0->unk_10);
StringTemplate_Format(param0->unk_04, param0->unk_0C, param0->unk_10);
Text_AddPrinterWithParamsAndColor(&param0->unk_200, 0, param0->unk_0C, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_200, FONT_SYSTEM, param0->unk_0C, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL);
sub_0201A9A4(&param0->unk_200);
sub_0201A9A4(&param0->unk_220);
MessageLoader_GetStrbuf(param0->unk_08, 128, param0->unk_0C);
Text_AddPrinterWithParamsAndColor(&param0->unk_210, 0, param0->unk_0C, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_210, FONT_SYSTEM, param0->unk_0C, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
sub_0201A9A4(&param0->unk_210);
sub_0201A9A4(&param0->unk_1F0);
}
@ -909,7 +909,7 @@ static void ov65_02236E50(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207D
MessageLoader_GetStrbuf(param0->unk_08, param2, v0);
StringTemplate_Format(param0->unk_04, param0->unk_0C, v0);
param0->unk_14 = Text_AddPrinterWithParamsAndColor(&param0->unk_1F0, 1, param0->unk_0C, 0, 0, param0->unk_16, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
param0->unk_14 = Text_AddPrinterWithParamsAndColor(&param0->unk_1F0, FONT_MESSAGE, param0->unk_0C, 0, 0, param0->unk_16, TEXT_COLOR(1, 2, 15), NULL);
sub_0201A9A4(&param0->unk_1F0);
Strbuf_Free(v0);
@ -974,7 +974,7 @@ static void ov65_02236F70(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207D
StringTemplate_Format(param0->unk_04, v1, v0);
BGL_FillWindow(&param0->unk_230, 15);
Text_AddPrinterWithParamsAndColor(&param0->unk_230, 0, v1, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_230, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL);
Window_Show(&param0->unk_230, 1, (1 + (18 + 12)), 3);
sub_0201A9A4(&param0->unk_230);
@ -1025,13 +1025,13 @@ static void ov65_0223709C(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_022368
MessageLoader_GetStrbuf(param1->unk_08, 129, v0);
StringTemplate_Format(param1->unk_04, v1, v0);
BGL_WindowColor(&param1->unk_220, 15, 0, param3 * (2 * 8), (20 * 8), (2 * 8));
Text_AddPrinterWithParamsAndColor(&param1->unk_220, 0, v1, 0, param3 * (2 * 8), 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param1->unk_220, FONT_SYSTEM, v1, 0, param3 * (2 * 8), TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL);
ov65_02237284(param1, param2, param3, 0, param4);
MessageLoader_GetStrbuf(param1->unk_08, 130, v0);
StringTemplate_Format(param1->unk_04, v1, v0);
Text_AddPrinterWithParamsAndColor(&param1->unk_220, 0, v1, 72, param3 * (2 * 8), 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param1->unk_220, FONT_SYSTEM, v1, 72, param3 * (2 * 8), TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL);
sub_0201A9A4(&param1->unk_220);
if (param3 == CommSys_CurNetId()) {

4
src/overlay067/ov67_0225C700.c
View File

@ -654,7 +654,7 @@ static void ov67_0225D210(UnkStruct_ov67_0225D210 *param0, u32 param1)
BGL_FillWindow(&param0->unk_08, 15);
MessageLoader_GetStrbuf(param0->unk_04, param1, param0->unk_1C);
StringTemplate_Format(param0->unk_00, param0->unk_18, param0->unk_1C);
Text_AddPrinterWithParams(&param0->unk_08, 1, param0->unk_18, 0, 0, 0xff, NULL);
Text_AddPrinterWithParams(&param0->unk_08, FONT_MESSAGE, param0->unk_18, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL);
if (param0->unk_20 == 0) {
Window_Show(&param0->unk_08, 1, (1 + (18 + 12)), 14);
@ -723,7 +723,7 @@ static void ov67_0225D37C(UnkStruct_ov67_0225D210 *param0, u32 param1)
BGL_FillWindow(&param0->unk_08, 0);
MessageLoader_GetStrbuf(param0->unk_04, param1, param0->unk_1C);
StringTemplate_Format(param0->unk_00, param0->unk_18, param0->unk_1C);
Text_AddPrinterWithParamsAndColor(&param0->unk_08, 1, param0->unk_18, Font_CalcCenterAlignment(FONT_SYSTEM, param0->unk_18, 0, 0xB0), 0, 0, 0xF0E00, 0);
Text_AddPrinterWithParamsAndColor(&param0->unk_08, FONT_MESSAGE, param0->unk_18, Font_CalcCenterAlignment(FONT_SYSTEM, param0->unk_18, 0, 0xB0), 0, TEXT_SPEED_INSTANT, TEXT_COLOR(15, 14, 0), 0);
}
static void ov67_0225D3D0(UnkStruct_ov67_0225D210 *param0, u32 param1)

36
src/overlay068/ov68_0225C700.c
View File

@ -166,7 +166,7 @@ static void ov68_0225D380(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB7
static void ov68_0225D388(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov66_02231374 *param3, u32 param4);
static BOOL ov68_0225D478(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, u32 param5);
static void ov68_0225D868(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2);
static void ov68_0225D89C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, u32 param2, u32 param3);
static void ov68_0225D89C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, u32 param2, TextColor param3);
static void ov68_0225D8F0(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_0225DB8C *param1, UnkStruct_ov68_0225CB70 *param2, UnkStruct_ov68_0225C91C *param3, const UnkStruct_ov66_0222E908 *param4, u32 param5, u32 param6, u32 param7, BOOL param8);
static void ov68_0225DA30(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_0225DC74 *param1, UnkStruct_ov68_0225C91C *param2, u32 param3);
static BOOL ov68_0225DA74(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225C91C *param1);
@ -884,13 +884,13 @@ static void ov68_0225D06C(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB
BGL_FillWindow(&param0->unk_00[0], 0);
v0 = ov68_0225DC58(&param0->unk_2C, param1, 0);
Text_AddPrinterWithParamsAndColor(&param0->unk_00[0], 1, v0, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00[0], FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
v0 = ov68_0225DC58(&param0->unk_2C, param1, 1);
Text_AddPrinterWithParamsAndColor(&param0->unk_00[0], 1, v0, 0, 24, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00[0], FONT_MESSAGE, v0, 0, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
v0 = ov68_0225DC58(&param0->unk_2C, param1, 2);
Text_AddPrinterWithParamsAndColor(&param0->unk_00[0], 1, v0, 0, 48, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00[0], FONT_MESSAGE, v0, 0, 48, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
sub_0201A9A4(&param0->unk_00[0]);
}
@ -942,7 +942,7 @@ static void ov68_0225D1B4(UnkStruct_ov68_0225D128 *param0, const Strbuf *param1)
BGL_FillWindow(&param0->unk_08, 15);
Strbuf_Copy(param0->unk_18, param1);
param0->unk_00 = Text_AddPrinterWithParamsAndColor(&param0->unk_08, 1, param0->unk_18, 0, 0, param0->unk_04, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
param0->unk_00 = Text_AddPrinterWithParamsAndColor(&param0->unk_08, FONT_MESSAGE, param0->unk_18, 0, 0, param0->unk_04, TEXT_COLOR(1, 2, 15), NULL);
sub_0200E060(&param0->unk_08, 1, 1, 5);
}
@ -954,7 +954,7 @@ static void ov68_0225D218(UnkStruct_ov68_0225D128 *param0, const Strbuf *param1)
BGL_FillWindow(&param0->unk_08, 15);
Strbuf_Copy(param0->unk_18, param1);
Text_AddPrinterWithParamsAndColor(&param0->unk_08, 1, param0->unk_18, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_08, FONT_MESSAGE, param0->unk_18, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL);
sub_0200E060(&param0->unk_08, 1, 1, 5);
sub_0201A9A4(&param0->unk_08);
}
@ -1052,7 +1052,7 @@ static void ov68_0225D388(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB
}
}
ov68_0225D89C(param0, param1, 109, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov68_0225D89C(param0, param1, 109, TEXT_COLOR(3, 4, 0));
{
param0->unk_80 = sub_020071B4(param2->unk_1A4, 200, 0, &param0->unk_84, param4);
@ -1124,7 +1124,7 @@ static BOOL ov68_0225D478(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB
ov66_0222E908(v3, &v2);
v4 = ov66_0222E924(param4->unk_04, ov66_0222E338(param4->unk_04));
ov68_0225D8F0(param0, &param0->unk_88, param1, param2, &v2, param5, ((u32)(((9 & 0xff) << 16) | ((10 & 0xff) << 8) | ((0 & 0xff) << 0))), ((u32)(((13 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), v4);
ov68_0225D8F0(param0, &param0->unk_88, param1, param2, &v2, param5, TEXT_COLOR(9, 10, 0), TEXT_COLOR(13, 14, 0), v4);
ov68_0225DA30(param0, &param0->unk_C8, param2, 1);
Sound_PlayEffect(1472);
@ -1240,7 +1240,7 @@ static BOOL ov68_0225D478(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB
v7.unk_04 = sub_02030ED4(v8);
v9 = ov66_0222E924(param4->unk_04, ov66_0222E338(param4->unk_04));
ov68_0225D8F0(param0, &param0->unk_A8, param1, param2, &v7, param5, ((u32)(((11 & 0xff) << 16) | ((12 & 0xff) << 8) | ((0 & 0xff) << 0))), ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), v9);
ov68_0225D8F0(param0, &param0->unk_A8, param1, param2, &v7, param5, TEXT_COLOR(11, 12, 0), TEXT_COLOR(15, 14, 0), v9);
ov68_0225DA30(param0, &param0->unk_DC, param2, 2);
Sound_PlayEffect(1472);
}
@ -1301,7 +1301,7 @@ static void ov68_0225D868(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB
}
}
static void ov68_0225D89C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, u32 param2, u32 param3)
static void ov68_0225D89C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, u32 param2, TextColor param3)
{
Strbuf *v0;
u32 v1;
@ -1313,7 +1313,7 @@ static void ov68_0225D89C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB
v1 = Font_CalcStrbufWidth(FONT_MESSAGE, v0, 0);
v2 = ((18 * 8) - v1) / 2;
Text_AddPrinterWithParamsAndColor(&param0->unk_00[0], 1, v0, v2, 4, 0xff, param3, NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00[0], FONT_MESSAGE, v0, v2, 4, TEXT_SPEED_NO_TRANSFER, param3, NULL);
sub_0201A9A4(&param0->unk_00[0]);
}
@ -1325,18 +1325,18 @@ static void ov68_0225D8F0(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_
BGL_FillWindow(&param0->unk_00[5], 0);
v0 = ov68_0225DC58(param1, param2, 0);
Text_AddPrinterWithParamsAndColor(&param0->unk_00[1], 1, v0, 0, 0, 0xff, param6, NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00[1], FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, param6, NULL);
v0 = ov68_0225DC58(param1, param2, 1);
Text_AddPrinterWithParamsAndColor(&param0->unk_00[1], 1, v0, 0, 24, 0xff, param6, NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00[1], FONT_MESSAGE, v0, 0, 24, TEXT_SPEED_NO_TRANSFER, param6, NULL);
v0 = ov68_0225DC58(param1, param2, 2);
Text_AddPrinterWithParamsAndColor(&param0->unk_00[1], 1, v0, 0, 48, 0xff, param6, NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00[1], FONT_MESSAGE, v0, 0, 48, TEXT_SPEED_NO_TRANSFER, param6, NULL);
if ((param4->unk_00 == param1->unk_04) && (param4->unk_04 < 3)) {
s32 v1;
s32 v2;
u32 v3;
TextColor v3;
if (param8 == 1) {
v3 = param7;
@ -1350,13 +1350,13 @@ static void ov68_0225D8F0(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_
v1 = Font_CalcStrbufWidth(FONT_MESSAGE, v0, 0);
v2 = (((12 * 8) - v1) / 2);
Text_AddPrinterWithParamsAndColor(&param0->unk_00[5], 1, v0, v2, 0, 0xff, v3, NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00[5], FONT_MESSAGE, v0, v2, 0, TEXT_SPEED_NO_TRANSFER, v3, NULL);
v0 = ov68_0225DC58(param1, param2, param4->unk_04);
v1 = Font_CalcStrbufWidth(FONT_MESSAGE, v0, 0);
v2 = (((13 * 8) - v1) / 2);
Text_AddPrinterWithParamsAndColor(&param0->unk_00[5], 1, v0, (12 * 8) + v2, 0, 0xff, param6, NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00[5], FONT_MESSAGE, v0, (12 * 8) + v2, 0, TEXT_SPEED_NO_TRANSFER, param6, NULL);
}
sub_0201A9A4(&param0->unk_00[5]);
@ -1440,7 +1440,7 @@ static void ov68_0225DB3C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB
}
}
ov68_0225D89C(param0, param1, 119, ((u32)(((5 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov68_0225D89C(param0, param1, 119, TEXT_COLOR(5, 6, 0));
}
static void ov68_0225DB8C(UnkStruct_ov68_0225DB8C *param0, BOOL param1, u32 param2)

24
src/overlay069/ov69_0225C700.c
View File

@ -564,12 +564,12 @@ static const u8 Unk_ov69_0225F014[5] = {
0x1E,
};
static const u32 Unk_ov69_0225F088[5] = {
(u32)(((5 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0)),
(u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((0 & 0xff) << 0)),
(u32)(((9 & 0xff) << 16) | ((10 & 0xff) << 8) | ((0 & 0xff) << 0)),
(u32)(((11 & 0xff) << 16) | ((12 & 0xff) << 8) | ((0 & 0xff) << 0)),
(u32)(((11 & 0xff) << 16) | ((12 & 0xff) << 8) | ((0 & 0xff) << 0)),
static const TextColor Unk_ov69_0225F088[5] = {
TEXT_COLOR(5, 6, 0),
TEXT_COLOR(7, 8, 0),
TEXT_COLOR(9, 10, 0),
TEXT_COLOR(11, 12, 0),
TEXT_COLOR(11, 12, 0),
};
static const UnkStruct_ov69_0225ECF0 Unk_ov69_0225F1E0[12][3] = {
@ -1842,7 +1842,7 @@ static void ov69_0225DBB4(UnkStruct_ov69_0225DC48 *param0, UnkStruct_ov69_0225D3
Font_InitManager(FONT_SUBSCREEN, param3);
{
u32 v1 = Font_CalcCenterAlignment(FONT_SUBSCREEN, v0, 0, 48);
Text_AddPrinterWithParamsAndColor(&param0->unk_1C, 2, v0, v1, 0, 0xff, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_1C, FONT_SUBSCREEN, v0, v1, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(2, 1, 15), NULL);
}
Font_Free(FONT_SUBSCREEN);
@ -1979,7 +1979,7 @@ static void ov69_0225DDFC(UnkStruct_ov69_0225DDC8 *param0)
sub_0200E060(&param0->unk_10, 1, 1, 2);
sub_0201A9A4(&param0->unk_10);
param0->unk_04 = Text_AddPrinterWithParams(&param0->unk_10, 1, param0->unk_0C, 0, 0, param0->unk_08, NULL);
param0->unk_04 = Text_AddPrinterWithParams(&param0->unk_10, FONT_MESSAGE, param0->unk_0C, 0, 0, param0->unk_08, NULL);
param0->unk_00 = 0;
}
@ -2037,7 +2037,7 @@ static void ov69_0225DEC0(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D3
v1 = ov69_0225EF74(param2, 0);
Text_AddPrinterWithParams(&param0->unk_1A8, 1, v1, 0, 0, 0xff, NULL);
Text_AddPrinterWithParams(&param0->unk_1A8, FONT_MESSAGE, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL);
sub_0200E060(&param0->unk_1A8, 0, 10, 10);
}
@ -2491,17 +2491,17 @@ static void ov69_0225E644(UnkStruct_ov69_0225E084 *param0, u32 param1, const Unk
{
v0 = ov69_0225EF74(param3, 2);
Text_AddPrinterWithParamsAndColor(v1, 1, v0, 0, 0, 0xff, Unk_ov69_0225F088[v2], NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, Unk_ov69_0225F088[v2], NULL);
}
{
v0 = ov69_0225EF90(param3, param2->unk_04);
Text_AddPrinterWithParamsAndColor(v1, 1, v0, 0, 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_MESSAGE, v0, 0, 16, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
}
{
v0 = ov69_0225EFB8(param3, param2->unk_04, param2->unk_08);
Text_AddPrinterWithParamsAndColor(v1, 1, v0, 0, 32, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v1, FONT_MESSAGE, v0, 0, 32, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
}
}

36
src/overlay070/ov70_0225D9A4.c
View File

@ -1558,7 +1558,7 @@ static void ov70_0225EA44(UnkStruct_ov70_0225E9C8 *param0, const Strbuf *param1)
BGL_FillWindow(&param0->unk_00, 15);
Strbuf_Copy(param0->unk_18, param1);
param0->unk_10 = Text_AddPrinterWithParamsAndColor(&param0->unk_00, 1, param0->unk_18, 0, 0, param0->unk_14, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
param0->unk_10 = Text_AddPrinterWithParamsAndColor(&param0->unk_00, FONT_MESSAGE, param0->unk_18, 0, 0, param0->unk_14, TEXT_COLOR(1, 2, 15), NULL);
sub_0200E060(&param0->unk_00, 1, 1, 1);
}
@ -1571,7 +1571,7 @@ static void ov70_0225EAA4(UnkStruct_ov70_0225E9C8 *param0, const Strbuf *param1)
BGL_FillWindow(&param0->unk_00, 15);
Strbuf_Copy(param0->unk_18, param1);
Text_AddPrinterWithParamsAndColor(&param0->unk_00, 1, param0->unk_18, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00, FONT_MESSAGE, param0->unk_18, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL);
sub_0200E060(&param0->unk_00, 1, 1, 1);
sub_0201A9A4(&param0->unk_00);
}
@ -1648,7 +1648,7 @@ static void ov70_0225EBC4(UnkStruct_ov70_0225E9C8 *param0, const Strbuf *param1)
BGL_FillWindow(&param0->unk_00, 15);
Strbuf_Copy(param0->unk_18, param1);
param0->unk_10 = Text_AddPrinterWithParams(&param0->unk_00, 1, param0->unk_18, 0, 0, param0->unk_14, NULL);
param0->unk_10 = Text_AddPrinterWithParams(&param0->unk_00, FONT_MESSAGE, param0->unk_18, 0, 0, param0->unk_14, NULL);
sub_0200E69C(&param0->unk_00, 1, (1 + (18 + 12)), 2, 3);
}
@ -1889,7 +1889,7 @@ static void ov70_0225F024(UnkStruct_ov70_0225EFD4 *param0)
static void ov70_0225F048(UnkStruct_ov70_0225EFD4 *param0, const Strbuf *param1, u8 param2, u8 param3)
{
Text_AddPrinterWithParamsAndColor(&param0->unk_00, 0, param1, param2, param3, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00, FONT_SYSTEM, param1, param2, param3, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL);
sub_0201A9A4(&param0->unk_00);
}
@ -1936,7 +1936,7 @@ static void ov70_0225F144(UnkStruct_ov70_0225F114 *param0)
static void ov70_0225F14C(UnkStruct_ov70_0225F114 *param0, const Strbuf *param1)
{
Text_AddPrinterWithParamsAndColor(&param0->unk_00, 0, param1, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_00, FONT_SYSTEM, param1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL);
Window_Show(&param0->unk_00, 1, ((1 + (18 + 12)) + ((18 + 12) + 24)), 3);
sub_0201A9A4(&param0->unk_00);
}
@ -2537,7 +2537,7 @@ static void ov70_0225FAD0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9
ov70_0225F338(param4);
if (ov66_0222E7C8(param8) == 0) {
v0 = ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((0 & 0xff) << 0)));
v0 = TEXT_COLOR(7, 8, 0);
if (param10 == 0) {
ov70_0225F940(param0, param3, 86, param7);
@ -2545,7 +2545,7 @@ static void ov70_0225FAD0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9
ov70_0225F940(param0, param3, 88, param7);
}
} else {
v0 = ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0)));
v0 = TEXT_COLOR(3, 4, 0);
if (param10 == 0) {
ov70_0225F940(param0, param3, 87, param7);
@ -2569,10 +2569,10 @@ static void ov70_0225FAD0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9
ov70_022602DC(param2, param4, 0, 44, 0, 0, v0);
ov70_0225F2A8(param4, TrainerInfo_ID_LowHalf(v1), 5, 0, 2);
ov70_02260314(param2, param4, 0, 49, 122, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov70_02260314(param2, param4, 0, 49, 122, 0, TEXT_COLOR(1, 2, 0));
ov70_022602DC(param2, param4, 0, 45, 0, 16, v0);
ov70_02260370(param2, param4, v1);
ov70_02260314(param2, param4, 0, 50, 122, 16, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov70_02260314(param2, param4, 0, 50, 122, 16, TEXT_COLOR(1, 2, 0));
ov70_02260360(param2, 0);
}
@ -2580,10 +2580,10 @@ static void ov70_0225FAD0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9
ov70_022602DC(param2, param4, 1, 46, 0, 0, v0);
if (ov66_0222E880(param8) == 0) {
ov70_022602DC(param2, param4, 1, 55, 32, 16, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov70_022602DC(param2, param4, 1, 55, 32, 16, TEXT_COLOR(1, 2, 0));
} else {
ov70_02260380(param2, param4, param8);
ov70_022602DC(param2, param4, 1, 51, 32, 16, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov70_022602DC(param2, param4, 1, 51, 32, 16, TEXT_COLOR(1, 2, 0));
}
ov70_02260360(param2, 1);
@ -2595,10 +2595,10 @@ static void ov70_0225FAD0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9
ov70_02260370(param2, param4, v1);
ov70_022602DC(param2, param4, 4, 56, 8, 0, v0);
ov70_022603B0(param2, param4, param12);
ov70_022602DC(param2, param4, 4, 59, 6, 24, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov70_022602DC(param2, param4, 4, 60, 90, 24, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov70_022602DC(param2, param4, 4, 61, 6, 44, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov70_022602DC(param2, param4, 4, 62, 90, 44, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))));
ov70_022602DC(param2, param4, 4, 59, 6, 24, TEXT_COLOR(1, 2, 0));
ov70_022602DC(param2, param4, 4, 60, 90, 24, TEXT_COLOR(1, 2, 0));
ov70_022602DC(param2, param4, 4, 61, 6, 44, TEXT_COLOR(1, 2, 0));
ov70_022602DC(param2, param4, 4, 62, 90, 44, TEXT_COLOR(1, 2, 0));
ov70_02260360(param2, 4);
} else {
param2->unk_00 = 0;
@ -2866,7 +2866,7 @@ static void ov70_022602DC(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225F2
Strbuf *v0;
v0 = ov70_0225F288(param1, 1, param3);
Text_AddPrinterWithParamsAndColor(&param0->unk_04[param2], 0, v0, param4, param5, 0xff, param6, NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_04[param2], FONT_SYSTEM, v0, param4, param5, TEXT_SPEED_NO_TRANSFER, param6, NULL);
}
static void ov70_02260314(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225F208 *param1, u32 param2, u32 param3, u8 param4, u8 param5, u32 param6)
@ -2883,7 +2883,7 @@ static void ov70_02260314(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225F2
v2 = 0;
}
Text_AddPrinterWithParamsAndColor(&param0->unk_04[param2], 0, v0, v2, param5, 0xff, param6, NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_04[param2], FONT_SYSTEM, v0, v2, param5, TEXT_SPEED_NO_TRANSFER, param6, NULL);
}
static void ov70_02260360(UnkStruct_ov70_0225FA84 *param0, u32 param1)
@ -3158,7 +3158,7 @@ static void ov70_02260870(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4
v0 = ov70_0225F288(param2, 1, 63);
BGL_FillWindow(&param0->unk_0C, 0);
Text_AddPrinterWithParamsAndColor(&param0->unk_0C, 0, v0, 0, 4, 0, (u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_0C, FONT_SYSTEM, v0, 0, 4, TEXT_SPEED_INSTANT, TEXT_COLOR(15, 14, 0), NULL);
}
if (param0->unk_02 == 0) {

18
src/overlay071/ov71_0223C69C.c
View File

@ -89,7 +89,7 @@ void ov71_0223C6F0 (Window * param0, const TrainerCard * param1)
for (v0 = 0; v0 < 7; v0++) {
if ((v0 != 3) || (v0 == 3) && (param1->unk_04_3)) {
MessageLoader_GetStrbuf(v1, Unk_ov71_0223D644[v0], v2);
Text_AddPrinterWithParamsAndColor(&param0[v0], 0, v2, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0[v0], FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
}
}
@ -110,7 +110,7 @@ void ov71_0223C6F0 (Window * param0, const TrainerCard * param1)
v5 = (8 * 17) - Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
Text_AddPrinterWithParamsAndColor(&param0[2], 0, v2, v5, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0[2], FONT_SYSTEM, v2, v5, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
}
if (param1->unk_04_3) {
@ -122,7 +122,7 @@ void ov71_0223C6F0 (Window * param0, const TrainerCard * param1)
v6 = (8 * 17) - Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
Text_AddPrinterWithParamsAndColor(&param0[3], 0, v2, v6, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0[3], FONT_SYSTEM, v2, v6, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
}
ov71_0223CD64(&param0[4], (8 * 17), 0, 0, v2, param1->unk_24, 9, 1);
@ -142,7 +142,7 @@ void ov71_0223C6F0 (Window * param0, const TrainerCard * param1)
StringTemplate_Format(v4, v2, v3);
v7 = (8 * 28) - Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
Text_AddPrinterWithParamsAndColor(&param0[5], 0, v2, v7, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0[5], FONT_SYSTEM, v2, v7, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
}
{
@ -156,7 +156,7 @@ void ov71_0223C6F0 (Window * param0, const TrainerCard * param1)
v8 = (8 * 28) - Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
Text_AddPrinterWithParamsAndColor(&param0[6], 0, v2, v8, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0[6], FONT_SYSTEM, v2, v8, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
}
Strbuf_Free(v3);
@ -538,7 +538,7 @@ static void ov71_0223CD64 (Window * param0, const u32 param1, const u32 param2,
Strbuf_FormatInt(param4, param5, param6, param7, 1);
v0 = Font_CalcStrbufWidth(FONT_SYSTEM, param4, 0);
Text_AddPrinterWithParamsAndColor(param0, 0, param4, param1 - (v0 + param2), param3, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, param4, param1 - (v0 + param2), param3, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
}
static void ov71_0223CDB0 (Window * param0, const u32 param1, const u32 param2, const u32 param3, const Strbuf *param4)
@ -546,7 +546,7 @@ static void ov71_0223CDB0 (Window * param0, const u32 param1, const u32 param2,
u32 v0;
v0 = Font_CalcStrbufWidth(FONT_SYSTEM, param4, 0);
Text_AddPrinterWithParamsAndColor(param0, 0, param4, param1 - (v0 + param2), param3, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, param4, param1 - (v0 + param2), param3, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
}
void ov71_0223CDE8 (Window * param0, const TrainerCard * param1, Strbuf *param2)
@ -575,7 +575,7 @@ void ov71_0223CDE8 (Window * param0, const TrainerCard * param1, Strbuf *param2)
MessageLoader_GetStrbuf(v2, 16, v4);
StringTemplate_Format(v5, v3, v4);
v1 = (8 * 28) - Font_CalcStrbufWidth(FONT_SYSTEM, v3, 0);
Text_AddPrinterWithParamsAndColor(&param0[5], 0, v3, v1, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0[5], FONT_SYSTEM, v3, v1, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
MessageLoader_Free(v2);
Strbuf_Free(v3);
@ -587,7 +587,7 @@ void ov71_0223CDE8 (Window * param0, const TrainerCard * param1, Strbuf *param2)
void ov71_0223CECC (Window * param0, const BOOL param1, Strbuf *param2)
{
if (param1) {
Text_AddPrinterWithParamsAndColor(param0, 0, param2, (207 - 2), 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, param2, (207 - 2), 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
} else {
BGL_WindowColor(param0, 0, (207 - 2), 0, 5, 2 * 8);
sub_0201A954(param0);

14
src/overlay072/ov72_0223D7A0.c
View File

@ -558,7 +558,7 @@ static void *ov72_0223E060(Window *param0, Strbuf *param1, int param2, u8 param3
v1 = Font_CalcStrbufWidth(FONT_SUBSCREEN, param1, 0);
v0 = ((param0->unk_07 * 8) - v1) / 2;
Text_AddPrinterWithParamsAndColor(param0, param3, param1, v0, param2, 0xff, param4, NULL);
Text_AddPrinterWithParamsAndColor(param0, param3, param1, v0, param2, TEXT_SPEED_NO_TRANSFER, param4, NULL);
return param0->unk_0C;
}
@ -576,7 +576,7 @@ static void ov72_0223E0A0(UnkStruct_ov72_0223DB98 *param0, OverlayManager *param
void *v0;
int v1;
v0 = ov72_0223E060(&param0->unk_348, param0->unk_2C, 1, 2, (u32)(((0xe & 0xff) << 16) | ((7 & 0xff) << 8) | ((2 & 0xff) << 0)));
v0 = ov72_0223E060(&param0->unk_348, param0->unk_2C, 1, FONT_SUBSCREEN, TEXT_COLOR(14, 7, 2));
DC_FlushRange(v0, 0x20 * 8 * 2);
@ -594,7 +594,7 @@ static void ov72_0223E0A0(UnkStruct_ov72_0223DB98 *param0, OverlayManager *param
int v3 = (28 * 8 - v2) / 2;
BGL_FillWindow(&param0->unk_358, 0x0);
Text_AddPrinterWithParamsAndColor(&param0->unk_358, 1, param0->unk_30, v3, 0, 0, (u32)(((0x1 & 0xff) << 16) | ((0x2 & 0xff) << 8) | ((0x0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_358, FONT_MESSAGE, param0->unk_30, v3, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
}
{
@ -605,7 +605,7 @@ static void ov72_0223E0A0(UnkStruct_ov72_0223DB98 *param0, OverlayManager *param
BGL_FillWindow(&param0->unk_2D8[v4], 0);
}
ov72_0223E910(param0->unk_2D8, 0, (u32)(((0xe & 0xff) << 16) | ((0xd & 0xff) << 8) | ((0xf & 0xff) << 0)), param0);
ov72_0223E910(param0->unk_2D8, 0, TEXT_COLOR(14, 13, 15), param0);
}
}
@ -717,7 +717,7 @@ static void ov72_0223E3A8(CellActor **param0, BOOL param1)
static int ov72_0223E3C0(UnkStruct_ov72_0223DB98 *param0, int param1)
{
ov72_0223E2A8(param0);
ov72_0223E910(param0->unk_2D8, 0, (u32)(((0xe & 0xff) << 16) | ((0xc & 0xff) << 8) | ((0xf & 0xff) << 0)), param0);
ov72_0223E910(param0->unk_2D8, 0, TEXT_COLOR(14, 12, 15), param0);
ov72_0223E914(param0);
ov72_0223E8CC(param0);
ov72_0223E80C(&param0->unk_328, param0->unk_4391, param0->unk_43E6, 1);
@ -1092,7 +1092,7 @@ static void ov72_0223E910(Window *param0, int param1, u32 param2, UnkStruct_ov72
}
for (v0 = 0; v0 < 5; v0++) {
Text_AddPrinterWithParamsAndColor(&param0[v0], 1, param3->unk_18[v0], 0, 0, 0xff, (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((15 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0[v0], FONT_MESSAGE, param3->unk_18[v0], 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 4, 15), NULL);
sub_0201A954(&param0[v0]);
}
}
@ -1114,7 +1114,7 @@ static void ov72_0223E930(UnkStruct_ov72_0223DB98 *param0, int param1)
BGL_FillWindow(&param0->unk_338, 0xf0f);
sub_0200E060(&param0->unk_338, 0, 1, 10);
param0->unk_38 = Text_AddPrinterWithParams(&param0->unk_338, 1, param0->unk_34, 0, 0, Options_TextFrameDelay(param0->unk_0C), NULL);
param0->unk_38 = Text_AddPrinterWithParams(&param0->unk_338, FONT_MESSAGE, param0->unk_34, 0, 0, Options_TextFrameDelay(param0->unk_0C), NULL);
}
static int ov72_0223E99C(int param0)

6
src/overlay073/ov73_021D0D80.c
View File

@ -723,7 +723,7 @@ static BOOL ov73_021D1510(UnkStruct_ov73_021D1058 *param0, u32 param1, int param
Strbuf_Free(v1);
}
param0->unk_58 = Text_AddPrinterWithParams(&param0->unk_1C, 1, param0->unk_5C, 0, 0, (Options_TextFrameDelay(param0->unk_08)), NULL);
param0->unk_58 = Text_AddPrinterWithParams(&param0->unk_1C, FONT_MESSAGE, param0->unk_5C, 0, 0, (Options_TextFrameDelay(param0->unk_08)), NULL);
param0->unk_50 = 1;
break;
case 1:
@ -855,7 +855,7 @@ static BOOL ov73_021D1784(UnkStruct_ov73_021D1058 *param0, u32 param1, int param
sub_0201A8D4(param0->unk_18, &param0->unk_1C, &v1);
BGL_WindowColor(&param0->unk_1C, 0, 0, 0, 24 * 8, 24 * 8);
Text_AddPrinterWithParamsAndColor(&param0->unk_1C, 0, param0->unk_5C, 0, 0, 0, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_1C, FONT_SYSTEM, param0->unk_5C, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
} else {
v1 = Unk_ov72_021D37E4;
@ -871,7 +871,7 @@ static BOOL ov73_021D1784(UnkStruct_ov73_021D1058 *param0, u32 param1, int param
sub_0201A8D4(param0->unk_18, &param0->unk_1C, &v1);
BGL_WindowColor(&param0->unk_1C, 0, 0, 0, 24 * 8, 24 * 8);
Text_AddPrinterWithParamsAndColor(&param0->unk_1C, 0, param0->unk_5C, 0, 0, 0, (u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_1C, FONT_SYSTEM, param0->unk_5C, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(15, 2, 0), NULL);
}
Strbuf_Free(param0->unk_5C);

32
src/overlay074/ov74_021D0D80.c
View File

@ -544,7 +544,7 @@ static void ov74_021D1668(UnkStruct_ov74_021D0D80 *param0)
{
u32 v0, v1;
u16 v2;
u32 v3, v4, v5;
TextColor v3, v4, v5;
Strbuf *v6;
Strbuf *v7;
static const u8 v8[7] = {
@ -557,22 +557,22 @@ static void ov74_021D1668(UnkStruct_ov74_021D0D80 *param0)
42,
};
v5 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0));
v3 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0));
v4 = (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((15 & 0xff) << 0));
v5 = TEXT_COLOR(1, 2, 0);
v3 = TEXT_COLOR(1, 2, 15);
v4 = TEXT_COLOR(3, 4, 15);
v6 = Strbuf_Init(256, param0->unk_00);
MessageLoader_GetStrbuf(param0->unk_20, 0, v6);
v1 = 2;
Text_AddPrinterWithParamsAndColor(&param0->unk_2C[0], 0, v6, v1, 2, 0, v5, NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_2C[0], FONT_SYSTEM, v6, v1, 2, TEXT_SPEED_INSTANT, v5, NULL);
v1 = 4;
for (v2 = 0; v2 < 7; v2++) {
Strbuf_Clear(v6);
MessageLoader_GetStrbuf(param0->unk_20, v8[v2], v6);
Text_AddPrinterWithParamsAndColor(&param0->unk_2C[1], 0, v6, v1, 16 * v2, 0xff, v3, NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_2C[1], FONT_SYSTEM, v6, v1, 16 * v2, TEXT_SPEED_NO_TRANSFER, v3, NULL);
}
for (v2 = 0; v2 < 7; v2++) {
@ -627,13 +627,13 @@ static void ov74_021D17CC(UnkStruct_ov74_021D0D80 *param0, u16 param1)
s8 v5 = 0;
static const s8 v6[] = { 0, 0, 0, 0, 0, 0, 0 };
v0 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0));
v1 = (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((15 & 0xff) << 0));
v0 = TEXT_COLOR(1, 2, 15);
v1 = TEXT_COLOR(3, 4, 15);
BGL_WindowColor(&(param0->unk_2C[1]), WINCLR_COL(15), (12 * 8 + 4) + v6[param1], 0 + param1 * 16, (48 * 8), 16);
if (param1 == 5) {
Text_AddPrinterWithParamsAndColor(&param0->unk_2C[1], 0, param0->unk_5C[param1].unk_04[param0->unk_5C[param1].unk_02], 1 * 48 + (12 * 8 + 4), 16 * param1 + 0, 0xff, v1, NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_2C[1], FONT_SYSTEM, param0->unk_5C[param1].unk_04[param0->unk_5C[param1].unk_02], 1 * 48 + (12 * 8 + 4), 16 * param1 + 0, TEXT_SPEED_NO_TRANSFER, v1, NULL);
sub_0201A954(&param0->unk_2C[1]);
param0->unk_10_21 = 1;
return;
@ -658,16 +658,16 @@ static void ov74_021D17CC(UnkStruct_ov74_021D0D80 *param0, u16 param1)
}
if (v3 == param0->unk_5C[param1].unk_00 - 1) {
v4 = 0xff;
v4 = TEXT_SPEED_NO_TRANSFER;
} else {
v4 = 0xff;
v4 = TEXT_SPEED_NO_TRANSFER;
}
if (param1 == 4) {
Text_AddPrinterWithParamsAndColor(&param0->unk_2C[1], 0, param0->unk_5C[param1].unk_04[v3], (12 * 8 + 4) - 0 + v5, 16 * param1 + 0, v4, v2, NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_2C[1], FONT_SYSTEM, param0->unk_5C[param1].unk_04[v3], (12 * 8 + 4) - 0 + v5, 16 * param1 + 0, v4, v2, NULL);
v5 += Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_5C[param1].unk_04[v3], 0) + 12;
} else {
Text_AddPrinterWithParamsAndColor(&param0->unk_2C[1], 0, param0->unk_5C[param1].unk_04[v3], v3 * 48 + (12 * 8 + 4) + v6[param1], 16 * param1 + 0, v4, v2, NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_2C[1], FONT_SYSTEM, param0->unk_5C[param1].unk_04[v3], v3 * 48 + (12 * 8 + 4) + v6[param1], 16 * param1 + 0, v4, v2, NULL);
}
}
@ -688,15 +688,15 @@ static void ov74_021D1968(UnkStruct_ov74_021D0D80 *param0, u16 param1, BOOL para
BGL_FillWindow(&(param0->unk_2C[2]), 15);
v0 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0));
v0 = TEXT_COLOR(1, 2, 15);
v1 = Strbuf_Init(256, param0->unk_00);
MessageLoader_GetStrbuf(param0->unk_20, param1, v1);
if (param2 == 0) {
param0->unk_2AC = Text_AddPrinterWithParamsAndColor(&param0->unk_2C[2], 1, v1, 4, 0, v2, v0, NULL);
param0->unk_2AC = Text_AddPrinterWithParamsAndColor(&param0->unk_2C[2], FONT_MESSAGE, v1, 4, 0, v2, v0, NULL);
} else {
Text_AddPrinterWithParamsAndColor(&param0->unk_2C[2], 1, v1, 4, 0, 0xff, v0, NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_2C[2], FONT_MESSAGE, v1, 4, 0, TEXT_SPEED_NO_TRANSFER, v0, NULL);
sub_0201A9A4(&param0->unk_2C[2]);
}

10
src/overlay075/ov75_021D0D80.c
View File

@ -279,7 +279,7 @@ static int ov75_021D0FA0(UnkStruct_ov75_021D1184 *param0)
v0 = Strbuf_Init((19 * 2 * 2), param0->unk_00);
MessageLoader_GetStrbuf(param0->unk_20, 2, v0);
Text_AddPrinterWithParamsAndColor(&param0->unk_44[5], 1, v0, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_44[5], FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 15), NULL);
Strbuf_Free(v0);
break;
case 1:
@ -336,7 +336,7 @@ static int ov75_021D108C(UnkStruct_ov75_021D1184 *param0)
v1 = Strbuf_Init((19 * 2 * 2), param0->unk_00);
MessageLoader_GetStrbuf(param0->unk_20, 3, v1);
param0->unk_0F = Text_AddPrinterWithParamsAndColor(&param0->unk_44[5], 1, v1, 0, 0, param0->unk_10, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
param0->unk_0F = Text_AddPrinterWithParamsAndColor(&param0->unk_44[5], FONT_MESSAGE, v1, 0, 0, param0->unk_10, TEXT_COLOR(1, 2, 15), NULL);
Strbuf_Free(v1);
sub_020039B0(param0->unk_30, 0, 34 + param0->unk_17, 1, 0, 0x7FFF);
@ -835,7 +835,7 @@ static void ov75_021D19C8(UnkStruct_ov75_021D1184 *param0)
v1 = sub_02014B34(&param0->unk_1C->unk_1A[v0], param0->unk_00);
Text_AddPrinterWithParamsAndColor(&param0->unk_44[0 + v0], 1, v1, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_44[0 + v0], FONT_MESSAGE, v1, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
Strbuf_Free(v1);
sub_0201A954(&param0->unk_44[0 + v0]);
}
@ -855,13 +855,13 @@ static void ov75_021D19C8(UnkStruct_ov75_021D1184 *param0)
v3 = (8 * 8) - Font_CalcStrbufWidth(FONT_MESSAGE, v2, 0);
v3 /= 2;
Text_AddPrinterWithParamsAndColor(&param0->unk_44[3 + v0], 1, v2, v3, 2, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_44[3 + v0], FONT_MESSAGE, v2, v3, 2, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
sub_0201A954(&param0->unk_44[3 + v0]);
}
Strbuf_Free(v2);
} else {
Text_AddPrinterWithParamsAndColor(&param0->unk_44[3], 1, param0->unk_1C->unk_10, 0, 2, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_44[3], FONT_MESSAGE, param0->unk_1C->unk_10, 0, 2, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
sub_0201A954(&param0->unk_44[3]);
}
}

10
src/overlay076/ov76_0223B870.c
View File

@ -158,7 +158,7 @@ void ov76_0223B98C(UnkStruct_ov76_0223DE00 *param0, int param1, int param2, int
{
Window_Init(&v5);
BGL_AddFramelessWindow(param0->unk_D4.unk_10, &v5, 10, 2, 0, 0);
Text_AddPrinterWithParamsAndColor(&v5, 2, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((2 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(&v5, FONT_SUBSCREEN, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 2), NULL);
}
v2 = 30000;
@ -959,7 +959,7 @@ void ov76_0223CA30(Window *param0, int param1)
v1 = MessageLoader_GetNewStrbuf(v0, param1);
BGL_FillWindow(param0, 15);
Text_AddPrinterWithParams(param0, 1, v1, 0, 0, 0, NULL);
Text_AddPrinterWithParams(param0, FONT_MESSAGE, v1, 0, 0, TEXT_SPEED_INSTANT, NULL);
sub_0201A954(param0);
Strbuf_Free(v1);
MessageLoader_Free(v0);
@ -1020,7 +1020,7 @@ void ov76_0223CC8C(UnkStruct_ov76_0223DE00 *param0)
v3 = sub_0202CA90(param0->unk_64, v2 - 1);
Strbuf_FormatInt(v4, v3, 3, 1, 1);
Text_AddPrinterWithParamsAndColor(v5, 0, v4, (-1 + 8), 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v5, FONT_SYSTEM, v4, (-1 + 8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
sub_0201A954(v5);
Strbuf_Free(v4);
}
@ -1051,7 +1051,7 @@ void ov76_0223CD20(UnkStruct_ov76_0223DE00 *param0, int param1)
v3 = sub_0202CA90(param0->unk_64, v2 - 1);
Strbuf_FormatInt(v4, v3, 3, 1, 1);
Text_AddPrinterWithParamsAndColor(v5, 1, v4, (-1 + 8), 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Text_AddPrinterWithParamsAndColor(v5, FONT_MESSAGE, v4, (-1 + 8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
sub_0201A954(v5);
Strbuf_Free(v4);
}
@ -1081,7 +1081,7 @@ void ov76_0223CDC4(Window *param0, int param1)
v1 = MessageLoader_GetNewStrbuf(v0, param1);
BGL_FillWindow(param0, 15);
Text_AddPrinterWithParams(param0, 1, v1, 0, 0, 0, NULL);
Text_AddPrinterWithParams(param0, FONT_MESSAGE, v1, 0, 0, TEXT_SPEED_INSTANT, NULL);
sub_0201A954(param0);
Strbuf_Free(v1);
MessageLoader_Free(v0);

2
src/overlay077/ov77_021D0D80.c
View File

@ -1273,7 +1273,7 @@ static void ov77_021D2214(BGL *param0, int param1, UnkStruct_ov77_021D1568 *para
v6 = Font_CalcCenterAlignment(FONT_SYSTEM, v5, 1, param2->unk_22C.unk_07 * 8);
Text_AddPrinterWithParamsColorAndSpacing(&param2->unk_22C, 0, v5, v6, 0, 0, (u32)(((1 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0)), 1, 0, NULL);
Text_AddPrinterWithParamsColorAndSpacing(&param2->unk_22C, FONT_SYSTEM, v5, v6, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 1, 0), 1, 0, NULL);
Strbuf_Free(v5);
MessageLoader_Free(v4);

26
src/overlay079/ov79_021D183C.c
View File

@ -83,7 +83,7 @@ static void ov79_021D183C(UnkStruct_020989DC *param0)
static void ov79_021D1850(UnkStruct_ov79_021D0E1C *param0, Strbuf *param1, u8 param2, u8 param3)
{
u32 v0 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0));
u32 v0 = TEXT_COLOR(1, 2, 15);
if (param3) {
sub_0200E060(&param0->unk_E8[2], 1, 1, 14);
@ -93,7 +93,7 @@ static void ov79_021D1850(UnkStruct_ov79_021D0E1C *param0, Strbuf *param1, u8 pa
RenderControlFlags_SetCanABSpeedUpPrint(1);
RenderControlFlags_SetAutoScrollFlags(0);
param0->unk_1F = Text_AddPrinterWithParamsAndColor(&param0->unk_E8[2], 1, param1, 0, 0, param2, v0, NULL);
param0->unk_1F = Text_AddPrinterWithParamsAndColor(&param0->unk_E8[2], FONT_MESSAGE, param1, 0, 0, param2, v0, NULL);
}
static u16 ov79_021D18B4(UnkStruct_0203D9B8 *param0, UnkStruct_ov79_021D0E1C *param1)
@ -250,7 +250,7 @@ void ov79_021D1B24(UnkStruct_ov79_021D0E1C *param0, u8 param1, u8 param2)
void ov79_021D1C44(UnkStruct_ov79_021D0E1C *param0, u8 param1)
{
int v0;
u32 v1 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0));
TextColor v1 = TEXT_COLOR(1, 2, 0);
Sound_PlayEffect(1508);
@ -280,7 +280,7 @@ void ov79_021D1C44(UnkStruct_ov79_021D0E1C *param0, u8 param1)
v0 = (20 * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_30.unk_38[param0->unk_1B], 0);
Text_AddPrinterWithParamsAndColor(&param0->unk_E8[6], 0, param0->unk_30.unk_38[param0->unk_1B], v0 / 2, 3, 0, v1, NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_E8[6], FONT_SYSTEM, param0->unk_30.unk_38[param0->unk_1B], v0 / 2, 3, TEXT_SPEED_INSTANT, v1, NULL);
}
static void ov79_021D1D20(UnkStruct_ov79_021D0E1C *param0, UnkStruct_020989DC *param1)
@ -308,19 +308,19 @@ static void ov79_021D1D20(UnkStruct_ov79_021D0E1C *param0, UnkStruct_020989DC *p
static void ov79_021D1D88(BmpList *param0, u32 param1, u8 param2)
{
UnkStruct_ov79_021D0E1C *v0 = (UnkStruct_ov79_021D0E1C *)sub_02001504(param0, 19);
u32 v1;
TextColor v1;
v1 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0));
v1 = TEXT_COLOR(1, 2, 0);
}
static void ov79_021D1D94(BmpList *param0, u32 param1, u8 param2)
{
UnkStruct_ov79_021D0E1C *v0 = (UnkStruct_ov79_021D0E1C *)sub_02001504(param0, 19);
u32 v1;
TextColor v1;
u16 v2, v3;
u8 v4 = 0;
v1 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0));
v1 = TEXT_COLOR(1, 2, 0);
if (!param2) {
Sound_PlayEffect(1500);
@ -361,7 +361,7 @@ static void ov79_021D1D94(BmpList *param0, u32 param1, u8 param2)
StringTemplate_SetNumber(v0->unk_30.unk_00, 0, v4, 2, 0, 1);
StringTemplate_Format(v0->unk_30.unk_00, v0->unk_30.unk_04, v0->unk_30.unk_10);
Text_AddPrinterWithParamsAndColor(&v0->unk_E8[1], 0, v0->unk_30.unk_04, 8, 0, 0, v1, NULL);
Text_AddPrinterWithParamsAndColor(&v0->unk_E8[1], FONT_SYSTEM, v0->unk_30.unk_04, 8, 0, TEXT_SPEED_INSTANT, v1, NULL);
sub_0209933C(v0->unk_1F8, v0->unk_1FC, v0->unk_20->unk_1C[param1].unk_02);
SpriteActor_EnableObject(v0->unk_1FC->unk_04, 1);
}
@ -439,15 +439,15 @@ void ov79_021D2054(UnkStruct_ov79_021D0E1C *param0)
void ov79_021D2078(UnkStruct_ov79_021D0E1C *param0)
{
int v0, v1;
u32 v2 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0));
u32 v3 = (u32)(((2 & 0xff) << 16) | ((3 & 0xff) << 8) | ((1 & 0xff) << 0));
TextColor v2 = TEXT_COLOR(1, 2, 0);
TextColor v3 = TEXT_COLOR(2, 3, 1);
Text_AddPrinterWithParamsAndColor(&param0->unk_E8[5], 0, param0->unk_30.unk_1C, 4, 0, 0, v2, NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_E8[5], FONT_SYSTEM, param0->unk_30.unk_1C, 4, 0, TEXT_SPEED_INSTANT, v2, NULL);
for (v1 = 0; v1 < 6; v1++) {
static const u8 v4[] = { 2, 10, 4, 6, 10, 6 };
v0 = (8 * 8) - Font_CalcStrbufWidth(FONT_SUBSCREEN, param0->unk_30.unk_20[v1], 0);
Text_AddPrinterWithParamsAndColor(&param0->unk_E8[7 + v1], 2, param0->unk_30.unk_20[v1], v0 / 2, v4[v1], 0, v3, NULL);
Text_AddPrinterWithParamsAndColor(&param0->unk_E8[7 + v1], FONT_SUBSCREEN, param0->unk_30.unk_20[v1], v0 / 2, v4[v1], TEXT_SPEED_INSTANT, v3, NULL);
}
}

2
src/overlay079/ov79_021D2268.c
View File

@ -744,7 +744,7 @@ static int ov79_021D2B94(UnkStruct_ov79_021D2928 *param0)
StringTemplate_SetStrbuf(param0->unk_1C.unk_00, 0, param0->unk_30.unk_0C, 2, 1, GAME_LANGUAGE);
StringTemplate_Format(param0->unk_1C.unk_00, param0->unk_1C.unk_04, param0->unk_1C.unk_08[param0->unk_30.unk_09]);
param0->unk_0C = Text_AddPrinterWithParamsAndColor(&param0->unk_6C, 1, param0->unk_1C.unk_04, 0, 0, param0->unk_10->unk_0A, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL);
param0->unk_0C = Text_AddPrinterWithParamsAndColor(&param0->unk_6C, FONT_MESSAGE, param0->unk_1C.unk_04, 0, 0, param0->unk_10->unk_0A, TEXT_COLOR(1, 2, 15), NULL);
param0->unk_0E = 0;
return 7;

Some files were not shown because too many files have changed in this diff Show More