diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-03 00:04:30 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-03 00:04:30 -0400 |
| commit | 1966f65696215a09066f6da70920703d6f3fd870 (patch) | |
| tree | a77304e6d34ede3fa3d6c62b82859e6c12ba2f48 /src/engine/mystery_event_script.c | |
| parent | e08f3e4398d6c1dc21437e7b6462521ecfd299a6 (diff) | |
| parent | 08e6fb5382bb4e2104d370783d15b4a2a3c65a2a (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into fix_setmondata
Diffstat (limited to 'src/engine/mystery_event_script.c')
| -rw-r--r-- | src/engine/mystery_event_script.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/mystery_event_script.c b/src/engine/mystery_event_script.c index a6568f5de..69434710f 100644 --- a/src/engine/mystery_event_script.c +++ b/src/engine/mystery_event_script.c @@ -1,5 +1,6 @@ #include "global.h" #include "berry.h" +#include "battle_tower.h" #include "easy_chat.h" #include "event_data.h" #include "mail_data.h" @@ -27,7 +28,6 @@ #endif extern void party_compaction(void); -extern void sub_813601C(void); extern ScrCmdFunc gMysteryEventScriptCmdTable[]; extern ScrCmdFunc gMysteryEventScriptCmdTableEnd[]; @@ -420,8 +420,8 @@ bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx) bool8 MEScrCmd_addtrainer(struct ScriptContext *ctx) { u32 data = ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]; - memcpy(gSaveBlock2.filler_A8.ereaderTrainer, (void *)data, sizeof(gSaveBlock2.filler_A8.ereaderTrainer)); - sub_813601C(); + memcpy(&gSaveBlock2.battleTower.ereaderTrainer, (void *)data, sizeof(gSaveBlock2.battleTower.ereaderTrainer)); + ValidateEReaderTrainer(); StringExpandPlaceholders(gStringVar4, gOtherText_NewTrainerInHoenn); ctx->data[2] = 2; return FALSE; |