diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-12 19:17:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 19:17:24 -0500 |
| commit | 43033ec97cfe3ea3128a93c079cf4a525ce3fbbf (patch) | |
| tree | 8b4d1c41cc6e18d6809c7c228997fb895e3829ae /src | |
| parent | a34c9d09b6b4da949ec6da6fa31b9f6eb12bdbee (diff) | |
| parent | 1b84bd395d4abff523dd800906083a47f492e866 (diff) | |
Merge pull request #390 from GriffinRichards/fix-constwarning
Fix warning about gMonPaletteTable section
Diffstat (limited to 'src')
| -rw-r--r-- | src/data/pokemon_graphics/palette_table.h | 3 | ||||
| -rw-r--r-- | src/field_effect.c | 5 |
2 files changed, 5 insertions, 3 deletions
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 |