psf
|
fd90802a37
|
Fixed CI issue introduced 7046 (#7072)
|
2025-06-07 09:51:47 +02:00 |
|
i0brendan0
|
67f7ad6b1e
|
[DRAFT] Fix Normalize not boosting Normal type moves if they were already Normal type (#7060)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-06-06 22:00:33 +02:00 |
|
Linathan
|
dc279f14ba
|
Chloroblast fix (#7008)
|
2025-06-06 21:33:56 +02:00 |
|
allcontributors[bot]
|
451cb91d5d
|
add Bivurnum as a contributor for code (#7067)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-06-06 11:14:17 -07:00 |
|
Alex
|
f374291f69
|
Fixes Wandering Spirit copied ability activation on fainted mon (#7066)
|
2025-06-05 22:47:32 +02:00 |
|
Linathan
|
25736c5628
|
Bug fix for Grassy Terrain incorrectly healing non-grounded Pokemon (#7058)
|
2025-06-05 14:35:30 +02:00 |
|
Alex
|
99997c49fc
|
Fixes speed calculation order (#7064)
|
2025-06-04 23:26:19 +02:00 |
|
PhallenTree
|
b3752e13d8
|
Fixes Aura Wheel + Normalize and Hunger Switch while Transformed/Terastallized (#7061)
|
2025-06-04 21:58:10 +02:00 |
|
allcontributors[bot]
|
2358f9a871
|
add iriv24 as a contributor for code (#7059)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
|
2025-06-04 07:50:34 +02:00 |
|
allcontributors[bot]
|
48b88899d1
|
add bassforte123 as a contributor for code (#7003)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
|
2025-06-03 23:12:38 +02:00 |
|
TLM-PsIQ
|
8b52e100b9
|
Fix ScaryFace anim for Bitter Malice (#6476)
|
2025-06-03 22:25:29 +02:00 |
|
psf
|
7263bb1886
|
Update CI to ignore allcontributors commits (#7046)
|
2025-06-02 15:41:05 +02:00 |
|
Alex
|
d33651bfd0
|
Battle controller pret documentation (#7029)
|
2025-06-02 14:22:11 +02:00 |
|
hedara90
|
46e09a9e46
|
Changed trainer tutorial to take into account removed palette compression (#7044)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-01 21:02:52 +02:00 |
|
Alex
|
661a418960
|
Fixes multi battle party re-order (#7042)
|
2025-06-01 13:08:37 +02:00 |
|
Eduardo Quezada
|
a93a17d490
|
Fixed text width for a lot of forms in HGSS Dex (#7035)
|
2025-05-31 20:28:24 +02:00 |
|
PhallenTree
|
585793131f
|
Fixes large battle messages being cut off instead of being prompted to advance 2 (#7036)
|
2025-05-31 20:25:25 +02:00 |
|
grintoul
|
3255f23239
|
Added line break between Trainer 1 name and Trainer 2 name in sText_TwoTrainersWantToBattle (#7028)
|
2025-05-31 09:50:41 +02:00 |
|
Alex
|
8cfe915bcd
|
Expansion 1.11.4 & 1.12.0 (#7026)
|
2025-05-30 21:17:15 +02:00 |
|
Hedara
|
98c03315a9
|
Start of 1.12.1 cycle
|
2025-05-30 20:55:09 +02:00 |
|
Hedara
|
efa2fb3be7
|
Expansion 1.12.0
|
2025-05-30 20:53:32 +02:00 |
|
Hedara
|
09ee1d0b2d
|
Merge branch 'upcoming' into expansion-1.11.4
|
2025-05-30 20:45:19 +02:00 |
|
Hedara
|
acb4a9cf62
|
Expansion 1.11.4
|
2025-05-30 20:15:56 +02:00 |
|
hedara90
|
347d0e1189
|
Master to upcoming merge (#7024)
|
2025-05-30 20:01:35 +02:00 |
|
cawtds
|
555bda4e66
|
Fix UB when using time menu (#7023)
|
2025-05-30 20:00:25 +02:00 |
|
AlexOn1ine
|
f4c64a2d79
|
conflicts
|
2025-05-30 19:20:32 +02:00 |
|
Bivurnum
|
37669e62ae
|
Bug fix: setfollowernpc macro no longer runs when FNPC_ENABLE_NPC_FOLLOWERS is FALSE (#6755)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-05-30 17:41:02 +02:00 |
|
khbsd
|
38ba41b324
|
fix: better area mons handling, no longer duplicates hiddenMons field (#6945)
|
2025-05-30 17:22:05 +02:00 |
|
psf
|
9656400f88
|
Moved time constants to dedicated files (#7019)
|
2025-05-30 16:39:01 +02:00 |
|
cawtds
|
1e32cf278c
|
fix battle controller macros (#7021)
|
2025-05-30 16:31:38 +02:00 |
|
Alex
|
5bdab5163e
|
Update Supersweet Syrup with eject pack fix (#7015)
|
2025-05-30 11:58:32 +02:00 |
|
Bivurnum
|
5dd45a0479
|
Fixed surf blob binding to invisible follower NPC on map reload (#7013)
|
2025-05-29 18:18:30 +02:00 |
|
Bivurnum
|
e631f3baa9
|
Fix follower NPC not reappearing after Mossdeep gym warp (#7014)
|
2025-05-29 18:17:54 +02:00 |
|
Alex
|
2864831c2b
|
Pret merge, (29th of May, 2025) (#7012)
|
2025-05-29 18:17:20 +02:00 |
|
Alex
|
213503dee9
|
Fixes spread move fire types not defrosting all targets (#6998)
|
2025-05-29 11:25:10 +02:00 |
|
Bivurnum
|
f2a3226b47
|
Fixed follower NPC changing to surf sprite when choosing not to surface from dive (#7010)
|
2025-05-29 11:05:23 +02:00 |
|
Bivurnum
|
79abc885e7
|
Fixes follower NPC not changing state with player after warp (#7009)
|
2025-05-29 11:04:41 +02:00 |
|
Raymond Dodge
|
e605b87722
|
Fix out-of-bounds in Heal Bell Cures Entire Party test (#7011)
|
2025-05-29 10:59:47 +02:00 |
|
Hedara
|
8ce7ffd080
|
Merge remote-tracking branch 'pret/master' into pret-merge
|
2025-05-29 09:10:41 +02:00 |
|
psf
|
cc8694d26d
|
Clarifies when to use each merge type for maintainers (#6999)
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-05-28 17:22:11 +02:00 |
|
Alex
|
7a9b51b387
|
Master to upcoming, 2025-05-28 (#7001)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
Co-authored-by: GriffinR <griffin.g.richards@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: malad1211 <43647853+malad1211@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Vex <edanvirgo@gmail.com>
Co-authored-by: PCG <75729017+PCG06@users.noreply.github.com>
|
2025-05-28 16:32:21 +02:00 |
|
Hedara
|
c8570d7c2b
|
Remove incorrectly re-added ABILITYEFFECT_ cases
|
2025-05-28 14:38:57 +02:00 |
|
Hedara
|
9d80ad530d
|
Merge branch 'master' into master-to-upcoming
Conflicts:
Makefile
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
data/maps/MtChimney/scripts.inc
data/maps/MtPyre_Summit/scripts.inc
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
include/constants/event_objects.h
include/constants/expansion.h
src/battle_script_commands.c
src/battle_util.c
src/field_screen_effect.c
|
2025-05-28 14:26:15 +02:00 |
|
PCG
|
00f3c09a22
|
Fixed CreateMon param order in CreateFacilityMon (#6989)
|
2025-05-28 12:51:00 +02:00 |
|
psf
|
d80e92e687
|
Pret merge (27th of May, 2025) (#6995)
|
2025-05-28 03:44:51 -07:00 |
|
Vex
|
ecb20b2a25
|
Fix Eiscue not resetting back to Ice Face form after battle. (#6997)
|
2025-05-28 12:43:38 +02:00 |
|
Alex
|
c489d36fc6
|
Fixes Gen3 berry activation timing (#6993)
|
2025-05-27 23:36:00 +02:00 |
|
Alex
|
7da5121b6c
|
Expansion 1.11.3 (#6994)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-27 20:52:45 +02:00 |
|
Hedara
|
156e0b394c
|
Start of 1.11.4 cycle
|
2025-05-27 20:34:28 +02:00 |
|
Hedara
|
7d1833f277
|
1.11.3 release
|
2025-05-27 20:33:27 +02:00 |
|