ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,308 Commits 1 Branch 0 Tags 235 MiB
2e75325806
Commit Graph

8308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ghoulslash
8a9d28d97f
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-09-23 12:21:36 -06:00
ghoulslash
2cea541b2a
Update src/battle_script_commands.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-09-23 12:21:26 -06:00
ghoulslash
d4a153bf14
Update data/battle_scripts_1.s 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-09-23 12:21:16 -06:00
ghoulslash
3925c07c1a fix l graphic 2021-09-23 13:20:32 -04:00
ghoulslash
768598b154 fix bad merge 2021-09-23 12:22:36 -04:00
ghoulslash
33972b5493 merge with be 2021-09-23 12:04:13 -04:00
ghoulslash
3f34fec42f change last ball graphic based on config. replace saveblock field with ewram field 2021-09-23 12:03:01 -04:00
ghoulslash
6ec1a74948 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_move_effects 2021-09-22 21:51:45 -04:00
ghoulslash
936f2c7bcb fix eject pack weak armor special case 2021-09-22 21:51:37 -04:00
Eduardo Quezada D'Ottone
2c66aa84b6
Merge pull request #1378 from ghoulslash/gen8_move_effects 
Several Gen 8 Move Effects
 2021-09-22 22:48:29 -03:00
ghoulslash
9bf2ffe459 fix lash out stat fell 2021-09-22 21:15:02 -04:00
ghoulslash
d738297f24 merge with be 2021-09-22 16:26:09 -04:00
ghoulslash
3559a1b8e6 fix prankster + magic coat 2021-09-22 16:09:23 -04:00
ghoulslash
a10a8714fc
Merge pull request #1672 from rh-hideout/revert-1671-scaldThawConfig 
Revert "Scald thaw flag config for Gen 5"
 2021-09-22 11:48:29 -06:00
ghoulslash
f7b90bab93
Merge pull request #1670 from SBird1337/ai/expected-value 
[ai] use expected value move dmg calculation
 2021-09-22 10:15:37 -06:00
sbird
303e31ae25 [ai] use expected value to simulate EFFECT_PSYWAVE 2021-09-22 18:05:58 +02:00
ghoulslash
8cc0bb6ac0
Merge pull request #1652 from BuffelSaft/multi-hit-resist-berry 
Fix multihit moves vs damage reducing berries
 2021-09-22 09:42:53 -06:00
ghoulslash
a01690cd57
Merge pull request #1665 from BuffelSaft/download 
Fix Download
 2021-09-22 09:40:48 -06:00
Eduardo Quezada D'Ottone
707d49242e
Revert "Scald thaw flag config for Gen 5" 2021-09-22 12:31:23 -03:00
ghoulslash
fb17176a26
Merge pull request #1667 from AsparagusEduardo/fix_IllusionEgg 
Adds missing check for Egg in Illusion
 2021-09-22 09:01:31 -06:00
ghoulslash
c5eeab88dc
Merge pull request #1671 from AsparagusEduardo/scaldThawConfig 
Scald thaw flag config for Gen 5
 2021-09-22 09:01:11 -06:00
Eduardo Quezada D'Ottone
1795154754
Merge pull request #1668 from BuffelSaft/foulplay 
Fix Foul Play
 2021-09-22 11:49:42 -03:00
ghoulslash
1309eea8ec Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_move_effects 2021-09-22 09:43:48 -04:00
ghoulslash
13062b5a8f fix lash out, obstruct, and decorate 2021-09-22 09:43:40 -04:00
Eduardo Quezada D'Ottone
53d985eedd Scald thaw flag config for <Gen 5 2021-09-22 10:29:32 -03:00
ghoulslash
fc84ebbd3e redo prankster checks to handle assist 2021-09-22 08:06:42 -04:00
sbird
0ee13418dc [ai] use expected value move dmg calculation 2021-09-22 13:15:43 +02:00
BuffelSaft
35af7a9cc1 Fix Foul Play 
if != else if. Pretty sure I broke this when adding Body Press.
 2021-09-22 15:44:13 +12:00
Eduardo Quezada D'Ottone
b65b27c0dd Adds missing check for Egg in Illusion 2021-09-22 00:20:34 -03:00
Eduardo Quezada D'Ottone
9a72178fa2
Merge pull request #1548 from StubbornOne/battle_engine 
Add Telepathy's damage prevention effect
 2021-09-21 23:02:41 -03:00
Eduardo Quezada D'Ottone
f22e01b1d0
Merge pull request #1588 from BuffelSaft/burmy-form-change 
Implement Burmy form change
 2021-09-21 22:59:21 -03:00
Eduardo Quezada D'Ottone
7571d56140
Applied Egg's implementation of telepathy 2021-09-21 22:57:05 -03:00
Eduardo Quezada D'Ottone
287ffff2e2
Merge branch 'battle_engine' into burmy-form-change 2021-09-21 22:34:37 -03:00
BuffelSaft
6eced3f7a4 Fix Download 
Raises user's stat instead of a random target's, and determines stat boosts using the opposing Pokemon's stats.
 2021-09-22 11:53:44 +12:00
ghoulslash
80a48de702 ally cannot block prankster + perish song 2021-09-21 11:54:59 -04:00
ghoulslash
9c79ba05fc allies do not block prankster 2021-09-21 11:38:37 -04:00
Eduardo Quezada D'Ottone
f338813c6a
Merge pull request #1538 from DizzyEggg/double_onemon_battles 
Support for double battles with only one pokemon
 2021-09-20 23:40:08 -03:00
Eduardo Quezada D'Ottone
0da9bd9d5e
Merge pull request #1664 from ghoulslash/dex_search 
Add fairy to dex search
 2021-09-20 23:33:19 -03:00
ghoulslash
b38761e6a8 add fairy to dex search 2021-09-20 22:26:02 -04:00
ghoulslash
32d19a9b19 syntax fixes. add B_PRANKSTER_DARK_TYPES check to perish song 2021-09-20 21:36:10 -04:00
Eduardo Quezada D'Ottone
f82161c003
Merge pull request #1661 from arantonitis/battle_engine 
Fixed Nature Power move on different terrains.
 2021-09-20 21:07:22 -03:00
Ariel Antonitis
e037cb9276 Fixed Nature Power move on different terrains. 2021-09-20 19:06:48 -04:00
ghoulslash
0ea6c65b83 merge with be 2021-09-17 09:10:09 -04:00
ghoulslash
faa963fd04 merge with be 2021-09-17 09:07:38 -04:00
ultima-soul
58356fdcd6
Merge pull request #1358 from ghoulslash/misty_terrain 
Electric and Misty Terrain Effects
 2021-09-16 19:09:39 -07:00
ghoulslash
b916d7991c merge with be 2021-09-16 21:52:29 -04:00
ultima-soul
a4d3cf27ad
Merge pull request #1355 from ghoulslash/mental_herb 
Update Mental herb to Gen5
 2021-09-16 18:47:44 -07:00
ghoulslash
e756b0accc merge with be 2021-09-16 21:41:29 -04:00
ultima-soul
3f200d6ff9
Merge pull request #1339 from ghoulslash/gen8_hold_effects 
Add Several Hold Effects
 2021-09-16 16:41:15 -07:00
ghoulslash
40fcd257a0 fixes 2021-09-16 19:36:06 -04:00