ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-11 14:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,215 Commits 1 Branch 0 Tags 235 MiB
5019615be1
Commit Graph

748 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
5019615be1 Refactored Secret Power move effect into a function 2021-10-04 21:28:15 -03:00
Eduardo Quezada D'Ottone
b5e0a07932
Merge pull request #1704 from LOuroboros/battle_bond 
Implemented Battle Bond
 2021-10-02 20:07:35 -03:00
LOuroboros
a18b9c5b32 Quick tweaks 
-Use the species name for sText_AttackerBecameAshSpecies
-Make Battle Bond not activate if the opposing party doesn't have 2 members or more.
 2021-10-02 11:21:11 -03:00
BuffelSaft
57d2e21117 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into shields-down 2021-10-02 15:51:48 +13:00
BuffelSaft
611da31ae3 Fix form ID check 
The six here should be a seven, and replacing it with this function call is better than hard-coding it.
 2021-10-02 15:51:16 +13:00
Eduardo Quezada D'Ottone
13a464ffa4
Merge pull request #1673 from ghoulslash/gen8_move_effects 
Gen8 move effects Fixes
 2021-09-23 18:04:20 -03:00
ghoulslash
2f69748e0d merge with be 2021-09-23 14:38:01 -04:00
ghoulslash
94ec25319f syntax fixes. Use BlocksPrankster for perish song battle script 2021-09-23 14:35:37 -04: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
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
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
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
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
sbird
0ee13418dc [ai] use expected value move dmg calculation 2021-09-22 13:15:43 +02:00
ghoulslash
80a48de702 ally cannot block prankster + perish song 2021-09-21 11:54:59 -04:00
ghoulslash
32d19a9b19 syntax fixes. add B_PRANKSTER_DARK_TYPES check to perish song 2021-09-20 21:36:10 -04: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
ghoulslash
b916d7991c merge with be 2021-09-16 21:52:29 -04:00
ghoulslash
40fcd257a0 fixes 2021-09-16 19:36:06 -04:00
ghoulslash
806be64935 format fixes 2021-09-16 17:10:41 -04:00
ghoulslash
b6862a4153 fix jumptocalledmove for assist + attackcanceler 2021-09-16 14:01:19 -04:00
ghoulslash
9d8672e3df merge with be 2021-09-16 13:12:59 -04:00
ghoulslash
2067f563cd cannot block your own prankster elevated perish song 2021-09-16 11:47:05 -04:00
ghoulslash
aeafd9e222 perish song + prankster interaction 2021-09-16 11:34:01 -04:00
ghoulslash
85f3982fb9 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into prankster 2021-09-15 17:52:45 -04:00
ghoulslash
845e333ba1 fix electric/misty terrain interactions with yawn/rest failures 2021-09-15 17:11:42 -04:00
ghoulslash
aa475ab300 merge with be 2021-09-15 16:42:23 -04:00
ghoulslash
801ba039d6 fix red card 2021-09-14 19:18:53 -04:00
ghoulslash
c4ce4c150d fix eject pack 2021-09-14 15:38:16 -04:00
ghoulslash
60713a8f2d fix room service activation msg, stat target 2021-09-14 12:50:36 -04:00
ghoulslash
95af97593b fix some comment styling. fix throat spray for multi-target moves 2021-09-14 11:53:35 -04:00
ghoulslash
f3f26d1a6f merge with be 2021-09-13 19:40:28 -04:00
BuffelSaft
7d3980de58 Fix multihit moves vs damage reducing berries 
The extra waitmessage command is ugly but appears to be needed - if it's moved before the printstring, the message isn't displayed long enough on single hit moves.
 2021-09-12 18:33:04 +12:00
ghoulslash
6915b029bd fix echoed voice power boost 2021-09-09 11:15:58 -04:00
ghoulslash
875bc52d48 fix resist berry item print msg 2021-09-09 10:15:18 -04:00
ghoulslash
5c9c425590 fix power herb actiation message 2021-09-09 10:03:24 -04:00
ghoulslash
b8a71cabd1 merge with be 2021-09-09 09:44:18 -04:00
DizzyEggg
decf65a025
Merge pull request #1580 from ghoulslash/water_bubble 
Water Bubble Prevents Burn
 2021-09-08 20:00:45 +02:00
BuffelSaft
a4b630e6b5 Fix MOVE_EFFECT_REMOVE_STATUS 
Wake-Up Slap and Sparkling Aria now print the correct message when the target is cured.

Also, fix Ice Hammer's effect chance.
 2021-09-07 16:34:32 +12:00
ghoulslash
e93ad2e255 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into water_bubble 2021-09-06 09:24:28 -04:00
DizzyEggg
68c33895fd
Merge pull request #1622 from BuffelSaft/money-boost 
Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE
 2021-09-06 11:32:53 +02:00
DizzyEggg
cdec3077b2
Merge pull request #1630 from BuffelSaft/disguise2 
Fix many Disguise bugs
 2021-09-06 10:32:37 +02:00