diff options
| author | shinny456 <shinny456@users.noreply.github.com> | 2019-01-19 10:44:58 -0500 |
|---|---|---|
| committer | shinny456 <shinny456@users.noreply.github.com> | 2019-01-19 10:44:58 -0500 |
| commit | 1b30da21d9a0f1264ba3649e725ac1a62eca3e3a (patch) | |
| tree | 3105ab0101ffd0768589279130163a971c8365ca /src/battle_factory.c | |
| parent | 8a5fce7837b7314adb9bf6996ef06c009e853c29 (diff) | |
| parent | 6857b73ee348b16ecbd11d3dd12de022c08af3a5 (diff) | |
merge trainer hill changes
Diffstat (limited to 'src/battle_factory.c')
| -rw-r--r-- | src/battle_factory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_factory.c b/src/battle_factory.c index 0445d5dea..5793c78e9 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -198,9 +198,9 @@ static void sub_81A5E94(void) gUnknown_03001288 = FALSE; for (i = 0; i < 6; i++) - gSaveBlock2Ptr->frontier.field_E70[i].monId |= 0xFFFF; + gSaveBlock2Ptr->frontier.field_E70[i].monId = 0xFFFF; for (i = 0; i < 3; i++) - gUnknown_03006298[i] |= 0xFFFF; + gUnknown_03006298[i] = 0xFFFF; SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); gTrainerBattleOpponent_A = 0; |