ghoulslash
5538095785
Replace hp checks with IsBattlerAlive ( #4429 )
...
* add IsBattlerAlive to flame/toxic orb, convert a bunch of .hp != 0 and .hp == 0 checks to IsBattlerAlive
* remove redundant IsBattlerAlive checks on flame/toxic orb
* Update src/battle_util.c
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-05-07 16:39:02 +02: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
2a605f2d84
Gen 1 type matchups + cleaned type matchup table ( #4508 )
2024-05-06 17:37:03 +02:00
Eduardo Quezada
d5a72ec685
Merge branch '_RHH/master' into _RHH/upcoming
2024-05-05 19:50:12 -04:00
PhallenTree
f07ef07855
Fixes various abilities' switch-in messages ( #4500 )
...
* Fixes Costar, Zero to Hero, Supreme Overlord and Ruin abilities' switch-in messages
* Fixed typo in Supreme Overlord's String Id
* Fixes spacing in battle_string_ids.h
2024-05-05 14:25:40 +02:00
kittenchilly
0aad2a9ba7
Change Battle Frontier validation to species flag ( #4341 )
...
* Split isLegendary into isRestrictedLegendary and isSubLegendary
* Address reviews and fix build
* Update frontier_util.c
* Remove gFrontierBannedSpecies , fast edition
* Sped up name generation
* More speed up
* Split Frontier restriction into its own flag
* Mythicals shouldn't be banned always anymore
* u32
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-05-03 13:32:06 -04:00
Eduardo Quezada
0c74fd31c3
Merge branch '_RHH/master' into _RHH/upcoming
2024-05-02 14:24:17 -04:00
Alex
6d397f9867
Fixes Magic Bounce in double battles ( #4464 )
...
* Fixes Magic Bounce in double battles
* Add Double Battle check
2024-05-02 14:23:46 +02:00
kittenchilly
d58e6517f8
Add abilities Tera Shift, Tera Shell, and Teraform Zero ( #4418 )
...
* Add abilities Tera Shift, Tera Shell, and Teraform Zero
* Address reviews
* Tests and misc cleanup
* Fix alignments
* Update battle_script_commands.c
* New tests and fix behavior
* Address more reviews
* Update battle_util.c
2024-04-27 19:52:31 +02:00
kittenchilly
fc9d5c289a
Embody Aspect fixes ( #4439 )
...
* Embody Aspect fixes
* Fix tests
* Update battle_util.c
2024-04-27 19:35:42 +02:00
kittenchilly
64b28124fb
Add Tera Starstorm move + make Tera Blast displayed type reflect current type due to tera state ( #4447 )
...
* Add Tera Starstorm move + make Tera Blast/Tera Starstorm displayed type reflect tera type
* Ooops
* Curse tests
2024-04-27 19:35:29 +02:00
Alex
ec37b2170f
Fixes Hospitality triggering on a fainted mon ( #4450 )
2024-04-26 16:29:26 +02:00
Eduardo Quezada
d42de03ddc
Merge branch '_RHH/master' into _RHH/upcoming
2024-04-25 12:37:31 -04:00
Alex
94cb2133c6
Fixes ability dancer not targeting multiply targets ( #4437 )
...
* Fixes ability dancer not targeting multiply targets
* remove file
2024-04-25 10:13:57 +02:00
AgustinGDLV
84a9d4ffcf
Terastallization ( #4110 )
...
* wrote foundational terastal tests
* implemented baseline test-only Tera functionality; modified GetBattlerType + STAB calculations, misc. changes to some moves
* added tests and func. for Stellar type, more tests for Tera Blast
* more tests for Stellar type, Conversion fixes, Color Change + Conversion2 future proof
* implemented tera blast, expanded stellar type func., fixed tests
* last set of Tera/Tera Blast tests for checklist, protean fix
* implemented in-battle Terastallization, WIP stellar indicator and tera animation
* fixed bad merge
* expanded NUMBER_OF_MON_TYPES, cut down on TYPE_STELLAR hackiness, added Stellar type to summary
* fixed type indicators
* added tera logic to AI
* implemented code review changes, added B_TERA_ORB_NO_COST
* updated AI to calc damage with Tera when applicable; minor rework to AI gimmick handling
* fixed Tera Blast split choice occuring when not Terastallized
* fixed Tera Blast using Last Respects BP calcs
* added tera type to TrainerMon, code review tweaks
2024-04-24 11:17:46 +02:00
Alex
49c86f86c8
Adds Ability Poison Puppeteer ( #4416 )
...
* Adds Ability Poison Puppeteer
* nothing happened
* parametrize poison powder and toxic
* leftover
2024-04-20 22:23:20 +02:00
Eduardo Quezada
3d9c7732f6
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/event_object_movement.h
# src/data.c
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info/gen_4_families.h
2024-04-20 13:23:14 -04:00
Eduardo Quezada
c4c371824f
Merge branch '_RHH/master' into _RHH/upcoming
2024-04-20 08:22:49 -04:00
LOuroboros
d08fb8e824
Turned B_RESTORE_HELD_BATTLE_ITEMS into a non-boolean config ( #4402 )
...
* Corrected the comment description of B_RESTORE_HELD_BATTLE_ITEMS
* Made B_RESTORE_HELD_BATTLE_ITEMS a non-boolean config
2024-04-18 09:03:39 +02:00
kittenchilly
e19b05a3a9
Add Fog weather ( #4359 )
...
* Add Fog weather
* Update battle_string_ids.h
* Update battle.h
* some tweaks
* Update battle_anim_scripts.s
* Address reviews
* Update battle_util.c
* Update battle_util.c
* Update include/config/battle.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Address reviews, changes, fix bugs
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-04-17 12:06:49 -04:00
Eduardo Quezada
5a276dcbbf
Merge branch '_RHH/master' into _RHH/upcoming
2024-04-15 18:29:06 -04:00
Alex
952183889a
Fixes Ability Shield, Neutralizing Gas interaction ( #4391 )
...
* Fixes Ability Shield, Neutralizing Gas interaction
* test was wrong
2024-04-14 18:43:55 +02:00
Alex
5bf6a252b5
Fixes Eject Pack softlocking the game ( #4387 )
2024-04-14 02:43:16 +02:00
skolgrahd
3b17ce39f7
Fixed softlock w/ weather-triggered form changes & Cloud Nine ( #4382 )
...
* Fixed softlock when weather-triggered form changes are suppressed by Cloud Nine
* Removed KNOWN_FAILING; line from Castform Air Lock test
2024-04-13 13:19:14 -04:00
Eduardo Quezada
5bf379720f
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/data/moves_info.h
2024-04-12 21:30:52 -04:00
Alex
35e04b84a8
Fixes Cud Chuw ( #4379 )
...
* Fixes Cud Chuw
* small correction
2024-04-12 12:15:49 +02:00
Alex
62d054e135
Future Sight fixes ( #4350 )
...
* Future Sight fixes
* handle life orb boost
* applied review
* Future Sight changes
* removed future sight no hit string
* agbcc
* Update battle_scripts.h
2024-04-11 10:23:16 +02:00
kittenchilly
3fb52b6b0e
Change Frostbite abbreviation from FSB to FRB ( #4355 )
...
* Change Frostbite abbreviation from FSB to FRB
* Melted the ice is actually the one used
* Update moves_info.h
* Update moves_info.h
* Update items.h
2024-04-10 09:16:32 +02:00
Alex
3c85089428
Fixes Gulp Missile Dive / Power Herb interaction ( #4371 )
...
* Fixed Cramorant Dive / Power Herb interaction
* remove file
* leftover
2024-04-09 10:32:11 +02:00
Alex
db42d2b5a4
Adds Booster Energy ( #4337 )
...
* Adds Booster Energy
* fix string
* fixes strings in tests
* Apply suggestions from code review
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-04-05 19:38:50 +02:00
sneed
520efa01c8
Fixes Guts countering frostbite spAtk reduction ( #4351 )
2024-04-05 18:11:11 +02:00
Alex
c52ae074ab
Fixes Protective Pads Fluffy interaction ( #4340 )
...
* Fixes Protective Pads Fluffy interaction
* couple more tests
2024-04-04 14:48:57 +02:00
Alex
92e23415ab
Change freeze dry to allow easier extendebility ( #4312 )
...
* Change freeze dry to allow easier extensibility
* give body press the foul play treatment
* Tests
2024-03-31 19:15:18 +02:00
DizzyEggg
46e6324fe2
Fix White Herb Known Failing tests ( #4258 )
...
* Fix White Herb Known Failing tests
* get out agbcc
* remove unneeded white herb test
2024-03-29 17:43:05 +01:00
DizzyEggg
4a8551247a
Fix Z mirror move ( #4308 )
2024-03-29 11:33:28 +01:00
Eduardo Quezada
39ed85635f
Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/data.h
# 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_3_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_6_families.h
# src/data/pokemon/species_info/gen_7_families.h
# src/data/pokemon/species_info/gen_8_families.h
2024-03-17 23:41:23 -03:00
Alex
b5af343dc4
Reverts additional move effect macros ( #4277 )
2024-03-14 17:20:13 -03:00
DizzyEggg
a36cfb1093
unify monSpritesGfx sprites/ptr and fix various compiler errors on o3/os/og ( #4252 )
2024-03-06 22:26:33 +01:00
Nephrite
e9b2f33084
Fixed Tangling Hair + Mirror Armor interaction
2024-02-27 13:38:38 +09:00
Nephrite
170070baef
Apply suggestions from code review
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-02-26 23:59:15 +09:00
Nephrite
0aac57bf60
Renamed TestSheerForceFlag
2024-02-26 15:11:21 +09:00
Nephrite
46b67355a5
Merge remote-tracking branch 'rhh/upcoming' into battlemove_refactored
2024-02-26 14:23:53 +09:00
Nephrite
174c6fc999
Renamed "MoveHasMoveEffect" functions
2024-02-26 14:21:38 +09:00
Eduardo Quezada
ead108d28e
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# src/data/graphics/pokemon.h
2024-02-19 13:49:10 -03:00
ghoulslash
ce99db0086
Generic Starting Battle Status Variable ( #4176 )
...
* setup generic starting battle status variable, ABILITYEFFECT_SWITCH_IN_STATUSES
* fix B_ANIM_TAILWIND, assign to starting statuses, and change B_VAR_STARTING_STATUS check for only the variable and not trainers
* Update src/battle_main.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Update src/battle_util.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Update src/battle_util.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* style fixes
* General_Room naims play SE
* fix sText_BizarreArenaCreated
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-02-14 10:05:37 +01:00
Eduardo Quezada
502a56efd1
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/global.h
# src/data.c
# src/data/pokemon/species_info/gen_7.h
2024-02-13 20:35:05 -03:00
LOuroboros
e73c58ed2e
Made EFFECT_WRING_OUT read the max power from the move's argument field ( #4180 )
...
* Made EFFECT_WRING_OUT read the max power from the move's argument field
* Renamed EFFECT_WRING_OUT to EFFECT_VARY_POWER_BASED_ON_HP
2024-02-12 22:39:15 +01:00
Nephrite
b665e7245b
Merge remote-tracking branch 'rhh/upcoming' into battlemove_refactored
2024-02-12 16:15:53 +09:00
Eduardo Quezada
1720e1b129
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# data/battle_scripts_2.s
# src/data/pokemon/species_info/gen_9.h
2024-02-10 17:53:32 -03:00
