summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-11-07 08:45:08 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-11-07 08:45:08 -0500
commit65b57e5a269c9dd4bdaf82e9cac2b2f5bb82772c (patch)
treeb14ef7870618dca4a2b4dbab161d687ff3c185a2 /src
parent4628859055b05feeebdde69b6852c3b6c88e6afe (diff)
through sub_8113EAC
Diffstat (limited to 'src')
-rw-r--r--src/quest_log.c29
1 files changed, 29 insertions, 0 deletions
diff --git a/src/quest_log.c b/src/quest_log.c
index 6e2767a1e..82b93898e 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -1,5 +1,6 @@
#include "global.h"
#include "constants/species.h"
+#include "data2.h"
#include "malloc.h"
#include "main.h"
#include "task.h"
@@ -9,6 +10,7 @@
#include "menu_helpers.h"
#include "window.h"
#include "text_window.h"
+#include "unk_text_util.h"
#include "event_data.h"
#include "event_scripts.h"
#include "string_util.h"
@@ -3504,3 +3506,30 @@ u16 * sub_8113DE0(u16 a0, u16 * a1)
r5 = (void *)r5 + (r1 * r6 + 4);
return r5;
}
+
+u16 * sub_8113E88(u16 a0, u16 * a1)
+{
+ a1 = (void *)a1 + (gUnknown_203B044.unk_2 * (gUnknown_8456AA0[a0] - 4) + 4);
+ return a1;
+}
+
+// TODO: delete this declaration once data_83FECCC.s is decompiled
+extern const u8 gText_EggNickname[];
+
+void sub_8113EAC(u16 a0, u8 * a1, u8 a2)
+{
+ if (a1 != NULL)
+ {
+ if (a0 != SPECIES_EGG)
+ GetSpeciesName(a1, a0);
+ else
+ StringCopy(a1, gText_EggNickname);
+ }
+ else
+ {
+ if (a0 != SPECIES_EGG)
+ UnkTextUtil_SetPtrI(a2, gSpeciesNames[a0]);
+ else
+ UnkTextUtil_SetPtrI(a2, gText_EggNickname);
+ }
+}