Game-Decompilation/fireemblem8u
1
0
Fork 0
mirror of https://github.com/FireEmblemUniverse/fireemblem8u.git synced 2024-11-23 13:19:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use enum values for PutSpecialChar/PutTwoSpecialChar

Browse Source
This commit is contained in:
Eebit 2023-10-24 21:04:55 -04:00
parent b0866b5b2b
commit 11d5c5a998
14 changed files with 93 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
include/fontgrp.h
View File

@ -77,53 +77,58 @@ enum text_colors {
// TEXT_COLOR_TALK_...
};
enum text_special_char {
TEXT_SPECIAL_BIGNUM_0,
TEXT_SPECIAL_BIGNUM_1,
TEXT_SPECIAL_BIGNUM_2,
TEXT_SPECIAL_BIGNUM_3,
TEXT_SPECIAL_BIGNUM_4,
TEXT_SPECIAL_BIGNUM_5,
TEXT_SPECIAL_BIGNUM_6,
TEXT_SPECIAL_BIGNUM_7,
TEXT_SPECIAL_BIGNUM_8,
TEXT_SPECIAL_BIGNUM_9,
TEXT_SPECIAL_SMALLNUM_0,
TEXT_SPECIAL_SMALLNUM_1,
TEXT_SPECIAL_SMALLNUM_2,
TEXT_SPECIAL_SMALLNUM_3,
TEXT_SPECIAL_SMALLNUM_4,
TEXT_SPECIAL_SMALLNUM_5,
TEXT_SPECIAL_SMALLNUM_6,
TEXT_SPECIAL_SMALLNUM_7,
TEXT_SPECIAL_SMALLNUM_8,
TEXT_SPECIAL_SMALLNUM_9,
TEXT_SPECIAL_DASH,
TEXT_SPECIAL_PLUS,
TEXT_SPECIAL_SLASH,
TEXT_SPECIAL_TILDE,
TEXT_SPECIAL_S,
TEXT_SPECIAL_A,
TEXT_SPECIAL_B,
TEXT_SPECIAL_C,
TEXT_SPECIAL_D,
TEXT_SPECIAL_E,
TEXT_SPECIAL_G,
TEXT_SPECIAL_K, // NOTE: this is an E? used as statscreen exp label and equip marker
TEXT_SPECIAL_COLON,
TEXT_SPECIAL_DOT,
TEXT_SPECIAL_HP_A,
TEXT_SPECIAL_HP_B,
TEXT_SPECIAL_LV_A,
TEXT_SPECIAL_LV_B,
TEXT_SPECIAL_ARROW,
TEXT_SPECIAL_HEART,
TEXT_SPECIAL_100_A,
TEXT_SPECIAL_100_B,
TEXT_SPECIAL_PERCENT,
enum text_special_char
{
TEXT_SPECIAL_BIGNUM_0 = 0x00,
TEXT_SPECIAL_BIGNUM_1 = 0x01,
TEXT_SPECIAL_BIGNUM_2 = 0x02,
TEXT_SPECIAL_BIGNUM_3 = 0x03,
TEXT_SPECIAL_BIGNUM_4 = 0x04,
TEXT_SPECIAL_BIGNUM_5 = 0x05,
TEXT_SPECIAL_BIGNUM_6 = 0x06,
TEXT_SPECIAL_BIGNUM_7 = 0x07,
TEXT_SPECIAL_BIGNUM_8 = 0x08,
TEXT_SPECIAL_BIGNUM_9 = 0x09,
TEXT_SPECIAL_SMALLNUM_0 = 0x0A,
TEXT_SPECIAL_SMALLNUM_1 = 0x0B,
TEXT_SPECIAL_SMALLNUM_2 = 0x0C,
TEXT_SPECIAL_SMALLNUM_3 = 0x0D,
TEXT_SPECIAL_SMALLNUM_4 = 0x0E,
TEXT_SPECIAL_SMALLNUM_5 = 0x0F,
TEXT_SPECIAL_SMALLNUM_6 = 0x10,
TEXT_SPECIAL_SMALLNUM_7 = 0x11,
TEXT_SPECIAL_SMALLNUM_8 = 0x12,
TEXT_SPECIAL_SMALLNUM_9 = 0x13,
TEXT_SPECIAL_DASH = 0x14,
TEXT_SPECIAL_PLUS = 0x15,
TEXT_SPECIAL_SLASH = 0x16,
TEXT_SPECIAL_TILDE = 0x17,
TEXT_SPECIAL_S = 0x18,
TEXT_SPECIAL_A = 0x19,
TEXT_SPECIAL_B = 0x1A,
TEXT_SPECIAL_C = 0x1B,
TEXT_SPECIAL_D = 0x1C,
TEXT_SPECIAL_E = 0x1D,
TEXT_SPECIAL_G = 0x1E,
TEXT_SPECIAL_K = 0x1F, // NOTE: this is an E? used as statscreen exp label and equip marker
TEXT_SPECIAL_COLON = 0x20,
TEXT_SPECIAL_DOT = 0x21,
TEXT_SPECIAL_HP_A = 0x22,
TEXT_SPECIAL_HP_B = 0x23,
TEXT_SPECIAL_LV_A = 0x24,
TEXT_SPECIAL_LV_B = 0x25,
TEXT_SPECIAL_ARROW = 0x26,
TEXT_SPECIAL_HEART = 0x27,
TEXT_SPECIAL_100_A = 0x28,
TEXT_SPECIAL_100_B = 0x29,
TEXT_SPECIAL_PERCENT = 0x2A,
TEXT_SPECIAL_35 = 0x35,
// TODO: rest
TEXT_SPECIAL_NOTHING = 0xFF,
TEXT_SPECIAL_NOTHING = 0xFF,
};
struct TextPrintProc {
@ -221,7 +226,7 @@ void EndGreenText(void);
// ??? DrawSpecialCharGlyph(???);
// ??? AddSpecialChar(???);
// ??? GetSpecialCharChr(???);
void PutSpecialChar(u16 *a, int b, int c);
void PutSpecialChar(u16 * tm, int color, int id);
// ??? PutNumberExt(???);
void PutNumber(u16 *a, int b, int c);
void PutNumberOrBlank(u16* a, int b, int c);
@ -230,7 +235,7 @@ void PutNumberSmall(u16* a, int b, int c);
void PutNumberBonus(int a, u16 *b);
// ??? SpecialCharTest(???);
void PutTime(u16 * tm, int color, int time, bool always_display_punctuation);
void PutTwoSpecialChar(u16 *a, int b, int c, int d);
void PutTwoSpecialChar(u16 * tm, int color, int id_a, int id_b);
void PutNumber2Digit(u16 *tm, int color, int number);
void PutNumber2DigitSmall(u16 *tm, int color, int number);
void PutNumber2DigitExt(u16 *tm, int color, int number, int id_zero);

1
include/variables.h
View File

@ -427,7 +427,6 @@ extern const u8 gUnknown_0820588E[];
// extern ??? Pals_PrepWindow
// extern ??? gUnknown_08205C64
extern const struct FaceVramEntry gFaceConfig_PrepItemUseScreen[4];
// extern ??? gUnknown_08205C90
// extern ??? sSaveMarker
// extern ??? sConvySavePackMask1
// extern ??? sConvySavePackMask2

4
src/bksel.c
View File

@ -305,7 +305,7 @@ void DrawBattleForecastContentsStandard(struct BattleForecastProc* proc) {
PutNumberTwoChr(gBmFrameTmap0 + 0xA8 + 0x40, 2, gBattleActor.battleEffectiveHitRate);
PutNumberTwoChr(gBmFrameTmap0 + 0xA8 + 0x80, 2, critRate);
PutTwoSpecialChar(gBmFrameTmap0 + 0xA8 - 0x44, 3, 0x22, 0x23);
PutTwoSpecialChar(gBmFrameTmap0 + 0xA8 - 0x44, TEXT_COLOR_SYSTEM_GOLD, TEXT_SPECIAL_HP_A, TEXT_SPECIAL_HP_B);
PutText(gaBattleForecastTextStructs, gBmFrameTmap0 + 0xA8 - 5);
PutText(gaBattleForecastTextStructs + 1, gBmFrameTmap0 + 0xA8 + 0x3B);
@ -359,7 +359,7 @@ void DrawBattleForecastContentsExtended(struct BattleForecastProc* proc) {
PutNumberTwoChr(gBmFrameTmap0 + 0xA8 + 0xC0, 2, gBattleActor.battleEffectiveCritRate);
PutNumberTwoChr(gBmFrameTmap0 + 0xA8 + 0x100, 2, gBattleActor.battleSpeed);
PutTwoSpecialChar(gBmFrameTmap0 + 0xA8 - 0x44, 3, 0x22, 0x23);
PutTwoSpecialChar(gBmFrameTmap0 + 0xA8 - 0x44, TEXT_COLOR_SYSTEM_GOLD, TEXT_SPECIAL_HP_A, TEXT_SPECIAL_HP_B);
PutText(gaBattleForecastTextStructs + 3, gBmFrameTmap0 + 0xA8 - 5);
PutText(gaBattleForecastTextStructs + 4, gBmFrameTmap0 + 0xA8 + 0x3B);

4
src/bmitem.c
View File

@ -424,7 +424,7 @@ void DrawItemMenuLineLong(struct Text* text, int item, s8 isUsable, u16* mapOut)
PutNumberOrBlank(mapOut + 10, isUsable ? TEXT_COLOR_SYSTEM_BLUE : TEXT_COLOR_SYSTEM_GRAY, GetItemUses(item));
PutNumberOrBlank(mapOut + 13, isUsable ? TEXT_COLOR_SYSTEM_BLUE : TEXT_COLOR_SYSTEM_GRAY, GetItemMaxUses(item));
PutSpecialChar(mapOut + 11, isUsable ? TEXT_COLOR_SYSTEM_WHITE : TEXT_COLOR_SYSTEM_GRAY, 0x16); // draw special character?
PutSpecialChar(mapOut + 11, isUsable ? TEXT_COLOR_SYSTEM_WHITE : TEXT_COLOR_SYSTEM_GRAY, TEXT_SPECIAL_SLASH);
DrawIcon(mapOut, GetItemIconId(item), 0x4000);
}
@ -451,7 +451,7 @@ void DrawItemStatScreenLine(struct Text* text, int item, int nameColor, u16* map
Text_DrawString(text, GetItemName(item));
color = (nameColor == TEXT_COLOR_SYSTEM_GRAY) ? TEXT_COLOR_SYSTEM_GRAY : TEXT_COLOR_SYSTEM_WHITE;
PutSpecialChar(mapOut + 12, color, 0x16);
PutSpecialChar(mapOut + 12, color, TEXT_SPECIAL_SLASH);
color = (nameColor != TEXT_COLOR_SYSTEM_GRAY) ? TEXT_COLOR_SYSTEM_BLUE : TEXT_COLOR_SYSTEM_GRAY;
PutNumberOrBlank(mapOut + 11, color, GetItemUses(item));

2
src/bmshop.c
View File

@ -1185,7 +1185,7 @@ void InitGoldBoxText(u16* tm) {
InitText(&gText_GoldBox, 1);
PutSpecialChar(tm, 3, 30);
PutSpecialChar(tm, TEXT_COLOR_SYSTEM_GOLD, TEXT_SPECIAL_G);
return;
}

6
src/prep_itemscreen.c
View File

@ -281,7 +281,7 @@ void EndDrawPrepUnitInfoBgSprites(void) {
void PrepItemScreen_DrawFunds(void) {
PutText(&gPrepItemScreenTexts[15], TILEMAP_LOCATED(gBG0TilemapBuffer, 19, 17));
PutNumber(TILEMAP_LOCATED(gBG0TilemapBuffer, 27, 17), 2, GetPartyGoldAmount());
PutSpecialChar(TILEMAP_LOCATED(gBG0TilemapBuffer, 28, 17), 3, 0x1e);
PutSpecialChar(TILEMAP_LOCATED(gBG0TilemapBuffer, 28, 17), TEXT_COLOR_SYSTEM_GOLD, TEXT_SPECIAL_G);
ShowPrepFundsSpriteAt(168, 133);
BG_EnableSyncByMask(1);
return;
@ -895,8 +895,8 @@ void sub_80994C4(struct PrepItemScreenProc* proc) {
x = GetStringTextCenteredPos(40, str);
PutDrawText(&gPrepItemScreenTexts[16], TILEMAP_LOCATED(gBG0TilemapBuffer, 2, 9) - 0x9a, 0, x, 0, str);
PutTwoSpecialChar(TILEMAP_LOCATED(gBG0TilemapBuffer, 2, 9) - 0x5b, 3, 0x24, 0x25);
PutSpecialChar(TILEMAP_LOCATED(gBG0TilemapBuffer, 2, 9) - 0x57, 3, 0x1d);
PutTwoSpecialChar(TILEMAP_LOCATED(gBG0TilemapBuffer, 2, 9) - 0x5b, TEXT_COLOR_SYSTEM_GOLD, TEXT_SPECIAL_LV_A, TEXT_SPECIAL_LV_B);
PutSpecialChar(TILEMAP_LOCATED(gBG0TilemapBuffer, 2, 9) - 0x57, TEXT_COLOR_SYSTEM_GOLD, TEXT_SPECIAL_E);
PutNumberOrBlank(TILEMAP_LOCATED(gBG0TilemapBuffer, 2, 9) - 0x58, 2, unit->level);
PutNumberOrBlank(TILEMAP_LOCATED(gBG0TilemapBuffer, 2, 9) - 0x55, 2, unit->exp);

2
src/prep_itemsupply.c
View File

@ -308,7 +308,7 @@ void sub_809D6CC(void) {
(GetConvoyItemCount_() == CONVOY_ITEM_COUNT) ? 4 : 2,
GetConvoyItemCount_()
);
PutSpecialChar(gBG0TilemapBuffer + 0x34 + 6, 0, 0x16);
PutSpecialChar(gBG0TilemapBuffer + 0x34 + 6, TEXT_COLOR_SYSTEM_WHITE, TEXT_SPECIAL_SLASH);
PutNumber(gBG0TilemapBuffer + 0x34 + 9, 2, 100);
BG_EnableSyncByMask(1);

2
src/prep_itemuse.c
View File

@ -170,7 +170,7 @@ void DrawPrepScreenItemUseStatLabels(struct Unit *unit)
);
/* LV */
PutTwoSpecialChar(TILEMAP_LOCATED(gBG2TilemapBuffer, 17, 1), 3, 0x24, 0x25);
PutTwoSpecialChar(TILEMAP_LOCATED(gBG2TilemapBuffer, 17, 1), TEXT_COLOR_SYSTEM_GOLD, TEXT_SPECIAL_LV_A, TEXT_SPECIAL_LV_B);
}
void DrawPrepScreenItemUseStatBars(struct Unit* unit, int mask)

6
src/prep_unitselect.c
View File

@ -174,8 +174,8 @@ void PrepUnit_DrawLeftUnitName(struct Unit *unit)
GetStringFromIndex(unit->pCharacterData->nameTextId)
);
PutTwoSpecialChar(TILEMAP_LOCATED(gBG0TilemapBuffer, 5, 3), 3, 0x24, 0x25);
PutSpecialChar(TILEMAP_LOCATED(gBG0TilemapBuffer, 9, 3), 3, 0x1D);
PutTwoSpecialChar(TILEMAP_LOCATED(gBG0TilemapBuffer, 5, 3), TEXT_COLOR_SYSTEM_GOLD, TEXT_SPECIAL_LV_A, TEXT_SPECIAL_LV_B);
PutSpecialChar(TILEMAP_LOCATED(gBG0TilemapBuffer, 9, 3), TEXT_COLOR_SYSTEM_GOLD, TEXT_SPECIAL_E);
PutNumberOrBlank(TILEMAP_LOCATED(gBG0TilemapBuffer, 8, 3), 2, unit->level);
PutNumberOrBlank(TILEMAP_LOCATED(gBG0TilemapBuffer, 11, 3), 2, unit->exp);
@ -267,7 +267,7 @@ void PrepUnit_DrawPickLeftBar(struct ProcPrepUnit *proc, s8 val)
proc->cur_counter
);
PutSpecialChar(TILEMAP_LOCATED(gBG0TilemapBuffer, 0x1A, 1), 0, 0x16);
PutSpecialChar(TILEMAP_LOCATED(gBG0TilemapBuffer, 0x1A, 1), TEXT_COLOR_SYSTEM_WHITE, TEXT_SPECIAL_SLASH);
PutNumberOrBlank(
TILEMAP_LOCATED(gBG0TilemapBuffer, 0x1C, 1),
proc->cur_counter == proc->max_counter

10
src/prep_wm_sell.c
View File

@ -149,14 +149,14 @@ void WmSell_DrawItemGoldValue(int item) {
u16 sellPrice = GetItemSellPrice(item);
if ((sellPrice == 0) || (GetItemAttributes(item) & IA_UNSELLABLE)) {
PutSpecialChar(gBG0TilemapBuffer + 0x134 + 5, 1, 0x14);
PutSpecialChar(gBG0TilemapBuffer + 0x134 + 6, 1, 0x14);
PutSpecialChar(gBG0TilemapBuffer + 0x134 + 7, 1, 0x14);
PutSpecialChar(gBG0TilemapBuffer + 0x134 + 5, TEXT_COLOR_SYSTEM_GRAY, TEXT_SPECIAL_DASH);
PutSpecialChar(gBG0TilemapBuffer + 0x134 + 6, TEXT_COLOR_SYSTEM_GRAY, TEXT_SPECIAL_DASH);
PutSpecialChar(gBG0TilemapBuffer + 0x134 + 7, TEXT_COLOR_SYSTEM_GRAY, TEXT_SPECIAL_DASH);
} else {
PutNumber(gBG0TilemapBuffer + 0x134 + 6, 2, sellPrice);
}
PutSpecialChar(gBG0TilemapBuffer + 0x13B, 3, 0x1e);
PutSpecialChar(gBG0TilemapBuffer + 0x13B, TEXT_COLOR_SYSTEM_GOLD, TEXT_SPECIAL_G);
}
BG_EnableSyncByMask(1);
@ -169,7 +169,7 @@ void WmSell_DrawPartyFunds(void) {
TileMap_FillRect(gBG0TilemapBuffer + 0xF4, 10, 1, 0);
PutNumber(gBG0TilemapBuffer + 0xF4 + 0x146, 2, GetPartyGoldAmount());
PutSpecialChar(gBG0TilemapBuffer + 0xF4 + 0x147, 3, 0x1e);
PutSpecialChar(gBG0TilemapBuffer + 0xF4 + 0x147, TEXT_COLOR_SYSTEM_GOLD, TEXT_SPECIAL_G);
BG_EnableSyncByMask(1);

14
src/statscreen.c
View File

@ -418,12 +418,12 @@ void DisplayLeftPanel(void)
GetStringFromIndex(gStatScreen.unit->pClassData->nameTextId));
// Display Lv/E labels
PutTwoSpecialChar(gBG0TilemapBuffer + TILEMAP_INDEX(1, 15), TEXT_COLOR_SYSTEM_GOLD, 0x24, 0x25);
PutSpecialChar(gBG0TilemapBuffer + TILEMAP_INDEX(5, 15), TEXT_COLOR_SYSTEM_GOLD, 0x1D);
PutTwoSpecialChar(gBG0TilemapBuffer + TILEMAP_INDEX(1, 15), TEXT_COLOR_SYSTEM_GOLD, TEXT_SPECIAL_LV_A, TEXT_SPECIAL_LV_B);
PutSpecialChar(gBG0TilemapBuffer + TILEMAP_INDEX(5, 15), TEXT_COLOR_SYSTEM_GOLD, TEXT_SPECIAL_E);
// Display Hp/'/' labels
PutTwoSpecialChar(gBG0TilemapBuffer + TILEMAP_INDEX(1, 17), TEXT_COLOR_SYSTEM_GOLD, 0x22, 0x23);
PutSpecialChar(gBG0TilemapBuffer + TILEMAP_INDEX(5, 17), TEXT_COLOR_SYSTEM_GOLD, 0x16);
PutTwoSpecialChar(gBG0TilemapBuffer + TILEMAP_INDEX(1, 17), TEXT_COLOR_SYSTEM_GOLD, TEXT_SPECIAL_HP_A, TEXT_SPECIAL_HP_B);
PutSpecialChar(gBG0TilemapBuffer + TILEMAP_INDEX(5, 17), TEXT_COLOR_SYSTEM_GOLD, TEXT_SPECIAL_SLASH);
// Display level
PutNumberOrBlank(gBG0TilemapBuffer + TILEMAP_INDEX(4, 15), TEXT_COLOR_SYSTEM_BLUE,
@ -439,7 +439,7 @@ void DisplayLeftPanel(void)
{
// Display '--' if current hp > 99
PutTwoSpecialChar(gBG0TilemapBuffer + TILEMAP_INDEX(3, 17), TEXT_COLOR_SYSTEM_BLUE,
0x14, 0x14);
TEXT_SPECIAL_DASH, TEXT_SPECIAL_DASH);
}
else
{
@ -454,7 +454,7 @@ void DisplayLeftPanel(void)
{
// Display '--' if max hp > 99
PutTwoSpecialChar(gBG0TilemapBuffer + TILEMAP_INDEX(6, 17), TEXT_COLOR_SYSTEM_BLUE,
0x14, 0x14);
TEXT_SPECIAL_DASH, TEXT_SPECIAL_DASH);
}
else
{
@ -740,7 +740,7 @@ void DisplayPage1(void)
{
PutSpecialChar(
gBmFrameTmap0 + TILEMAP_INDEX(16, 1 + i*2),
0, 0x35);
TEXT_COLOR_SYSTEM_WHITE, TEXT_SPECIAL_35);
CallARM_FillTileRect(
gBmFrameTmap1 + TILEMAP_INDEX(1, 2 + i*2),

12
src/uichapterstatus.c
View File

@ -725,11 +725,9 @@ void DrawChapterStatusStatValues() {
PutNumber(gBG0TilemapBuffer + 0x1C0 + 0x4B, 2, GetPartyGoldAmount());
PutSpecialChar(gBG0TilemapBuffer + 0x1C0 + 0x4C, 3, 30);
PutTwoSpecialChar(gBG0TilemapBuffer + 0x1C0 - 0x8F, 3, 36, 37);
PutTwoSpecialChar(gBG0TilemapBuffer + 0x1C0 - 0x4F, 3, 34, 35);
PutSpecialChar(gBG0TilemapBuffer + 0x1C0 + 0x4C, TEXT_COLOR_SYSTEM_GOLD, TEXT_SPECIAL_G);
PutTwoSpecialChar(gBG0TilemapBuffer + 0x1C0 - 0x8F, TEXT_COLOR_SYSTEM_GOLD, TEXT_SPECIAL_LV_A, TEXT_SPECIAL_LV_B);
PutTwoSpecialChar(gBG0TilemapBuffer + 0x1C0 - 0x4F, TEXT_COLOR_SYSTEM_GOLD, TEXT_SPECIAL_HP_A, TEXT_SPECIAL_HP_B);
BG_EnableSyncByMask(BG0_SYNC_BIT);
@ -748,8 +746,8 @@ void ChapterStatus_DrawText(struct ChapterStatusProc* proc) {
PutNumber(gBG1TilemapBuffer + 0xA4, 2, proc->numAllyUnits);
if (gPlaySt.chapterVisionRange != 0) {
PutSpecialChar(gBG1TilemapBuffer + 0xA4 + 7, 2, 20);
PutSpecialChar(gBG1TilemapBuffer + 0xA4 + 8, 2, 20);
PutSpecialChar(gBG1TilemapBuffer + 0xA4 + 7, TEXT_COLOR_SYSTEM_BLUE, TEXT_SPECIAL_DASH);
PutSpecialChar(gBG1TilemapBuffer + 0xA4 + 8, TEXT_COLOR_SYSTEM_BLUE, TEXT_SPECIAL_DASH);
} else {
PutNumber(gBG1TilemapBuffer + 0xA4 + 7, 2, proc->numEnemyUnits);
}

20
src/uisupport.c
View File

@ -1062,23 +1062,23 @@ void DrawSupportSubScreenUnitPartnerText(struct SubScreenProc* proc, int idx) {
int unitCharId;
int partnerCharId;
int gUnknown_08205C90[3] = {
0x1B,
0x1A,
0x19,
int supportLvCharLut[3] = {
TEXT_SPECIAL_C,
TEXT_SPECIAL_B,
TEXT_SPECIAL_A,
};
if (proc->partnerState[idx] == 0) {
for (i = 0; i < 5; i++) {
PutSpecialChar(gBG2TilemapBuffer + TILEMAP_INDEX(0x10 + i, _y = idx * 2 + 3), 1, 0x14);
PutSpecialChar(gBG2TilemapBuffer + TILEMAP_INDEX(0x10 + i, _y = idx * 2 + 3), TEXT_COLOR_SYSTEM_GRAY, TEXT_SPECIAL_DASH);
}
for (i = 0; i < 2; i++) {
PutSpecialChar(gBG2TilemapBuffer + TILEMAP_INDEX(0x16 + i, _y = idx * 2 + 3), 1, 0x14);
PutSpecialChar(gBG2TilemapBuffer + TILEMAP_INDEX(0x16 + i, _y = idx * 2 + 3), TEXT_COLOR_SYSTEM_GRAY, TEXT_SPECIAL_DASH);
}
for (i = 0; i < 3; i++) {
PutSpecialChar(gBG2TilemapBuffer + TILEMAP_INDEX(0x19 + i, _y = idx * 2 + 3), 1, 0x14);
PutSpecialChar(gBG2TilemapBuffer + TILEMAP_INDEX(0x19 + i, _y = idx * 2 + 3), TEXT_COLOR_SYSTEM_GRAY, TEXT_SPECIAL_DASH);
}
} else {
int color = 0;
@ -1114,10 +1114,10 @@ void DrawSupportSubScreenUnitPartnerText(struct SubScreenProc* proc, int idx) {
color = 0;
}
PutSpecialChar(gBG2TilemapBuffer + TILEMAP_INDEX(0x19 + i, (idx * 2) + 3), color, gUnknown_08205C90[i]);
PutSpecialChar(gBG2TilemapBuffer + TILEMAP_INDEX(0x19 + i, (idx * 2) + 3), color, supportLvCharLut[i]);
}
PutSpecialChar(gBG2TilemapBuffer + 0x1B + (((idx * 2) + 3) * 0x20), 1, 0x14);
PutSpecialChar(gBG2TilemapBuffer + 0x1B + (((idx * 2) + 3) * 0x20), TEXT_COLOR_SYSTEM_GRAY, TEXT_SPECIAL_DASH);
} else {
for (i = 0; i < 3; i++) {
@ -1128,7 +1128,7 @@ void DrawSupportSubScreenUnitPartnerText(struct SubScreenProc* proc, int idx) {
color = 0;
}
PutSpecialChar(gBG2TilemapBuffer + TILEMAP_INDEX(0x19 + i, (idx * 2) + 3), color, gUnknown_08205C90[i]);
PutSpecialChar(gBG2TilemapBuffer + TILEMAP_INDEX(0x19 + i, (idx * 2) + 3), color, supportLvCharLut[i]);
}
}
}

2
src/unitinfowindow.c
View File

@ -382,7 +382,7 @@ void RefreshHammerneUnitInfoWindow(struct Unit* unit) {
Text_DrawString(proc->lines + i, GetItemName(item));
PutText(proc->lines + i, gBG0TilemapBuffer + TILEMAP_INDEX(xPos + 3, yPos));
PutSpecialChar(gBG0TilemapBuffer + TILEMAP_INDEX(xPos + 12, yPos), color, 0x16);
PutSpecialChar(gBG0TilemapBuffer + TILEMAP_INDEX(xPos + 12, yPos), color, TEXT_SPECIAL_SLASH);
color = IsItemHammernable(item) ? 2 : 1;