Alex
2d628aca0e
Move end clear bits clean up ( #8354 )
...
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-11-27 17:42:16 +01:00
AlexOn1ine
93cc143134
conflicts
2025-11-11 13:12:00 +01:00
FosterProgramming
43f9a78da5
Fix recharge moves + add recharge move tests ( #8181 )
2025-11-09 17:46:22 +01:00
Bassoonian
f7cbe4853b
Add type enum ( #8054 )
2025-10-27 16:41:22 +00:00
Bassoonian
be23dfdf2a
Even more enums and documentation ( #8029 )
2025-10-25 14:37:47 +02:00
Alex
eee546df06
Item battle effect refactor ( #7857 )
2025-10-12 08:59:33 +02:00
khbsd
e385c7f59f
feat: change defines in constants/abilities.h to an enum ( #7006 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-09-29 21:35:09 +02:00
grintoul
ce8f532c20
Battle debug menu: highlight chosen action and change separator ( #7709 )
2025-09-08 21:50:18 +02:00
grintoul
70068bf314
Battle debug menu now checks correct parties depending on battler party ( #7652 )
2025-08-30 22:39:02 +02:00
Alex
f4c91b5539
Convert statuses3 to volatiles ( #7514 )
2025-08-11 23:19:36 +02:00
Alex
acc82e7d79
Convert Status4 to volatiles ( #7411 )
...
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-08-05 19:28:33 +02:00
Alex
8e8813e593
Show chosen move in the battle debug menu ( #7382 )
2025-07-22 12:58:15 -04:00
AlexOn1ine
165e7502bc
Instant Win option in Battle Debug
2025-07-13 16:21:37 +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
Alex
31a561201b
Adds hazard queue ( #7295 )
2025-07-07 15:30:35 -04:00
Eduardo Quezada
c6a62758a2
Use compound strings in battle debug menu ( #7282 )
2025-07-05 13:45:20 +02:00
Alex
e503f97f32
Use dedicated functions for Mud/Water Sport ( #7248 )
2025-07-02 09:08:12 +02:00
hedara90
390482d355
Fix debug text order ( #7149 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-19 14:26:49 +02:00
Eduardo Quezada
800829538c
Compound strings for hold effect names ( #7140 )
2025-06-18 11:38:42 +02:00
Nephrite
06cd3af3ea
Volatile status refactoring ( #6983 )
2025-06-18 07:22:41 +02:00
AlexOn1ine
b90fdd1b3c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
Hedara
2e4833240f
Merge commit 'b31a73f990fb680629e2a503d72d137bcff0872a' into pret-merge
...
Conflicts:
include/item.h
src/battle_ai_script_commands.c
src/battle_main.c
src/battle_pyramid_bag.c
src/battle_script_commands.c
src/battle_util.c
src/item.c
src/item_menu.c
src/item_use.c
src/pokemon.c
src/pokemon_summary_screen.c
src/shop.c
2025-05-24 21:24:56 +02:00
AlexOn1ine
1a773a5916
conflicts
2025-05-14 23:21:33 +02:00
Eduardo Quezada
3ef61e6451
Combined type-enhancing hold effects ( #6846 )
2025-05-14 13:45:08 +02:00
Eduardo Quezada
13071f7019
Added IsOnPlayerSide
2025-05-12 13:53:15 -04:00
Alex
d00563d830
Changed White Herb hold effect name ( #6815 )
2025-05-11 11:34:47 +02:00
AlexOn1ine
4959187d97
fix conflicts
2025-05-09 21:47:53 +02:00
Eduardo Quezada
392d662c12
Rename GetPartyBattlerData to GetBattlerMon ( #6800 )
2025-05-09 15:14:09 +02:00
Alex
1871d16ffa
Refactor battler message ids ( #6765 )
2025-05-07 00:24:10 +02:00
Eduardo Quezada
1f23fe0dd3
Use GetPartyBattlerData where appropiate ( #6779 )
2025-05-06 17:13:50 +02:00
AlexOn1ine
9a14bb2dd3
removed aiFlags prefix
2025-05-01 20:22:11 +02:00
AlexOn1ine
182d42642d
Move out ai struct out of BattleResources
2025-05-01 11:27:48 +02:00
Bassoonian
512368fd03
Add type checking for hold item effects ( #6619 )
2025-04-15 23:33:00 +02:00
Hedara
2210e2d410
Merge branch 'master' into upcoming-master
2025-04-09 11:06:38 +02:00
hedara90
ff8bf967d4
Added AI switch display to the battle debug ( #6529 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-02 23:44:09 +02:00
AlexOn1ine
ae640f0714
25-03-25 master to upcoming merge
2025-03-25 21:39:58 +01:00
kittenchilly
76bb903d06
Update Battle Debug menu with new AI flags ( #6444 )
2025-03-22 08:54:52 +01:00
hedara90
4e01ce6993
Moved some AI stuff out of the battlestruct ( #6405 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-11 21:23:02 +01:00
Pawkkie
b12f32667f
Fix roll handling in AI damage calcs ( #6396 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-03-08 09:53:14 +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
Pawkkie
b5f539ed21
Rename AI_FLAG_PREFER_STRONGEST_MOVE ( #5972 )
2025-01-08 14:00:20 +01:00
Eduardo Quezada
9669a0554d
Encapsulate move data ( #5852 )
2025-01-01 20:34:33 +01:00
Eduardo Quezada
5130ea9da3
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-28 11:45:49 -03:00
Alex
71dfd3e7c0
Ogerpon masks were missing their hold effects ( #5391 )
...
* Ogerpon masks were missing their hold effects
* fix wrong num
* test
* correct tests and additional fix
* added hold effect to battle debug
2024-09-19 00:25:53 +02:00
Alex
25e9ca2ac6
Cleaned up a bit of code with GetBattlerPartyData ( #5378 )
...
* rename GetBattlerPartyData
2024-09-15 08:24:26 +02:00
pkmnsnfrn
5635f94036
More changes from typeX to types[X]
2024-08-07 11:35:45 -07: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
a16448c081
Update and clean up Battle Debug ( #4643 )
...
* Update battle debug with new stuff
* Fix status not showing up
* Update hold effects as well
* Update battle_debug.c
* Update battle_debug.c
2024-07-26 00:07:11 +02: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
