PhallenTree
68701a9e2d
Fix some Pledge move combo issues ( #5330 )
...
Fix Pledge moves looping, adds tests for pledge+incapacitation situations
2024-09-08 08:28:16 +02:00
Alex
28287fe80a
Fixes minor wrong order in AI_CalcDamage and adds Tera Blast/Tera Storm ( #5155 )
...
* Fixes minor wrong order in AI_CalcDamage and adds Tera Blast/Tera Storm
* update moveEffect
* fix compile
2024-09-06 21:08:54 +02:00
Liamjd14
e9c0784dc0
Gen 9 Follower pokemon sprites ( #5304 )
...
* Gen 9 Follower Sprites
2024-09-05 22:31:14 +02:00
ghoulslash
ff72723464
Fix Cmd_trainerslidein/out ( #5326 )
...
* fix Cmd_trainerslidein battler Id
* GetBattlerForBattleScript in trainerslideout
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-09-05 20:51:13 +02:00
Pawkkie
9bd5601b5c
Wonder Guard AI Fix ( #5317 )
...
* Fix Wonder Guard looping
* Review + Sheer Cold
2024-09-02 17:43:41 -04:00
SarnPoke
a422db09c6
Fix Slateport Battle Tent/Battle Factory ( #5281 )
...
* Fix Slateport Battle Tent/Battle Factory
Stops the Battle Factory and Slateport Battle Tent from returning no Pokémon when player wants to swap their Pokémon.
* Fix player rental party being junk data after rest
Fixes #5280
* Consolidate checks into single method
Consolidates every gSpecialVar_0x8005 check into a singular method.
2024-09-02 16:53:03 -04:00
hedara90
fb1f12aa1b
Fixed Max Attacks into Max Guards message printing ( #5312 )
...
* Fixed Max Attacks into Max Guards message printing
* Updated the solution
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-02 13:58:10 +02:00
Ariel A
42d9f24c84
feat: added OW_MON_WANDER_WALK config option
2024-09-01 17:17:24 -04:00
Ariel A
839cf2e790
feat: static OW pokemon now bob while walking in place (per OW_MON_BOBBING)
2024-09-01 15:31:12 -04:00
Alex
6648498e2e
Fixes dmax move base power not seen by ai ( #5299 )
2024-09-01 18:07:18 +02:00
Alex
e09a59a7e4
Fixes Tar Shot on Tera mons ( #5302 )
...
* Fixes Tar Shot on Tera mon
* new line
2024-08-31 12:24:28 -04:00
AgustinGDLV
cfa56962e1
fixed dupe gimmick use in doubles ( #5235 )
...
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2024-08-31 13:15:56 +02:00
PhallenTree
ac9b40a423
Fixes Max Moves ignoring absorbing abilities, G-Max Corviknight and Centiskorch names ( #5296 )
...
* Fix Max and G-Max Moves bypassing absorbing abilities
* Fix G-Max Corviknight and Centiskorch speciesName
* Remove some outdated comments
* Missing Dynamax check
* Add Max Quake and Max Overgrowth to test
2024-08-31 12:39:37 +02:00
GriffinR
04197b4912
Fix swapped cycling road entrances
2024-08-31 01:54:25 -04:00
Alex
addaf40971
Fixes Scale Shot not activating + Known Failing Round test ( #5292 )
...
* Fixes Scale Shot not activating + Known Failing Round test
* Update test/battle/move_effect/multi_hit.c
2024-08-30 19:36:14 -04:00
Cafei
8053f4ab1e
Enable female Indeedee follower and improve shiny Indeedees ( #5285 )
...
Enable Indeedee female follower sprite.
Shiny improvements.
Fix front Indeedee male shading.
2024-08-29 18:14:46 +02:00
Cafei
213c097dc0
Paldean Wooper and Clodsire followers ( #5277 )
2024-08-28 11:47:08 +02:00
Alex
98dbf3a575
Fixes Charged up status ( #5274 )
...
Charge changed to last until the damage boost is consumed instead of next turn, previous behavior accessible with `B_CHARGE`
2024-08-27 20:01:51 +02:00
PhallenTree
930cac6aca
Fix Instruct bypassing AtkCanceler, Entry Hazards targeting wrong side of the field if opponent fainted ( #5262 )
...
* Fix Instruct bypassing AtkCanceler + interaction with firstTurnOnly moves
* Fix Entry Hazards targeting the wrong side of the field if opponent fainted
* Remove unused BattleScript_AuroraVeilEnds and STRINGID_AURORAVEILENDS
* Alternative fix + Fix gBattlerTarget initially set to 2
* Fix Instruct animation
* Alternative anim fix
2024-08-27 14:46:56 +02:00
laserXdolphin
c406c4cc76
Fixed Ice Fang frostbite and freeze text. The frostbite and freeze texts were swapped. ( #5273 )
2024-08-27 14:33:58 +02:00
Pawkkie
e9c8bd0548
Revert "Chilly Reception AI" ( #5270 )
2024-08-26 16:58:15 -07:00
hedara90
74c309e2b0
Replaced all usages of tabs in C files with spaces ( #5261 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-26 16:55:54 -07:00
Pawkkie
a9f31dcc4f
Chilly Reception AI ( #5265 )
2024-08-26 18:57:17 -04:00
kittenchilly
03b0d066ce
Update battle_ai_main.c
2024-08-26 16:50:58 -05:00
hedara90
2e43ffd5f7
Fixed Snore not hitting twice with Parental Bond ( #5264 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-26 21:59:39 +02:00
kittenchilly
80ad7f15cc
Chilly Reception AI
2024-08-26 13:09:50 -05:00
SarnPoke
5de0f3cb4a
Add Anger Point/Crit Moves Doubles AI Interaction ( #5244 )
...
* Add Anger Point/Crit Moves AI Interaction
Encourages the AI to use an "always crit" move on its partner, if that partner has the Anger Point ability.
* Add OHKO check
Makes sure that the crit move does not OHKO the partner with Anger Point.
* Fix mistake
Fixes small mistake
* Add Speed Check
Checks if mon is faster than its Anger Point partner when scoring.
2024-08-25 23:38:40 +02:00
kittenchilly
afd18f06b4
Fix switch out move message ( #5258 )
2024-08-25 23:29:33 +02:00
Alex
92038129e2
Fixes Purifying Salt being poisoned by Toxic Spikes ( #5252 )
2024-08-25 09:06:03 -04:00
hedara90
51a127fcb5
Better implementation of the obedience fix ( #5245 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-25 11:20:26 +02:00
Hiram Anderson
36a5c6ed4f
Basculin graphics config fix ( #5256 )
...
This fixes a compilation error that occurs if OW_POKEMON_OBJECT_EVENTS is true but P_HISUIAN_FORMS is false.
2024-08-25 10:03:33 +02:00
kittenchilly
2fed75f7c5
Adaptability, Aerilate, Aftermath tests ( #5242 )
...
* Adaptability, Aerilate, Aftermath tests
* Update test/battle/ability/aerilate.c
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-08-24 10:53:19 -04:00
PhallenTree
85fe398b50
Fix Starting Status being passed on to future wild battles ( #5248 )
2024-08-24 14:28:24 +02:00
Salem
4208da1e22
add missing break for poison puppeteer ( #5243 )
2024-08-23 18:21:40 +02:00
Martin Griffin
ac28fc52e5
Merge pull request #2007 from cawtds/ub-fix-battle-transition
...
UB fix in battle_transition.c
2024-08-21 19:08:07 +01:00
Martin Griffin
56d3faa32f
Merge pull request #2025 from Bassoonian/cleandefinespaces
...
Clean up defines lacking spaces
2024-08-21 19:04:12 +01:00
Martin Griffin
ea726eee31
Merge pull request #2024 from luckytyphlosion/master
...
Slight storage system documentation
2024-08-21 19:02:03 +01:00
kittenchilly
bd38c64f29
New Garganacl and Naclstack battle sprite + various battle sprite fixes ( #5142 )
...
Garganacl, Spidops, Wattrel, Kilowattrel, Shroodle, Bombirdier, Orthworm, Veluza, Aerodactyl-Mega, Medicham-Mega, Latis-Mega, Diancie-Mega, Ponyta-Galar, Rapidash-Galar, Magearna, Landorus.
2024-08-20 20:16:32 +02:00
hedara90
d379ffef3e
Fixed Confide+Crafty Shield interaction ( #5202 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-20 08:24:42 -04:00
Alex
bde6982890
Fixes weather abilities not activating when Cloud Nine user leaves th… ( #5209 )
...
* Fixes weather abilities not activating when Cloud Nine user leaves the field
* parametrize
2024-08-20 07:24:48 -04:00
Pawkkie
a111ac496d
Fix typos ( #5221 )
...
Fix typos in move description of Decorate, Collision Course and Electro Drift
2024-08-20 12:44:27 +02:00
PhallenTree
bc5f40e518
Adds missing Wind Rider activation and tests ( #5207 )
...
* Adds missing Wind Rider activation + tests
* Adds test for opponent setting up Tailwind
* Update src/battle_util.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-08-19 15:25:44 +02:00
kittenchilly
a958e61110
Fix using Population Dice with Loaded Dice printing garbage text ( #5195 )
2024-08-17 22:33:11 +02:00
Alex
8607a7fb33
Fixes UB in Cmd_averagestats ( #5191 )
...
* Fixes UB in Cmd_averagestats
* fix test and align default case
2024-08-17 18:19:22 +02:00
Alex
3a0c5c9c6c
Adds missing AI checks for poltergeist ( #5189 )
...
Adds missing AI checks for poltergeist
2024-08-17 18:18:03 +02:00
hedara90
b641c6f4fa
Fixed incorrect weather damage rounding when maxHP <16 ( #5183 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-16 23:02:49 +02:00
hedara90
bd3d99d7d9
Fixed Retaliate not working correctly with passive damage ( #5182 )
...
* Fixed Retaliate not working correctly when allies fainted from passive end of turn damage
* Changed test parameters to use legal stats
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-16 17:31:28 +02:00
PhallenTree
ec3a86dd9a
Adds in-battle effect of Pickup, adds Harvest and Pickup tests ( #5170 )
...
* Adds Harvest tests
* Adds Pickup in-battle effect + tests
* Fix G-Max Replenish test (Munchlax activates Pickup before G-Max Replenish)
* Change canPickupItem to bit field
* Make RandomUniformExcept inclusive (higher end) + convert bitfield
* Use CantPickupItem in PickupHasValidTargetc check
* Review
2024-08-16 15:37:23 +02:00
GriffinR
3f49c5cbaf
Fix trainer match call flags
2024-08-15 23:00:20 +02:00
Bassoonian
c1ee43254e
Clean up defines lacking spaces
2024-08-15 19:34:56 +02:00
hedara90
45f10d734f
Fixed Ice Face, implemented tests ( #5171 )
...
* Fixed Ice Face, implemented tests
* Fixed agbcc and bad battle mon looping
* Fixed the ShouldChangeFormInWeather function again
* Cleaned up End of Turn weather form changes, simplified Ice Face
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-15 13:51:39 +02:00
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) ( #5174 )
2024-08-14 19:48:20 -07:00
luckytyphlosion
7d921fa89b
Slight storage system documentation
2024-08-14 18:27:44 -04:00
Alex
e3d9bb643f
#5120 Follow up ( #5158 )
...
Consistency change
2024-08-14 18:27:40 +02:00
Alex
9019fed264
Fixes booster energy not increasing speed ( #5167 )
...
* Fixes booster energy not increasing speed
* alternative solution
* forgot else
2024-08-14 18:26:52 +02:00
Sadfish the Sad
fde85e9357
some gen 9 move anims + fickle beam rework ( #5159 )
...
* new move anims + fickle beam rework
* more fickle beam changes
* removed the true for consistency
* ficklebeamboosted gets cleared now
* mortal spin and thunderclap changes
* minor mortal spin pal change
* removed hex numbers and made hard press quicker
2024-08-14 17:20:18 +02:00
Bassoonian
63a1f85d81
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge14aug
2024-08-14 12:33:04 +02:00
GriffinR
a3d5f54b75
Fix type for offset in MapConnection
2024-08-13 19:10:24 +02:00
Alex
a8cd459370
Fixes Purifying Salt not halving dmg for dynamic move types ( #5145 )
...
* Fixes Purifying Salt not halving dmg for dynamic move types
* forgot to add
2024-08-12 15:54:24 -04:00
cawtds
ba1512f864
Fix specific tiles changing to pc tiles when using boxlink/debug pc ( #5141 )
2024-08-12 15:52:55 -04:00
Alex
863b96f759
Fixes Stomping Tantrum effect not doubling power in certain situations ( #5140 )
...
* Fixes Stomping Tantrum effect not doubling power in certain situations
* fix dancer test
2024-08-11 19:05:38 -04:00
Eduardo Quezada
e6e2285c44
Added OBJ_EVENT_GFX_SPECIES_SHINY
2024-08-11 14:50:38 -04:00
PhallenTree
779cedd16f
Fixes Dancer, adds Revelation Dance interactions with Z-Move, Roost and typeless mons ( #5133 )
...
* Add Revelation Dance interactions with typeless mons, Roost and Z-Move
* Fixes Dancer-called moves not updating their type
* Adds Revelation Dance tests
* Make sure target isn't immune in Dancer test
* Missing ... in message
* Missing Assume
* CI ends Dancer test too early?
* Z-Revelation Dance is Breakneck Blitz (Test)
* Fix test (Zoroark too strong?)
* Replace H!Zoroark
* Remove Ability specification
* Remove HP_Bars
* Fix Dancer checking for battlers that don't exist in single battles
2024-08-11 12:13:46 -04:00
Alex
137c15a9ce
Clean up for #4928 ( #5120 )
...
* Clean up for #4928
* agbcc
* review comments
* agbcc
* Update src/battle_util.c
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-08-11 13:21:49 +02:00
Alex
527cc33e0d
Adjusted AI calcs for Triple Kick Effect ( #5127 )
...
* Adjusted AI calcs for Triple Kick Effect
* use strikeCount
* fix compile
2024-08-11 13:01:10 +02:00
Alex
77afb01477
Fixes Zigzgoon battle being able to use a Gimmick ( #5129 )
...
* Fixes Zigzgoon battle being able to use a Gimmick
* add commit
* Update src/battle_terastal.c
* Update src/battle_dynamax.c
2024-08-11 00:23:51 +02:00
kittenchilly
a4dc9a0480
Add Dowsing Machine expanded name ( #5134 )
2024-08-10 23:59:23 +02:00
Martin Griffin
a5e0738484
trainerproc: Parse line markers ( #5122 )
2024-08-08 20:12:18 +02:00
hedara90
6bbc0601a9
Fixed non-grass Ivy Cudgel breaking battle UI ( #5117 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-08 10:39:38 +02:00
Bassoonian
c390999141
Pret Merge (7th of August) ( #5116 )
2024-08-08 10:23:14 +02:00
Bassoonian
0b1f06b594
Merrp merge (7th of August) ( #5110 )
2024-08-07 22:05:07 +02:00
pkmnsnfrn
5635f94036
More changes from typeX to types[X]
2024-08-07 11:35:45 -07:00
Bassoonian
cb4e687917
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergeforpsf
2024-08-07 19:05:46 +02:00
Pawkkie
9f845a79e5
Fix Switch AI Bug: AI never switching out when it could be OHKO'd ( #5089 )
...
* Fix switch AI bug
* Forgot to save a file lol
* Fix infinite loop test compatibility
2024-08-07 15:58:39 +02:00
Bassoonian
207129e0c8
Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into pretmerge7aug
2024-08-07 12:42:45 +02:00
psf
312749dd31
Changed type1 and type2 to be consistent ( #2021 )
...
* Changed type1 and type2 in gBattleMons to match gSpeciesInfo
* Changed monType1 and monType2 to monTypes to match gSpeciesInfo
2024-08-07 06:44:03 +01:00
Ariel A
5293e67995
Merge branch 'followers' into followers-expanded-id
2024-08-07 00:02:16 -04:00
kittenchilly
e4f09c8103
Move Relearner now displays move category ( #5081 )
...
* Move relearner now displays move category
* Update move_relearner.c
* Update move_relearner.c
* Address reviews
2024-08-06 23:58:18 +02:00
tertu
08f8ccd9eb
Follower palette fix ( #5107 )
2024-08-06 11:52:05 -05:00
Hedara
a9492f5b1c
Fixed Xerneas
2024-08-06 16:52:42 +02:00
Hedara
29bb658d1b
Fixed some overworld palettes
2024-08-06 13:25:26 +02:00
PhallenTree
67f049fddb
Fixes Defiant interaction with Court Changed Sticky Web + Fickle Beam description ( #5093 )
...
* Fixes Court Changed Sticky Web deactivating Defiant/Competitive
* Fixes Fickle Beam's description
* Alternative fix
* Remove extra newLine
2024-08-06 10:45:30 +02:00
Bassoonian
55159bedd7
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5aug
2024-08-05 23:32:38 +02:00
Philipp AUER
1f93c25611
use OBJ_EVENT_GFX_SPECIES_MASK in bufferspeciesname ( #5088 )
...
Co-authored-by: sbird <sbird@no.tld>
2024-08-05 15:18:35 -04:00
Bassoonian
4dce7db714
Another text fix
2024-08-04 16:53:46 +01:00
Bassoonian
369efc1208
Fix two small text errors in follower dialogue
2024-08-04 01:15:36 +01:00
pkmnsnfrn
0fb48e8a9a
Fixed expanded OW IDs
2024-08-03 17:04:33 -07:00
Alex
41a79e3833
IsValidForBattle function formatting ( #5085 )
...
ocd
2024-08-03 22:23:34 +01:00
Martin Griffin
9d97537ee2
Fix speed ties ( #4780 )
...
* Fix speed ties
* fixup! Fix speed ties
* fixup! Fix speed ties
* fixup! fixup! Fix speed ties
* fixup! Fix speed ties
* Workaround for Comatose-Ditto interaction
2024-08-03 17:29:47 +02:00
Frank
62b4ea5aaa
Fixed bottom half of Mt. Pyre not being labeled in PokeNav
2024-08-01 13:34:17 -04:00
Eduardo Quezada
57fc0fd3b9
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-01 08:36:11 -04:00
Alex
de8002e9e0
Removes unnecessary checks for Shield Dust and Covert Cloak ( #5073 )
...
* Removes unnecessary checks for Shield Dust and Covert Cloak
* remove redundant include
* Update test/battle/ability/shield_dust.c
Co-authored-by: hedara90 <90hedara@gmail.com>
* Update test/battle/hold_effect/covert_cloak.c
Co-authored-by: hedara90 <90hedara@gmail.com>
---------
Co-authored-by: hedara90 <90hedara@gmail.com>
2024-08-01 09:58:14 +02:00
Eduardo Quezada
8450268b74
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/data/battle_anim.h
2024-07-31 18:13:19 -04:00
Alex
3b9ea5b54c
Adds battle frontier conversion script ( #5040 )
...
Adds script to convert battle frontier mons to new format
Fixes existing battle frontier mons to match vanilla
2024-07-31 15:04:21 -07:00
tertu
05ff7cef1c
Tweak IV generation slightly ( #4876 )
...
With HQ_RANDOM on, this means that the generator now only consumes one RNG output when generating IVs.
Without HQ_RANDOM on, IV generation should be unchanged.
2024-07-31 19:51:47 +02:00
Alex
e6175b5b84
Fixes spread damage in double battles ( #5064 )
...
* Fixes spread move damage in doubles
* add DoubleBattle check
* add additional check to test
* restore trainer party
2024-07-31 12:20:57 +02:00
PhallenTree
ab9f8e69fb
Fixes Stalwart/Propeller Tail, Life Orb on confusion, Remove Status wrong battlescripts ( #5061 )
...
* Fix swapped BattleScripts in MoveEffectRemoveStatus for Freeze/Frostbite
* Fix Life Orb damaging the user if they hit themselves in confusion
* Fix Stalwart/Propeller Tail not ignoring redirection from Storm Drain/Lightning Rod
* Parametrize Species
2024-07-30 10:36:22 +02:00
hedara90
74220518d4
Fixed the animation tables being different sizes ( #5063 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-29 13:34:19 -04:00
Eduardo Quezada
3372503430
Added OBJ_EVENT_GFX_SPECIES_SHINY macro ( #5049 )
...
* Added OBJ_EVENT_GFX_SPECIES_SHINY
* Update src/event_object_movement.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-29 18:41:03 +02:00
Eduardo Quezada
54c19af037
Fixed B_HEAL_BELL_SOUNDPROOF checking for Gen9+ instead of Gen8+ ( #5060 )
2024-07-29 16:28:32 +02:00
Eduardo Quezada
b4eca0a6ec
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# data/battle_anim_scripts.s
# src/battle_util.c
2024-07-29 09:36:16 -04:00
hedara90
a89820fa96
Fixed Hidden Power damage category for PSS < GEN_4 ( #5053 )
...
* Fixed Hidden Power damage category for PSS < GEN_4
* Fixed category display regression
* Wrapped GET_MOVE_TYPE
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-29 13:45:14 +02:00
kittenchilly
904d59220d
Shorten squish anim
2024-07-28 11:55:57 -05:00
kittenchilly
f22666c2a3
Merge branch 'master' into axekick-anim
2024-07-28 11:46:14 -05:00
Eduardo Quezada
18aff2db3b
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_anim_script.inc
# data/battle_anim_scripts.s
# include/constants/battle_anim.h
# src/battle_anim.c
# src/data/battle_anim.h
2024-07-27 16:26:37 -04:00
Eduardo Quezada
bb471746d6
Renamed EVO_DEFEAT_WITH_ITEM to EVO_DEFEAT_THREE_WITH_ITEM ( #5046 )
2024-07-27 21:41:05 +02:00
Eduardo Quezada
1e8773356c
Changed EVO_OVERWORLD_STEPS to use an EWRAM variable ( #5047 )
...
* Changed EVO_OVERWORLD_STEPS to use an EWRAM variable
* Fixed PC swapping not resetting the follower steps
2024-07-27 20:48:59 +02:00
Bassoonian
c603e11310
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge27july
2024-07-27 12:01:39 +02:00
Martin Griffin
30f8ccfe6e
Merge pull request #2017 from PokemonSanFran/numSnowflakeSpritesConstant
...
Added constant for NUM_SNOWFLAKE_SPRITES
2024-07-27 07:26:40 +01:00
pkmnsnfrn
91b48a10d4
Added constant for NUM_SNOWFLAKE_SPRITES
2024-07-26 21:57:42 -07:00
DizzyEggg
e82e3b4198
Allow flags in trigger scripts ( #4900 )
2024-07-26 23:46:33 +02:00
Pawkkie
3c1fbbb06e
Fixes cantBeSurpressed ability check for breakable abilities ( #5043 )
2024-07-26 15:57:01 -04:00
AlexOn1ine
5dd10a4af1
forgot abilityShield check
2024-07-26 21:34:20 +02:00
AlexOn1ine
dfd63fd34f
func CanBreakThroughAbility
2024-07-26 21:30:41 +02:00
AlexOn1ine
89563cb9b1
check for breakable ability
2024-07-26 21:11:16 +02:00
AlexOn1ine
8b2774e07d
Fixes cantBeSurpressed ability check for breakable abilities
2024-07-26 20:19:58 +02:00
hedara90
b0b63f66b9
Added Ivy Cudgel Animation ( #5034 )
...
* Added Ivy Cudgel Anim, changed Ogerpon palettes, added jumpifmovetypeequals command
* Make the 20 year old compiler not complain
* Maybe better cudgel
* Moved animation
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-26 18:06:44 +02:00
Eduardo Quezada
cc00446eb8
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info/gen_9_families.h
2024-07-26 09:42:52 -04:00
kittenchilly
a16448c081
Update and clean up Battle Debug ( #4643 )
...
* Update battle debug with new stuff
* Fix status not showing up
* Update hold effects as well
* Update battle_debug.c
* Update battle_debug.c
2024-07-26 00:07:11 +02:00
kittenchilly
b4792d3f7e
Add Axe Kick animation
2024-07-25 14:06:02 -05:00
psf
c69107a14a
Fix fishing minigame ( #5031 )
...
Fixed issue from #4343 where `GEN_3` minigame was not correctly working.
2024-07-25 08:37:02 -07:00
Pawkkie
062856cc6c
Add Memento to Risky AI flag ( #5032 )
2024-07-25 13:57:42 +02:00
cawtds
7ae6b1d22a
fix fishing minigame
2024-07-25 00:58:21 +02:00
kittenchilly
7f6ddcf9d9
Update all level up learnsets to Indigo Disk ( #5023 )
...
* Update all movesets to Indigo Disk
* Also update past gens for gen 9 mons
* Update gen_1.h
2024-07-24 22:53:37 +02:00
sneed
298ee34097
fix givemon not giving Cherish Ball ( #5022 )
2024-07-24 20:37:46 +02:00
PhallenTree
7b2914c046
Fix Mold Breaker-like abilities, AI Move Accuracy function, Fury Cutter with Parental Bond ( #5030 )
...
* Fix GetBattlerAbility not checking correct battler's action
* Fix Fury Cutter counter being incorrectly incremented on 2nd hit of Parental Bond + test
* Fix AI_SetMoveAccuracy only using attacker's ability
* Review
2024-07-24 19:36:55 +02:00
hedara90
3f4b4adae5
Updated reference to config location to new location ( #5026 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-23 14:09:32 -04:00
hedara90
7a4df80f89
Added Ogerpon Tera Sprites ( #4996 )
...
* Added Ogerpon Tera Sprites
* Updated references to Ogerpon Tera forms
* Fixed back sprite offsets and color indices for Hearthflame Tera
* Removed Ogerpon data duplicates
---------
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-07-23 11:55:07 -04:00
Eduardo Quezada
ae48293806
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_ai_util.c
2024-07-22 23:06:44 -04:00
hedara90
84e249f98a
Some tera tests ( #5020 )
...
* Added tests for Terapagos/tera interactions
* Fixed missed things
* Fixed Terapagos Stellar boost (by Alex)
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-22 20:43:17 +02:00
cawtds
30ff2fa337
fix givemon random ivs
2024-07-22 17:18:22 +02:00
ghoulslash
67551dba04
Fixes AI not being aware during calcs ( #4992 )
2024-07-22 08:20:16 -04:00
kittenchilly
0bcd6a5435
Make Snow Warning description respect config ( #5018 )
...
* Make Snow Warning description respect config
* Update src/data/abilities.h
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-07-22 13:39:32 +02:00
PhallenTree
aac6ebd3d7
Fixes Sleep Talk, Toxic Debris and Jaboca/Rowap Berry issues; Adds Sleep Talk tests ( #5009 )
...
* Fix Sleep Talk failing with choice item; Added some Sleep Talk tests
* Fix Jaboca, Rowap berries recording Rocky Helmet Effect; Fix Toxic Debris not checking side's toxic spikes count properly in Doubles
2024-07-21 21:24:05 +02:00
sneed
3fa6bf46db
Test battlers always have their forced abilities ( #4707 )
...
* Test battlers always have their forced abilities
* indentation
2024-07-21 21:20:39 +02:00
Eduardo Quezada
0b02527e5c
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# test/test_runner.c
2024-07-21 13:36:07 -04:00
hedara90
7e509c440b
Added Terapagos Stellar Sprite ( #5008 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-21 08:17:31 +02:00
Eduardo Quezada
01831a30b9
Temporarely revert regional form inheritance ( #5004 )
2024-07-20 18:23:47 +02:00
tertu
5ccf3e2688
Fix chain fishing shiny rolls ( #4906 )
2024-07-19 09:48:14 -05:00
Eduardo Quezada
98eb4e5027
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_script.inc
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/frontier_util.c
# test/battle/ai/ai.c
2024-07-19 09:20:05 -04:00
Bassoonian
9ff30ee87a
Fix frontier ineligibility fix ( #4997 )
2024-07-19 11:46:25 +02:00
Alex
552e2768da
Fixes to Opportunist and Mirror Herb adjustments ( #4928 )
...
* Replace Opportunist todo tests with proper tests
* add failing test
* desc
* Fixes to Opportunist and Mirror Herb adjustments
* more tests
* some fixes
* first turn events switch
* simple enum + revert test desc
2024-07-19 11:01:46 +02:00
Bassoonian
93ee3a9197
Fix Psycho Shift Frostbite interaction ( #4995 )
2024-07-18 21:51:21 +02:00
Alex
62640456e7
Fixes residual damage order. #4945 Follow up. ( #4993 )
2024-07-18 12:48:23 +02:00
Alex
b21ffa1f9b
Changes score adjustments to tempScore increases ( #4987 )
2024-07-17 23:36:15 +02:00
AlexOn1ine
19fff81160
Fixes AI not being aware during calcs
2024-07-17 22:13:09 +02:00
Martin Griffin
23aa9f0433
trainers.h ( #4990 )
2024-07-17 21:41:52 +02:00
innocenthedgehog
d333f9f066
Fix typos in trainers.party documentation ( #4988 )
...
Co-authored-by: psytp2 <psytp2@nottingham.ac.uk>
2024-07-17 13:46:44 +02:00
hedara90
7703cb314b
trainerproc documentation ( #4734 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-16 18:50:31 +01:00
iriv24
0e21e0debf
replace gTransformedPersonalities[battlerAtk] in HandleLoadSpecialPokePic with personalityValue in HandleSpeciesGfxDataChange ( #4975 )
2024-07-15 19:41:23 +02:00
