Eduardo Quezada
aebbe448b8
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-28 12:58:14 -04:00
PhallenTree
930cac6aca
Fix Instruct bypassing AtkCanceler, Entry Hazards targeting wrong side of the field if opponent fainted ( #5262 )
...
* Fix Instruct bypassing AtkCanceler + interaction with firstTurnOnly moves
* Fix Entry Hazards targeting the wrong side of the field if opponent fainted
* Remove unused BattleScript_AuroraVeilEnds and STRINGID_AURORAVEILENDS
* Alternative fix + Fix gBattlerTarget initially set to 2
* Fix Instruct animation
* Alternative anim fix
2024-08-27 14:46:56 +02:00
kittenchilly
8d47db6160
Add Population Bomb animation ( #5194 )
...
* Population Bomb animation
* Update battle_anim_new.c
* Update battle_anim_new.c
2024-08-25 23:39:25 +02:00
Eduardo Quezada
abf60e9c64
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-24 19:44:35 -04:00
Alex
5a320f94d2
Fixes Hyperspace Fury softlock ( #5237 )
...
Fixes #5236
2024-08-21 11:43:57 -04:00
Eduardo Quezada
6ac18a6fe5
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-20 08:00:05 -04:00
Alex
bde6982890
Fixes weather abilities not activating when Cloud Nine user leaves th… ( #5209 )
...
* Fixes weather abilities not activating when Cloud Nine user leaves the field
* parametrize
2024-08-20 07:24:48 -04:00
PhallenTree
ec3a86dd9a
Adds in-battle effect of Pickup, adds Harvest and Pickup tests ( #5170 )
...
* Adds Harvest tests
* Adds Pickup in-battle effect + tests
* Fix G-Max Replenish test (Munchlax activates Pickup before G-Max Replenish)
* Change canPickupItem to bit field
* Make RandomUniformExcept inclusive (higher end) + convert bitfield
* Use CantPickupItem in PickupHasValidTargetc check
* Review
2024-08-16 15:37:23 +02:00
Eduardo Quezada
fe275ef062
Teatime animations use B_WAIT_TIME_LONG ( #5173 )
2024-08-15 13:45:01 +02:00
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) ( #5174 )
2024-08-14 19:48:20 -07:00
Eduardo Quezada
661ec0a9fd
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-14 17:10:20 -04:00
Alex
4d78d5e507
Fixes Poltergeist missing accuracy check ( #5168 )
2024-08-14 12:07:01 -04:00
Sadfish the Sad
fde85e9357
some gen 9 move anims + fickle beam rework ( #5159 )
...
* new move anims + fickle beam rework
* more fickle beam changes
* removed the true for consistency
* ficklebeamboosted gets cleared now
* mortal spin and thunderclap changes
* minor mortal spin pal change
* removed hex numbers and made hard press quicker
2024-08-14 17:20:18 +02:00
Eduardo Quezada
113f8de9b1
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_controller_player.c
2024-08-08 13:22:49 -04:00
PhallenTree
67f049fddb
Fixes Defiant interaction with Court Changed Sticky Web + Fickle Beam description ( #5093 )
...
* Fixes Court Changed Sticky Web deactivating Defiant/Competitive
* Fixes Fickle Beam's description
* Alternative fix
* Remove extra newLine
2024-08-06 10:45:30 +02:00
cawtds
3af93bdfee
FRLG+ whiteout message ( #4967 )
...
* FRLG whiteout message + post whiteout event
2024-08-02 08:28:05 -07:00
Eduardo Quezada
b4eca0a6ec
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# data/battle_anim_scripts.s
# src/battle_util.c
2024-07-29 09:36:16 -04:00
kittenchilly
904d59220d
Shorten squish anim
2024-07-28 11:55:57 -05:00
kittenchilly
9979fe01ac
Update battle_anim_scripts.s
2024-07-28 11:47:49 -05:00
kittenchilly
f22666c2a3
Merge branch 'master' into axekick-anim
2024-07-28 11:46:14 -05:00
Eduardo Quezada
18aff2db3b
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_anim_script.inc
# data/battle_anim_scripts.s
# include/constants/battle_anim.h
# src/battle_anim.c
# src/data/battle_anim.h
2024-07-27 16:26:37 -04:00
Eduardo Quezada
1e8773356c
Changed EVO_OVERWORLD_STEPS to use an EWRAM variable ( #5047 )
...
* Changed EVO_OVERWORLD_STEPS to use an EWRAM variable
* Fixed PC swapping not resetting the follower steps
2024-07-27 20:48:59 +02:00
hedara90
b0b63f66b9
Added Ivy Cudgel Animation ( #5034 )
...
* Added Ivy Cudgel Anim, changed Ogerpon palettes, added jumpifmovetypeequals command
* Make the 20 year old compiler not complain
* Maybe better cudgel
* Moved animation
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-26 18:06:44 +02:00
kittenchilly
b4792d3f7e
Add Axe Kick animation
2024-07-25 14:06:02 -05:00
Eduardo Quezada
98eb4e5027
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_script.inc
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/frontier_util.c
# test/battle/ai/ai.c
2024-07-19 09:20:05 -04:00
Alex
552e2768da
Fixes to Opportunist and Mirror Herb adjustments ( #4928 )
...
* Replace Opportunist todo tests with proper tests
* add failing test
* desc
* Fixes to Opportunist and Mirror Herb adjustments
* more tests
* some fixes
* first turn events switch
* simple enum + revert test desc
2024-07-19 11:01:46 +02:00
Bassoonian
cfcac0b0f9
Clean up battle scripts ( #4839 )
...
* Clean up battle and anim scripts
* Revert anim cleanup
2024-07-15 16:25:25 +02:00
Alex
edc883d038
Refactors residual damage ( #4945 )
...
* Refactors damage non types
* correction
* Refactor weather damage script
* new line
* correction
* there was a hail test already
* ndebug
* add sandstorm test
* Update src/battle_script_commands.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-07-13 12:12:40 +02:00
Eduardo Quezada
fb708b7ed3
Merge branch '_RHH/master' into _RHH/upcoming
2024-07-10 10:05:10 -04:00
hedara90
76d760041c
Flame Burst + Substitute fix ( #4939 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-10 13:58:32 +02:00
Eduardo Quezada
de609a2f5b
Added missing redirect abilities Gen 3-4 config ( #4920 )
...
* Added missing redirect abilities Gen 3-4 config
* Combined 3 Battle Script Natives into 1
* Cleaner FindMonThatAbsorbsOpponentsMove
2024-07-07 09:52:59 +02:00
Eduardo Quezada
fcdc9ed65a
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_util.c
# src/data/pokemon/species_info/gen_7_families.h
# test/battle/ability/download.c
# test/battle/ability/intimidate.c
# test/battle/ability/supreme_overlord.c
# test/battle/ability/zero_to_hero.c
# test/battle/ai/ai.c
# test/battle/move_effect/plasma_fists.c
2024-07-05 14:25:25 -04:00
Alex
dd7b735211
Fixes Grassy Terrain heal turn duration ( #4903 )
2024-07-03 22:53:15 +02:00
sneed
75be596933
fix sticky hold softlock ( #4885 )
2024-06-29 18:54:58 +02:00
DizzyEggg
f2e8482488
Fix how switch-in effects are played out after multiple faints in the same turn ( #4864 )
...
* Multiple switch-ins after fainting
* empty new lines
* Fix failing tests
2024-06-24 20:37:47 +02:00
AgustinGDLV
9797640dff
Gimmick Refactor ( #4449 )
...
* consolidated gimmick checks, triggers, communication, and activation; updated test runner
* fixed improper use of .usableGimmick
* cleaning up battle_dynamax.c, changing function args to u32s
* fixed '#ifdef TESTING' causing errors
* updated z-moves to use gimmick interface, pared down redundancies; no AI/tests
* added support for z-moves in tests, consolidated gimmick fields
* removed ShouldUseMaxMove and .usingMaxMove
* renamed TryChangeZIndicator, updated z move display
* added several z-move tests and fixed various z-move interactions; fixed z-move category calc
* fixed useless battler arg in GetTypeBasedZMove
* added basic test check for bad Z-Move or Mega usage
* reworked test runner gimmick functionality; added support for Ultra Burst + Z-Move to test Light That Burns the Sky
* fixed gimmick test logic; fixed damage category override
* fixed mega rayquaza test fail
* consolidated gimmick indicator logic; added graphics to gGimmicksInfo
* removed TeraData struct
* reimplemented AI logic for Z-Moves; no changes
* updated Z-Move and Ultra Burst trigger gfx
* added testrunner check for multiple gimmick use
* fixed duplicate z-move call in test
* reorganized data/graphics/gimmicks.h
* added signature Z-Move ability tests; implemented Guardian of Alola
* fixed bad test update
* fixed Thousand Arrows not affecting Tera Flying; clean-up
* fixed -ate tests
* fixed tera tests
* fixed tera tests really
* fixed last batch of tests
* fixed -ate mega test again
* code review
* code review pt.2
* tweaked CanTera again
* dynamax flag only required for player
2024-06-22 22:25:40 +02:00
DizzyEggg
d0bb03e5a9
Fix AI's right slot switching-in too early ( #4851 )
...
* apply safe switching to trainer doubles battles - with a config
* get rid of the config
* make it compile
2024-06-21 12:17:12 +02:00
Eduardo Quezada
4d6452e14e
Move general config file to the config folder ( #4805 )
2024-06-19 13:42:01 +02:00
Bassoonian
a24b767276
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into masterintoupcoming18jun
2024-06-18 15:27:06 +02:00
Bassoonian
d9001a7923
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge18jun
2024-06-18 11:04:40 +02:00
Jaizu
189d542520
Fix Steven partner battle post-battle script ( #2001 )
2024-06-17 15:44:52 -04:00
kittenchilly
a118b2caa8
Fix Booster Energy ability popup and message ( #4804 )
2024-06-14 20:22:26 -04:00
DizzyEggg
2716ec5b03
Fix Pursuit not getting Choice-locked on switch-out ( #4801 )
...
* Fix Pursuit not getting Choice-locked on switch-out
* use label
2024-06-14 12:46:03 +02:00
DizzyEggg
84d13d0abf
Fix Smack Down anim + move anim tests ( #4774 )
...
* Fix Smack Down anim + move anim tests
* really agbcc
* fix undefined reference
* hopefully everything works
2024-06-13 15:30:28 -04:00
Eduardo Quezada
06153e4280
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# include/battle.h
# include/constants/battle_script_commands.h
# include/constants/pokemon.h
# src/battle_ai_util.c
# src/battle_main.c
# src/battle_util.c
# test/battle/ai.c
2024-06-13 11:44:28 -04:00
DizzyEggg
2b64546a25
fix tectonic rage anim not clearing mon bg ( #4787 )
2024-06-13 13:45:11 +02:00
DizzyEggg
349b402f1b
Fix Soul-Heart changing stats of wrong battler ( #4785 )
2024-06-13 10:57:20 +02:00
Bassoonian
ff24d1e1bb
Add release to debug scripts ( #4782 )
2024-06-13 07:38:41 +02:00
Alex
9c72392891
Fixes Shell Side Arm ( #4753 )
...
* Fixes Shell Side Arm
* Fixes to random call
* hardcoded the effect to the move
* minor change
* minor change 2
* applied reviews
2024-06-12 11:21:44 +02:00
Bassoonian
dffaaeaaa6
Add Leader's Crest evolution method ( #4768 )
...
* Add Leader's Crest evolution method
* Fix typo in in HGSS dex
* Update src/pokedex_plus_hgss.c
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
* Update src/battle_script_commands.c
---------
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-06-12 09:31:59 +02:00
