Alex
|
f671b130a6
|
Fixes Beat Up incorrect slots usage (#7741)
|
2025-09-17 11:40:40 +02:00 |
|
Alex
|
74de29a921
|
Bugfixes Batch (#7739)
|
2025-09-16 19:44:06 +02:00 |
|
Eduardo Quezada
|
f39fdf57cf
|
Fixed disabled cross-evolutions still being possible (#7678)
|
2025-09-02 15:46:48 +02:00 |
|
Frank DeBlasio
|
674cd13659
|
Added sortType to Douse Drive (#7664)
|
2025-08-31 20:53:23 +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 |
|
AlexOn1ine
|
ce52d83343
|
25/08/25 Master merge
|
2025-08-25 17:30:38 +02:00 |
|
grintoul
|
888783aaa5
|
Restore AI: Basic Trainer to PARTNER_STEVEN (#7586)
|
2025-08-20 10:22:19 -04:00 |
|
Eduardo Quezada
|
96653e704e
|
Fixed Teleport's description not being updated based on B_TELEPORT_BEHAVIOR (#7580)
|
2025-08-19 14:39:20 +02:00 |
|
khbsd
|
82bf955e35
|
fix: remove unused wild_encounters.json.txt jinja file (#7581)
|
2025-08-19 08:54:43 +02:00 |
|
grintoul
|
916f083852
|
Added trainerBackPic to Trainer struct to de-couple trainer pic and trainer back pic defines (#7425)
|
2025-08-13 11:02:41 +02:00 |
|
Nephrite
|
38eb3461b9
|
Changed item name/pluralName to a compound string (#7359)
|
2025-08-08 20:51:16 +02:00 |
|
AlexOn1ine
|
0eb715de11
|
Add rock climb history from ghoul
|
2025-08-05 20:47:05 +02:00 |
|
Alex
|
acc82e7d79
|
Convert Status4 to volatiles (#7411)
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-08-05 19:28:33 +02:00 |
|
Martin Griffin
|
76b8ffc12e
|
Fix sorting bag by type (#7488)
|
2025-08-05 19:24:34 +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 |
|
Nephrite
|
73fd567520
|
Additional effects tweak (#7392)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-08-01 18:13:23 +02:00 |
|
AlexOn1ine
|
bc73f4654b
|
merge master 31/07/25
|
2025-08-01 12:18:11 +02:00 |
|
Nephrite
|
2eeb346387
|
Bag refactor3 + Ghoulslash's sorting feature port (#7330)
|
2025-07-29 10:47:32 +02:00 |
|
Eduardo Quezada
|
d801556a97
|
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727
|
2025-07-27 11:59:07 -04:00 |
|
AlexOn1ine
|
90eef35715
|
master merge
|
2025-07-19 17:01:18 +02:00 |
|
Alex
|
73a2e5104e
|
Bugfixes for Knock Off, Cover, Thief, Ceaseless Edge and Stone Axe (#7326)
|
2025-07-14 21:34:21 +02:00 |
|
hedara90
|
14dbbf63d4
|
Remove competitive syntax config (#7154)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-07-12 13:03:36 -07:00 |
|
Frank DeBlasio
|
c9ec896312
|
Refactor battle environment (#4891)
|
2025-07-12 12:38:06 -04:00 |
|
Nephrite
|
a1e67572b6
|
Replaces STATUS2 usage with volatiles in code (#7262)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-07-11 22:53:49 +02:00 |
|
Linathan
|
9228826ae1
|
New and polished battle animations (#7074)
|
2025-07-11 19:14:19 +02:00 |
|
Nephrite
|
5a6e7749ab
|
Removed all instances of .chance = 100, SHEER_FORCE_NO_BOOST (#7300)
|
2025-07-08 16:17:05 +02:00 |
|
Nephrite
|
e8abfbce49
|
Untangled TMs and HMs from item ids (#7173)
|
2025-07-04 19:07:53 +02:00 |
|
AlexOn1ine
|
aa9ff53b81
|
master to upcoming merge
|
2025-07-02 10:05:31 +02:00 |
|
Alex
|
10e55bd18d
|
Fixes Life Dew playing anim when it is not supposed to + tests (#7239)
|
2025-07-01 17:49:31 +02:00 |
|
Alex
|
89b1a45536
|
Fixes Ice Spinner and Steel Roller (#7259)
|
2025-07-01 15:39:22 +01:00 |
|
mudskipper13
|
aae04ffc84
|
Improve trainer back pic-related data and code (+ smol documentation) (#6821)
|
2025-06-30 23:50:48 +02:00 |
|
Alex
|
5451e40830
|
Fixes Toxic Thread animation not being played at the right time (#7247)
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-06-30 21:41:29 +02:00 |
|
GriffinR
|
44c3069895
|
Add explicit defaults for MAPSEC data
|
2025-06-26 16:26:59 -04:00 |
|
GriffinR
|
670d3a6c9f
|
Merge pull request #2152 from GriffinRichards/mapsec-data
Relax MAPSEC region map data requirements
|
2025-06-25 22:05:35 -04:00 |
|
Hedara
|
51a5577f65
|
Merge branch 'master' into master-upcoming
Conflicts:
src/battle_controller_safari.c
src/data/moves_info.h
src/graphics.c
|
2025-06-25 14:17:07 +02:00 |
|
Hedara
|
726f18f360
|
Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
asm/macros/event.inc
data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
data/scripts/trainer_hill.inc
include/graphics.h
|
2025-06-24 10:42:24 +02:00 |
|
DizzyEggg
|
e1b83d6056
|
Match graphics declarations with externs (#2089)
|
2025-06-23 20:31:18 +01:00 |
|
Bassoonian
|
c34ec8956d
|
Master to upcoming merge, 20/06/25 (#7169)
|
2025-06-23 10:04:44 +02:00 |
|
grintoul
|
6c6daa8b9c
|
Fixes Rapid Spin description (#7178) (#7181)
|
2025-06-23 10:02:51 +02:00 |
|
Eduardo Quezada
|
bca28b40bb
|
Use argument.type for EFFECT_SOAK (#7141)
|
2025-06-21 00:04:52 +02:00 |
|
AlexOn1ine
|
aabb632894
|
Master to upcoming merge, 20/06/25
|
2025-06-20 17:09:58 +02:00 |
|
Eduardo Quezada
|
5966852f8d
|
Removed Mind Blown effect in favor of move flag (#7138)
|
2025-06-17 00:02:46 +02:00 |
|
Eduardo Quezada
|
651e87af5f
|
Converted Relic Song into a proper form change (#7139)
|
2025-06-17 00:02:25 +02:00 |
|
PhallenTree
|
a000a743df
|
Fix typos and some cleanup (mainly in battle files) (#7107)
|
2025-06-13 14:12:13 +02:00 |
|
GriffinR
|
50d81616cd
|
Relax MAPSEC region map data requirements
|
2025-06-10 13:05:03 -04:00 |
|
Hedara
|
bdd7c5bfa8
|
Merge branch 'master' into master-merge
Conflicts:
src/contest_painting.c
|
2025-06-09 23:27:18 +02:00 |
|
Bassoonian
|
b372c272f4
|
Update FRLG whiteouts to new pret system (#7040)
Co-authored-by: cawtds <38510667+cawtds@users.noreply.github.com>
|
2025-06-08 14:45:14 +02:00 |
|
wiz1989
|
e63ac48de2
|
added Ash Greninja overworld sprites (#6976)
|
2025-06-07 09:57:43 +02:00 |
|
Linathan
|
dc279f14ba
|
Chloroblast fix (#7008)
|
2025-06-06 21:33:56 +02:00 |
|