Pawkkie
|
83b7732fae
|
Store predictingMove, config for chance
|
2025-05-08 14:19:43 -04: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 |
|
Eduardo Quezada
|
addebea4d6
|
Better handling of battle coords (#6787)
|
2025-05-07 22:25:10 +02:00 |
|
Alex
|
6a548a6034
|
Document battler side in anim code (#6780)
|
2025-05-07 11:05:01 +02: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
|
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 |
|
Pawkkie
|
c8fa4442d9
|
Adjust switch AI based on move scoring (#6615)
|
2025-05-06 00:39:44 +02:00 |
|
Pawkkie
|
3f5335c4ba
|
Refactor AI flags to u64 (#6753)
Co-authored-by: DizzyEggg
|
2025-05-04 17:16:34 +02:00 |
|
Eduardo Quezada
|
96650ffd27
|
Add "Move Item" option in party menu (#6758)
|
2025-05-04 11:40:31 +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 |
|
Alex
|
9259b7ee69
|
Bugfixes batch (#6750)
|
2025-05-02 20:14:27 +02: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 |
|
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 |
|
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 |
|
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 |
|
Cafe
|
b451bc3606
|
New Lurantis animation (#6725)
|
2025-04-30 12:45:29 +02:00 |
|
Alex
|
afcba8d9cd
|
Fixes Stomping Tantrum not doubling power if asleep or frozen (#6719)
|
2025-04-29 23:25:56 +02:00 |
|
Hedara
|
4873589c65
|
Merge remote-tracking branch 'pret/master' into new-pret-merge
Conflicts:
asm/macros/battle_script.inc
data/battle_anim_scripts.s
include/battle.h
include/battle_controllers.h
include/battle_setup.h
include/constants/battle.h
src/battle_anim_normal.c
src/battle_anim_utility_funcs.c
src/battle_bg.c
src/battle_controllers.c
src/battle_main.c
src/battle_script_commands.c
|
2025-04-29 20:27:33 +02:00 |
|
Pawkkie
|
ab6a97d20d
|
remove predictedScore
|
2025-04-28 21:47:17 -04:00 |
|
Pawkkie
|
787a8a0d9d
|
Merge remote-tracking branch 'upstream/upcoming' into move-prediction
|
2025-04-28 13:23:33 -04:00 |
|
Bivurnum
|
49ae82c679
|
changed remove check from objId to localId for npc followers
|
2025-04-28 10:58:35 -05:00 |
|
Pawkkie
|
96a8035dec
|
Fix party data assignment (#6712)
|
2025-04-28 08:48:21 +02:00 |
|
Pawkkie
|
7a3cf5d3a3
|
Improve AI's defense against Focus Punch (#6713)
|
2025-04-28 08:34:09 +02:00 |
|
Pawkkie
|
38c90909eb
|
WORKS, still needs work :D
|
2025-04-28 00:56:03 -04:00 |
|
Pawkkie
|
4970b3bd95
|
Merge remote-tracking branch 'upstream/upcoming' into move-prediction
|
2025-04-28 00:33:42 -04:00 |
|
Eduardo Quezada
|
c1b9ed5dcf
|
Fixed upcoming not compiling in gcc 11.4.0 (#6710)
|
2025-04-27 23:11:03 -04:00 |
|
hedara90
|
67f3405864
|
Fix pc mon pic (#6709)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-04-27 15:19:46 -04:00 |
|
hedara90
|
5dfbdf56da
|
27/04/25 Master to upcoming merge (#6701)
|
2025-04-27 18:01:50 +02:00 |
|
Eduardo Quezada
|
fc872b481e
|
Fix FORM_CHANGE_ITEM_HOLD bug manifested during givemon (#6702)
|
2025-04-27 15:27:21 +02:00 |
|
Bivurnum
|
47723c34e5
|
Follower NPCs (follow-me) (#6500)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-04-27 14:56:18 +02:00 |
|
AlexOn1ine
|
19fb962173
|
remove more unused
|
2025-04-27 14:56:03 +02:00 |
|
AlexOn1ine
|
1c5d9b4708
|
unused var
|
2025-04-27 10:03:31 +02:00 |
|
AlexOn1ine
|
e246b20e72
|
27/04/25 Master to upcoming merge
|
2025-04-27 09:50:25 +02:00 |
|
Alex
|
87bd59b6f4
|
Fixes Z and Max moves dmg reduction against side protection - upcoming (#6698)
|
2025-04-26 23:37:15 +02:00 |
|
hedara90
|
d1aa49cca3
|
Remove compressed palettes (#6455)
|
2025-04-26 22:58:40 +02:00 |
|
Alex
|
1cd4d23969
|
Fixes Z and Max moves dmg reduction against side protection (#6697)
|
2025-04-26 21:46:41 +02:00 |
|
Pawkkie
|
8f5b2fddf7
|
Fix bracket typo in AI_CheckBadMove conditional (#6695)
|
2025-04-26 09:46:10 +02:00 |
|
Pawkkie
|
9737850eea
|
Keep Steven Multi Debug Option at the Bottom Forever (#6694)
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-04-25 19:57:22 +02:00 |
|
PCG
|
f661f3b3ac
|
Pokedex Plus HGSS move configs (#6687)
|
2025-04-24 19:34:37 +02:00 |
|
hedara90
|
5cd7bd77b3
|
Fix various Toxic Spikes interactions (#6690)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-04-24 17:06:47 +02:00 |
|
PhallenTree
|
34e91dd96f
|
Fixes Unburden doubling speed when affected by Neutralizing Gas (#6691)
|
2025-04-24 15:26:23 +02:00 |
|