summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2019-12-12 19:00:42 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2019-12-12 19:00:42 -0500
commit5df43761c0cdec23a59ee5852cf8d3936cf14972 (patch)
treecb01d32b36b33ea0fda81d27a3c448389c1e820a /src
parent1f1b8191e7f2e0ab742db798aa9a7690af796bc7 (diff)
through sub_8104A34
Diffstat (limited to 'src')
-rw-r--r--src/pokedex_screen.c28
1 files changed, 27 insertions, 1 deletions
diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c
index f78701b9e..ace5282a2 100644
--- a/src/pokedex_screen.c
+++ b/src/pokedex_screen.c
@@ -21,6 +21,7 @@
#include "pokedex_screen.h"
#include "data.h"
#include "pokedex.h"
+#include "trainer_pokemon_sprites.h"
#include "constants/songs.h"
#include "constants/species.h"
@@ -99,7 +100,7 @@ bool32 sub_8104664(u8 a0);
void sub_81047B0(u8 *windowId_p);
void sub_81047C8(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 colorIdx);
void sub_810491C(u8 windowId, u8 fontId, u16 num, u8 x, u8 y, u8 colorIdx);
-void sub_8104A34(u8 windowId, u8 a1, u16 species, u8 a3, u8 y);
+void sub_8104A34(u8 windowId, u8 fontId, u16 species, u8 x, u8 y);
u16 sub_8104BBC(u8 a0, u8 a1);
void sub_8104C2C(const u8 *a0);
void sub_8104E90(void);
@@ -1664,3 +1665,28 @@ void sub_810491C(u8 windowId, u8 fontId, u16 num, u8 x, u8 y, u8 colorIdx)
}
sub_81047C8(windowId, fontId, buff, x, y, colorIdx);
}
+
+u32 sub_81049CC(int species)
+{
+ switch (species)
+ {
+ case SPECIES_SPINDA:
+ return gSaveBlock2Ptr->pokedex.spindaPersonality;
+ case SPECIES_UNOWN:
+ return gSaveBlock2Ptr->pokedex.unownPersonality;
+ default:
+ return 0;
+ }
+}
+
+void sub_81049FC(u8 windowId, u16 species, u16 paletteOffset)
+{
+ LoadMonPicInWindow(species, 8, sub_81049CC(species), TRUE, paletteOffset >> 4, windowId);
+}
+
+void sub_8104A34(u8 windowId, u8 fontId, u16 species, u8 x, u8 y)
+{
+ u16 dexNum = SpeciesToNationalPokedexNum(species);
+ sub_81047C8(windowId, fontId, gUnknown_8415FFF, x, y, 0);
+ sub_8104880(windowId, fontId, dexNum, x + 9, y, 0);
+}