1 files changed, 9 insertions, 8 deletions
diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c
index e303d5173..33e7620f7 100644
--- a/src/script_pokemon_util_80F99CC.c
+++ b/src/script_pokemon_util_80F99CC.c
@@ -12,17 +12,18 @@
 #include "overworld.h"
 #include "script.h"
 #include "script_pokemon_80F9.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
+#include "ewram.h"
 
 extern u8 gPlayerPartyCount;
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
 extern u8 gUnknown_02038694;
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 
 extern void (*gFieldCallback)(void);
 
@@ -271,8 +272,8 @@ void HandleMoveTutorPartyMenu(u8 var)
 
 void sub_80F9EEC(void)
 {
-    sub_809D9F0(&gPlayerParty[0], gSpecialVar_0x8004, gPlayerPartyCount - 1, c2_exit_to_overworld_2_switch, 0);
-    unk_2018000.unk8 = 3;
+    ShowSelectMovePokemonSummaryScreen(&gPlayerParty[0], gSpecialVar_0x8004, gPlayerPartyCount - 1, c2_exit_to_overworld_2_switch, 0);
+    UNK_2018000_STRUCT.unk8 = 3;
     gFieldCallback = sub_8080990;
 }
 
@@ -280,11 +281,11 @@ void ScrSpecial_CountPokemonMoves(void) // count pokemon moves
 {
     u8 i;
 
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
 
     for (i = 0; i < 4; i++) // checks MOVE1-MOVE4
         if (GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_MOVE1 + i))
-            gScriptResult++;
+            gSpecialVar_Result++;
 }
 
 void ScrSpecial_GetPokemonNicknameAndMoveName(void)
@@ -436,8 +437,8 @@ void sub_80FA0DC(void)
 void sub_80FA148(void)
 {
     struct Pokemon *party = &gPlayerParty[gSpecialVar_0x8004];
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
 
     if (GetMonData(party, MON_DATA_IS_EGG))
-        gScriptResult = 1;
+        gSpecialVar_Result = 1;
 }