13536 Commits

Author SHA1 Message Date
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 67157250efeaf5ffefc45ac1955b09f27f09788b.

* 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 24913f53392f6f1353d59a3975f1dfd5db9f2d00.

# 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
d6762d4dbc Merge branch 'lighting' into lighting-expanded-id 2024-06-01 15:22:21 -04:00
Ariel A
d410ca6999 Merge branch 'followers' into lighting 2024-06-01 15:21:57 -04: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