dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into main-menu-state-machine

Browse Source
This commit is contained in:
Phlosioneer
2019-02-26 22:34:42 -05:00
parent 6cb4c677cd 231355f84d
commit 72bb0daccb
457 changed files with 17619 additions and 23557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/trade.c
View File

@@ -1834,9 +1834,9 @@ static void sub_8077B74(void)
}
if (gUnknown_0203229C->tradeMenuCursorPosition < PARTY_SIZE)
gUnknown_0203229C->tradeMenuCursorPosition = gUnknown_0203CF20;
gUnknown_0203229C->tradeMenuCursorPosition = gLastViewedMonIndex;
else
gUnknown_0203229C->tradeMenuCursorPosition = gUnknown_0203CF20 + PARTY_SIZE;
gUnknown_0203229C->tradeMenuCursorPosition = gLastViewedMonIndex + PARTY_SIZE;
gUnknown_0203229C->tradeMenuCursorSpriteIdx = CreateSprite(&gSpriteTemplate_832DC94, gTradeMonSpriteCoords[gUnknown_0203229C->tradeMenuCursorPosition][0] * 8 + 32, gTradeMonSpriteCoords[gUnknown_0203229C->tradeMenuCursorPosition][1] * 8, 2);
gMain.state = 16;