Alex
|
f8fc86275c
|
Fixes protective pads not protecting from secondary protect effects (#7229)
|
2025-07-01 17:48:57 +02:00 |
|
Alex
|
89b1a45536
|
Fixes Ice Spinner and Steel Roller (#7259)
|
2025-07-01 15:39:22 +01:00 |
|
Alex
|
5451e40830
|
Fixes Toxic Thread animation not being played at the right time (#7247)
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-06-30 21:41:29 +02:00 |
|
hedara90
|
46d4b7c8c9
|
Bug Fix: Follower NPCs no longer have glitchy bobbing while underwater (#7232)
|
2025-06-30 21:39:51 +02:00 |
|
hedara90
|
66703ddf9d
|
1.12.1 release (#7254)
|
2025-06-30 12:34:24 +02:00 |
|
Hedara
|
947faa97d3
|
Start of 1.12.2 cycle
|
2025-06-30 11:01:46 +02:00 |
|
Hedara
|
1e281547ed
|
1.12.1 Release commit
|
2025-06-30 11:01:13 +02:00 |
|
ghoulslash
|
21ac62f781
|
Flush textbox for Truant Popup (#7252)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-06-29 21:38:52 +02:00 |
|
hedara90
|
ae123f0f37
|
Added tests for Toxic Thread (#7244)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-29 10:16:38 +02:00 |
|
PhallenTree
|
6ed4f73f6a
|
Fixes Emergency Exit sometimes causing an unrelated battler to become invisible (#7241)
|
2025-06-28 23:20:40 +02:00 |
|
hedara90
|
502c73dc9b
|
Fix 01_battle_engine_bugs.yaml (#7242)
|
2025-06-28 13:24:24 -07:00 |
|
Juanjo
|
8973006273
|
[FIX] Prevent caught Pokémon loss in NPC partner battles (#7177)
|
2025-06-28 10:36:37 +02:00 |
|
ghoulslash
|
0c4b0c582e
|
Add some tests (#7234)
|
2025-06-28 10:20:39 +02:00 |
|
Alex
|
a96591dd43
|
Fixes Scald defrosting target while asleep (#7233)
|
2025-06-28 10:14:55 +02:00 |
|
ghoulslash
|
3dda407bb0
|
Jaboca berry triggers instead of being stolen by bug bite (#7237)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-06-28 08:43:50 +02:00 |
|
Bivurnum
|
9416a783d4
|
removed unnecessary fnpc underwater update
|
2025-06-26 16:47:09 -05: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 |
|
Alex
|
773ecd4c24
|
Fixes OOB for Teatime and Flower Shield (#7214)
|
2025-06-25 21:00:49 +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 |
|
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 |
|