dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #390 from GriffinRichards/fix-constwarning

Browse Source 
Fix warning about gMonPaletteTable section
This commit is contained in:
GriffinR
2021-02-12 19:17:24 -05:00
committed by GitHub
parent a34c9d09b6 1b84bd395d
commit 43033ec97c
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/data.h
+1 -1
View File
@@ -27,7 +27,7 @@ extern const struct MonCoords gMonFrontPicCoords[];
extern const struct CompressedSpriteSheet gMonFrontPicTable[]; extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const struct MonCoords gMonBackPicCoords[]; extern const struct MonCoords gMonBackPicCoords[];
extern const struct CompressedSpriteSheet gMonBackPicTable[]; extern const struct CompressedSpriteSheet gMonBackPicTable[];
extern struct CompressedSpritePalette gMonPaletteTable[]; extern const struct CompressedSpritePalette gMonPaletteTable[];
extern const struct CompressedSpritePalette gMonShinyPaletteTable[]; extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[]; extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
extern const struct MonCoords gTrainerFrontPicCoords[]; extern const struct MonCoords gTrainerFrontPicCoords[];
src/data/pokemon_graphics/palette_table.h
+1 -2
View File
@@ -1,5 +1,4 @@
// A dirty hack because field_effect.c requires this not be const const struct CompressedSpritePalette gMonPaletteTable[] =
__attribute__((section(".rodata"))) struct CompressedSpritePalette gMonPaletteTable[] =
{ {
SPECIES_PAL(NONE, gMonPalette_CircledQuestionMark), SPECIES_PAL(NONE, gMonPalette_CircledQuestionMark),
SPECIES_PAL(BULBASAUR, gMonPalette_Bulbasaur), SPECIES_PAL(BULBASAUR, gMonPalette_Bulbasaur),
src/field_effect.c
+4 -1
View File
@@ -1,6 +1,5 @@
#include "global.h" #include "global.h"
#include "gflib.h" #include "gflib.h"
#include "data.h"
#include "decompress.h" #include "decompress.h"
#include "event_data.h" #include "event_data.h"
#include "event_object_movement.h" #include "event_object_movement.h"
@@ -29,6 +28,10 @@
#include "constants/metatile_behaviors.h" #include "constants/metatile_behaviors.h"
#include "constants/songs.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 subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))}
#define FIELD_EFFECT_COUNT 32 #define FIELD_EFFECT_COUNT 32