Alex
edb196e851
Fixes Red Card against Dynamaxed mons ( #6526 )
2025-04-02 14:28:53 +02:00
PhallenTree
ea59e858fb
Fixes Hone Claws checking the wrong stats for its stat change animation and Stockpile drops being stopped by stat reduction prevention effects ( #6522 )
2025-04-01 21:03:04 +02:00
AlexOn1ine
0c35879e02
conflicts
2025-04-01 19:11:55 +02:00
AlexOn1ine
ccebebf64f
31-03-25 Master merge
2025-03-31 18:23:46 +02:00
Alex
388389714b
Rename removelishtscreenreflect to removescreens ( #6495 )
2025-03-30 10:52:24 +02:00
Alex
79a2ec1ce2
Fixes Emergency Exit and Eject Pack ( #6459 )
2025-03-29 14:04:01 +01:00
Alex
7ead90aeff
Fixs Aftermath ability popup message ( #6491 )
2025-03-29 09:45:59 +01:00
AlexOn1ine
ae640f0714
25-03-25 master to upcoming merge
2025-03-25 21:39:58 +01:00
hedara90
bb73fb1971
Fix Jet Punch in isolated tests ( #6461 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-21 21:46:03 +01:00
Bassoonian
9a23f19575
19-03-25 master to upcoming merge ( #6450 )
2025-03-20 09:57:05 +01:00
Alex
adc2c61fe8
Unifies dynamic move category checks ( #6443 )
2025-03-19 23:06:08 +01:00
AlexOn1ine
3c632b8b44
19-03-25 master to upcoming merge
2025-03-19 17:12:47 +01:00
Alex
99a3d01877
Fixes dynamax reversion when ejected out + anim fix ( #6416 )
...
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-03-17 19:57:38 +01:00
wiz1989
1e2aa18ffe
Added Dynamax/Gigantamax battle messages ( #6440 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-03-17 19:16:43 +01:00
PhallenTree
ddab689a07
Fixes Neutralizing Gas Exits, Weather Abilities and Terrain Effects order ( #6435 )
2025-03-16 23:10:20 +01:00
surskitty
7193909fa7
Configuration to make all Hail moves summon Snow or vis versa, to have only one ice weather ( #6149 )
2025-03-12 21:31:45 +01:00
Alex
3def0e751b
Fixes crash damage move against absorbing abilities ( #6361 )
2025-03-09 20:54:58 +01:00
ghoulslash
d44eff4e0c
fix red card overwriting gBattlerAttacker causing subsequent MOVEEND cases checking attacker not to trigger properly
2025-03-03 14:56:08 -05:00
AlexOn1ine
0a333dbdc8
merge rhh/upcoming
2025-02-28 00:21:07 +01:00
Hedara
06d31bc8ea
Merge branch 'master' into final-1.10-master-upcoming-merge
2025-02-26 22:07:10 +01:00
hedara90
37abce1992
Made some move animations fit in VRAM ( #6289 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-26 14:56:36 +01:00
Alex
13acf18d74
Fixes effect paralyze not being absorbed by absorbing abilities ( #6338 )
2025-02-25 22:28:10 +01:00
Alex
335233bab5
Update data/battle_scripts_1.s
...
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-02-23 22:56:46 +01:00
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
Eduardo Quezada
8c57172f2a
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-02-20 19:46:02 -03:00
Eduardo Quezada
fe7ed22f5b
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-20 19:44:00 -03:00
Alex
767ea38dbf
Fixes doesnt effect message for Thunder Wave ( #6304 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-02-20 19:18:27 -03:00
Eduardo Quezada
2428af66cd
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-02-20 19:17:59 -03: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
Alex
502b1c5087
Rename SetPhotonGeyser to a more general use and clean up ( #6272 )
2025-02-17 22:07:30 +01:00
PhallenTree
b1c597495b
Fixes Called moves ignoring redirection ( #6267 )
2025-02-14 13:47:02 +01:00
Eduardo Quezada
9c4fbbf274
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-13 13:06:32 -03:00
AlexOn1ine
5ee5aa796a
merge rhh/upcoming
2025-02-12 21:01:21 +01:00
AlexOn1ine
ff47ca0f7a
fix healing after magic room ends
2025-02-12 20:16:02 +01:00
AlexOn1ine
f8b45028db
fix grassy terrain healing
2025-02-12 19:33:41 +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
Eduardo Quezada
3507862164
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-12 09:30:59 -03:00
AlexOn1ine
b4f17c7506
review comments
2025-02-11 12:06:16 +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
Eduardo Quezada
a2ad5d2ca3
Heal Bell/Aromatherapy/Sparkly Swirl improvements and fixes ( #6210 )
2025-02-09 21:54:03 +01:00
AlexOn1ine
4babfd003e
rhh merge/upcoming
2025-02-09 14:04:21 +01:00
AlexOn1ine
f2bd88a7f9
EndTurnEffectsOrder Refactor
2025-02-09 13:48:08 +01:00
Zatsu
43bce41796
Add caught mon to full party by sending a different mon to the Box ( #6058 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-02-09 00:54:58 +01:00
ghoulslash
6f541bb449
Fix Liquid Ooze + Leech Seed Test ( #6217 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-02-08 22:42:25 +01:00
Frank DeBlasio
41882b267d
Consolidate duplicate dialogue of nature girl in Battle Frontier ( #6195 )
2025-02-08 12:51:22 -08: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
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
Eduardo Quezada
3fc9b0195d
Cleaned up code to align with previous review comments
2025-01-26 17:14:00 -03:00
Eduardo Quezada
00241cf569
Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2
...
# Conflicts:
# README.md
# asm/macros/event.inc
# data/scripts/pkmn_center_nurse.inc
# include/constants/event_objects.h
# include/constants/field_weather.h
# include/overworld.h
# include/palette.h
# include/sprite.h
# src/battle_controller_player.c
# src/data/object_events/object_event_graphics.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_weather.c
# src/overworld.c
# src/palette.c
# src/scrcmd.c
# src/sprite.c
2025-01-26 12:08:10 -03:00
hedara90
e1e3bcfa91
Tera starstorm ( #6073 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-26 11:08:46 +01:00
Ariel A
bc034aaf73
Merge branch 'followers-expanded-id' into lighting-expanded-id
2025-01-25 21:42:02 -05:00
Ariel A
8933b84e1c
Merge branch 'followers' into followers-expanded-id
2025-01-25 21:40:51 -05: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
Eduardo Quezada
26daf15ce0
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-24 18:29:28 -03:00
Ariel A
c492bb3fec
fix: follower field movements after scripted movement update
2025-01-21 23:27:28 -05:00
Pawkkie
44ebf33f1d
Add Steven Multi to debug menu ( #6064 )
2025-01-20 22:29:21 +01:00
Eduardo Quezada
a756bb501c
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-19 22:31:33 -03: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
Eduardo Quezada
937b3106b4
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-17 19:33:48 -03:00
Eduardo Quezada
c363c28b22
Addressing a bunch of small things
2025-01-17 18:21:48 -03: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
Eduardo Quezada
89f90e1f69
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-03 13:58:10 -03: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
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
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
