Merge remote-tracking branch 'upstream/master' into berry_crush

2020-12-10 23:30:52 -05:00
parent 32ae13f9b6 8d29f65c6c
commit 58976ebaa8
500 changed files with 25386 additions and 24803 deletions
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -214,8 +214,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;