dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Extern gSprites and gOamMatrices with known array size (#2090)

Browse Source
This commit is contained in:
DizzyEggg
2025-01-18 00:18:17 +01:00
committed by GitHub
parent 2f67b17571
commit 0a436d580e
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sprite.h
+3 -2
View File
@@ -1,6 +1,7 @@
#ifndef GUARD_SPRITE_H #ifndef GUARD_SPRITE_H
#define GUARD_SPRITE_H #define GUARD_SPRITE_H
#define OAM_MATRIX_COUNT 32
#define MAX_SPRITES 64 #define MAX_SPRITES 64
#define SPRITE_NONE 0xFF #define SPRITE_NONE 0xFF
#define TAG_NONE 0xFFFF #define TAG_NONE 0xFFFF
@@ -254,12 +255,12 @@ extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[];
extern const struct SpriteTemplate gDummySpriteTemplate; extern const struct SpriteTemplate gDummySpriteTemplate;
extern u8 gReservedSpritePaletteCount; extern u8 gReservedSpritePaletteCount;
extern struct Sprite gSprites[]; extern struct Sprite gSprites[MAX_SPRITES + 1];
extern u8 gOamLimit; extern u8 gOamLimit;
extern u16 gReservedSpriteTileCount; extern u16 gReservedSpriteTileCount;
extern s16 gSpriteCoordOffsetX; extern s16 gSpriteCoordOffsetX;
extern s16 gSpriteCoordOffsetY; extern s16 gSpriteCoordOffsetY;
extern struct OamMatrix gOamMatrices[]; extern struct OamMatrix gOamMatrices[OAM_MATRIX_COUNT];
extern bool8 gAffineAnimsDisabled; extern bool8 gAffineAnimsDisabled;
void ResetSpriteData(void); void ResetSpriteData(void);
src/sprite.c
-2
View File
@@ -5,8 +5,6 @@
#define MAX_SPRITE_COPY_REQUESTS 64 #define MAX_SPRITE_COPY_REQUESTS 64
#define OAM_MATRIX_COUNT 32
#define sAnchorX data[6] #define sAnchorX data[6]
#define sAnchorY data[7] #define sAnchorY data[7]