diff options
| author | garakmon <thomastaps194@comcast.net> | 2018-07-07 21:29:11 -0400 |
|---|---|---|
| committer | garakmon <thomastaps194@comcast.net> | 2018-07-07 21:29:11 -0400 |
| commit | 864a69f9bf050eaaa062c8346cd6a5032e617139 (patch) | |
| tree | bd8b133710c813b11becf602067495526c849b6a /include/global.fieldmap.h | |
| parent | 47bcba3e1b5140cef7f04edcda3759818408726a (diff) | |
merge conflicts are soooooooooo fun
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 |