diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-07-20 22:42:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-20 22:42:32 -0500 |
| commit | 959f78fe146e75f9ce02b318eb6a8d97652a9996 (patch) | |
| tree | c3100c9cb3ac199ced8b28203878fac7c2a76994 /include/global.fieldmap.h | |
| parent | b23014cfa0573e53a104f433cf2d75f350340d60 (diff) | |
| parent | 7d960d219fae9d0a14ef1974c11231f8de55b89c (diff) | |
Merge branch 'master' into master
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 7589de029..4029132e8 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -166,7 +166,7 @@ struct MapHeader /* 0x0C */ struct MapConnections *connections; /* 0x10 */ u16 music; /* 0x12 */ u16 mapDataId; - /* 0x14 */ u8 name; + /* 0x14 */ u8 regionMapSectionId; /* 0x15 */ u8 cave; /* 0x16 */ u8 weather; /* 0x17 */ u8 mapType; |