Fix warning about gMonPaletteTable section
This commit is contained in:
+1
-1
@@ -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[];
|
||||
|
||||
@@ -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),
|
||||
|
||||
+4
-1
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user