diff options
| author | scnorton <scnorton@biociphers.org> | 2017-09-03 13:48:45 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-09-03 13:48:45 -0400 |
| commit | 63e96ae515a35a184341965fd30a8bc48e434d81 (patch) | |
| tree | 6ab8764b3f413237237013cb75e706e6143b07a5 /src | |
| parent | 86ac21e417dde4d4f33aff78714648517afc88fc (diff) | |
sub_804D8E4
Diffstat (limited to 'src')
| -rw-r--r-- | src/trade.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/trade.c b/src/trade.c index d0be1b48b..592b3f3e8 100644 --- a/src/trade.c +++ b/src/trade.c @@ -190,7 +190,7 @@ void sub_804A33C(u8 *, u8, u8); static #endif void sub_804A51C(u8, u8, u8, u8, u8, u8); -/*static*/ void sub_804D948(u8, u8); + /*static*/ void sub_804BA94(u8, u8); /*static*/ bool8 sub_804C29C(void); /*static*/ void sub_804DC18(void); @@ -3171,7 +3171,16 @@ static bool8 sub_804ABF8(void) asm(".section .text.sub_804DAD4"); -void sub_804D948(u8 whichPlayerMon, u8 whichInGameTrade) +/*static*/ void sub_804D8E4(void) +{ + u8 nickname[32]; + const struct InGameTrade *inGameTrade = &gIngameTrades[gSpecialVar_0x8004]; + GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_NICKNAME, nickname); + StringCopy10(gStringVar1, nickname); + StringCopy(gStringVar2, gSpeciesNames[inGameTrade->species]); +} + +static void sub_804D948(u8 whichPlayerMon, u8 whichInGameTrade) { const struct InGameTrade *inGameTrade = &gIngameTrades[whichInGameTrade]; u8 level = GetMonData(&gPlayerParty[whichPlayerMon], MON_DATA_LEVEL); |