ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-28 04:34:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,455 Commits 1 Branch 0 Tags 235 MiB
5592706a71
Commit Graph

291 Commits

Author SHA1 Message Date
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
c7c0fbc296 merge with be, make AI CanBeStatused functions separate from general util ones 2021-08-12 13:37:53 -06:00
ghoulslash
d218322b2c merge with be 2021-08-12 01:26:13 -04:00
ghoulslash
4ca6d76160 add bug bite 2021-07-25 14:55:52 -06:00
ghoulslash
c914ed8572 fix sucker punch, surging strikes, obstruct, and snipe shot 2021-07-25 09:38:54 -06:00
ghoulslash
a37d4c3da9 merge with be, give life dew jungle healing effect 2021-07-25 08:22:05 -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
MissingNoL
bfc66a21cc gBattlescriptCurrInstr[3] is not reading species parameter 2021-06-06 19:14:11 -07:00
MissingNoL
921b80de7c
Update battle_script_commands.h 
Properly aligned the list of number IDs
 2021-06-05 16:40:03 -07:00
MissingNoL
f30a9542ee Problem: Photon Geyser is calculating as Shell Side Arm?? Needs: Poison effect, contact move for Shell Side Arm 2021-05-27 22:21:55 -07:00
ghoulslash
c356ffaed4 merge with be. fix null ptr check in GetBattleMoveSplit 2021-05-24 10:46:53 -06:00
ghoulslash
5840b1f0ed utility umbrella effect 2021-05-24 09:52:45 -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
f4d8a91ba4 Misc battle script cleanup 2021-04-03 14:07:31 -04:00
GriffinR
c9d3b26ff7 Label miss string indexes 2021-04-02 02:12:46 -04:00
Evan
b130396c0e merge with be 2021-03-01 17:05:10 -07:00
Evan
f4d4cf262e fix screen cleaner, curious medicine, as one 2021-02-02 09:00:07 -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
dd51edd881 add eerie spell, surging strikes, jungle healing 2021-01-28 10:51:00 -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
10b1d33d13 handle battler being affected by terrain 2021-01-16 12:05:51 -07:00
Evan
8ef6a2c80d merge with be 2021-01-13 14:23:30 -07:00
Evan
1e22ae4cf2 merge with be 2021-01-10 09:08:25 -07:00
Evan
b5128be68b eject packer invisible before openpartymenu 2021-01-08 08:02:00 -07:00
Evan
5eb49722c0 add red card effect 2021-01-07 19:33:39 -07:00
Evan
7fffe23e63 add terrain seeds 2021-01-06 20:22:05 -07:00
Evan
d5d2cac60c init branch 2021-01-06 14:42:45 -07:00
Evan
0a3908ee92 add neigh and as one abilities 2021-01-05 19:37:23 -07:00
BuffelSaft
10cf5b3673 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into Batte_Engine_Only 2021-01-04 10:55:30 +13:00
Evan
a0b9ece980 merge with BE 2020-12-20 16:39:50 -07:00
Evan
e70e2bcd65 merge with be 2020-12-14 09:09:51 -07:00
Evan
b85dacce9d fix conflicts 2020-12-14 08:50:41 -07:00
Evan
34dd11448b sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem 2020-12-09 10:28:18 -07:00
BuffelSaft
72b769ec75 Add config options for Jump Kick 
Added options for:
- Gen 4 style recoil when target is immune (user takes 50% of target's max HP)
- Gen 3 style recoil when target is immune (i.e no recoil)
- Gen 5+ recoil was already implemented but was bugged
 2020-12-07 19:30:31 +13:00
Evan
4060b09bd6 expand top left move window. add z move init anim 2020-11-27 17:06:36 -05:00
Evan
ef43596a79 toggleable manual ability popup destruction 2020-11-19 15:16:27 -07:00
Evan
99d9a36860 add totem boosts 2020-11-19 10:35:37 -07:00
Evan
64bcac4589 move pickpocket to back of moveend sequence 2020-11-12 23:30:00 -07:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +02: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
3bdf675221 Hopefully illusion works as intended now 2020-06-28 19:45:48 +02:00
Eduardo Alvaro Quezada D'Ottone
9fb073ca23
Some cleanup (#454) 
* Toxic Thread doesn't have power.

* Added missing commas.

* Autotomize typo.

It wasn't until today that I learned that autotomize was a word.
 2020-06-27 11:21:13 +02:00
DizzyEggg
548a43f8d9 Rocky Helmet before Knock Off 2020-06-25 16:15:11 +02:00
Eduardo Alvaro Quezada D'Ottone
8d848997c9
Battle Configs: The Revenge (#363) 
* Turns for Uproar

* Chances for the amount of hits with multi-hit moves.

* Electric type mon's immunity to paralysis

* (Hi) Jump Kick to always do 1/2 of maxHP when crashing

* Turns for Disable.

* Minimized mons can always be hit by moves like Stomp

* Grass types immune to powder and spore moves.

* Psywave's damage formula

* Fixed random usage.
 2020-05-28 10:38:27 +02:00
DizzyEggg
ee68f0f826 Fix switch-in abilities when shift style switch 2020-04-25 11:17:59 +02:00
DizzyEggg
40ce053ce1 Adrenaline Orb 2020-04-22 15:12:25 +02:00
DizzyEggg
d56aaf7c0b Destiny Knot 2020-04-22 14:40:44 +02:00
DizzyEggg
c8ba013539 Power Herb 2020-04-22 10:44:19 +02:00
Eduardo Alvaro Quezada D'Ottone
c5a6acc7db
Corrosion (#306) 
* Status move poisoning for Steel and Poison types.

* Can poison itself with Toxic Orb.

* Secondary effect poisoning now working.

* Created a function that checks if abilities can bypass type immunities.

* Created macro to handle typeimmunity

* Applied review changes.

* Applied review requests.

* Left more readable version of HOLD_EFFECT_TOXIC_ORB.
 2020-04-21 15:59:19 +02:00
DizzyEggg
328e951afa Ally Switch, tbd 2020-04-20 20:05:04 +02:00
DizzyEggg
0f628c8ff2 Fairy Lock 2020-04-20 19:41:07 +02:00
DizzyEggg
dd17360ab0 Zen Mode and Shields Down 2020-04-19 21:18:39 +02:00
DizzyEggg
ad481c8688 Moody 2020-04-19 15:44:44 +02:00
DizzyEggg
c01ed5325c Poison Touch fix 2020-04-19 14:43:54 +02:00
DizzyEggg
6a3944d27c Frisk, would be easier if it didnt scan 2 opponents 2020-04-19 13:37:56 +02:00
DizzyEggg
e62f1475d4 Beast Boost and Receiver 2020-04-19 12:07:56 +02:00
DizzyEggg
e42ead10c9 Soul Heart 2020-04-18 19:59:09 +02:00
DizzyEggg
34f5d9e2ae Burn Up And Purify 2020-04-17 21:14:26 +02:00
Eduardo Alvaro Quezada D'Ottone
2b9eb00486
Mind blown (#302) 
* Mind Blown Part 1 (Definition and self-damage)

* Mind Blown Part 2 (Damp interaction)
 2020-04-14 09:27:29 +02:00
DizzyEggg
cb5b673f8a Big Root and STRENGTH Sap 2020-04-13 15:00:17 +02:00
DizzyEggg
39e3b0b740 Form changes layout and Stance Change Aegi 2019-12-31 19:11:53 +01:00
Nephrite
0343f63eda Dancer 
Implemented Dancer and all relevant code for interacting with abilities, certain moves, etc
 2019-12-07 10:19:01 +00:00
DizzyEggg
ea6736cd8d merge 2019-11-10 12:09:14 +01:00
GriffinR
5fd44d1e74 Rename some STAT_CHANGE macros 2019-10-26 11:53:00 -04:00
GriffinR
73b96fe145 Rename CONTACT macros to ON_DAMAGE 2019-09-27 12:27:36 -04:00
GriffinR
3bf8129396 Clean up new Cmd macro names 2019-09-27 02:54:28 -04:00
GriffinR
bb236b490d Update BS constants for Cmd rename 2019-09-15 17:58:12 -04:00
GriffinR
869d0eebc0
Rename atk## constants and states 2019-08-23 08:46:21 -04:00
DizzyEggg
c9de753ecc Illusion 2019-08-08 13:06:55 +02:00
DizzyEggg
2863045241 Fix switch-in abilities text/pop-up 2019-08-05 11:24:49 +02:00
DizzyEggg
e1ea4b62e9 Natural Gift 2019-05-20 12:03:00 +02:00
DizzyEggg
d027bb0d7a Life Flame toxic orbs 2019-05-10 11:03:33 +02:00
DizzyEggg
875b413a09 Various battle target items 2019-05-09 20:31:58 +02:00
Papa Cancer
b50007e861 Instruct 
Re-PR'd due to excess "merges"
 2019-04-20 20:11:49 +01:00
Papa Cancer
754befe393 Baneful Bunker + King's Shield 
Both apply a move effect from atk49. King's Shield swaps attacker and defender for the sake of Defiant etc. and then swaps them back!
 2019-04-17 14:54:21 +01:00
DizzyEggg
93e86e6a76 Tweak Stomping Tantrum 2019-04-13 14:36:08 +02:00
Papa Cancer
c9ad96d228 Stomping Tantrum 
Uses timer in gBattleStruct to count time since last failed move. This is augmented by a MOVE_FAILED result in atk_49 and decreased with an ENDTURN case. EFFECT_STOMPING_TANTRUM doubles  base power if the timer is set.
 2019-04-01 20:06:45 +01:00
DizzyEggg
6f9096c613 Add Sweet Veil 2019-03-31 22:02:39 +02:00
DizzyEggg
b12334c88b Remove cases from ABE, add functionality of Flower Veil 2019-03-31 21:38:58 +02:00
DizzyEggg
17e74756cb Merge with master, add defines to atk49 and statbuffchange commands 2019-03-31 15:19:25 +02:00
DizzyEggg
35cffea987 Helpful macros for atk49 2019-03-30 08:29:56 -05:00
DizzyEggg
7a8f524bc5 Proper Roar handling in double battles 2019-03-06 12:09:34 +01:00
Papa Cancer
cfd50eb65a Grassy Terrain + minor fixes 
Includes strings for all
Fixes:
・Psychic Terrain blocks priority if the TARGET is grounded, not the user
・Psychic Terrain no longer targets an opponent
・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable
・Small fix: Meteor Mash corrected to being a physical attack
 2019-03-02 22:52:43 +00:00
Papa Cancer
d704b9cd5b Gravity fix 
Brings down Pokémon in the middle of a two-turn flying move (only Bounce and Fly at the moment); says the appropriate message for all mons brought to the ground via Gravity
 2019-02-24 13:28:24 +00: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
b9e711bbf4 Add Powder 2018-12-03 12:50:32 +01:00
DizzyEggg
434e257943 Add Acupressure 2018-11-24 21:06:53 +01:00
DizzyEggg
15b8046b2b Add third type 2018-11-17 12:10:24 +01:00
DizzyEggg
bb9dbc0c6d Merge with master 2018-11-14 22:50:27 +01:00
DizzyEggg
a4235c9ff8 Document battle arena 2018-11-11 18:33:16 +01:00
DizzyEggg
bc42de5f60 Aurora Veil, Revelation Dance, Diamond Storm 2018-11-03 14:35:45 +01:00
DizzyEggg
68d94ad316 Implement trainer sliding 2018-11-03 01:17:16 +01:00
DizzyEggg
e9965dd341 merge with master 2018-11-02 22:55:32 +01:00
DizzyEggg
0ab27e44b1 more tower, fail 2018-10-21 20:13:12 +02:00
DizzyEggg
de9e9072fc Rototiller and 2 turn moves 2018-09-30 14:04:46 +02:00
DizzyEggg
162c83fcff Bestow 2018-09-30 12:27:51 +02:00
DizzyEggg
7623eabdee After you 2018-09-29 19:37:39 +02:00
DizzyEggg
b9cf1fdcfe Psycho Shift, Power Trick, Flame Burst 2018-09-29 18:40:14 +02:00
DizzyEggg
dddefbb0e3 Full support for moves hitting all battlers 2018-09-29 16:41:25 +02:00
DizzyEggg
ada76cbe4f Synchronoise and Smack Down 2018-09-29 15:43:56 +02:00
DizzyEggg
597299136f Add Pollen Puff effect 2018-09-29 14:10:53 +02:00
DizzyEggg
cbaae44f9f Add pop-up to battlescripts 2018-09-29 13:36:33 +02:00
DizzyEggg
3f2beff554 Defog 2018-09-23 19:03:53 +02:00
DizzyEggg
6b7a171dbe Ability pop-up fail, maybe will do something about it later 2018-09-23 14:24:06 +02:00
DizzyEggg
19e1606595 Add Copycat 2018-09-22 18:37:03 +02:00
DizzyEggg
db44a7e25a Techno Blast and Autotomize 2018-09-22 17:27:51 +02:00
DizzyEggg
9474254e4d Final Gambit, Dragon Tail 2018-09-22 16:15:00 +02:00
DizzyEggg
1284bb94f1 Last Resort, Fangs and Flare Blitz/Volt Tackle 2018-09-22 10:45:43 +02:00
DizzyEggg
55f21c1776 Mega Evolution support is mostly done. 2018-09-16 18:55:32 +02:00
DizzyEggg
490a4f993b Merge with master 2018-09-01 12:38:38 +02:00
DizzyEggg
2b7c138cbe Some labels 2018-08-25 21:04:12 +02:00
DizzyEggg
4cb1e880da Reflect Type and SOAK 2018-08-11 13:30:34 +02:00
DizzyEggg
674d35861c Couple bug fixes 2018-08-11 12:16:00 +02:00
DizzyEggg
d230d986fa Me First. 2018-08-05 16:43:07 +02:00
DizzyEggg
065032bf35 Moves changing terrains 2018-08-05 12:43:57 +02:00
DizzyEggg
2218949d7c Topsy Turvy and Ion Deluge. 2018-08-04 23:34:29 +02:00
DizzyEggg
222ea7269d Rapid Spin blews all hazards, Quash and a couple of new move effects 2018-08-04 22:23:07 +02:00
DizzyEggg
9ff7b0e849 Effect to u16, Lucky Chant, Sucker Punch, Sticky Web and Metal Burst 2018-08-04 20:36:24 +02:00
DizzyEggg
39f9b1ddf0 Experience on caught mon 2018-08-03 18:01:14 +02:00
DizzyEggg
320120d529 Merge with master 2018-08-03 00:20:34 +02:00
DizzyEggg
44a454ecb4 Moves with accuracy 0 bypass accuracy checks; Heal Block move effect done 2018-07-30 20:41:16 +02:00
DizzyEggg
68145cd002 Document atk48 2018-07-29 15:33:16 +02:00
DizzyEggg
3d93da7133 Add Imposter 2018-07-29 12:21:28 +02:00
DizzyEggg
f51812d0fe Add Fell Stinger 2018-07-26 23:40:55 +02:00
DizzyEggg
d991d669da Add Moxie 2018-07-26 22:52:13 +02:00
DizzyEggg
1c95c36338 Healing Wish and Lunar Dance 2018-07-26 20:36:16 +02:00
DizzyEggg
100ce73a12 Sticky Web done 2018-07-24 22:09:55 +02:00
DizzyEggg
6a7d58003b Add Bad Dreams 2018-07-22 21:05:12 +02:00
DizzyEggg
fee81d03ab A couple of gen4 abilities 2018-07-22 18:40:18 +02:00
DizzyEggg
2ebf14a83d Get rid of scripting dmg multiplier 2018-07-14 18:58:45 +02:00
DizzyEggg
d2e47323fe document frontier related 2018-07-01 11:15:42 +02:00
DizzyEggg
305a4fa744 match two functions 2018-02-28 19:37:48 +01:00
DizzyEggg
96290f4ee3 pokemon and battle constants 2018-02-08 11:17:41 +01:00