diff options
| author | PikalaxALT <pikalax1@gmail.com> | 2017-09-21 17:55:30 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalax1@gmail.com> | 2017-09-21 17:55:30 -0400 |
| commit | d87ed69449da253a374170a8135200657fb0426b (patch) | |
| tree | 94baba568fc6dd25d082b309746198d41d07bd1b /include/global.h | |
| parent | aecddc277130652a90e00ad0cc314b7ef9765bbb (diff) | |
| parent | c1c2015f7046676b043641c0d1f9d9e29bc73647 (diff) | |
Merge branch 'master' into field_effect_helpers
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/global.h b/include/global.h index ab7d43955..79269937f 100644 --- a/include/global.h +++ b/include/global.h @@ -608,7 +608,7 @@ struct SaveBlock1 /* 0x02025734 */ /*0x2C*/ u16 battleMusic; /*0x2E*/ u8 weather; /*0x2F*/ u8 filler_2F; - /*0x30*/ u8 flashUsed; + /*0x30*/ u8 flashLevel; // flash level on current map, 0 being normal and 4 being the darkest /*0x32*/ u16 mapDataId; /*0x34*/ u16 mapView[0x100]; /*0x234*/ u8 playerPartyCount; |