471 Commits

Author SHA1 Message Date
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
spindrift64
3b91a964c9
Fix Iron Ball type effectiveness check (#6794) 2025-05-09 22:23:44 +02:00
hedara90
b6b6e91959
A lot of tests (#6734)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-07 16:50:12 +02:00
Pawkkie
c8fa4442d9
Adjust switch AI based on move scoring (#6615) 2025-05-06 00:39:44 +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
Pawkkie
7a3cf5d3a3
Improve AI's defense against Focus Punch (#6713) 2025-04-28 08:34:09 +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
PCG
68598e232e
Disable P_TUTOR_MOVES_ARRAY config (#6693) 2025-04-25 12:33:03 +02:00
PCG
f661f3b3ac
Pokedex Plus HGSS move configs (#6687) 2025-04-24 19:34:37 +02:00
Ruby
aba34015db
Time menu for RTC in debug menu. (#6634)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-23 19:34:37 +02:00
khbsd
6b8e680139
Remove hardcoded values from wild_encounter.h generation (#6640)
Co-authored-by: Moos Toet <moostoet@hotmail.com>
2025-04-20 22:27:36 +02:00
AlexOn1ine
fd0766c7fa 17-04-25-master-merge 2025-04-17 14:14:37 +02:00
LOuroboros
cb98106db0
Corrected Dexnav config related comment (#6610) 2025-04-13 21:49:38 -04:00
Pawkkie
540744024d
"Aerilate"-esque Ability Tests and Config (#6313) 2025-04-12 14:48:58 -04:00
Hedara
9afd8800f3 Merge branch 'upcoming' into merrps-dns 2025-04-12 16:33:02 +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
agsmgmaster64
1344d8e9dd
Type Effectiveness Indicators when selecting moves (#6559) 2025-04-12 01:03:45 +02:00
Hedara
301ef288f5 Review comments 2025-04-11 11:37:36 +02:00
khbsd
c1ad43b1cc
Adds SHOW_TYPES_SEEN to the B_SHOW_TYPES option (#6561) 2025-04-10 21:43:21 +02:00
Hedara
b075163c57 Cleanup and config options 2025-04-10 21:17:20 +02:00
psf
17d851e1f9
Add B_RUN_TRAINER_BATTLE - players can run from Trainer Battles (#6456)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-10 14:59:58 +02:00
Hedara
e419606a10 Merge branch 'upcoming' into merrps-dns 2025-04-09 12:48:18 +02:00
hedara90
3d68061f23
Updated move animation tests (#6554) 2025-04-09 12:17:57 +02:00
Hedara
08a2ad2c98 Merge branch 'upcoming' into merrps-dns 2025-04-09 10:01:51 +02:00
khbsd
26f28103ec
Add Time-Based Encounters (#6454) 2025-04-09 09:49:09 +02:00
psf
69f2f9f151
Add OW_DEFOG_FIELD_MOVE to allow players to clear overworld Fog (#6477) 2025-04-08 16:21:32 +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
psf
b60fcc9a72
Add B_ANIMATE_MON_AFTER_KO - mons animate after scoring a KO (#6451) 2025-03-26 11:39:25 +01:00
AlexOn1ine
ae640f0714 25-03-25 master to upcoming merge 2025-03-25 21:39:58 +01:00
hedara90
08f11ca5c1
Update the All Move Animations test (#6460)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-21 22:33:03 +01:00
Pawkkie
4c18e88282
Improve "all moves bad" switching (#6453) 2025-03-20 16:43:56 +01:00
Alex
5c05715585
Adds move description battle config (#6364) 2025-03-20 10:12:37 +01:00
Alex
4c4d043c13
Refactor the function IsAbilityPreventingEscape (#6439)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-03-19 16:09:36 +01:00
wiz1989
1e2aa18ffe
Added Dynamax/Gigantamax battle messages (#6440)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-03-17 19:16:43 +01:00
khbsd
816ed0d963
Low Health Beeps Configuration (#6328) 2025-03-15 22:02:48 -07:00
hedara90
b08a5fb15a
Tests for checking all move animations (#6297)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-13 13:46:48 +01:00
surskitty
7193909fa7
Configuration to make all Hail moves summon Snow or vis versa, to have only one ice weather (#6149) 2025-03-12 21:31:45 +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
wiz1989
e0c7b63095
"no additional effect" text for status Z moves without effects (#6368) 2025-03-06 12:47:03 +01:00
surskitty
fb28206f21
Configuration to scale Critical Capture odds based on local Pokedex or estimated National Pokedex (#6250) 2025-02-27 15:16:16 -08:00
hedara90
622a7f9a85
Refactor testing flags and vars to not conflict with user ones (#6301)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-22 15:32:39 +01:00
Pawkkie
b7df5b8c29
Fix Overzealous Absorber Switching (#6318) 2025-02-22 10:37:11 +01:00
Pawkkie
bf263efa4b
Fix AI hazard move handling, minor AI tweaks (#6311) 2025-02-21 09:58:14 +01:00
Eduardo Quezada
2428af66cd Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-02-20 19:17:59 -03:00
moostoet
a42de40eb2
Add function to adjust AI scoring for generalized item effects (#6247) 2025-02-13 12:51:25 -05:00
Eduardo Quezada
9c4fbbf274 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-13 13:06:32 -03:00
Alex
8448e745ea
Adds a follower flag define to disable followers on the fly (#6174) 2025-02-13 17:33:59 +01:00
Hedara
0da3e49889 Review comments 2025-02-13 10:36:52 +01:00
Hedara
a859f40e37 Review comments 2025-02-12 14:31:42 +01:00