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

merge w upcoming

Browse source
This commit is contained in:
ghoulslash 2024-09-29 13:33:20 -04:00
commit be3ee1ba85
197 changed files with 3099 additions and 549 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml vendored
View file

@ -23,9 +23,10 @@ body:
label: Version
description: What version of pokeemerald-expansion are you using as a base?
options:
- 1.9.1 (Latest release)
- 1.9.2 (Latest release)
- master (default, unreleased bugfixes)
- upcoming (Edge)
- 1.9.1
- 1.9.0
- 1.8.6
- 1.8.5

3
.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml vendored
View file

@ -23,9 +23,10 @@ body:
label: Version
description: What version of pokeemerald-expansion are you using as a base?
options:
- 1.9.1 (Latest release)
- 1.9.2 (Latest release)
- master (default, unreleased bugfixes)
- upcoming (Edge)
- 1.9.1
- 1.9.0
- 1.8.6
- 1.8.5

3
.github/ISSUE_TEMPLATE/04_other_errors.yaml vendored
View file

@ -23,9 +23,10 @@ body:
label: Version
description: What version of pokeemerald-expansion are you using as a base?
options:
- 1.9.1 (Latest release)
- 1.9.2 (Latest release)
- master (default, unreleased bugfixes)
- upcoming (Edge)
- 1.9.1
- 1.9.0
- 1.8.6
- 1.8.5

1
CHANGELOG.md
View file

@ -1,6 +1,7 @@
# Pokeemerald-Expansion Changelogs
## 1.9.x
- **[Version 1.9.2](docs/changelogs/1.9.x/1.9.2.md) - 🧹 Bugfix Release**
- **[Version 1.9.1](docs/changelogs/1.9.x/1.9.1.md) - 🧹 Bugfix Release**
- **[Version 1.9.0](docs/changelogs/1.9.x/1.9.0.md) - ✨ Feature Release**

4
README.md
View file

@ -9,7 +9,7 @@ pokeemerald-expansion is a decomp hack base project based off pret's [pokeemeral
If you use pokeemerald-expansion in your hack, please add RHH (Rom Hacking Hideout) to your credits list. Optionally, you can list the version used, so it can help players know what features to expect.
You can phrase it as the following:
```
Based off RHH's pokeemerald-expansion 1.9.1 https://github.com/rh-hideout/pokeemerald-expansion/
Based off RHH's pokeemerald-expansion 1.9.2 https://github.com/rh-hideout/pokeemerald-expansion/
```
## What features are included?
@ -178,7 +178,7 @@ With this, you'll get the latest version of pokeemerald-expansion, plus a couple
- Check your current version.
- You can check in the debug menu's `Utilities -> Expansion Version` option.
- If the option is not available, you possibly have version 1.6.2 or older. In that case, please check the [changelogs](CHANGELOG.md) to determine your version based on the features available on your repository.
- Once you have your remote set up, run the command `git pull RHH expansion/X.Y.Z`, replacing X, Y and Z with the digits of the respective version you want to update to (eg, to update to 1.8.4, use `git pull RHH expansion/1.8.4`).
- Once you have your remote set up, run the command `git pull RHH expansion/X.Y.Z`, replacing X, Y and Z with the digits of the respective version you want to update to (eg, to update to 1.9.2, use `git pull RHH expansion/1.9.2`).
- ***Important:*** If you are several versions behind, we recommend updating one minor version at a time, skipping directly to the latest patch version (eg, 1.5.3 -> 1.6.2 -> 1.7.4 and so on)
- Alternatively, you can update to unreleased versions of the expansion.
- ***master (stable):*** It contains unreleased **bugfixes** that will come in the next patch version. To merge, use `git pull RHH master`.

18
asm/macros/event.inc
View file

@ -2105,15 +2105,15 @@
@ The rest of the arguments are the stat change values to each stat.
@ For example, giving the first opponent +1 to atk and -2 to speed would be: settotemboost B_POSITION_OPPONENT_LEFT, 1, 0, -2
.macro settotemboost battler:req, atk=0,def=0,speed=0,spatk=0,spdef=0,acc=0,evas=0
setvar VAR_0x8000, \battler
setvar VAR_0x8001, \atk
setvar VAR_0x8002, \def
setvar VAR_0x8003, \speed
setvar VAR_0x8004, \spatk
setvar VAR_0x8005, \spdef
setvar VAR_0x8006, \acc
setvar VAR_0x8007, \evas
special SetTotemBoost
callnative ScriptSetTotemBoost
.2byte \battler
.2byte \atk
.2byte \def
.2byte \speed
.2byte \spatk
.2byte \spdef
.2byte \acc
.2byte \evas
.endm
@ useful totem boost macros

8
data/battle_anim_scripts.s
View file

@ -28451,7 +28451,7 @@ gBattleAnimGeneral_MegaEvolution::
delay 20
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA
waitforvisualfinish
createvisualtask AnimTask_TransformMon, 2, 1, 0
createvisualtask AnimTask_HideSwapSprite, 2, 1, 0
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 5, 14
waitforvisualfinish
@ -28642,7 +28642,7 @@ General_PrimalReversion_Alpha:
delay 20
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA
waitforvisualfinish
createvisualtask AnimTask_TransformMon, 2, 1, 0
createvisualtask AnimTask_HideSwapSprite, 2, 1, 0
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 5, 14
waitforvisualfinish
@ -28669,7 +28669,7 @@ General_PrimalReversion_Omega:
delay 20
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA
waitforvisualfinish
createvisualtask AnimTask_TransformMon, 2, 1, 0
createvisualtask AnimTask_HideSwapSprite, 2, 1, 0
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 5, 14
waitforvisualfinish
@ -28705,7 +28705,7 @@ gBattleAnimGeneral_UltraBurst::
call LightThatBurnsTheSkyGreenSparks
delay 20
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA
createvisualtask AnimTask_TransformMon, 2, 1, 0
createvisualtask AnimTask_HideSwapSprite, 2, 1, 0
createsprite gUltraBurstSymbolSpriteTemplate, ANIM_ATTACKER, 0x0, 0x0, 0x0, 0x0, 0x0
waitforvisualfinish
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA

62
data/battle_scripts_1.s
View file

@ -3279,51 +3279,17 @@ BattleScript_RoarBlockedByDynamax:
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_MultiHitLoop::
jumpifhasnohp BS_ATTACKER, BattleScript_MultiHitEnd
jumpifhasnohp BS_TARGET, BattleScript_MultiHitPrintStrings
jumpifhalfword CMP_EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoMultiHit
jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_MultiHitPrintStrings
BattleScript_DoMultiHit::
movevaluescleanup
copyhword sMOVE_EFFECT, sMULTIHIT_EFFECT
critcalc
damagecalc
jumpifmovehadnoeffect BattleScript_MultiHitNoMoreHits
adjustdamage
attackanimation
waitanimation
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
waitmessage B_WAIT_TIME_LONG
multihitresultmessage
flushtextbox
addbyte sMULTIHIT_STRING + 4, 1
moveendto MOVEEND_NEXT_TARGET
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_MultiHitPrintStrings
decrementmultihit BattleScript_MultiHitLoop
goto BattleScript_MultiHitPrintStrings
BattleScript_MultiHitNoMoreHits::
pause B_WAIT_TIME_SHORT
BattleScript_MultiHitPrintStrings::
resultmessage
waitmessage B_WAIT_TIME_LONG
jumpifmovehadnoeffect BattleScript_MultiHitEnd
copyarray gBattleTextBuff1, sMULTIHIT_STRING, 6
printstring STRINGID_HITXTIMES
waitmessage B_WAIT_TIME_LONG
return
BattleScript_MultiHitEnd::
setadditionaleffects
tryfaintmon BS_TARGET
moveendcase MOVEEND_SYNCHRONIZE_TARGET
moveendfrom MOVEEND_STATUS_IMMUNITY_ABILITIES
end
BattleScript_ScaleShot::
call BattleScript_MultiHitPrintStrings
goto BattleScript_DefDownSpeedUp
BattleScript_EffectConversion::
attackcanceler
@ -7001,12 +6967,12 @@ BattleScript_WishMegaEvolution::
BattleScript_PrimalReversion::
call BattleScript_PrimalReversionRet
end2
end3
BattleScript_PrimalReversionRestoreAttacker::
call BattleScript_PrimalReversionRet
copybyte gBattlerAttacker, sSAVED_BATTLER
end2
end3
BattleScript_PrimalReversionRet::
flushtextbox
@ -7715,15 +7681,11 @@ BattleScript_EmergencyExitWildNoPopUp::
BattleScript_TraceActivates::
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUp
call BattleScript_AbilityPopUpScripting
printstring STRINGID_PKMNTRACED
waitmessage B_WAIT_TIME_LONG
settracedability BS_SCRIPTING
switchinabilities BS_SCRIPTING
return
BattleScript_TraceActivatesEnd3::
call BattleScript_TraceActivates
end3
BattleScript_ReceiverActivates::
@ -9410,6 +9372,16 @@ BattleScript_ZMoveActivateStatus::
copybyte sSTATCHANGER, sSAVED_STAT_CHANGER
return
BattleScript_ZMoveActivatePowder::
flushtextbox
trytrainerslidezmovemsg
savetarget
printstring STRINGID_ZPOWERSURROUNDS
playanimation BS_ATTACKER, B_ANIM_ZMOVE_ACTIVATE, NULL
setzeffect
restoretarget
goto BattleScript_MoveUsedPowder
BattleScript_ZEffectPrintString::
printfromtable gZEffectStringIds
waitmessage B_WAIT_TIME_LONG
@ -10041,7 +10013,7 @@ BattleScript_BerserkGeneRet_End:
BattleScript_BoosterEnergyEnd2::
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, sB_ANIM_ARG1
call BattleScript_AbilityPopUpTarget
call BattleScript_AbilityPopUpScripting
printstring STRINGID_BOOSTERENERGYACTIVATES
waitmessage B_WAIT_TIME_MED
printstring STRINGID_STATWASHEIGHTENED

1
data/specials.inc
View file

@ -534,7 +534,6 @@ gSpecials::
def_special RemoveRecordsWindow
def_special CloseDeptStoreElevatorWindow
def_special TrySetBattleTowerLinkType
def_special SetTotemBoost
def_special TrySpecialOverworldEvo
def_special GetNumberSprayStrength
def_special GetSprayId

2
docs/SUMMARY.md
View file

@ -19,6 +19,8 @@
- [How to use the Testing System](./how_to_testing_system.md)
- [Changelog](./CHANGELOG.md)
- [1.9.x]()
- [Version 1.9.2](changelogs/1.9.x/1.9.2.md)
- [Version 1.9.1](changelogs/1.9.x/1.9.1.md)
- [Version 1.9.0](changelogs/1.9.x/1.9.0.md)
- [1.8.x]()
- [Version 1.8.6](changelogs/1.8.x/1.8.6.md)

2
docs/changelogs/1.9.x/1.9.0.md
View file

@ -551,6 +551,6 @@
* @rayrobdod made their first contribution in https://github.com/rh-hideout/pokeemerald-expansion/pull/4727
* @innocenthedgehog made their first contribution in https://github.com/rh-hideout/pokeemerald-expansion/pull/4988
**Full Changelog**: https://github.com/rh-hideout/pokeemerald-expansion/compare/expansion/1.8.5...expansion/1.9.0
**Full Changelog**: https://github.com/rh-hideout/pokeemerald-expansion/compare/expansion/1.8.6...expansion/1.9.0
<!--Last PR: 5060-->

4
docs/changelogs/1.9.x/1.9.1.md
View file

@ -120,14 +120,14 @@
* Improved 1.8 ⇒ 1.9 non-Competitive syntax migration instructions by @mrgriffin in [#5079](https://github.com/rh-hideout/pokeemerald-expansion/pull/5079)
## 📦 Branch Synchronisation 📦
### pret
### pret's base pokeemerald
* 5th of August in [#5098](https://github.com/rh-hideout/pokeemerald-expansion/pull/5098)
* Fixed bottom half of Mt. Pyre not being labeled in PokeNav by @fdeblasio in [pret#2018](https://github.com/pret/pokeemerald/pull/2018)
* 7th of August in [#5116](https://github.com/rh-hideout/pokeemerald-expansion/pull/5116)
* Changed type1 and type2 to be consistent by @pkmnsnfrn in [pret#2021](https://github.com/pret/pokeemerald/pull/2021)
* 14th of August in [#5165](https://github.com/rh-hideout/pokeemerald-expansion/pull/5165)
* Fix type for offset in MapConnection by @GriffinRichards in [pret#2011](https://github.com/pret/pokeemerald/pull/2011)
### Followers
### merrp/aarant's followers
* 7th of August in [#5110](https://github.com/rh-hideout/pokeemerald-expansion/pull/5110)
* Fixed expanded OW IDs by @pkmnsnfrn in [aarant#38](https://github.com/aarant/pokeemerald/pull/38)
* Fix two small text errors in follower dialogue by @Bassoonian in [aarant#39](https://github.com/aarant/pokeemerald/pull/39)

202
docs/changelogs/1.9.x/1.9.2.md Normal file
View file

@ -0,0 +1,202 @@
# Version 1.9.2
```md
## How to update
- If you haven't set up a remote, run the command `git remote add RHH https://github.com/rh-hideout/pokeemerald-expansion`.
- Once you have your remote set up, run the command `git pull RHH expansion/1.9.2`.
```
## 🌋 *REFACTORS* 🌋
📜 = Uses a migration script.
* Remove unused `BattleScript_WindPowerActivatesEnd2` in [#5257](https://github.com/rh-hideout/pokeemerald-expansion/pull/5257)
* Refactored in-battle disobedience to fix bug in [#5245](https://github.com/rh-hideout/pokeemerald-expansion/pull/5245)
## 💥 *Hardlock/Softlock/Crash/Compiling fixes* 💥
* Fixed hardlock when Hyperspace Fury is used by Hoopa Unbound by @AlexOn1ine in [#5237](https://github.com/rh-hideout/pokeemerald-expansion/pull/5237)
* Fixed compile error when `OW_POKEMON_OBJECT_EVENTS` is `TRUE` but `P_HISUIAN_FORMS` is `FALSE` around Basculin by @hjk321 in [#5256](https://github.com/rh-hideout/pokeemerald-expansion/pull/5256)
* Fixed hardlock when the AI cannot choose moves due to its opponent having Wonder Guard by @Pawkkie and Wiz in [#5317](https://github.com/rh-hideout/pokeemerald-expansion/pull/5317)
* Fixed multiple Pledge move hardlocks
* Fixed potential hardlock when attempting to use Pledge moves on the same turn that the user would wake up by @PhallenTree in [#5330](https://github.com/rh-hideout/pokeemerald-expansion/pull/5330)
* Fixed hardlock when the opponent's combo doesn't happen when cancelled by sleep by @hedara90 and @PhallenTree in [#5339](https://github.com/rh-hideout/pokeemerald-expansion/pull/5339)
* Fixes hardlock when the opponent's combo doesn't happen when cancelled by freeze by @PhallenTree in [#5340](https://github.com/rh-hideout/pokeemerald-expansion/pull/5340)
* Fixed hardlock when the opponent's combo doesn't happen when cancelled by Powder by @hedara90 in [#5341](https://github.com/rh-hideout/pokeemerald-expansion/pull/5341)
## 🧬 General 🧬
### Fixed
* Fixed loading into the wrong version of a map after saving in areas with multiple layouts by @hedara90 in [#5347](https://github.com/rh-hideout/pokeemerald-expansion/pull/5347)
## 🐉 Pokémon 🐉
### Added
* Added `OVERWORLD_SET_ANIM` macro to allow using custom animation tables for Overworld Pokémon by @hedara90 in [#5309](https://github.com/rh-hideout/pokeemerald-expansion/pull/5309)
* Added asymetrical Farfetch'd sprites using a previously unused table from merrp's followers branch.
* Added unique sprites for overworld Pumpkaboo and Gourgeist forms by @hedara90 in [#5390](https://github.com/rh-hideout/pokeemerald-expansion/pull/5390)
* Added missing Sirfetch'd competitive alias (`SPECIES_SIRFETCH_D`) by @cawtds in [#5283](https://github.com/rh-hideout/pokeemerald-expansion/pull/5283)
* Added Paldean Wooper and Clodsire overworld sprites by @Cafeei in [#5277](https://github.com/rh-hideout/pokeemerald-expansion/pull/5277)
* Added missing Gen 9 Overworld sprites by @Liamjd14 in [#5304](https://github.com/rh-hideout/pokeemerald-expansion/pull/5304)
* Original sprites by Darkus_Shadow, Princess-Phoenix, shaderr31, Molfang62, CarmaNekko, EduarPokeN, Larryturbo, TyranitarDark and Anarlaurendil
* Sources:
* Normal: https://www.deviantart.com/darkusshadow/art/Gen-9-Paldea-Pokemon-Overworld-Sprites-967776690
* Shiny: https://www.deviantart.com/darkusshadow/art/SHINY-Gen-9-Paldea-Pokemon-Overworld-Sprites-967779547
* Added missing overworld sprites by @Liamjd14 in [#5336](https://github.com/rh-hideout/pokeemerald-expansion/pull/5336)
* **New Sprites:**
* Oricorio Pom Pom/Pa'U/Sensu, Zygarde 10%/Complete and Original Color Magearna
* Credits to: Princess-Phoenix, Larryturbo, Kidkatt, Zender1752 and SageDeoxys.
* Black/White Kyurem
* Credits to: Larryturbo.
* Shaymin Sky and Therian Tornadus/Thundurus/Landorus
* Credits to: @Liamjd14
* **Using their base form's sprites**
* Totem Raticate/Mimikyu/Marowak and Partner Pikachu/Eevee
* Added Added asymmetrical overworld sprites by @Liamjd14 in [#5336](https://github.com/rh-hideout/pokeemerald-expansion/pull/5336)
* Slowbro (Galarian), Tinkatink, Tinkatuff, Tinkaton and Scovillain
* Enabled in `gSpeciesInfo` by @Liamjd14 in [#5385](https://github.com/rh-hideout/pokeemerald-expansion/pull/5385)
### Changed
* Improved Garganacl and Naclstack battle sprites by using the ones from @CyanSMP64's repo by @kittenchilly in [#5142](https://github.com/rh-hideout/pokeemerald-expansion/pull/5142)
* Improved both shiny Indeedee by @Cafeei in [#5285](https://github.com/rh-hideout/pokeemerald-expansion/pull/5285)
* Shiny Combusken now uses its Gen8+ palette by @Cafeei in [#5333](https://github.com/rh-hideout/pokeemerald-expansion/pull/5333)
### Fixed
* Reenabled unused female Indeedee overworld sprite by @Cafeei in [#5285](https://github.com/rh-hideout/pokeemerald-expansion/pull/5285)
* Fixed G-Max Corviknight and Centiskorch's expanded names by @PhallenTree in [#5296](https://github.com/rh-hideout/pokeemerald-expansion/pull/5296)
* Fixed G-Max Cinderace back sprite by @hedara90 in [#5295](https://github.com/rh-hideout/pokeemerald-expansion/pull/5295)
* Fixed Shiny Mothim' by @Cafeei in [#5333](https://github.com/rh-hideout/pokeemerald-expansion/pull/5333)
* Fixed multiple battle sprite issues by @kittenchilly in [#5142](https://github.com/rh-hideout/pokeemerald-expansion/pull/5142)
* **Sprite issues:**
* Bombirdier, Mega Absol/Aerodactyl/Latias/Latios/Salamence, Orthworm and Veluza.
* **Shiny issues:**
* Bombirdier, Kilowattrel, Landorus, Magearna, Mega Diancie/Medicham, Galarian Ponyta, Shroodle, Spidops and Wattrel.
* Fixed multiple overworld Pokémon sprites - Part 1 by @Cafeei in [#5241](https://github.com/rh-hideout/pokeemerald-expansion/pull/5241)
* **"Blinking pixels":**
* Dwebble, Krookodile, Servine, Throh and Vulpix.
* **Shiny Palettes**
* Crustle, Excadrill, Lillipup, Serperior, Servine, Sigilyph, Swoobat, Tranquil and Venipede.
* **Misc fixes:**
* Archen, Basculin, Blitzle, Crustle, Escavalier, Krokorok, Krookodile, Sawsbuck, secondary, Serperior, Snivy, Throh, Woobat, Zebstrika
* Fixed multiple overworld Pokémon sprites - Part 2 by @Cafeei in [#5333](https://github.com/rh-hideout/pokeemerald-expansion/pull/5333)
* **Palette Fixes:**
* Shiny Riolu/Snover, Oshawott, Kabutops, Shieldon, Kingler and Groudon.
* **Fixed "Blinking pixels":**
* Abomasnow, Aggron, Alakazam, Ariados, Articuno, Azumarill, Barboach, Bayleef, Bibarel, Blastoise, Celebi, Charmeleon, Cherrim, Chinchou, Cloyster, Corphish, Corsola, Crawdaunt, Cubone, Dewott, Doduo, Dusknoir, Electabuzz, Espeon, Exeggcute, Farfetch'd, Feraligatr, Flaafy, Flareon, Floatzel, Furret, Gastly, Girafarig, Giratina, Gligar, Gloom, Golbat, Grumpig, Hariyama, Heatran (just reduced), Hoppip, Jolteon, Jumpluff, Kricketot, Larvitar, Leafeon, Lileep, Lumineon, Luxio, Luxray, Machamp, Magneton, Mantine, Mantyke, Marowak, Meowth, Mesprit, Mew, Mewtwo, Mime Jr, Moltres, Numel, Oshawott, Phione, Pinsir, Politoed, Porygon-Z, Probopass, Quilava, Qwilfish, Rampardos, Rapidash, Regirock, Sceptile, Scizor, Seel, Shieldon, Shiftry, Slowking, Smoochum, Sneasel, Spheal, Steelix, Sudowoodo, Suicune, Swellow, Swinub, Tentacruel, Togekiss, Togepi, Vaporeon, Vibrava, Wartortle, Wooper, Yanma, Yanma, Yanmega, Zangoose, Zapdos, Zubat
* **Misc. Sprite Fixes**: Dewott, Misdreavus, Oshawott, Torkoal and Victini.
* Overworld sprite fixes by @Liamjd14 (with help from @hedara90 to solve conflicts) in [#5334](https://github.com/rh-hideout/pokeemerald-expansion/pull/5334)
* **Palette Fixes**: Shieldon.
* **Misc. Sprite Fixes** Torkoal.
* **"Blinking pixels":**
* Ambipom, Armaldo, Crawdaunt, Crobat, Donphan, Flaaffy, Flygon, Grovyle, Hoppip, Igglybuff, Illumise, Jumpluff, Ledian, Ledyba, Mamoswine, Mantine, Marshtomp, Meganium, Mightyena, Miltank, Numel, Prinplup, Raikou, Roserade, Skarmory, Skiploom, Spinarak, Staraptor, Stunky, Torkoal, Wooper, Xatu, Yanma
* Overworld Pokémon sprite changes by @Liamjd14 in [#5336](https://github.com/rh-hideout/pokeemerald-expansion/pull/5336)
* **Fixed "blinking pixels":**
* Alolan Graveler/Golem/Alolan/Ninetales
* Dawn Wings Necrozma
* Hisuian Growlithe/Arcanine
* Winter Sawsbuck
* **Added missing Shiny Palettes**
* Calyrex Ice/Shadow Rider, Origin Dialga/Palkia, White-Striped Basculin, Therian Enamorus and Low-Key Toxtricity.
* **Removed Gigantamax Low-Key Toxtricity using base Low-Key follower sprites.**
* **Fixed Shiny palettes**
* Alolan Marowak/Raichu, Eternal Flower Floette, Flabébé (All), Galarian Ponyta/Rapidash
* Typhlosion-Hisui follower shiny stomach color wrong - done
* **Other sprite/palette fixes**
* Alolan Exeggutor/Marowak/Persian/Raichu/Sandshrew, Hisuian Sligoo/Goodra and Winter Sawsbuck.
## ⚔️ Battle General ⚔️ ##
### Changed
* Updated Damage Category icons to match Gen6+ colors by @kittenchilly in [#5080](https://github.com/rh-hideout/pokeemerald-expansion/pull/5080)
### Fixed
* Fixed Slateport Battle Tent/Battle Factory issues by @SarnPoke in [#5281](https://github.com/rh-hideout/pokeemerald-expansion/pull/5281)
* Choosing the "SWAP" option no longer shows invalid Pokémon ("??????????").
* Reloading after choosing "REST" no longer resets the player's challenge party to invalid Pokémon ("??????????").
* Fixed Starting Status happening Wild Battles from a previous Trainer Battle by @PhallenTree in [#5248](https://github.com/rh-hideout/pokeemerald-expansion/pull/5248)
* Fixed bugged behavior caused by Z-Moves and disobedience by @hedara90 in [#5245](https://github.com/rh-hideout/pokeemerald-expansion/pull/5245)
* Fixed Entry Hazards targeting wrong side of the field if the opponent fainted by @PhallenTree in [#5262](https://github.com/rh-hideout/pokeemerald-expansion/pull/5262)
* Fixed being able to use multiple of the same Gimmick in Double Battles by @AgustinGDLV in [#5235](https://github.com/rh-hideout/pokeemerald-expansion/pull/5235)
* Fixed Terastallization not granting immunity to Tar Shot by @AlexOn1ine in [#5302](https://github.com/rh-hideout/pokeemerald-expansion/pull/5302)
* Fixed `Cmd_trainerslidein/out` using the incorrect function by @ghoulslash in [#5326](https://github.com/rh-hideout/pokeemerald-expansion/pull/5326)
* Cleanup by @hedara90 in [#5344](https://github.com/rh-hideout/pokeemerald-expansion/pull/5344)
## 🤹 Moves 🤹
### Added
* Added Charge's Gen 9 behavior via `B_CHARGE` config by @AlexOn1ine in [#5274](https://github.com/rh-hideout/pokeemerald-expansion/pull/5274)
* Added Powder's Gen 7+ behavior of not causing damage when under Heavy Rain via `B_POWDER_RAIN` by @PhallenTree in [#5370](https://github.com/rh-hideout/pokeemerald-expansion/pull/5370)
### Fixed
* Fixed move descriptions missing periods (Decorate, Collision Course, Electro Drift) by @Pawkkie and Kasen in [#5221](https://github.com/rh-hideout/pokeemerald-expansion/pull/5221)
* Fixed Confide not being blocked by Crafty Shield interaction by @hedara90 in [#5202](https://github.com/rh-hideout/pokeemerald-expansion/pull/5202)
* Fixed message for switch out moves by @kittenchilly in [#5258](https://github.com/rh-hideout/pokeemerald-expansion/pull/5258)
* Fixed Ice Fang's descriptions using the opposite of what they're supposed to do based on `B_USE_FROSTBITE` by @laserXdolphin in [#5273](https://github.com/rh-hideout/pokeemerald-expansion/pull/5273)
* Fixes to Instruct by @PhallenTree in [#5262](https://github.com/rh-hideout/pokeemerald-expansion/pull/5262)
* Fixed Instruct bypassing AtkCanceler checks (Instruct allowed the target to act while asleep, flinched, etc.) and its interaction with First Turn Only moves (Fake Out, First Impression, Mat Block).
* Fixed Instruct's animation using the attacker and target of the called move.
* Fixed Scale Shot's effect not activating if the opponent fainted before all hits finished by @AlexOn1ine in [#5292](https://github.com/rh-hideout/pokeemerald-expansion/pull/5292)
* Fixed Round not preserving turn order for non-Round users if there's a switch out at the beginning of the turn by @AlexOn1ine in [#5292](https://github.com/rh-hideout/pokeemerald-expansion/pull/5292)
* Fixed Max Moves ignoring absorbing abilities (+ test) by @PhallenTree in [#5296](https://github.com/rh-hideout/pokeemerald-expansion/pull/5296)
* Fixed attack string for Max Moves not being printed if it's blocked by Max Guard by @hedara90 in [#5312](https://github.com/rh-hideout/pokeemerald-expansion/pull/5312)
* Fixed some Pledge move combo issues by @PhallenTree in [#5330](https://github.com/rh-hideout/pokeemerald-expansion/pull/5330)
* Fixed Pledge move combos attempting to be executed multiple times in a turn, causing mons to decrement sleep timer multiple times during the turn or causing infinite loops.
* Fixed potential issue with custom non-sound moves that use `EFFECT_ATTACK_UP_USER_ALLY` or `EFFECT_PERISH_SONG` being blocked by Soundproof anyway by @AlexOn1ine in [#5301](https://github.com/rh-hideout/pokeemerald-expansion/pull/5301)
* Fixed Pledge combinations not being absorbed by absorption Abilities (Sap Sipper, Storm Drain, etc.) by @hedara90 in [#5364](https://github.com/rh-hideout/pokeemerald-expansion/pull/5364)
* Fixed Toxic Thread decreasing speed by 2 stages instead of 1 by @AsparagusEduardo in [#5369](https://github.com/rh-hideout/pokeemerald-expansion/pull/5369)
* Fixed Destiny Bond not working if the user was fainted by a multi-Hit move's non-first hit by @AlexOn1ine in [#5377](https://github.com/rh-hideout/pokeemerald-expansion/pull/5377)
* Fixed Powder interactions by @PhallenTree in [#5370](https://github.com/rh-hideout/pokeemerald-expansion/pull/5370)
* Fixed Magic Guard not protecting against Powder's secondary damage when using a Fire-type move.
* Fixed Fire/Water Pledge combination being cancelled by Powder.
* Fixed Fire Z-Moves not playing their animations and not granting their secondary effects when the user is under Powder's effect
* Fixed After You/Shell Trap not updating battlers' actions correctly by @PhallenTree in [#5384](https://github.com/rh-hideout/pokeemerald-expansion/pull/5384)
## 🎭 Abilities 🎭
### Fixed
* Fixed weather abilities not activating when Cloud Nine user leaves the field by @AlexOn1ine in [#5209](https://github.com/rh-hideout/pokeemerald-expansion/pull/5209)
* Fixed missing `break` for Poison Puppeteer's code by @u8-Salem in [#5243](https://github.com/rh-hideout/pokeemerald-expansion/pull/5243)
* Fixed Pokémon with Purifying Salt being poisoned by Toxic Spikes by @AlexOn1ine in [#5252](https://github.com/rh-hideout/pokeemerald-expansion/pull/5252)
* Fixed Parental Bond not affecting Snore by @hedara90 in [#5264](https://github.com/rh-hideout/pokeemerald-expansion/pull/5264)
* Fixed Tera Shift's description by @AsparagusEduardo in [#5351](https://github.com/rh-hideout/pokeemerald-expansion/pull/5351)
## 🧶 Items 🧶
### Fixed
* Fixed berries missing their timing after passive damage by @AlexOn1ine in [#5300](https://github.com/rh-hideout/pokeemerald-expansion/pull/5300)
* Fixed Micle Berry not increasing accuracy on the next turn by @AlexOn1ine in [#5358](https://github.com/rh-hideout/pokeemerald-expansion/pull/5358)
## 🤖 Battle AI 🤖
### Changed
* AI is encouraged to use "always crit" moves on partner with Anger Point by @SarnPoke in [#5244](https://github.com/rh-hideout/pokeemerald-expansion/pull/5244)
### Fixed
* Fixed AI not seeing the power of Max Moves by @AlexOn1ine in [#5299](https://github.com/rh-hideout/pokeemerald-expansion/pull/5299)
* Fixed minor wrong order in `AI_CalcDamage` that made Nature Power not be considered for Z-Moves by @AlexOn1ine in [#5155](https://github.com/rh-hideout/pokeemerald-expansion/pull/5155)
* Fixed AI not considering Tera Blast/Tera Storm by @AlexOn1ine in [#5155](https://github.com/rh-hideout/pokeemerald-expansion/pull/5155)
* Fixed `AI_IsMoveEffectInPlus` reading the incorrect stat for secondary effects that reduce stats by 2 stages by @ghoulslash and @Pawkkie in [#5366](https://github.com/rh-hideout/pokeemerald-expansion/pull/5366)
## 🧹 Other Cleanup 🧹
### Changed
* Remove unused `BattleScript_WindPowerActivatesEnd2` signature by @u8-Salem in [#5257](https://github.com/rh-hideout/pokeemerald-expansion/pull/5257)
* Replaced all usages of tabs in C files with spaces by @hedara90 in [#5261](https://github.com/rh-hideout/pokeemerald-expansion/pull/5261)
* Fixed missing `break`s in two `ENDTURN` cases by @ghoulslash in [#5350](https://github.com/rh-hideout/pokeemerald-expansion/pull/5350)
* `ShouldSwitchIfWonderGuard` cleanup by @Pawkkie in [#5383](https://github.com/rh-hideout/pokeemerald-expansion/pull/5383)
## 🧪 Test Runner 🧪
### Added
* Added missing Adaptability, Aerilate, Aftermath tests by @kittenchilly in [#5242](https://github.com/rh-hideout/pokeemerald-expansion/pull/5242)
* Added missing Disguise tests by @hedara90 in [#5249](https://github.com/rh-hideout/pokeemerald-expansion/pull/5249)
* Added some missing Instruct tests by @PhallenTree in [#5262](https://github.com/rh-hideout/pokeemerald-expansion/pull/5262)
* Added missing Powder tests by @PhallenTree in [#5370](https://github.com/rh-hideout/pokeemerald-expansion/pull/5370)
* Added `ShouldSwitchIfWonderGuard` AI tests by @Pawkkie in [#5383](https://github.com/rh-hideout/pokeemerald-expansion/pull/5383)
### Changed
* Moved `ASSUME`s to inside `GIVEN` blocks to prevent them from being added correctly to the totals in the test summary by @AsparagusEduardo in [#5308](https://github.com/rh-hideout/pokeemerald-expansion/pull/5308)
## 📚 Documentation 📚
### Fixed
* Fixed test system documentation saying that `make check TESTS="Spikes"` could be done with single quotes instead of double quotes by @AsparagusEduardo in [#5266](https://github.com/rh-hideout/pokeemerald-expansion/pull/5266)
## 📦 Branch Synchronisation 📦
### pret's base pokeemerald
* N/A
### merrp/aarant's followers
* Merrp merge (September 9th) by @AsparagusEduardo in [#5359](https://github.com/rh-hideout/pokeemerald-expansion/pull/5359)
* aarant#40 (discarded, as it was already part of the expansion)
* New features:
* [Static OW pokemon now bob while walking in place](https://github.com/rh-hideout/pokeemerald-expansion/commit/839cf2e79012e0fc9159af5ab9e6a497e86bbfa4)
* Toggled by `OW_FOLLOWERS_BOBBING`.
* [Added `OW_MON_WANDER_WALK` config option](https://github.com/rh-hideout/pokeemerald-expansion/commit/42d9f24c8472a67d742d9d9da106480c84514336)
* If true, OW pokemon with `MOVEMENT_TYPE_WANDER*` will walk-in-place in between steps.
## New Contributors
* @laserXdolphin made their first contribution in [#5273](https://github.com/rh-hideout/pokeemerald-expansion/pull/5273)
* @Liamjd14 made their first contribution in [#5304](https://github.com/rh-hideout/pokeemerald-expansion/pull/5304)
**Full Changelog**: https://github.com/rh-hideout/pokeemerald-expansion/compare/expansion/1.9.1...expansion/1.9.2
<!--Last PR: 5390-->

11
docs/changelogs/template.md
View file

@ -10,7 +10,7 @@
📜 = Uses a migration script.
* N/A
## 💥 *Softlock/Crash fixes* 💥
## 💥 *Hardlock/Softlock/Crash/Compiling fixes* 💥
* N/A
## 🧬 General 🧬
@ -122,6 +122,14 @@
### Fixed
* N/A
## 📚 Documentation 📚
### Added
* N/A
### Changed
* N/A
### Fixed
* N/A
## 📦 Branch Synchronisation 📦
### pret's base pokeemerald
* N/A
@ -135,3 +143,4 @@
**Full Changelog**: https://github.com/rh-hideout/pokeemerald-expansion/compare/expansion/1.Y.Z...expansion/1.Y.Z
<!--Last PR: ____-->
<!--Used to keep track of the last PR merged in case new ones come in before the changelog is done.-->

BIN
graphics/pokemon/arcanine/hisuian/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1 KiB

6
graphics/pokemon/basculin/white_striped/overworld_shiny.pal
View file

@ -6,13 +6,13 @@ JASC-PAL
255 255 255
172 197 255
0 0 0
32 139 65
80 112 40
16 98 41
123 172 172
172 222 230
41 189 90
120 168 56
74 74 74
90 90 90
64 80 80
57 74 82
123 148 197
123 148 189

BIN
graphics/pokemon/calyrex/ice_rider/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

8
graphics/pokemon/calyrex/ice_rider/overworld_shiny.pal
View file

@ -7,13 +7,13 @@ JASC-PAL
0 37 32
146 175 206
183 206 229
0 75 65
0 88 72
52 69 167
66 119 111
0 112 96
100 100 100
242 242 242
64 83 103
216 215 206
208 200 144
0 0 0
169 160 155
168 136 88
191 191 191

BIN
graphics/pokemon/calyrex/shadow_rider/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

2
graphics/pokemon/calyrex/shadow_rider/overworld_normal.pal
View file

@ -8,7 +8,7 @@ JASC-PAL
246 242 246
65 64 74
32 36 65
49 68 164
0 75 65
213 210 205
0 32 24
148 174 205

6
graphics/pokemon/calyrex/shadow_rider/overworld_shiny.pal
View file

@ -8,12 +8,12 @@ JASC-PAL
246 242 246
65 64 74
32 36 65
49 68 164
213 210 205
0 88 72
208 200 144
0 32 24
148 174 205
74 52 148
172 161 156
168 136 88
98 101 98
24 16 65
49 36 115

16
graphics/pokemon/dialga/origin/overworld_shiny.pal
View file

@ -1,19 +1,19 @@
JASC-PAL
0100
16
98 182 49
0 40 128
0 0 0
65 129 255
189 32 16
246 80 65
57 121 180
98 121 139
32 64 106
16 56 90
24 64 106
156 172 115
8 106 123
8 106 123
8 148 156
189 202 222
32 89 148
139 161 180
156 210 246
8 148 156
115 189 156
156 246 148
16 16 16
24 40 49

10
graphics/pokemon/enamorus/overworld_shiny.pal
View file

@ -4,16 +4,16 @@ JASC-PAL
41 165 49
0 0 0
164 133 41
230 117 156
189 60 90
172 72 82
230 131 164
255 90 0
189 82 106
238 234 255
32 36 32
57 60 57
205 202 222
148 32 24
164 24 24
255 198 57
16 16 16
246 85 139
255 139 238
82 80 90
115 48 57

BIN
graphics/pokemon/enamorus/therian/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

10
graphics/pokemon/enamorus/therian/overworld_shiny.pal
View file

@ -6,14 +6,14 @@ JASC-PAL
118 50 58
232 232 248
200 200 216
224 116 156
174 74 87
213 106 156
213 65 57
16 16 16
243 46 46
199 46 41
74 74 74
147 33 30
243 84 143
187 62 94
238 131 230
203 0 128
247 238 76
255 197 60
0 0 0

BIN
graphics/pokemon/exeggutor/alolan/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
graphics/pokemon/flabebe/blue_flower/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 735 B

After

Width:  |  Height:  |  Size: 668 B

4
graphics/pokemon/flabebe/blue_flower/overworld_shiny.pal
View file

@ -12,8 +12,8 @@ JASC-PAL
221 181 0
243 86 75
21 44 77
69 66 127
31 95 31
70 144 248
154 149 228
184 216 153
96 90 188
0 0 0

BIN
graphics/pokemon/flabebe/orange_flower/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 735 B

After

Width:  |  Height:  |  Size: 670 B

4
graphics/pokemon/flabebe/orange_flower/overworld_shiny.pal
View file

@ -12,8 +12,8 @@ JASC-PAL
221 181 0
243 86 75
171 61 1
69 66 127
31 95 31
253 145 59
154 149 228
184 216 153
96 90 188
0 0 0

BIN
graphics/pokemon/flabebe/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 706 B

After

Width:  |  Height:  |  Size: 663 B

4
graphics/pokemon/flabebe/overworld_shiny.pal
View file

@ -12,8 +12,8 @@ JASC-PAL
221 181 0
243 86 75
107 36 33
96 90 188
154 149 228
31 95 31
184 216 153
96 90 188
0 0 0
0 0 0

BIN
graphics/pokemon/flabebe/white_flower/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 707 B

After

Width:  |  Height:  |  Size: 666 B

4
graphics/pokemon/flabebe/white_flower/overworld_shiny.pal
View file

@ -11,8 +11,8 @@ JASC-PAL
232 153 2
221 181 0
243 86 75
69 66 127
154 149 228
31 95 31
184 216 153
96 90 188
0 0 0
0 0 0

BIN
graphics/pokemon/flabebe/yellow_flower/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 735 B

After

Width:  |  Height:  |  Size: 669 B

4
graphics/pokemon/flabebe/yellow_flower/overworld_shiny.pal
View file

@ -12,8 +12,8 @@ JASC-PAL
221 181 0
243 86 75
148 81 2
69 66 127
31 95 31
230 206 10
154 149 228
184 216 153
96 90 188
0 0 0

4
graphics/pokemon/floette/eternal_flower/overworld_shiny.pal
View file

@ -9,8 +9,8 @@ JASC-PAL
255 93 135
59 55 55
205 39 81
25 105 88
12 180 149
127 63 79
207 143 159
251 254 255
99 113 115
197 199 199

BIN
graphics/pokemon/golem/alolan/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 902 B

After

Width:  |  Height:  |  Size: 938 B

BIN
graphics/pokemon/goodra/hisuian/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 952 B

After

Width:  |  Height:  |  Size: 871 B

BIN
graphics/pokemon/gourgeist/large/overworld.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 895 B

BIN
graphics/pokemon/gourgeist/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 949 B

After

Width:  |  Height:  |  Size: 819 B

BIN
graphics/pokemon/gourgeist/small/overworld.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 619 B

BIN
graphics/pokemon/gourgeist/super/overworld.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
graphics/pokemon/graveler/alolan/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 698 B

After

Width:  |  Height:  |  Size: 749 B

BIN
graphics/pokemon/growlithe/hisuian/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 723 B

After

Width:  |  Height:  |  Size: 687 B

BIN
graphics/pokemon/kyurem/black/overworld.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

19
graphics/pokemon/kyurem/black/overworld_normal.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 18 128
16 16 16
40 40 40
48 48 42
56 56 56
72 72 72
71 86 86
96 96 96
248 232 8
144 136 120
239 173 74
72 72 72
136 152 144
184 176 152
179 204 187
232 232 248

19
graphics/pokemon/kyurem/black/overworld_shiny.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
125 146 158
16 16 16
40 40 40
48 48 42
57 62 66
72 72 72
71 86 86
48 80 56
240 64 180
96 128 108
194 52 146
72 72 72
173 228 247
184 176 152
122 147 201
232 232 248

BIN
graphics/pokemon/kyurem/white/overworld.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

19
graphics/pokemon/kyurem/white/overworld_normal.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
238 27 128
16 16 16
48 48 42
62 62 66
80 96 96
96 96 96
80 96 96
232 232 248
236 220 10
144 136 120
239 173 74
136 152 144
184 176 152
182 207 190
196 196 209
232 232 248

19
graphics/pokemon/kyurem/white/overworld_shiny.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
238 27 128
16 16 16
48 48 42
62 62 66
80 96 96
48 75 81
80 96 96
232 232 248
237 90 188
90 115 128
170 45 128
122 147 200
184 176 152
196 203 240
196 196 209
232 232 248

BIN
graphics/pokemon/landorus/therian/overworld.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

19
graphics/pokemon/landorus/therian/overworld_normal.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
84 86 84
109 127 139
237 237 246
198 198 211
22 37 14
142 85 23
219 152 23
246 131 142
87 78 43
212 99 49
225 80 74
38 37 38
214 195 61
0 0 0
0 0 0

19
graphics/pokemon/landorus/therian/overworld_shiny.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
103 64 40
103 128 140
237 237 246
160 184 160
22 37 14
158 97 23
248 160 40
229 89 32
38 37 38
158 97 23
229 89 32
38 37 38
214 195 61
0 0 0
0 0 0

BIN
graphics/pokemon/lycanroc/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 863 B

4
graphics/pokemon/lycanroc/overworld_normal.pal
View file

@ -1,12 +1,12 @@
JASC-PAL
0100
16
255 255 255
243 18 128
199 162 141
184 181 175
92 170 238
128 128 128
88 146 214
255 255 255
85 129 197
141 116 102
178 98 156

4
graphics/pokemon/lycanroc/overworld_shiny.pal
View file

@ -1,12 +1,12 @@
JASC-PAL
0100
16
255 255 255
243 18 128
136 168 200
184 181 175
92 170 238
128 128 128
88 146 214
255 255 240
85 129 197
96 120 176
248 152 136

BIN
graphics/pokemon/magearna/original_color/overworld.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 890 B

19
graphics/pokemon/magearna/original_color/overworld_normal.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
49 44 43
179 74 68
203 98 96
179 74 68
0 0 0
232 227 162
203 98 96
186 177 108
94 84 82
70 153 169
168 161 155
239 229 115
231 227 224
186 177 108
0 0 0

19
graphics/pokemon/magearna/original_color/overworld_shiny.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
49 44 43
90 85 84
216 120 144
179 74 68
0 0 0
206 200 197
135 129 126
153 146 143
105 93 91
70 153 169
168 161 155
232 220 110
206 200 197
167 157 71
0 0 0

BIN
graphics/pokemon/marowak/alolan/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 817 B

After

Width:  |  Height:  |  Size: 833 B

16
graphics/pokemon/marowak/alolan/overworld_normal.pal
View file

@ -7,13 +7,13 @@ JASC-PAL
72 72 72
0 0 0
216 224 224
81 51 79
50 142 66
211 248 121
48 48 80
40 216 176
160 248 240
52 35 51
112 71 82
4 107 56
48 189 120
137 86 133
170 130 145
112 64 80
40 216 176
24 168 136
80 72 136
168 128 144
172 229 196

18
graphics/pokemon/marowak/alolan/overworld_shiny.pal
View file

@ -7,13 +7,13 @@ JASC-PAL
72 72 72
0 0 0
216 224 224
67 58 109
50 142 66
211 248 121
54 49 81
67 67 67
4 107 56
48 189 120
101 87 164
112 112 112
96 64 136
40 216 176
160 248 240
52 35 51
40 32 32
40 216 176
24 168 136
136 96 192
64 48 48
172 229 196

BIN
graphics/pokemon/necrozma/dawn_wings/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
graphics/pokemon/ninetales/alolan/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 784 B

After

Width:  |  Height:  |  Size: 887 B

2
graphics/pokemon/ninetales/alolan/overworld_shiny.pal
View file

@ -2,7 +2,7 @@ JASC-PAL
0100
16
152 208 160
91 74 138
112 80 112
0 0 0
178 178 219
230 225 246

BIN
graphics/pokemon/oricorio/pau/overworld.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 590 B

19
graphics/pokemon/oricorio/pau/overworld_normal.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
32 32 32
192 173 154
252 234 216
144 128 112
104 59 68
239 183 188
184 142 145
0 0 0
191 137 141
199 132 137
242 106 141
135 104 106
237 243 238
230 97 131
255 190 197

19
graphics/pokemon/oricorio/pau/overworld_shiny.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
32 32 32
223 90 124
252 152 158
158 54 72
104 59 68
239 183 188
202 86 116
0 0 0
252 152 158
199 132 137
254 236 199
135 104 106
237 243 238
220 174 133
254 236 199

BIN
graphics/pokemon/oricorio/pom_pom/overworld.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 630 B

19
graphics/pokemon/oricorio/pom_pom/overworld_normal.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
0 0 0
244 234 66
175 167 45
72 58 37
240 224 112
161 150 73
215 201 100
135 104 106
105 101 27
184 142 145
237 243 238
87 87 87
237 183 187
135 104 106
255 237 191

19
graphics/pokemon/oricorio/pom_pom/overworld_shiny.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
0 0 0
240 240 240
207 207 207
72 65 54
240 224 112
161 150 73
215 201 100
135 135 135
135 135 135
184 142 145
237 243 238
87 87 87
246 190 194
135 104 106
255 237 191

BIN
graphics/pokemon/oricorio/sensu/overworld.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 740 B

19
graphics/pokemon/oricorio/sensu/overworld_normal.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
27 64 78
210 249 248
55 97 92
240 230 248
0 0 0
162 232 232
60 61 86
169 171 225
148 148 250
184 142 145
122 124 160
246 190 194
229 177 181
135 104 106
72 58 37

19
graphics/pokemon/oricorio/sensu/overworld_shiny.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
27 64 78
131 131 241
48 58 68
240 230 248
0 0 0
148 148 250
48 58 68
169 197 225
148 209 250
184 142 145
122 147 160
246 190 194
229 177 181
135 104 106
72 58 37

BIN
graphics/pokemon/palkia/origin/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

30
graphics/pokemon/palkia/origin/overworld_normal.pal
View file

@ -1,19 +1,19 @@
JASC-PAL
0100
16
32 97 0
0 0 0
246 80 65
172 161 180
255 238 238
246 161 156
131 121 148
115 197 164
72 76 80
248 248 248
176 184 192
200 216 232
120 136 144
136 120 144
16 16 16
197 190 213
246 194 189
164 80 164
205 137 197
106 97 24
222 218 246
65 72 74
82 80 90
208 192 216
232 216 248
200 136 192
240 80 64
240 160 152
232 216 248
160 80 160
104 96 24

30
graphics/pokemon/palkia/origin/overworld_shiny.pal
View file

@ -1,19 +1,19 @@
JASC-PAL
0100
16
32 97 0
0 0 0
246 80 65
172 161 180
255 238 238
246 161 156
131 121 148
115 197 164
72 76 80
248 248 248
191 175 192
228 193 232
137 125 144
164 120 144
16 16 16
197 190 213
246 194 189
164 80 164
205 137 197
106 97 24
222 218 246
65 72 74
82 80 90
217 183 216
240 193 248
224 128 186
240 80 64
240 160 152
251 227 225
164 120 144
104 96 24

BIN
graphics/pokemon/persian/alolan/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 689 B

After

Width:  |  Height:  |  Size: 754 B

BIN
graphics/pokemon/ponyta/galarian/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 738 B

After

Width:  |  Height:  |  Size: 736 B

4
graphics/pokemon/ponyta/galarian/overworld_normal.pal
View file

@ -10,10 +10,10 @@ JASC-PAL
65 113 106
213 153 213
189 186 189
246 226 172
72 200 232
238 234 255
0 0 0
106 222 222
115 113 65
230 186 230
48 152 168
246 242 222

16
graphics/pokemon/ponyta/galarian/overworld_shiny.pal
View file

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
200 144 48
199 171 123
131 121 90
32 32 32
192 216 200
240 200 80
66 149 97
248 240 160
240 219 158
48 152 168
247 244 203
189 186 189
71 180 150
72 200 232
238 234 255
0 0 0
128 248 176
72 88 72
229 218 105
106 222 222
16 16 16
48 152 168
232 248 240

BIN
graphics/pokemon/pumpkaboo/large/overworld.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 597 B

BIN
graphics/pokemon/pumpkaboo/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 522 B

After

Width:  |  Height:  |  Size: 512 B

BIN
graphics/pokemon/pumpkaboo/small/overworld.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 429 B

BIN
graphics/pokemon/pumpkaboo/super/overworld.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 769 B

12
graphics/pokemon/raichu/alolan/overworld_shiny.pal
View file

@ -2,16 +2,16 @@ JASC-PAL
0100
16
152 208 160
112 105 18
240 225 38
144 88 40
248 176 72
0 0 0
81 54 41
150 141 24
168 104 64
112 40 40
151 117 86
102 68 37
123 87 56
136 72 56
112 72 40
255 239 225
232 216 176
44 29 27
78 201 201
204 188 174

BIN
graphics/pokemon/rapidash/galarian/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 965 B

After

Width:  |  Height:  |  Size: 959 B

14
graphics/pokemon/rapidash/galarian/overworld_shiny.pal
View file

@ -4,16 +4,16 @@ JASC-PAL
152 208 160
18 2 31
0 24 96
71 113 111
107 220 217
167 235 232
32 128 120
56 192 168
128 224 200
62 62 62
176 144 32
176 160 104
245 243 220
237 237 137
224 220 175
255 255 255
0 0 0
233 217 173
248 248 208
224 220 175
247 247 228
232 232 248
230 223 160

BIN
graphics/pokemon/sandshrew/alolan/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 481 B

After

Width:  |  Height:  |  Size: 534 B

BIN
graphics/pokemon/sawsbuck/winter/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 814 B

After

Width:  |  Height:  |  Size: 866 B

BIN
graphics/pokemon/scovillain/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
graphics/pokemon/shaymin/sky/overworld.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 829 B

19
graphics/pokemon/shaymin/sky/overworld_normal.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
88 88 112
176 224 96
120 168 48
240 192 0
240 128 168
128 128 152
184 56 56
248 40 48
48 152 72
232 232 248
168 168 208
64 64 64
104 128 0
40 88 56
0 0 0

19
graphics/pokemon/shaymin/sky/overworld_shiny.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
88 88 112
136 208 192
80 168 152
240 192 0
240 128 168
128 128 152
184 56 56
248 40 48
48 152 72
232 232 248
168 168 208
64 64 64
104 128 0
56 104 96
0 0 0

BIN
graphics/pokemon/sliggoo/hisuian/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 744 B

After

Width:  |  Height:  |  Size: 652 B

4
graphics/pokemon/sliggoo/hisuian/overworld_normal.pal
View file

@ -10,8 +10,8 @@ JASC-PAL
189 148 205
222 197 255
139 82 139
0 0 0
0 0 0
96 156 144
64 108 96
0 0 0
0 0 0
0 0 0

4
graphics/pokemon/sliggoo/hisuian/overworld_shiny.pal
View file

@ -10,8 +10,8 @@ JASC-PAL
189 148 205
222 197 255
139 82 139
0 0 0
0 0 0
170 171 96
134 124 71
0 0 0
0 0 0
0 0 0

BIN
graphics/pokemon/slowbro/galarian/overworld.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
graphics/pokemon/thundurus/therian/overworld.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

Some files were not shown because too many files have changed in this diff Show more