Bivurnum
|
c6221fa50e
|
Add debug options for follower NPCs (#7215)
|
2025-06-25 21:13:43 +02: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Alex
|
66e8200d95
|
Use battler arguments for SetMoveEffect (#7156)
|
2025-06-23 15:26:31 +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 |
|
Bassoonian
|
625918daf6
|
Add assumes for bag tests (#7188)
|
2025-06-23 13:11:59 +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 |
|
Bassoonian
|
c34ec8956d
|
Master to upcoming merge, 20/06/25 (#7169)
|
2025-06-23 10:04:44 +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 |
|
Eduardo Quezada
|
1f8455c769
|
Fixed TM and Berries disappearing when sorting (#7168)
|
2025-06-22 20:39:13 +02:00 |
|
Eduardo Quezada
|
cf7f15faac
|
Untangle InitBtlControllers functions (#6748)
|
2025-06-22 16:21:37 +02:00 |
|
DizzyEggg
|
01fc7e76ef
|
Fix wrong keep temps files directory in makefile
|
2025-06-22 11:26:31 +02:00 |
|
Eduardo Quezada
|
b094b70dc5
|
More battle controller function consolidation. (#6877)
|
2025-06-21 10:59:41 +02:00 |
|
Eduardo Quezada
|
bca28b40bb
|
Use argument.type for EFFECT_SOAK (#7141)
|
2025-06-21 00:04:52 +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 |
|
AlexOn1ine
|
3a42cd84af
|
comment test
|
2025-06-20 17:31:16 +02:00 |
|
AlexOn1ine
|
aabb632894
|
Master to upcoming merge, 20/06/25
|
2025-06-20 17:09:58 +02: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 |
|
hedara90
|
390482d355
|
Fix debug text order (#7149)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-19 14:26:49 +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 |
|