Merge pull request #435 from huderlem/party_menu

Decompile party_menu

2 files changed, 6 insertions, 3 deletions

diff --git a/src/engine/naming_screen.c b/src/engine/naming_screen.c
index 3f8417e6d..a20a15569 100644
--- a/src/engine/naming_screen.c
+++ b/src/engine/naming_screen.c
@@ -30,6 +30,8 @@ extern u8 unk_2000000[];
 
 #define namingScreenData (*(struct NamingScreenData *)(unk_2000000))
 
+extern u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality);
+
 const u32 gSpriteImage_83CE094[] = INCBIN_U32("graphics/naming_screen/pc_icon/0.4bpp");
 const u32 gSpriteImage_83CE154[] = INCBIN_U32("graphics/naming_screen/pc_icon/1.4bpp");
 
diff --git a/src/engine/sprite.c b/src/engine/sprite.c
index fb8c2b648..5d394502a 100644
--- a/src/engine/sprite.c
+++ b/src/engine/sprite.c
@@ -916,16 +916,17 @@ void DestroySpriteAndFreeResources(struct Sprite *sprite)
     DestroySprite(sprite);
 }
 
-void sub_800142C(u32 a1, u32 a2, u16 *a3, u16 a4, u32 a5)
+// Loads the mon name, level, and hp sprites into OAM.
+void DrawPartyMenuMonText(u32 a1, u32 a2, const u16 *a3, u16 a4, u32 baseTileNumber)
 {
-    u16 *d = a3;
+    const u16 *d = a3;
     struct OamData *oam = &gMain.oamBuffer[gMain.objCount];
     while (!(gMain.objCount & 0x80) && (s16)(d[0] + 1) != 0)
     {
         u16 *x = (u16 *)oam;
         x[0] = (d[0] & sOamBitmasks[0]) | ((d[0] + a2) & sOamBitmasks[1]) | ((a4 & sOamBitmasks[2]) << 8);
         x[1] = (d[1] & sOamBitmasks[3]) | ((d[1] + a1) & sOamBitmasks[4]) | ((a4 & sOamBitmasks[5]) << 4);
-        x[2] = (d[2] & sOamBitmasks[6]) | ((d[2] + a5) & sOamBitmasks[7]) | (a4 & sOamBitmasks[8]);
+        x[2] = (d[2] & sOamBitmasks[6]) | ((d[2] + baseTileNumber) & sOamBitmasks[7]) | (a4 & sOamBitmasks[8]);
         oam++;
         gMain.objCount++;
         d += 3;