psf
bf8b09b1b6
Item Ball refactor / Pluralize item names for giveitem and finditem ( #3942 )
...
* Emptied out item_ball_scripts
Added GetObjectEventTrainerRangeFromTemplate
Added Common_EventScript_FindItem
* Replaced trainer_sight_or_berry_tree_id with item constant
Replaced scripts with Common_EventScript_FindItem
* Renamed to GetItemBallIdAndAmountFromTemplate
Moved to item_ball.c
* Updated ObjectEventTemplate
* Updated inc files to support plural item names
* Refactored CopyItemNameHandlePlural to handle all items
* Change failsafe in GetItemBallIdFromTemplate to be ITEM_NONE + 1 instead of ITEMS_COUNT
* Converted spaces to tabs
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415663
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415525
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415409
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415130
* Added warning on object_event macro to prevent silent failure
Reverted global.fieldmap to original state, per feedback
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-14 21:35:45 +01:00
Nephrite
c4616739d8
Merge remote-tracking branch 'rhh/upcoming' into secondary_effects_overhaul
2024-01-11 00:35:35 +09:00
Nephrite
daeba066e0
Fixed SetMoveEffect + Sheer Force
2024-01-02 05:51:40 +09:00
DizzyEggg
b83b1f7e88
Merge branch 'upcoming' into feature/dynmulti-expansion
2023-12-30 22:41:59 +01:00
Nephrite
9dfa0d264f
Merge branch 'upcoming' into secondary_effects_overhaul
2023-12-30 23:54:01 +09:00
Nephrite
ff51eb2b6c
Removed unused move effects, various ids, and one script command
2023-12-30 20:35:48 +09:00
Nephrite
e34373effc
Renamed seteffectwithchance to setadditionaleffects
...
Function no longer has ability to apply effects from moveEffect - for that, seteffectprimary or secondary is now recommended. Removed EFFECT_RAMPAGE, updated a few tests
2023-12-30 20:29:09 +09:00
Nephrite
be2e3cf056
Updated primary/secondary macros
...
Makes things just a little easier to keep track of where move effects are being set and run
2023-12-30 19:41:03 +09:00
Nephrite
e7de08eca2
Unified Sonic Boom & Dragon Rage
...
Not really in scope, but what the hell
2023-12-30 15:40:50 +09:00
Martin Griffin
ab900e38df
Merge remote-tracking branch 'rhh/master' into upcoming
2023-12-29 19:48:21 +00:00
Nephrite
39773c0659
Burn Up and Double Shock
...
Both working by applying an additional effect; added a generic "jumpifnotcurrentmoveargtype" type command to make it possible, relpacing secret power's function
2023-12-29 12:44:38 +09:00
kittenchilly
94a650a203
Add Fillet Away + Belly Drum tweaks ( #3616 )
...
* Add Fillet Away
* Fillet Away and Belly Drum tests
* More tests
* Update fillet_away.c
* Update fillet_away.c
* Newlines
* Update battle_scripts_1.s
* Update belly_drum.c
* Address reviews
* Fix order
* Swords Dance assume
* Update belly_drum.c
* Try some stuff
* Fix hp not being halved in certain cases
* Update battle_scripts_1.s
* AI stuff
2023-12-28 23:27:09 +01:00
Martin Griffin
3ad66028e9
Backwards-compatible BoxPokémon Refactor ( #3438 )
...
* Check progress in non-battle PARAMETRIZEd tests
* Overworld Script Tests
* Backward-compatible BoxPokemon Refactor
Reuses space that contains zeros to provide space for:
- HP/status in the box
- 12-character nicknames
- Up to 63 PokéBalls
- Shininess separate from PID
- Hidden Nature
- Hyper Training
- Dynamax Level
- Gigantamax Factor
- Terastallization Types
- Shadow
Implements:
- OW_PC_HEAL to switch between Gen7- and Gen8+ behavior
- Nature Mints
- Dynamax Candy
- Hyper Training commands (canhypertrain/hypertrain)
- Gigantamax Factor commands (hasgigantamaxfactor/togglegigantamaxfactor)
- Terastallization Type on the summary screen
- Prevents Gigantamax Factor Pokémon from evolving into a species without a Gigantamax form
* fixup! Backward-compatible BoxPokemon Refactor
* displaydexinfo fix from Jasper
2023-12-27 17:48:17 +01:00
sbird
c27ea10eb1
Merge branch 'feature/dynmulti' into feature/dynmulti-expansion
2023-12-26 14:22:49 +01:00
Nephrite
c5061f0161
Updated remaining moves which use secondaryEffectChance
...
secondaryEffectChance is no longer considered anywhere in the code; tidied up scripts and more
2023-12-26 13:12:11 +09:00
Nephrite
76b4e08e5e
Trapping moves, Secret Power, rampage moves
...
Also tidied up a lot of #ifs and commas in battle_moves.h
2023-12-26 10:46:11 +09:00
Nephrite
cda445c2f5
Merge remote-tracking branch 'rhh/upcoming' into secondary_effects_overhaul_rebase
2023-12-25 12:19:38 +09:00
Alex
61e6365470
Fixes Photon Geyeser category + minor AI calc fixes ( #3807 )
2023-12-23 12:31:40 +01:00
kittenchilly
505b8b63eb
Add Doodle + update ability banlists ( #3609 )
...
* Add Doodle
* Doodle test
* Oops
* Update battle_util.c
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-12-22 16:45:55 +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
Eduardo Quezada D'Ottone
442620cf6b
Renamed Battle Move "Split" to the proper "Category" ( #3774 )
2023-12-20 10:08:26 +01:00
Alex
65bfab1a38
rename Cmd_jumpifaffectedbyprotect
2023-12-16 09:48:41 +01:00
Bassoonian
0fd08a32ac
Add status form change
2023-12-15 11:17:35 +01:00
Eduardo Quezada
b2917fac5d
Merge remote-tracking branch '_RHH_origin/master' into RHH/upcoming
...
# Conflicts:
# include/constants/battle_script_commands.h
# src/battle_script_commands.c
2023-12-10 14:29:42 -03:00
Alex
628eb95925
Adds Rage Fist ( #3573 )
...
* Adds Rage Fist
* Fix initial implementation
* fix merge
* review changes
* endure test
* add field enduredDamage
* rage fist: transform, disguise and field change
* merge fix
2023-12-10 12:33:25 +01:00
Alex
d5f3df6f08
Fix Defog and Prevent Escape effects ( #3668 )
...
* Fix Defog and Prevent Escape effects
* pain split / mirror coat interaction
* remove unused various define
* use pain split effect
* remove test
2023-12-10 00:26:03 +01:00
Eduardo Quezada
d076193b9f
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# asm/macros/battle_script.inc
# include/constants/battle.h
# include/constants/battle_script_commands.h
# src/battle_script_commands.c
# src/data/battle_moves.h
2023-12-03 16:39:32 -03:00
Alex
4bde378c0d
Fixes Floral Healing + Tests ( #3604 )
2023-11-29 13:57:29 +01:00
sbird
cefb05bdec
[dynmulti] left/top read from variables
2023-11-29 13:19:37 +01:00
psf
fe16a2cdee
Port pokefirered's Vs. Seeker to pokeemerald ( #3256 )
...
* First version of Vs. Seeker
* Update movement.inc
98f7e9978d (r1306721924)https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722004
* Update field_effect_scripts.s
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722024
* Update item_use.h
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722401
* Update movement_action_func_tables.h
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722828
* Update event_object_movement.c
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722887
* Update overworld.c
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306723396
* Update vs_seeker.h
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306724158
* Update vs_seeker.c
Addressed some cleanup comments from SBird
* Update UpdateRandomTrainerRematches
Fixed typo in ClearAllTrainerRematchStates
Fixed types in GetRematchableTrainerLocalId
* Updated UseVsSeekerEffect_2
* Updated UseVsSeekerEffect_3
* Updated UseVsSeekerEffect_4
* Fixed bug that allowed Vs Seeker to be used indoors in correct places
Moved VsSeeker function declarations into header
* Refactored FieldUseFunc_VsSeeker
* Added curly braces to else case in FieldUseFunc_VsSeeker
* renamed data[x] in Task_ResetObjectsRematchWantedState
* Refactored Task_ResetObjectsRematchWantedState
* Refactored VsSeekerResetObjectMovementAfterChargeComplete
* Refactored ResetMovementOfRematchableTrainers
* Refactored GatherNearbyTrainerInfo
* Refactored Task_VsSeeker_3
* CanUseVsSeeker
* Refactored GetVsSeekerResponseInArea
* GetCurVsSeekerResponse refactored
* Cleaned up GetTrainerFlagFromScript
* Gave sensible names to Task_VsSeeker
* Fixed two bugs where player would not have the right gfx state after using VsSeeker on a Bike or Underwater
* Renamed UseVsSeeker Functions
* Added I_VS_SEEKER_CHARGING to make Vs. Seeker broken until flag is assigned
Removed extra VsSeeker animation code
* Addressed PR feedback
* Fixed issue with building non-modern
* Refactored GetRunningBehaviorFromGraphicsId and renamed to GetResponseMovementTypeFromTrainerGraphicsId
* Addresses Lunos's PR feedback: https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1623547850
Removed the check to see if a map was not indoors to improve readability
Made IsValidLocationForVsSeeker into a static function
* Added changes in response to Jasper's feedback
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1725276522
* Updated with Edu's discord feedback https://discord.com/channels/419213663107416084/1135040810082123907/1176872015085453392
* Removed ifdef tags around the repo unless needed
b5dc744ced
2023-11-26 18:58:43 +01:00
Nephrite
4058d16f2f
2-Turn moves + unique moves with secondary effects
...
Two turn moves (Bounce, Freeze Shock, Sky Attack, Shadow/Phantom Force), Dire Claw, Stone Axe, Ceaseless Edge, Wicked Torque, Relic Song, Fake Out,
2023-11-25 23:56:17 +09:00
Nephrite
d9f64b7537
Fixed seteffectwithchance
...
Now has the ability to loop over multiple effects without causing problems - requires a maybe controversial macro modification...
2023-11-23 17:08:30 +09:00
Bassoonian
a7beed5b25
Dynamax messages ( #3581 )
...
* Dynamax messages
* Convert various to callnative
* Remove battler argument from callnatives
* Rename i variable
* Fix missing else
2023-11-21 19:18:18 +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
Alex
5fa1bffa8d
Adds Glaive Rush, fixes for Plasma Fists and Relic Song ( #3476 )
...
* Adds Glaive Rush
* Fixes: Glaive Rush status is removed until users next turn
* Glaive Rush no affect
* simplify glaive rush script
* simlify script further
* leftover
* Fix Plasma Fists and Relic Song + tests
* Callnative for Plasma Fists
* Use Status Field Ion Deludge for Plasma Fists
* add assumes for flinch_status
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-11-18 15:19:38 +01:00
Alex
f6781a77d4
merge rhh/upcoming
2023-10-25 09:42:19 +02:00
Eduardo Quezada
1137d54b61
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# asm/macros/battle_script.inc
# src/battle_script_commands.c
2023-10-23 17:36:42 -03:00
LOuroboros
cd59e055c2
Made Reflect Type handle 3rd types ( #3303 )
...
* Made Reflect Type handle 3rd types
Misc:
-Turned VARIOUS_TRY_REFLECT_TYPE into a callnative (BS_TryReflectType)
-Introduced a macro to to check for typeless Pokémon (Pokémon who have Mystery in all 3 type slots) in battle.
-Made the new BS_TryReflectType take into account the forms for Arceus and Silvally, rather than just their default form.
2023-10-23 10:08:36 +01:00
Alex
bf56ea8a8b
apply suggestions
2023-10-22 19:46:31 +02:00
LOuroboros
620998e68d
Added a macro to flush the text box in battles
2023-10-21 17:28:43 -03:00
Alex
91b6722322
Octolock, more tests
2023-10-18 20:25:34 +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
Eduardo Quezada
566ec93492
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# asm/macros/battle_script.inc
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
# include/constants/battle_script_commands.h
# include/constants/battle_string_ids.h
# src/battle_script_commands.c
# src/data/battle_moves.h
2023-09-24 20:32:45 -03:00
LOuroboros
35e76e9868
Fixed Ice Spinner, refactored battle terrain text string tables and ditched EFFECT_REMOVE_TERRAIN ( #3247 )
...
Co-authored-by: Alex <alexthenotes@gmail.com>
2023-09-24 00:01:18 -03:00
Alex
a073e7bd59
Adds Gigaton Hammer and Salt Cure ( #3297 )
2023-09-15 11:18:47 -03:00
Eduardo Quezada
3333395ff7
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/variousGone1
...
# Conflicts:
# include/constants/battle_script_commands.h
# src/battle_script_commands.c
2023-09-07 15:54:55 -03:00
Eduardo Quezada
820113d883
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/battle_scripts.h
# include/battle_util.h
# src/battle_script_commands.c
# src/battle_util.c
2023-09-07 15:13:06 -03:00
DizzyEggg
cfd802423b
Fling fixes and tests ( #3191 )
...
* begin fling tests
* fling fixes and tests
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* scripts names change
* fix fling's test file
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-09-05 06:56:36 -03:00
Eduardo Quezada
c4553c71aa
5 more callnatives
...
- jumpifshelltrap
- jumpifemergencyexited
- jumpifrodaffected
- jumpifabsorbaffected
- jumpifmotoraffected
2023-08-31 23:43:48 -04:00
Eduardo Quezada
4ac61ad15f
handleultraburst, handleprimalreversion, handlemegaevo
2023-08-31 22:34:57 -04:00
