Merge pull request #1519 from GriffinRichards/doc-mgift

Document Mystery Gift

1 files changed, 13 insertions, 13 deletions

diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c
index 176eab7fc..f80240006 100644
--- a/src/mystery_event_script.c
+++ b/src/mystery_event_script.c
@@ -43,7 +43,7 @@ static bool32 CheckCompatibility(u16 a1, u32 a2, u16 a3, u32 a4)
 
 static void SetIncompatible(void)
 {
-    StringExpandPlaceholders(gStringVar4, gText_MysteryGiftCantBeUsed);
+    StringExpandPlaceholders(gStringVar4, gText_MysteryEventCantBeUsed);
     SetMysteryEventScriptStatus(3);
 }
 
@@ -65,15 +65,15 @@ static bool32 RunMysteryEventScriptCommand(struct ScriptContext *ctx)
         return FALSE;
 }
 
-void sub_8153870(u8 *script)
+void InitMysteryEventScriptContext(u8 *script)
 {
     InitMysteryEventScript(&sMysteryEventScriptContext, script);
 }
 
-bool32 sub_8153884(u32 *a0)
+bool32 RunMysteryEventScriptContextCommand(u32 *script)
 {
     bool32 ret = RunMysteryEventScriptCommand(&sMysteryEventScriptContext);
-    *a0 = sMysteryEventScriptContext.data[2];
+    *script = sMysteryEventScriptContext.data[2];
 
     return ret;
 }
@@ -229,17 +229,17 @@ bool8 MEScrCmd_setenigmaberry(struct ScriptContext *ctx)
     if (!haveBerry)
     {
         str = gStringVar4;
-        message = gText_MysteryGiftBerry;
+        message = gText_MysteryEventBerry;
     }
     else if (StringCompare(gStringVar1, gStringVar2))
     {
         str = gStringVar4;
-        message = gText_MysteryGiftBerryTransform;
+        message = gText_MysteryEventBerryTransform;
     }
     else
     {
         str = gStringVar4;
-        message = gText_MysteryGiftBerryObtained;
+        message = gText_MysteryEventBerryObtained;
     }
 
     StringExpandPlaceholders(str, message);
@@ -259,7 +259,7 @@ bool8 MEScrCmd_giveribbon(struct ScriptContext *ctx)
     u8 index = ScriptReadByte(ctx);
     u8 ribbonId = ScriptReadByte(ctx);
     GiveGiftRibbonToParty(index, ribbonId);
-    StringExpandPlaceholders(gStringVar4, gText_MysteryGiftSpecialRibbon);
+    StringExpandPlaceholders(gStringVar4, gText_MysteryEventSpecialRibbon);
     ctx->data[2] = 2;
     return FALSE;
 }
@@ -278,7 +278,7 @@ bool8 MEScrCmd_initramscript(struct ScriptContext *ctx)
 bool8 MEScrCmd_givenationaldex(struct ScriptContext *ctx)
 {
     EnableNationalPokedex();
-    StringExpandPlaceholders(gStringVar4, gText_MysteryGiftNationalDex);
+    StringExpandPlaceholders(gStringVar4, gText_MysteryEventNationalDex);
     ctx->data[2] = 2;
     return FALSE;
 }
@@ -286,7 +286,7 @@ bool8 MEScrCmd_givenationaldex(struct ScriptContext *ctx)
 bool8 MEScrCmd_addrareword(struct ScriptContext *ctx)
 {
     UnlockAdditionalPhrase(ScriptReadByte(ctx));
-    StringExpandPlaceholders(gStringVar4, gText_MysteryGiftRareWord);
+    StringExpandPlaceholders(gStringVar4, gText_MysteryEventRareWord);
     ctx->data[2] = 2;
     return FALSE;
 }
@@ -320,7 +320,7 @@ bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx)
 
     if (gPlayerPartyCount == PARTY_SIZE)
     {
-        StringExpandPlaceholders(gStringVar4, gText_MysteryGiftFullParty);
+        StringExpandPlaceholders(gStringVar4, gText_MysteryEventFullParty);
         ctx->data[2] = 3;
     }
     else
@@ -340,7 +340,7 @@ bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx)
             GiveMailToMon2(&gPlayerParty[PARTY_SIZE - 1], &mail);
         CompactPartySlots();
         CalculatePlayerPartyCount();
-        StringExpandPlaceholders(gStringVar4, gText_MysteryGiftSentOver);
+        StringExpandPlaceholders(gStringVar4, gText_MysteryEventSentOver);
         ctx->data[2] = 2;
     }
 
@@ -352,7 +352,7 @@ bool8 MEScrCmd_addtrainer(struct ScriptContext *ctx)
     u32 data = ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0];
     memcpy(&gSaveBlock2Ptr->frontier.ereaderTrainer, (void *)data, sizeof(gSaveBlock2Ptr->frontier.ereaderTrainer));
     ValidateEReaderTrainer();
-    StringExpandPlaceholders(gStringVar4, gText_MysteryGiftNewTrainer);
+    StringExpandPlaceholders(gStringVar4, gText_MysteryEventNewTrainer);
     ctx->data[2] = 2;
     return FALSE;
 }