diff options
| author | Garak <thomastaps194@comcast.net> | 2018-06-24 13:45:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-24 13:45:15 -0400 |
| commit | b3dec86071ae7d2eb5c1258ea778f0e823a5f636 (patch) | |
| tree | 594590b12dc14049b9c17587d8b602686a4c57fa /include/global.fieldmap.h | |
| parent | ac636ec14e896214b549025e671fc6ae7f6fd045 (diff) | |
| parent | 4313b2f49d22f4e5a6db3c45f9f3a434079a7c1f (diff) | |
Merge pull request #1 from pret/master
upstream merge
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 799a12a19..f15348689 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -238,8 +238,8 @@ struct EventObject struct EventObjectGraphicsInfo { /*0x00*/ u16 tileTag; - /*0x02*/ u16 paletteTag1; - /*0x04*/ u16 paletteTag2; + /*0x02*/ u16 paletteTag; + /*0x04*/ u16 bridgeReflectionPaletteTag; /*0x06*/ u16 size; /*0x08*/ s16 width; /*0x0A*/ s16 height; |