diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-05 18:53:19 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-05 18:53:19 -0500 |
| commit | f6527d12428c8a8bd2561c3da50ebb36968e061c (patch) | |
| tree | 1882d862a18e61ddddf94dee1f9b4dae43336538 /src/engine/mystery_event_script.c | |
| parent | cbd3aa95d12bab05042025bd143a2a7cacf0b86d (diff) | |
| parent | f5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff) | |
Merge branch 'master' into cable_car
Diffstat (limited to 'src/engine/mystery_event_script.c')
| -rw-r--r-- | src/engine/mystery_event_script.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/engine/mystery_event_script.c b/src/engine/mystery_event_script.c index 12ad329da..6fcad66ac 100644 --- a/src/engine/mystery_event_script.c +++ b/src/engine/mystery_event_script.c @@ -14,6 +14,7 @@ #include "string_util.h" #include "text.h" #include "util.h" +#include "mystery_event_msg.h" #if ENGLISH #define LANGUAGE_MASK 0x2 @@ -32,17 +33,6 @@ extern void party_compaction(void); extern ScrCmdFunc gMysteryEventScriptCmdTable[]; extern ScrCmdFunc gMysteryEventScriptCmdTableEnd[]; -extern const u8 gOtherText_BerryObtainedDadHasIt[]; -extern const u8 gOtherText_BerryTransformed[]; -extern const u8 gOtherText_BerryAlreadyObtained[]; -extern const u8 gOtherText_SpecialRibbonReceived[]; -extern const u8 gOtherText_DexUpgraded[]; -extern const u8 gOtherText_RareWordAdded[]; -extern const u8 gOtherText_PokeWasSentOver[]; -extern const u8 gOtherText_PartyIsFull[]; -extern const u8 gOtherText_NewTrainerInHoenn[]; -extern const u8 gOtherText_DataCannotUseVersion[]; - static EWRAM_DATA struct ScriptContext sMysteryEventScriptContext = {0}; static bool32 CheckCompatibility(u16 a1, u32 a2, u16 a3, u32 a4) @@ -317,7 +307,7 @@ bool8 MEScrCmd_setenigmaberry(struct ScriptContext *ctx) ctx->data[2] = 2; if (IsEnigmaBerryValid() == TRUE) - VarSet(0x402D, 1); + VarSet(VAR_ENIGMA_BERRY_AVAILABLE, 1); else ctx->data[2] = 1; |