7253 Commits

Author SHA1 Message Date
Alex
de79d6de48
Added IsOnPlayerSide (#6832) 2025-05-13 12:38:43 +02:00
Bassoonian
2394195123
Remove non-existent functions from header files (#6825) 2025-05-13 10:52:45 +02:00
Eduardo Quezada
5f0a853e74 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/isOnPlayerSide 2025-05-12 20:58:27 -04:00
Eduardo Quezada
3b6dbf38fd Review changes 2025-05-12 20:53:14 -04:00
Alex
006abe097e
Add AI_FLAG_PREDICT_MOVES (#6551) 2025-05-12 23:10:10 +02:00
Alex
7f894ef5fb
Fixes a mistake made by me (#6828) 2025-05-12 20:08:00 +02:00
Eduardo Quezada
13071f7019 Added IsOnPlayerSide 2025-05-12 13:53:15 -04:00
Hedara
1abfa7acfa Merge branch 'master' into master-upcoming
Conflicts:
	include/battle.h
	include/constants/battle_string_ids.h
	src/battle_ai_util.c
	src/battle_main.c
	src/battle_util.c
	test/battle/ai/ai.c
2025-05-12 18:21:35 +02:00
Eduardo Quezada
eadf89e6f9
Allow different flags for Badge boost (#6805) 2025-05-11 11:36:52 +02:00
Alex
d00563d830
Changed White Herb hold effect name (#6815) 2025-05-11 11:34:47 +02:00
Alex
0ad3f929ab
Fixes Berserk Gene infinite loop (#6813) 2025-05-11 11:34:16 +02:00
spindrift64
f4f82f2394
Toxic Spikes print whether the target is poisoned or badly poisoned (#6814) 2025-05-10 22:55:28 +02:00
Alex
4342bfb91d
Refactor stockpile resets (#6810)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-05-10 20:09:38 +02:00
spindrift64
3b91a964c9
Fix Iron Ball type effectiveness check (#6794) 2025-05-09 22:23:44 +02: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
Alex
9060d401c9
Adds partyState to BattleStruct (#6783) 2025-05-09 12:29:54 +02:00
Pawkkie
c7ee329433 Full functionality 2025-05-08 16:45:10 -04:00
Pawkkie
04278dbfac don't need prints any more 2025-05-08 14:52:13 -04:00
Pawkkie
b48d0c387d Throw out unnecessary functions 2025-05-08 14:49:49 -04:00
Pawkkie
83b7732fae Store predictingMove, config for chance 2025-05-08 14:19:43 -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
hedara90
b6b6e91959
A lot of tests (#6734)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-07 16:50:12 +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
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
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
hedara90
fe2d7442af
Remove old slide workaround (#6754)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-03 10:54:49 +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
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
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
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
Hedara
f0ecbce9c7 Start of 1.11.3 Cycle 2025-04-30 11:26:09 +02:00
Hedara
accb85554a Expansion 1.11.2 Release 2025-04-30 11:23:05 +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
Pawkkie
7a3cf5d3a3
Improve AI's defense against Focus Punch (#6713) 2025-04-28 08:34:09 +02:00