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

Multiple changes

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files
src/trade_scene.c
+5 -5
View File
@@ -1294,7 +1294,7 @@ static bool8 DoTradeAnim_Cable(void)
if (sTradeData->tradeSpecies[0] != SPECIES_EGG)
{
PlayCry1(sTradeData->tradeSpecies[0], 0);
PlayCry_Normal(sTradeData->tradeSpecies[0], 0);
}
sTradeData->state = 11;
@@ -1677,7 +1677,7 @@ static bool8 DoTradeAnim_Cable(void)
{
if (sTradeData->tradeSpecies[1] != SPECIES_EGG)
{
PlayCry1(sTradeData->tradeSpecies[1], 0);
PlayCry_Normal(sTradeData->tradeSpecies[1], 0);
}
sTradeData->state = 267;
sTradeData->timer = 0;
@@ -1791,7 +1791,7 @@ static bool8 DoTradeAnim_Wireless(void)
if (sTradeData->tradeSpecies[0] != SPECIES_EGG)
{
PlayCry1(sTradeData->tradeSpecies[0], 0);
PlayCry_Normal(sTradeData->tradeSpecies[0], 0);
}
sTradeData->state = 11;
@@ -2198,7 +2198,7 @@ static bool8 DoTradeAnim_Wireless(void)
{
if (sTradeData->tradeSpecies[1] != SPECIES_EGG)
{
PlayCry1(sTradeData->tradeSpecies[1], 0);
PlayCry_Normal(sTradeData->tradeSpecies[1], 0);
}
sTradeData->state = 267;
sTradeData->timer = 0;
@@ -2756,7 +2756,7 @@ static void CheckPartnersMonForRibbons(void)
FlagSet(FLAG_SYS_RIBBON_GET);
}
void LoadTradeAnimGfx(void)
void InitTradeBg(void)
{
TradeAnimInit_LoadGfx();
}