Eduardo Quezada
|
7a0cbc12d2
|
Added CRY_MODE_DYNAMAX (#6933)
|
2025-06-30 09:45:09 -07:00 |
|
GriffinR
|
0c7c81e02f
|
Merge branch 'master' into _pret/pr/pyramidLocation
|
2025-06-30 11:51:45 -04: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 |
|
Eduardo Quezada
|
57da4617da
|
Ability status immunity
|
2025-06-26 17:44:29 -04:00 |
|
Eduardo Quezada
|
cf85abc270
|
Remove unused messages
|
2025-06-26 16:42:12 -04:00 |
|
GriffinR
|
44c3069895
|
Add explicit defaults for MAPSEC data
|
2025-06-26 16:26:59 -04: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 |
|
GriffinR
|
670d3a6c9f
|
Merge pull request #2152 from GriffinRichards/mapsec-data
Relax MAPSEC region map data requirements
|
2025-06-25 22:05:35 -04:00 |
|
GriffinR
|
2a7a4f1e76
|
Merge pull request #2127 from AsparagusEduardo/_pret/maxLinkPlayers
Fix other missing instances of MAX_LINK_PLAYERS
|
2025-06-25 22:05:13 -04: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 |
|
DizzyEggg
|
9df5ab16e8
|
Ensure sMonMarkings_Gfx alignment (#2158)
|
2025-06-25 19:41:23 +01:00 |
|
Eduardo Quezada
|
f0230d0c8c
|
Fixed Fake RTC debug menu (#7218)
|
2025-06-25 20:08:22 +02:00 |
|
DizzyEggg
|
64a6e8817c
|
Fix sGpuRegBuffer potential alignment issues (#2157)
|
2025-06-25 17:54:13 +01: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 |
|
Hedara
|
abf8fa2457
|
Merge commit '1cc2c7f2a02c350c0d724ab661ea0b78d108df51' into merrp-merge
|
2025-06-25 17:56:37 +02:00 |
|
Hedara
|
80ec5ff409
|
Merge commit '143500a1f95bf5951c001ec88db8b9d3f55d43e7' into merrp-merge
|
2025-06-25 17:22:11 +02:00 |
|
Hedara
|
3ce34c41b6
|
Merge commit '1f2fe7396b68d82da356b93fca10cc5736d3159c' into merrp-merge
Conflicts:
include/follower_helper.h
src/follower_helper.c
|
2025-06-25 17:20:38 +02:00 |
|
Hedara
|
1686797a5e
|
Merge commit '7612e386419ef913bda5a62a5c8f234190542bb0' into merrp-merge
Conflicts:
src/palette.c
|
2025-06-25 17:07:13 +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 |
|
Ariel A
|
1cc2c7f2a0
|
fix: destroy shadows during battle transition intro
|
2025-06-24 20:46:22 -04:00 |
|
Ariel A
|
cab7f8b24b
|
fix: removed sweet scent field effect dependence on gPaletteDecompressionBuffer
|
2025-06-24 20:45:52 -04:00 |
|
Ariel A
|
7564262543
|
Merge branch 'followers' into lighting
|
2025-06-24 20:44:44 -04:00 |
|
Ariel A
|
685a8a9118
|
Merge remote-tracking branch 'upstream/master' into followers
|
2025-06-24 20:39:12 -04:00 |
|
Ariel A
|
143500a1f9
|
fix: capitalization in follower splash message
|
2025-06-24 20:20:01 -04:00 |
|
Ariel A
|
1f2fe7396b
|
feat: added abnormal weather follower message
Includes support for follower matching != species
|
2025-06-24 20:19:23 -04: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 |
|