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
13,030 Commits 1 Branch 0 Tags 235 MiB
7936910f90
Commit Graph

211 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
bbf7b62ceb Config for lost money after losing a battle 2021-12-11 23:03:50 -03:00
BuffelSaft
ff60882b29 Requested changes 2021-11-23 11:04:39 +13:00
W1serV1ser
c2f81cd5f5 Added Sky Drop 2021-11-20 11:44:48 -08:00
BuffelSaft
98712e576e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2021-11-19 17:48:11 +13:00
ghoulslash
940a165be7 merge w be 2021-11-13 09:09:15 -05:00
BuffelSaft
e2599c2469 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1 2021-11-10 14:31:32 +13:00
ghoulslash
41bf1dc2f4 merge w be 2021-11-06 10:40:57 -04:00
BuffelSaft
ee83d1142c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1 2021-11-05 21:40:05 +13:00
BuffelSaft
bf786c6c9a Fix Magma Storm 
Fix the strings and animation displayed when Magma Storm. Also move gTrappingMoves to battle_script_message.c as it's only sued in this file, and this allows ARRAY_COUNT(sTrappingMoves) to replace the constant in SetMoveEffect.
 2021-11-05 18:22:52 +13:00
LOuroboros
22f7e81bef Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry 2021-11-04 12:25:26 -03:00
BuffelSaft
28e78cb6c4 Gen 8 moves initial commit 
Full credit to Nunuchu42 and cfmnephrite for this code.
 2021-11-04 19:50:54 +13:00
BuffelSaft
f323e2c047 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil 2021-11-03 14:18:28 +13:00
LOuroboros
69b42de0d9 Implemented Mimicry 
Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
 2021-11-02 14:44:55 -03:00
BuffelSaft
95435b5f7f Pastel Veil switchin effect attempt 
Battle script isn't working for partner for some reason.
 2021-11-02 23:06:10 +13:00
BuffelSaft
40bced517a Pastel Veil blocks poison for whole side 
Tested vs Toxic, Toxic Thread and Sludge with 100% effect chance.
 2021-11-02 20:00:57 +13:00
ghoulslash
98b4b821dc merge with be 2021-11-01 13:55:55 -04:00
ghoulslash
bc170f3a43 merge with be 2021-10-31 11:04:39 -04:00
BuffelSaft
47bfeaeecd Implement Gorilla Tactics 
It's Choice Band but as an ability.
 2021-10-30 18:31:44 +13:00
ghoulslash
28bc7dc14d start ability 2021-10-29 22:32:19 -04:00
ghoulslash
f342e7c590 merge with be 2021-10-28 17:03:10 -04:00
LOuroboros
28522f3ffb Fixed Hyperspace Fury not breaking through protections 
Also repositioned VARIOUS_JUMP_IF_SPECIES.
 2021-10-28 12:09:44 -03:00
LOuroboros
1ab8c84f41 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury 2021-10-26 21:23:21 -03:00
LOuroboros
d9b8e11a9c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE 2021-10-19 07:47:42 -03:00
ghoulslash
a3d2bdc9cf merge with be 2021-10-13 18:30:53 -04:00
ghoulslash
bbd09fdcf7 add wandering spirit 2021-10-12 10:32:51 -04:00
LOuroboros
91a68cd5db Implemented Primal Reversion 2021-10-09 00:36:41 -03:00
BuffelSaft
274e964d91 Fix Safety Googles 
Fix typo and update gLastUsedItem before calling the safety goggles battle script.
 2021-10-09 15:05:01 +13:00
ghoulslash
391cfabcac merge with be 2021-10-06 14:31:21 -04: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
LOuroboros
c464b1b5dd STRINGID_ATTACKERBECAMEASHGRENINJA -> STRINGID_ATTACKERBECAMEASHSPECIES 2021-10-01 23:12:59 -03:00
LOuroboros
f3ded43a88 Implemented Battle Bond 2021-10-01 22:49:17 -03:00
ghoulslash
761006a164 merge with be 2021-09-26 19:19:32 -04:00
ghoulslash
b916d7991c merge with be 2021-09-16 21:52:29 -04:00
ghoulslash
e756b0accc merge with be 2021-09-16 21:41:29 -04:00
ghoulslash
f61d516aad some syntax/format fixes 2021-09-15 17:15:50 -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
f3f26d1a6f merge with be 2021-09-13 19:40:28 -04: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
933696b3cd merge with be 2021-09-03 17:41:00 -04:00
ExpoSeed
5a5c257f68 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-09-02 21:43:20 -05:00
ghoulslash
7c53214dad merge with be 2021-09-02 15:33:42 -04:00
LOuroboros
9e4f33d09e Implemented Desolate Land, Primordial Sea and Delta Stream 2021-08-27 17:56:43 -03:00
ghoulslash
d218322b2c merge with be 2021-08-12 01:26:13 -04:00
ghoulslash
ab529b4e89 add stuff cheeks 2021-07-27 10:31:48 -06:00
Xhyzi
c2bd046ea6 Shell Trap 2021-06-15 20:22:50 +02:00
Xhyzi
155e9b6332 Court Change 2021-06-15 20:14:10 +02:00
Xhyzi
0202b75822 Beak Blast 2021-06-15 19:57:21 +02:00
Xhyzi
7799e49e3a Corrosive Gas 2021-06-15 19:45:24 +02:00
Xhyzi
ee3f3eb78f Meteor Beam 2021-06-15 17:06:21 +02:00
Xhyzi
5a094a3033 Snap Trap 2021-06-15 16:22:42 +02:00
ExpoSeed
c8fc141287 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-06-10 11:54:20 -05:00
ultima-soul
092f02f119 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-06-07 12:00:23 -07:00
MissingNoL
bfc66a21cc gBattlescriptCurrInstr[3] is not reading species parameter 2021-06-06 19:14:11 -07:00
LOuroboros
b552db7193 Tweaked the Oblivious immunities 
Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.
 2021-06-04 19:23:07 -03:00
ghoulslash
c356ffaed4 merge with be. fix null ptr check in GetBattleMoveSplit 2021-05-24 10:46:53 -06:00
Flametix
a8fab62c89 Fix Substitute typo 2021-05-06 20:49:04 -04: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
f4d8a91ba4 Misc battle script cleanup 2021-04-03 14:07:31 -04:00
GriffinR
9ea9ffde09 Add remaining multistring chooser constants 2021-04-03 11:49:06 -04:00
ghoulslash
d89e2c1775 merge with be 2021-04-02 08:55:54 -06:00
GriffinR
c9d3b26ff7 Label miss string indexes 2021-04-02 02:12:46 -04:00
Evan
2ccdf1d89e merge with be. magic guard checks 2021-03-03 09:21:06 -07:00
Evan
b130396c0e merge with be 2021-03-01 17:05:10 -07:00
Evan
6cb8c6309a merge with be 2021-03-01 11:28:51 -07:00
Evan
0483114a05 merge and some fixes 2021-02-02 11:45:15 -07:00
Evan
f4d4cf262e fix screen cleaner, curious medicine, as one 2021-02-02 09:00:07 -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
4611c71bd1 merge with be 2021-01-21 08:55:14 -07:00
Evan
8ec12c665c merge with be 2021-01-20 17:36:13 -07:00
Evan
e61309dce6 merge with be 2021-01-20 17:34:24 -07:00
Evan
16d54b6d32 merge with be, add form checks to CanBattlerGetOrLoseItem 2021-01-20 14:28:03 -07:00
Evan
0d8f804194 update mental herb to gen 5 2021-01-15 18:11:55 -07:00
Evan
8ef6a2c80d merge with be 2021-01-13 14:23:30 -07:00
opakedragon
cbaf9b38b2
rename string id to reflect usage 2021-01-11 08:48:00 -05:00
Evan
1e22ae4cf2 merge with be 2021-01-10 09:08:25 -07:00
Evan
d4e4405cf5 merge with be 2021-01-10 09:04:21 -07:00
Evan
6dabff1ee3 merge with be 2021-01-07 21:24:21 -07:00
Evan
0118723a9c add eject button 2021-01-07 20:31:27 -07:00
Evan
5eb49722c0 add red card effect 2021-01-07 19:33:39 -07:00
LOuroboros
8511ed57e4 Tweaked Steam Engine's battle string 2021-01-07 18:13:16 -03:00
Evan
efa4fe89ad micle berry 2021-01-06 10:47:07 -07:00
Evan
f2e486eb0d custap berry effect, custap/quick claw activation message 2021-01-06 09:37:31 -07:00
Evan
4c1e8f2f2e add curious medicine 2021-01-05 20:02:11 -07:00
Evan
0a3908ee92 add neigh and as one abilities 2021-01-05 19:37:23 -07:00
LOuroboros
2b0702ec04 Implemented Perish Body 
Inspired by Raguzero's implementation.
 2020-12-11 19:44:32 -03:00
LOuroboros
7d8b8083e8 Implemented Sand Spit 2020-12-11 16:47:23 -03:00
LOuroboros
322918e280 Implemented Steam Engine 
And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.
 2020-12-10 18:27:35 -03:00
Evan
34dd11448b sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem 2020-12-09 10:28:18 -07:00
LOuroboros
6a0fee9c56 Fixed Intrepid Sword and Dauntless Shield 
And also introduced a new BattleString for BattleScript_BattlerAbilityStatRaiseOnSwitchIn
 2020-12-05 14:03:13 -03:00
LOuroboros
9e1d7cc827 Implemented Ball Fetch 2020-12-02 23:09:35 -03:00
Evan
4ad5e368a9 fix merge conflicts 2020-12-01 17:57:57 -05:00
Evan
2bfc7ea9b1 merge upstream 2020-12-01 15:42:04 -05:00
Evan
a0bde70493 z move effects 2020-11-30 10:55:46 -05:00
Evan
4060b09bd6 expand top left move window. add z move init anim 2020-11-27 17:06:36 -05:00
Evan
07a4400d50 finish switch in ability messages 2020-11-19 11:42:00 -07:00
Evan
99d9a36860 add totem boosts 2020-11-19 10:35:37 -07:00
Eduardo Quezada D'Ottone
e6f8d57f08 Merge remote-tracking branch 'RHH/battle_engine' into BE-WishMegaEvo 
# Conflicts:
#	include/constants/battle_string_ids.h
 2020-11-10 17:28:17 -03:00
LOuroboros
a25190f357 A few things. 
-Introduced a Gen. 8 styled text string for Intimidate
-Added an ability popup to BattleScript_IntimidatePrevented
 2020-11-10 10:34:51 -03:00
Eduardo Quezada D'Ottone
35d5324324 Review changes. 2020-11-08 21:02:34 -03:00