Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1998 from Sneed69/define-POKE_ICON_BASE_PAL_TAG 

Move POKE_ICON_BASE_PAL_TAG to a header
This commit is contained in:
GriffinR 2024-05-22 20:29:12 -04:00 committed by GitHub
parent aa4fa925c2 b592c6eae5
commit 18f84b78f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/constants/pokemon_icon.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef GUARD_CONSTANTS_POKEMON_ICON_H
#define GUARD_CONSTANTS_POKEMON_ICON_H
#define POKE_ICON_BASE_PAL_TAG 56000
#endif // GUARD_CONSTANTS_POKEMON_ICON_H

3
src/pokemon_icon.c
View File

@ -4,8 +4,7 @@
#include "palette.h" #include "palette.h"
#include "pokemon_icon.h" #include "pokemon_icon.h"
#include "sprite.h" #include "sprite.h"
#include "constants/pokemon_icon.h"
#define POKE_ICON_BASE_PAL_TAG 56000
#define INVALID_ICON_SPECIES SPECIES_OLD_UNOWN_J // Oddly specific, used when an icon should be a ?. Any of the 'old unown' would work #define INVALID_ICON_SPECIES SPECIES_OLD_UNOWN_J // Oddly specific, used when an icon should be a ?. Any of the 'old unown' would work

3
src/pokemon_storage_system.c
View File

@ -40,6 +40,7 @@
#include "constants/moves.h" #include "constants/moves.h"
#include "constants/rgb.h" #include "constants/rgb.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/pokemon_icon.h"
/* /*
NOTE: This file is large. Some general groups of functions have NOTE: This file is large. Some general groups of functions have
@ -215,7 +216,7 @@ enum {
#define BOXID_CANCELED 201 #define BOXID_CANCELED 201
enum { enum {
PALTAG_MON_ICON_0 = 56000, PALTAG_MON_ICON_0 = POKE_ICON_BASE_PAL_TAG,
PALTAG_MON_ICON_1, // Used implicitly in CreateMonIconSprite PALTAG_MON_ICON_1, // Used implicitly in CreateMonIconSprite
PALTAG_MON_ICON_2, // Used implicitly in CreateMonIconSprite PALTAG_MON_ICON_2, // Used implicitly in CreateMonIconSprite
PALTAG_3, // Unused PALTAG_3, // Unused