2506 Commits

Author SHA1 Message Date
cawtds
3af93bdfee
FRLG+ whiteout message (#4967)
* FRLG whiteout message + post whiteout event
2024-08-02 08:28:05 -07: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
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
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
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
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
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
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
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
Alex
b21ffa1f9b
Changes score adjustments to tempScore increases (#4987) 2024-07-17 23:36:15 +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
Eduardo Quezada
2b40e79ac3 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	include/battle_util.h
#	src/battle_ai_main.c
2024-07-14 22:44:00 -04:00
sneed
6aa308e1d8
EFFECT_PHOTON_GEYSER and restored EFFECT_SHELL_SIDE_ARM work for physical moves (#4923) 2024-07-14 15:35:11 +02:00
Bassoonian
f6d2b2861a
Fix Tera indicators (#4960)
* Fix Tera indicators

* Better fix
2024-07-13 23:08:43 +02:00
Frank DeBlasio
d224db43c8
Consolidated Lilycove Contest Lady's values into one struct (#4951)
* Consolidated Lilycove Contest Lady's values into one struct

* Converted Lilycove Lady strings to COMPOUND_STRINGS
2024-07-13 14:44:22 +02:00
Bassoonian
deb2b69a76
Fix Diamond Storm's effect (#4947) 2024-07-11 09:28:38 -04:00
Bassoonian
f85bff6e30
Fix Basculegion's gen9 level up learnset (#4948) 2024-07-11 15:07:39 +02:00
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
kleeenexfeu
e1a6876600
Bitter Malice description fix (#4933)
It always lowers the foe's attack
2024-07-08 17:37:40 -04: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
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
Alex
13b8daf36b
Supersweet Syrup wrong ability desc (#4902) 2024-07-03 22:53:41 +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
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
Alex
8ac739ea1a
[Update moves_info.h] wrong move names (#4854) 2024-06-22 09:52:39 +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
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
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
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
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
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
Bassoonian
568ce39c5d
Adds forbidden status parameter to FORM_CHANGE_ITEM_USE (#4738) 2024-06-08 07:36:39 +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
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
kittenchilly
a5b75746ea Pawmi 2024-06-03 14:17:34 -05:00