7419 Commits

Author SHA1 Message Date
Eduardo Quezada
57da4617da Ability status immunity 2025-06-26 17:44:29 -04:00
Eduardo Quezada
cf85abc270 Remove unused messages 2025-06-26 16:42:12 -04:00
i0brendan0
206d2503d8
Add Gen 2 Moonlight, Morning Sun, Synthesis configuration (#7209)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-06-26 21:00:02 +02:00
PhallenTree
a82aa618fb
Adds Ability Shield activation message (#7224) 2025-06-26 14:42:32 +02:00
Alex
6824e7d175
Attackcanceller clean up (#7210) 2025-06-25 21:36:15 +02:00
Bolt-Strike
f217344cb5
Disable unowned evo methods (#7103) 2025-06-25 21:29:59 +02:00
Alex
2531613a52
Fixes Eject Pack not resolving correctly during switch in effects (#7002) 2025-06-25 21:15:40 +02:00
Bivurnum
c6221fa50e
Add debug options for follower NPCs (#7215) 2025-06-25 21:13:43 +02:00
Alex
7d7ffd58ae
Fixes Booster Energy timing activation + Clean up (#7175)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-06-25 18:20:55 +02:00
Alex
f8551830c9
Adds Gen5+ Encore config (#7051) 2025-06-25 15:58:30 +02:00
Hedara
51a5577f65 Merge branch 'master' into master-upcoming
Conflicts:
	src/battle_controller_safari.c
	src/data/moves_info.h
	src/graphics.c
2025-06-25 14:17:07 +02:00
Bivurnum
bfb0c2fa73
Added createfollowernpc macro to make a new follower from a gfx id (#7196) 2025-06-25 10:59:25 +02:00
cawtds
59350cc32f
Increase party action limit (#7119) 2025-06-24 15:15:04 +02:00
Hedara
726f18f360 Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
	asm/macros/event.inc
	data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
	data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
	data/scripts/trainer_hill.inc
	include/graphics.h
2025-06-24 10:42:24 +02:00
DizzyEggg
e1b83d6056
Match graphics declarations with externs (#2089) 2025-06-23 20:31:18 +01:00
psf
456a8f6aa0
Update the description of OW_OBJECT_VANILLA_SHADOWS (#7184) 2025-06-23 15:40:13 +02:00
Alex
66e8200d95
Use battler arguments for SetMoveEffect (#7156) 2025-06-23 15:26:31 +02:00
i0brendan0
0ccf797cce
Fixes Roamers not saving shininess (#7185) 2025-06-23 15:05:01 +02:00
Bassoonian
c34ec8956d
Master to upcoming merge, 20/06/25 (#7169) 2025-06-23 10:04:44 +02:00
DizzyEggg
53f8ae11ff
Move gTradePlatform_Tilemap to header (#2088) 2025-06-22 19:48:37 -04:00
Eduardo Quezada
cf7f15faac
Untangle InitBtlControllers functions (#6748) 2025-06-22 16:21:37 +02:00
Eduardo Quezada
b094b70dc5
More battle controller function consolidation. (#6877) 2025-06-21 10:59:41 +02:00
AlexOn1ine
aabb632894 Master to upcoming merge, 20/06/25 2025-06-20 17:09:58 +02:00
Bassoonian
24fdac662e Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196 2025-06-19 14:32:23 +02:00
Daniel Walls
cc33d6171b
Add config options for removing bard phoneme audio to save ROM space (#7155) 2025-06-18 20:16:25 -07:00
Eduardo Quezada
8a0bc495d5
Fixed description of FORM_CHANGE_WITHDRAW (#7152) 2025-06-18 22:09:59 +02:00
Bassoonian
6333702461
Converts more defines to enums and name unnamed enums (#7071)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-06-18 14:30:37 +02:00
PhallenTree
340d815c6d
Stat Change (Animation) Refactor (#7144) 2025-06-18 14:24:35 +02:00
Alex
ab1838ffd8
Repurposes IsMagicGuardProtected into a general function (#7114) 2025-06-18 12:56:03 +02:00
Eduardo Quezada
800829538c
Compound strings for hold effect names (#7140) 2025-06-18 11:38:42 +02:00
Nephrite
a18709fb47
Bag refactor (groundwork for expansion) (#7018) 2025-06-18 10:59:24 +02:00
Nephrite
06cd3af3ea
Volatile status refactoring (#6983) 2025-06-18 07:22:41 +02:00
Eduardo Quezada
5966852f8d
Removed Mind Blown effect in favor of move flag (#7138) 2025-06-17 00:02:46 +02:00
Eduardo Quezada
651e87af5f
Converted Relic Song into a proper form change (#7139) 2025-06-17 00:02:25 +02:00
Alex
e2f0767be5
Decouple Status set by ability from SetMoveEffect (#7125) 2025-06-16 14:45:21 +01:00
hedara90
b2a0107a68
Test runner fixes (#7100)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-15 12:02:29 +02:00
cawtds
3491cd95e8
Fix sell price display (#7123) 2025-06-15 11:52:51 +02:00
Alex
c6b4118c3c
Added AI_FLAG_PP_STALL_PREVENTION to AI_FLAG_SMART_TRAINER (#7112) 2025-06-14 11:06:23 +02:00
Alex
d4146afcae
Add damage context to effectiveness multiplier (#7111) 2025-06-14 11:05:14 +02:00
Alex
e1b542944f
Refactor damage calculations aruguments by using a struct context (#7108) 2025-06-13 14:16:40 +02:00
PhallenTree
a000a743df
Fix typos and some cleanup (mainly in battle files) (#7107) 2025-06-13 14:12:13 +02:00
Alex
aa78420b9e
Deprecate absent member from battlerState (#7091) 2025-06-12 10:41:46 +02:00
Pawkkie
3db12a0ae6
Haze Boosting AI Followup (#6966) 2025-06-11 18:30:22 +02:00
hedara90
c9a49e696e
Increased heap by 768 bytes (#7097)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-11 17:55:32 +02:00
Bassoonian
192bc1ec20
Master merge (#7093) 2025-06-10 22:52:43 +02:00
Alex
cb4ef705f7
Remove redundancy for ShouldLowerStat functions (#6577) 2025-06-09 21:47:16 -04:00
Hedara
bdd7c5bfa8 Merge branch 'master' into master-merge
Conflicts:
	src/contest_painting.c
2025-06-09 23:27:18 +02:00
Alex
fd856e5068
Removes duplicate AI ability func (#7045)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-06-09 11:30:16 +02:00
Emilia Daelman
f4ff5e6d26
Feature/ai/wide guard quick guard singles (#7086)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-06-08 21:50:34 +02:00
kittenchilly
872bb8785b
Simplify white out messages (#6961) 2025-06-08 08:52:37 -07:00