diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.fieldmap.h | 6 | ||||
| -rw-r--r-- | include/macros/map.inc | 4 |
2 files changed, 5 insertions, 5 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 diff --git a/include/macros/map.inc b/include/macros/map.inc index 80257fd23..bc54271d4 100644 --- a/include/macros/map.inc +++ b/include/macros/map.inc @@ -26,9 +26,9 @@ inc _num_npcs .endm - .macro warp_def x, y, byte, warp, map_id + .macro warp_def x, y, elevation, warp, map_id .2byte \x, \y - .byte \byte, \warp + .byte \elevation, \warp .byte \map_id & 0xFF @ map num .byte \map_id >> 8 @ map group inc _num_warps |