diff options
| author | Garak <thomastaps194@comcast.net> | 2018-07-07 20:50:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-07 20:50:41 -0400 |
| commit | 6c5d1c4a3de2f1a2d1855a542a6a5d53e4daf936 (patch) | |
| tree | e9a140e919d72891ea825b64fc72a9cfa175ce88 /include/global.fieldmap.h | |
| parent | c4cc1522c86ec240c53c75455b650b1c69b2d5a4 (diff) | |
| parent | 9238533346fd97c67e48fee33a204d1e8e2dd0a7 (diff) | |
Merge pull request #9 from pret/master
sync with source repo
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index f15348689..15766a350 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -90,10 +90,10 @@ struct EventObjectTemplate struct WarpEvent { s16 x, y; - s8 warpId; - u8 mapGroup; + u8 elevation; + u8 warpId; u8 mapNum; - u8 unk7; + u8 mapGroup; }; struct CoordEvent |