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

Merge remote-tracking branch 'pret/master' into pokefirered_pokeemeraldSync4

Browse Source 
# Conflicts:
#	include/battle.h
#	include/cable_club.h
#	src/battle_anim_fire.c
#	src/battle_anim_ghost.c
#	src/battle_anim_ground.c
#	src/battle_message.c
#	src/cable_club.c
This commit is contained in:
Eduardo Quezada
2022-09-04 17:44:13 -03:00
parent 616ab63d94 b3c7b9e09f
commit 9241dc6fe7
355 changed files with 20064 additions and 19067 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trade.c
+6 -16
View File
@@ -1346,9 +1346,7 @@ static bool8 shedinja_maker_maybe(void)
break;
case 3:
if (id == 0)
{
Link_PrepareCmd0xCCCC_Rfu0xA100(1);
}
SendBlockRequest(BLOCK_REQ_SIZE_200);
sTradeMenuResourcesPtr->state++;
break;
case 4:
@@ -1365,9 +1363,7 @@ static bool8 shedinja_maker_maybe(void)
break;
case 7:
if (id == 0)
{
Link_PrepareCmd0xCCCC_Rfu0xA100(1);
}
SendBlockRequest(BLOCK_REQ_SIZE_200);
sTradeMenuResourcesPtr->state++;
break;
case 8:
@@ -1384,9 +1380,7 @@ static bool8 shedinja_maker_maybe(void)
break;
case 11:
if (id == 0)
{
Link_PrepareCmd0xCCCC_Rfu0xA100(1);
}
SendBlockRequest(BLOCK_REQ_SIZE_200);
sTradeMenuResourcesPtr->state++;
break;
case 12:
@@ -1403,9 +1397,7 @@ static bool8 shedinja_maker_maybe(void)
break;
case 15:
if (id == 0)
{
Link_PrepareCmd0xCCCC_Rfu0xA100(3);
}
SendBlockRequest(BLOCK_REQ_SIZE_220);
sTradeMenuResourcesPtr->state++;
break;
case 16:
@@ -1422,9 +1414,7 @@ static bool8 shedinja_maker_maybe(void)
break;
case 19:
if (id == 0)
{
Link_PrepareCmd0xCCCC_Rfu0xA100(4);
}
SendBlockRequest(BLOCK_REQ_SIZE_40);
sTradeMenuResourcesPtr->state++;
break;
case 20:
@@ -2140,7 +2130,7 @@ static void HandleRedrawTradeMenuOnSide(u8 side)
gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].data[4] = (sTradeMonSpriteCoords[whichParty * PARTY_SIZE][1] * 8) - 12;
StoreSpriteCallbackInData6(&gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]], SpriteCB_MonIcon);
sTradeMenuResourcesPtr->menuRedrawState[side]++;
StartSpriteLinearTranslationFromCurrentPos(&gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]]);
TradeMenuBouncePartySprites(&gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]]);
CopyToBgTilemapBufferRect_ChangePalette(1, sTradePartyBoxTilemap, side * 15, 0, 15, 17, 0);
CopyBgTilemapBufferToVram(1);
CopyBgTilemapBufferToVram(0);