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
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
2b64546a25
fix tectonic rage anim not clearing mon bg ( #4787 )
2024-06-13 13:45:11 +02:00
DizzyEggg
349b402f1b
Fix Soul-Heart changing stats of wrong battler ( #4785 )
2024-06-13 10:57:20 +02:00
DizzyEggg
8e41b9857f
Fix Revive in double battles ( #4784 )
2024-06-13 10:41:17 +02:00
Bassoonian
ff24d1e1bb
Add release to debug scripts ( #4782 )
2024-06-13 07:38:41 +02:00
DizzyEggg
21339cf272
Fix AI not recognising Volt Absorb/FlashFire ( #4781 )
2024-06-12 23:02:45 +02:00
Bassoonian
416519220d
Add evolution tracker check tests ( #4771 )
2024-06-12 15:52:04 -04: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
kittenchilly
5ebdcdc9b0
Fix Pokemon in tests not being male by default ( #4766 )
2024-06-12 08:34:36 +01: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
Alex
fd08e59e8d
Clear body tests ( #4685 )
2024-06-11 08:26:31 +02:00
Pawkkie
02ad637849
Review feedback
2024-06-10 21:40:42 -04:00
Alex
84583614bb
Fixes Tar shot making all of the target's types weak to fire ( #4756 )
2024-06-10 21:41:52 +02:00
sneed
178568e05d
Update test/battle/move_effect/tar_shot.c
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-06-10 22:15:39 +03:00
sneed
d8685bb3b1
tar shot works properly
2024-06-10 22:07:15 +03:00
Alex
a894ea4ea6
Fix AI crit calculations ( #4751 )
2024-06-10 11:07:31 +02:00
Alex
43e48353ec
Fix conflicts with RavePossum's standalone BW pop up ( #4752 )
2024-06-10 00:02:42 +02:00
sneed
aa50bfef28
add test
2024-06-09 23:41:12 +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
Pawkkie
55a2c85d95
Review feedback
2024-06-08 20:47:19 -04:00
Pawkkie
a7a89df80f
Review feedback
2024-06-08 20:32:57 -04: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
Pawkkie
b8e199ae9e
Review feedback
2024-06-08 12:37:59 -04: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
Bassoonian
0a049ea6f7
Add followers to readme & update migration script readme ( #4719 )
...
* Add followers to readme & update migration script readme
* Apply suggestions from code review
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update README.md
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-06-07 13:38:25 -04: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
