diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-13 14:25:52 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-13 14:25:52 -0400 |
| commit | 23c07589f5c515cbf16db08881142b6ae76dc5ee (patch) | |
| tree | e014266f2a4007fc05cecd79c7d2558d5b40978c /include/global.fieldmap.h | |
| parent | aa202b06245aa4c65f10379ecf9dc8c440a049ed (diff) | |
| parent | 3dce3407d5f9bca69d61b1cf1b314fb1e921d572 (diff) | |
Merge remote-tracking branch 'origin/master' into sync_bery_crush
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 28737b520..7544fe418 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -249,8 +249,8 @@ struct ObjectEvent struct ObjectEventGraphicsInfo { /*0x00*/ u16 tileTag; - /*0x02*/ u16 paletteTag1; - /*0x04*/ u16 paletteTag2; + /*0x02*/ u16 paletteTag; + /*0x04*/ u16 reflectionPaletteTag; /*0x06*/ u16 size; /*0x08*/ s16 width; /*0x0A*/ s16 height; |