diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 12:57:46 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 12:57:46 -0500 |
| commit | fdd7e7cb848747a1e0ace8a63d29aaa22dfd1140 (patch) | |
| tree | 6ddaed4de52bfcc517d573a8f30c5bd0a1650782 /src/engine/mystery_event_script.c | |
| parent | bb8f652504f886af296ffcaac57bf76cdc893c97 (diff) | |
| parent | 1c1ce902515ccb3ccecde29611711c9b1a3ce955 (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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/mystery_event_script.c b/src/engine/mystery_event_script.c index a6568f5de..12ad329da 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" @@ -8,7 +9,7 @@ #include "pokemon.h" #include "pokemon_size_record.h" #include "script.h" -#include "species.h" +#include "constants/species.h" #include "strings.h" #include "string_util.h" #include "text.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; |