summaryrefslogtreecommitdiff
path: root/src/diploma.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-09-28 21:41:17 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-09-28 21:41:17 -0400
commit6235276ca255a2b345c3a97be23c6b53be6eba0f (patch)
tree81930ebec5d50f4b44575b28979549c34f2e1b0e /src/diploma.c
parent170c82f299905b6e55b20a5c2c04f92353131d0e (diff)
parentc1c2015f7046676b043641c0d1f9d9e29bc73647 (diff)
Merge branch 'master' into daycare
Diffstat (limited to 'src/diploma.c')
-rw-r--r--src/diploma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/diploma.c b/src/diploma.c
index ba7de58aa..27601404c 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -4,7 +4,7 @@
#include "menu.h"
#include "palette.h"
#include "pokedex.h"
-#include "rom4.h"
+#include "overworld.h"
#include "sprite.h"
#include "string_util.h"
#include "strings2.h"
@@ -35,7 +35,7 @@ static void VBlankCB(void)
TransferPlttBuffer();
}
-void sub_8145D88(void)
+void CB2_ShowDiploma(void)
{
u32 savedIme;