From efe4929ce217b60942c61959aff0544ee76cbad0 Mon Sep 17 00:00:00 2001 From: Frank DeBlasio <35279583+fdeblasio@users.noreply.github.com> Date: Fri, 17 Nov 2023 18:54:13 -0500 Subject: [PATCH] Added Japan-only Walda PC icons (#3550) * 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 --- .../wallpapers/icons/bolt_japan.png | Bin 0 -> 133 bytes .../wallpapers/icons/cross_japan.png | Bin 0 -> 102 bytes .../wallpapers/icons/plusle_japan.png | Bin 0 -> 135 bytes include/config/overworld.h | 1 + src/data/wallpapers.h | 15 +++++++++++++++ 5 files changed, 16 insertions(+) create mode 100644 graphics/pokemon_storage/wallpapers/icons/bolt_japan.png create mode 100644 graphics/pokemon_storage/wallpapers/icons/cross_japan.png create mode 100644 graphics/pokemon_storage/wallpapers/icons/plusle_japan.png diff --git a/graphics/pokemon_storage/wallpapers/icons/bolt_japan.png b/graphics/pokemon_storage/wallpapers/icons/bolt_japan.png new file mode 100644 index 0000000000000000000000000000000000000000..a217a5642faf818bb4cace8a75d89b98f152eaaa GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UAd^}woLnNlA_MH}GP~>1vuQW^e zZ|lV^XLdwhJYMbK2VRq#j2zi}3tuvE*0O(N6=KhLs&3z_y#KnE!{u%JBe%v(w<{0H fowKiT>w!x?EE{;0XLY)mgUt7I^>bP0l+XkK1Jo%d literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/wallpapers/icons/cross_japan.png b/graphics/pokemon_storage/wallpapers/icons/cross_japan.png new file mode 100644 index 0000000000000000000000000000000000000000..9367347e9deca338feedefa64ea32470b879b4f5 GIT binary patch literal 102 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UAbUj@hLnNjq*Bo!)nsMO=kB-1A zTW02Fg)-3=)(C}Pg3l(Tw<(C;ImmFmKa`bW)+<)^*Q>jgKn8fa`njxgN@xNA?`j=N literal 0 HcmV?d00001 diff --git a/graphics/pokemon_storage/wallpapers/icons/plusle_japan.png b/graphics/pokemon_storage/wallpapers/icons/plusle_japan.png new file mode 100644 index 0000000000000000000000000000000000000000..f58c05989c8c0620db2ad578bc93b99ec6d11512 GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UA{5)M8LnNk__Foh|puoZGKaV@* zzicY2Jxk8kr~M9k7uepvVz6lNDsU1_SUp`t*jgY$YSPv2W$~wv%f|g~U~PO7GtKPA hL8avW_=+OEV=R2Ee3~b&={16E@O1TaS?83{1OU@KD%Ai0 literal 0 HcmV?d00001 diff --git a/include/config/overworld.h b/include/config/overworld.h index e2ced7ccbf..cac35413de 100644 --- a/include/config/overworld.h +++ b/include/config/overworld.h @@ -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. diff --git a/src/data/wallpapers.h b/src/data/wallpapers.h index 64c61fe2d5..d204d44130 100644 --- a/src/data/wallpapers.h +++ b/src/data/wallpapers.h @@ -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,