Multiple changes

- BATTLESTRINGS_ID_ADDER ->BATTLESTRINGS_TABLE_START
- Defines for battle windows
- MAIL_NONE
- MON_DATA_FILLER -> MON_DATA_UNUSED_RIBBONS
- Usage of BattlePutTextOnWindow with masks
- PlayCry1 -> PlayCry_Normal
- BlendPalettes(0xFFFFFFFF -> BlendPalettes(PALETTES_ALL
- FillPalette(0 -> FillPalette(RGB_BLACK
This commit is contained in:
Eduardo Quezada
2022-07-27 18:10:52 -04:00
parent a81c1539e5
commit f5e9cc595b
55 changed files with 613 additions and 423 deletions
+3 -3
View File
@@ -1701,14 +1701,14 @@ void BufferStringBattle(u16 stringId)
}
break;
default: // load a string from the table
if (stringId >= BATTLESTRINGS_COUNT + BATTLESTRINGS_ID_ADDER)
if (stringId >= BATTLESTRINGS_COUNT + BATTLESTRINGS_TABLE_START)
{
gDisplayedStringBattle[0] = EOS;
return;
}
else
{
stringPtr = gBattleStringsTable[stringId - BATTLESTRINGS_ID_ADDER];
stringPtr = gBattleStringsTable[stringId - BATTLESTRINGS_TABLE_START];
}
break;
}
@@ -2169,7 +2169,7 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst)
{
case B_BUFF_STRING: // battle string
hword = T1_READ_16(&src[srcId + 1]);
StringAppend(dst, gBattleStringsTable[hword - BATTLESTRINGS_ID_ADDER]);
StringAppend(dst, gBattleStringsTable[hword - BATTLESTRINGS_TABLE_START]);
srcId += 3;
break;
case B_BUFF_NUMBER: // int to string