ghoulslash
|
81ed774c00
|
EndTurnEffectOrder Refactor (#6224)
|
2025-04-14 10:57:34 -04:00 |
|
GriffinR
|
709cfa1c9a
|
Merge pull request #2014 from Bassoonian/battleterrain
CI / build (push) Waiting to run
Rename battle terrain to environment
|
2025-04-13 19:32:06 -04:00 |
|
Alex
|
a4bfbea3cb
|
Revert wrongly done Embody Aspect fix (#6607)
|
2025-04-14 00:17:10 +02:00 |
|
Alex
|
caa878002a
|
Remove redundant bit for Throat Spray (#6593)
|
2025-04-13 16:22:04 +02:00 |
|
psf
|
e146940f25
|
Add B_LEVEL_UP_NOTIFICATION to improve player QoL when performing multiple level ups (#4901)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-04-12 10:23:48 +02:00 |
|
Hedara
|
2210e2d410
|
Merge branch 'master' into upcoming-master
|
2025-04-09 11:06:38 +02:00 |
|
Pawkkie
|
11d26af7a8
|
Initial attempt, doesn't see move effectiveness / damage
|
2025-04-08 00:15:28 -04:00 |
|
Pawkkie
|
d7a6e0bea8
|
Initialize move scores
|
2025-04-07 23:22:01 -04:00 |
|
AlexOn1ine
|
e8cc3c81f8
|
conflicts
|
2025-04-06 14:59:12 +02:00 |
|
Alex
|
5b9077e207
|
Refactor / Simlify Cmd_adjustdamage and remove redundancy (#6499)
|
2025-04-02 23:52:54 +02:00 |
|
Alex
|
c1f18d0765
|
Refactor protect to allow at least 126 different types of protect eff… (#6506)
|
2025-04-02 17:26:05 +02:00 |
|
Alex
|
ae62c80d0f
|
Refactors faint target abilities and adds Battle Bond config (#6519)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-02 16:00:23 +02:00 |
|
Alex
|
edb196e851
|
Fixes Red Card against Dynamaxed mons (#6526)
|
2025-04-02 14:28:53 +02:00 |
|
AlexOn1ine
|
0c35879e02
|
conflicts
|
2025-04-01 19:11:55 +02:00 |
|
AlexOn1ine
|
ccebebf64f
|
31-03-25 Master merge
|
2025-03-31 18:23:46 +02:00 |
|
Isaac Aronson
|
926a7437da
|
Add AI thinking cycle count display to frame count
|
2025-03-30 17:24:36 -05:00 |
|
Alex
|
79a2ec1ce2
|
Fixes Emergency Exit and Eject Pack (#6459)
|
2025-03-29 14:04:01 +01:00 |
|
AlexOn1ine
|
ae640f0714
|
25-03-25 master to upcoming merge
|
2025-03-25 21:39:58 +01:00 |
|
Alex
|
5ec301f04a
|
Removes unused Special Status members (#6479)
|
2025-03-25 21:15:25 +01:00 |
|
hedara90
|
a36f838d76
|
AI gimmick check changed from checking trainer data to a BattleStruct field (#6478)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-03-25 20:01:34 +01:00 |
|
Alex
|
b93976c980
|
Fixes Cheek Pouch mutating damage (#6466)
|
2025-03-23 23:34:24 +01:00 |
|
AlexOn1ine
|
3c632b8b44
|
19-03-25 master to upcoming merge
|
2025-03-19 17:12:47 +01:00 |
|
Alex
|
0db9043c52
|
Rename absentBattlerFlags to absent (#6432)
|
2025-03-17 21:51:04 +01:00 |
|
AlexOn1ine
|
4adb908a6b
|
review comments
|
2025-03-12 23:41:28 +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 |
|
Alex
|
3def0e751b
|
Fixes crash damage move against absorbing abilities (#6361)
|
2025-03-09 20:54:58 +01:00 |
|
AlexOn1ine
|
dd8606d577
|
fix timers
|
2025-03-08 22:26:03 +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 |
|
ghoulslash
|
d44eff4e0c
|
fix red card overwriting gBattlerAttacker causing subsequent MOVEEND cases checking attacker not to trigger properly
|
2025-03-03 14:56:08 -05:00 |
|
AlexOn1ine
|
134d1e79c7
|
review comments addressed
|
2025-02-28 22:42:53 +01:00 |
|
AlexOn1ine
|
0a333dbdc8
|
merge rhh/upcoming
|
2025-02-28 00:21:07 +01:00 |
|
Hedara
|
06d31bc8ea
|
Merge branch 'master' into final-1.10-master-upcoming-merge
|
2025-02-26 22:07:10 +01:00 |
|
PhallenTree
|
320c6cf11f
|
Fixes Coaching on semi-invulnerable ally, Air Balloon being stolen, Immunity abilities being ignored by Mold Breaker (#6327)
|
2025-02-23 20:50:52 +01:00 |
|
PhallenTree
|
9479b67964
|
Remove pursuitSwitchByMove and additional if statement (#6326)
|
2025-02-23 11:49:00 +01:00 |
|
Alex
|
7c78053a8c
|
Clean up leftover from simu hp reduction development (#6323)
|
2025-02-22 21:56:30 +01:00 |
|
Eduardo Quezada
|
fe7ed22f5b
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-20 19:44:00 -03:00 |
|
Alex
|
de8d25da55
|
Expand usage of IsBattlerAlly (rename from IsAlly) (#6251)
|
2025-02-14 12:31:21 +01:00 |
|
Alex
|
53727aa23d
|
Fixes ability Embody Aspect triggering multiple times (#6259)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-02-14 12:26:49 +01:00 |
|
AlexOn1ine
|
5ee5aa796a
|
merge rhh/upcoming
|
2025-02-12 21:01:21 +01:00 |
|
AlexOn1ine
|
3c09e43a20
|
minor reviews
|
2025-02-12 18:51:50 +01:00 |
|
Alex
|
72de12609c
|
Fixes BATTLER_TURN_DAMAGED battler id (#6236)
|
2025-02-11 16:18:00 -03:00 |
|
Alex
|
cc9ca81c29
|
Add abstraction layer for battler positions (#6212)
|
2025-02-11 11:32:34 -05:00 |
|
AlexOn1ine
|
b4f17c7506
|
review comments
|
2025-02-11 12:06:16 +01:00 |
|
Pawkkie
|
bd50fe6014
|
Fix AI switching in absorbing mon incorrectly (#6227)
|
2025-02-09 22:28:06 +01:00 |
|
Eduardo Quezada
|
a2ad5d2ca3
|
Heal Bell/Aromatherapy/Sparkly Swirl improvements and fixes (#6210)
|
2025-02-09 21:54:03 +01:00 |
|
Alex
|
5f13f9545f
|
Redefine IsBattlerAlive in battle.h as a static inline (#6211)
|
2025-02-09 14:09:23 -05:00 |
|
AlexOn1ine
|
f2bd88a7f9
|
EndTurnEffectsOrder Refactor
|
2025-02-09 13:48:08 +01:00 |
|
Eduardo Quezada
|
64c5113b23
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-02 14:18:13 -03:00 |
|
Eduardo Quezada
|
7c6eda21b1
|
Added missing in-battle "Move Info" button prompt (#6155)
|
2025-02-01 18:47:36 +01:00 |
|
Eduardo Quezada
|
ee1b75614d
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-30 22:46:06 -03:00 |
|
Alex
|
94c98e6233
|
Clean up follow up for Simultaneous Reduction HP (#6139)
|
2025-01-29 19:39:19 +01:00 |
|
Alex
|
6432027f6b
|
Replace BattleStruct members quickClawRandom/quickDrawRandom with locals (#6136)
|
2025-01-29 07:02:40 -03:00 |
|
Alex
|
49cbebd212
|
Remove formToChangeInto (Unused) (#6137)
|
2025-01-28 17:11:11 -03:00 |
|
Eduardo Quezada
|
927bb8f833
|
Fixed AI not handling type effectiveness beyond x8 (#6127)
|
2025-01-28 19:16:10 +01:00 |
|
PhallenTree
|
4158f9251f
|
Fix Powder (status) config and some terrain timers not using gBattleTurnCounter (#6109)
|
2025-01-26 13:06:11 +01:00 |
|
Alex
|
77b677dbf9
|
Introduces BattleTurnCounter to simplfy timer checks (#6080)
|
2025-01-25 14:26:38 -05:00 |
|
Eduardo Quezada
|
cd84e07341
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-23 23:01:25 -03:00 |
|
psf
|
b109aa0c92
|
Cleaned up Trainer Slides, added automated Trainer Slide tests, add new Enemy Critical Hit Slide (#6018)
|
2025-01-23 16:28:33 +01:00 |
|
hedara90
|
e8d3b4163f
|
Trainerslide animation fix (#6040)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-01-22 14:50:23 +01:00 |
|
Alex
|
ac9c8ac3bb
|
Replace WEATHER_HAS_EFFECT with HasWeatherEffect (#6069)
|
2025-01-21 08:43:45 +01:00 |
|
Alex
|
27c8ec07c2
|
Documentation for DisableStruct (#6066)
|
2025-01-20 16:41:42 -05:00 |
|
Pawkkie
|
465d30fbd0
|
Add AI_FLAG_PREDICT_SWITCH (#6028)
|
2025-01-16 21:43:16 +01:00 |
|
Alex
|
ddef67bbb1
|
Future Sight Innards Out follow up for upcoming (#5998)
|
2025-01-12 00:25:50 +01:00 |
|
Alex
|
8f34c76395
|
Removes Resource Flags and moves fields to DisableStruct (#5945)
|
2025-01-11 09:39:10 -03:00 |
|
Eduardo Quezada
|
8821779815
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-11 08:07:15 -03:00 |
|
Alex
|
6e5f40d506
|
Introduces BattlerState struct for the Battle Engine (#5954)
|
2025-01-11 07:12:22 -03:00 |
|
Alex
|
75a2d419e1
|
Follo up for Innards Out / Future Sight interaction (#5967)
|
2025-01-10 16:59:37 +01:00 |
|
Alex
|
5391b451ae
|
Shell Bell Clean up / Simplification and Tests (#5924)
|
2025-01-07 21:50:23 +01:00 |
|
PhallenTree
|
c10287b4c1
|
Fixes various Dynamax HP conversions/calculations (#5933)
|
2025-01-07 20:08:31 +01:00 |
|
wiz1989
|
04da838d88
|
Innards Out and Future Sight interaction
|
2025-01-07 14:00:09 +01:00 |
|
ghoulslash
|
401df8da4d
|
move overwrittenAbilities field to DisableStruct (#5946)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-01-03 18:17:23 +01:00 |
|
Alex
|
ec1876b826
|
Remove EWRAM gHpDealt (not needed anymore) (#5925)
|
2025-01-02 23:37:58 +01:00 |
|
Eduardo Quezada
|
9669a0554d
|
Encapsulate move data (#5852)
|
2025-01-01 20:34:33 +01:00 |
|
Eduardo Quezada
|
53aebc34dd
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2024-12-20 20:48:13 -03:00 |
|
Bassoonian
|
5cc0b35d81
|
Replace power checks with IS_MOVE_STATUS (#5820)
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
|
2024-12-20 08:20:46 -03:00 |
|
Alex
|
a2aba3f86a
|
Changes target TURN_DAMAGED and MAX_HP to inlines (#5822)
|
2024-12-17 17:21:12 -05:00 |
|
PhallenTree
|
775ea3b564
|
Pursuit refactor (#5707)
|
2024-12-06 19:14:46 +01:00 |
|
Eduardo Quezada
|
68b5b63ecb
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/hp_reduction
|
2024-12-04 12:04:47 -03:00 |
|
Eduardo Quezada
|
e4f8b4ccf0
|
Addressed review changes (minus encapsulation)
|
2024-12-04 11:31:28 -03:00 |
|
Martin Griffin
|
993663d9b0
|
Variadic IS_BATTLER_OF_TYPE and GetBattlerTypes (#5708)
|
2024-12-03 13:12:54 +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 |
|
AlexOn1ine
|
aa61f24e81
|
clean up
|
2024-12-02 18:25:24 +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
|
720938f040
|
Fix conflicts
|
2024-12-01 14:28:26 -03:00 |
|
Eduardo Quezada
|
7010080465
|
Merge branch '_RHH/upcoming' into _RHH/pr/master/1.10.0
|
2024-12-01 14:28:12 -03:00 |
|
Alex
|
0ca588943b
|
Fixes choiced moves not locked in after ability block (#5738)
|
2024-12-01 13:45:35 +01:00 |
|
Alex
|
88cdd8bdfb
|
Fixes Kee Maranga and Enigma Berry (#5727)
|
2024-11-28 11:22:32 +01:00 |
|
AlexOn1ine
|
97b30cb712
|
simultaneous hp reduction
|
2024-11-23 08:35:01 +01:00 |
|
hedara90
|
3481340da8
|
Critical Hit documentation and distorted match up struct switch (#5665)
|
2024-11-13 22:30:27 +01:00 |
|
PhallenTree
|
0919fbdc2d
|
Fix Order Up + Tera Stellar breaking each other with Commander (#5667)
|
2024-11-13 11:45:08 +01:00 |
|
AlexOn1ine
|
4dc784bd2d
|
fix conflict
|
2024-11-12 23:30:49 +01:00 |
|
AlexOn1ine
|
3204454853
|
Critical Hit documentation and distorted match up struct switch
|
2024-11-12 23:27:53 +01:00 |
|
Alex
|
a8351e305c
|
Fixes Red Card / Eject Pack interaction with Emergency Exit (#5657)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
|
2024-11-11 14:56:51 -05:00 |
|
Eduardo Quezada
|
b48e5770be
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2024-11-11 15:58:42 -03:00 |
|
Alex
|
0b66f52ead
|
Minor BattleStruct clean up (#5585)
|
2024-10-28 16:35:31 +01:00 |
|
Pawkkie
|
7413d107ae
|
Should switch refactor to facilitate switch prediction (#5466)
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
|
2024-10-25 13:04:42 +02:00 |
|
Eduardo Quezada
|
ee9c6d4912
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2024-10-17 00:16:01 -03:00 |
|
Pawkkie
|
9882e0aea6
|
Refactor ShouldSwitchIfAllBadMoves (#5452)
* Refactor ShouldSwitchIfAllBadMoves
* Rest of bugfix
* Enable Shed Tail test
* Revert "Enable Shed Tail test"
This reverts commit e0b9a3affcf3c465c8743741e5ca61bde6c8cb18.
* Better names for i, j
* Fix MAX_MON_MOVES that should be MAX_BATTLERS_COUNT
* battlerIndex / moveIndex fix
* Update src/battle_controller_player_partner.c
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2024-10-16 11:22:48 -04:00 |
|
Eduardo Quezada
|
9ed153ff93
|
Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015
|
2024-10-15 22:22:52 -03:00 |
|