Commit Graph

7995 Commits

Author SHA1 Message Date
AlexOn1ine
f8266b828b 26/01/26 Master to upcoming merge 2026-01-26 19:35:43 +01:00
GGbond
21492e0f23
Fix Foresight/Miracle Eye repeated-use behavior (#9025) 2026-01-26 14:48:39 +01:00
Eduardo Quezada
b07fe3f826
Fixed Link Overworld (#9014) 2026-01-25 14:59:26 +01:00
khbsd
12970602ce
fix: IsDoubleBattle() return value (#9012) 2026-01-25 10:15:01 +01:00
Eduardo Quezada
89da62b02d
Remove trailing whitespace - Master (#9011) 2026-01-25 10:12:41 +01:00
khbsd
2d09384229
fix: add __attribute__((packed)) to enum Direction (#8994) 2026-01-23 11:38:13 +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
Bassoonian
fb4c8ef62c
More type checking across the repo (#8988) 2026-01-22 17:40:09 +01:00
Bassoonian
61f8a50751
Add even more type checking (#8972) 2026-01-21 12:56:13 +01:00
Alex
da62ebcffd
Move attack canceler to the move resolution file (#8921) 2026-01-21 12:11:37 +01:00
Alex
6c05a08750
Refactor OHKO Moves (#8916) 2026-01-21 11:55:30 +01:00
GGbond
128beb39e1
Fixed several issues with Parting Shot (#8928) 2026-01-20 22:06:50 +01:00
Bassoonian
d12929ffbd
Pret merge (20th of January, 2026) (#8973) 2026-01-20 14:35:55 +01:00
hedara90
3b241b561a
Move CMD_ARGS to battle_script_commands (#8974)
Co-authored-by: Hedara <hedara90@gmail.com>
2026-01-20 14:31:36 +01:00
Alex
922db5ce4a
Move adjustdamage to the damage calc (#8948) 2026-01-20 12:30:00 +01:00
Frank DeBlasio
7b4eb6ce40
Poke Ball consolidation (#8962) 2026-01-20 00:02:34 +01:00
Hedara
594a4c7ec3 Merge commit 'dc077e50d3a2d52964a52ce9a9e81fd99586dd4f' into pret-merge
Conflicts:
	.github/workflows/build.yml
	asm/macros/battle_script.inc
	include/constants/battle_script_commands.h
	src/battle_controllers.c
	src/battle_script_commands.c
	src/data/graphics/battle_environment.h
	src/party_menu.c
2026-01-19 21:40:27 +01:00
FosterProgramming
8d059cf5c4
Change randomweightedarray to use u16 weights instead of u8 (#8934) 2026-01-18 10:24:49 +01:00
Eduardo Quezada
258cc08533
GetBattleTrainer -> GetBattlerTrainer (#8952) 2026-01-18 09:08:33 +01:00
GGbond
925d929c06
AI avoids Protect against Unseen Fist and protection‑ignoring moves (#8939) 2026-01-18 04:11:39 +00:00
Eduardo Quezada
f0c79076c0
Consolidated HandleStatusIconUpdate (#8925) 2026-01-17 22:11:59 +01:00
hedara90
9023b203c7
Add sprite fill function taking a sprite as argument (#8940)
Co-authored-by: Hedara <hedara90@gmail.com>
2026-01-17 21:30:02 +01:00
cawtds
7b03c2e238
Fix teleport location (#8941) 2026-01-17 15:48:45 +01:00
Bassoonian
36fcd9c6b2
Adds `Item` enum (#8897) 2026-01-17 02:26:09 -08:00
Alex
de7aaf854c
Misc battle engine changes (#8931) 2026-01-16 18:55:22 +01:00
Linathan
31d3e5f022
Add missing cries for Cramorant-Gulping, Cramorant-Gorging, Oinkologne-Female, and Ursaluna-Bloodmoon (#8911)
Co-authored-by: LinathanZel <LinathanZel@github.com>
2026-01-16 07:19:23 +00:00
John Cooper McDonald
4ccf0115a1
Allow renaming and move relearning from box summary screen (#8854) 2026-01-15 12:20:14 +01:00
Kasenn
ef48a4d155
Change HP bar color calculation from pixel-width to actual values (#8694) 2026-01-15 10:52:24 +01:00
grintoul
8c4fa6e71d
Refactor multi test system trainer party allocation and adds enum BattleTrainer (#8908) 2026-01-14 23:33:24 +01:00
Bassoonian
786c3d948f
Battle file cleanup & documentation (#8903) 2026-01-14 12:17:21 +01:00
FosterProgramming
550fe9a7de
Refactor pokerus and add configs (#7731)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2026-01-14 12:04:33 +01:00
Alex
533d6494e6
Master to upcoming, 2026-01-13 (#8909) 2026-01-14 00:49:48 +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
spindrift64
f3f4b06d2c
Add config flag to skip save overwrite confirmation (#8659) 2026-01-13 22:56:07 +01:00
Hedara
e0b4e7be44 Merge branch 'master' into master-to-upcoming
Conflicts:
	include/constants/script_commands.h
	src/battle_util.c
	test/text.c
2026-01-13 20:46:03 +01:00
Linathan
4c4255f69b
Add Legends Z-A cries (#8151) 2026-01-13 20:18:24 +01:00
amiosi
9798b6c7d7
Changes to Item icons and palettes (#8614) 2026-01-13 15:16:26 +01:00
amiosi
481e0370b5
Gen 3 Lax Incense (#8864) 2026-01-13 15:10:37 +01:00
Bassoonian
37211c611b
Deleted unnecessary files (#8899) 2026-01-12 22:01:22 +01:00
Frank DeBlasio
36119e45d8
More contest code consolidation (#8889) 2026-01-12 21:21:21 +01:00
Frank DeBlasio
6dfcde7d48
Decoupled trainer gender from encounter music (#8892) 2026-01-12 17:45:44 +01:00
Alex
550469891a
Add setpreattackadditionaleffect and use it for brick break / spectra… (#8719) 2026-01-12 17:13:39 +01:00
Frank DeBlasio
a15d9a81f9
Adding move animation backgrounds to the Pokemon Sprite Visualizer (#8764) 2026-01-11 22:59:14 +01:00
Eduardo Quezada
46e23967ec Merge branch '_RHH/master' into _RHH/pr/upcoming/masterMerge 2026-01-11 15:08:31 -03:00
Eduardo Quezada
4df79828ac Merge branch '_RHH/master' into _RHH/pr/upcoming/masterMerge 2026-01-11 15:06:42 -03:00
amiosi
0870fe24c7
Miscellaneous species_info Changes (#8462) 2026-01-11 18:54:43 +01: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