Frank DeBlasio
41882b267d
Consolidate duplicate dialogue of nature girl in Battle Frontier ( #6195 )
2025-02-08 12:51:22 -08:00
Alex
765a12f520
Convert max effects to normal move effects ( #6143 )
2025-02-06 21:02:39 -03:00
Hedara
27da389d1e
Merge branch 'master' into master-to-upcoming
2025-02-06 13:05:02 +01:00
hedara90
cad1a37566
Tachyon Cutter and Salt Cure animations ( #6182 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-05 15:27:21 +01:00
PhallenTree
5238665a7a
Fixes Suction Cups ability popup and Red Card + Guard Dog interaction ( #6171 )
2025-02-03 18:31:14 +01:00
Eduardo Quezada
64c5113b23
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-02 14:18:13 -03: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
hedara90
e1e3bcfa91
Tera starstorm ( #6073 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-26 11:08:46 +01:00
Pawkkie
43e41bbed8
Add Code Entry functionality ( #5951 )
2025-01-25 22:03:08 +01:00
Salem
01e8d8233e
Trainer Battle Parameter Consolidation ( #5982 )
2025-01-25 22:02:39 +01:00
Pawkkie
44ebf33f1d
Add Steven Multi to debug menu ( #6064 )
2025-01-20 22:29:21 +01:00
Eduardo Quezada
f6a86a65ef
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-19 10:32:57 -03: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
Eduardo Quezada
ce40c3356c
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-12 08:42:57 -03: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
Eduardo Quezada
8821779815
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-11 08:07:15 -03:00
Martin Griffin
1551a33069
Fix leftover test change from #5033 ( #5987 )
2025-01-09 17:28:09 -03:00
Martin Griffin
bb781f21a1
Arbitrary trainer scripts + map script/trigger softlock prevention ( #5033 )
...
Script_RunImmediatelyUntilEffect runs a script until either a specified
effect may occur or it reaches an end.
All existing script commands and natives, and some specials, call
Script_RequestEffects which allows us to analyze them.
Any downstream script commands/natives/specials will be statically known
not to call Script_RequestEffects and treated as if they have all
effects. Manually tagging them with requests_effects=1 and calling
Script_RequestEffects will make them analyzable.
Using these, we're able to execute scripts until they either exit with
no effect, or would possibly have an effect. This allows us to:
1. Not run on frame map scripts or triggers if they would have no
effect.
2. Immediately run triggers if they only affect flags/vars. This removes
the lag frames when biking into the Cycling Road, for example.
3. Migrate on load/on transition/on resume/on return to field/on dive
warp scripts onto the global script context if they would block
(approximated via SCREFF_HARDWARE).
4. Support arbitrary control flow in trainer scripts. The trainer does
not see the player if the script has no effect, and the trainer will
use whichever trainerbattle command is branched to.
5. Support arbitrary scripts in trainer scripts. cant_see and
cant_see_if_* commands have been introduced so that scripts are able
to do something when the player interacts with the trainer even if
that trainer wouldn't see them.
2025-01-08 10:27:00 +00:00
shachar700
cbd0b3ef0c
Field effect for cutting grass is missing setfieldeffectargument. Issue #5766 ( #5952 )
2025-01-05 16:45:21 +01:00
psf
a7f77ed08d
Adds B_VAR_DIFFICULTY and related functions READ DESC ( #5337 )
...
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-01-04 14:25:03 +01:00
ghoulslash
03684c6539
Battle Weather Refactor ( #5833 )
2025-01-04 07:33:25 -05:00
ghoulslash
d8ea4fa1ec
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav
2025-01-02 08:28:21 -05:00
Eduardo Quezada
a50c78bb1e
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-01 18:34:42 -03:00
Alex
b7e945fbfb
Reverts wrongly done partial Eject Pack fix ( #5928 )
2025-01-01 21:41:42 +01:00
Eduardo Quezada
9669a0554d
Encapsulate move data ( #5852 )
2025-01-01 20:34:33 +01:00
Eduardo Quezada
004efd1e5a
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-31 18:38:03 -03:00
Alex
7e0c1f9323
New U-turn animation to fix visibility ( #5910 )
2024-12-31 00:36:07 +01:00
Alex
af19b13195
Adds Pledge Side Statuses as Starting Statuses ( #5899 )
2024-12-30 09:18:23 +01:00
Hedara
2088f2a12d
Merge branch 'master' into master-upcoming
2024-12-29 21:43: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
AlexOn1ine
74f1d7cb80
merge rhh/upcomig
2024-12-28 21:03:34 +01:00
AlexOn1ine
6a906a3fc1
refactor done
2024-12-28 20:55:59 +01:00
Eduardo Quezada
3bc4126558
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-28 15:28:07 -03:00
AlexOn1ine
9c34634dd6
Draft Change
2024-12-25 11:03:32 +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
Eduardo Quezada
25075239a2
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-21 08:46:33 -03: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
Eduardo Quezada
53aebc34dd
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-20 20:48:13 -03: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
AlexOn1ine
99fef0260f
Battle Weather Refactor
2024-12-19 20:50:08 +01:00
Alex
b22a867e11
Fixes Room Service ( #5827 )
2024-12-19 14:12:01 +01:00