Fix special evolution triggering twice in certain situations #4553
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AgustinGDLV
approved these changes
May 16, 2024
Pawkkie
added a commit
to Pawkkie/pokeemerald-expansion
that referenced
this pull request
May 29, 2024
Pid64
pushed a commit
to Pid64/pokeemerald-unleashed
that referenced
this pull request
Jun 2, 2024
undertheearth
added a commit
to undertheearth/pokeemerald-expansion-gameplay
that referenced
this pull request
Jun 2, 2024
commit 085c2f3d43508da57ecc9ba4b2ad77636b4219f2
Author: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
Date: Sun Jun 2 07:32:18 2024 +0100
Moves activation of Guard Dog from HitEscape to HitSwitchTarget (#4690)
* Removes incorrect activation of Guard Dog
* Adds Guard Dog check on Dragon Tail, Circle Throw
commit 43e2a973fcbe5a279aadd5c269d4aa01df708382
Author: Isaac Rivera <40581123+iriv24@users.noreply.github.com>
Date: Sat Jun 1 19:00:17 2024 -0400
add check for held item before using poltergeist and a check that it is the first turn for moves that are first turn only (#4693)
commit 0a8284ce9fa11da5dc729c4784d46da79269f181
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sat Jun 1 09:07:51 2024 -0400
Added missing Move Effect TODO tests - Volume B (#4682)
* Added missing Move Effect TODO tests - Volume B
* Apply suggestions from code review
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Removed unused bulldoze effect file
* Removed individual tests for Baton Pass + Status1 in favor of the existing single test
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
commit 0ed8d09d4777608d7749a66d171c438fca655f0c
Author: WillKolada <57021938+WillKolada@users.noreply.github.com>
Date: Fri May 31 15:33:31 2024 -0500
Revert Dynamax HP on fainting (#4681)
* Revert Dynamax HP on fainting
Calls UndoDynamax whenever a mon faints to ensure that its HP is reverted and the relevant data is cleared. Updates UndoDynamax to CalculateMonStats after applying the HP reversion to prevent fainted mons from retaining their boosted Max HP until the end of the battle.
* Update src/battle_main.c
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
commit 13d4d29e1e3c32eb2d88c0c59c3953851095fcbd
Author: sneed <56992013+Sneed69@users.noreply.github.com>
Date: Fri May 31 13:19:07 2024 +0300
Move SOLAR_POWER_HP_DROP label (#4675)
commit 317cf2e9336feaa133e794b230803468be6208b5
Author: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com>
Date: Thu May 30 13:15:26 2024 -0700
updated Disguise to be a breakable ability (#4666)
commit 1a59adcea808d091ce351db0876c10bc6b9471d1
Author: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
Date: Thu May 30 12:53:48 2024 +0100
Fixes Burning Bulwark incorrect message and Grassy Glide granting priority to Max Move (#4659)
* Fixes Burning Bulwark burning message and normalizes similar messages
* Fixes Grassy Glide granting priority to Max Move used from that slot
* Missed freeze message
commit 84a7fd86d69fdddde8b2bf7eec6d174899e5be68
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Wed May 29 09:56:59 2024 +0200
#4635 follow up. Missing test comments (#4647)
commit 0570609ce63e1bdbddb8da01acfeb52c7aa2765b
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Tue May 28 10:34:05 2024 +0200
Small Ability Effect Move Block refactor (#4635)
* Small Ability Effect Move Block refactor
* combine tests
commit e0499f8b3e0a1549043e1b9212e31836d5073e1d
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Tue May 28 10:30:27 2024 +0200
Fixes AI going for speed control even when faster (#4630)
* Fixes AI going for speed control even when faster
* Update src/battle_ai_util.c
commit df6fab7284ae6e7566deaf1ab15965883cf9698f
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Tue May 28 10:29:37 2024 +0200
Missing ignoreSubstitute flags (#4623)
* Missing ignoreSubstitute flags
* update defog flag
commit 9104c40d43e573daff06de91e2ecef5423ec2677
Author: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
Date: Mon May 27 16:07:13 2024 +0100
Fixes Dancer triggering if the move's user didn't act (#4638)
* Fixes Dancer triggering if the user flinched
* Add check to make sure "Pokemon used move" message is kept
* Address review
---------
Co-authored-by: Fltp <fltpessoa2@gmail.com>
commit 069161b71649e486290072b052cb536f1805c19e
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Mon May 27 09:31:06 2024 -0400
Untag release
commit 680c5581d4a2572cc336bb9e7107d2793d5baf56
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Mon May 27 09:14:35 2024 -0400
Fixed changelog inaccuracy
commit 767a1c79374c33d79c033a16186e50fc4976d814
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Mon May 27 09:06:34 2024 -0400
Version 1.8.4 (#4639)
* Version 1.8.4
* Missing labels
commit 431cb64b3e5acdd7f7b26bd16108689b1d2b22b8
Merge: acd62b006 9e72271c8
Author: Philipp AUER <SBird1337@users.noreply.github.com>
Date: Mon May 27 12:40:41 2024 +0200
Pre-1.8.4 pret merge (2024/05/26) (v2) (#4637)
commit acd62b006560b096e39b09cf4ffc3e4557c7e310
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Mon May 27 00:38:05 2024 -0400
Reverted bad implementation of Sparkling Aria+Covert Cloak/Shield Dust (#4634)
commit 94af656f17bac3598738b13487af107446658dd6
Author: Rachel <lhearachel@proton.me>
Date: Sun May 26 18:50:12 2024 -0700
Explicitly define Gengar's 3rd ability slot (Hidden Ability) (#4633)
commit 9e72271c8eb4101f295dc6872b68e3032717fc87
Merge: c279aa23c 18f84b78f
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun May 26 18:34:26 2024 -0400
Merge remote-tracking branch '_pret_origin/master' into _RHH/pr/master/pret_20240526
# Conflicts:
# src/battle_anim_poison.c
# src/pokemon.c
# src/pokemon_icon.c
commit c279aa23c6d4d83d7ac693d9dfc34be38ade106d
Author: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
Date: Sun May 26 16:23:04 2024 -0400
Belch AI Scoring Fix (#4616)
* Belch scoring fix and test
* Add assumptions for pocket
* Update test to AI_SINGLE_BATTLE_TEST
* Alex's fixes
* Missed reverting a line
* Mucked up spacing mb
* Mucked up the spacing fix mb MB
commit 2e07dbb0eeaee0fc376d22bdbc9834b941209714
Author: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Sun May 26 15:20:51 2024 -0500
Add Gen 9 and PLA footprints + update some footprints (#4621)
* PLA footprints
* Gen 9 Starters
* Gen 9 Cross Gen Evos
* Question mark
* Gen 9 regular mons
* Gen 9 Paradox mons
* Gen 9 legendaries and mythicals
* Past gen mon footprint changes
commit 8f38089127eacf406d485399dc9a671c0a99c2d0
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun May 26 13:38:22 2024 -0400
Added failsafe in HGSS dex for Egg Groups without text defined (#4628)
* Added failsafe in HGSS dex for Egg Groups without text defined
* Fixed stringvar
commit ee1d0339f96f9f4d7e26c536b1374db6d52adc22
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun May 26 13:37:58 2024 -0400
Fixed HITMARKER_PASSIVE_DAMAGE whitespace (#4629)
commit 487dc921197c72524879c15b9cf20407fb762347
Author: hedara90 <90hedara@gmail.com>
Date: Sun May 26 17:01:20 2024 +0200
Fixing bugs with Moxie clones+Dynamax, Fling Flinch infinite loop and Focus Sash+foreseen moves (#4625)
* Fixed Elixirs not being able to be used unless the first move was missing PP
* Revert "Pokedex Plus fixes (#4514)"
This reverts commit 982934c4aad64c75468e2ae6642cb74e50aa0944.
* Pokedex Plus fixes (#4514)
* Pokedex plus no longer allows browsing unseen evos
* Restore "has no evolutions" printing
* only print "has no evolution" text at 0 depth
* Revert config changes
* fix duplicate icons and removed eevee hardcodes
* add new scope and indentation fixes
* actually introduce new scope
* Revert "Fixed Elixirs not being able to be used unless the first move was missing PP"
This reverts commit 313f2e552672cae9506c6a647464c247b9b39928.
* Initial Testing of Focus Sash+Future Sight
* Fixed infinite loop when flinging Razor Fang on a mon that's already moved
* Fixed Moxie clones not triggering on pokemon fainted by Max Moves
* Fixed Focus Sash enduring another time if broken by foreseen moves
* Update src/battle_script_commands.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Update src/battle_script_commands.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Added assumptions to tests
---------
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
commit 474f929c023254d068cce5256801cbb7a4c3d66a
Author: cawtds <38510667+cawtds@users.noreply.github.com>
Date: Sun May 26 00:06:55 2024 +0200
Fix dire hit being used on incorrect target (#4626)
* fix getboxmondata for evolutiontracker if compiled with agbcc
* fix dire hit being used on incorrect battler
commit a507af300e27ae85840f04223d6834b79b50dedc
Author: BlueAnthem37510 <137793234+BlueAnthem37510@users.noreply.github.com>
Date: Fri May 24 10:28:35 2024 +0100
Sceptilite & Salandit sprite fixes (#4614)
Co-authored-by: BlueAnthem37510 <a@a.com>
commit 312dcbb8a8f9ec3b08be7c3ae1d32389c0bc92d9
Author: sneed <56992013+Sneed69@users.noreply.github.com>
Date: Fri May 24 12:21:35 2024 +0300
Speed Ignoring effect fixes (#4613)
* Custap ties with Quick Draw, Stall with Mycelium
* add a test
commit 18f84b78f2d1a8669753fa586836fca06036c790
Merge: aa4fa925c b592c6eae
Author: GriffinR <griffin.g.richards@gmail.com>
Date: Wed May 22 20:29:12 2024 -0400
Merge pull request #1998 from Sneed69/define-POKE_ICON_BASE_PAL_TAG
Move POKE_ICON_BASE_PAL_TAG to a header
commit b592c6eae5015e6b01198212444a3b852bda27d0
Author: sneed <devilduke1995@gmail.com>
Date: Thu May 23 02:45:22 2024 +0300
Add POKE_ICON_BASE_PAL_TAG to a header
commit edab81b658774a61045e60b24a69a6877658d42b
Author: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Wed May 22 15:20:44 2024 -0500
Fix Inner Focus, Scrappy, etc granting immunity to all stat drops if the attacker has Intimidate (#4606)
* Fix Inner Focus, Scrappy, etc granting immunity to all stat drops if the attacker has Intimidate
* Formatting
* Test
* Update own_tempo.c
commit 973146c725fd54413ce22df18abe2c259237ebbf
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Wed May 22 00:55:20 2024 +0200
BS_SetGlaiveRush formatting (#4610)
Please merge my OCD induced change.
commit aa4fa925c2a00447bc7448b12300ef4b8bb1f7c8
Merge: 999731fbf 411d7e617
Author: GriffinR <griffin.g.richards@gmail.com>
Date: Tue May 21 12:01:53 2024 -0400
Merge pull request #1995 from Jaizu/adjust_friendship
Make AdjustFriendship more readable
commit 999731fbf184784e99a842e1deff72a5ce60227f
Merge: 5dbd90b91 ef03daf6d
Author: GriffinR <griffin.g.richards@gmail.com>
Date: Tue May 21 11:58:08 2024 -0400
Merge pull request #1996 from Jaizu/fix_pokeblocks
Fix Pokeblock script missing a releaseall
commit b73e33618d3f0d42b46468ed4299bfce49d3fa51
Author: cawtds <38510667+cawtds@users.noreply.github.com>
Date: Mon May 20 00:25:03 2024 +0200
Fix status curing of full restore when used on party member (#4603)
* fix getboxmondata for evolutiontracker if compiled with agbcc
* fixed full restore curing status condition when used in battle on party member with missing hp
added more full restore tests
* formatting, removed unused
commit 57ec87387d7880aa37737c89a78ae14706753f58
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Sun May 19 21:29:54 2024 +0200
Fixes freeze on Galvanize Explosion against Volt Absorb (#4601)
commit ef03daf6d4798e450d1bb3cfab1267738d3d0a92
Author: Jaizu <jaizu85@gmail.com>
Date: Sun May 19 12:52:04 2024 +0200
Fix Pokeblock script missing a releaseall
commit 35e90b896d222077fdd285d4b73a8bfd1af96658
Author: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
Date: Sun May 19 04:13:14 2024 -0400
Adjust description of FREE_MATCH_CALL (#4590)
* Adjust description of FREE_MATCH_CALL
* Shorten comment
commit b7fc2b447a12844e67d80afd0ffe48418344a0c1
Author: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Sat May 18 15:20:47 2024 -0500
Add Stellar Tera Shard sprite (#4595)
* Add Stellar Tera Shard sprite
* Update items.h
commit 4ccfd5355d8f63e70c99bd3e4901a6697aca6169
Author: hedara90 <90hedara@gmail.com>
Date: Sat May 18 19:55:31 2024 +0200
Fixed Elixir only being useable if the first move was missing PP (#4594)
* Fixed Elixir only being useable is the first move was missing PP
* Update restore_pp.c
Commented out the test that doesn't actually test what it's supposed to due to current test system.
---------
Co-authored-by: Hedara <hedara90@gmail.com>
commit a28ee83b06ac80a53b1476880ceecd148029eaf6
Author: Cafei <46283144+cafei-uh@users.noreply.github.com>
Date: Sat May 18 19:07:27 2024 +0400
sawsbuck sprites (#4592)
commit 982934c4aad64c75468e2ae6642cb74e50aa0944
Author: sneed <56992013+Sneed69@users.noreply.github.com>
Date: Sat May 18 11:53:01 2024 +0300
Pokedex Plus fixes (#4514)
* Pokedex plus no longer allows browsing unseen evos
* Restore "has no evolutions" printing
* only print "has no evolution" text at 0 depth
* Revert config changes
* fix duplicate icons and removed eevee hardcodes
* add new scope and indentation fixes
* actually introduce new scope
commit 635db6312c6ae59ff36fd86c8ee1d680f81cf567
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Fri May 17 00:41:55 2024 +0200
AI respects partner when using spread moves in double battles (#4518)
* Fixes Earthquake AI in double battles
* earthquake_ai_fix
* Use CompareDamagingMoves to fix spread damage issue
commit 6f12da0a67c13d2bfa5c522965ad30895e0cc294
Author: cawtds <38510667+cawtds@users.noreply.github.com>
Date: Thu May 16 22:45:08 2024 +0200
Fix special evolution triggering twice in certain situations (#4553)
commit d235a716fe5c046c248ccb4f04a38ea31836a36d
Author: Bassoonian <iasperbassoonian@gmail.com>
Date: Wed May 15 21:11:30 2024 +0200
Add missing EOF newlines to species_info files (#4584)
commit 3a1b4951c61bddd5be77bfc3116712dc0a2916d0
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Wed May 15 14:48:10 2024 -0400
Added missing Move Effect TODO tests - Volume A (#4569)
* Added missing TODO tests - Volume A
* Update test/battle/move_effect/autotomize.c
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
commit 00fc5b94f2c5f03c57e6eafa33c1af67eeb243e5
Author: sneed <56992013+Sneed69@users.noreply.github.com>
Date: Wed May 15 18:51:47 2024 +0300
Various AI switching logic fixes Part 2 (#4572)
* AI can calc hail and sandstorm damage again
* reverse weatherImpact hp calculation sign
* add missing toxic damage calculation
commit e5b33a04347c92964ec081b11f2e5ac570b2f7f7
Author: Isaac Rivera <40581123+iriv24@users.noreply.github.com>
Date: Wed May 15 09:40:40 2024 -0400
Add check for Magic Guard to avoid taking recoil damage (#4578)
* Add check for Magic Guard to avoid taking recoil damage
* add test to verify a mon with magic guard does not take recoil damage
followed format from "Steel Beam hp loss is prevented by Magic Guard" test
* update format of tests with magic guard and some form of recoil damage
commit bbb6ade9e8a8a879468222150e9ca8bddb411fa3
Author: Bassoonian <iasperbassoonian@gmail.com>
Date: Wed May 15 11:56:58 2024 +0200
Fix debug ability u8 (#4576)
commit 35362fbd24a8e6d64b4608b166fbb7633978c331
Author: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Tue May 14 11:28:50 2024 -0500
Update various sprites to ones from PokeCommunity (#4554)
* Updated battle sprites
* Update icon sprites
* Revert appletun change
commit 2e7c32019fe24af1e22203c3abc4404c8a99443a
Author: Bassoonian <iasperbassoonian@gmail.com>
Date: Tue May 14 17:36:12 2024 +0200
Update items.h (#4574)
commit 08bdc85359a2b6f0a608085f1ef48101cb40ce5d
Author: Isaac Rivera <40581123+iriv24@users.noreply.github.com>
Date: Tue May 14 11:28:14 2024 -0400
Adds tests to verify Parental Bond doesn't affect EFFECT_MULTI_HIT moves (#4573)
* Adds tests to verify that Parental Bond does not affect moves with EFFECT_MULTI_HIT
* actually make kanga mega evolve in tests
* add celebrate for opponent and "not animation" on 5th hit
* update test strings
commit d71d5f7f1eaa4d5b00f4c41adb6e1943f43eb19d
Author: sneed <56992013+Sneed69@users.noreply.github.com>
Date: Tue May 14 14:44:46 2024 +0300
fix incorrect usage of ANIM_PLAYER_LEFT and _RIGHT (#4560)
commit 5cc7330f33eb924b1227edfff4f3caac12adec1f
Author: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
Date: Tue May 14 12:34:36 2024 +0100
Fixes cries in move animations ignoring Illusion (#4564)
* Fixes cries in move animations not taking into account the ability Illusion
* Fixes cry for Link Battles
commit dd6e91eaf7bc9f37b938f6bdb9a1cb60a70f0dd0
Author: Isaac Rivera <40581123+iriv24@users.noreply.github.com>
Date: Tue May 14 07:32:44 2024 -0400
Add check for MULTI_HIT moves in IsMoveAffectedByParentalBond (#4570)
commit 9cd3fbb232cf629e92f68569808d5f349dc46ef5
Author: TheJamesLJ <jameslj.efc@hotmail.co.uk>
Date: Tue May 14 12:28:10 2024 +0100
Opponents Shaymin Sky form correctly reverts on frozen status (#4559)
* Fixed Shaymin form change with incorrect status condition
* Fixed Shaymin receiving damage again after changing form
* PR feedback updates - fixed missing commas in battle script
* Added Shaymin form change test by @AlexOn1ine
commit 23b880479058716cdc882611da2db2b1266eafd2
Author: sneed <56992013+Sneed69@users.noreply.github.com>
Date: Tue May 14 14:09:26 2024 +0300
Various AI switching logic fixes (#4571)
commit 411d7e617777a3a7e7c60fdaf5d73d39a2695599
Author: Jaizu <jaizu85@gmail.com>
Date: Tue May 14 12:48:20 2024 +0200
Make AdjustFriendship more readable
commit cd1f4a8e944dfc1ded9dfd39f51645600086fe66
Author: Bassoonian <iasperbassoonian@gmail.com>
Date: Mon May 13 20:04:41 2024 +0200
Fixed C0ntest (#4563)
commit ac16a5291881321e8cf3d4c1380e0a614ebf2180
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Mon May 13 13:19:37 2024 -0400
Revert "Guillotine: Decapitalize everything (#3949)" (#4525)
This reverts commit e2d70d440e6217ed8d16663010ea2678846c4e14, reversing
changes made to 0d2b40095377e51576dcc8931c1d87066b039c31.
# Conflicts:
# gflib/text.c
# include/config/decap.h
# src/battle_message.c
# src/item.c
commit ebdc9ffc39eb6443116bef155fb4840396f67ad3
Author: hedara90 <90hedara@gmail.com>
Date: Mon May 13 13:33:04 2024 +0200
Fixed some moves' on-hit effects bypassing Substitutes where they shouldn't and some other things discovered along the way (#4558)
* Fixed some moves' on-hit effects bypassing Substitutes where they shouldn't.
Fixed Sparkling Aria interaction with Shield Dust in Singles vs Doubles.
Fixed Wake-Up Slap and Smelling Salts getting boosted damage where they shouldn't vs Substitutes.
* Cleaned up check for Sparkling Aria+Shield Dust interaction and fixed for agbcc.
Fixed logic for checking if moves should do extra damage on statused targets.
Wrote tests for Wake-Up Slap and Smelling Salts receicing extra damage on statused targets.
Wrote tests to check Thousand Arrows type effectiveness vs ungrounded Flying types.
* Update src/battle_util.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Update src/battle_script_commands.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Update src/battle_script_commands.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Update test/battle/ability/shield_dust.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Update test/battle/item_effect/covert_cloak.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Update test/battle/item_effect/covert_cloak.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Update test/battle/item_effect/covert_cloak.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Update test/battle/move_effect/smelling_salts.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Update test/battle/move_effect/thousand_arrows.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Update test/battle/move_effect/wake_up_slap.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Update test/battle/move_effect/wake_up_slap.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Update test/battle/move_effect/wake_up_slap.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
commit fdd0063b6c0a9b2c8b3d4489784293e6240634d4
Author: WillKolada <57021938+WillKolada@users.noreply.github.com>
Date: Mon May 13 04:27:17 2024 -0500
Updated AI scores for Status moves that Dynamax Pokemon are immune to (#4523)
* Update IsDamageMoveUsable to check for Steel Roller viability
* Condense terrain flag checks and renamed IsDamageMoveUsable
IsDamageMoveUsable is now named IsDamageMoveUnusable to more accurately reflect the boolean it returns.
* Made the AI aware of when more moves will fail against Dynamax Pokemon
Turns out Dynamax Pokemon are immune to quite a few moves. The AI is only aware of one of these at present--the Low Kick/Grass Knot effect, which I learned when the AI tried to Heavy Slam my Dynamaxed Pokemon. These additional cases should prevent the AI from selecting moves that have no effect against Dynamax Pokemon, though it may still select moves whose secondary effect won't work on Dynamaxed Pokemon (such as Fake Out or Circle Throw).
* Update battle_ai_util.c
Now handles damaging moves that Dynamax Pokemon are immune to
* Update scores for Status moves Dynamax Pokemon are immune to
* Extra parentheses oops
* Update pokemon.h
Added "doesntAffectDynamax" flag to MoveInfo
* Update pokemon.h
Replaced comma with semicolon (I'm using the online editor for this lol, sorry for all the commits)
* Update moves_info.h
Set the "doesntAffectDynamax" flag to TRUE for moves that have no effect on Dynamaxed targets.
* Update battle_dynamax.c
IsMoveBlockedByDynamax now simply returns the move's "doesntAffectDynamax" flag.
* Revert "Update pokemon.h"
This reverts commit 7edde776f8fcb5aee81cd76279ceaf29b55337ff.
Revert "Update pokemon.h"
This reverts commit ed01b18d750124422702974a7c8065f5cd541644.
Revert "Update moves_info.h"
This reverts commit bc42e7bccf3294244377281e51d2a061eeb97cad.
Revert "Update battle_dynamax.c"
This reverts commit 29dbdce850f232a23cdc3024dc558bd0d8a2881a.
* Update battle_ai_main.c
Made the new conditions consistent as separate checks.
* Update battle_ai_main.c
Whitespace formatting fixes. Sorry, lost track of what I'd changed and what I hadn't.
commit eae221b9cff17f6fb253d80aa5adb40fdc0b8a63
Author: Cafei <46283144+cafei-uh@users.noreply.github.com>
Date: Mon May 13 00:08:10 2024 +0400
A bunch of Pokemon sprite changes and fixes (#4552)
* A bunch of sprite fixes
- New Basculin Blue and White animations to fix their entry animations
- New Xerneas Neutral entry animation derived from its Active form animation
- Recolored Iron Hands and Iron Bundle back sprites
* Requested changes
commit 571d7bc43654d30b2de766115341be7e9d7b336f
Author: Cafei <46283144+cafei-uh@users.noreply.github.com>
Date: Sun May 12 23:45:34 2024 +0400
Fix silent Oricorio Pom-Pom cry (#4551)
* Fix Oricorio Pom-Pom silent cry
* Silly mistake, thanks for pointing it out
commit b66738ff8d2e7bb77c9f1a5e044aa8f479de8adf
Author: TheJamesLJ <jameslj.efc@hotmail.co.uk>
Date: Sun May 12 20:43:49 2024 +0100
Multiple sprite updates (#4541)
* Updated Mega Mewtwo Y sprite to fix transparent eye pixel
* Updated Keldeo Resolute sprite to a two framed animation
* Updated Keldeo Resolute sprite to increase definition to facial features
* Improved Keldeo Resolutes second frame to match BW2 original & changed front animation
* Added Meloetta Pirouette front anim
* Updated Meloetta Pirouette anim frame to a dip
commit 56cee80fbfe066047c9832c963aa550e0179e85c
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Sun May 12 17:41:18 2024 +0200
Explosion and Mind Blown / Steel Beam refactor (CFRU port) (#4516)
* Explosion and Mind Blown / Steel Beam refactor (CFRU port)
* forgot ndebug
* Restored EFFECT_MIND_BLOWN
* requested changes
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
commit f502ba2a696bf9f65093492b910983cea681a4e6
Author: sneed <56992013+Sneed69@users.noreply.github.com>
Date: Sat May 11 20:03:19 2024 +0300
Stat stage related AI fixes (#4548)
* stat stage related AI fixes
* add more ai fixes and 2 tests
* use legal ability in tests
* Fix test and remove mold breaker check
* Use DoesBattlerIgnoreAbilityChecks
commit 8de4ed5a7c7b162329569fdcc4ac1bd2cac0cb9d
Author: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
Date: Sat May 11 13:16:35 2024 +0100
Fixes Copycat issues with Z-Moves and 2 turn moves (#4549)
* Fixes Copycat 2-turn moves animation
* Fixes Copycat being able to call Z-Moves
commit 1ef7e11ef22ef37a5edbeb754d0e78037c49e28d
Author: Cafei <46283144+cafei-uh@users.noreply.github.com>
Date: Sat May 11 02:20:25 2024 +0400
Unown entry animation fix (#4546)
- Changed all anim_front.png into front.png
- Set PLACEHOLDER_ANIM_SINGLE_FRAME in front_pic_anims.h
commit 833decb0df5db7437edc526f2d033c465579b3ae
Author: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
Date: Fri May 10 23:12:09 2024 +0100
Fix Mr. Mime's typing (#4547)
commit 4c5260c82ebbec03f990ff9ea2776525e34bc515
Author: WillKolada <57021938+WillKolada@users.noreply.github.com>
Date: Fri May 10 16:01:37 2024 -0500
Changed item descriptions to prevent text overflowing into scroll menus (#4540)
* Changed Dubious Disc description to prevent overflow
The first line of the Dubious Disc description was too long. A few letters would escape the box in the Bag and in Marts. This brings them in line.
* Changed Ice Beam and Blizzard Frostbite descriptions
These descriptions also overflowed, even more so than the Dubious Disc.
commit d247a779278bdc72b3a6b15c95c939b47cd2f7ca
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Fri May 10 23:00:32 2024 +0200
Fixes Future Sight freeze/weird behavior (#4543)
commit e122ba28be6e3f3513afe31f71816368c5de1fcf
Author: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
Date: Thu May 9 10:22:46 2024 -0400
fix battle script clearing specialBattleType (#4536)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
commit f12773dbb8456a04edac588f0900b7a55c47d893
Author: Bassoonian <iasperbassoonian@gmail.com>
Date: Thu May 9 16:22:17 2024 +0200
Fix possible agbcc corruption for tree mutations (#4535)
commit dd0c3a9ee5ceda51ad1215fb994d97424c8bbf81
Author: hedara90 <90hedara@gmail.com>
Date: Thu May 9 15:22:48 2024 +0200
Fixed moves with HP cost triggering effects where they shouldn't (#4533)
Co-authored-by: Hedara <hedara90@gmail.com>
commit fcfc6b60f27447f15b052f1e2d0c6270f24c26ca
Author: cawtds <38510667+cawtds@users.noreply.github.com>
Date: Thu May 9 15:19:13 2024 +0200
fix getboxmondata for evolutiontracker if compiled with agbcc (#4510)
commit d07d7a0082a84760382700b18a7cf85be844052f
Author: sneed <56992013+Sneed69@users.noreply.github.com>
Date: Thu May 9 11:11:55 2024 +0300
Transform GFX uses the correct battler index (#4486)
commit 63254a8fdc1b71344258236b4a8db8fdc6f746c4
Author: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
Date: Thu May 9 08:22:56 2024 +0100
Fixes Thief and Covet used by an opponent not stealing items (#4506)
* Fixes MOVE_EFFECT_STEAL_ITEM (Thief and Covet)
* Fix stealing consumed item
* Removed unnecessary instructions
* Removes unnecessary check for item to trigger Sticky Hold
commit b3a4553860bcc6031153c851fa512c59fb97f832
Author: sneed <56992013+Sneed69@users.noreply.github.com>
Date: Thu May 9 09:44:22 2024 +0300
Dynamic Multichoice no longer plays sound on init (#4480)
commit 432c4f233c7393a2eef16e209dbc3b3a26add508
Author: sneed <56992013+Sneed69@users.noreply.github.com>
Date: Wed May 8 15:03:59 2024 +0300
fix ai caring about fixed damage moves' resists (#4524)
commit b04d153a24858c25ad6f8d67e6dd163dac984b0e
Author: WillKolada <57021938+WillKolada@users.noreply.github.com>
Date: Tue May 7 15:47:20 2024 -0500
Expanded AI awareness of moves that don't work against Dynamax Pokemon (#4521)
* Update IsDamageMoveUsable to check for Steel Roller viability
* Condense terrain flag checks and renamed IsDamageMoveUsable
IsDamageMoveUsable is now named IsDamageMoveUnusable to more accurately reflect the boolean it returns.
* Made the AI aware of when more moves will fail against Dynamax Pokemon
Turns out Dynamax Pokemon are immune to quite a few moves. The AI is only aware of one of these at present--the Low Kick/Grass Knot effect, which I learned when the AI tried to Heavy Slam my Dynamaxed Pokemon. These additional cases should prevent the AI from selecting moves that have no effect against Dynamax Pokemon, though it may still select moves whose secondary effect won't work on Dynamaxed Pokemon (such as Fake Out or Circle Throw).
* Update battle_ai_util.c
Now handles damaging moves that Dynamax Pokemon are immune to
commit 82b626aef1af4d1bbec3fd9c0fc000234c9bfd3f
Author: Nopinou <140268269+Nopinou@users.noreply.github.com>
Date: Tue May 7 15:53:09 2024 +0200
fix and tweak level cap code (#4505)
Co-authored-by: Baptiste-Lecoutre <59924283+Baptiste-Lecoutre@users.noreply.github.com>
commit 2d7c79e860e58610c0691da119e1008fdc947510
Author: BlueAnthem37510 <137793234+BlueAnthem37510@users.noreply.github.com>
Date: Tue May 7 11:44:17 2024 +0100
Gulp missile not triggering on faint fix and added form change type (#4502)
* Cramorant faint fix and add form change type
* Fixed formatting, renamed form change type, changed various to callnative
* Fix oops broke everything except gulp missile
* Improved condition order
* remove extra line
* whitespace and alignment
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* whitespace and alignment
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* whitespace and alignment
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* whitespace and alignment
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* whitespace and alignment
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* whitespace and alignment
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Added requested changes
---------
Co-authored-by: BlueAnthem37510 <a@a.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
commit eca47fe209ee592b4b07145e33983c40cd515202
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Mon May 6 14:51:48 2024 -0400
Non-tagged release
commit 7e43916e57ca98a077ac3ac46acde1ca0fb0d5b4
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Mon May 6 14:44:37 2024 -0400
Version 1.8.3 (#4499)
* Moved changelogs to folders by minor version
* Version 1.8.3
commit 4ce8a05d5d69a6a1bc93229736431ed1ae2d5266
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Mon May 6 13:59:37 2024 -0400
Add tests to complement PR4500 (#4511)
commit b2fda17c06369086350e2c5047cfbed85df48263
Author: lolbinarycat <dogedoge61+github@gmail.com>
Date: Mon May 6 12:18:15 2024 -0400
Make filepath links in readme relative (#4509)
This allows programs like emacs to open the proper file when
clicking them.
Co-authored-by: binarycat <binarycat@envs.net>
commit d98a4cb9a5acf3b7e51e8d21aab69aeedf0cb1ae
Author: cawtds <38510667+cawtds@users.noreply.github.com>
Date: Mon May 6 12:07:22 2024 +0200
Fixed evolution tracker updates (#4503)
* update evolution tracker correctly
* Update src/battle_script_commands.c
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
commit 5ec08ee98c373414f3663bb5bb116a5c6760c746
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Mon May 6 03:36:52 2024 -0400
Small Battle Test reorganization (#4504)
* Fixed test folders + Chud Chew test name fixes
* Adjusted file names + merged Burn Up and Double Shock files
* Added Spit Up/Swallow files that point to Stockpile's file
* Multiple changes (see description)
- Moved secondary effect files to their own folder.
- Split hit_set_entry_hazards.c to separate files for Spikes/Stealth Rock.
- Grouped Hex/Venoshock to the same file
commit e20cb62de61b9a08651ce8c357a7a85c07ea1de9
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun May 5 18:54:28 2024 -0400
Fixed Steam Roller AI check affecting Terrain setting effects (#4498)
* Fixed battle_ai_util.c whitespace
* Add arguments check
* Parenthesis
* Update src/battle_ai_util.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Added AI tests by AlexOn1ine
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
commit 41138f101cab957fef4e7a401bb6b528c0f3889e
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Sun May 5 14:29:59 2024 +0200
Fix Red Card, Endured Damage interaction (#4482)
commit bcb230f3c980c2db3e318cf22571ecebc916d631
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun May 5 08:26:30 2024 -0400
Fixed Flute Items being consumed in battle (#4496)
commit f07ef07855087aae28272e63399e93025ef08a33
Author: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
Date: Sun May 5 13:25:40 2024 +0100
Fixes various abilities' switch-in messages (#4500)
* Fixes Costar, Zero to Hero, Supreme Overlord and Ruin abilities' switch-in messages
* Fixed typo in Supreme Overlord's String Id
* Fixes spacing in battle_string_ids.h
commit 4410c1b797f30e3465a33392198b35e925bcbca6
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun May 5 05:58:11 2024 -0400
Improve Eject Pack test names (#4497)
commit ff2d1bb02cd75857cb3f52ca3d60f7372258efb8
Author: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
Date: Sat May 4 15:59:47 2024 +0100
Fixes Assist (#4491)
commit adbb5a44c8cca1934c6a4dcfd91d0a1f97d440a4
Author: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
Date: Sat May 4 14:11:32 2024 +0100
Fixes no effect on Diamond Storm, typo on Mortal Spin (#4489)
commit 22f9eee5094f4bdf017cfdb06465ea4068690d17
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Thu May 2 14:01:22 2024 -0400
Added trainerproc to .gitignore
commit 6d397f9867a9c899a1afe7ecad73ed0bdab57d26
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Thu May 2 14:23:46 2024 +0200
Fixes Magic Bounce in double battles (#4464)
* Fixes Magic Bounce in double battles
* Add Double Battle check
commit 2aed78ebbb762720e064c09c62cf806751cb139b
Author: WillKolada <57021938+WillKolada@users.noreply.github.com>
Date: Thu May 2 01:42:08 2024 -0500
Update IsDamageMoveUsable to check for Steel Roller viability (#4476)
* Update IsDamageMoveUsable to check for Steel Roller viability
* Condense terrain flag checks and renamed IsDamageMoveUsable
IsDamageMoveUsable is now named IsDamageMoveUnusable to more accurately reflect the boolean it returns.
commit d59ef3710a3abe24dda6fd44aeb3d94536b95a41
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Wed May 1 18:15:56 2024 -0400
Fixed Future Sight script whitespace (#4475)
commit 77e17247cded9028336fe0da8f19096fb8b0c9b5
Author: hedara90 <90hedara@gmail.com>
Date: Wed May 1 23:23:37 2024 +0200
Color change fixes (#4472)
* Fixed forseen moves not triggering Color Change and added tests for Color Change
* Added issue number to Known Failing test
---------
Co-authored-by: Hedara <hedara90@gmail.com>
commit 48d71b0de1fa1d418baeffc87390cf69c4d729df
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Tue Apr 30 13:59:02 2024 +0200
Hard Level Caps issues (#4420)
* Fix 1 exp gain on hard level caps
* Level Cap issues
* fix compile
* brackets
commit 6ad443c9a80b32b67ce1187e9a7deeca4d0e2418
Author: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
Date: Mon Apr 29 22:16:58 2024 +0100
Fixes Eject Items causing wrong pokemon to take damage from entry hazards (#4465)
* Fix hazards damaging the wrong pokemon using eject items
* Added Stealth Rock test as requested
* Added Stealth Rock double battle test
commit c1f92b088eb80d0147b0663dab269523826658c4
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Mon Apr 29 13:21:33 2024 +0200
Eject Pack fix (#4463)
commit c7797dff814f2d929af2a8859ab14129960ec02b
Author: Bassoonian <iasperbassoonian@gmail.com>
Date: Sun Apr 28 22:48:34 2024 +0200
Make Fur Coat breakable (#4459)
commit 0fafb5cd9624688266d23594114a319db0b7f2ab
Author: sneed <56992013+Sneed69@users.noreply.github.com>
Date: Sun Apr 28 18:06:39 2024 +0300
Fix lingering long ability popup names (#4456)
commit 3ac67acc63742147b74ec1b14a6ef4221323150d
Author: Cafei <46283144+cafei-uh@users.noreply.github.com>
Date: Sun Apr 28 19:05:23 2024 +0400
Fix Tatsugiri Droopy back sprite (#4455)
commit fc9d5c289a8a042d3ec34672ad41f8903ea661f0
Author: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Sat Apr 27 12:35:42 2024 -0500
Embody Aspect fixes (#4439)
* Embody Aspect fixes
* Fix tests
* Update battle_util.c
commit 7355eb99a5bca70aa7e724a341d54bf8e4f8adc4
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Sat Apr 27 13:36:29 2024 +0200
Fix infinite loop caused by leftovers with AI_FLAG_SMART_CHOICES (#4453)
commit ec37b2170f1fa1e2b27f2329592c1275484398a0
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Fri Apr 26 16:29:26 2024 +0200
Fixes Hospitality triggering on a fainted mon (#4450)
commit 4935b2b3ad4363e0589ea2e5ea4e90cee12d5a3f
Author: Bassoonian <iasperbassoonian@gmail.com>
Date: Thu Apr 25 23:24:10 2024 +0200
Update pokedex_plus_hgss.c (#4445)
commit 94cb2133c6c2dd92f2e37e7de4d17216fb5cde77
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Thu Apr 25 10:13:57 2024 +0200
Fixes ability dancer not targeting multiply targets (#4437)
* Fixes ability dancer not targeting multiply targets
* remove file
commit 87dca8eb1cf68e6f05a044b666e51a1ccd35d25d
Author: Martin Griffin <martinrgriffin@gmail.com>
Date: Tue Apr 23 20:49:22 2024 +0100
Fix typo in Rotom Catalog (#4433)
https://discord.com/channels/419213663107416084/774393519569502268/1232372639562072084
commit edc98d664f5d4ecd604ab9d2347d4abec495a3f6
Author: sneed <56992013+Sneed69@users.noreply.github.com>
Date: Tue Apr 23 19:51:03 2024 +0300
pokedex expYield matches SpeciesInfo type (#4432)
commit dbbe39709573e535cfede92144e8db3387dc3d3b
Author: Eemeliri <eemeli.rintanen@gmail.com>
Date: Tue Apr 23 15:16:32 2024 +0300
Fix Lycanroc dusk and midnight form backsprites and adjust back offset (#4430)
commit b24714a5973d04ee0fce7457854d82ac93c25c91
Author: Martin Griffin <martinrgriffin@gmail.com>
Date: Mon Apr 22 14:03:55 2024 +0100
Fix GiveBoxMonInitialMoveset_Fast
commit d398b9e8e7f0a4ef851395cd55bccd92b1319ba0
Author: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Mon Apr 22 03:49:53 2024 -0500
Fix ABILITY_POPUP not respecting abilityPopupOverwrite in tests (#4423)
commit fa53e97f0c1a5e6117637262416c10d409d05afe
Author: sneed <56992013+Sneed69@users.noreply.github.com>
Date: Mon Apr 22 11:42:46 2024 +0300
Add thunder cage to trapping move array (#4426)
* Add thunder cage to trapping move array
* align sTrappingMoves vertically
commit 6bde095ae883cd4ee0d78608839cea22878376c2
Author: Bassoonian <iasperbassoonian@gmail.com>
Date: Mon Apr 22 10:20:37 2024 +0200
Partner fixes (#4422)
* Partner fixes
* Generalise TRAINER_PARTNER(PARTNER_NONE)
commit 9097f438f12340791d706e3fe7d9842d52a6aa22
Author: LOuroboros <lunosouroboros@gmail.com>
Date: Mon Apr 22 04:58:17 2024 -0300
Fixes Will-O-Wisp's capitalization in gMovesInfo (#4425)
commit 81a73deb767e31756504c1426357faf5a566457c
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Sun Apr 21 15:40:35 2024 +0200
Fixes Quash (#4419)
* Fixes Quash
* Update test/battle/move_effect/quash.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Update test/battle/move_effect/quash.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
commit 620c453fbd2c049657c1ea9b15e6278741abcaef
Author: sneed <56992013+Sneed69@users.noreply.github.com>
Date: Sun Apr 21 15:10:14 2024 +0300
Intimidate and Super Sweet Sugar prints the right message and doesn't play animation when already at -6 (#4406)
* Intimidate won't print message or play animation at -6
Super Sweet Syrup included
* Update intimidate.c
* Update supersweet_syrup.c
* Update test/battle/ability/supersweet_syrup.c
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
commit 4b048c327b33a767b43b793e40b49497647d68ca
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Sat Apr 20 13:58:21 2024 +0200
Pokemoncommunity sprites (new batch) (#4414)
commit 88ce33c864a8dcd7378eb9f5429bad3083faf084
Author: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Sat Apr 20 02:41:01 2024 -0500
Add further icon sprite changes and fixes (#4413)
commit 5dbd90b917c2474cd89b45b2c2e33e1544c43b0e
Author: Kurausukun <lord.uber1@gmail.com>
Date: Fri Apr 19 14:17:12 2024 -0400
Use Only One Loop in RandomlyGivePartyPokerus (#1991)
commit 9cfe9b1bdd2829d1e7fa057d97925a0322878648
Merge: 8c4b1a37d 2b78a8582
Author: GriffinR <griffin.g.richards@gmail.com>
Date: Fri Apr 19 14:14:12 2024 -0400
Merge pull request #1990 from NTx86/fix-hoenn-pokedex-pal
Fix hoenn pokedex palette being split in two
commit 8c4b1a37d65fe39cf764d984e5c7c73da1c4678c
Merge: af0165a35 c64453efe
Author: GriffinR <griffin.g.richards@gmail.com>
Date: Fri Apr 19 14:11:22 2024 -0400
Merge pull request #1989 from NTx86/fix-poison-anim-array
Fix poison projectile array being incorrectly combined into three separate arrays
commit 4f0d98ec52d7f426106d39ee9bbd15d76c0a92ba
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Fri Apr 19 12:05:45 2024 -0400
Fixed datatypes for Ability inheriting (#4411)
commit be093e74149668b45bba3d4dcabbefbc37025079
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Fri Apr 19 16:34:44 2024 +0200
Couple comment changes (#4409)
* comment_change
* fix comment
* an other correction
* fix fix comment
* Update include/constants/battle_ai.h
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
commit 76f79215c7726508e3d83179ef1c2ff8c897357a
Author: Jared Schoeny <jared@schoeny.com>
Date: Fri Apr 19 00:20:26 2024 -1000
Update macOS instructions in INSTALL.md (#4407)
commit 5f4d565c863efa0e2cbd1f3f2c975d58f17a7845
Author: sneed <56992013+Sneed69@users.noreply.github.com>
Date: Fri Apr 19 00:16:36 2024 +0300
Combine AI smart switching with smart mon choices automatically and disable smart mon choices in double battles. (#4405)
* AI_FLAG_SMART_SWITCHING also sets AI_FLAG_SMART_MON_CHOICES
* Disable AI_FLAG_SMART_MON_CHOICES in doubles
commit 4fa5ae24e171f9c59182d280fccefc50ca209185
Author: Martin Griffin <martinrgriffin@gmail.com>
Date: Thu Apr 18 11:49:54 2024 +0100
Fix AI test error messages (#4404)
commit 4d5a745e31759c15b6dbb013761a4de73b95cb6e
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Thu Apr 18 10:34:33 2024 +0200
Fix bug involved infinite loop when player mon has only status moves (#4403)
commit d08fb8e82430667262fcbb77b160f4b5d595bcd5
Author: LOuroboros <lunosouroboros@gmail.com>
Date: Thu Apr 18 04:03:39 2024 -0300
Turned B_RESTORE_HELD_BATTLE_ITEMS into a non-boolean config (#4402)
* Corrected the comment description of B_RESTORE_HELD_BATTLE_ITEMS
* Made B_RESTORE_HELD_BATTLE_ITEMS a non-boolean config
commit 159eb1aea999944eb1f8d6c0eedf01708e986343
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Mon Apr 15 17:51:27 2024 -0400
Untag release
commit ab5c2d916165c60728bca6ac75874cb5a8374695
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Mon Apr 15 17:47:50 2024 -0400
Version 1.8.2 (#4394)
commit 634dcf5e26902e24d5a5b5eba15a7d556e3cec77
Author: sneed <56992013+Sneed69@users.noreply.github.com>
Date: Mon Apr 15 23:01:52 2024 +0300
Actually disable forms when disabling forms (#4395)
* Remove form table data when forms are disabled
* Remove erroreous edit
* Add missing G-Max checks
* Update form_species_tables.h
commit e8890bc8f36a511b5c33ebb42ede063e15fe9063
Author: Bassoonian <iasperbassoonian@gmail.com>
Date: Mon Apr 15 21:57:42 2024 +0200
Fix teachable learnsets crashing in some environments (#4389)
commit ecf70d365cbb1c21b5650ce52266db8591b300ea
Author: Damon Murdoch <damonmurdoch1@gmail.com>
Date: Mon Apr 15 07:31:39 2024 +1000
[Rebase of #4286] Reordered Debug_EventScript_InflictStatus1 (#4372)
* Update debug.inc
Created new merge as per discussion in discord, previous pull request https://github.com/rh-hideout/pokeemerald-expansion/pull/4286
* Added new file 'config.inc' as per feedback
Added new file 'config.inc' as per feedback
* Restore order
* fixed, my bad
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
commit fd87a79b277e23aad952002b08486423777013e1
Author: sneed <56992013+Sneed69@users.noreply.github.com>
Date: Mon Apr 15 00:23:14 2024 +0300
Pokedex plus defaults to male icons and front pics (#4390)
* Pokedex defaults to male icons and front pics
* Choose palette from personality
* Unknown icon matches front pic
commit fbff04d4e35bd08ec6ca6860d2f38ed74d54fd11
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun Apr 14 15:06:17 2024 -0400
Fixed silent Klefki cry (#4392)
* Fixed Klefki's cry not being hearable
* Added warning to family toggle file
commit 952183889a3209c1e08debfd7e6f6fde3fa6d953
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Sun Apr 14 18:43:55 2024 +0200
Fixes Ability Shield, Neutralizing Gas interaction (#4391)
* Fixes Ability Shield, Neutralizing Gas interaction
* test was wrong
commit 5bf6a252b5862d9aebf5154cc369ba0d53d79925
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Sun Apr 14 02:43:16 2024 +0200
Fixes Eject Pack softlocking the game (#4387)
commit a8a8344ba24631500412b016e015745bbd903865
Author: PCG <75729017+PCG06@users.noreply.github.com>
Date: Sun Apr 14 02:24:59 2024 +0530
Include Memento effect in `IsStatLoweringEffect` (#4386)
commit 65bee290ea7cd514b6759c8767956f8885d66ea8
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sat Apr 13 14:56:03 2024 -0400
Fixed Gengar's missing cries (#4385)
commit 2d42f72a8a88a35b6fbd242ebfed7fad8ed792ab
Author: sneed <56992013+Sneed69@users.noreply.github.com>
Date: Sat Apr 13 21:55:17 2024 +0300
Rewrite GiveBoxMonInitialMoveset_Fast (#4373)
* GiveBoxMonInitialMoveset_Fast rewrite
Fix duplicate move bug and change behavior to match GiveBoxMonInitialMoveset results
* Fixed issue with learnsets smaller than 4
commit 3b17ce39f7d462fa9a8c5e590a2ccb00a4f7e5de
Author: skolgrahd <162426316+skolgrahd@users.noreply.github.com>
Date: Sat Apr 13 13:19:14 2024 -0400
Fixed softlock w/ weather-triggered form changes & Cloud Nine (#4382)
* Fixed softlock when weather-triggered form changes are suppressed by Cloud Nine
* Removed KNOWN_FAILING; line from Castform Air Lock test
commit a0a5ba4af2566507b8d5efc465e7296f3c6cc8dc
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Sat Apr 13 14:14:43 2024 +0200
Adds Role Play tests (#4381)
* Adds Role Play tests
* gastro acid
* Update gastro_acid.c
commit 2b78a85828eb40b68a0973615665fd22b961bfd9
Author: NT_x86 <sumoner200@gmail.com>
Date: Sat Apr 13 13:09:24 2024 +0300
Fix hoenn pokedex palette being split in two
commit c64453efe50959e6286e984a2a7dda47a1d86831
Author: NT_x86 <sumoner200@gmail.com>
Date: Sat Apr 13 10:14:31 2024 +0300
Fix poison projectile array being incorrectly combined into three seperate arrays
commit 91286123d12a0f403e4a462aac26d64db2b029ac
Merge: 35e04b84a 8329d8368
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Fri Apr 12 09:13:57 2024 -0400
Mid-April pret merge (#4380)
commit 8329d8368d9a2fb450d171c56b4c7dc2c42eb104
Merge: 35e04b84a af0165a35
Author: Bassoonian <iasperbassoonian@gmail.com>
Date: Fri Apr 12 12:16:28 2024 +0200
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergemidapril
commit 35e04b84a82654b701f8ae21cad5ee1536109180
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Fri Apr 12 12:15:49 2024 +0200
Fixes Cud Chuw (#4379)
* Fixes Cud Chuw
* small correction
commit ee3a577240863bbfdf2d79f67010be883872ef3d
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Thu Apr 11 21:34:11 2024 +0200
Fixes givemon moves not defaulting to none (#4377)
commit af0165a35d675be2ebb402fbaccf0c49ae9504b2
Merge: a0637251f f9d690baf
Author: GriffinR <griffin.g.richards@gmail.com>
Date: Thu Apr 11 14:41:04 2024 -0400
Merge pull request #1987 from PokemonSanFran/cancelGroundEffectsCamera
Added fix to Keep the Camera from Making Waves
commit a0637251f874053493d1a967770e618b1d779aa2
Merge: 0b73cd81d 3135a1fc2
Author: GriffinR <griffin.g.richards@gmail.com>
Date: Thu Apr 11 14:39:00 2024 -0400
Merge pull request #1986 from LOuroboros/patch-1
Updated value of gMain.inBattle at OpponentHandleEndLinkBattle
commit 0b73cd81d8f7cf365c1a7f399abc04ac9407e3fc
Merge: f19747d6c 71b8d2039
Author: GriffinR <griffin.g.richards@gmail.com>
Date: Thu Apr 11 14:38:40 2024 -0400
Merge pull request #1985 from PokemonSanFran/surfingDismountFix
BUGFIX for Surfing Dismount Ground Effects
commit 5d9f78bcb5f286f39f30e758405eb113084fe09a
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Thu Apr 11 10:42:55 2024 +0200
Fixes bug preventing Belch from usage after Stuff Cheeks (#4376)
commit 62d054e135f7c3bfb3b99bc80159d6693e1771ef
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Thu Apr 11 10:23:16 2024 +0200
Future Sight fixes (#4350)
* Future Sight fixes
* handle life orb boost
* applied review
* Future Sight changes
* removed future sight no hit string
* agbcc
* Update battle_scripts.h
commit 3fb52b6b0e2f60d8db465048659c5253220570bb
Author: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Wed Apr 10 02:16:32 2024 -0500
Change Frostbite abbreviation from FSB to FRB (#4355)
* Change Frostbite abbreviation from FSB to FRB
* Melted the ice is actually the one used
* Update moves_info.h
* Update moves_info.h
* Update items.h
commit 3c85089428e1fa4a1f127dd221b60e8cb02c959b
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Tue Apr 9 10:32:11 2024 +0200
Fixes Gulp Missile Dive / Power Herb interaction (#4371)
* Fixed Cramorant Dive / Power Herb interaction
* remove file
* leftover
commit b5c7332182a1dacc17713d44f502b3ec85b2c097
Author: Philipp AUER <SBird1337@users.noreply.github.com>
Date: Sun Apr 7 16:43:04 2024 +0200
feat: check if inside of git repository before building (#4363)
* feat: check if inside of git repository before building
* pokemon_expansion -> pokeemerald-expansion
---------
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
commit 41ddd911b7b52020f33789b7e6818e461c5a0c9a
Author: Martin Griffin <martinrgriffin@gmail.com>
Date: Sun Apr 7 12:08:35 2024 +0100
Include gba/defines.h in gba/types.h (#4364)
If gba/types.h is included before gba/defines.h, it ends up declaring a
variable named PACKED rather than specifying that BgCnt should be
packed.
commit c740c4ba19c451ff63fb9ec602d316aa94d1a632
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Sun Apr 7 00:07:55 2024 +0200
Disguise fixes + gen8 hp loss config (#4360)
* Disguise fixes + gen8 hp loss config
* fix battler arg
* Update test/battle/ability/disguise.c
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
commit 77db5d9d1ebe288e38d916780eab787659e9c223
Author: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Sat Apr 6 04:26:16 2024 -0500
Update almost all Gen 9 icon sprites + add the missing ones (#4290)
* Ogerpon form icons
* Sprigatito family
* Fuecoco family
* Quaxly family
* Lechonk family
* Tarountula family
* Nymble family
* Pawmi family
* Tandemaus family
* Fidough family
* Smoliv family
* Squawkabilly forms
* Nacli family
* Charcadet family
* Tadbulb family
* Wattrel family
* Maschiff family
* Shroodle family
* Bramblin family
* Toedscool family
* Klawf
* Capsakid family
* Rellor family
* Flittle family
* Tinkatink family
* Wiglett family
* Bombirdier
* Finizen family
* Varoom family
* Cyclizar
* Orthworm
* Glimmet family
* Greavard family
* Flamigo
* Cetoddle family
* Veluza
* Dondozo
* Tatsugiri forms
* Annihilape
* Clodsire
* Farigiraf
* Dudunsparce
* Kingambit
* Great Tusk
* Scream Tail
* Brute Bonnet
* Flutter Mane
* Slither Wing
* Sandy Shocks
* Iron Treads
* Iron Bundle
* Iron Hands
* Iron Jugulis
* Iron Moth
* Iron Thorns
* Frigibax family
* Gimmighoul family
* Treasures of Ruin
* Roaring Moon
* Iron Valiant
* Paradox duo
* Walking Wake
* Iron Leaves
* Dipplin
* Poltchageist family
* The Loyal Three
* Ursaluna Bloodmoon
* Revert "Ursaluna Bloodmoon"
This reverts commit 33486816cf19ebe4b868117824c0ac77e183e806.
* Revert "Revert "Ursaluna Bloodmoon""
This reverts commit 2d0e90e51d896517821cda42aea5bb5fabd0b61e.
* Oops, out of order :(
* Paldean Tauros breeds
* PLA New Pokemon
* PLA Hisuian Forms
* Archaludon
* Hydrapple
* Gouging Fire
* Raging Bolt
* Iron Boulder
* Iron Crown
* Terapagos forms
* Pecharunt
* Partner Pikachu
* Partner Eevee
* Address reviews
* Arboliva tweak
commit f9d690bafeeea422d113ab44297704269abf2f48
Author: pkmnsnfrn <pkmnsnfrn@gmail.com>
Date: Fri Apr 5 14:58:31 2024 -0700
Added fix to Keep the Camera from Making Waves
commit 3135a1fc2b1461c328c6a11e88d1df6b7a6b1455
Author: LOuroboros <lunosouroboros@gmail.com>
Date: Fri Apr 5 17:04:46 2024 -0300
Updated value-setting of gMain.inBattle at OpponentHandleEndLinkBattle
commit 4aeae4a52e6bac8d15ea9362426aca6900e755ac
Author: Bassoonian <iasperbassoonian@gmail.com>
Date: Fri Apr 5 20:17:30 2024 +0200
Fix Trainer Slide message misbehaving (#4353)
commit e4d81150c0cd8916e7cf22c3442b16b5ce8a81c7
Author: Bassoonian <iasperbassoonian@gmail.com>
Date: Fri Apr 5 20:01:33 2024 +0200
Add Earth Eater AI code (#4352)
commit 520efa01c8eb7b904c7154bba67435d4bd66e0ad
Author: sneed <56992013+Sneed69@users.noreply.github.com>
Date: Fri Apr 5 19:11:11 2024 +0300
Fixes Guts countering frostbite spAtk reduction (#4351)
commit 71b8d2039732554235cee49f765d0a0dd7f03dff
Author: pkmnsnfrn <pkmnsnfrn@gmail.com>
Date: Thu Apr 4 16:21:34 2024 -0400
Replaced magic numbers regarding triggerGroundEffectsOnMove to TRUE / FALSE
commit 7ee921e9dae948713f94c5f286855e3001f05a3f
Author: pkmnsnfrn <pkmnsnfrn@gmail.com>
Date: Thu Apr 4 16:17:48 2024 -0400
Added BUGFIX for groundEffectsOnMove when the player stops Surfing
commit d1c2a10af68351cb0c54a5c1851bd4e058007b9b
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Thu Apr 4 19:52:45 2024 +0200
Fixes switch in AI bug (#4338)
* Fixes switch in AI bug
* fixes fix
* test
commit 2baa3525e124db373f7a837c32d1a67683a3fd26
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Thu Apr 4 14:51:07 2024 +0200
Fixes ability pop up config (#4339)
commit c52ae074abd82ca746d2fd8082a2f751a54d5d7c
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Thu Apr 4 14:48:57 2024 +0200
Fixes Protective Pads Fluffy interaction (#4340)
* Fixes Protective Pads Fluffy interaction
* couple more tests
commit d580c980a77ca7ef2357938cf796c1f7da15ab1f
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Wed Apr 3 15:29:46 2024 -0300
Clarify to not use the "Download ZIP" option (#4336)
* Clarify to not use the "Download ZIP" option.
* Link to TAAR guide
* Further discouraging
commit 29a4444fc128f392c627e6eda95393e9fda3f34d
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Tue Apr 2 21:32:47 2024 +0200
Pecharunt sprite from pokemoncommunity (#4324)
* Pecharunt sprite from pokemoncommunity
* disable icon sprite
commit 7c1a0bb685bc70d0cce950c271cf73e95c366300
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Tue Apr 2 21:32:19 2024 +0200
defiant_tests (#4331)
commit f65fc5f849cb974ec93ab574984edc1c2a8b7342
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Tue Apr 2 11:06:14 2024 +0200
Fix totem boost not triggering (#4328)
commit f5a5932e4d71c3c1311aa7dbb349710dbd7e5311
Author: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Mon Apr 1 23:42:14 2024 +0200
Fixes Soft Level Cap issue (#4327)
commit e1f6480e32560d4314c50440d44a1381d65db641
Merge: 8f6f744e7 a54d64194
Author: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
Date: Mon Apr 1 14:58:36 2024 -0400
Random Pyramid Encounter fixes (#4326)
commit a54d6419436bfd9c0861517a76f0c0494f4b6505
Author: Alex <alexthenotes@gmail.com>
Date: Mon Apr 1 20:38:58 2024 +0200
fix get base species id
commit f58bec2397f4eeef3fa6a5384f2e439f4020d1c8
Author: Alex <alexthenotes@gmail.com>
Date: Mon Apr 1 20:31:01 2024 +0200
Random Pyramid Encounter fixes
commit 8f6f744e7f0d5bd95d5e6b72a6a24e8879da9694
Author: Zimmermann Gyula <graiondilach@hotmail.com>
Date: Sat Mar 30 11:46:15 2024 +0100
Check for the correct battler's No Guard. (#4320)
commit 0acd058c161d38993914a295d7ddf29cbc0383dd
Author: Bassoonian <iasperbassoonian@gmail.com>
Date: Fri Mar 29 17:43:33 2024 +0100
Fix style of some bit definitions (#4319)
commit 46e6324fe2b8b10d36f8a9fafdea87ca862c92a7
Author: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri Mar 29 17:43:05 2024 +0100
Fix White Herb Known Failing tests (#4258)
* Fix White Herb Known Failing tests
* get out agbcc
* remove unneeded white herb test
commit 8c7ba8a8498f62252633310430ec76b3328e6507
Merge: f038dbba9 9527f1e17
Author: Bassoonian <iasperbassoonian@gmail.com>
Date: Fri Mar 29 16:49:29 2024 +0100
Fix formatting of plates (#4318)
commit 9527f1e1751fee53ff0a026b04bc1a0d0d45050a
Author: Bassoonian <iasperbassoonian@gmail.com>
Date: Fri Mar 29 15:31:28 2024 +0100
Fix formatting of plates
commit f038dbba9e02cab466a31e73fa0f65c69b824109
Merge: 4a8551247 3d181e5c7
Author: Bassoonian <iasperbassoonian@gmail.com>
Date: Fri Mar 29 14:18:14 2024 +0100
Pret merge (2024/03/24) (#4304)
commit 4a8551247adc84fe30073ff25657f318ba0368f0
Author: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri Mar 29 11:33:28 2024 +0100
Fix Z mirror move (#4308)
commit 6abd75b05543bdad9b3f9a17dd878b8ba50ae8f2
Author: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue Mar 26 17:23:57 2024 +0100
fix broken battle arena gfx (#4307)
commit 68fa212738da7ab82c6d726119ce3ad498382b8b
Author: ravepossum <145081120+ravepossum@users.noreply.github.com>
Date: Tue Mar 26 03:58:00 2024 -0400
Fix Receiving Zero Exp When Below Level Cap (#4305)
* fix logic for calculating exp from level cap when below cap
* Update src/level_caps.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
---------
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
commit 9b2feafdf2e740756e3774d5ad92199da2b48af9
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun Mar 24 17:52:47 2024 -0300
Non-tagged
commit 024848a9e9c0ae30cbb9a269779504561d5443d3
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun Mar 24 16:07:49 2024 -0300
Version 1.8.1 (hotfix) (#4303)
commit 30851b0ad86c6a894674850ac0e6be5089f129cb
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun Mar 24 14:59:28 2024 -0300
Fixed Egg's summary screen softlock (#4301)
commit 3d181e5c7032d65308323c97ca3ed3cc5946e196
Merge: 88565970c f19747d6c
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun Mar 24 13:52:18 2024 -0300
Merge remote-tracking branch '_pret/master' into _RHH/pr/master/pret_sync20240324
# Conflicts:
# src/battle_anim_fight.c
commit 88565970c8de64300c234f16cade9171d7996be5
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun Mar 24 08:19:24 2024 -0300
Fixed unintended form behavior (#4299)
commit 795b927dfcdec097e161df464a538ab273273c8d
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun Mar 24 08:16:20 2024 -0300
Added pre-1.6.2 changelogs (#4296)
* Added pre-1.6.2 changelogs
* Fixed missing emoji lol
commit f19747d6cc340cad5689e526ec29af30bc89b82e
Merge: b08d62b61 927f098cf
Author: GriffinR <griffin.g.richards@gmail.com>
Date: Thu Mar 21 21:28:30 2024 -0400
Merge pull request #1983 from LOuroboros/modernfateful
Renamed ScrCmd_setmonmodernfatefulencounter and ScrCmd_checkmonmodernfatefulencounter for consistency reasons
commit b08d62b615b09ef3fd743f5c6ad1d1017ac397bd
Merge: b4f92ad2e 2db9ab2a2
Author: GriffinR <griffin.g.richards@gmail.com>
Date: Thu Mar 21 21:23:53 2024 -0400
Merge pull request #1961 from GriffinRichards/doc-camera-sprite
Document camera sprite functions
commit b4f92ad2e1a4df64b90e7498ea31d15b0ccad51b
Merge: 82c3e4af1 82f863650
Author: GriffinR <griffin.g.richards@gmail.com>
Date: Thu Mar 21 21:16:56 2024 -0400
Merge pull request #1982 from DizzyEggg/anim_improvements
Simplify weirdly matching division/substraction code
commit 1b1ee8d6c879436c3c0a1155dbc560f70bb3d9d5
Author: ravepossum <145081120+ravepossum@users.noreply.github.com>
Date: Thu Mar 21 09:57:07 2024 -0400
small fixes to python install instructions (#4288)
Co-authored-by: ravepossum <ravepossum@example.com>
commit 26ba65c7a7afff16c1ad4d7a51889d39784f2b1f
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Thu Mar 21 10:56:29 2024 -0300
Fixed species flag padding (#4291)
commit 3623694789225a4a4dbece35d81c11f1dc72f5ef
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Wed Mar 20 19:19:18 2024 -0300
Actually remove unused STATUS3_CANT_SCORE_A_CRIT (#4293)
commit d662409cda6815c7a3820d5d131a297122372ae2
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Mon Mar 18 17:40:05 2024 -0300
Disable Tera Type on summary screen by default (#4289)
commit 37c44ae7630d9f9b956ded7999103ae3a833a41e
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun Mar 17 17:10:44 2024 -0300
Fix README.md (#4285)
commit 6b283506498e08ee9d984051fd3909cc4f6ba761
Author: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun Mar 17 13:19:32 2024 -0300
Non-tagged
commit 107bcdf6231beb59f29e2d964c0602d844e4c259
Merge: dbd7e2a7c 331e…
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Issue: Special evolutions can currently trigger twice if canceled and another evolution occurs.
Example setup:
Slot 1: Bulbasaur Lvl 15 (close to lvl 16)
Slot 2: Farfetch'd Galarian Lvl x
Battle: Switch out Bulbasaur to Farfetch'd -> crit 3x with Farfetch'd -> capture/defeat Pokemon -> Bulbasaur levels up
Now Farfetch'ds evolution triggers -> cancel ->Bulbasaurs evolution triggers -> cancel -> Farfetch'ds evolution triggers again
Side effect of this solution: Evolution order now alway in party order, previously party slots with special evolutions triggered first
Discord contact info
.cawt