Merge master into fix-eventobj, add explicit size to gObjectEventGraphicsInfoPointers

2 files changed, 30 insertions, 30 deletions

diff --git a/src/data/object_event/event_object_graphics.h b/src/data/object_event/event_object_graphics.h
index 88ca30ff5..0629e8c46 100755
--- a/src/data/object_event/event_object_graphics.h
+++ b/src/data/object_event/event_object_graphics.h
@@ -4,21 +4,21 @@ const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/object_events/palettes/e
 const u32 gObjectEventPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/walking.4bpp");
 const u32 gObjectEventPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/running.4bpp");
 const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_33.gbapal");
-const u16 NullPalette_8499A38[16] = {};
-const u16 NullPalette_8499A58[16] = {};
-const u16 NullPalette_8499A78[16] = {};
-const u16 NullPalette_8499A98[16] = {};
-const u16 NullPalette_8499AB8[16] = {};
-const u16 NullPalette_8499AD8[16] = {};
-const u16 NullPalette_8499AF8[16] = {};
-const u16 NullPalette_8499B18[16] = {};
-const u16 NullPalette_8499B38[16] = {};
-const u16 NullPalette_8499B58[16] = {};
-const u16 NullPalette_8499B78[16] = {};
-const u16 NullPalette_8499B98[16] = {};
-const u16 NullPalette_8499BB8[16] = {};
-const u16 NullPalette_8499BD8[16] = {};
-const u16 NullPalette_8499BF8[16] = {};
+const u16 gObjectEventPaletteNull1[16] = {};
+const u16 gObjectEventPaletteNull2[16] = {};
+const u16 gObjectEventPaletteNull3[16] = {};
+const u16 gObjectEventPaletteNull4[16] = {};
+const u16 gObjectEventPaletteNull5[16] = {};
+const u16 gObjectEventPaletteNull6[16] = {};
+const u16 gObjectEventPaletteNull7[16] = {};
+const u16 gObjectEventPaletteNull8[16] = {};
+const u16 gObjectEventPaletteNull9[16] = {};
+const u16 gObjectEventPaletteNull10[16] = {};
+const u16 gObjectEventPaletteNull11[16] = {};
+const u16 gObjectEventPaletteNull12[16] = {};
+const u16 gObjectEventPaletteNull13[16] = {};
+const u16 gObjectEventPaletteNull14[16] = {};
+const u16 gObjectEventPaletteNull15[16] = {};
 const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_09.gbapal");
 const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_10.gbapal");
 const u32 gObjectEventPic_BrendanFieldMove[] = INCBIN_U32("graphics/object_events/pics/people/brendan/field_move.4bpp");
@@ -40,20 +40,20 @@ const u32 gObjectEventPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/object_
 const u32 gObjectEventPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/running.4bpp");
 const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_34.gbapal");
 const u16 gUnusedObjectEventPalette[] = INCBIN_U16("graphics/object_events/palettes/unused_palette.gbapal");
-const u16 NullPalette_84A54F8[16] = {};
-const u16 NullPalette_84A5518[16] = {};
-const u16 NullPalette_84A5538[16] = {};
-const u16 NullPalette_84A5558[16] = {};
-const u16 NullPalette_84A5578[16] = {};
-const u16 NullPalette_84A5598[16] = {};
-const u16 NullPalette_84A55B8[16] = {};
-const u16 NullPalette_84A55D8[16] = {};
-const u16 NullPalette_84A55F8[16] = {};
-const u16 NullPalette_84A5618[16] = {};
-const u16 NullPalette_84A5638[16] = {};
-const u16 NullPalette_84A5658[16] = {};
-const u16 NullPalette_84A5678[16] = {};
-const u16 NullPalette_84A5698[16] = {};
+const u16 gObjectEventPaletteNull16[16] = {};
+const u16 gObjectEventPaletteNull17[16] = {};
+const u16 gObjectEventPaletteNull18[16] = {};
+const u16 gObjectEventPaletteNull19[16] = {};
+const u16 gObjectEventPaletteNull20[16] = {};
+const u16 gObjectEventPaletteNull21[16] = {};
+const u16 gObjectEventPaletteNull22[16] = {};
+const u16 gObjectEventPaletteNull23[16] = {};
+const u16 gObjectEventPaletteNull24[16] = {};
+const u16 gObjectEventPaletteNull25[16] = {};
+const u16 gObjectEventPaletteNull26[16] = {};
+const u16 gObjectEventPaletteNull27[16] = {};
+const u16 gObjectEventPaletteNull28[16] = {};
+const u16 gObjectEventPaletteNull29[16] = {};
 const u32 gObjectEventPic_MayMachBike[] = INCBIN_U32("graphics/object_events/pics/people/may/mach_bike.4bpp");
 const u32 gObjectEventPic_MayAcroBike[] = INCBIN_U32("graphics/object_events/pics/people/may/acro_bike.4bpp");
 const u32 gObjectEventPic_MaySurfing[] = INCBIN_U32("graphics/object_events/pics/people/may/surfing.4bpp");
diff --git a/src/data/object_event/event_object_graphics_info_pointers.h b/src/data/object_event/event_object_graphics_info_pointers.h
index 01c8cbde7..c72b0279d 100755
--- a/src/data/object_event/event_object_graphics_info_pointers.h
+++ b/src/data/object_event/event_object_graphics_info_pointers.h
@@ -246,7 +246,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldM
 const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan2;
 
 
-const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[] = {
+const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM_OBJ_EVENT_GFX] = {
     [OBJ_EVENT_GFX_BRENDAN_NORMAL] =           &gObjectEventGraphicsInfo_BrendanNormal,
     [OBJ_EVENT_GFX_BRENDAN_MACH_BIKE] =        &gObjectEventGraphicsInfo_BrendanMachBike,
     [OBJ_EVENT_GFX_BRENDAN_SURFING] =          &gObjectEventGraphicsInfo_BrendanSurfing,