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
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
kittenchilly
7f8f480ecb
Add FORM_CHANGE_BATTLE_TERASTALLIZATION + allow species to force tera types ( #4438 )
...
* Add FORM_CHANGE_BATTLE_TERASTALLIZATION and allow species to force tera types
* Fix form change not changing tera type
* Update form_species_tables.h
* Address reviews
* Can't change the forced Tera Type anymore
* Revert "Can't change the forced Tera Type anymore"
This reverts commit 67157250ef
2024-06-04 13:38:49 +02:00
cawtds
97143e020f
Refactor move animations ( #4683 )
...
* fix getboxmondata for evolutiontracker if compiled with agbcc
* refactored move animation scripts as part of gMovesInfo
* migration script for move anims
* default animation, migration for battle_anim_scripts.s
* added warning for missing animation
* add include to migration
* add struct member in migration script
* removed include and struct member from migration script
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-06-02 08:18:13 +02:00
hedara90
d999092689
Upgraded Dragon Darts Animation ( #4620 )
...
* Upgraded Dragon Darts Animation
* Fixed Dragon Darts not workin in link battles
* Apply suggestions from code review
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-05-28 10:17:52 +02:00
Alex
faf61e62fb
Adds move Spicy Extract ( #4211 )
...
* Adds move Spicy Extract
* remove uneeded line
* anim, new tests, acc change
* Clear Amulet, Contrary interaction
* ai
* correction
* simplify script a bit
* clean up
* Spicy Extract script overhaul
* merge rhh/upcoming
* alignment
* AI changes/additions
* add Foul Play check
* Remove useless ai checks
* remove wrong test
* review issues
2024-05-16 11:03:50 +02:00
Eduardo Quezada
ab682ce900
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/data/items.h
# src/pokemon_summary_screen.c
2024-05-15 09:58:21 -04:00
sneed
d71d5f7f1e
fix incorrect usage of ANIM_PLAYER_LEFT and _RIGHT ( #4560 )
2024-05-14 13:44:46 +02:00
Abbie Potter
da3d715f3b
Punchier tera animation ( #4507 )
...
* Punchier tera animation
* Removed testing comments
* Replaced VARIOUS_APPLY_TERASTALLIZATION with callnative
* Remove redundant arg from applyterastallization
2024-05-07 07:59:52 -04:00
kittenchilly
e19b05a3a9
Add Fog weather ( #4359 )
...
* Add Fog weather
* Update battle_string_ids.h
* Update battle.h
* some tweaks
* Update battle_anim_scripts.s
* Address reviews
* Update battle_util.c
* Update battle_util.c
* Update include/config/battle.h
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Address reviews, changes, fix bugs
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-04-17 12:06:49 -04:00
ghoulslash
ce99db0086
Generic Starting Battle Status Variable ( #4176 )
...
* setup generic starting battle status variable, ABILITYEFFECT_SWITCH_IN_STATUSES
* fix B_ANIM_TAILWIND, assign to starting statuses, and change B_VAR_STARTING_STATUS check for only the variable and not trainers
* Update src/battle_main.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Update src/battle_util.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Update src/battle_util.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* style fixes
* General_Room naims play SE
* fix sText_BizarreArenaCreated
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-02-14 10:05:37 +01:00
Eduardo Quezada
1720e1b129
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# data/battle_scripts_2.s
# src/data/pokemon/species_info/gen_9.h
2024-02-10 17:53:32 -03:00
Bassoonian
b4fa0b1bf0
Clean up space/tabs difference ( #4163 )
2024-02-10 14:43:14 -03:00
ZnogyroP
06f1f67903
Use shaketargetbasedonmovepowerordmg
2024-02-07 16:15:03 -05:00
ZnogyroP
e295d7346a
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into battle-anims
2024-02-07 16:10:00 -05:00
Alex
02e4154f0c
Electro Shot Animation ( #4148 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-02-07 11:26:23 +01:00
ZnogyroP
34067ac37f
A batch of gen 9 move anims
...
Animations for:
- Last Respects
- Lumina Crash
- Kowtow Cleave
- Torch Song
- Aqua Step
- Hydro Steam
- Tidy Up
- Pounce
- Trailblaze
- Chilling Water
- Rage Fist
- Temper Flare
- Psychic Noise
2024-02-06 13:58:25 -05:00
PCG
273110ebae
Jet Punch animation ( #4067 )
...
* Jet Punch animation
* Tabs
* Jet Punch anim makeover
* Fix anim glitch in doubles and whitespace
---------
Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
2024-02-06 07:55:08 -03:00
Eduardo Quezada
f89efad082
Merge branch '_RHH/master' into _RHH/upcoming
2024-02-05 17:52:34 -03:00
DizzyEggg
065c0ec588
Fairy Lock animation fix ( #4111 )
...
* Fairy Lock animation fix
* remove comment
* fairy lock anim hopefully works
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-02-04 23:23:03 +01:00
Alex
ab2774f8c7
Adds Dragon Cheer ( #4122 )
...
* Adds Dragon Cheer
* fix assumptions
---------
Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
2024-02-03 08:00:41 -07:00
ZnogyroP
71b49a114f
Adds move Upper Hand ( #4085 )
...
* Remove non-existent tilesets from label comments and alphabetize
* Fixed braces style
* gbagfx bit depth upconversion fix
* jsonproc: filter out every non-alphanumeric character
* fix(linking): link gflib/malloc.c at top of EWRAM in ld_script_modern.ld
* Adds move Upper Hand
* Requested changes
- Tabs / spaces where proper
- HitFromAtkString -> HitFromAccCheck
- Actually compiles now lol
- Moved assumes into relevant tests
- Cleaned up the check for TryUpperHand
* Fixed || positioning
* Update upper_hand.c
* Revert "Merge remote-tracking branch 'upstream/master' into upper-hand"
This reverts commit b21275dfe989b1ad1ea1
2024-02-01 12:23:58 +01:00
Alex
87472d4a6c
A few new gen 9 move animations ( #3989 )
...
* A few new gen 9 move animations
* draco meteor anim
tmp
* applied suggestions
* fix compile
* add more crystals to ice spinner
* further fixes
---------
Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
2024-01-16 19:33:49 -07:00
Biffalo XIII
4a3954ff34
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/birch_pc.c
# src/main.c
2024-01-09 09:19:12 -03:00
ghoulslash
91dfa93d3b
fix genie storm move anims for both targets, add AnimEllipticalGustCentered, AnimParticleInVortex handles multiple targets, add dynamic pals based on move target in UnpackSelectedBattlePalettes ( #3895 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-01-02 23:46:07 +01:00
Alex
cc32e378d6
Adds some Indigo Disk moves ( #3853 )
...
* Burning Bulwark
* Fickle Beam
* Alluring Voice
* Electro Shot
* forgot sheer force flag for alluring voice
* review changes
* additional alluring voice test
* Simple Allruing Voice animation
* Update battle.h
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-12-30 20:20:12 +01:00
Martin Griffin
ab900e38df
Merge remote-tracking branch 'rhh/master' into upcoming
2023-12-29 19:48:21 +00:00
Bassoonian
245026353d
Remove leftover TID placeholder move defines ( #3864 )
2023-12-29 18:59:14 +00:00
Bassoonian
fde3fc0a52
Metronome move fix ( #3852 )
...
* Draft Indigo Disk move data
* Add basic defines (flags, targets and priority missing)
* Update move flags
* Temper Flare is Stomping Tantrum
* Fix failing tests
* Disable Burning Bulwark for now
2023-12-28 16:57:29 +01:00
Bassoonian
872ddf32c6
The Indigo Disk Moves ( #3704 )
...
* Draft Indigo Disk move data
* Add basic defines (flags, targets and priority missing)
* Update move flags
* Temper Flare is Stomping Tantrum
* Forgot to push, please squash :D
* Fix failing tests
2023-12-28 12:21:52 +01:00
DizzyEggg
fcdc515be2
Fix rain dance/sunny day not blending opponent sprite ( #3785 )
2023-12-21 13:17:05 +01:00
DizzyEggg
6137db102e
Ally Switch ( #3533 )
...
* ally switch move animation
* Ally Switch anim done
* ally switch test and improve animation
* derp
* add ally switch known failing test for ally targeting moves
* moves which targetted ally fail after ally switch
* ally switch works like protect
---------
Co-authored-by: root <root@LAPTOP-3SNV7DEQ>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2023-12-20 15:26:28 +01:00
Zimmermann Gyula
df447c48d3
Realign battleanim array with battlemove array.
2023-12-19 19:03:23 +01:00
DizzyEggg
acec68fdb8
fix neutralising gas visual glitch ( #3746 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2023-12-17 00:41:50 +01:00
Eduardo Quezada
537f1c9235
Merge branch 'RHH/master' into RHH/upcoming
2023-12-16 20:13:15 -03:00
Alex
e339bc4f29
Fix Fiery Wrath anim ( #3739 )
2023-12-15 20:27:04 +01:00
Patrick Curran
f7ca839f23
EFFECT_CHILLY_RECEPTION ( #3379 )
...
* Chilly Reception Effect
* Wrap Chilling Reception Message Better
* Animation & Some Testing
* Remove Wimp Out cases from Chilly Reception tests
* Animation tweaks
* Battle Script Updates
* Created CheckPrimalWeather macro for Weather Effects
* Updated Chilly Reception logic to switch even if weather doesn't change
Testing Updates
* Fixed test: Move does not animate if weather fails to change
* Remove snow animation check during failure path test
* * Fix indentation
* Move Chilly Reception animation to always play (even when weather change fails)
* Updates to MoveSwitch and PartingShot to get closer to original logic
* Update BattleScript_EffectChillyReception logic
* * Move CHILLY_RECEPTION animation
* Test updates
* Fix Chilly Reception MESSAGE checks
---------
Co-authored-by: Patrick Curran <rapidnutcracker@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2023-12-06 17:11:13 +01:00
Alex
b9edbb429b
Adds combined pledge move effects ( #3336 )
...
* Adds combined pledge move effects
* added pledge status and various other fixes
* leftover
* fix triple arrow test tag
* pledge moves can not be redirected by absorbing abilities
* more pledge changes
* remove duplicate test
* Stab boost, Rainbow anim and new SeaOfFire anim
* leftover
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-11-21 16:23:22 +01:00
kittenchilly
85e75a72c6
Update affection mechanics to gen 8+ ( #3495 )
...
* Update affection mechanics to gen 8+
* Update battle.h
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-11-14 21:29:38 +01:00
Alex
2b9f6b350e
Move animations. Credits to Captain-Ford ( #3529 )
...
Co-authored-by: DizzyEggg <16259973+DizzyEggg@users.noreply.github.com>
2023-11-06 12:31:43 +01:00
Alex
f2fddf4ee1
Syrup Bomb move and special speed drop anim, Credits to Dat.H A ( #3474 )
2023-10-27 19:14:45 -03:00
Eduardo Quezada D'Ottone
6585a62b13
Dynamax Cleanup ( #3435 )
...
* Mon animation names
* Moved indicator code so it follows the same standards as the other indicators
* Whitespace
* Fixed modern compile
* Fixed issue that caused Low Key Toxtricity learning Amped moves when Gigantamaxed
2023-10-23 11:39:22 +01:00
kittenchilly
d495e177b9
Add Snow weather animation ( #3440 )
...
* Snow weather animation
* Update battle_anim_scripts.s
* Apply changes from review
2023-10-22 21:15:07 +02:00
Eduardo Quezada
c0540a3559
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
...
# Conflicts:
# include/battle.h
# include/constants/battle_move_effects.h
# include/constants/battle_string_ids.h
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
2023-10-15 00:30:00 -03:00
DizzyEggg
a7b9d139da
Fix Wall Werrors on modern ( #3412 )
...
* Fix Wall Werror errors
* fix hgss pokedex modern errors
* tests build on modern
* learnset change
* Update src/battle_ai_util.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* Update src/battle_anim_new.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* Update src/debug.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* Update src/debug.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* Update src/pokedex_plus_hgss.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* review changes
* unused cmd args
* various args back
---------
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
2023-10-13 18:39:35 +02:00
Eduardo Quezada
92301398bc
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
...
# Conflicts:
# asm/macros/battle_script.inc
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/battle.h
# include/battle_controllers.h
# include/battle_interface.h
# include/config/battle.h
# include/constants/battle.h
# include/constants/battle_anim.h
# include/constants/battle_move_effects.h
# include/constants/battle_string_ids.h
# include/data.h
# include/random.h
# sound/cry_tables.inc
# src/battle_anim_new.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/species_info.h
# src/data/text/move_names.h
# test/test_runner_battle.c
2023-10-09 16:51:41 -03:00
kittenchilly
b5f7a51351
Add Teal Mask item, move, and ability data ( #3349 )
2023-10-08 15:56:09 -03:00
