Commit Graph

11732 Commits

Author SHA1 Message Date
LOuroboros
de05c4dd56 Implemented Good as Gold's effect 2022-12-06 05:23:29 -03:00
LOuroboros
e25f843db3 Implemented Quark Drive's effect
Also tweaked STRINGID_SUNLIGHTACTIVATEDABILITY and STRINGID_STATWASHEIGHTENED.
2022-12-06 05:23:29 -03:00
LOuroboros
a328088122 Implemented Protosynthesis' effect
Also turned GetHighestStatId into a global function since Protosynthesis' effect uses it.
2022-12-06 05:23:29 -03:00
LOuroboros
34cafa746c Implemented Electromorphosis' effect
Also added a battle preproc config to check if the STATUS3_CHARGED_UP was already applied.
Pokémon Scarlet and Violet don't check if this status flag was already applied on the target of abilities like Electromorphosis (and Wind Power until proven otherwise.)
As a result, the game will trigger the ability multiple times if they're hit by a multihit move.
This directive makes the code end the ability effect preemptively if the target does have the status flag applied.
2022-12-06 05:23:29 -03:00
LOuroboros
88cae380d0 Implemented Wind Power's effect 2022-12-06 05:23:29 -03:00
LOuroboros
c1e232cbf6 Implemented Rocky Payload's effect 2022-12-06 05:23:29 -03:00
LOuroboros
c43060fbfd Tweaked BattleScript_WellBakedBodyActivates and BattleScript_WindRiderActivatesMoveEnd 2022-12-06 05:23:29 -03:00
LOuroboros
4dc44150c5 Implemented Wind Rider's effect 2022-12-06 05:23:29 -03:00
LOuroboros
ca656b63b9 Added Well Baked Body's effect and misc. changes
-Added a modifybattlerstatstage macro to handle stat stages in battle.
-Rewrote the checks inside the case ABILITYEFFECT_MOVES_BLOCK of AbilityBattleEffects.
2022-12-06 05:21:24 -03:00
LOuroboros
eb082cd1a2 Implemented Purifying Salt's effect 2022-12-03 01:51:11 -03:00
LOuroboros
acb9c31bd4 Implemented Anger Shell's effect 2022-12-03 01:19:24 -03:00
LOuroboros
be71c4ca99 Implemented Thermal Exchange's effect 2022-12-03 01:15:31 -03:00
LOuroboros
b0027cb78b Implemented Seed Sower's effect 2022-12-02 23:31:41 -03:00
LOuroboros
8dd3fd025f Implemented Lingering Aroma's effect
And took the chance to tweak Mummy's.
2022-12-02 23:31:38 -03:00
LOuroboros
653364fd71 Added the basic data for the Gen. 9 Abilities 2022-12-02 23:01:22 -03:00
Eduardo Quezada D'Ottone
14e35a4831
Merge pull request #2466 from ghoulslash/be/slidefix
Set battler before BattleScript_TrainerSlideMsgRet
2022-11-29 22:22:19 -03:00
ghoulslash
6140cacbef set BS_SCRIPING before BattleScript_TrainerSlideMsgRet 2022-11-29 18:28:33 -05:00
Eduardo Quezada D'Ottone
816bc46694
Merge pull request #2456 from AsparagusEduardo/RHH/pr/sync/pretmerge_20221124
Gen 9 when? (Pret sync 2022/11/24)
2022-11-29 17:46:16 -03:00
Eduardo Quezada
9d1149c423 Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221124
# Conflicts:
#	src/pokemon.c
2022-11-29 17:40:09 -03:00
Eduardo Quezada D'Ottone
7ab3d37a7c
Merge pull request #2464 from ghoulslash/be/callnative
add callnative bs func, convert metal burst dmg calc
2022-11-28 16:16:04 -03:00
ghoulslash
510fb56d74 distinguish callnative vs. various macrso 2022-11-28 11:57:34 -05:00
ghoulslash
b869b836cc add callnative bs func, convert metal burst dmg calc 2022-11-28 10:34:27 -05:00
ghoulslash
1037613b0e
Merge pull request #2418 from LOuroboros/zPP
Made Z-Moves unusable without PP
2022-11-28 09:52:28 -05:00
ghoulslash
ac30ebd5a4
Merge pull request #2453 from AsparagusEduardo/RHH/pr/cleanup/configShiny
Refactored Shiny configs + cleanup
2022-11-28 09:51:39 -05:00
ghoulslash
33873eff6f
Merge pull request #2460 from LOuroboros/rareCandiesLv100
Allow Lv100 'mons to access level based evos
2022-11-28 09:48:55 -05:00
BuffelSaft
70a10ebda0
Merge pull request #2462 from AsparagusEduardo/RHH/pr/fix/cries
Fix cry table alignment due to missing placeholder Enamorus Therian cry
2022-11-27 02:12:38 +13:00
Eduardo Quezada
65a33ed442 Fix cry table alignment due to missing placeholder Enamorus Therian cry 2022-11-26 09:20:54 -03:00
LOuroboros
add75d84c0 Applied a couple of tweaks
-Made it so only Rare Candies can evolve Lv100 'mons. Game Freak dumb. The Exp. Candies SHOULD work too.
-Made sure to remove the candy that was used from the bag.
2022-11-25 18:12:51 -03:00
LOuroboros
53110a0ff6 Allow Lv100 'mons to access level based evos 2022-11-25 17:34:11 -03:00
Eduardo Quezada
e858b4e709 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124
# Conflicts:
#	include/battle.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_dome.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/battle_tower.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
2022-11-24 15:36:00 -03:00
GriffinR
004ce32da0 Sync text ctrl codes with pokefirered 2022-11-23 21:13:00 -05:00
Eduardo Quezada D'Ottone
b48f057fe7
Merge pull request #1589 from cynderquil/pokemon_expansion
Fix Bastiodon's second icon frame
2022-11-20 20:47:07 -03:00
GriffinR
4736b4b14d
Merge pull request #1810 from AsparagusEduardo/pret/pr/baseStatsRename
Renamed gBaseStats to gSpeciesInfo
2022-11-18 17:45:23 -05:00
GriffinR
5fa364256d
Merge pull request #1808 from AsparagusEduardo/pret/PR/numSides
Introduce NUM_BATTLE_SIDES
2022-11-18 17:39:00 -05:00
GriffinR
df470b75dd
Merge pull request #1817 from GriffinRichards/sync-wireless
Add cursor kind constants, sync wireless improvements
2022-11-17 15:18:20 -05:00
Eduardo Quezada
791c547b2c Renamed missing overworld debug configs 2022-11-14 14:07:32 -03:00
Eduardo Quezada
540f4679bb Implemented uses of Shiny config 2022-11-14 11:56:02 -03:00
Eduardo Quezada
011ec16f1e Organized conffig files into their own folder and cleaned up 2022-11-14 11:03:49 -03:00
Eduardo Quezada D'Ottone
49b7328d32
Merge pull request #2451 from eatthepear/patch-1
Fix Berries that were broken after Bug Bite fix
2022-11-12 17:26:29 -03:00
eatthepear
bd4b660983
Fix Berries that were broken after Bug Bite fix
Issue #2448 
Haven't tested extensively, but regular Berries work and Bug Bite w/ Berries also works.
I believe this line was missing by accident (you can look at the merged Bug Bite PR #2433 to see that this line was deleted and never replaced).
2022-11-11 21:28:44 -05:00
Eduardo Quezada D'Ottone
6197e76875
Merge pull request #2449 from LOuroboros/patch-1
Uncommented level up moves
2022-11-11 01:46:42 -03:00
LOuroboros
7260478c54 Uncommented level up moves 2022-11-11 01:31:22 -03:00
GriffinR
601bb0b578 Index gBattleFrontierHeldItems 2022-11-10 16:14:06 -05:00
GriffinR
3b1c8dfb17 Update list menu graphics 2022-11-09 19:44:58 -05:00
Eduardo Quezada D'Ottone
a2b355f2a4
Merge pull request #2422 from AsparagusEduardo/RHH/pr/sync/pretmerge_20221030
Support for Porymap 5.0.0 (pret merge 2022-10-30)
2022-11-09 20:15:15 -03:00
Eduardo Quezada
f2d0e547ac Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030
# Conflicts:
#	src/rom_header_gf.c
2022-11-09 19:54:44 -03:00
Eduardo Quezada
bd63ef18af Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
# Conflicts:
#	src/pokemon_storage_system.c
2022-11-09 19:33:26 -03:00
GriffinR
e434b0047f More missing constant usage 2022-11-09 15:53:47 -05:00
GriffinR
431a7ef8dd Add missing cursorKind field usage 2022-11-09 15:37:47 -05:00
GriffinR
1d1c2d41bb Add list menu cursor constants 2022-11-09 15:16:46 -05:00