diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-10-18 02:59:01 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-10-18 02:59:01 -0400 |
| commit | 2db57c612570c5a74e6b30bec8074f70132636b1 (patch) | |
| tree | d0c14d87edf3aa209d274d0987e875334a3e9462 /include/global.fieldmap.h | |
| parent | fbbe7c5e4c42f6c4a25c40216e4eda1d1b1fb89e (diff) | |
| parent | a335716a41ebed9b221a7569ab426a2efdd5d719 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into clean_bike
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 4167f7cbd..eb99cc19f 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -111,11 +111,11 @@ struct CoordEvent struct BgEvent { - u16 x, y; - u8 unk4; - u8 kind; - // 0x2 padding for the union beginning. - union { // carried over from diego's FR/LG work, seems to be the same struct + /*0x00*/u16 x; + /*0x02*/u16 y; + /*0x04*/u8 unk4; + /*0x05*/u8 kind; + /*0x08*/union { // carried over from diego's FR/LG work, seems to be the same struct // in gen 3, "kind" (0x3 in BgEvent struct) determines the method to read the union. u8 *script; |