ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-29 13:50:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,270 Commits 1 Branch 0 Tags 235 MiB
07bdd2ffe6
Commit Graph

87 Commits

Author SHA1 Message Date
BuffelSaft
07bdd2ffe6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2021-10-09 15:18:51 +13:00
BuffelSaft
fbc4d7584e
Merge pull request #1610 from LOuroboros/primalAbilities 
Implement Desolate Land, Primordial Sea and Delta Stream
 2021-10-08 20:01:09 +13:00
LOuroboros
b85b3094c8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalAbilitiesDev 2021-10-03 07:05:56 -03:00
Eduardo Quezada D'Ottone
57ea20bc6d Implemented modern effect of struggle with config 2021-10-02 13:32:36 -03:00
BuffelSaft
530998c4b7 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2021-09-23 16:41:35 +12:00
BuffelSaft
2f03ac31b9 Multihit refactor and Parental Bond 
Port multihit system from the CFRU, implement Parental Bond, refactor certain moves as required and implement all remaining multi hit moves except Dragon Darts.
 2021-09-23 14:31:21 +12:00
ghoulslash
9d8672e3df merge with be 2021-09-16 13:12:59 -04:00
BuffelSaft
bdbb4b5f7e Fix many Disguise bugs 
Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.
 2021-09-06 18:27:42 +12:00
LOuroboros
9e4f33d09e Implemented Desolate Land, Primordial Sea and Delta Stream 2021-08-27 17:56:43 -03:00
ghoulslash
a37d4c3da9 merge with be, give life dew jungle healing effect 2021-07-25 08:22:05 -06:00
ghoulslash
c3e28e9b1a merge with be 2021-05-23 12:22:52 -06:00
ghoulslash
54b03a474d fix SIDE_STATUS_SCREEN_ANY 2021-05-23 12:22:07 -06:00
ultima-soul
14a0303e2f Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-27 18:36:37 -07:00
GriffinR
9ea9ffde09 Add remaining multistring chooser constants 2021-04-03 11:49:06 -04:00
ghoulslash
a595b213b4 merge with be 2021-03-28 17:29:22 -06:00
Evan
55b8538f68 merge with be 2021-03-01 11:22:37 -07:00
Evan
f3d975e239 merge with be 2021-02-12 08:59:55 -07:00
ultima-soul
2a20d50904 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-02-01 15:54:08 -08:00
Evan
9fcf7d2453 zero terrain timers for steel roll, remove unused move effectd 2021-01-28 13:51:39 -07:00
Evan
c009b51ae8 add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot 2021-01-28 13:27:00 -07:00
Evan
a37acb8345 coaching, lash out, burning jealousy 2021-01-28 12:21:11 -07:00
GriffinR
b9e1b050e1 Label remaining battle types 2021-01-13 15:20:29 -05:00
Evan
31ec3e8479 non-partner good move checks 2020-12-19 21:58:23 -07:00
Evan
67fefd0261 var terrain, surge fixes 2020-12-13 19:42:48 -07:00
Evan
ac332d5e98 check bad move 2020-12-13 15:02:21 -07:00
Evan
c026f705b3 permanent terrain move bgs 2020-11-17 19:45:27 -07:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
PokeCodec
e27975afaa Match battle script commands by correcting a function and the pokemon struct 2020-08-18 22:05:01 -04:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +02:00
GriffinR
fb402725c6 Convert more battle constants to bit shifts 2020-07-18 18:39:38 -04:00
GriffinR
aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
DizzyEggg
1a94d27fe6 Emergency Exit 2020-07-15 17:21:12 +02:00
DizzyEggg
0f628c8ff2 Fairy Lock 2020-04-20 19:41:07 +02:00
DizzyEggg
1435cd4692 Change inner structure of semi invulerable moves 2020-04-11 11:47:13 +02:00
DizzyEggg
76c5287629 Bug Bite 2019-05-23 12:32:14 +02:00
DizzyEggg
824a95fe07 Incinerate 2019-05-10 15:12:33 +02:00
Papa Cancer
c4acc3dbf8
Merge branch 'battle_engine_v2' into beta 2019-04-20 16:49:57 +01:00
Papa Cancer
e310d0f10e Core Enforcer 
New code - uses Gastro Acid script instead through own move effect
 2019-04-18 12:10:18 +01:00
Papa Cancer
e5e45bbcf5 Throat Chop 
Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
 2019-04-17 13:52:25 +01:00
Papa Cancer
43525d2a9c
Merge branch 'battle_engine_v2' into delta 2019-04-05 23:13:41 +01:00
Papa Cancer
4c8bc9d526 Three pointless moves 
Celebrate, Hold Hands and Happy Hour. Yay(!)
Update: turns out Pay Day works differently to how I thought, so I added a new move effect for Happy Hour doubling prize money.
Made all three effects subset of EFFECT_SPLASH, now called EFFECT_DUMB, as per Egg's instructions ( ͡° ͜ʖ ͡°)
 2019-04-05 18:10:02 +01:00
Papa Cancer
ebe2dc6bbb Mat Block 
Nothing more needs to be said
 2019-03-31 17:17:13 +01:00
DizzyEggg
f9ee31903d VCreate and fix stat stage changes functions 2019-03-07 12:20:57 +01:00
DizzyEggg
df9e6a6889 Free up two status3 flags 2019-02-25 16:17:23 +01:00
DizzyEggg
94cd547e9a Change move effect to u16 2019-02-14 13:17:27 +01:00
DizzyEggg
dc39f76a95 Spectral Thief effect 2019-02-14 12:15:53 +01:00
DizzyEggg
a42bba755b Add Crafty Shield effect 2019-02-01 14:34:16 +01:00
DizzyEggg
736826e863 New feature - battle 2 vs 1 opponent 2019-01-27 20:54:34 +01:00
DizzyEggg
2c3210f4d1 merge with master 2019-01-18 22:30:34 +01:00
DizzyEggg
c0bc01d301 Move some vars to C 2019-01-13 13:15:23 +01:00