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 |
|
Eduardo Quezada
|
8d81f60313
|
Fix tests failing with B_FRIENDSHIP_BOOST being TRUE (#7194)
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-06-25 14:01:31 +02:00 |
|
DizzyEggg
|
675fb8f60e
|
Pret merge (24th of June, 2025) (#7206)
|
2025-06-25 13:58:28 +02:00 |
|
Ariel A
|
06c6fd02e0
|
Merge branch 'lighting' into lighting-expanded-id
|
2025-06-24 20:53:07 -04:00 |
|
Ariel A
|
b7d0a7e203
|
Merge branch 'followers-expanded-id' into lighting-expanded-id
|
2025-06-24 20:53:02 -04:00 |
|
Ariel A
|
f6efe480fa
|
fix: ignore trainerRange on OW templates when trainerType nonzero
|
2025-06-24 20:51:08 -04:00 |
|
Ariel A
|
841d0cf251
|
Merge branch 'followers' into followers-expanded-id
|
2025-06-24 20:50:58 -04: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
|
200ef41fce
|
fix: mapjson missing cstdint
|
2025-06-24 20:22:24 -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 |
|
Ariel A
|
07fd8a28fb
|
fix: hide followers when player enters Battle Pike curtains
|
2025-06-24 20:16:04 -04:00 |
|
Eduardo Quezada
|
b372fa30b6
|
Fix AI party count calc being maintained between tests (#7200)
|
2025-06-24 21:03:54 +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 |
|
allcontributors[bot]
|
2e3e0889f9
|
add pablopenna as a contributor for code (#7202)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
|
2025-06-23 19:13:50 -07:00 |
|
DizzyEggg
|
e1b83d6056
|
Match graphics declarations with externs (#2089)
|
2025-06-23 20:31:18 +01:00 |
|
Pablo Pena
|
e449a612f5
|
fix: use BackPickId to calculate player intro ball throw animation palette (#7193)
|
2025-06-23 19:45:12 +02:00 |
|
Eduardo Quezada
|
a75a49710f
|
Fixed debug flag menu sound (#7190)
|
2025-06-23 15:46:49 +02:00 |
|
psf
|
456a8f6aa0
|
Update the description of OW_OBJECT_VANILLA_SHADOWS (#7184)
|
2025-06-23 15:40:13 +02:00 |
|
i0brendan0
|
0ccf797cce
|
Fixes Roamers not saving shininess (#7185)
|
2025-06-23 15:05:01 +02:00 |
|
Alex
|
753eb9f8d8
|
Fixes Enigma, Kee and Maranga Berry activation timing (#7171)
|
2025-06-23 13:47:26 +02:00 |
|
DizzyEggg
|
7fdc5a45b6
|
force RHH Rom Header to always be present (#7187)
|
2025-06-23 10:38:03 +02:00 |
|
DizzyEggg
|
0dae2cea28
|
force sGFRomHeader to always be present (#7186)
|
2025-06-23 10:37:49 +02:00 |
|
grintoul
|
6c6daa8b9c
|
Fixes Rapid Spin description (#7178) (#7181)
|
2025-06-23 10:02:51 +02:00 |
|
GriffinR
|
4ce83c7d96
|
Merge pull request #2104 from GriffinRichards/fix-collision-comparison
Fix collision comparison in PlayerNotOnBikeMoving
|
2025-06-22 20:05:30 -04:00 |
|