Pawkkie
|
83b7732fae
|
Store predictingMove, config for chance
|
2025-05-08 14:19:43 -04:00 |
|
spindrift64
|
5e190d0782
|
Fix gems activating for moves that don't deal type damage (#6789)
|
2025-05-08 20:17:32 +02:00 |
|
Pawkkie
|
63ffe603be
|
merge fixes
|
2025-05-08 14:04:27 -04:00 |
|
Pawkkie
|
1e57670b34
|
Merge remote-tracking branch 'upstream/upcoming' into move-prediction
|
2025-05-08 13:58:18 -04:00 |
|
Eduardo Quezada
|
5820cc99f6
|
battle_main enum cleanup (#6788)
|
2025-05-08 13:34:33 +02:00 |
|
i0brendan0
|
8cc289ef35
|
Fix rerolls overwriting Fixed Personality (#6774)
|
2025-05-08 11:28:00 +02:00 |
|
Eduardo Quezada
|
addebea4d6
|
Better handling of battle coords (#6787)
|
2025-05-07 22:25:10 +02:00 |
|
hedara90
|
b6b6e91959
|
A lot of tests (#6734)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-07 16:50:12 +02:00 |
|
Alex
|
6a548a6034
|
Document battler side in anim code (#6780)
|
2025-05-07 11:05:01 +02:00 |
|
Alex
|
7c4fb512a1
|
Fixes Symbiosis not triggering when a weakness berry was consumed (#6782)
|
2025-05-07 11:04:11 +02:00 |
|
Martin Griffin
|
384b8f127e
|
Merge pull request #2132 from AsparagusEduardo/_pret/pr/respectMonPicOffsets
`InitSpritePosToAnimAttacker` documentation
|
2025-05-07 07:02:14 +01:00 |
|
Alex
|
6fe5f6530a
|
General MoveEnd clean up and Fell Stinger adjustments (#6674)
|
2025-05-07 00:30:43 +02:00 |
|
Alex
|
1871d16ffa
|
Refactor battler message ids (#6765)
|
2025-05-07 00:24:10 +02:00 |
|
Eduardo Quezada
|
f12c321845
|
InitSpritePosToAnimAttacker documentation (#6781)
|
2025-05-06 21:51:26 +02:00 |
|
Eduardo Quezada
|
15e39339b9
|
InitSpritePosToAnimAttacker documentation
|
2025-05-06 15:11:38 -04:00 |
|
Eduardo Quezada
|
1f23fe0dd3
|
Use GetPartyBattlerData where appropiate (#6779)
|
2025-05-06 17:13:50 +02:00 |
|
Eduardo Quezada
|
76b9a6918e
|
Use missing constants with GetBattlerSpriteCoord (#6778)
|
2025-05-06 14:54:28 +02:00 |
|
Alex
|
4e7b1f2a97
|
Fixes Stomping Tantrum not boosting damage when missed due to Accuracy (#6762)
|
2025-05-06 12:07:01 +02:00 |
|
Pawkkie
|
c8fa4442d9
|
Adjust switch AI based on move scoring (#6615)
|
2025-05-06 00:39:44 +02:00 |
|
GriffinR
|
c39ef1a030
|
Merge pull request #2125 from DavidJCobb/battle-link-re
Battle link reverse-engineering
|
2025-05-05 18:17:28 -04:00 |
|
spindrift64
|
0742741dd3
|
Fix Life Orb inflicting self damage when using status moves (#6767) (#6773)
|
2025-05-04 22:26:12 +02:00 |
|
Pawkkie
|
3f5335c4ba
|
Refactor AI flags to u64 (#6753)
Co-authored-by: DizzyEggg
|
2025-05-04 17:16:34 +02:00 |
|
PCG
|
904b399a81
|
Added Egg Moves for Basculin White Striped (#6769)
|
2025-05-04 11:43:57 +02:00 |
|
Eduardo Quezada
|
96650ffd27
|
Add "Move Item" option in party menu (#6758)
|
2025-05-04 11:40:31 +02:00 |
|
hedara90
|
fe2d7442af
|
Remove old slide workaround (#6754)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-03 10:54:49 +02:00 |
|
hedara90
|
e92d48aee9
|
03/05/25 Master to upcoming merge (#6764)
|
2025-05-03 10:54:27 +02:00 |
|
Pawkkie
|
5e2a066eda
|
Add AI_FLAG_PP_STALL_PREVENTION to ai_flags.md (#6756)
|
2025-05-03 10:48:30 +02:00 |
|
AlexOn1ine
|
40bf9ae087
|
conflicts
|
2025-05-03 10:26:07 +02:00 |
|
hedara90
|
68d9c0e456
|
Fix the Move Item option in the PC still expecting compressed palettes (#6739)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-02 21:43:24 +02:00 |
|
Bivurnum
|
668cd7e413
|
Rename follower npc macros for better specificity and to match documentation (#6742)
|
2025-05-02 21:08:42 +02:00 |
|
Alex
|
9259b7ee69
|
Bugfixes batch (#6750)
|
2025-05-02 20:14:27 +02:00 |
|
Pawkkie
|
1f5d949013
|
Pret merge (2nd of May 2025) (#6752)
|
2025-05-02 12:14:39 -04:00 |
|
GriffinR
|
263026e432
|
Merge pull request #2128 from DavidJCobb/re-battle-weather-anims
Identified task and sprite fields related to battle weather animations
|
2025-05-02 11:33:04 -04:00 |
|
hedara90
|
ccda2308a3
|
Add AI_FLAG_PP_STALL_PREVENTION (#6743)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-02 11:30:09 -04:00 |
|
Hedara
|
4fa48b6e89
|
Merge remote-tracking branch 'pret/master' into pret-merge-2025-05-02
|
2025-05-02 17:29:41 +02:00 |
|
GriffinR
|
5a036aedcf
|
Merge pull request #2131 from hedara90/fix-mapson-g++-include
Added missing include due to g++ changes
|
2025-05-02 11:28:12 -04:00 |
|
Hedara
|
c8d3a6b4df
|
Added missing include due to g++ changes
|
2025-05-02 16:03:55 +02:00 |
|
DavidJCobb
|
0f17e70371
|
Shorter names for engine/controller communication enum members
|
2025-05-02 00:01:15 -04:00 |
|
DavidJCobb
|
d83b0671f7
|
Battle anims, ice: ARRAY_COUNT works if used with a cast
|
2025-05-01 23:49:05 -04:00 |
|
AlexOn1ine
|
9a14bb2dd3
|
removed aiFlags prefix
|
2025-05-01 20:22:11 +02:00 |
|
AlexOn1ine
|
057c0f5480
|
fix test compiling
|
2025-05-01 17:25:27 +02:00 |
|
AlexOn1ine
|
182d42642d
|
Move out ai struct out of BattleResources
|
2025-05-01 11:27:48 +02:00 |
|
PhallenTree
|
fadf472157
|
Adds RNG tags and tests for Moody and Starf Berry (#6718)
|
2025-05-01 10:16:15 +02:00 |
|
Pawkkie
|
1a2cd5645a
|
Fix roll handling in AI party damage calcs (#6733)
|
2025-05-01 10:15:19 +02:00 |
|
Pawkkie
|
4b1789ab1e
|
Fix Wonder Guard potential double switching (#6737)
|
2025-04-30 18:16:48 -04:00 |
|
Eduardo Quezada
|
d2a4b5ef84
|
Changed Tackle for Scratch in tests (#6730)
|
2025-04-30 17:18:52 -04:00 |
|
Alex
|
55f9f6adea
|
Refactor battler flee and watch options + clean up (#6724)
|
2025-04-30 11:54:42 -04:00 |
|
Alex
|
4ff2f3de42
|
Centralizes non volatile status effect checks (#6533)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-04-30 11:34:19 -04:00 |
|
Bassoonian
|
2412666b01
|
Master to upcoming 2025-04-30 (#6731)
|
2025-04-30 15:56:07 +02:00 |
|
Hedara
|
0eeba00d1b
|
Merge branch 'master' into master-upcoming-2025-04-30
Conflicts:
include/battle.h
include/constants/expansion.h
include/graphics.h
src/battle_bg.c
src/battle_util.c
src/data/graphics/battle_terrain.h
src/data/graphics/pokemon.h
src/pokeblock_feed.c
src/pokemon_sprite_visualizer.c
|
2025-04-30 15:22:37 +02:00 |
|