atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added Japan-only Walda PC icons (#3550)

Browse source 
* Added Japan-only Walda PC icons

* Added a config for the Japanese icons

* Update overworld.h with suggestions

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
This commit is contained in:
Frank DeBlasio 2023-11-17 18:54:13 -05:00 committed by GitHub
parent bf8c9609ae
commit efe4929ce2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
graphics/pokemon_storage/wallpapers/icons/bolt_japan.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 133 B

BIN
graphics/pokemon_storage/wallpapers/icons/cross_japan.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 102 B

BIN
graphics/pokemon_storage/wallpapers/icons/plusle_japan.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 135 B

1
include/config/overworld.h
View file

@ -9,6 +9,7 @@
// PC settings
#define OW_PC_PRESS_B GEN_LATEST // In Gen4, pressing B when holding a Pokémon is equivalent to placing it. In Gen3, it gives the "You're holding a Pokémon!" error.
#define OW_PC_JAPAN_WALDA_ICONS TRUE // In the US release of Emerald, the Cross, Bolt, and Plusle icons for Walda's wallpapers were left blank from the Japan release. Setting this to TRUE will restore them.
// Out-of-battle Ability effects
#define OW_SYNCHRONIZE_NATURE GEN_LATEST // In Gen8, if a Pokémon with Synchronize is leading the party, it's 100% guaranteed that wild Pokémon will have the same Nature, as opposed to 50% previously. Stationary Pokémon are excluded in Gen3. In Gen6, all No Eggs Discovered gift Pokémon will have the same Nature, while in Gen7 all gift Pokémon will, regardless of Egg Group - In Gen 8, no gift Pokémon are affected. In Gen9, this ability has no out-of-battle effect.

15
src/data/wallpapers.h
View file

@ -317,6 +317,7 @@ static const u32 sWallpaperIcon_Brick[] = INCBIN_U32("graphics/pokemon_st
static const u32 sWallpaperIcon_FourStar[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/four_star.4bpp.lz");
static const u32 sWallpaperIcon_Asterisk[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/asterisk.4bpp.lz");
static const u32 sWallpaperIcon_Dot[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/dot.4bpp.lz");
static const u32 sWallpaperIcon_CrossJapan[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/cross_japan.4bpp.lz");
static const u32 sWallpaperIcon_LineCircle[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/line_circle.4bpp.lz");
static const u32 sWallpaperIcon_PokeBall[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/pokeball.4bpp.lz");
static const u32 sWallpaperIcon_Maze[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/maze.4bpp.lz");
@ -325,6 +326,7 @@ static const u32 sWallpaperIcon_BigAsterisk[] = INCBIN_U32("graphics/pokemon_st
static const u32 sWallpaperIcon_Circle[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/circle.4bpp.lz");
static const u32 sWallpaperIcon_Koffing[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/koffing.4bpp.lz");
static const u32 sWallpaperIcon_Ribbon[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/ribbon.4bpp.lz");
static const u32 sWallpaperIcon_BoltJapan[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/bolt_japan.4bpp.lz");
static const u32 sWallpaperIcon_FourCircles[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/four_circles.4bpp.lz");
static const u32 sWallpaperIcon_Lotad[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/lotad.4bpp.lz");
static const u32 sWallpaperIcon_Crystal[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/crystal.4bpp.lz");
@ -334,6 +336,7 @@ static const u32 sWallpaperIcon_Luvdisc[] = INCBIN_U32("graphics/pokemon_st
static const u32 sWallpaperIcon_StarInCircle[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/star_in_circle.4bpp.lz");
static const u32 sWallpaperIcon_Spinda[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/spinda.4bpp.lz");
static const u32 sWallpaperIcon_Latis[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/latis.4bpp.lz");
static const u32 sWallpaperIcon_PlusleJapan[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/plusle_japan.4bpp.lz");
static const u32 sWallpaperIcon_Minun[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/minun.4bpp.lz");
static const u32 sWallpaperIcon_Togepi[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/togepi.4bpp.lz");
static const u32 sWallpaperIcon_Magma[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/icons/magma.4bpp.lz");
@ -367,7 +370,11 @@ static const u32 *const sWaldaWallpaperIcons[] =
sWallpaperIcon_FourStar,
sWallpaperIcon_Asterisk,
sWallpaperIcon_Dot,
#if OW_PC_JAPAN_WALDA_ICONS == TRUE
sWallpaperIcon_CrossJapan,
#else
gWallpaperIcon_Cross,
#endif
sWallpaperIcon_LineCircle,
sWallpaperIcon_PokeBall,
sWallpaperIcon_Maze,
@ -376,7 +383,11 @@ static const u32 *const sWaldaWallpaperIcons[] =
sWallpaperIcon_Circle,
sWallpaperIcon_Koffing,
sWallpaperIcon_Ribbon,
#if OW_PC_JAPAN_WALDA_ICONS == TRUE
sWallpaperIcon_BoltJapan,
#else
gWallpaperIcon_Bolt,
#endif
sWallpaperIcon_FourCircles,
sWallpaperIcon_Lotad,
sWallpaperIcon_Crystal,
@ -386,7 +397,11 @@ static const u32 *const sWaldaWallpaperIcons[] =
sWallpaperIcon_StarInCircle,
sWallpaperIcon_Spinda,
sWallpaperIcon_Latis,
#if OW_PC_JAPAN_WALDA_ICONS == TRUE
sWallpaperIcon_PlusleJapan,
#else
gWallpaperIcon_Plusle,
#endif
sWallpaperIcon_Minun,
sWallpaperIcon_Togepi,
sWallpaperIcon_Magma,