ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,192 Commits 1 Branch 0 Tags 235 MiB
ceffaa4e76
Commit Graph

8192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
c2e0990aab fix some merge conflicts 2021-09-16 13:29:36 -04:00
ghoulslash
9d8672e3df merge with be 2021-09-16 13:12:59 -04:00
ghoulslash
ac42b19de7 some formatting fixes 2021-09-16 11:54:27 -04:00
ghoulslash
a50f03a06b magic bounce overrides prankster blockage 2021-09-16 11:53:24 -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
f61d516aad some syntax/format fixes 2021-09-15 17:15:50 -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
705b765067 update multistring chooser labels in GetMentalHerbEffect 2021-09-15 14:51:24 -04:00
ghoulslash
0bca01cb74 mental herb fixes 2021-09-15 12:56:58 -04:00
ghoulslash
b85586a33a merge with be 2021-09-15 12:54:39 -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
55c3e152cf replace some BufferStatChange, fix room service and terrain seeds 2021-09-14 15:07:15 -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
StubbornOne
b21740b757
Merge branch 'rh-hideout:battle_engine' into battle_engine 2021-09-10 10:09:09 +08:00
ghoulslash
0cd7f3ffcd
Merge pull request #1635 from rh-hideout/DizzyEggg-galvanize_explosion 
fix galvanize explosion + lightning rod
 2021-09-09 12:04:42 -06:00
DizzyEggg
c5b810b508
Merge pull request #1643 from ghoulslash/echoed_voice 
better echoed voice power boost
 2021-09-09 19:59:45 +02:00
ghoulslash
f9cc09dc48 tweak formula 2021-09-09 13:54:16 -04:00
ghoulslash
92429c7649 better echoed voice power boost 2021-09-09 13:38:46 -04:00
ghoulslash
9d3f906fda
Merge pull request #1537 from DizzyEggg/intimidate_popup 
Fix lag caused by ability pop-up while it's set to False
 2021-09-09 09:34:50 -06:00
DizzyEggg
90c837deb6
Merge pull request #1642 from ghoulslash/echoed_voice 
Fix echoed voice power boost
 2021-09-09 17:32:27 +02:00
ghoulslash
6915b029bd fix echoed voice power boost 2021-09-09 11:15:58 -04:00
DizzyEggg
9ad4feecf2
Merge pull request #1641 from ghoulslash/power_herb 
Fix Item Activation Messages
 2021-09-09 16:29:40 +02: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
d7938bc2dc Merge branch 'prankster' of github.com:ghoulslash/pokeemerald into prankster 2021-09-09 09:44:25 -04:00
ghoulslash
b8a71cabd1 merge with be 2021-09-09 09:44:18 -04:00
DizzyEggg
4c9660bff1
Merge pull request #1579 from ghoulslash/embargo 
Add Embargo Effect
 2021-09-08 20:03:08 +02:00
DizzyEggg
decf65a025
Merge pull request #1580 from ghoulslash/water_bubble 
Water Bubble Prevents Burn
 2021-09-08 20:00:45 +02:00
DizzyEggg
6a8f55dabf
fix galvanice explosion 2021-09-08 12:38:46 +02:00
ghoulslash
acee60ff3c
Merge pull request #1633 from BuffelSaft/smellysalt 
Fix MOVE_EFFECT_REMOVE_STATUS
 2021-09-07 06:34:45 -06:00
BuffelSaft
bd92552fb6 Add new line to burn was healed string 2021-09-07 16:39:42 +12:00