diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2021-04-07 23:09:44 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2021-04-07 23:09:44 -0400 |
| commit | ba26e43f9417af3ade1ce5fc593a93139b25394f (patch) | |
| tree | e71dddcb21e54576596ff66ddc625c5059ded736 /src | |
| parent | 0ecc1876a9cb8e31b1aa0879bf2b9e9c87271858 (diff) | |
fix trade nonmatchings (thanks to shoomer)
Diffstat (limited to 'src')
| -rw-r--r-- | src/trade.c | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/src/trade.c b/src/trade.c index 21c127838..f1010f5ff 100644 --- a/src/trade.c +++ b/src/trade.c @@ -674,7 +674,7 @@ static const u8 gUnknown_8262055[][2] = { static void InitTradeMenuResources(void) { int i; - static vu16 dummy; + static u16 dummy; ResetSpriteData(); FreeAllSpritePalettes(); @@ -723,11 +723,6 @@ static void CB2_ReturnFromLinkTrade2(void) u8 id; s32 width; u32 xPos; -#ifndef NONMATCHING - register u32 r0 asm("r0"); -#else - u32 r0; -#endif u8 *name; switch (gMain.state) @@ -895,7 +890,8 @@ static void CB2_ReturnFromLinkTrade2(void) gMain.state++; break; case 12: - width = GetStringWidth(1, gSaveBlock2Ptr->playerName, 0); + name = gSaveBlock2Ptr->playerName; + width = GetStringWidth(1, name, 0); xPos = (56 - width) / 2; 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); } id = GetMultiplayerId(); - r0 = (id ^ 1) * sizeof(*gLinkPlayers); - name = gLinkPlayers->name; - width = GetStringWidth(1, name + r0, 0); + name = gLinkPlayers[id ^ 1].name; + width = GetStringWidth(1, name, 0); xPos = (56 - width) / 2; for (i = 0; i < 3; i++) { @@ -999,11 +994,6 @@ void CB2_ReturnToTradeMenuFromSummary(void) u8 id; s32 width; u32 xPos; -#ifndef NONMATCHING - register u32 r0 asm("r0"); -#else - u32 r0; -#endif u8 *name; switch (gMain.state) @@ -1095,7 +1085,8 @@ void CB2_ReturnToTradeMenuFromSummary(void) } break; case 12: - width = GetStringWidth(1, gSaveBlock2Ptr->playerName, 0); + name = gSaveBlock2Ptr->playerName; + width = GetStringWidth(1, name, 0); xPos = (56 - width) / 2; 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); } id = GetMultiplayerId(); - r0 = (id ^ 1) * sizeof(*gLinkPlayers); - name = gLinkPlayers->name; - width = GetStringWidth(1, name + r0, 0); + name = gLinkPlayers[id ^ 1].name; + width = GetStringWidth(1, name, 0); xPos = (56 - width) / 2; for (i = 0; i < 3; i++) { |