diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-02 14:34:55 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-02 14:34:55 -0400 |
| commit | 2a5df1b3eed197bd44a10d54960770b9f02995f5 (patch) | |
| tree | 1cb754008dd2d983e65fc156395ceac862e78071 /src | |
| parent | 85e758cb43dff511033c03d5c8f9ff3155bb805a (diff) | |
sub_804997C
Diffstat (limited to 'src')
| -rw-r--r-- | src/trade.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/trade.c b/src/trade.c index a9eeddf7c..ff63411ce 100644 --- a/src/trade.c +++ b/src/trade.c @@ -20,6 +20,7 @@ #include "songs.h" #include "sound.h" #include "data2.h" +#include "pokemon_summary_screen.h" #include "trade.h" #ifdef ENGLISH @@ -842,7 +843,7 @@ static void sub_8047EC0(void) UpdatePaletteFade(); } -/*static*/ void sub_80484F4(void) +void sub_80484F4(void) { int i; struct UnkStructF *unkStructF; @@ -1766,6 +1767,21 @@ static void sub_8049620(void) } } +/*static*/ void sub_804997C(void) +{ + if (!gPaletteFade.active) + { + if (gUnknown_03004824->tradeMenuCursorPosition < PARTY_SIZE) + { + ShowPokemonSummaryScreen(gPlayerParty, gUnknown_03004824->tradeMenuCursorPosition, gUnknown_03004824->playerPartyCount - 1, sub_80484F4, 4); + } + else + { + ShowPokemonSummaryScreen(gEnemyParty, gUnknown_03004824->tradeMenuCursorPosition - 6, gUnknown_03004824->friendPartyCount - 1, sub_80484F4, 4); + } + } +} + asm(".section .text.sub_804A96C"); /*static*/ void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) { |