summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorscnorton <scnorton@biociphers.org>2017-09-04 17:42:33 -0400
committerscnorton <scnorton@biociphers.org>2017-09-04 17:42:33 -0400
commitce7f9a1cab4ed09809aef9e550050cef7c62488f (patch)
tree95156da6bed5041f7d52bc31fcec2dd3e43c67fa /src
parentc121c19a159d902fb697df71fc60dbbd511da567 (diff)
sub_804BA18
Diffstat (limited to 'src')
-rw-r--r--src/trade.c21
1 files changed, 19 insertions, 2 deletions
diff --git a/src/trade.c b/src/trade.c
index c3e8c6a6f..4e4903e51 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -34,6 +34,7 @@
#include "mail_data.h"
#include "evolution_scene.h"
#include "pokeball.h"
+#include "pokedex.h"
#include "trade.h"
#ifdef ENGLISH
@@ -245,8 +246,6 @@ void sub_804D80C(struct Sprite *);
void sub_804E1DC(void);
void sub_804BBCC(void);
void sub_804D8E4(void);
-void sub_804BA18(u8);
-void sub_804BA64(void);
extern u8 gUnknown_020297D8[2];
extern u8 *gUnknown_020296CC[13];
@@ -3504,6 +3503,24 @@ static bool8 sub_804ABF8(void)
asm(".section .text.sub_804DAD4");
+static void sub_804BA18(u8 partyIdx)
+{
+ struct Pokemon *pokemon = &gPlayerParty[partyIdx];
+ if (!GetMonData(pokemon, MON_DATA_IS_EGG))
+ {
+ u16 species = SpeciesToNationalPokedexNum(GetMonData(pokemon, MON_DATA_SPECIES, NULL));
+ GetNationalPokedexFlag(species, 2);
+ GetNationalPokedexFlag(species, 3);
+ }
+}
+
+static void sub_804BA64(void)
+{
+ u8 mpId = GetMultiplayerId();
+ if (gLinkPlayers[mpId ^ 1].lp_field_2 == 0x8000)
+ EnableNationalPokedex();
+}
+
void sub_804BA94(u8 a0, u8 a1)
{
u8 friendship;