7436 Commits

Author SHA1 Message Date
Alex
7ae97ab6e9
Refactor move Synchronise (#7271) 2025-07-07 13:36:21 -04:00
surskitty
4052ab337c
Expanding and Refactoring Skill Swap and other ability-changing moves (#7238)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-07-05 14:49:35 +02:00
surskitty
c360900a5b
Renaming STATUS1_REFRESH and adding more constants for common STATUS1 checks. (#7284) 2025-07-05 13:46:23 +02:00
Nephrite
e8abfbce49
Untangled TMs and HMs from item ids (#7173) 2025-07-04 19:07:53 +02:00
surskitty
b3f52166df
Changing P_ONLY_OBTAINABLE_SHINIES to truly be Only Obtainable Shinies (#7275) 2025-07-04 11:06:36 +02:00
hedara90
ae1d99bb4f
Master to upcoming merge 01/07/25 (#7267) 2025-07-02 11:39:59 +02:00
AlexOn1ine
aa9ff53b81 master to upcoming merge 2025-07-02 10:05:31 +02:00
Alex
e503f97f32
Use dedicated functions for Mud/Water Sport (#7248) 2025-07-02 09:08:12 +02:00
cawtds
92b4b7f0a0
Keep removed headers (#7261) 2025-07-02 09:06:23 +02:00
Alex
be2d36b6ee
Fixes instances of battler mutation for abilities (#7250) 2025-07-01 19:48:12 +02:00
Alex
10e55bd18d
Fixes Life Dew playing anim when it is not supposed to + tests (#7239) 2025-07-01 17:49:31 +02:00
Alex
f8fc86275c
Fixes protective pads not protecting from secondary protect effects (#7229) 2025-07-01 17:48:57 +02:00
Alex
89b1a45536
Fixes Ice Spinner and Steel Roller (#7259) 2025-07-01 15:39:22 +01:00
mudskipper13
aae04ffc84
Improve trainer back pic-related data and code (+ smol documentation) (#6821) 2025-06-30 23:50:48 +02:00
Eduardo Quezada
7a0cbc12d2
Added CRY_MODE_DYNAMAX (#6933) 2025-06-30 09:45:09 -07:00
Hedara
947faa97d3 Start of 1.12.2 cycle 2025-06-30 11:01:46 +02:00
Hedara
1e281547ed 1.12.1 Release commit 2025-06-30 11:01:13 +02:00
Bivurnum
b1200117a9
Better system for Follower NPC running frames (#7222)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-06-27 10:12:35 +02:00
psf
b60c897b4a
Add P_ASK_MOVE_CONFIRMATION (#7132) 2025-06-27 10:11:41 +02: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