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 |
|
Bivurnum
|
1f5195c686
|
update fnpc docs for createfollowernpc
|
2025-06-26 15:55:43 -05: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 |
|
Bassoonian
|
4f731835b4
|
Update .gitignore to add heal locations (#7050)
|
2025-06-25 20:13:29 +02: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
|
9ca6562874
|
Cleanup of merrp merge
|
2025-06-25 18:04:12 +02:00 |
|
Hedara
|
a3bec47a23
|
Merge commit '06c6fd02e0670e783a56756a1b08a98d213b27cb' into merrp-merge
|
2025-06-25 18:03:16 +02:00 |
|
Hedara
|
d989edfe98
|
Merge commit 'b7d0a7e203cc862ec6216433762c7529be2b9bb1' into merrp-merge
Conflicts:
include/constants/event_objects.h
src/event_object_movement.c
src/follower_helper.c
|
2025-06-25 18:03:01 +02:00 |
|
Hedara
|
08914a8f2c
|
Merge commit 'f6efe480fa4363eacf59538e6e68ec34fa6f6a1d' into merrp-merge
Conflicts:
src/event_object_movement.c
|
2025-06-25 18:00:38 +02:00 |
|
Hedara
|
25e168a3f8
|
Merge commit '841d0cf25164e92d98970b0d057de3a698722970' into merrp-merge
Conflicts:
include/event_object_movement.h
include/field_player_avatar.h
src/union_room_player_avatar.c
|
2025-06-25 17:59:49 +02:00 |
|
Hedara
|
abf8fa2457
|
Merge commit '1cc2c7f2a02c350c0d724ab661ea0b78d108df51' into merrp-merge
|
2025-06-25 17:56:37 +02:00 |
|
Hedara
|
1b2351ad68
|
Merge commit 'cab7f8b24b0dfaa26de8d63938cc3c9737d127a6' into merrp-merge
Conflicts:
src/fldeff_sweetscent.c
|
2025-06-25 17:56:21 +02:00 |
|
Hedara
|
c0a50096f3
|
Merge commit '75642625439306f0cc5aed81177dc191f0d5950e' into merrp-merge
Conflicts:
include/constants/event_objects.h
src/event_object_movement.c
src/follower_helper.c
|
2025-06-25 17:54:59 +02:00 |
|
Hedara
|
1916703e5a
|
Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge
Conflicts:
include/battle_script_commands.h
include/constants/event_objects.h
include/event_object_movement.h
include/field_effect.h
include/field_effect_helpers.h
include/sprite.h
src/battle_controller_player.c
src/event_object_movement.c
src/pokeball.c
|
2025-06-25 17:49:19 +02:00 |
|
Hedara
|
7db0d5c908
|
Merge commit '200ef41fce5071a2032ef34e4ba64b71368cfccd' into merrp-merge
|
2025-06-25 17:22:22 +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
|
150091990d
|
Merge commit '07fd8a28fbd5b23a6828846e4606fc3ecd54c3d9' into merrp-merge
|
2025-06-25 17:14:52 +02:00 |
|
Hedara
|
472fe6f728
|
Merge commit '73e891a88a61dfdf3ed11d5c91cad80e5349d519' into merrp-merge
Conflicts:
src/event_object_movement.c
|
2025-06-25 17:14:22 +02:00 |
|
Hedara
|
239ade8432
|
Merge commit '00c5ccbc890d28b54a3d69be5be175493e81e6c1' into merrp-merge
|
2025-06-25 17:12:32 +02:00 |
|
Hedara
|
aaf9fef99f
|
Merge commit '02a49be4b2812bd7cef9d101fb0e07619607e017' into merrp-merge
Conflicts:
include/event_object_movement.h
src/overworld.c
|
2025-06-25 17:12:08 +02:00 |
|
Hedara
|
6cde645fe3
|
Merge commit 'a4e032c28d316a8cfafa55bbba1251bcd58d2ef5' into merrp-merge
Conflicts:
include/event_object_movement.h
src/overworld.c
|
2025-06-25 17:10:17 +02:00 |
|
Hedara
|
dc2d885ee9
|
Merge commit '91f9ef0b4dac38c0805b056da540582777bb722c' into merrp-merge
|
2025-06-25 17:08:02 +02:00 |
|
Hedara
|
ccf3b5ffa2
|
Merge commit 'f993c904e89edf3d3791cfe01f7eb51ab2a436df' into merrp-merge
|
2025-06-25 17:07:39 +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 |
|
DizzyEggg
|
4b944be820
|
Master to Upcoming, 2025-06-25 (#7213)
|
2025-06-25 14:58:05 +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 |
|