122 Commits

Author SHA1 Message Date
Bassoonian
f7cbe4853b
Add type enum (#8054) 2025-10-27 16:41:22 +00:00
Alex
eee546df06
Item battle effect refactor (#7857) 2025-10-12 08:59:33 +02:00
Alex
a818b97732
GetBattlerHoldEffect clean up (#7819)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-09-29 17:16:15 +02:00
Alex
32f8464fec
Attackcanceller fixes and improvements (#7698) 2025-09-16 18:00:30 +02:00
Nephrite
a1e67572b6
Replaces STATUS2 usage with volatiles in code (#7262)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-07-11 22:53:49 +02:00
Eduardo Quezada
d795de9e9d
Remove more instances of hard-coded Move IDs (#7056) 2025-06-03 23:26:48 +02:00
Alex
177fa2f096
Combines Super Fang and Guardian of Alola effects (#7048) 2025-06-03 10:26:25 +02:00
Alex
eb81820ae3
Clean up battlescript calls with func BattleScriptCall (#6873) 2025-05-31 09:09:35 +02:00
Eduardo Quezada
13071f7019 Added IsOnPlayerSide 2025-05-12 13:53:15 -04:00
PhallenTree
48c08c0368
Illusion struct cleanup and many Illusion fixes (#6798) 2025-05-09 20:41:20 +02:00
Eduardo Quezada
392d662c12
Rename GetPartyBattlerData to GetBattlerMon (#6800) 2025-05-09 15:14:09 +02:00
Bassoonian
cca969b04d
Adds move effect type checking (#6618) 2025-04-16 00:08:57 +02:00
Bassoonian
512368fd03
Add type checking for hold item effects (#6619) 2025-04-15 23:33:00 +02:00
AlexOn1ine
99bd3dba4a revert BS_UpdateDynamax 2025-04-14 16:20:07 +02:00
AlexOn1ine
0c35879e02 conflicts 2025-04-01 19:11:55 +02:00
Alex
99a3d01877
Fixes dynamax reversion when ejected out + anim fix (#6416)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-03-17 19:57:38 +01:00
AlexOn1ine
4babfd003e rhh merge/upcoming 2025-02-09 14:04:21 +01:00
AlexOn1ine
f2bd88a7f9 EndTurnEffectsOrder Refactor 2025-02-09 13:48:08 +01:00
Alex
765a12f520
Convert max effects to normal move effects (#6143) 2025-02-06 21:02:39 -03:00
Eduardo Quezada
e9c14e35ca
Cleaned up party data access GetPartyBattlerData (#6172) 2025-02-03 20:34:15 +01:00
Alex
77b677dbf9
Introduces BattleTurnCounter to simplfy timer checks (#6080) 2025-01-25 14:26:38 -05:00
Eduardo Quezada
8821779815 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-11 08:07:15 -03:00
Eduardo Quezada
c33c38e020
Remove form change function footguns (#5995) 2025-01-11 09:57:39 +01:00
PhallenTree
c10287b4c1
Fixes various Dynamax HP conversions/calculations (#5933) 2025-01-07 20:08:31 +01:00
ghoulslash
03684c6539
Battle Weather Refactor (#5833) 2025-01-04 07:33:25 -05:00
Eduardo Quezada
9669a0554d
Encapsulate move data (#5852) 2025-01-01 20:34:33 +01:00
AlexOn1ine
74f1d7cb80 merge rhh/upcomig 2024-12-28 21:03:34 +01:00
Alex
8edf14423a
Refactors argument into a union (#5853)
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-12-23 15:51:35 -03:00
AlexOn1ine
99fef0260f Battle Weather Refactor 2024-12-19 20:50:08 +01:00
Philipp AUER
7744298788
Fix fixed point damage calculation off-by-1s (#5775)
Co-authored-by: sbird <sbird@no.tld>
2024-12-05 11:35:56 +00:00
Pawkkie
599f4d339b
Adds SleepClauseBlock enum to CanBeSlept (#5773) 2024-12-04 21:54:31 +01:00
AlexOn1ine
8acb31339d rename critChance and moveDamage 2024-12-02 19:57:45 +01:00
AlexOn1ine
d95dbadccc merge rhh/upcoming 2024-12-02 19:00:55 +01:00
Pawkkie
2b7905beb1
Add B_FLAG_SLEEP_CLAUSE (#5566)
Co-authored-by: Isaac Rivera <isaacrivera2020@u.northwestern.edu>
Co-authored-by: iriv24 <40581123+iriv24@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
2024-12-02 09:06:03 +01:00
Eduardo Quezada
1a581c407c Merge branch '_RHH/master' into _RHH/upcoming 2024-12-01 08:11:32 -03:00
Alex
3343a16a7c
Fixes Dynamax dynamic move type (#5739) 2024-11-30 17:49:50 -05:00
AlexOn1ine
97b30cb712 simultaneous hp reduction 2024-11-23 08:35:01 +01:00
Eduardo Quezada
59e617b16d
Updated Wring Out effects to match Eruption effects (#5549) 2024-10-20 21:44:28 +02:00
psf
2597d8a35a
Updated species defines (#5075)
* First version of new defines

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Removed old defines

* Removed old defines

* Removed old defines and cleaned up some macros

* Undid changes to documentation
Deleted unused defines
Updated defines
Fixed tests
fixed docs

* moved note to top per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#discussion_r1783641599

* fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#pullrequestreview-2341613591
2024-10-02 18:24:57 -03:00
PhallenTree
ac9b40a423
Fixes Max Moves ignoring absorbing abilities, G-Max Corviknight and Centiskorch names (#5296)
* Fix Max and G-Max Moves bypassing absorbing abilities

* Fix G-Max Corviknight and Centiskorch speciesName

* Remove some outdated comments

* Missing Dynamax check

* Add Max Quake and Max Overgrowth to test
2024-08-31 12:39:37 +02:00
Alex
77afb01477
Fixes Zigzgoon battle being able to use a Gimmick (#5129)
* Fixes Zigzgoon battle being able to use a Gimmick

* add commit

* Update src/battle_terastal.c

* Update src/battle_dynamax.c
2024-08-11 00:23:51 +02:00
Alex
edc883d038
Refactors residual damage (#4945)
* Refactors damage non types

* correction

* Refactor weather damage script

* new line

* correction

* there was a hail test already

* ndebug

* add sandstorm test

* Update src/battle_script_commands.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-07-13 12:12:40 +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
594633aa15
Remove Duplicate ai code from battle_ai_util.c (#4883)
* Remove Duplicate ai code from battle_ai_util.c

* Add GetBattlerAbility in toxic self check
2024-07-03 10:48:31 +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
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
WillKolada
0ed8d09d47
Revert Dynamax HP on fainting (#4681)
* Revert Dynamax HP on fainting

Calls UndoDynamax whenever a mon faints to ensure that its HP is reverted and the relevant data is cleared. Updates UndoDynamax to CalculateMonStats after applying the HP reversion to prevent fainted mons from retaining their boosted Max HP until the end of the battle.

* Update src/battle_main.c

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-05-31 22:33:31 +02:00
Nephrite
93af96c10c
Replaces VARARG_8 uses with recursive macros (#4232) 2024-04-05 18:42:11 +01:00
Frank DeBlasio
2f4203bc4c
Consolidate type properties (#4185)
* Moved gTypeNames into gTypes

* Added invalid move text to struct

* Added max move to struct

* Added icon palette to struct

* Added macros for invalid and max moves

* Swapped palette and max move order

* Renamed invalid to generic

* Renamed invalid to generic in struct definition

* Added zMoves and items to type struct

* Addressed comments

* Incorporated newer comments

* Updated comment format
2024-03-12 07:57:38 -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