Hedara
|
1686797a5e
|
Merge commit '7612e386419ef913bda5a62a5c8f234190542bb0' into merrp-merge
Conflicts:
src/palette.c
|
2025-06-25 17:07:13 +02:00 |
|
DizzyEggg
|
675fb8f60e
|
Pret merge (24th of June, 2025) (#7206)
|
2025-06-25 13:58:28 +02: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 |
|
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 |
|
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 |
|
DizzyEggg
|
53f8ae11ff
|
Move gTradePlatform_Tilemap to header (#2088)
|
2025-06-22 19:48:37 -04:00 |
|
PhallenTree
|
98670ca30e
|
Fixes Neutralizing Gas leaving the field activating unsuppressable abilities again (#7170)
|
2025-06-21 00:04:01 +02:00 |
|
hedara90
|
009a47a5dc
|
Fixed Battle Pyramid mon generation (#7146)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-20 13:19:24 +02:00 |
|
Bassoonian
|
24fdac662e
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196
|
2025-06-19 14:32:23 +02:00 |
|
Bivurnum
|
12b2a29607
|
Bug fix: clear follower npc surf blob on white out (#7153)
|
2025-06-18 22:50:55 +02:00 |
|
psf
|
75fe3e7da6
|
Fixed typo in sMoveRelearnerMenuState (#2155)
|
2025-06-17 15:38:33 +01:00 |
|
hedara90
|
981aa3ee7c
|
Use RGB values for DEFAULT_LIGHT_COLOR (#7133)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-16 13:38:07 +02:00 |
|
Pawkkie
|
283bf68ff9
|
Fix incorrect function parameters used in AI damage calc (#7130)
|
2025-06-16 07:59:30 +02:00 |
|
cawtds
|
3491cd95e8
|
Fix sell price display (#7123)
|
2025-06-15 11:52:51 +02:00 |
|
Bivurnum
|
459946ac9a
|
Bug fix: Follower NPC no longer retains bike sprite after white out (#7120)
|
2025-06-15 11:10:32 +02:00 |
|
GriffinR
|
bfa3e4a07b
|
Merge pull request #2145 from abaresk/remove-berryfix
Remove berry yield bug fix
|
2025-06-15 00:41:33 -04:00 |
|
DizzyEggg
|
1cc4321a42
|
Fix AnimItemSteal_Step3 and AnimKnockOffOpponentsItem matches
|
2025-06-13 16:45:24 +02:00 |
|
Alex
|
c120fa71dc
|
Fixes Ally Switch in multi battles (#7109)
|
2025-06-13 15:18:27 +02:00 |
|
PhallenTree
|
a000a743df
|
Fix typos and some cleanup (mainly in battle files) (#7107)
|
2025-06-13 14:12:13 +02:00 |
|
ghoulslash
|
96844bd3bb
|
fix sprite count in RepeatBallOpenParticleAnimation
|
2025-06-09 16:19:25 -04:00 |
|
PhallenTree
|
28d185be95
|
Fixes Pursuit potentially causing both battlers to switch into the same mon (#7084)
|
2025-06-07 23:59:44 +02:00 |
|
Alex
|
9f1eb78737
|
Fixes freeze during a 1v2 double battle (#7075)
|
2025-06-07 11:49:15 +02:00 |
|
明雅
|
1692d641c4
|
Fix Contest Painting load palette error (#7077)
|
2025-06-07 10:05:24 +02:00 |
|
Bivurnum
|
ea75a09dac
|
Clear saved follower NPC door warp when doing dive warp (#7065)
|
2025-06-07 09:54:07 +02:00 |
|
i0brendan0
|
67f7ad6b1e
|
[DRAFT] Fix Normalize not boosting Normal type moves if they were already Normal type (#7060)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-06-06 22:00:33 +02:00 |
|
Linathan
|
dc279f14ba
|
Chloroblast fix (#7008)
|
2025-06-06 21:33:56 +02:00 |
|
Linathan
|
25736c5628
|
Bug fix for Grassy Terrain incorrectly healing non-grounded Pokemon (#7058)
|
2025-06-05 14:35:30 +02:00 |
|
Alex
|
99997c49fc
|
Fixes speed calculation order (#7064)
|
2025-06-04 23:26:19 +02:00 |
|
PhallenTree
|
b3752e13d8
|
Fixes Aura Wheel + Normalize and Hunger Switch while Transformed/Terastallized (#7061)
|
2025-06-04 21:58:10 +02:00 |
|
TLM-PsIQ
|
8b52e100b9
|
Fix ScaryFace anim for Bitter Malice (#6476)
|
2025-06-03 22:25:29 +02:00 |
|
cawtds
|
b36a78ed47
|
replace magic numbers with enums
|
2025-06-02 22:55:41 +02:00 |
|
cawtds
|
0fc900514b
|
sync list menu functions with firered
|
2025-06-02 22:51:26 +02:00 |
|
Alex
|
d33651bfd0
|
Battle controller pret documentation (#7029)
|
2025-06-02 14:22:11 +02:00 |
|
Alex
|
661a418960
|
Fixes multi battle party re-order (#7042)
|
2025-06-01 13:08:37 +02:00 |
|
Eduardo Quezada
|
a93a17d490
|
Fixed text width for a lot of forms in HGSS Dex (#7035)
|
2025-05-31 20:28:24 +02:00 |
|
PhallenTree
|
585793131f
|
Fixes large battle messages being cut off instead of being prompted to advance 2 (#7036)
|
2025-05-31 20:25:25 +02:00 |
|
grintoul
|
3255f23239
|
Added line break between Trainer 1 name and Trainer 2 name in sText_TwoTrainersWantToBattle (#7028)
|
2025-05-31 09:50:41 +02:00 |
|
cawtds
|
555bda4e66
|
Fix UB when using time menu (#7023)
|
2025-05-30 20:00:25 +02:00 |
|
Bivurnum
|
37669e62ae
|
Bug fix: setfollowernpc macro no longer runs when FNPC_ENABLE_NPC_FOLLOWERS is FALSE (#6755)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-05-30 17:41:02 +02:00 |
|