diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-09-24 10:17:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 10:17:34 -0400 |
| commit | 42d2fefe0218f529f9c22f3b6b4230ca91a00de5 (patch) | |
| tree | db4ae87659baced2022e440109306266c1c80e3b /include/global.fieldmap.h | |
| parent | f8f7617946e150514313267ba52a35ebd9052936 (diff) | |
| parent | 09fd4fc4c57796036905cdc5caaa53fb96c436f8 (diff) | |
Merge branch 'master' into tag-none
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 6bafa9747..41b8539ff 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -146,7 +146,7 @@ struct MapHeader /* 0x1A */ bool8 allowCycling:1; bool8 allowEscaping:1; // Escape Rope and Dig bool8 allowRunning:1; - bool8 showMapName:5; // the last 4 bits are unused + bool8 showMapName:5; // the last 4 bits are unused // but the 5 bit sized bitfield is required to match /* 0x1B */ u8 battleType; }; |