diff options
| -rw-r--r-- | include/data.h | 2 | ||||
| -rw-r--r-- | src/data/pokemon_graphics/palette_table.h | 3 | ||||
| -rw-r--r-- | src/field_effect.c | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/data.h b/include/data.h index 1a91d6f62..19da0034f 100644 --- a/include/data.h +++ b/include/data.h @@ -27,7 +27,7 @@ extern const struct MonCoords gMonFrontPicCoords[]; extern const struct CompressedSpriteSheet gMonFrontPicTable[]; extern const struct MonCoords gMonBackPicCoords[]; extern const struct CompressedSpriteSheet gMonBackPicTable[]; -extern struct CompressedSpritePalette gMonPaletteTable[]; +extern const struct CompressedSpritePalette gMonPaletteTable[]; extern const struct CompressedSpritePalette gMonShinyPaletteTable[]; extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[]; extern const struct MonCoords gTrainerFrontPicCoords[]; diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index bb4f64a07..35edcc76c 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -1,5 +1,4 @@ -// A dirty hack because field_effect.c requires this not be const -__attribute__((section(".rodata"))) struct CompressedSpritePalette gMonPaletteTable[] = +const struct CompressedSpritePalette gMonPaletteTable[] = { SPECIES_PAL(NONE, gMonPalette_CircledQuestionMark), SPECIES_PAL(BULBASAUR, gMonPalette_Bulbasaur), diff --git a/src/field_effect.c b/src/field_effect.c index 9167843b6..d656b8107 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -1,6 +1,5 @@ #include "global.h" #include "gflib.h" -#include "data.h" #include "decompress.h" #include "event_data.h" #include "event_object_movement.h" @@ -29,6 +28,10 @@ #include "constants/metatile_behaviors.h" #include "constants/songs.h" +extern struct CompressedSpritePalette gMonPaletteTable[]; // Intentionally declared (incorrectly) without const in order to match +extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; +extern const struct CompressedSpriteSheet gTrainerFrontPicTable[]; + #define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))} #define FIELD_EFFECT_COUNT 32 |