4148 Commits

Author SHA1 Message Date
PhallenTree
320c6cf11f
Fixes Coaching on semi-invulnerable ally, Air Balloon being stolen, Immunity abilities being ignored by Mold Breaker (#6327) 2025-02-23 20:50:52 +01:00
PhallenTree
f6ff64cdbe
Fixes Brick Break/Psychic Fangs/Raging Bull breaking screens if target is immune (#6308) 2025-02-20 12:55:10 -03:00
PhallenTree
5340dc8687
Fixes non-Ghost type Curse animation (#6299) 2025-02-19 18:09:06 +01:00
Alex
b2f45fcf1f
Restoretarget in Rototiller script + Tests (#6296) 2025-02-18 20:43:07 +01:00
PhallenTree
b1c597495b
Fixes Called moves ignoring redirection (#6267) 2025-02-14 13:47:02 +01:00
Hedara
a859f40e37 Review comments 2025-02-12 14:31:42 +01:00
Hedara
7426a98dc5 Merge remote-tracking branch 'merrp/followers-expanded-id' into merrp-merge 2025-02-12 13:34:28 +01:00
Ariel A
c8fb56d73b Merge branch 'followers' into followers-expanded-id 2025-02-10 00:24:50 -05:00
Ariel A
ef05bbf394 Merge remote-tracking branch 'upstream/master' into followers 2025-02-10 00:11:38 -05:00
PhallenTree
cf5b95cee8
Fixes Expanding Force and Spectral Thief move animations (#6185) 2025-02-09 22:34:48 +01:00
Alex
de9e9af1b7
Fixes Spectral Thief stealing boost at the wrong time (#6197)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2025-02-07 16:24:05 -05:00
PhallenTree
5238665a7a
Fixes Suction Cups ability popup and Red Card + Guard Dog interaction (#6171) 2025-02-03 18:31:14 +01:00
Alex
97d8bd2646
Fixes Dragon Tail missing timing against Rocky Helmet / Iron Barbs (#6154) 2025-01-31 22:02:26 +01:00
Alex
89cfd85b8f
Fixes battler mutation during the intim script (#6151)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-01-31 21:49:26 +01:00
Ariel A
8933b84e1c Merge branch 'followers' into followers-expanded-id 2025-01-25 21:40:51 -05:00
Ariel A
c492bb3fec fix: follower field movements after scripted movement update 2025-01-21 23:27:28 -05:00
Alex
9ed3b176f0
Pret merge (17 of January) (#6045) 2025-01-18 19:53:29 +01:00
ghoulslash
37cbae5e54
Fix Symbiosis Needing battler Argument + Tests (#6039)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-01-18 14:44:07 +01:00
Bassoonian
bcf9a1eff8 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan 2025-01-17 21:57:25 +01:00
GriffinR
2f67b17571
Document bard music (#2053)
* Missing bard song limit constants
* Index bard sound arrays with word constants
* Document bard music
2025-01-17 17:54:38 +00:00
Raymond Dodge
b5b0ffd511
Define field script opcode constants (#2005)
Replace the magic number opcodes in field script command macros with
these new constants
2025-01-17 17:04:00 +00:00
hedara90
9c7c94d474
Fixed a bunch of move anims (#5936)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-12 10:01:44 +01:00
Eduardo Quezada
15a034a1d9
Fixed multiple transform/form change graphical issues (#6005) 2025-01-12 09:49:19 +01:00
shachar700
cbd0b3ef0c
Field effect for cutting grass is missing setfieldeffectargument. Issue #5766 (#5952) 2025-01-05 16:45:21 +01:00
Alex
b7e945fbfb
Reverts wrongly done partial Eject Pack fix (#5928) 2025-01-01 21:41:42 +01:00
Ariel A
a6ef9c7577 Merge branch 'followers' into followers-expanded-id 2025-01-01 00:39:14 -05:00
Ariel A
01335fa453 Unfreeze follower object during lockall (if safe movement flag set).
MSGBOX_SIGN no longer freezes follower.
2025-01-01 00:35:30 -05:00
Alex
7e0c1f9323
New U-turn animation to fix visibility (#5910) 2024-12-31 00:36:07 +01:00
ghoulslash
ca31145d36
Fix Salt Cure script (#5895)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-12-29 16:51:33 +01:00
Eduardo Quezada
e883b7c251
Fixed Wish triggering Disguise (#5860) 2024-12-22 23:39:17 +01:00
Alex
f61a0f6a30
Sheer Force fix and move effect cleanup (#5812) 2024-12-21 19:45:50 +01:00
kittenchilly
c3133193e2
Fix Hit Escape moves giving Exp to the mon that switches in (#5844) 2024-12-21 10:30:25 +01:00
Alex
5b05e7913c
Pret merge (20th of December) (#5845) 2024-12-21 10:17:58 +01:00
PhallenTree
742f7a4875
Fixes Cotton Down and Gulp Missile not interacting correctly with stat reduction prevention effects (#5841) 2024-12-20 22:24:23 +01:00
Eduardo Quezada
82252251e7 Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220 2024-12-20 16:04:33 -03:00
Alex
b22a867e11
Fixes Room Service (#5827) 2024-12-19 14:12:01 +01:00
Alex
99ba36b446
Fixes Tidy Up (#5819) 2024-12-17 09:47:37 +01:00
kittenchilly
6e6352569f
Narrower font tweaks and font fitting fixes (#5782) 2024-12-07 18:12:09 -03:00
iriv24
cb12bdc220
Fix No Guard failing OHKO Moves into Semi-Invulnerable Pokemon (#5779)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-12-07 18:11:45 -03:00
ghoulslash
6e24b6af3d
Gravity fix + Sky Drop Test (#5780)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-12-07 14:48:01 +01:00
ghoulslash
a775098e83
Fix octolock + defiant (#5781)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-12-07 13:38:34 +01:00
Eduardo Quezada
3f98c78297
Added POKEMART_LIST_END to avoid users accidentally removing it (#1947) 2024-12-04 17:38:23 -05:00
Eduardo Quezada
5c180a0b09
Added FONT_SHORT_NARROWER (#5101) 2024-12-04 06:30:19 -08:00
Alex
70224f0ea3
Fixes items preventing other switch in effects (#5732)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-12-03 11:15:29 -05:00
Eduardo Quezada
1a581c407c Merge branch '_RHH/master' into _RHH/upcoming 2024-12-01 08:11:32 -03:00
Alex
acdd447160
Changes Max Phantasm move anim script call (#5737) 2024-11-30 19:19:08 -05:00
Hedara
f6fdca615f Merge branch 'master' into master-to-upcoming 2024-11-29 11:32:12 +01:00
Alex
c4fe97011e
Fix Floral Healing anim (#5733) 2024-11-28 22:51:34 +01:00
Sadfish the Sad
64887ee876
dark void, clangorous soulblaze, vortex animation fixes (#5650) 2024-11-25 19:57:22 +01:00
Alex
612c8d3ff6
Fixes heal blocked leeach seed in tests (#5700) 2024-11-21 17:18:44 +00:00