3466 Commits

Author SHA1 Message Date
Eduardo Quezada
67e95e28e9
WITH_CONFIG Refactor (#7584) 2025-12-04 15:49:52 +01:00
FosterProgramming
142a5ef08c
Fix illusion not breaking properly when behind substitute (#8423)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-12-04 00:35:38 +01:00
moostoet
d0965814fe
Fix Costar not copying partner's critical hit boosts (#8386) 2025-12-02 21:25:52 +01:00
Eduardo Quezada
115694675f
Renamed Config Test system to more general names (#7283) 2025-12-02 11:26:44 -05:00
Hedara
fcfa2a3d17 Start of 1.14.2 cycle 2025-12-01 17:41:14 +01:00
Hedara
905c580b08 Expansion 1.14.1 2025-12-01 17:35:59 +01:00
Hedara
2e0e428ffd Start of 1.14.1 cycle 2025-11-30 16:11:41 +01:00
Hedara
da5a2ca70c 1.14.0 release 2025-11-30 16:00:23 +01:00
Hedara
71fc42947d Merge branch 'upcoming' into expansion-releases 2025-11-30 15:42:23 +01:00
Hedara
66ea9ac406 1.13.4 release version 2025-11-30 15:41:43 +01:00
hedara90
ce858f51b2
27/11/25 Master to upcoming merge (#8359) 2025-11-27 21:07:59 +01:00
Alex
2d628aca0e
Move end clear bits clean up (#8354)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-11-27 17:42:16 +01:00
AlexOn1ine
68300e0f9a 27/11/25 Master to upcoming merge 2025-11-27 13:39:12 +01:00
moostoet
fbc640d692
Refactor Beat Up handling for Gen 3/4 defaults, fix crit check, and expand test coverage (#8307) 2025-11-25 22:18:51 +01:00
psf
1ea0500b95
Fixed broken friendship from items in battle test and added new test for opposite case (#7872) 2025-11-24 06:55:30 +00:00
Eduardo Quezada
51a750e61a
Finished fixing tests when setting GEN_LATEST to GEN_5 (#8263) 2025-11-23 12:04:36 +01:00
AlexOn1ine
6a28506ee2 19/11/25 Master to upcoming merge 2025-11-19 18:20:30 +01:00
moostoet
8c2d31b792
Add AI flag AI_FLAG_KNOW_OPPONENT_PARTY to know all species in party (#8290) 2025-11-18 23:41:04 +01:00
FosterProgramming
4a69268bd5
Make rainbow effect anim change based on side (#8269) 2025-11-18 23:31:47 +01:00
Alex
e445160c92
Adjust Canceler naming to contain only one l (#8258) 2025-11-15 18:44:16 +01:00
Zimmermann Gyula
772abe6e7d
Implement GSC berry/apricorn tree functionality. (#7777)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-11-14 20:28:55 +01:00
Frank DeBlasio
ca575f2701
Added Gen 6 contest combos (#8251) 2025-11-14 18:24:33 +01:00
Frank DeBlasio
6d09eb2402
Added contest config and cleaned up contest category variables (#8178) 2025-11-13 11:29:38 +01:00
Alex
bb11d96d86
Merge branch 'upcoming' into 111125 2025-11-11 19:04:54 +01:00
Alex
f28abcab6a
Micro clean up in BattleStruct (#8177) 2025-11-11 17:42:27 +01:00
Eduardo Quezada
2dc36a8ba0
Wrote some missing tests (#8203) 2025-11-11 13:52:24 +01:00
AlexOn1ine
93cc143134 conflicts 2025-11-11 13:12:00 +01:00
PhallenTree
649798449e
Powder Move blocking cleanup (#8194) 2025-11-10 21:01:35 +01:00
Alex
226fd60674
Fix incorrect comments (#8193) 2025-11-10 15:55:58 +01:00
Alex
59d131f599
Fixes wrongly assigned count for Semi Invulnerable state (#8175) 2025-11-10 10:40:47 +01:00
Alex
d9797fa01d
Remove redundant Future Sight flag (#8185) 2025-11-09 22:33:03 +01:00
PCG
d2425c1468
Move Relearners for TMs, Tutors and Egg moves (#8040)
Co-authored-by: khbsd <khb.dev@gmail.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-11-09 12:54:01 -08:00
FosterProgramming
3e583f8add
Fix tera tint not applying on activation (#8135) 2025-11-09 18:10:44 +01:00
FosterProgramming
43f9a78da5
Fix recharge moves + add recharge move tests (#8181) 2025-11-09 17:46:22 +01:00
khbsd
82a63a09fe
update: time-based encounters system tuneup and @cawtds' header script (#8158) 2025-11-07 21:25:09 -08:00
grintoul1
c230e54678 Master to Upcoming merge 20251107 2025-11-07 22:45:57 +00:00
khbsd
4d28f7be23
feat: adds stevebeller's instant text and MandL27's faster text printing (#8063) 2025-11-07 23:11:17 +01:00
Alex
0f14a4db57
Clean up ability effect hitmarker (#8138) 2025-11-04 21:44:57 +00:00
Bassoonian
473a0aa44d
Add Legends Z-A content (#7935)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-11-04 22:25:33 +01:00
Alex
41aba41838
Attackstring hitmarker clean up (#8136) 2025-11-04 18:35:48 +00:00
Alex
80b5d81a9a
Create BattleStruct sub struct for event states (#8131) 2025-11-04 18:34:54 +00:00
Hedara
b0ccddac69 Merge branch 'master' into master-to-upcoming
Conflicts:
	include/constants/expansion.h
2025-11-03 11:11:07 +01:00
Hedara
cfdbd19ea8 Start of 1.13.4 cycle 2025-11-01 21:51:24 +01:00
Hedara
f969c126b1 1.13.3 release version 2025-11-01 21:51:06 +01:00
Hedara
5c31b58b81 Merge commit 'd1d543548772cbdf087c5ccc1e0b19980aa9ad87' into pret-merge
Conflicts:
	spritesheet_rules.mk
	tools/mapjson/mapjson.cpp
2025-11-01 15:13:16 +01:00
Alex
1c1a98ee45
Grudge, Destiny Bond and FaintBattler refactor (#8072)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-10-30 23:14:02 +01:00
Alex
ff557e3d0c
Clean up for item hold effect refactor (#8014) 2025-10-30 21:07:37 +01:00
Martin Griffin
d1d5435487
Improve undefined map assembler messages (#2196) 2025-10-29 21:34:03 -04:00
Hedara
a2ef3284dd Merge branch 'master' into master-to-upcoming
Conflicts:
	data/battle_scripts_1.s
	include/battle_util.h
	include/constants/battle.h
	src/battle_script_commands.c
	src/battle_util.c
2025-10-29 18:42:59 +01:00
Alex
dd875b87bc
Combine Simple Beam and Worry Seed into one effect (#8039)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-10-29 15:20:12 +01:00