17662 Commits

Author SHA1 Message Date
Eduardo Quezada
3b6dbf38fd Review changes 2025-05-12 20:53:14 -04:00
Eduardo Quezada
13071f7019 Added IsOnPlayerSide 2025-05-12 13:53:15 -04:00
Alex
a880cfe6d2
master to upcoming, 2025-05-12 (#6830) 2025-05-12 18:44:35 +02: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
hedara90
5f86fd7de6
Changed github CI to use arm-none-eabi-gcc (#6829)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-12 16:38:03 +01:00
PhallenTree
a6b02b00c0
Fixes restoretarget on empty stack when using G-Max Gravitas (#6827) 2025-05-12 15:16:40 +02:00
hedara90
2bc82a886a
Add AUTO_GEN_TARGETS for .party files and map_groups_count, but on master (#6824)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-11 22:37:11 +02:00
Ruby
2740fdd6e6
Timemacros (#6696) 2025-05-11 12:34:54 +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
Alex
8d5d7c7fca
Fixes ai moves being recorded without correct index (#6803)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-05-10 19:38:48 +02:00
spindrift64
3b91a964c9
Fix Iron Ball type effectiveness check (#6794) 2025-05-09 22:23:44 +02:00
Eduardo Quezada
eee78ddfb9
Fix upcoming compile (#6804) 2025-05-09 21:28:55 +02:00
PhallenTree
48c08c0368
Illusion struct cleanup and many Illusion fixes (#6798) 2025-05-09 20:41:20 +02:00
hedara90
e587757fa6
Added JSON as the preferred data format (#6801) 2025-05-09 15:15:48 +02:00
Eduardo Quezada
392d662c12
Rename GetPartyBattlerData to GetBattlerMon (#6800) 2025-05-09 15:14:09 +02:00
Pawkkie
04cebed982
Fix AI function table to match new u64 flags (#6796) 2025-05-09 12:32:22 +02:00
Alex
9060d401c9
Adds partyState to BattleStruct (#6783) 2025-05-09 12:29:54 +02:00
Eduardo Quezada
f3113eb865
Add missing uses of IsBattlerAlly (#6793) 2025-05-08 21:18:51 +02:00
Pawkkie
da047dfd22
Add AI for Zero to Hero Palafin (#6791) 2025-05-08 20:33:27 +02:00
spindrift64
5e190d0782
Fix gems activating for moves that don't deal type damage (#6789) 2025-05-08 20:17:32 +02: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
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
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
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
hedara90
ccda2308a3
Add AI_FLAG_PP_STALL_PREVENTION (#6743)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-02 11:30:09 -04:00