GGbond
|
474d586452
|
Add tests for Taunt (#9386)
|
2026-03-02 12:30:52 +00:00 |
|
hedara90
|
9f251f95be
|
Revert "Start of 1.16.0 cycle" (#9402)
|
2026-03-01 18:10:59 +01:00 |
|
Hedara
|
9da3592b21
|
Start of 1.16.0 cycle
|
2026-03-01 16:43:13 +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 |
|
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 |
|
AlexOn1ine
|
0fc3ef056a
|
27/02/26 Master to upcoming merge
|
2026-02-27 23:53:24 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Linathan
|
a635ac599d
|
Zen Mode Fix: Removes start battle form change and adds switch-out form change (#9304)
Co-authored-by: LinathanZel <linathan@DESKTOP-RVGNQ5E.localdomain>
|
2026-02-25 19:35:16 +01:00 |
|
FosterProgramming
|
dc3dd0273c
|
Add original frlg safari zone menu and fix initial step counter (#9340)
|
2026-02-25 15:22:08 +01:00 |
|
FosterProgramming
|
91a1278934
|
Fix region text when looking at map in frlg (#9347)
|
2026-02-25 15:19:09 +01:00 |
|
PhallenTree
|
8e3183a7a9
|
Simplify defrosting/thawing and expand target thawing config (#9271)
|
2026-02-23 17:11:05 +01:00 |
|
GGbond
|
8334c68422
|
Fix Eviolite to use original species after Transform (#9285)
|
2026-02-23 14:51:32 +01:00 |
|
hedara90
|
021a560de0
|
21/02/26 Master to upcoming merge (#9292)
|
2026-02-22 15:10:16 +01:00 |
|
luuma
|
cb5db2491f
|
Fixes Minior not appearing in Meteor form when encountered in the wild (#9282)
|
2026-02-21 17:45:32 +01:00 |
|
FosterProgramming
|
9f6e733f8f
|
Fix sanitizeTrainerId (#9244)
|
2026-02-21 05:48:05 -08:00 |
|
AlexOn1ine
|
675de8cbea
|
21/02/26 Master to upcoming merge
|
2026-02-21 12:55:21 +01:00 |
|
Marky
|
25ffb2c12c
|
Add enum for Elevations (#2233)
CI / build (push) Has been cancelled
|
2026-02-20 01:17:42 -05:00 |
|
PhallenTree
|
199d7ae2cb
|
Fixes Rapid Spin and target defrost not being blocked by Sheer Force (#9252)
|
2026-02-19 14:24:39 +01:00 |
|
FosterProgramming
|
bc6bbb1bc5
|
Make sure grass effect palette ignore fog when time blended (#9235)
|
2026-02-17 13:54:36 +01:00 |
|
Alex
|
89fbaef8ba
|
Sky Drop Fixes/Refactor (#9185)
|
2026-02-16 18:22:53 +01:00 |
|
PhallenTree
|
cf18d086b6
|
Adds CancelerSetTargets and improves Pre Attack Effects (#9178)
|
2026-02-14 20:54:01 +01:00 |
|
GGbond
|
acfd2f4f8c
|
Fix Taunt to not block Me First in Gen 5+ (#9069)
|
2026-02-10 12:05:41 +01:00 |
|
GGbond
|
57c51c0702
|
Fix Transform fail conditions with gen-specific checks (#9070)
|
2026-02-10 11:59:09 +01:00 |
|
FosterProgramming
|
9f1cdbdcaa
|
Add wander around slower movement type (#9164)
|
2026-02-09 15:10:04 +01:00 |
|
Alex
|
63f5617c29
|
Fix Pickpocket timing (#9165)
|
2026-02-09 13:26:09 +01:00 |
|
Frank DeBlasio
|
064ca5c243
|
Added macro for Surf/Muddy Water's animation (#2232)
CI / build (push) Has been cancelled
|
2026-02-06 10:08:20 -05:00 |
|
Alex
|
63fc5bf0fe
|
Strength Sap fixes (#9130)
|
2026-02-06 15:11:23 +01:00 |
|
Eduardo Quezada
|
32d1777b7a
|
Use direct config names instead of enum names (#8824)
|
2026-02-06 11:57:33 +01:00 |
|
Pawkkie
|
354cdab5e0
|
Fix AI_FLAG_RANDOMIZE_SWITCHIN logic (#9128)
|
2026-02-05 21:24:14 +01:00 |
|
John Cooper McDonald
|
e9e1247fa5
|
Add all of the Z-A mega stone sprites (#9143)
|
2026-02-05 20:14:06 +01:00 |
|
PhallenTree
|
75d2ac742b
|
Fixes Dancer activating on missed moves and Neutralizing Gas interaction (#9129)
|
2026-02-05 16:07:18 +01:00 |
|
Hedara
|
0c447063e1
|
Merge branch 'master' into master-merge
Conflicts:
data/battle_anim_scripts.s
include/battle_util.h
include/constants/expansion.h
src/battle_anim_dark.c
src/battle_anim_effects_1.c
src/battle_anim_normal.c
src/battle_hold_effects.c
src/battle_script_commands.c
src/battle_util.c
src/debug.c
|
2026-02-04 12:46:59 +01:00 |
|
hedara90
|
e772770426
|
Battle Heap and Animation Test fixes (#9118)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2026-02-03 11:41:50 +01:00 |
|
khbsd
|
703d108548
|
fix(battle ui): standardize hp bar color logic for GEN_5 and up (#9083)
|
2026-02-03 11:16:00 +01:00 |
|
Alex
|
45410b94f7
|
Delete irrelevant battle type comments for expansion (#9082)
|
2026-02-02 14:21:13 +01:00 |
|
Hedara
|
c8b0d1b08c
|
1.14.4 cycle start
|
2026-02-01 17:13:46 +01:00 |
|