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
|
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 |
|
GriffinR
|
f029fc5eac
|
Merge pull request #2156 from DizzyEggg/temps
Fix wrong keep temps files directory in makefile
|
2025-06-22 19:54:58 -04:00 |
|
DizzyEggg
|
53f8ae11ff
|
Move gTradePlatform_Tilemap to header (#2088)
|
2025-06-22 19:48:37 -04:00 |
|
DizzyEggg
|
01fc7e76ef
|
Fix wrong keep temps files directory in makefile
|
2025-06-22 11:26:31 +02:00 |
|
PhallenTree
|
98670ca30e
|
Fixes Neutralizing Gas leaving the field activating unsuppressable abilities again (#7170)
|
2025-06-21 00:04:01 +02:00 |
|
GriffinR
|
e2e3438674
|
Add missing uses of LOCALID_NONE for trainerbattle
|
2025-06-20 15:33:12 -04:00 |
|
Eduardo Quezada
|
8edb736429
|
Spruce up FEATURES.md (#7159)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-06-20 05:44:55 -07:00 |
|
hedara90
|
009a47a5dc
|
Fixed Battle Pyramid mon generation (#7146)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-20 13:19:24 +02:00 |
|
hedara90
|
c7e744d713
|
Pret merge (19th of June, 2025) (#7163)
|
2025-06-20 10:07:14 +02:00 |
|
Bassoonian
|
24fdac662e
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196
|
2025-06-19 14:32:23 +02:00 |
|
Alex
|
57feee3743
|
Add missing flag for Berserk Gene (#7151)
|
2025-06-19 14:26:28 +02:00 |
|
allcontributors[bot]
|
4a80caf8cd
|
add poetahto as a contributor for code (#7162)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-06-18 21:23:27 -07:00 |
|
allcontributors[bot]
|
a996525bdd
|
add lordraindance2 as a contributor for code (#7161)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
|
2025-06-18 21:06:45 -07:00 |
|
Bivurnum
|
12b2a29607
|
Bug fix: clear follower npc surf blob on white out (#7153)
|
2025-06-18 22:50:55 +02:00 |
|
Eduardo Quezada
|
8a0bc495d5
|
Fixed description of FORM_CHANGE_WITHDRAW (#7152)
|
2025-06-18 22:09:59 +02:00 |
|
ghoulslash
|
a154d7a7a4
|
Fix savage spin out spider web template (#7137)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-06-18 11:04:24 +02:00 |
|
Eduardo Quezada
|
9adb84b2d0
|
Fixed KNOWN_FAILING Tera test (#6949)
|
2025-06-18 11:00:42 +02:00 |
|
Eduardo Quezada
|
0dc01f244e
|
Fixed Aura Wheel KNOWN_FAILING test (#7135)
|
2025-06-17 20:48:03 +02:00 |
|
psf
|
75fe3e7da6
|
Fixed typo in sMoveRelearnerMenuState (#2155)
|
2025-06-17 15:38:33 +01:00 |
|
allcontributors[bot]
|
e7b9372662
|
add fakuzatsu as a contributor for code (#7136)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
|
2025-06-17 13:47:57 +01:00 |
|