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
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
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
Eduardo Quezada
069161b716
Untag release
2024-05-27 09:31:06 -04:00
Eduardo Quezada
767a1c7937
Version 1.8.4 ( #4639 )
...
* Version 1.8.4
* Missing labels
2024-05-27 09:06:34 -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
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
sneed
b592c6eae5
Add POKE_ICON_BASE_PAL_TAG to a header
2024-05-23 02:45:22 +03: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
Eduardo Quezada
14ab00cfeb
Moved message counts to their own file + remove unneeded include
2024-05-21 22:04:22 -04:00
Eduardo Quezada
9fc7e37c73
Comment updates
2024-05-21 19:38:42 -04:00
Eduardo Quezada
2fe18c22f9
Style fixes
2024-05-21 18:57:09 -04:00
moostoet
85ca0645a9
Add configuration to prevent permanent item theft (Covet / Thief) from NPCs ( #4605 )
...
* feat: implement logic for gen5+ covet/thief
* refactor: add define, misc. changes
* fix: define parenthesises
* fix: revert to bool32
* fix: formatting
2024-05-20 22:52:12 +02:00
cawtds
b73e33618d
Fix status curing of full restore when used on party member ( #4603 )
...
* fix getboxmondata for evolutiontracker if compiled with agbcc
* fixed full restore curing status condition when used in battle on party member with missing hp
added more full restore tests
* formatting, removed unused
2024-05-20 00:25:03 +02:00
Bassoonian
bc9f09744d
Egg Move Refactor ( #4534 )
...
* Egg Move Refactor
* Update python file and fix formatting
2024-05-19 13:47:15 +02:00
Frank DeBlasio
849bd0c8bb
Consolidate natures ( #4562 )
...
* Added NatureInfo struct
* Added back animation variants to struct
* Added PokeBlock animations to struct
* Added Battle Palace info to struct
* Added nature girl messages to struct
* Reordered gNaturesInfo to match struct order
* Refactored nature stat table
* Fixed battle dome nature calculation
* Fixed neutral nature values
* Fixed bracket layout
2024-05-19 10:14:31 +02:00
Pawkkie
35e90b896d
Adjust description of FREE_MATCH_CALL ( #4590 )
...
* Adjust description of FREE_MATCH_CALL
* Shorten comment
2024-05-19 10:13:14 +02:00
kittenchilly
b7fc2b447a
Add Stellar Tera Shard sprite ( #4595 )
...
* Add Stellar Tera Shard sprite
* Update items.h
2024-05-18 22:20:47 +02:00
Bassoonian
d811cd1c4c
Add egg cycle length config ( #4596 )
2024-05-18 14:59:32 -04:00
Eduardo Quezada
a6bfcc1194
More style fixes
2024-05-18 14:36:06 -04:00
Alex
1d83ce430c
Follow up to #4579 : wrong naming ( #4591 )
2024-05-18 17:05:25 +02:00
Eduardo Quezada
73a13e5dd4
Some review changes
2024-05-18 10:40:09 -04:00
Eduardo Quezada
569749f9c2
Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# Makefile
# gflib/sprite.h
# graphics/object_events/pics/pokemon/wailord.png
# include/constants/event_objects.h
# include/random.h
# src/data/object_events/object_event_graphics.h
# src/data/object_events/object_event_graphics_info.h
# src/data/object_events/object_event_graphics_info_pointers.h
# src/event_object_movement.c
# src/random.c
# src/scrcmd.c
2024-05-18 10:12:17 -04:00
kittenchilly
4b221b5802
Get rid of gItemIconTable ( #4579 )
...
* Get rid of gItemIconTable
* Move the script to the folder
2024-05-18 10:22:26 +02:00
Ariel A
d785fad8cf
refactor: code review for expansion
2024-05-17 21:37:18 -04:00
Ariel A
d3849f2fc6
Merge branch 'followers' into followers-expanded-id
2024-05-17 20:46:24 -04:00
Ariel A
6856bcf610
refactor: code review for expansion
2024-05-17 20:45:32 -04:00
Eduardo Quezada
dca0305ac8
FLAG_TEMP_HIDE_FOLLOWER is now an alias for FLAG_TEMP_E
2024-05-17 11:24:05 -04:00
Alex
635db6312c
AI respects partner when using spread moves in double battles ( #4518 )
...
* Fixes Earthquake AI in double battles
* earthquake_ai_fix
* Use CompareDamagingMoves to fix spread damage issue
2024-05-17 00:41:55 +02:00
Eduardo Quezada
6eba5bcb80
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
2024-05-16 17:31:46 -04:00
Alex
faf61e62fb
Adds move Spicy Extract ( #4211 )
...
* Adds move Spicy Extract
* remove uneeded line
* anim, new tests, acc change
* Clear Amulet, Contrary interaction
* ai
* correction
* simplify script a bit
* clean up
* Spicy Extract script overhaul
* merge rhh/upcoming
* alignment
* AI changes/additions
* add Foul Play check
* Remove useless ai checks
* remove wrong test
* review issues
2024-05-16 11:03:50 +02:00
Bassoonian
7d84cd62ef
Add on release item config ( #4577 )
2024-05-15 23:46:25 +02:00
ghoulslash
9c6dfb7c0c
Move RestoreBattlerData out of Ai_CalcDmg and add SaveBattlerData Protections ( #4156 )
...
* move restorebattlerdata out of Ai_CalcDmg
* fix SetBattlerdata calls
* add saved field to struct AI_SavedBattleMon to prevent overwriting saved mon info
* AI_CalcPartyMonDamage set opposing battler known data
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-05-15 20:39:03 +02:00
Eduardo Quezada
ab682ce900
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/data/items.h
# src/pokemon_summary_screen.c
2024-05-15 09:58:21 -04:00
Eduardo Quezada
ac16a52918
Revert "Guillotine: Decapitalize everything ( #3949 )" ( #4525 )
...
This reverts commit e2d70d440e6217ed8d16663010ea2678846c4e14, reversing
changes made to 0d2b40095377e51576dcc8931c1d87066b039c31.
# Conflicts:
# gflib/text.c
# include/config/decap.h
# src/battle_message.c
# src/item.c
2024-05-13 19:19:37 +02:00
Eduardo Quezada
3219a48adf
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_script_commands.c
2024-05-13 11:00:12 -04:00
Alex
56cee80fbf
Explosion and Mind Blown / Steel Beam refactor (CFRU port) ( #4516 )
...
* Explosion and Mind Blown / Steel Beam refactor (CFRU port)
* forgot ndebug
* Restored EFFECT_MIND_BLOWN
* requested changes
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-05-12 11:41:18 -04:00
sneed
a8bb82778a
Remove and replace MOVE_EFFECT_SP_ATK_TWO_DOWN ( #4557 )
2024-05-12 15:07:43 +02:00
Eduardo Quezada
be37820bd9
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_script_commands.c
2024-05-11 19:53:19 -04:00
sneed
f502ba2a69
Stat stage related AI fixes ( #4548 )
...
* stat stage related AI fixes
* add more ai fixes and 2 tests
* use legal ability in tests
* Fix test and remove mold breaker check
* Use DoesBattlerIgnoreAbilityChecks
2024-05-11 19:03:19 +02:00
Abbie Potter
da3d715f3b
Punchier tera animation ( #4507 )
...
* Punchier tera animation
* Removed testing comments
* Replaced VARIOUS_APPLY_TERASTALLIZATION with callnative
* Remove redundant arg from applyterastallization
2024-05-07 07:59:52 -04:00
BlueAnthem37510
2d7c79e860
Gulp missile not triggering on faint fix and added form change type ( #4502 )
...
* Cramorant faint fix and add form change type
* Fixed formatting, renamed form change type, changed various to callnative
* Fix oops broke everything except gulp missile
* Improved condition order
* remove extra line
* whitespace and alignment
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* whitespace and alignment
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* whitespace and alignment
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* whitespace and alignment
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* whitespace and alignment
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* whitespace and alignment
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Added requested changes
---------
Co-authored-by: BlueAnthem37510 <a@a.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-05-07 06:44:17 -04:00
Eduardo Quezada
35a76248d1
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# src/data/pokemon/species_info/gen_4_families.h
2024-05-06 16:03:29 -04:00
Eduardo Quezada
1ceae6e100
Merge branch '_RHH/master' into _RHH/upcoming
2024-05-06 15:29:21 -04:00
Eduardo Quezada
eca47fe209
Non-tagged release
2024-05-06 14:51:48 -04:00
