diff options
| author | Tetrable <atifhuss386@gmail.com> | 2019-01-02 21:25:14 +0000 |
|---|---|---|
| committer | Tetrable <atifhuss386@gmail.com> | 2019-01-02 21:25:14 +0000 |
| commit | a3ebca4d814adcf245212cb549f72812f2cf39c6 (patch) | |
| tree | 88fddcd03a5f19cf84b6199863f95fd06f1954bf /src/battle_factory.c | |
| parent | 1e3da62d24ad91e4d69ac6974476fd5ea47cae9b (diff) | |
| parent | a0ff38d0be4f618822d96cc7833e7c331ee78b5f (diff) | |
Fix merge conflicts
Diffstat (limited to 'src/battle_factory.c')
| -rw-r--r-- | src/battle_factory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_factory.c b/src/battle_factory.c index 419408695..0445d5dea 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -202,7 +202,7 @@ static void sub_81A5E94(void) for (i = 0; i < 3; i++) gUnknown_03006298[i] |= 0xFFFF; - saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); + SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); gTrainerBattleOpponent_A = 0; } |