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

13536 Commits

Author SHA1 Message Date
LOuroboros
5b1c31bbc9
Update tutor_learnsets.h 2022-05-10 12:39:36 -03:00
sneed
bceccf5474 changes 2022-05-10 08:17:31 +03:00
sneed
709f583390 Initial commit 2022-05-10 02:58:24 +03:00
Eduardo Quezada D'Ottone
f80bab897f
Merge pull request #2112 from AgustinGDLV/evo_battle 
Gen 8 Evolution Mechanics (Battle Engine)
 2022-05-09 17:40:19 -04:00
Eduardo Quezada D'Ottone
b43dfd5976
Quick formatting 2022-05-09 17:04:28 -04:00
Eduardo Quezada D'Ottone
b6922a1dab
Merge branch 'pokemon_expansion' into evo_overworld 2022-05-09 16:36:34 -04:00
AgustinGDLV
277f4a3751
niceties 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-05-08 21:23:06 -07:00
AgustinGDLV
502ce4bb33 fixed graphics bug and reverted last commit 2022-05-08 21:16:16 -07:00
AgustinGDLV
e50d5661cd removed unneccesary preproc 2022-05-08 20:57:12 -07:00
AgustinGDLV
54163240d8 implemented toggelable cancellation / multi-evo 2022-05-08 20:55:29 -07:00
ghoulslash
d5fe2240b8 fix IsAbilityPreventingEscape message in party menu 2022-05-08 21:07:44 -04:00
ghoulslash
07b0ce9737 add inner focus ability popup msg 2022-05-08 17:57:30 -04:00
Eduardo Quezada D'Ottone
13f9919b9e
Merge pull request #2123 from Sneed69/wikiberry_battle 
Update Confuse Berry Hold Effect (Battle Engine)
 2022-05-08 09:02:33 -04:00
sneed
eebfed20ad #elif 2022-05-08 09:58:06 +03:00
Ariel A
f576556df7 Merge branch 'romhack' into lighting 2022-05-08 01:49:59 -04:00
Ariel A
b5cf90a931 Fixed shadow brightness during orb effect. 2022-05-08 01:49:53 -04:00
Ariel A
40d610e29a Removed old debugPtr. 2022-05-08 01:32:17 -04:00
Ariel A
e8f3dcaa79 Fixed OrbEffect hanging when follower pokemon is out. 2022-05-08 01:28:12 -04:00
Eduardo Quezada
6684ec96ea Fixed dex showing incorrect moves when using PE and BE 2022-05-07 22:46:40 -04:00
Eduardo Quezada D'Ottone
c71b60d9f8 Merge branch 'PokemonExpansion' into PE_breedOverrides 
# Conflicts:
#	include/constants/pokemon_config.h
 2022-05-07 19:45:06 -04:00
Eduardo Quezada D'Ottone
989ec641f4
Merge pull request #2120 from ghoulslash/be/healblock 
Heal Block AI and Pollen Puff Selection Prevention
 2022-05-07 19:29:24 -04:00
sneed
f83875cf0f remove item expansion check 2022-05-07 23:34:38 +03:00
AgustinGDLV
7b0154336d
Merge branch 'battle_engine' into symbiosis 2022-05-07 13:26:21 -07:00
AgustinGDLV
fa334b21f7 minor tweaks 2022-05-07 13:18:25 -07:00
AgustinGDLV
9d222d3ab4 fixed gems and damage-reducing berries 2022-05-07 13:12:21 -07:00
sneed
d8256663e3 fix syntax 2022-05-07 22:12:10 +03:00
sneed
5592fa434a catch < gen7 with engine 2022-05-07 22:01:35 +03:00
sneed
4c8770fdc2 Update battle_util.c 2022-05-07 21:57:50 +03:00
sneed
7008c01f25 Update items.h 2022-05-07 21:41:21 +03:00
LOuroboros
195a290a98 Small corrections 2022-05-07 14:32:57 -03:00
ghoulslash
0172f84617
Merge pull request #2070 from AsparagusEduardo/PE_evoData 
Updated missing evolution and form change data
 2022-05-07 11:37:11 -04:00
ghoulslash
5dae95d8f8
Merge pull request #2096 from rh-hideout/revert-2095-CanMonLearnTMTutor 
Revert "Removed ternary from CanMonLearnTMTutor"
 2022-05-07 11:31:48 -04:00
ghoulslash
9fa4d916d3
Merge pull request #2055 from AsparagusEduardo/BE_configs 
Once again, Battle Configs
 2022-05-07 11:31:25 -04:00
ghoulslash
5456a87b83 fix pollen puff heal blocked battler in CanTargetBattler 2022-05-07 11:27:32 -04:00
Eduardo Quezada D'Ottone
dc25bc6145 Merge branch 'battle_engine' into BE_WhiteOutMoney 
# Conflicts:
#	include/constants/battle_string_ids.h
#	src/battle_message.c
 2022-05-07 11:16:34 -04:00
Eduardo Quezada D'Ottone
cbe73de8c8
Merge pull request #1861 from LOuroboros/primalReversionTweaks 
Primal Reversion Tweaks
 2022-05-07 11:04:23 -04:00
Eduardo Quezada D'Ottone
096fe3c11d Removed unecessary B_LEEK_ALWAYS_CRIT config 2022-05-07 10:56:31 -04:00
Eduardo Quezada D'Ottone
89816b62ba Added Sheer Cold accuracy change to ShouldTryOHKO 2022-05-07 10:38:16 -04:00
Eduardo Quezada D'Ottone
4e7ce0b663 Merge branch 'battle_engine' into BE_configs 
# Conflicts:
#	include/constants/battle_config.h
 2022-05-07 10:25:34 -04:00
ghoulslash
07579bd42b prevent ally pollen puff selection under heal block. add some ai checks for heal block 2022-05-07 09:56:32 -04:00
ghoulslash
adfb336a3f
Merge pull request #2105 from Sneed69/healblock 
Add missing Heal Block functionalities
 2022-05-07 09:13:18 -04:00
ghoulslash
e5b777695c
Merge pull request #2107 from Sneed69/steelbeam 
Steel Beam Move Effect Implementation
 2022-05-07 08:40:34 -04:00
ghoulslash
a88ed6562e
Merge pull request #2115 from AgustinGDLV/spotlight 
fixed spotlight function
 2022-05-07 08:23:13 -04:00
ghoulslash
f63a451517
Merge pull request #2110 from Sneed69/gen8rattled 
Gen 8 Intimidate triggers Rattled
 2022-05-07 08:20:39 -04:00
ghoulslash
52dff039b9
Merge pull request #2114 from AgustinGDLV/shed_shell 
fixed shed shell
 2022-05-07 08:15:10 -04:00
AgustinGDLV
2ffff788b4 fixed Fling 2022-05-06 22:29:40 -07:00
AgustinGDLV
542a0f07b4 fixed bug bite / bestow 2022-05-06 22:07:25 -07:00
BuffelSaft
3e645b1839 IsMoveAffectedByParentalBond supports dynamic move targeting 
Update IsMoveAffectedByParentalBond to properly handle Expanding Force.
 2022-05-07 14:37:02 +12:00
BuffelSaft
3e1934ebe3 Rework VARIOUS_IS_PARENTAL_BOND_LAST_STRIKE 
Make this more versatile by allowing it to check parentalBondOn instead of only checking if parentalBondOn == 2. Also, fix Dragon Tail/Circle Throw switching the target on the first hit.
 2022-05-07 14:20:37 +12:00
BuffelSaft
8693db632b Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-05-07 12:27:20 +12:00