diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-21 23:12:36 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-21 23:12:36 +0100 |
| commit | bcffcb0c1cd1d9b9a223fa8029f33b4c3c926575 (patch) | |
| tree | cd9e57cb761cad0ad93d5024d3f8c84e49e2bd9d /src/scrcmd.c | |
| parent | df479661ffd0c270e4a8c35f37285d5d3988f592 (diff) | |
| parent | a705a863d1f59411a6f18fdd95e81de76f66fd66 (diff) | |
pokeblock merge conflicts
Diffstat (limited to 'src/scrcmd.c')
| -rw-r--r-- | src/scrcmd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index 1b10501fc..412f8acd1 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -2332,7 +2332,7 @@ bool8 ScrCmd_mossdeepgym4(struct ScriptContext *ctx) bool8 ScrCmd_cmdD8(struct ScriptContext *ctx) { - gSelectedMapObject = sub_80B47BC(); + gSelectedMapObject = GetCurrentApproachingTrainerMapObjectId(); return FALSE; } |