ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 13:45:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,026 Commits 1 Branch 0 Tags 235 MiB
b166e9a5e3
Commit Graph

554 Commits

Author SHA1 Message Date
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
2daf1fbbf8 Geomancy 2020-04-20 19:02:03 +02:00
Eduardo Alvaro Quezada D'Ottone
4697a5b687
More Battle configs (#339) 
* Fixed naming of King Shield's description variable.

* Config for King Shield lowering attack.

* Config for terrain type attack boost.

* Standarized battle config descriptions.

* Adjusted config logic accounting for GEN_8.

* Changed KING_S_SHIELD back to KINGS_SHIELD

* Missed B_ABILITY_WEATHER.
 2020-04-20 14:11:28 +02:00
DizzyEggg
3dfd19b3e2 AI Weather moves tweaks 2020-04-20 13:00:04 +02:00
DizzyEggg
28805b0f98 AI powder moves 2020-04-20 12:14:56 +02:00
DizzyEggg
d38e0d8ae5 AI dont rely on power if bad effects 2020-04-20 11:27:09 +02:00
DizzyEggg
ce28454461 Fix Life Orb fainting an already fainted mon 2020-04-20 08:55:21 +02:00
DizzyEggg
dd17360ab0 Zen Mode and Shields Down 2020-04-19 21:18:39 +02:00
DizzyEggg
c01ed5325c Poison Touch fix 2020-04-19 14:43:54 +02:00
DizzyEggg
d5307c3e54 Poison Touch 2020-04-19 14:24:31 +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
ee8a00be81 some ability tweaks 2020-04-18 20:34:09 +02:00
DizzyEggg
e42ead10c9 Soul Heart 2020-04-18 19:59:09 +02:00
DizzyEggg
7178ea6b46 Shore Up 2020-04-18 18:34:18 +02:00
DizzyEggg
093eca07b3 Volt Switch UTurn anim fix when cant switch out 2020-04-18 18:04:20 +02:00
DizzyEggg
68bcc76538 Fix trainer slide in shadow steal 2020-04-18 13:26:40 +02:00
DizzyEggg
bc86292c93 Psycho Cut fix, small AI tweak 2020-04-18 12:19:07 +02:00
DizzyEggg
34f5d9e2ae Burn Up And Purify 2020-04-17 21:14:26 +02:00
Eduardo Alvaro Quezada D'Ottone
81617eb577
Overworld effects (#245) 
* Snow Cloak's overworld effect. (reduces the chance of encountering wild Pokémon on Snow by 50%)

* Quick Feet's overworld effect. (reduces the chance of encountering wild Pokémon by 50%)

* No Guard's overworld effect. (raises the chance of encountering wild Pokémon by 50%)

* Honey Gather.

* Checks if honey is defined.

* Applied review changes.

* Fixed pointer reference

* Applied requested changes.

* Using weather constants.
 2020-04-15 14:45:07 +02:00
DizzyEggg
8ea7fcc348 better ai debug 2020-04-14 13:40:27 +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
51e1639513 Magic Guard protects from stuff 2020-04-13 15:49:40 +02:00
DizzyEggg
cb5b673f8a Big Root and STRENGTH Sap 2020-04-13 15:00:17 +02:00
DizzyEggg
51e2e0ad10 Ability pop-up for levitate and wonder guard 2020-04-13 13:06:31 +02:00
DizzyEggg
060b795d8e Merge with master 2020-04-11 19:48:24 +02:00
DizzyEggg
a2a9f259c8 Change handlinf of forbidden moves for mimic metronome etc 2020-04-11 13:22:35 +02:00
DizzyEggg
6daab7a5c9 Fix Damp loop 2020-04-11 12:02:51 +02:00
DizzyEggg
1435cd4692 Change inner structure of semi invulerable moves 2020-04-11 11:47:13 +02:00
AsparagusEduardo
f45336c546 Using Battle Action constants 2020-03-17 22:14:14 -03:00
PikalaxALT
39da49495d
Merge pull request #1000 from GriffinRichards/doc-dex 
Document pokedex.c
 2020-03-17 10:43:57 -04:00
Eduardo Alvaro Quezada D'Ottone
64031dd672
Option for Toxic never missing if user is Poison type. (#304) 2020-03-14 12:15:36 +01:00
DizzyEggg
cf4d5f6e59 Merge with master 2020-03-13 23:02:17 +01:00
GriffinR
31b0cbe9b4 Document pokedex.c 2020-03-09 16:24:01 -04:00
Eduardo Quezada
f821303429 Using True/False on SetMoveEffect. 2020-03-07 16:54:13 -06:00
GriffinR
e633b57593 Document remaining status/general/special anims 2020-02-25 12:54:08 -06:00
DizzyEggg
b1b1bf7f12 Fix two turn moves not activating moxie 2020-02-22 18:43:16 +01:00
DizzyEggg
bd75f16a9b Clear move effect after each turn 2020-02-22 18:22:04 +01:00
DizzyEggg
517974ebcb Can't Knock Off mega stones 2020-02-22 17:30:07 +01:00
DizzyEggg
edb581af1f Mega evo elevation shadow 2020-02-16 13:46:35 +01:00
Eduardo Alvaro Quezada D'Ottone
33e8e20118
Disguise ability (#258) 
* Protection from attacks.

* Changes form when Busting Disguise.

* Ability changing moves set to fail.

- Simple Beam and Worry Seed now fail if the target has Disguise.
- Role Play and Skill Swap now fail if either the attacker or the target have Disguise.

* Disguise no longer triggers when transformed.

* Mimikyu reverts to Disguised

* No longer blocks from entry hazards and weather.

* Applied review changes

* Oops, new line

* yeah
 2020-02-08 19:29:51 +01:00
DizzyEggg
c9774f6e25 Transformed Aegi cannot change forms 2020-02-08 12:09:38 +01:00
DizzyEggg
41f0c0acb5 Sort out ohko moves 2020-02-08 10:39:22 +01:00
Eduardo Alvaro Quezada D'Ottone
90442ffbc2
Battle config options (#243) 
* Option to use pre-GenVI critical hit multiplier.

* Clarified the option that multiplies EXP by 1.5 for trainer battles.

* Fixed code style.

* Option to change Burn damage.

* Option to change to Gen 7 paralysis drop.

* Ordered settings.

* Implemented review suggestions.
 2020-02-08 09:51:55 +01:00
DizzyEggg
834b7b52d3 Merge with master 2020-02-08 09:38:29 +01:00
GriffinR
27c4329e45 Use friendship event constants 2020-02-04 12:16:15 -06:00
GriffinR
be5d417236 Document some pokenav menu handlers 2020-02-04 08:02:28 -06:00
DizzyEggg
06a9165f75 Fix Ice Body not working 2020-01-18 19:18:57 +01:00
DizzyEggg
bcf6b02a55 Fix Last Resort 2020-01-18 18:57:23 +01:00
Eduardo Alvaro Quezada D'Ottone
000a709363 Gen7 trainer exp multiplier. (#200) 
* Gen7 trainer exp multiplier.

* Changed check for TRAINER_BATTLE_MULTIPLIER from "before Gen 7" to "not Gen 7" as requested.
.
 2020-01-18 18:29:56 +01:00
DizzyEggg
cafb0c3b6a Fix Surf taking 3 pp 2020-01-04 18:17:26 +01:00
DizzyEggg
39e3b0b740 Form changes layout and Stance Change Aegi 2019-12-31 19:11:53 +01:00
DizzyEggg
b15f0b3bb3 Comatose 2019-12-31 16:36:53 +01:00
DizzyEggg
77842b0376 Contact moves for Aftermath and Bestow for Unburden 2019-12-25 12:19:09 +01:00
ultima-soul
332aa80a33 Resolve review comments and encapsulate Unburden check and set. 2019-12-23 09:25:26 -08:00
ultima-soul
5786745d15 Merge branch 'battle_engine' into unburden 2019-12-23 09:01:16 -08:00
DizzyEggg
ea9109943d Aurora Veil now only works in Hail 2019-12-23 17:50:13 +01:00
DizzyEggg
308e1594c9
Merge pull request #212 from Fontbane/gooey 
Queenly Majesty, Big Pecks, Gooey and Tangling Hair
 2019-12-23 17:23:33 +01:00
DizzyEggg
e4a9a228c5
Merge pull request #210 from ultima-soul/battle_engine 
Implement Leaf Guard.
 2019-12-23 17:15:51 +01:00
DizzyEggg
9e3d5672e6 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-12-23 16:40:21 +01:00
ultima-soul
1146de4561 Implement Unburden. 2019-12-21 23:09:06 -08:00
Fontbane
2fb6ea4fc4 Big Pecks 2019-12-19 14:01:46 -05:00
ultima-soul
029ab67ff4 Implement Leaf Guard. 2019-12-16 00:29:20 -08:00
GriffinR
ed1ff0ad77 Document misc strings and text colors 2019-12-10 19:29:23 -06:00
DizzyEggg
9b459eb64a Fix atk49state 2019-12-09 08:41:09 +01:00
DizzyEggg
740ab29c7c
Merge pull request #204 from cfmnephrite/beta 
Dancer
 2019-12-09 08:36:22 +01:00
DizzyEggg
ac499bc896 Merge with master 2019-12-09 08:16:18 +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
GriffinR
c40879aa36 Use ST_OAM constants for OamData definitions 2019-12-06 19:05:44 -06:00
Thomas Winwood
e3f7f47321 Turn some magic numbers into named constants 2019-11-23 07:53:26 -06:00
DizzyEggg
b4ac979600 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-11-10 12:09:43 +01:00
DizzyEggg
ea6736cd8d merge 2019-11-10 12:09:14 +01:00
Marcus Huderle
01e6fb6dd0 Document some battle_bg-related things 2019-11-07 18:24:04 -06:00
huderlem
a4b4ecd470
Merge pull request #787 from GriffinRichards/rename-tablecmds 
Rename table cmds
 2019-11-04 16:31:27 -06:00
DizzyEggg
1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01:00
GriffinR
e01ec84837 Document party_menu second pass 2019-10-31 03:25:56 -04:00
GriffinR
5fd44d1e74 Rename some STAT_CHANGE macros 2019-10-26 11:53:00 -04:00
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
DizzyEggg
621dd4f0bf Fix Sheer Force moves and effects happening 2019-10-21 14:48:03 +02:00
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
GriffinR
5325835ee7 Use STR_CONV constants 2019-09-30 15:43:44 -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
1016b23918
Merge branch 'master' into rename-tablecmds 2019-09-26 15:02:38 -04:00
huderlem
886f043025
Merge pull request #816 from jiangzhengwenjz/ptch-3 
get rid of goto in battle_script_commands
 2019-09-25 16:31:53 -05:00
GriffinR
6ab192e739 Review changes for #807 2019-09-17 16:50:17 -05:00
GriffinR
b46c4b6703 more constant usage 2019-09-16 19:21:23 -05:00
GriffinR
bb236b490d Update BS constants for Cmd rename 2019-09-15 17:58:12 -04:00
DizzyEggg
7647941ec4 Fix Truant in new switch in system 2019-08-30 12:51:56 +02:00
DizzyEggg
f979987c2f Fix Intimidate and Trace on new switch in system 2019-08-30 12:25:21 +02:00
jiangzhengwenjz
4f9052cb96 get rid of goto in battle_script_commands 2019-08-28 06:06:17 +08:00
DizzyEggg
c97869018d Fix Mega Indicator appearing and priority 2019-08-25 15:33:28 +02:00
GriffinR
869d0eebc0
Rename atk## constants and states 2019-08-23 08:46:21 -04:00
GriffinR
68905e3961
rename atk## prefixes 2019-08-23 07:55:36 -04:00
DizzyEggg
143cb7ad35 Updated switch mechanics 2019-08-22 15:57:33 +02:00
DizzyEggg
c9de753ecc Illusion 2019-08-08 13:06:55 +02:00
DizzyEggg
9823d2bdf1 Fix mega evo indicator priority on lvl-up-box 2019-08-05 12:15:15 +02:00
DizzyEggg
8542e7fb1f Blizzard 100% accuracy in hail 2019-08-05 11:39:31 +02:00
DizzyEggg
2863045241 Fix switch-in abilities text/pop-up 2019-08-05 11:24:49 +02:00
DizzyEggg
3e476adf4a Stockpile gen4 effect and fixed spit up 2019-07-09 19:06:12 +02:00
DizzyEggg
c80861d85e Add hopefully support for Cherrim 2019-06-15 14:46:35 +02:00
DizzyEggg
76c5287629 Bug Bite 2019-05-23 12:32:14 +02:00
DizzyEggg
32aeba21e0 Some AI tweaking 2019-05-23 11:41:35 +02:00
DizzyEggg
1b7493e47a Fix Flame Burst crashing the game 2019-05-23 10:02:04 +02:00
DizzyEggg
28227dfd88 Fix Life Orb string 2019-05-23 09:20:02 +02:00
DizzyEggg
e1ea4b62e9 Natural Gift 2019-05-20 12:03:00 +02:00
DizzyEggg
269f573297 Fix powder and resist berry string 2019-05-20 10:10:00 +02:00
DizzyEggg
f22f7866ac Merge with master, fix conficts 2019-05-17 09:52:20 +02:00
DizzyEggg
4ae1e014bc Change abilities in base stats to array 2019-05-16 17:09:43 -05:00
DizzyEggg
33979f0fa6 use ability num instead of alt ability 2019-05-16 17:09:43 -05:00
DizzyEggg
824a95fe07 Incinerate 2019-05-10 15:12:33 +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
DizzyEggg
bb8e397e5b Gems and dmg reducing berries 2019-05-07 15:26:58 +02:00
DizzyEggg
5bc63ab550 Merge branch 'master' into battle_engine_v2 2019-05-07 10:23:14 +02:00
huderlem
fe59902b8a Fix indentation 2019-05-03 18:21:11 -05:00
hjk321
26114d4579 Update comparison 2019-05-03 18:21:11 -05:00
hjk321
ee4049d93e Fix indentation Error 2019-05-03 18:21:11 -05:00
hjk321
106a89eace Document magic number from atk04_critcalc 2019-05-03 18:21:11 -05:00
DizzyEggg
d0f91a996d Tweak up mega evo 2019-05-02 23:10:01 +02:00
Papa Cancer
b50007e861 Instruct 
Re-PR'd due to excess "merges"
 2019-04-20 20:11:49 +01:00
Papa Cancer
7e99272482 Laser Focus 
Re-PR'd due to excess "merges"
 2019-04-20 20:02:52 +01:00
Papa Cancer
c4acc3dbf8
Merge branch 'battle_engine_v2' into beta 2019-04-20 16:49:57 +01:00
DizzyEggg
5b43a9289d
Merge pull request #134 from thechurchofcage/epsilon 
Baneful Bunker + King's Shield
 2019-04-20 08:42:35 +02: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
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
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
DizzyEggg
93e86e6a76 Tweak Stomping Tantrum 2019-04-13 14:36:08 +02:00
DizzyEggg
549a9cdcc2
Merge pull request #118 from thechurchofcage/beta 
Stomping Tantrum
 2019-04-13 14:09:15 +02:00
DizzyEggg
2646f3b26a Merge with master 2019-04-13 13:42:44 +02:00
Phlosioneer
50350cc2e1 Merge branch 'master' into contest-ai-cleanup 2019-04-07 20:20:22 -04:00
DizzyEggg
f8713f9c15 Merge with master 2019-04-06 20:43:13 +02:00
Papa Cancer
33d484a7ed
Merge branch 'battle_engine_v2' into beta 2019-04-06 00:38:56 +01:00
Papa Cancer
43525d2a9c
Merge branch 'battle_engine_v2' into delta 2019-04-05 23:13:41 +01:00
DizzyEggg
a83255d103 fix after prs 2019-04-06 00:03:03 +02:00
DizzyEggg
794c9aa255
Merge pull request #121 from thechurchofcage/epsilon 
Three pointless moves
 2019-04-05 23:47:54 +02:00
DizzyEggg
7c8f69e6e3
Merge pull request #109 from Fontbane/patch-4 
Field Effects for Gen IV Abilities
 2019-04-05 23:40:30 +02: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
Fontbane
7bc3cdf527 Delete level variable 2019-04-05 10:16:41 -04:00
DizzyEggg
8751fafad1 Make it compile 2019-04-05 07:53:23 -05:00
DizzyEggg
dd24597d52 Finish up menu specialised 2019-04-05 07:53:23 -05:00
DizzyEggg
183b714ff1 Merge with master and fix web moves 2019-04-05 12:43:44 +02:00
AJ Fontaine
704f025a00 Fix a typo in as(s)istattackselect 2019-04-04 19:34:35 -05:00
Phlosioneer
1360b3a477 RGB Constants 2019-04-04 17:05:46 -04:00
ultima-soul
91a94a0ca1 Try to get closer to matching. 2019-04-03 21:13:26 -07:00
Fontbane
562ad70915 Removed Gen 4 Ability field effects 2019-04-01 23:07:21 -04:00
DizzyEggg
d39b5f6d26 Fix messing with move result flags when not needed 2019-04-02 00:14:01 +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