diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-07-05 20:11:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 20:11:10 -0700 |
| commit | 9238533346fd97c67e48fee33a204d1e8e2dd0a7 (patch) | |
| tree | e9a140e919d72891ea825b64fc72a9cfa175ce88 /include/global.fieldmap.h | |
| parent | 99c98097753008b1f824a676b36f34ac2857effe (diff) | |
| parent | f309f3272ae04be643ee3d1dd9f3fc3e5fc6c699 (diff) | |
Merge pull request #648 from yenatch/master
fix WarpEvent and label some of pokemon_summary_screen
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 |