3146 Commits

Author	SHA1	Message	Date
Bassoonian	885180ff8b	27/02/26 Master to upcoming merge (#9384)	2026-02-28 15:58:05 +01:00
AlexOn1ine	0fc3ef056a	27/02/26 Master to upcoming merge	2026-02-27 23:53:24 +01:00
Bassoonian	310f746565	Fix space indentation in .s and .inc files (#9371)	2026-02-27 12:45:00 -08:00
Hedara	4dba49657a	Merge remote-tracking branch 'pret/master' into pret-merge ... Conflicts: data/battle_anim_scripts.s src/battle_anim_water.c src/event_object_movement.c src/field_player_avatar.c	2026-02-26 15:33:26 +01:00
Alex	89fbaef8ba	Sky Drop Fixes/Refactor (#9185)	2026-02-16 18:22:53 +01:00
Frank DeBlasio	064ca5c243	Added macro for Surf/Muddy Water's animation (#2232)	2026-02-06 10:08:20 -05:00
Hedara	0c447063e1	Merge branch 'master' into master-merge ... Conflicts: data/battle_anim_scripts.s include/battle_util.h include/constants/expansion.h src/battle_anim_dark.c src/battle_anim_effects_1.c src/battle_anim_normal.c src/battle_hold_effects.c src/battle_script_commands.c src/battle_util.c src/debug.c	2026-02-04 12:46:59 +01:00
Frank DeBlasio	dafbe66df4	Converted break_screen_animation from a macro to a function (#9115)	2026-02-04 09:54:14 +01:00
Hedara	e758d55a03	Merge remote-tracking branch 'pret/master' into pret-merge ... Manual cleanups to the Magma Storm animation and AnimTask_InvertScreenColor Conflicts: asm/macros/battle_anim_script.inc data/battle_anim_scripts.s include/constants/battle_anim.h src/battle_anim_bug.c src/battle_anim_dragon.c src/battle_anim_effects_1.c src/battle_anim_normal.c	2026-01-31 19:20:54 +01:00
Eduardo Quezada	278739ee66	Form Change Improvements (#8850) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2026-01-29 00:35:08 +01:00
Frank DeBlasio	db3e5cc1fd	Consolidated common steps for Brick Break, Psychic Fang, and Raging Bull's animations (#9020)	2026-01-28 17:47:00 +01:00
cawtds	97e83ebe6a	Add FRLG (#7423)	2026-01-28 17:41:12 +01:00
Alex	0c44cc1b27	Move Target failure follow up (#8986) ... Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>	2026-01-28 15:48:14 +01:00
AlexOn1ine	f8266b828b	26/01/26 Master to upcoming merge	2026-01-26 19:35:43 +01:00
Eduardo Quezada	89da62b02d	Remove trailing whitespace - Master (#9011)	2026-01-25 10:12:41 +01:00
FosterProgramming	fe2c154b89	Refactor chooseboxmon (#8491) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2026-01-22 19:54:19 +01:00
Alex	922db5ce4a	Move adjustdamage to the damage calc (#8948)	2026-01-20 12:30:00 +01:00
Martin Griffin	22eed3f4bf	Partially document battle_anim_effects_1.c	2026-01-19 09:16:37 +00:00
Martin Griffin	0e415dde46	Document battle_anim_dragon.c	2026-01-19 09:16:37 +00:00
Martin Griffin	5d713ad9bb	Document battle_anim_dark.c	2026-01-19 09:16:37 +00:00
Martin Griffin	050a9415c7	Document battle_anim_bug.c	2026-01-19 09:16:37 +00:00
Martin Griffin	e09423fadf	Document battle_anim_normal.c	2026-01-19 09:16:37 +00:00
Alex	de7aaf854c	Misc battle engine changes (#8931)	2026-01-16 18:55:22 +01:00
Alex	bb41e5622c	Refactor move target failure (#8696) ... Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>	2026-01-13 15:13:38 -08:00
Alex	550469891a	Add setpreattackadditionaleffect and use it for brick break / spectra… (#8719)	2026-01-12 17:13:39 +01:00
PhallenTree	ad6b64432e	Improve IsBattlerSpritePresent's alive check (#8847)	2026-01-09 14:59:37 +01: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
PhallenTree	a06894b5ee	Ability Shield allows for ability activation when obtained and Trick cleanup (#8784)	2026-01-04 17:23:36 +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
cawtds	b11741855d	Add enum for battle script opcodes (#2222)	2026-01-02 20:19:01 +00:00
grintoul	e82ed111ba	Misc style and whitespace cleanup (#8681)	2026-01-02 18:01:43 +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	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
AlexOn1ine	a1948b7c40	01/01/26 Master to upcoming merge	2026-01-01 10:24:19 +01:00
Pawkkie	0551fcf408	Add Dynamic Switch AI Function (#8629)	2025-12-25 02:02:01 +01:00
spindrift64	582a643d1f	fix poisons absorbing toxic spikes when fainting from other hazards (#8644)	2025-12-23 21:47:42 +01:00
Alex	4d69a7274f	Stockpile / WishFutureKnock / Order up clean up (#8528)	2025-12-22 19:57:54 +01:00
Alex	6681b03c9b	Refactor Endeavor to use DoFixedDamageMoveCalc func (#8618)	2025-12-22 18:33:38 +01:00
PhallenTree	22b78e924d	Counter/Mirror Coat/Metal Burst refactor (#8604)	2025-12-21 12:25:28 +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
Alex	71a1967b7b	Move target type refactor (#8513)	2025-12-18 13:12:41 +01:00
Eduardo Quezada	425e532afb	Document magic number in createspriteontargets (#8551)	2025-12-17 10:43:57 +01:00
Alex	5509268d6b	Fix potential bug with CanBattlerGetOrLoseItem (#8518)	2025-12-13 13:14:48 -05:00
Martin Griffin	7e2215e05a	waitmovementall (#8333)	2025-12-11 14:52:58 +01:00
Eduardo Quezada	04da8aa285	Allow Starting Statuses beyond 15 (#8485)	2025-12-09 16:24:23 +01:00
GriffinR	d8a6b72e23	Display error for invalid hidden item flags	2025-12-03 21:44:25 -05:00
Alex	49a18df48a	Refactor Fury Cutter and Rollout (#8375)	2025-12-02 16:45:34 +01:00