Commit Graph

19820 Commits

Author SHA1 Message Date
GGbond
41c02c206f
Fix Unseen Fist triggering protection move side effects (#9428) 2026-03-05 08:29:37 +01:00
shachar700
18de04499e
Update event_objects.h (#9418) 2026-03-04 20:42:36 +01:00
Alex
c8ce8a2b28
Fixes U-turn not reseting targetsDone flag (#9411) 2026-03-04 13:16:56 +01:00
FosterProgramming
87078e355d
Fix free match call compile fail (#9416) 2026-03-04 13:16:37 +01:00
Montblanc
e9040d6327
Fix FRLG party menu Oak support message window (#9412) 2026-03-04 00:00:15 +01:00
Raymond Dodge
c3bd23c26f
Make trainerproc-generated files depend on trainerproc (#9414) 2026-03-03 11:37:18 +01:00
PhallenTree
298b647251
Fix ability reference in Steadfast message (#9389) 2026-03-02 16:24:42 +01:00
GGbond
474d586452
Add tests for Taunt (#9386) 2026-03-02 12:30:52 +00:00
GGbond
a7ecf56328
Fix missing AI handling for partnerProtecting and Well-Baked Body (#9385) 2026-03-01 13:02:02 -05:00
hedara90
9f251f95be
Revert "Start of 1.16.0 cycle" (#9402) 2026-03-01 18:10:59 +01:00
hedara90
48ebdcb2fb
Start of 1.16.0 cycle (#9400) 2026-03-01 17:17:36 +01:00
Hedara
9da3592b21 Start of 1.16.0 cycle 2026-03-01 16:43:13 +01:00
hedara90
7cbafaa400
Update changelog (#9397)
Co-authored-by: Hedara <hedara90@gmail.com>
2026-03-01 10:30:50 -05:00
Alex
2727e2a69b
Expansion 1.14.4 & 1.15.0 release (#9395) 2026-02-28 23:51:17 +01:00
Hedara
e0b84e392b Start of 1.15.1 cycle 2026-02-28 22:13:55 +01:00
Hedara
150649546e Expansion 1.15.0 2026-02-28 22:13:30 +01:00
Hedara
beb9825fef Merge branch 'upcoming' into expansion-release 2026-02-28 22:00:41 +01:00
Hedara
d6f59caeaf Expansion 1.14.4 2026-02-28 21:44:20 +01:00
hedara90
2d09c49c9f
Fix reshowing battle not loading gimmick palettes (#9391)
Co-authored-by: Hedara <hedara90@gmail.com>
2026-02-28 18:45:27 +01:00
FosterProgramming
15527c5028
add missing tv sprite in frlg pokecenter (#9348) 2026-02-28 16:37:59 +01:00
Bassoonian
885180ff8b
27/02/26 Master to upcoming merge (#9384) 2026-02-28 15:58:05 +01:00
FosterProgramming
1af1e6a4e0
Movement follow player (#9365) 2026-02-28 15:45:57 +01:00
grintoul
ed8b03b5f7
Corrects battler used in STRINGID_ATTACKERABILITYSTATRAISE (#9383) 2026-02-28 00:00:13 +01:00
AlexOn1ine
0fc3ef056a 27/02/26 Master to upcoming merge 2026-02-27 23:53:24 +01:00
Bassoonian
310f746565
Fix space indentation in .s and .inc files (#9371) 2026-02-27 12:45:00 -08:00
FosterProgramming
08fe65bd2e
Fix mapjson failing with long map/layout names (#9375) 2026-02-27 21:42:12 +01:00
Frank DeBlasio
267e603c2a
Updated Trainer Tower formatting (#9209) 2026-02-27 21:41:33 +01:00
Meister-anon
9ec82b5ca8
Fix Meloetta not reverting forms on switch and remove deprecated Lunar Dance string ID (#9379)
Co-authored-by: Meister-anon <user@DESKTOP-TQ65PS9>
2026-02-27 20:23:18 +00:00
Alex
e5ebb5aecf
Make sure prevo moves are not duplicated in move relearner (#9377) 2026-02-27 18:19:39 +01:00
Alex
986b0bb5ec
Fix Baton Pass to clear Mean Look trapping on the target in Gen 5+ (#9378) 2026-02-27 18:17:06 +01:00
Alex
a0f170fc58
Fix Trapping Persisting after KO in doubles (#9380) 2026-02-27 18:11:34 +01:00
ChrispyChris27
48b017af68 Fix Trapping Persisting after KO in doubles
Fixes trapping abilities continuing to trap the player if the last mon on one side of a two trainer double battle has one.
2026-02-27 11:37:38 -05:00
Bassoonian
d7106b7ef1
Regularise switch indentation (#9368) 2026-02-27 15:54:21 +01:00
Bassoonian
de6947a6e5
Fix spacing for conditions (#9369) 2026-02-27 15:10:52 +01:00
Jamie Foster
2affc72188 Make sure prevo moves are not duplicated in move relearner 2026-02-27 15:10:32 +01:00
FosterProgramming
5b8a6c614e
Fix mapjson error with layouts missing layout_version key (#9374) 2026-02-27 12:31:22 +00:00
Bassoonian
080274645c
Cleans up unused String IDs and EWRAM variables (#9363) 2026-02-27 13:21:31 +01:00
Bassoonian
3c805a030b
Fix tabs in C/H files (#9364) 2026-02-27 13:12:41 +01:00
FosterProgramming
edc164e247
Add red and leaf icons to frlg map (#9357) 2026-02-27 11:24:16 +00:00
GGbond
cbe9f80e03 Fix 2026-02-27 18:08:19 +08:00
Alex
893563a2d5
Pret merge, 26th of February (#9362)
Co-authored-by: Frank <fdeblasio1004@gmail.com>
Co-authored-by: GriffinR <griffin.g.richards@gmail.com>
Co-authored-by: Frank DeBlasio <35279583+fdeblasio@users.noreply.github.com>
Co-authored-by: Kildemal <206095739+izrofid@users.noreply.github.com>
Co-authored-by: Marky <143505183+HashtagMarky@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
2026-02-26 20:25:28 +01:00
psf
59776b997b
Adds a warning when trainer is invalid (#9195)
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: hedara90 <90hedara@gmail.com>
2026-02-26 19:55:07 +01:00
Alex
3bb1b3502a
Fix illegal switch due to hazards (#9361) 2026-02-26 08:00:41 -08:00
Hedara
4dba49657a Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
	data/battle_anim_scripts.s
	src/battle_anim_water.c
	src/event_object_movement.c
	src/field_player_avatar.c
2026-02-26 15:33:26 +01:00
FosterProgramming
cbe2cfbd8e
Merge metatile labels files (#9351) 2026-02-26 11:44:42 +01:00
GGbond
217b6d6da2
Fix Paradox stat selection under Wonder Room (#9356) 2026-02-26 11:41:52 +01:00
luuma
cabbc632fd
Fixes plasma fists and several let's go and max move effects which should occur even when fainting a foe (#9262) 2026-02-25 21:46:22 +01:00
FosterProgramming
e5b2492b8d
createmon uses enum Pokeball instead of Item (#9281)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2026-02-25 21:10:57 +01:00
FosterProgramming
cc69e60559
Fix trainer sprite no reshowing properly in safari battle (#9353) 2026-02-25 20:26:11 +01:00
FosterProgramming
a3f53bc66c
Set var facing on all interactions (#9330) 2026-02-25 20:06:30 +01:00