Nephrite
|
e8abfbce49
|
Untangled TMs and HMs from item ids (#7173)
|
2025-07-04 19:07:53 +02:00 |
|
surskitty
|
b3f52166df
|
Changing P_ONLY_OBTAINABLE_SHINIES to truly be Only Obtainable Shinies (#7275)
|
2025-07-04 11:06:36 +02:00 |
|
hedara90
|
ae1d99bb4f
|
Master to upcoming merge 01/07/25 (#7267)
|
2025-07-02 11:39:59 +02:00 |
|
AlexOn1ine
|
aa9ff53b81
|
master to upcoming merge
|
2025-07-02 10:05:31 +02:00 |
|
Alex
|
c27cc2ed70
|
Script clean up for Flame Burst and Costar (#7264)
|
2025-07-02 09:16:05 +02:00 |
|
Alex
|
e503f97f32
|
Use dedicated functions for Mud/Water Sport (#7248)
|
2025-07-02 09:08:12 +02:00 |
|
cawtds
|
92b4b7f0a0
|
Keep removed headers (#7261)
|
2025-07-02 09:06:23 +02:00 |
|
Alex
|
be2d36b6ee
|
Fixes instances of battler mutation for abilities (#7250)
|
2025-07-01 19:48:12 +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
|
f8fc86275c
|
Fixes protective pads not protecting from secondary protect effects (#7229)
|
2025-07-01 17:48:57 +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 |
|
hedara90
|
46d4b7c8c9
|
Bug Fix: Follower NPCs no longer have glitchy bobbing while underwater (#7232)
|
2025-06-30 21:39:51 +02:00 |
|
Eduardo Quezada
|
7a0cbc12d2
|
Added CRY_MODE_DYNAMAX (#6933)
|
2025-06-30 09:45:09 -07:00 |
|
Juanjo
|
8973006273
|
[FIX] Prevent caught Pokémon loss in NPC partner battles (#7177)
|
2025-06-28 10:36:37 +02:00 |
|
Alex
|
a96591dd43
|
Fixes Scald defrosting target while asleep (#7233)
|
2025-06-28 10:14:55 +02:00 |
|
ghoulslash
|
3dda407bb0
|
Jaboca berry triggers instead of being stolen by bug bite (#7237)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-06-28 08:43:50 +02:00 |
|
Alex
|
c5b939a312
|
Changes pre-proc to a normal if for Item Desc Header (#7231)
|
2025-06-27 22:31:31 +02:00 |
|
Alex
|
d1577d96ad
|
Set correct Instruction in Cmd_setnonvolatilestatus (#7236)
|
2025-06-27 18:37:24 +01:00 |
|
Bivurnum
|
b1200117a9
|
Better system for Follower NPC running frames (#7222)
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-06-27 10:12:35 +02:00 |
|
psf
|
b60c897b4a
|
Add P_ASK_MOVE_CONFIRMATION (#7132)
|
2025-06-27 10:11:41 +02:00 |
|
Bivurnum
|
9416a783d4
|
removed unnecessary fnpc underwater update
|
2025-06-26 16:47:09 -05:00 |
|
i0brendan0
|
206d2503d8
|
Add Gen 2 Moonlight, Morning Sun, Synthesis configuration (#7209)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-06-26 21:00:02 +02:00 |
|
hedara90
|
8bbb84fc96
|
Fix incorrect type input (#7228)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-26 20:15:22 +02:00 |
|
Alex
|
ed59b2fb0e
|
Remove redundant move result flag checks (#7223)
|
2025-06-26 16:08:12 +02:00 |
|
Alex
|
565cf6f7ff
|
Adds missing healBlockTimer for Baton Pass (#7220)
|
2025-06-26 15:54:19 +02:00 |
|
Alex
|
4def635e1f
|
Fixes wrong assignment in TrySymbiosis (#7221)
|
2025-06-26 15:53:50 +02:00 |
|
DizzyEggg
|
8e7274f3fc
|
lto support (#7182)
|
2025-06-26 15:53:14 +02:00 |
|
PhallenTree
|
a82aa618fb
|
Adds Ability Shield activation message (#7224)
|
2025-06-26 14:42:32 +02:00 |
|
Raymond Dodge
|
6f7dac6d11
|
Add 'Give Decoration' function to overworld debug menu (#7219)
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-06-25 22:11:43 +02:00 |
|
Alex
|
6824e7d175
|
Attackcanceller clean up (#7210)
|
2025-06-25 21:36:15 +02:00 |
|
Bolt-Strike
|
f217344cb5
|
Disable unowned evo methods (#7103)
|
2025-06-25 21:29:59 +02:00 |
|
Alex
|
2531613a52
|
Fixes Eject Pack not resolving correctly during switch in effects (#7002)
|
2025-06-25 21:15:40 +02:00 |
|
Bivurnum
|
c6221fa50e
|
Add debug options for follower NPCs (#7215)
|
2025-06-25 21:13:43 +02:00 |
|
Alex
|
773ecd4c24
|
Fixes OOB for Teatime and Flower Shield (#7214)
|
2025-06-25 21:00:49 +02:00 |
|
Eduardo Quezada
|
f0230d0c8c
|
Fixed Fake RTC debug menu (#7218)
|
2025-06-25 20:08:22 +02:00 |
|
Alex
|
7d7ffd58ae
|
Fixes Booster Energy timing activation + Clean up (#7175)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-06-25 18:20:55 +02:00 |
|
Alex
|
f8551830c9
|
Adds Gen5+ Encore config (#7051)
|
2025-06-25 15:58:30 +02:00 |
|
Eduardo Quezada
|
03d3245a39
|
Easier expandability of debug menu (#6910)
|
2025-06-25 15:57:41 +02: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 |
|
DizzyEggg
|
675fb8f60e
|
Pret merge (24th of June, 2025) (#7206)
|
2025-06-25 13:58:28 +02:00 |
|
Bivurnum
|
bfb0c2fa73
|
Added createfollowernpc macro to make a new follower from a gfx id (#7196)
|
2025-06-25 10:59:25 +02:00 |
|
Eduardo Quezada
|
b5956d8eba
|
Fix healthbox when blending effects happen (#7203)
|
2025-06-24 23:15:16 +02:00 |
|
Eduardo Quezada
|
b372fa30b6
|
Fix AI party count calc being maintained between tests (#7200)
|
2025-06-24 21:03:54 +02:00 |
|
cawtds
|
59350cc32f
|
Increase party action limit (#7119)
|
2025-06-24 15:15:04 +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 |
|
hedara90
|
74326023da
|
Backported Safari catch and add to party fix (#7192)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-24 09:29:20 +02:00 |
|
DizzyEggg
|
93511ceb05
|
Fix BtlController_EmitChosenMonReturnValue UB (#7197)
|
2025-06-24 09:28:26 +02:00 |
|
Alex
|
bc95824e8c
|
Fixes wrong Future Sight indexing (#7198)
|
2025-06-24 09:04:19 +02:00 |
|