Commit graph

11291 commits

Author SHA1 Message Date
Eduardo Quezada
fb708b7ed3 Merge branch '_RHH/master' into _RHH/upcoming 2024-07-10 10:05:10 -04:00
Eduardo Quezada
b5160b7ec8
Fixed SPECIES_NONE's overworld data not compiling when ObjectEventGraphicsInfo gets new fields (#4937) 2024-07-10 01:22:25 +02:00
ghoulslash
e1d8ef8190
Dynamic AI Functions (#4908)
* dynamic ai func

* add AI_TagBattlePreferFoe as an example

* Update src/battle_ai_main.c

* Update src/battle_ai_main.c

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-09 13:50:48 +02:00
kleeenexfeu
e1a6876600
Bitter Malice description fix (#4933)
It always lowers the foe's attack
2024-07-08 17:37:40 -04:00
ghoulslash
49e93799d1
Battle Anim Debug Check (#4930)
* battle anim scripts check uncleared Task_UpdateMonBg after anims

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-07-08 19:49:13 +01:00
Pawkkie
0f21415130
Minor AI flag fixes / cleanup (#4924)
* AI flag fixes / cleanup

* Review feedback
2024-07-08 20:15:12 +02:00
DizzyEggg
40950b63f7
shop menu allows for 6 digits item prices 2024-07-08 18:12:48 +02:00
Bassoonian
8ec3a85706
Fix safari zone player healthbox (#4927) 2024-07-08 18:10:25 +02:00
Alex
637a7072f0
Add missing adjust scores (#4925)
* Add missing adjust scores

* ai log made the test fail
2024-07-08 12:05:32 +02:00
Alex
cc0a9acc7f
Fixes wrong nature on partner (#4926) 2024-07-08 11:47:30 +02:00
psf
4ddae07451
Removed AI_FLAG_HELP_PARTNER (#4918) 2024-07-08 11:38:52 +02:00
psf
805a6300c7
Fixed B_TRANSITION_SHRED_SPLIT from softlocking the game (#4919)
* Added B_ENABLE_SHRED_SPLIT
Created preproc define to remove ShredSplit_BrokenCheck

* Removed config per https://github.com/rh-hideout/pokeemerald-expansion/pull/4919\#issuecomment-2211690039
2024-07-08 10:08:07 +02:00
Eduardo Quezada
6404241c40
Fixed P_UPDATED_ABILITIES not reverting newly given abilities in Gens 4/6/7 (#4922) 2024-07-07 13:18:16 +02:00
Eduardo Quezada
de609a2f5b
Added missing redirect abilities Gen 3-4 config (#4920)
* Added missing redirect abilities Gen 3-4 config

* Combined 3 Battle Script Natives into 1

* Cleaner FindMonThatAbsorbsOpponentsMove
2024-07-07 09:52:59 +02:00
cawtds
5dda4b846e fishing chain only resets on failed attempt or when map warping, encountering different species does not break the chain, differentiate between max shiny streak and max chain length 2024-07-06 15:18:51 +02:00
sneed
60c7588532
IsFinalStrikeEffect uses effect instead of move (#4917)
* IsFinalStrikeEffect uses effect instead of move

* Update test/battle/ability/parental_bond.c

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-06 09:41:19 +02:00
cawtds
3babd7f130 shiny roll calc as separate function 2024-07-06 02:10:30 +02:00
Bassoonian
a7f786009e Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5july 2024-07-05 20:44:29 +02:00
Eduardo Quezada
fcdc9ed65a Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/battle_util.c
#	src/data/pokemon/species_info/gen_7_families.h
#	test/battle/ability/download.c
#	test/battle/ability/intimidate.c
#	test/battle/ability/supreme_overlord.c
#	test/battle/ability/zero_to_hero.c
#	test/battle/ai/ai.c
#	test/battle/move_effect/plasma_fists.c
2024-07-05 14:25:25 -04:00
kleeenexfeu
8168dd7be9
Shed tail rounds up, not down (#4913)
* Shed tail rounds up, not down

* Label
2024-07-05 19:21:30 +02:00
DizzyEggg
47533e3a7e
Berry blender's Task_HandleOpponent small fixes 2024-07-04 20:56:22 +02:00
ghoulslash
3df7e770df
Remove SetBattlerData from AI_CalcDamage (#4881) 2024-07-04 10:05:20 -04:00
psf
2a5e4343c8
Implemented OW_IGNORE_EGGS_ON_HEAL (#4888)
* Implemented OW_IGNORE_EGGS_ON_HEAL

* Removed videos and change nPokemon to u32

* Changed OW_IGNORE_EGGS_ON_HEAL to GEN_LATEST per https://github.com/rh-hideout/pokeemerald-expansion/pull/4888\#issuecomment-2205271486

* Update include/config/overworld.h

Fixed spelling error per https://github.com/rh-hideout/pokeemerald-expansion/pull/4888#discussion_r1664454436

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-04 16:03:42 +02:00
Alex
13b8daf36b
Supersweet Syrup wrong ability desc (#4902) 2024-07-03 22:53:41 +02:00
Alex
dd7b735211
Fixes Grassy Terrain heal turn duration (#4903) 2024-07-03 22:53:15 +02:00
cawtds
91550eb75f chain fishing refactored 2024-07-03 17:02:12 +02:00
cawtds
26395fe600 fix fishing encounter rolls 2024-07-03 16:51:53 +02:00
Alex
594633aa15
Remove Duplicate ai code from battle_ai_util.c (#4883)
* Remove Duplicate ai code from battle_ai_util.c

* Add GetBattlerAbility in toxic self check
2024-07-03 10:48:31 +02:00
Pawkkie
7e167f0b3c
Add AI_FLAG_SEQUENCE_SWITCHING (#4878)
* AI_FLAG_BAD_SWITCHING

* Cleanup and tests, U-Turn / Baton Pass / Parting Shot aren't working properly

* Fix U-Turn etc. tests

* Test overhaul with Egg's suggestions

* Add EFFECT_HIT_SWITCH_TARGET to tests

* Review feedback

* Re-review feedback
2024-07-01 08:53:07 +02:00
Frank DeBlasio
6957fc70c9
Allowed rematches to occur if I_VS_SEEKER_CHARGING isn't enabled (#4866) 2024-06-29 22:12:26 +02:00
Frank DeBlasio
c3634db0ea
Fixed Mud Sport/Water Sport reduction value (#4874)
* Fixed Mud Sport/Water Sport reduction value

* Removed define
2024-06-29 22:11:49 +02:00
Frank DeBlasio
103ed85b83
Added config to prevent unobtainable Pokemon from being shiny (#4735)
* Added config to prevent unobtainable Pokemon from being shiny

* Added config for disabling shinies if the player has no Poke Balls

* Removed check for adventure started flag
2024-06-29 22:07:14 +02:00
abcboy101
779855ee02 Decode unused JP text in berry_blender.c 2024-06-29 14:02:50 -04:00
sneed
75be596933
fix sticky hold softlock (#4885) 2024-06-29 18:54:58 +02:00
Alex
699c96afa3
Remove SetBattlerData from AI_CalcDamage
Since #4156 SetBattlerData and RestoreBattlerData were moved out of `AI_CalcDamage`. I assume this was a bad merge somewhere
2024-06-28 19:36:09 +02:00
Pawkkie
d1ca1f667f
Smarter Choice AI for Status Moves (#4872)
* Smarter choice item usage

* Clarify test name / line ending

* Review feedback

* Review feedback pt. 2
2024-06-28 09:04:24 +02:00
DizzyEggg
26ef19d6c0
Fix wrong palette in palyer backsprite in recorded battle (#4875) 2024-06-27 11:33:28 +02:00
DizzyEggg
cd5a862b95
Fix Megas gaining abilities after fainting (#4873) 2024-06-26 23:44:01 +02:00
Frank DeBlasio
f19948312e
Allowed double battles to occur with only one Pokemon by talking to the trainers (#4848) 2024-06-26 10:45:27 +02:00
ghoulslash
41583673a5
Zero Enemy Data at end of battles (#4867)
* zero enemy data in FreeResetData_ReturnToOvOrDoEvolutions

* only run through FreeBattleResources once at end of battle in FreeResetData_ReturnToOvOrDoEvolutions

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-06-26 10:41:14 +02:00
Bassoonian
81bd14818e
Add day limit for forms support (#4778)
* Add day limit for forms support

* Add missing newline

* Incorporate review suggestions
2024-06-26 10:36:44 +02:00
fakuzatsu
6c9dcd60bc
simple button config for the move description menu (#4860)
* simple button config for the move description menu

* change from preproc to normal if
2024-06-25 11:09:01 +02:00
DizzyEggg
f2e8482488
Fix how switch-in effects are played out after multiple faints in the same turn (#4864)
* Multiple switch-ins after fainting

* empty new lines

* Fix failing tests
2024-06-24 20:37:47 +02:00
cawtds
a8ae1a0342
added missing minior description + test for missing descriptions (#4858) 2024-06-24 12:19:12 +02:00
AgustinGDLV
9797640dff
Gimmick Refactor (#4449)
* consolidated gimmick checks, triggers, communication, and activation; updated test runner

* fixed improper use of .usableGimmick

* cleaning up battle_dynamax.c, changing function args to u32s

* fixed '#ifdef TESTING' causing errors

* updated z-moves to use gimmick interface, pared down redundancies; no AI/tests

* added support for z-moves in tests, consolidated gimmick fields

* removed ShouldUseMaxMove and .usingMaxMove

* renamed TryChangeZIndicator, updated z move display

* added several z-move tests and fixed various z-move interactions; fixed z-move category calc

* fixed useless battler arg in GetTypeBasedZMove

* added basic test check for bad Z-Move or Mega usage

* reworked test runner gimmick functionality; added support for Ultra Burst + Z-Move to test Light That Burns the Sky

* fixed gimmick test logic; fixed damage category override

* fixed mega rayquaza test fail

* consolidated gimmick indicator logic; added graphics to gGimmicksInfo

* removed TeraData struct

* reimplemented AI logic for Z-Moves; no changes

* updated Z-Move and Ultra Burst trigger gfx

* added testrunner check for multiple gimmick use

* fixed duplicate z-move call in test

* reorganized data/graphics/gimmicks.h

* added signature Z-Move ability tests; implemented Guardian of Alola

* fixed bad test update

* fixed Thousand Arrows not affecting Tera Flying; clean-up

* fixed -ate tests

* fixed tera tests

* fixed tera tests really

* fixed last batch of tests

* fixed -ate mega test again

* code review

* code review pt.2

* tweaked CanTera again

* dynamax flag only required for player
2024-06-22 22:25:40 +02:00
Pawkkie
2640bcd053
Minor switch AI refactor (#4849) 2024-06-22 11:17:10 +02:00
Bassoonian
87b21c2ce5
Fix item duplication glitch (#4844)
* Fix Toxic Chain file acting up

* Fix item dupe glitch
2024-06-22 10:47:25 +02:00
Alex
8ac739ea1a
[Update moves_info.h] wrong move names (#4854) 2024-06-22 09:52:39 +02:00
sneed
6893d8dbef
ignoresTargetAbility doesnt ignore the attacker's ability (#4855) 2024-06-22 09:52:25 +02:00
DizzyEggg
438f478146
Fix comatose transform gastro acid interaction (#4852) 2024-06-21 12:19:43 +02:00
DizzyEggg
d0bb03e5a9
Fix AI's right slot switching-in too early (#4851)
* apply safe switching to trainer doubles battles - with a config

* get rid of the config

* make it compile
2024-06-21 12:17:12 +02:00
sneed
c31f982a7b
Fix fury cutter scaling up to 640 power (#4846)
* Fix fury cutter scaling up to 640 power

* Replace three instances of int i with one int turn

* dynamic test
2024-06-21 08:15:00 +02:00
DizzyEggg
b9d1438162
move 3 btl ctrl player vars to gBattleStruct (#4840) 2024-06-20 17:42:52 +02:00
Eduardo Quezada
4d6452e14e
Move general config file to the config folder (#4805) 2024-06-19 13:42:01 +02:00
sneed
9538d53f93
Don't specify sDexSearchTypeOptions array size (#4820) 2024-06-19 13:41:18 +02:00
DizzyEggg
c3b1701c16
Contrary stat drop anim with Spectral Thief (#4824)
* Contrary stat drop anim with Spectral Thief

* Are you happy now agbcc? I hope I w
2024-06-19 13:40:46 +02:00
kittenchilly
74f53a7e18
Fix caught wild pokemon not restoring their used held item (#4803)
* Fix caught wild pokemon not restoring their used held item

* Actually we can use the same struct
2024-06-18 20:31:03 +02:00
sneed
277b8607df
Clarify some cases of ChangeStatBuffs usage (#4826) 2024-06-18 20:14:16 +02:00
sneed
609754f0f6
Add RandomChance macro and ability trigger chance config (#4829)
* RandomChance macro, contact ability chance config

* Unify config, add shed skin
2024-06-18 20:13:44 +02:00
sneed
b6d3bdf622
Confusion, cursed body and poison touch trigger chance fixes and tests (#4831)
* accurate confusion chance and a test

* Accurate Poison Touch chance and tests

* Accurate cursed body chance

* Create cursed_body.c
2024-06-18 20:07:40 +02:00
Alex
f106b21344
Adds Toxic Chain's effect (#4823) 2024-06-18 20:04:28 +02:00
Bassoonian
a24b767276 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into masterintoupcoming18jun 2024-06-18 15:27:06 +02:00
PhallenTree
1fd23ec929
Fix potential issue with abilities that would cause Toxic Chain to not activate 2024-06-18 11:50:30 +01:00
PhallenTree
a26050fbde
Adds Toxic Chain interaction with Knock Off 2024-06-18 11:46:23 +01:00
PhallenTree
161f61284a
Use RandomWeighted; fix Test 2024-06-17 17:48:05 +01:00
DizzyEggg
203318b9a2
Get rid of hardcoded stat raise anim values (#4825) 2024-06-17 13:51:04 +02:00
sneed
e64a2f3e25
Roamer's frostbite carries over between battles (#4822) 2024-06-17 11:44:47 +02:00
PhallenTree
a49c988b89
Adds Toxic Chain's effect 2024-06-16 19:53:35 +01:00
kittenchilly
b8607fe3aa
Fix Poltchageist not always producing counterfeit offspring (#4812) 2024-06-15 18:31:29 -04:00
Eduardo Quezada
1eb0b3261f
Added option to disable species cries (#4791)
* Added option to disable cries

* Update src/pokemon.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-06-15 22:07:13 +02:00
sneed
e5e38c13f3
fix unitialized struct UB (#4808) 2024-06-15 21:20:10 +02:00
sneed
e18150fb35
Change code to reflect that Shell Side Arm's default category is special (#4806)
* swapped cat is physical

* Update battle_util.c

* 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-06-15 15:35:43 +02:00
Bassoonian
22994c79d4
Add support for multiple roamers (#4762)
* Replicate initial commit

* Integrate the rest of Duke's vanilla commits

* Alter Roamer struct to add frostbite support

* Fix some indentation issues

* Add option to hide substitute followers

* Revert "Add option to hide substitute followers"

This reverts commit 3fadaafae5.

* Incorporate feedback
2024-06-15 11:17:32 +02:00
kittenchilly
a118b2caa8
Fix Booster Energy ability popup and message (#4804) 2024-06-14 20:22:26 -04:00
DizzyEggg
de7a4e2328
Fix Encore turn amount bug (#4802)
* Encore 3 turns

* remove duplicate
2024-06-14 13:15:38 +02:00
DizzyEggg
2716ec5b03
Fix Pursuit not getting Choice-locked on switch-out (#4801)
* Fix Pursuit not getting Choice-locked on switch-out

* use label
2024-06-14 12:46:03 +02:00
DizzyEggg
c7224d9ca7
Fix Relic Song transforming species other than Meloetta (#4799) 2024-06-14 10:24:57 +02:00
Pawkkie
a7642da544
Revenge Killer switching factors in Trick Room (#4794)
* Revenge Killer switching factors in Trick Room

* Comments and float multiplication
2024-06-14 10:18:01 +02:00
DizzyEggg
1a4f277d6f
Tests for Body Press + body press interaction with Wonder room (#4792) 2024-06-14 09:43:10 +02:00
DizzyEggg
4b1ff3ad7f
fix starting terrain making all other terrains infinite (#4795) 2024-06-14 09:31:21 +02:00
Eduardo Quezada
88028c0c37
Split Pokémon Object Events from Following Pokémon functionality (#4761)
* Split Pokémon Object Events from Following Pokémon functionality

* Renamed follower pngs and palettes

* Define renames

* Reorder configs

* Renaming: SpeciesInfo fields, macros and palettes.
2024-06-13 22:46:27 +02:00
DizzyEggg
84d13d0abf
Fix Smack Down anim + move anim tests (#4774)
* Fix Smack Down anim + move anim tests

* really agbcc

* fix undefined reference

* hopefully everything works
2024-06-13 15:30:28 -04:00
Eduardo Quezada
3747668bf3
Fixed AI_FLAG_RISKY score increase making tests with AI_LOG fail (#4790) 2024-06-13 19:13:10 +02:00
ghoulslash
353727a805
Add createmon Script Cmd, Support for 2v1Wild Battles (#4688)
* add createmon and setwilddoubleflag script cmds to support createing mons at given player or enemy slots and setting up 2v1 battles

* give givemon macro PARTY_SIZE for tests

* style fixes

* add createmon test

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-06-13 19:11:36 +02:00
Eduardo Quezada
43310716af Fixes to master merge 2024-06-13 11:44:52 -04:00
Eduardo Quezada
06153e4280 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	include/battle.h
#	include/constants/battle_script_commands.h
#	include/constants/pokemon.h
#	src/battle_ai_util.c
#	src/battle_main.c
#	src/battle_util.c
#	test/battle/ai.c
2024-06-13 11:44:28 -04:00
sneed
f868de066d
fix passing hold effect instead of ability (#4789) 2024-06-13 16:40:53 +02:00
sneed
c2ca22d474
Various small doubles AI fixes (#4786)
* fix AI thinking defiant procs off ally moves

* AI see's partner's ability for swagger and flatter
2024-06-13 13:52:13 +02:00
DizzyEggg
8ff1cbed2a
update shiny data for battle mons (#4788) 2024-06-13 13:45:56 +02:00
DizzyEggg
8e41b9857f
Fix Revive in double battles (#4784) 2024-06-13 10:41:17 +02:00
DizzyEggg
21339cf272
Fix AI not recognising Volt Absorb/FlashFire (#4781) 2024-06-12 23:02:45 +02:00
sneed
000f144465
AI actually avoids contact vs rocky helmet/rough skin (#4779) 2024-06-12 20:54:34 +02:00
Bassoonian
03cc0ae6b3
Add option to hide substitute followers (#4765)
* Add option to hide substitute followers

* Update event_object_movement.c
2024-06-12 13:53:01 -04:00
DizzyEggg
a17259763c
Fix Baton Pass breaking on Memento (#4773)
* Fix Baton Pass breaking on Memento

* doubled headers
2024-06-12 13:17:18 +02:00
kittenchilly
251019d63d
Update wild held items to Gen 9 (#4769)
* Update wild held items to Gen 9

* Update gen_1_families.h

* Update gen_5_families.h
2024-06-12 11:33:03 +02:00
Bassoonian
76c566a0ca
Add the Let's Go evolution method (#4758)
* Add overworld step evolution method

* Increase evolutionTracker bits from 9 to 10

* Implement tracker increase

* Remove leftover NDEBUG activation

* Reset evolution tracker data upon evolution

* Revert an accidental change to unrelated code

* Add missing break in switch case, oops
2024-06-12 11:31:19 +02:00
Alex
9c72392891
Fixes Shell Side Arm (#4753)
* Fixes Shell Side Arm

* Fixes to random call

* hardcoded the effect to the move

* minor change

* minor change 2

* applied reviews
2024-06-12 11:21:44 +02:00
Bassoonian
dffaaeaaa6
Add Leader's Crest evolution method (#4768)
* Add Leader's Crest evolution method

* Fix typo in in HGSS dex

* Update src/pokedex_plus_hgss.c

Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>

* Update src/battle_script_commands.c

---------

Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-06-12 09:31:59 +02:00
cawtds
4724b5dfd6
Improved Surf/Thunderbolt test (#4764)
* improved Surf/Thunderbolt test that previously relied on correct AI guess

* remove unnecessary mod

* fixed infinite rng loop

* wrong ability num and readability

* Update src/battle_ai_util.c

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-06-12 09:09:15 +02:00
Bassoonian
341fa3692c
Make Tandemaus only evolve at the end of battles (#4759) 2024-06-12 08:43:51 +02:00
Bassoonian
5fe0aee063
Add config to turn off two-framed front sprites (#4750)
* Add config to turn off two-framed front sprites

* Two frames should be on by default

* Simplifies integration
2024-06-11 13:10:23 -04:00
sneed
821d5dccab
AI calculates/stores minimum possible move damage and uses it with AI_FLAG_TRY_TO_FAINT (#4760)
* AI uses safest option to faint foes

* dont calculate non crit dmg unless it's needed

* struct SimulatedDamage

* add GetDamageByRollType and name DamageRollType

* Parametrize test AI flags

* use simDamage member's instead of dmg & minDmg
2024-06-11 18:28:16 +02:00
Eduardo Quezada
64f82cdd5f Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/battle_ai_util.c
#	src/battle_util.c
2024-06-11 08:12:03 -04:00
sneed
d8685bb3b1 tar shot works properly 2024-06-10 22:07:15 +03:00
Eduardo Quezada
911af213c1 Merge remote-tracking branch 'ravepossum/bsbob_map_popups' into _RHH/pr/upcoming/bwPopupMergeFix
# Conflicts:
#	include/field_weather.h
#	include/rtc.h
#	include/strings.h
#	src/field_weather.c
#	src/map_name_popup.c
#	src/menu.c
#	src/rtc.c
#	src/strings.c
2024-06-09 16:34:11 -04:00
sneed
1ca4676c4c fix ai crit calculations 2024-06-09 23:09:34 +03:00
Eduardo Quezada
7df0219003
BW2 Style Map Pop-Ups (#4396) 2024-06-09 16:03:41 -04:00
Bassoonian
bbc05234b9
Make Pokémon Sprite Visualizer name official (#4745)
* Rename files to PSV

* Rename functions and defines

* Add missing newlines

* Integrate feedback
2024-06-09 12:12:35 -04:00
Raymond Dodge
650127e857
clean and generate src/data/map_group_count.h (#4727)
`src/data/map_group_count.h` is currently in `.gitignore`. However, git
does not ignore a file if that file is already in the index. To actually
ignore the file, the file must be deleted and that deletion must be
committed.

In addition, the Makefile did not previously clean `src/data/map_group_count.h`,
nor know how to generate `src/data/map_group_count.h`.
It did generate the file as a side-effect of a different rule, but if
asked to generate, it did not know how to.
2024-06-09 17:16:32 +02:00
sneed
db15190508
Use GetBattlerAbility instead of the ability field in more places (#4746)
* Fix Skill Link ignoring gastro acid, neutralising gas

* Fix own tempo stopping berserk gene confusion when disabled
2024-06-08 22:58:37 +02:00
Alex
d83f90d51f
Tera Shell AI calcs (#4742)
* Tera Shell AI calcs

* agbcc
2024-06-08 20:56:20 +02:00
Alex
78f1da4131
Adds 1 vs 2 macro (#4741) 2024-06-08 09:49:28 +02:00
Bassoonian
568ce39c5d
Adds forbidden status parameter to FORM_CHANGE_ITEM_USE (#4738) 2024-06-08 07:36:39 +02:00
sneed
f1911dae59
Fix mycelium might and ability shield (#4740)
* Fix mycelium might and ability shield

* fix check
2024-06-08 07:27:44 +02:00
sneed
2cc2dc01ca
Fix daycare move transferring between evolved mons and allow sharing moves between different forms of the same species (#4479)
* Fix daycare move transferring between evolved mons

Also allow sharing moves between different forms

* Make sure Snorlax gets Snorlax's egg moves instead of Munchlax's

* Use GET_BASE_SPECIES_ID

* Actually fix Snorlax/Roselia/etc behavior

* remove preproc checks

* rename ambiguous GetEggMovesSpecies function

* remove extra indentation, add incense breeding check

* update comment

* Update src/daycare.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-06-07 21:54:58 +02:00
sneed
dc742b3077
Fix Berserk, Angel Shell, Wimp Out, Emergency Exit HP threshold (#4724)
* Fix HadMoreThanHalfHpNowHasLess

* rename the functions

* formatting
2024-06-07 21:54:25 +02:00
Bassoonian
d6422da284
Fix partner palette problem (#4736) 2024-06-07 21:05:16 +02:00
Bassoonian
0fda9d6cd6
Fix Hyper Potion price (#4737) 2024-06-07 21:04:03 +02:00
sneed
fa81861593
Add newer generation Heal Bell interactions with Soundproof (#4732)
* newer generation soundproof heal bell interactions

* Fix bugs and rewrite AnyPartyMemberStatused

* add missing check, tests, clean up

* fix ai code and rename battler for clarity
2024-06-07 18:51:21 +02:00
Eduardo Quezada
8b09ef09fa Merge branch '_RHH/master' into _RHH/upcoming 2024-06-07 12:25:08 -04:00
sneed
1241cbe79f
FIx mummy and lingering aroma abilities (#4731)
* FIx mummy ability

..and lingering aroma.
Adds tests for both.

* merge the tests

* new line

* add 2 more tests

Mummy and Lingering Aroma don't replace each other
Mummy doesn't replace abilities that can't be suppressed
2024-06-07 11:46:07 +02:00
sneed
d0a8e9fb31
Use AI_DATA->abilities in more places (#4729)
* use AI_DATA->abilities in more places

* Missed one

* restore the hack
2024-06-06 16:27:07 +02:00
sneed
7fd0239370
Rampage moves always confuse on final turn (#4722)
* rampage moves confuse on the final turn

* fix B_RAMPAGE_CANCELLING < GEN_5

* Remove pointless assumes
2024-06-05 05:38:04 +02:00
Eduardo Quezada
dce10ab705 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	test/species.c
2024-06-04 16:47:29 -04:00
kittenchilly
7f8f480ecb
Add FORM_CHANGE_BATTLE_TERASTALLIZATION + allow species to force tera types (#4438)
* Add FORM_CHANGE_BATTLE_TERASTALLIZATION and allow species to force tera types

* Fix form change not changing tera type

* Update form_species_tables.h

* Address reviews

* Can't change the forced Tera Type anymore

* Revert "Can't change the forced Tera Type anymore"

This reverts commit 67157250ef.

* Fix a lot of things

* Oops

* Update pokemon.h

* Update pokemon.h

* Address reviews

* Update tera_starstorm.c

* Update test/battle/gimmick/terastal.c

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-06-04 13:38:49 +02:00
Alex
167cd7d0f7
Remove misleading preprocs (#4718) 2024-06-04 10:47:11 +02:00
kittenchilly
a5b75746ea Pawmi 2024-06-03 14:17:34 -05:00
kittenchilly
ea617ccd7a Okidogi 2024-06-03 13:56:37 -05:00
kittenchilly
33972cedf3 Pawmo 2024-06-03 13:48:36 -05:00
hedara90
5bf7f08ad2 Added Normal and Terastal Terapagos sprites (#4691)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-06-03 13:33:42 -05:00
RavePossum
69b367e350 PR feedback - 32 bit params, multiline condition formatting 2024-06-03 00:10:10 -04:00
cawtds
7404d03ea9
fixed potential undefined behaviour when using escape rope (#4705) 2024-06-03 00:58:24 +02:00
cawtds
658b437777
fixed honey use altering tiles (#4703) 2024-06-02 22:38:52 +02:00
sneed
ad8576d548
Fix some abilities preventing stat dropping move effects when used on self (#4696)
* Move SOLAR_POWER_HP_DROP label

* Abilities don't prevent self stat dropping effects

Hyper cutter does not stop MOVE_EFFECT_ATK_MINUS_1 and MOVE_EFFECT_ATK_MINUS_2.
Big Pecks does not stop MOVE_EFFECT_DEF_MINUS_1 and MOVE_EFFECT_DEF_MINUS_2.
Keen Eye and Illuminate do not stop MOVE_EFFECT_ACC_MINUS_1 and MOVE_EFFECT_ACC_MINUS_2.
2024-06-02 18:20:00 +02:00
Eduardo Quezada
ee1d14755a Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-06-02 11:06:41 -04:00
Eduardo Quezada
da91e6a392 Remove unused callfunc 2024-06-02 10:53:45 -04:00
Eduardo Quezada
3202625ca5 Restored Gen 4-8 followers
This reverts commit 24913f5339.

# Conflicts:
#	src/data/pokemon/species_info/gen_4_families.h
#	src/data/pokemon/species_info/gen_5_families.h
#	src/data/pokemon/species_info/gen_8_families.h
2024-06-02 10:31:01 -04:00
Alex
4eda5f61af
Use 9th roll instead of average in AI calcs (#4679)
* Use 9th roll instead of average in AI calcs

* damage_roll

* duke suggestion
2024-06-02 15:36:12 +02:00
Alex
86b76134e3
replace gCurrentMove with move in CalcCritChanceStageArgs (#4687)
AI got the wrong calc when the global was used.
2024-06-02 15:31:10 +02:00
cawtds
9b10e13336
Fixed regional variant inheritance and pokeball inheritance (#4695)
* fixed regional variant inheritance  and pokeball inheritance

* species inheritance: consider cases with different evolutions but same base species e.g. Persian and Perrserker
ball inheritance: fix inheritance for regional forms
2024-06-02 14:04:00 +02:00
hedara90
240b69d032
Added Normal and Terastal Terapagos sprites (#4691)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-06-02 08:26:43 +02:00
cawtds
97143e020f
Refactor move animations (#4683)
* fix getboxmondata for evolutiontracker if compiled with agbcc

* refactored move animation scripts as part of gMovesInfo

* migration script for move anims

* default animation, migration for battle_anim_scripts.s

* added warning for missing animation

* add include to migration

* add struct member in migration script

* removed include and struct member from migration script

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-06-02 08:18:13 +02:00
Eduardo Quezada
1359966a14 Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
#	src/event_object_movement.c
#	src/scrcmd.c
2024-06-01 20:17:19 -04:00
Eduardo Quezada
941e32a14f Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/battle_main.c
#	test/battle/move_effect/body_press.c
2024-06-01 19:55:53 -04:00
Isaac Rivera
43e2a973fc
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) 2024-06-02 01:00:17 +02:00
Ariel A
e420f99fc3 Merge branch 'followers' into followers-expanded-id 2024-06-01 15:20:56 -04:00
Ariel A
3727be9511 fix: fixed a few oversights with follower message generation 2024-06-01 14:46:45 -04:00
Eduardo Quezada
0a8284ce9f
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>
2024-06-01 15:07:51 +02:00
Eduardo Quezada
0be643a517
Set TYPE_NONE as type 0 + other type data tweaks (#4462)
* Set TYPE_MYSTERY as type 0

* Remove redundant TYPE_NONE

* Moved Gen 1-3 type damage categories to gTypesInfo

* Set TYPE_NONE as 0 instead

* Grouped type info to a single file

* Fixed sTypeEffectivenessTable static name

* Adjusted MON_DATA_TERA_TYPE to account for shift in type IDs

* oops, missed the extern

* Moved Tera Type RGB values to gTypesInfo

* Fixed Tera Type test

* Added option test feature to set IVs

* Hidden Power type test

* Tera Type safeguard in givemon

* Removed isHiddenPowerType for a future PR that refactors Hidden Power

* Review changes
2024-06-01 07:38:22 +02:00
Pawkkie
cb1b4bc9a0
Switch AI uses trapping abilities aggressively (#4669)
* Trapping switch AI

* Review feedback, mostly spacing cleanup

* Assume Mawile is Steel type

* Move switching tests into their own file
2024-06-01 07:30:43 +02:00
WillKolada
0ed8d09d47
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>
2024-05-31 22:33:31 +02:00
WillKolada
5405e6532e
Clear Dynamax data when a battler faints (#4672)
* Update battle_main.c

Now clears dynamax data when a battler faints

* Update battle_main.c

Actually call the helper function instead of only doing half of what it does.

* Added new line before return

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-05-31 18:23:56 +02:00
Eduardo Quezada
c79188e3b3 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/battle_ai_util.c
#	src/battle_util.c
2024-05-31 12:04:33 -04:00
Bassoonian
e3959a764b
Rename MgbaPrintf_ to Test_MgbaPrintf (#4642) 2024-05-31 17:54:25 +02:00
sneed
e869aaf70b
Add global constants for damage roll related code and make AverageRollDmg faster (#4663)
* faster AverageRollDmg, global dmg roll constants

* restore MAX_ROLL_PERCENTAGE & MIN_ROLL_PERCENTAGE

* rename AverageRollDmg
2024-05-31 16:56:17 +02:00
sneed
810caa7fd6
In battle move descriptions index fix (#4678) 2024-05-31 15:54:51 +02:00
Eduardo Quezada
de760e697f More review 2024-05-31 08:28:57 -04:00
Alex
d55e072747
Adds AI_IsFaster and AI_IsSlower functions (#4671) 2024-05-31 12:55:15 +02:00
Alex
bebc13b5a1
Adjust Ate-Ability code a bit to make it more readable (#4640)
* Adjust Ate-Ability code a bit to make it more readable

* stupid oversight

* fixed

* pull normal type move check out of function

* unused var

* switch and tests

* oversight

* Apply suggestions from code review

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-05-31 12:22:18 +02:00
sneed
13d4d29e1e
Move SOLAR_POWER_HP_DROP label (#4675) 2024-05-31 12:19:07 +02:00
Bassoonian
52d45674f0
Move Descriptions in battle (#4152)
* Port xaman move desc to modern expansion

* Fix modern compiler error

* Fix compliling + EFFECT_PLACEHOLDER support

* Change to L-button to avoid conflict with Mega Evolution

* Reorder and change priority to category

* add sprite for move category icon, declare category icon sprite data extern

* remove static category icon sprite data from hgss dex for global data

* Change to else if

---------

Co-authored-by: Pawkkie <moog272@gmail.com>
Co-authored-by: RavePossum <ravepossum@proton.me>
2024-05-31 12:10:03 +02:00
AgustinGDLV
317cf2e933
updated Disguise to be a breakable ability (#4666) 2024-05-30 22:15:26 +02:00
Pawkkie
8d58564569
Test runner set mode (#4661)
* Item icon table glitch

* Test runner uses OPTIONS_BATTLE_STYLE_SET
2024-05-30 21:24:33 +02:00
PhallenTree
1a59adcea8
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
2024-05-30 13:53:48 +02:00
Alex
462dca0c09
Remove temp scores in AI_CalcMoveEffectScores (#4655) 2024-05-30 09:54:24 +02:00
Alex
58793294b8
Update item_icon_table.h (#4658)
Add new line
2024-05-30 09:53:23 +02:00
Eduardo Quezada
e7f66e663b Convert callfuncs to callnative 2024-05-29 19:25:51 -04:00
Eduardo Quezada
3d05961dd5 getdirectiontoface macro 2024-05-29 15:52:21 -04:00
ghoulslash
7b1248b167
add savedBattlerAttacker and stack for saved target/attacker (#4061)
* add saveattacker/savetarget stack

* add safety checks to savedAttackerCount/savedTargetCount

* add testing warnings for saveattacker/savetarget

* update frisk with saveattacker

* restoretarget at end of red card battle scripts, remove testing checks on SaveAttacker,SaveTarget

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-05-29 21:50:24 +02:00
Pawkkie
a0006d8dfb
AI_FLAG_RISKY Improvements (#4648)
* #defines for damage roll bounds

* Risky AI behavior implemented

* Ignore score penalty to EFFECT_RECOIL_IF_MISS moves if accuracy has been lowered

* Adjust score defines

* EFFECT_MIND_BLOWN

* Use GetBestDmgMoveFromBattler instead of AI_CompareDamagingMoves
2024-05-29 19:54:18 +02:00
Eduardo Quezada
ff480dec27 More review comments 2024-05-28 18:32:20 -04:00
Eduardo Quezada
2f4077ba5d Adjusted function names to align with pret 2024-05-28 17:25:18 -04:00
Eduardo Quezada
6d5cd7cbd7 Removed duplicate tags 2024-05-28 14:58:26 -04:00
Eduardo Quezada
021074cd2e Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info.h
#	src/data/pokemon/species_info/gen_1_families.h
#	src/data/pokemon/species_info/gen_2_families.h
#	src/data/pokemon/species_info/gen_4_families.h
#	src/data/pokemon/species_info/gen_5_families.h
#	src/data/pokemon/species_info/gen_8_families.h
2024-05-28 14:28:33 -04:00
Eduardo Quezada
8854eaa880 Removed duplicated object event tags 2024-05-28 14:16:34 -04:00
Alex
7a393a974a
Adds Dragon Darts effect (CFRU port) (#4612)
* Adds Dragon Darts effect (CFRU port)

* fix test compile

* review
2024-05-28 11:34:56 +02:00
Alex
0570609ce6
Small Ability Effect Move Block refactor (#4635)
* Small Ability Effect Move Block refactor

* combine tests
2024-05-28 10:34:05 +02:00
Alex
e0499f8b3e
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
2024-05-28 10:30:27 +02:00
Alex
df6fab7284
Missing ignoreSubstitute flags (#4623)
* Missing ignoreSubstitute flags

* update defog flag
2024-05-28 10:29:37 +02:00
Pawkkie
be2517415b
Damage roll selection in AI_CalcDamage (#4615)
* Damage roll selection and AI_FLAG_CONSERVATIVE

* Clarify enum names

* Simplify AverageRollDmg line

* Change u8s to u32s

* Turns out Boomburst does a lot of damage lol

* Spacing
2024-05-28 10:21:25 +02:00
hedara90
d999092689
Upgraded Dragon Darts Animation (#4620)
* Upgraded Dragon Darts Animation

* Fixed Dragon Darts not workin in link battles

* Apply suggestions from code review

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

---------

Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-05-28 10:17:52 +02:00
Ariel A
0630acce44 fix: make LoadSheetGraphicsInfo load, then free, tiles
Fixes follower pokeball gfx showing garbage for 1 frame when emerging
2024-05-27 18:15:02 -04:00
PhallenTree
9104c40d43
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>
2024-05-27 17:07:13 +02:00
Eduardo Quezada
80b193280d Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/battle_main.c
#	src/data/item_icon_table.h
#	src/data/pokemon/species_info/gen_9_families.h
2024-05-27 10:13:42 -04:00
Philipp AUER
431cb64b3e
Pre-1.8.4 pret merge (2024/05/26) (v2) (#4637) 2024-05-27 12:40:41 +02:00
Eduardo Quezada
acd62b0065
Reverted bad implementation of Sparkling Aria+Covert Cloak/Shield Dust (#4634) 2024-05-27 06:38:05 +02:00
Rachel
94af656f17
Explicitly define Gengar's 3rd ability slot (Hidden Ability) (#4633) 2024-05-26 21:50:12 -04:00
Eduardo Quezada
9e72271c8e 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
2024-05-26 18:34:26 -04:00
Pawkkie
c279aa23c6
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
2024-05-26 22:23:04 +02:00
kittenchilly
2e07dbb0ee
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
2024-05-26 22:20:51 +02:00
Alex
4f1df84acf
Make AI see Loaded Dice hold effect for multi hit moves that strike 5… (#4622)
* Make AI see Loaded Dice hold effect for multi hit moves that strike 5 times

* Update battle_ai_util.c
2024-05-26 22:19:45 +02:00
Eduardo Quezada
8f38089127
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
2024-05-26 19:38:22 +02:00
hedara90
487dc92119
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 982934c4aa.

* 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 313f2e5526.

* 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>
2024-05-26 17:01:20 +02:00
cawtds
474f929c02
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
2024-05-26 00:06:55 +02:00
sneed
312dcbb8a8
Speed Ignoring effect fixes (#4613)
* Custap ties with Quick Draw, Stall with Mycelium

* add a test
2024-05-24 11:21:35 +02:00
Rachel
c129423a69
Fix move descriptions for Feint and Feint Attack (#4617) 2024-05-24 11:19:55 +02:00
sneed
b592c6eae5 Add POKE_ICON_BASE_PAL_TAG to a header 2024-05-23 02:45:22 +03:00
kittenchilly
edab81b658
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
2024-05-22 22:20:44 +02:00
Eduardo Quezada
1be5581f19 Revert NUM_DECORATION_FLAGS definition 2024-05-22 14:17:11 -04:00
Alex
ba07d2b3d4
Renames evolution methods the were labeled as evo level (#4607)
* [FIX] EVO_LEVEL_MOVE_TWENTY_TIMES -> EVO_USE_MOVE_TWENTY_TIMES

* rename evo_level_recoil_damage

* change EVO_LEVEL_ITEM_COUNT_999
2024-05-22 11:06:24 +02:00