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

Merge pull request #411 from Kurausukun/temp2

Browse Source 
Fix Trade Nonmatchings (Thanks to Shoomer/RadicalDweamer)
This commit is contained in:
PikalaxALT
2021-04-09 12:33:31 -04:00
committed by GitHub
parent ee96375931 ba26e43f94
commit 52c25bac8e
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trade.c
+9 -19
View File
@@ -674,7 +674,7 @@ static const u8 gUnknown_8262055[][2] = {
static void InitTradeMenuResources(void) static void InitTradeMenuResources(void)
{ {
int i; int i;
static vu16 dummy; static u16 dummy;
ResetSpriteData(); ResetSpriteData();
FreeAllSpritePalettes(); FreeAllSpritePalettes();
@@ -723,11 +723,6 @@ static void CB2_ReturnFromLinkTrade2(void)
u8 id; u8 id;
s32 width; s32 width;
u32 xPos; u32 xPos;
#ifndef NONMATCHING
register u32 r0 asm("r0");
#else
u32 r0;
#endif
u8 *name; u8 *name;
switch (gMain.state) switch (gMain.state)
@@ -895,7 +890,8 @@ static void CB2_ReturnFromLinkTrade2(void)
gMain.state++; gMain.state++;
break; break;
case 12: case 12:
width = GetStringWidth(1, gSaveBlock2Ptr->playerName, 0); name = gSaveBlock2Ptr->playerName;
width = GetStringWidth(1, name, 0);
xPos = (56 - width) / 2; xPos = (56 - width) / 2;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
@@ -904,9 +900,8 @@ static void CB2_ReturnFromLinkTrade2(void)
CreateSprite(&temp, xPos + sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][0] + (i * 32), sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][1], 1); CreateSprite(&temp, xPos + sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][0] + (i * 32), sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][1], 1);
} }
id = GetMultiplayerId(); id = GetMultiplayerId();
r0 = (id ^ 1) * sizeof(*gLinkPlayers); name = gLinkPlayers[id ^ 1].name;
name = gLinkPlayers->name; width = GetStringWidth(1, name, 0);
width = GetStringWidth(1, name + r0, 0);
xPos = (56 - width) / 2; xPos = (56 - width) / 2;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
@@ -999,11 +994,6 @@ void CB2_ReturnToTradeMenuFromSummary(void)
u8 id; u8 id;
s32 width; s32 width;
u32 xPos; u32 xPos;
#ifndef NONMATCHING
register u32 r0 asm("r0");
#else
u32 r0;
#endif
u8 *name; u8 *name;
switch (gMain.state) switch (gMain.state)
@@ -1095,7 +1085,8 @@ void CB2_ReturnToTradeMenuFromSummary(void)
} }
break; break;
case 12: case 12:
width = GetStringWidth(1, gSaveBlock2Ptr->playerName, 0); name = gSaveBlock2Ptr->playerName;
width = GetStringWidth(1, name, 0);
xPos = (56 - width) / 2; xPos = (56 - width) / 2;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
@@ -1104,9 +1095,8 @@ void CB2_ReturnToTradeMenuFromSummary(void)
CreateSprite(&temp, xPos + sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][0] + (i * 32), sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][1], 1); CreateSprite(&temp, xPos + sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][0] + (i * 32), sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][1], 1);
} }
id = GetMultiplayerId(); id = GetMultiplayerId();
r0 = (id ^ 1) * sizeof(*gLinkPlayers); name = gLinkPlayers[id ^ 1].name;
name = gLinkPlayers->name; width = GetStringWidth(1, name, 0);
width = GetStringWidth(1, name + r0, 0);
xPos = (56 - width) / 2; xPos = (56 - width) / 2;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {