3391 Commits

Author SHA1 Message Date
AlexOn1ine
a4470cac2c Master to upcoming merge 2025-09-27 22:42:53 +02:00
Alex
e5e0800b90
Fixes Throat Spray being blocked by Sheer Force (#7808) 2025-09-27 15:59:31 -04:00
Alex
3c9f05b367
Fixes activation order for a couple abilities (#7732) 2025-09-27 18:47:10 +02:00
Eduardo Quezada
f9a8a0251a
Added regional form evolution condition (#6990) 2025-09-25 19:16:33 +02:00
AlexOn1ine
bc84e6656d Master to upcoming merge 2025-09-17 20:18:51 +02:00
Alex
32f8464fec
Attackcanceller fixes and improvements (#7698) 2025-09-16 18:00:30 +02:00
mudskipper13
59a214828e
Implement field_name_box (#7697)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-09-14 20:45:18 +02:00
Eduardo Quezada
deaf77f619
Fix most failed and assume fail tests with GEN_LATEST = GEN_6 (#7696) 2025-09-14 20:21:38 +02:00
Alex
78a05c97ac
Refactors ruin ability checks into a field effect (#7711) 2025-09-14 14:41:10 +01:00
Alex
499e90ac4b
Fixes Endure and Eject Pack issues (#7687)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-09-12 18:09:46 +02:00
PhallenTree
827dd4a67c
Fixes Intrepid Sword/Dauntless Shield boosting after entering while at max stats (#7716) 2025-09-10 16:38:09 +02:00
Martin Griffin
44c886e1c9
Add make release target (#7296) 2025-09-10 07:27:44 +01:00
PhallenTree
8486e0e045
Fixes Weak Armor and items not displaying stat change attributes (#7701) 2025-09-07 20:30:00 +02:00
Hedara
1ec08fbe0d Merge branch 'master' into master-to-upcoming 2025-09-06 19:43:43 +02:00
Alex
0422340356
Refactors Attackstring and PP deduction (#7402) 2025-09-03 20:25:27 +02:00
Eduardo Quezada
1e6a533131
Fix most failed tests with GEN_LATEST = GEN_7 (#7688) 2025-09-03 19:23:23 +02:00
Hedara
ef001df006 Start of 1.13.2 cycle 2025-09-02 16:18:32 +02:00
Hedara
c1b1fb4cdc 1.13.1 Release version 2025-09-02 16:17:05 +02:00
Eduardo Quezada
5344d1ec63 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/messages 2025-08-28 16:50:18 -04:00
grintoul
a2e1835993
Separates FRB and FRZ animations (#7611) 2025-08-28 19:07:08 +02:00
Hedara
2ab1bc87e0 Start of 1.14 cycle 2025-08-28 16:46:58 +02:00
Hedara
9ff4c48f77 Start of 1.13.1 cycle 2025-08-28 16:16:40 +02:00
Hedara
7056aaba6e Expansion version 1.13.0 2025-08-28 16:15:09 +02:00
Hedara
acf7f0c6e1 Merge branch 'upcoming' into expansion-release 2025-08-28 16:13:58 +02:00
Hedara
d812b58064 Expansion version 1.12.3 2025-08-28 15:49:29 +02:00
AlexOn1ine
1131b205f2 conflicts 2025-08-28 14:09:38 +02:00
RavePossum
2fbf45d057
Restore X item friendship increase (#7583) 2025-08-26 22:17:30 +02:00
Bassoonian
28e7a25989
25/08/25 Master merge (#7618) 2025-08-26 15:23:24 +02:00
Alex
e2f24bbb3f
Prevents a regression for custom abilties (#7616) 2025-08-25 17:37:57 +02:00
AlexOn1ine
ce52d83343 25/08/25 Master merge 2025-08-25 17:30:38 +02:00
FosterProgramming
1e6bb4f47c
Fix overlap between spin evolution and script evolution (#7593) 2025-08-22 20:23:18 +02:00
Hedara
da77dba59f Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
	data/battle_scripts_1.s
	include/constants/battle.h
	src/battle_script_commands.c
	src/battle_util.c
2025-08-21 15:40:38 +02:00
Alex
208f97e1e3
Rename passive damage hitmarker (#2174) 2025-08-21 13:43:19 +01:00
Eduardo Quezada
7d459fd6dc
Fixed Transistor damage calculation test failing when GEN_LATEST is less than GEN_9 (#7577) 2025-08-18 19:44:43 +02:00
Alex
f4c91b5539
Convert statuses3 to volatiles (#7514) 2025-08-11 23:19:36 +02:00
Eduardo Quezada
db0ca2ce49 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/messages 2025-08-11 12:39:28 -04:00
Eduardo Quezada
a9d5c2cd28
Updated Dream Eater/Liquid Ooze's interaction to Gen 5 standards (#7528) 2025-08-11 16:06:58 +02:00
AlexOn1ine
bd919e3219 11/08/25 Master to upcoming merge 2025-08-11 08:31:12 +02:00
Eduardo Quezada
c87d3b1769 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/messages 2025-08-10 21:29:01 -04:00
Eduardo Quezada
0b299b3ffd
Fixed most failed tests with GEN_LATEST GEN_8 (#7498) 2025-08-08 09:44:12 +02:00
surskitty
e8b6d40f18
AI_FLAG_ATTACKS_PARTNER with a config for bloodthirstiness (#7401) 2025-08-06 10:22:34 -04:00
Alex
acc82e7d79
Convert Status4 to volatiles (#7411)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-08-05 19:28:33 +02:00
grintoul
27886a6577
Macro-for-AI-Flag-definitions (#7471) 2025-08-05 14:14:04 +02:00
pokesidv
4d31693005
Rock climb by ghoulslash (#7432)
Co-authored-by: Evan <eroelke@gmail.com>
Co-authored-by: Jaizu <jaizu85@gmail.com>
Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-08-03 14:52:07 +02:00
Alex
3841fee888
Clean up noResultString (#7408) 2025-08-02 15:17:44 +02:00
Nephrite
73fd567520
Additional effects tweak (#7392)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-08-01 18:13:23 +02:00
surskitty
0b44093a8e
Adds AI_FLAG_ASSUMPTIONS as a constant for semi-omniscience (#7435) 2025-08-01 18:11:34 +02:00
AlexOn1ine
bc73f4654b merge master 31/07/25 2025-08-01 12:18:11 +02:00
Hedara
637f7dff46 Start of 1.12.3 cycle 2025-07-30 20:35:16 +02:00
Hedara
d8059ce3d1 1.12.2 release version 2025-07-30 20:34:43 +02:00