diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-08 03:07:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 03:07:50 -0500 |
| commit | 9140594b233b08d05d0832b62d3e64d50528a460 (patch) | |
| tree | 1175aa70b24f9c07b8089e23b2e8e7fdcba1b524 /src/union_room.c | |
| parent | e19b9c9d467aa51c1ca550d2d9af4e3e9e5fd11e (diff) | |
| parent | 030784dece994daf90ac1cb06a44912245b519ea (diff) | |
Merge branch 'master' into doc-littleroot
Diffstat (limited to 'src/union_room.c')
| -rw-r--r-- | src/union_room.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/union_room.c b/src/union_room.c index 5952b03eb..d22373ea0 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -30,6 +30,7 @@ #include "party_menu.h" #include "pokemon_jump.h" #include "random.h" +#include "save_location.h" #include "script.h" #include "script_pokemon_util_80F87D8.h" #include "sound.h" @@ -1078,7 +1079,7 @@ u32 sub_8013B8C(struct UnkStruct_Group *arg0, s32 id) if (gUnknown_02022C2C == 4 && structPtr->unk.field_0.unk_00.unk_01_2 != 3) { - if (!(gSaveBlock2Ptr->specialSaveWarpFlags & 0x80)) + if (!(gSaveBlock2Ptr->specialSaveWarpFlags & CHAMPION_SAVEWARP)) return 1; else if (structPtr->unk.field_0.unk_00.isChampion) return 0; |