Commit Graph

3565 Commits

Author SHA1 Message Date
Frank DeBlasio
a15d9a81f9
Adding move animation backgrounds to the Pokemon Sprite Visualizer (#8764) 2026-01-11 22:59:14 +01:00
Eduardo Quezada
4df79828ac Merge branch '_RHH/master' into _RHH/pr/upcoming/masterMerge 2026-01-11 15:06:42 -03:00
Bassoonian
b0f922d3c1
Adds type checking for battler positions (#8792) 2026-01-11 14:53:22 +00:00
Linathan
3e273221ff
Add Legends Z-A: Mega Dimension content (#8550)
Co-authored-by: LinathanZel <LinathanZel@github.com>
Co-authored-by: root <root@Linathan.localdomain>
2026-01-11 13:51:19 +01:00
FosterProgramming
8ad0451914
Capture odds refactor and new catch rate modifiers (#8682)
Co-authored-by: kittenchilly <mario.pikmin.zelda@gmail.com>
2026-01-11 09:52:38 +01:00
Alex
c76c3b37bb
Refactor protect failure to match vanilla (#8832) 2026-01-10 18:23:01 +01:00
FosterProgramming
4527557761
Another MOVE_DEFAULT bugfix (#8823) 2026-01-07 11:07:12 -08:00
Eduardo Quezada
45295d9544
B_ABILITY_TRIGGER_CHANCE config tests (#8594) 2026-01-06 15:53:29 +01:00
Frank DeBlasio
ec0db10694
Consolidate battle anim particles (#8797) 2026-01-06 14:09:29 +01:00
Alex
5b76c96411
Update volatiles once again (#8798) 2026-01-06 01:09:53 +01:00
Frank DeBlasio
faa779ea2c
Added Secret Power animations to gBattleEnvironmentInfo (#8807) 2026-01-05 23:03:13 +01:00
Kildemal
54b3a0e410
Add handling for Trick/Switcheroo behavior when both battlers are choice-locked (pre–Gen 5) (#8730) 2026-01-05 14:22:07 +00:00
FosterProgramming
1dcfe54b59
Refactor mon generation (#8204)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2026-01-04 20:01:59 -08:00
Hedara
7fed5c93bb Merge branch 'upcoming' into master-to-upcoming 2026-01-04 17:34:20 +01:00
Hedara
0b91e2772f Merge commit '900abdb5a6aa9703c83316d4463c0ff43e57548f' into master-to-upcoming
Conflicts:
	asm/macros/battle_script.inc
	src/battle_script_commands.c
2026-01-04 17:26:53 +01:00
Hedara
78124e88d7 Merge commit '0e33bf916e80e4dcf4f96ca0419a8b2fda5da51d' into master-to-upcoming
Conflicts:
	src/battle_main.c
	test/battle/ability/beads_of_ruin.c
	test/battle/ability/commander.c
	test/battle/ability/desolate_land.c
	test/battle/ability/primordial_sea.c
	test/battle/ability/supreme_overlord.c
	test/battle/ability/sword_of_ruin.c
	test/battle/ability/tablets_of_ruin.c
	test/battle/ability/vessel_of_ruin.c
	test/battle/ai/ai.c
	test/battle/ai/ai_multi.c
	test/battle/ai/ai_switching.c
	test/battle/gimmick/dynamax.c
	test/battle/move_effect/counter.c
	test/battle/move_effect/fling.c
	test/battle/move_effect/mirror_coat.c
	test/battle/move_effect/misty_explosion.c
	test/battle/move_effect/protect.c
	test/battle/move_effect/psychic_terrain.c
	test/battle/move_effect/sticky_web.c
	test/battle/trainer_slides.c
2026-01-04 11:28:59 +01:00
grintoul
838d582381
enum TrainerPicID to replace defines for TRAINER_PIC_XXXX and TRAINER_BACK_PIC_XXXX (#8789)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2026-01-03 16:41:11 -08:00
Frank DeBlasio
2fba6a4da4
Simplified sprite visualizer's battle backgrounds (#8775) 2026-01-03 22:59:34 +01:00
Zimmermann Gyula
8cd51b94b0
Add Gen2 OW_TIMES_OF_DAY configuration. (#8176) 2026-01-03 09:08:43 -08:00
Alex
d9da5ee874
Fix Red Card / Eject Button interaction (#8780) 2026-01-03 16:54:04 +00:00
Bassoonian
3755e51a24
Move enum (#8739) 2026-01-03 17:43:48 +01:00
Alex
906b1c8ea9
Clean up volatiles (#8762) 2026-01-03 17:25:19 +01:00
Kildemal
ad6469718b
Add pre–Gen 4 handling for Hidden Power and Counter interaction (#8741) 2026-01-03 17:14:59 +01:00
Alex
e04028420a
Further weather consolidation (#8161) 2026-01-03 15:39:22 +01:00
Alex
900abdb5a6
Add enum for battle script commands (#8778) 2026-01-03 13:52:21 +00:00
moostoet
1510947001
Fix Rage generational inaccuracies (#8642) 2026-01-03 08:51:31 +01:00
moostoet
0e33bf916e
Fix berry activation timing for Yawn sleep and Leech Seed damage (#8776) 2026-01-03 08:50:17 +01:00
Hedara
addb11cfa2 Merge branch 'master' into master-to-upcoming
Conflicts:
	include/constants/expansion.h
	src/battle_script_commands.c
2026-01-02 11:49:03 +01:00
Hedara
c09339cc46 Start of 1.14.3 cycle 2026-01-02 10:45:08 +01:00
Hedara
64d40d3c14 Expansion 1.14.2 release 2026-01-02 10:41:18 +01:00
lordraindance2
eee89c0a60
Added a include/config option to change mega cry sounds (#7558) 2026-01-02 10:19:34 +01:00
Hedara
4bdef731e4 Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
	include/constants/battle_ai.h
	src/battle_ai_script_commands.c
	src/battle_gfx_sfx_util.c
	src/pokemon_summary_screen.c
	src/trainer_pokemon_sprites.c
2026-01-01 22:16:58 +01:00
hedara90
f91b052f7a
01/01/26 Master to upcoming merge (#8731) 2026-01-01 11:59:18 +01:00
AlexOn1ine
a1948b7c40 01/01/26 Master to upcoming merge 2026-01-01 10:24:19 +01:00
Pawkkie
39c142a879
Add AI_FLAG_RANDOMIZE_PARTY_INDICES (#8717) 2025-12-31 22:56:22 +01:00
grintoul
a71fc91484
Trainer slides for multiple trainers and multibattles (#7588)
Co-authored-by: hedara90 <90hedara@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-12-30 20:28:53 +00:00
Alex
5774dde7ae
Adds smart target type (#8639) 2025-12-30 19:16:03 +01:00
Alex
3a8fdf9fad
Create battle_move_resolution.c (#8703) 2025-12-29 16:13:45 +01:00
PhallenTree
d5c40bbbdd
Add Move End Faint Block (#8673) 2025-12-28 20:44:39 +01:00
hedara90
8de29867d9
Make Porygon not load-bearing (#8688) 2025-12-27 16:26:41 +01:00
FosterProgramming
30e5fc6958
Refactoring the way teachable learnsets are generated (#8027) 2025-12-26 13:13:29 +01:00
FosterProgramming
a44da2cc99
Improve make_scr_cmd_constants.py (#8347) 2025-12-24 07:26:51 +01:00
Alex
4d69a7274f
Stockpile / WishFutureKnock / Order up clean up (#8528) 2025-12-22 19:57:54 +01:00
Alex
644b04a9f4
Move Explosion to attackcanceler and Terrain Boost effect (#8612) 2025-12-22 18:52:28 +01:00
PhallenTree
22b78e924d
Counter/Mirror Coat/Metal Burst refactor (#8604) 2025-12-21 12:25:28 +01:00
Eduardo Quezada
828e12bee6
B_SPORT_DMG_REDUCTION config tests (#8593) 2025-12-20 15:47:46 +01:00
Eduardo Quezada
36e71c8236
B_BINDING_TURNS config tests (#8595) 2025-12-20 15:24:39 +01:00
Eduardo Quezada
44b658935f
B_TAILWIND_TURNS config tests (#8592) 2025-12-19 18:21:10 -05:00
Eduardo Quezada
9451af1c64
B_UPDATED_CONVERSION_2 config tests (#8573) 2025-12-19 16:17:24 +01:00
Hedara
e4ae9317c9 Merge branch 'master' into master-to-upcoming
Manual fixes to Lunar Dance handling

 Conflicts:
	include/battle_util.h
	src/battle_ai_main.c
	src/battle_ai_switch.c
	src/battle_ai_util.c
	src/battle_end_turn.c
	src/battle_script_commands.c
	src/battle_util.c
	test/battle/ai/ai_doubles.c
	test/battle/move_effect/snatch.c
	test/battle/spread_moves.c
2025-12-19 15:31:37 +01:00