Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,118 Commits 1 Branch 0 Tags
Commit Graph

289 Commits

Author SHA1 Message Date
Eduardo Quezada
afb1efe0d3 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_controller_player_partner.c
 2024-01-28 18:11:44 -03:00
Alex
9bcd46bce8
Fixes Pursuit, Tangling Hair interaction (#4086) 2024-01-28 19:15:53 +01:00
Bassoonian
b9a02b205d
Rename gItems and gAbilities to gItemsInfo and gAbilitiesInfo (#4068) 
* Rename gItems to gItemsInfo

* Rename gAbilities to gAbilitiesInfo

* Just fixing up my bad merge

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2024-01-26 15:25:52 -03:00
Eduardo Quezada D'Ottone
6d1d6a5d5f
Fixed test battle move category assumptions (#4051) 
* Fixed move category assumptions

* Update test/battle/ai_check_viability.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-24 10:43:57 +01:00
Eduardo Quezada
00e2ca6030 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
#	src/battle_ai_util.c
#	src/battle_script_commands.c
#	src/battle_tv.c
#	src/data/battle_moves.h
#	src/data/pokemon/species_info/gen_9.h
 2024-01-22 15:56:10 -03:00
Alex
0ec777dd24
Fixes Mind Blown / Magic Guard interaction and renames Steel Beam effect (#4043) 
* Fixes Mind Blown / Magic Guard interaction and renames Steel Beam effect

* review fixes

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-21 23:42:01 +01:00
Alex
b0c76563bf
Fixes Psychic Noise, Aroma Veil interaction in doubles (#4021) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-20 14:10:22 +01:00
Alex
9efdd9e0cd
Adds Move Shed Tail (#4016) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-18 00:14:18 +01:00
Alex
8f99ef16be
Adds Move Psychic Noise (#4005) 
* Adds Move Psychic Noise

* changes psychic noise from effect to move_effect

* remove leftover

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-16 22:52:56 +01:00
Alex
bb190d33dd
Fix stat drop in doubles for single target moves (#4003) 
* Fix stat drop in doubles for single target moves

* Update test/battle/move_effect/pay_day.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/pay_day.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/sp_atk_two_down.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/sp_atk_two_down.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2024-01-16 09:25:40 -03:00
Eduardo Quezada D'Ottone
ff0aed31b3
Removed some hardcoded move IDs (#3982) 
* Removed EFFECT_HURRICANE in favor of using EFFECT_THUNDER

* Added EFFECT_BLIZZARD

* Helping the IDE a little

* Added EFFECT_RAIN_ALWAYS_HIT for Forces of Nature moves

* Removed MOVE_SELF_DESTRUCT and MOVE_EXPLOSION hardcoding

* Removed EFFECT_FRUSTRATION hardcoding

MOVE_SELF_DESTRUCT

* Cleaned up sPoints_MoveEffect

* Removed MOVE_AURA_WHEEL and MOVE_PRESENT hardcoding

* Fixed compile
 2024-01-12 22:41:46 +01:00
Eduardo Quezada D'Ottone
e5b58b04b6
Renamed healBlockBanned to healingMove (#3981) 
* Renamed healBlockBanned to healingMove

* Fix fix
 2024-01-12 18:41:45 +01:00
Eduardo Quezada
33f34e91e9 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	data/battle_scripts_1.s
 2024-01-12 12:24:19 -03:00
Alex
6220a8ced9
Adds Clanging Sclaes test, reverts fix and few Parental Bond tests (#3973) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-12 01:43:43 +01:00
Biffalo XIII
2cc26d935a Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	data/battle_scripts_1.s
#	include/config/pokemon.h
#	src/birch_pc.c
 2024-01-11 19:51:11 -03:00
Nephrite
095decbd27 FINAL review changes 2024-01-12 07:25:51 +09:00
Nephrite
a76e3c70ba Applied more review fixes 2024-01-12 03:02:48 +09:00
Nephrite
3c93f97166 Apply suggestions from code review 
Thanks, Edu

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2024-01-12 02:13:55 +09:00
Nephrite
c4616739d8 Merge remote-tracking branch 'rhh/upcoming' into secondary_effects_overhaul 2024-01-11 00:35:35 +09:00
Nephrite
67e76f2b59 Some more review fixes + Fling fix 
Not the ideal solution but Fling now has a hardcoded check for Shield Dust and acts accordingly - a better long term solution inolves making a bunch of reusable MOVE_EFFECTS and rejigging attackcanceler but I didn't feel like doing that today...
 2024-01-11 00:27:06 +09:00
Nephrite
25f0179628 Review changes 
Numerous AI updates and test fixes; added a test for Aura Wheel
 2024-01-10 00:55:43 +09:00
Alex
5498098438
Syrup Bomb / Sticky Syrup addition (#3948) 
* Syrup Bomb / Sticky Syrup addition

* Update test/battle/move_effect/syrup_bomb.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update src/battle_script_commands.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-09 13:37:07 +01:00
Eduardo Quezada D'Ottone
0d75ccd2d2
Stuff Cheeks cleanup (#3950) 
Co-authored-by: Biffalo XIII <--global>
 2024-01-09 09:15:23 +01:00
Nephrite
ab75ad6d02
Ability flags update (#3886) 
* Added five ability flags

Omitted duplicate flags that are basically "can't copy" (Role Play, Receiver, Entrainment, Skill Swap), didn't bother adding Neutralizing Gas flag,

* Mold Breaker and Trace

* Gastro Acid, Simple Beam, Worry Seed

Decided to keep the Simple Beam/Worry Seed functions

* Entrainment done

* Skill Swap

* Doodle/Role Play + flag descriptions

Also adjusted Doodle test

* Wandering Spirit, Mummy, Neutralizing Gas

Neutralizing Gas really only needs to check for other mons with Neutralizing Gas, otherwise unsuppressable abilities are handled separately.

* Renamed flags
 2024-01-01 15:03:34 +01:00
Nephrite
0980253cce Merge branch 'upcoming' into secondary_effects_overhaul 2024-01-01 20:40:11 +09:00
Nephrite
923d22b42b Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into secondary_effects_overhaul_merge 2024-01-01 03:50:36 +09: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
Nephrite
9dfa0d264f Merge branch 'upcoming' into secondary_effects_overhaul 2023-12-30 23:54:01 +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
kittenchilly
66a638f7b4
Change Ivy Cudgel to be based on Ogerpon form rather than held item (#3865) 
* Change Ivy Cudgel to be based on Ogerpon form rather than held item

* Update ivy_cudgel.c

* Address reviews

* Update test/battle/move_effect/ivy_cudgel.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-30 11:40:58 +01:00
Nephrite
b6da1a1e1d Tweaked helper functions 2023-12-30 17:42:53 +09:00
Nephrite
f5ae8e0686 Rapid Spin uses additional effects + test 2023-12-30 17:02:59 +09:00
Martin Griffin
ab900e38df Merge remote-tracking branch 'rhh/master' into upcoming 2023-12-29 19:48:21 +00:00
DizzyEggg
604b823ffd
Missing Strength sap tests (#3860) 
* add missing strength sap tests

* a

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-29 13:39:54 +01:00
Nephrite
9d68f4ab6f Added Throat Chop test 
I don't know why it used to work through subs but now it won't
 2023-12-29 20:17:57 +09: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
Nephrite
417a02c95e Fixed Make it Rain 
To do: misc fixes here and there, maybe do Burn Up/Double Shock, Dragon Rage/SonicBoom...
 2023-12-29 01:40:43 +09:00
DizzyEggg
3e321d1172
fix ally switch dig issue (#3835) 2023-12-27 15:35:42 -05:00
Nephrite
77c722ea09 Obsoleted 22 more effects 
Also added a better way of calculating battle_tv score properly; to do: Make it Rain
 2023-12-27 17:43:20 +09:00
Nephrite
cd5c59ae5a Merge remote-tracking branch 'rhh/upcoming' into secondary_effects_overhaul 2023-12-26 13:19:10 +09: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
Alex
166a1a4e63
Adds ability Embody Aspect + minor fix to Hospitality (#3821) 
* Adds ability Embody Aspect + minor fix to Hospitality

* comment out failing tests related to neutralizing gas

* fixes neutralizing gas bug

* leftover
 2023-12-25 18:28:16 +01:00
Nephrite
b0b9883625 Removed unused effects + fixed tests + removed secondaryEffectChance 
To do: remaining moves that make use of `secondaryEffectChance` field
 2023-12-25 12:53:15 +09:00
Nephrite
cda445c2f5 Merge remote-tracking branch 'rhh/upcoming' into secondary_effects_overhaul_rebase 2023-12-25 12:19:38 +09:00
Nephrite
31b3337cda Updated moves that raise the target's own stats 
Modified tests to use MoveHasMoveEffect
 2023-12-24 23:52:08 +09:00
Zimmermann Gyula
f700466e8d
Implement optional Gen1 type immunity logic. (#3627) 
* Implement optional Gen1 type immunity logic.

* Add tests against Gen1 burn, freeze and paralysis.

* !fixup Expand tests with Gen1 paths.

* Fixup tests.

Remove superflous defines.
Explicitly ASSUME used move type and effect.

* Fix flipped definitions on Freezing Glare test.

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-23 16:34:24 +01:00
Alex
61e6365470
Fixes Photon Geyeser category + minor AI calc fixes (#3807) 2023-12-23 12:31:40 +01:00
Alex
63316daf30
Adds missing Doodle tests and fix (#3800) 2023-12-22 18:25:23 +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