Commit Graph

11527 Commits

Author SHA1 Message Date
Eduardo Quezada
271bff5675 Gen 5+ stat recalculate in the same party loop at the end of battle that changes forms. 2022-11-02 10:06:02 -03:00
Eduardo Quezada
8b0a848424 Zen Mode triggers at the beginning of a battle 2022-11-01 23:53:04 -03:00
Eduardo Quezada
15c12af2cf Using TryBattleFormChange in place of certain TryFormChange 2022-11-01 23:50:26 -03:00
Eduardo Quezada
797c5514d3 Mega Evolution in form change tables 2022-11-01 18:37:23 -03:00
Eduardo Quezada
fa8b1b9c05 Updated descriptions of form change constants 2022-11-01 15:02:45 -03:00
Eduardo Quezada
f5b900e2ef Defaults Primal Reversion indicator to Alpha when item not Red Orb. 2022-11-01 15:02:22 -03:00
Eduardo Quezada
a57f6d184b Fainting by poison in the overworld reverts forms 2022-11-01 12:24:04 -03:00
Eduardo Quezada
0a79390ec0 Primal Reversion in Form Change tables 2022-10-21 02:08:37 -03:00
Eduardo Quezada
861590f747 Form change when fainting. Goodbye UndoFormChange! 2022-10-20 18:53:12 -03:00
Eduardo Quezada
d8cc7f7abe Form change when switching out 2022-10-20 17:56:56 -03:00
Eduardo Quezada
b74f0777da Renamed form change constants 2022-10-20 17:22:58 -03:00
Eduardo Quezada
ff494edb85 Refactored ItemUseOutOfBattle_FormChange to not use secondaryId 2022-10-20 16:57:34 -03:00
Eduardo Quezada
620e69945d Form change for starting and ending battles. Adjusted PP for Iron Head/Behemoth moves 2022-10-20 16:40:24 -03:00
Eduardo Quezada D'Ottone
c57ab9e529
Merge pull request #2392 from gruxor/wait-fix
Replaced busy-wait loops
2022-10-17 15:34:22 -03:00
gruxor
610a8efb7d Replaced busy-wait loops 2022-10-17 11:21:06 -04:00
Eduardo Quezada D'Ottone
ffc5ffcfe5
Merge pull request #2390 from ghoulslash/be/psychocut
Improve psycho cut anim
2022-10-17 00:41:01 -03:00
ghoulslash
a585d56053 fix whitespace 2022-10-16 23:39:12 -04:00
ghoulslash
71023512fd update psycho cut anim 2022-10-16 19:20:24 -04:00
ghoulslash
ede6162724
Merge pull request #2388 from AsparagusEduardo/RHH/pr/running
Config for running indoors
2022-10-16 09:28:32 -04:00
ghoulslash
e3f37ad825
Merge pull request #2389 from AsparagusEduardo/RHH/pr/FixZMove
Fixed Z-Move not being cleared if Pokémon faints
2022-10-16 09:27:23 -04:00
Eduardo Quezada D'Ottone
dd2d6107bd Fixed Z-Move not being cleared if Pokémon faints 2022-10-16 09:57:21 -03:00
Eduardo Quezada D'Ottone
4cbc6d4de1 Config for running indoors 2022-10-14 22:31:45 -03:00
Eduardo Quezada D'Ottone
068422bc3f
Merge pull request #2386 from LOuroboros/patch-1
Uncommented evo moves for each species
2022-10-14 12:00:56 -03:00
LOuroboros
8a1a561b80
Uncommented evo moves for each species 2022-10-14 11:28:15 -03:00
ghoulslash
d64e18d0b4
Merge pull request #2385 from LOuroboros/trainerClassBasedBalls
Added class-based Poké Balls for trainers
2022-10-14 10:19:20 -04:00
LOuroboros
90f79999bb Added class-based Poké Balls for trainers
Thanks to Ghoulslash for helping me optimizing things.
2022-10-14 11:14:30 -03:00
Eduardo Quezada D'Ottone
71dad6aec9
Merge pull request #2384 from May8th1995/confuseAI
Fix AI issue giving decrementing score to confuse hit instead of confuse
2022-10-13 12:16:00 -03:00
tennis
db013aab0b Fix AI issue giving decrementing score to confuse hit instead of confuse 2022-10-13 15:58:57 +01:00
Eduardo Quezada D'Ottone
839d7063fe
Merge pull request #2383 from May8th1995/badgeFlagBug
Fix bug where badge boosts apply in all gens but gen 3.
2022-10-13 11:45:18 -03:00
tennis
f79205af08 Fix bug where badge boost flag is inverted 2022-10-13 15:32:08 +01:00
ghoulslash
6363e61043
Merge pull request #2381 from AsparagusEduardo/RHH/1.2.0
Version 1.2.0
2022-10-07 18:33:00 -04:00
Eduardo Quezada D'Ottone
2ce340e8e1
Merge pull request #2262 from LOuroboros/becomingAHero
Fixed Mega Evolved Pokémon being able to get Friendship effects in battle
2022-10-07 18:27:29 -03:00
LOuroboros
589c969e89 Removed unused access to struct MegaEvolutionData in GetBattlerFriendshipScore 2022-10-07 18:20:00 -03:00
ghoulslash
06bddbac23
Merge pull request #2379 from AsparagusEduardo/RHH/pr/pretmerge_20221007
One for the go! (pret merge 2022/10/07)
2022-10-07 17:14:00 -04:00
ghoulslash
1a9f6abe99
Merge pull request #2380 from AsparagusEduardo/RHH/pr/feature/bWaitTime
Config for Battle text pause times
2022-10-07 16:32:29 -04:00
ghoulslash
9164f03f96
Merge pull request #2141 from Sneed69/Triple-Kick-Fix
Triple kick power calc rework
2022-10-07 16:31:50 -04:00
Eduardo Quezada
8ea060044a Battle text pauses config 2022-10-07 17:22:29 -03:00
Eduardo Quezada
2a8048b677 Removed ItemId_GetId like in upstream 2022-10-07 14:53:58 -03:00
Eduardo Quezada
68b474c0f0 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007
# Conflicts:
#	include/constants/items.h
#	src/battle_interface.c
2022-10-07 14:52:32 -03:00
ghoulslash
5f6e97af7f
Merge pull request #2283 from AsparagusEduardo/RHH/pr/pokemonConfig
Toggles for Pokémon species by generation
2022-10-07 13:24:13 -04:00
Eduardo Quezada
9b977486fe Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig
# Conflicts:
#	src/data/pokemon/base_stats.h
2022-10-07 14:05:45 -03:00
LOuroboros
50ca188cb2 Replaced didMegaEvo with a shiny new species flag 2022-10-07 12:32:36 -03:00
LOuroboros
02c6bc64b2 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into becomingAHero 2022-10-07 12:20:52 -03:00
ghoulslash
441586f23f
Merge pull request #2293 from AsparagusEduardo/RHH/pr/pokemonFlags
4 new species flags
2022-10-07 10:55:43 -04:00
ghoulslash
d7f7fa7d07
Merge pull request #2376 from AsparagusEduardo/RHH/pr/feature/ballsMulti
Changed ballMultiplier to account for future Hisuian ball multipliers
2022-10-07 10:48:02 -04:00
ghoulslash
1e04c80dfa
Merge pull request #2367 from AsparagusEduardo/RHH/pr/feature/MewTeach
Special handling for Mew's Teachable moveset
2022-10-07 10:39:56 -04:00
ghoulslash
7c7eb8ac7f
Merge pull request #2365 from AsparagusEduardo/RHH/pr/BattleArenaBide
Added missing Bide exception to Battle Arena Mind Points
2022-10-07 10:32:47 -04:00
ghoulslash
923046c993
Merge pull request #2359 from AsparagusEduardo/RHH/pr/pretmerge_20220925
I don't have any Sunday memes (pret merge 2022-09-25)
2022-10-07 10:25:59 -04:00
GriffinR
bb2e64b3fc
Merge pull request #1786 from tustin2121/patch-spritestuff
Subsprite Tables Documentation
2022-10-06 22:17:32 -04:00
tustin2121
ea168d1a6b Fix typo 2: revelations 2022-10-06 20:34:46 -04:00