ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-11 06:05:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,755 Commits 1 Branch 0 Tags 235 MiB
499fb8071d
Commit Graph

838 Commits

Author SHA1 Message Date
Evan
c2dfc571b2 misty terrain blocks confusion 2021-01-16 12:21:04 -07:00
Evan
10b1d33d13 handle battler being affected by terrain 2021-01-16 12:05:51 -07:00
Evan
4a5a3ea6af add safeguard checks 2021-01-16 11:47:29 -07:00
Evan
9e29d303ec electric and misty terrain preventions 2021-01-16 11:40:02 -07:00
Evan
449c2bcc34 add config option 2021-01-15 18:28:10 -07:00
Evan
0d8f804194 update mental herb to gen 5 2021-01-15 18:11:55 -07:00
sbird
5d02cc2059 [battle_engine] fix wrap style move damage 2021-01-15 16:04:09 +01:00
LOuroboros
c2f718d3d3 Implemented Cramorant's Gulp Missile form change 2021-01-14 17:23:09 -03:00
Evan
9902f6e603 merge with be 2021-01-13 14:32:14 -07:00
GriffinR
b9e1b050e1 Label remaining battle types 2021-01-13 15:20:29 -05:00
Evan
56395a060f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2021-01-13 09:23:07 -07:00
surskitty
a0f1dcb9cf Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2021-01-10 15:40:21 -05:00
Evan
d4e4405cf5 merge with be 2021-01-10 09:04:21 -07:00
Evan
c95bfae701 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_hold_effects 2021-01-10 09:02:21 -07:00
Evan
e748db8ef4 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2021-01-10 08:58:16 -07:00
ultima-soul
b5b4efdaa0
Merge pull request #1314 from LOuroboros/battle_debug_constant 
battle_config.h tweaks
 2021-01-09 12:36:37 -08:00
ultima-soul
1caed479de
Merge pull request #1298 from ghoulslash/mummy 
Fix Early Mummy Activation
 2021-01-09 12:33:04 -08:00
Evan
6dabff1ee3 merge with be 2021-01-07 21:24:21 -07:00
Evan
2bd5167a6c eject pack 2021-01-07 21:11:56 -07:00
Evan
5eb49722c0 add red card effect 2021-01-07 19:33:39 -07:00
ultima-soul
d2d961e447
Merge pull request #1262 from LOuroboros/gen8_abilities_BE 
Implemented various Gen. 8 abilities
 2021-01-07 13:31:17 -08:00
LOuroboros
de9b0328ec Corrections to Steam Engine 2021-01-07 16:33:52 -03:00
LOuroboros
339aa95c1d Review corrections 
-Intrepid Sword and Dauntless Shield are now properly affecting the user
-Slightly tweaked Ball Fetch's effect, since an operation involving gBattleResults.catchAttempts was being done twice unnecessarily.
 2021-01-07 04:31:26 -03:00
Evan
bf644f23a7 add heavy duty boots 2021-01-06 20:53:48 -07:00
Evan
7fffe23e63 add terrain seeds 2021-01-06 20:22:05 -07:00
Evan
c1dd3fca21 add room service 2021-01-06 18:00:14 -07:00
Evan
0cdab790dc add blunder policy 2021-01-06 15:40:20 -07:00
Evan
db6f9d05ec add throat spray 2021-01-06 15:28:58 -07:00
Evan
aac3f9c3db kee, maranga, sitrus beries 2021-01-06 13:07:18 -07:00
Evan
c3615485f3 merge in berry branch 2021-01-06 12:54:02 -07:00
Evan
7646855e79 jaboca, rowap berry effects 2021-01-06 11:15:56 -07: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
d3ae05189d resist berry ripen boost 2021-01-05 22:21:38 -07:00
Evan
b3a6df8d57 stat raising berries 2021-01-05 22:13:32 -07:00
Evan
f046a25ce0 ripen & hp restoring berries 2021-01-05 21:15:21 -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
3246c20be5 Moved Power Spot's effect to CalcMoveBasePowerAfterModifiers 2021-01-05 19:51:52 -03:00
Evan
4923af960e steely spirit, screen cleaner, transistor, dragon's maw 2021-01-05 15:44:12 -07:00
Evan
5ae1e3c25b Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2021-01-04 11:43:36 -07:00
LOuroboros
517c8ffdd0 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities_BE 2021-01-03 22:05:14 -03:00
ExpoSeed
7dadcb94b8 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-03 17:14:43 -06:00
LOuroboros
da1f525d45 Made Alolan Marowak be affected by Thick Club 2021-01-03 09:58:19 -03:00
surskitty
aa9796a6ae Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip. 2020-12-31 18:57:36 -05:00
LOuroboros
320cc37ac9 USE_BATTLE_DEBUG -> B_ENABLE_DEBUG 2020-12-23 14:04:14 -03:00
Evan
a426092006 fix sticky barb theft in trainer battles 2020-12-22 08:35:11 -07:00
Evan
5bdf266000 add additional item theft check 2020-12-20 19:06:50 -07:00
Evan
7988a1f41d Ai_TryOnAlly and reorganize files 2020-12-20 14:47:20 -07:00
LOuroboros
819001c102 Removed redundant check in Punk Rock's effect 2020-12-19 19:15:12 -03:00
LOuroboros
a417a1b2b9 Corrected Punk Rock's checks 2020-12-19 16:18:39 -03:00
Evan
916d0416e3 outline AI_CheckGoodMove 2020-12-15 21:57:33 -07:00
Evan
259e59bae0 fix early mummy activation on two-turn moves 2020-12-14 12:27:48 -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
GriffinR
81d95b9325 Use BUGFIX for some inline fixes 2020-12-12 23:30:51 -05:00
LOuroboros
1f10b94a11 Implemented Power Spot 2020-12-12 21:22:42 -03:00
LOuroboros
305bea32df Added missing check to Flower Gift (offensive) 2020-12-12 20:32:52 -03:00
LOuroboros
8e187d1d5b Implemented Ice Scales 2020-12-12 19:39:35 -03:00
LOuroboros
55bc2b4bb9 Corrected small inconsistency in move flag names 2020-12-12 12:18:56 -03:00
LOuroboros
c930a63c84 Implemented Punk Rock 2020-12-11 19:46:33 -03: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
c9824a8dd9 Fixed Cotton Down 
It was tough, but the nightmare is finally over.
Ghoulslash, Blurose, Cancer Fairy, thanks to all of you guys!
 2020-12-07 20:08:36 -03:00
LOuroboros
c83c67ff8e Implemented Stalwart 2020-12-05 14:19:25 -03:00
LOuroboros
002973d373 Renamed BattleScript_TargetAbilityStatRaiseOnSwitchIn 
This battlescript is meant to be called within the case ABILITYEFFECT_ON_SWITCHIN of AbilityBattleEffects, which refers to the currently selected battler as Battler instead of Attacker or Target.
 2020-12-05 13:50:47 -03:00
LOuroboros
e2f4ca27b0 BattleScript_TargetAbilityStatRaiseOnSwitchin -> BattleScript_TargetAbilityStatRaiseOnSwitchIn 2020-12-05 02:43:29 -03:00
Evan
39cbc21925 fix trainer theft, update config option 2020-12-03 08:42:12 -05:00
LOuroboros
9e8913c698 Implemented Propeller Tail 2020-12-02 23:23:34 -03:00
LOuroboros
9e1d7cc827 Implemented Ball Fetch 2020-12-02 23:09:35 -03:00
LOuroboros
0c4c6fc778 Implemented Cotton Down 2020-12-02 22:53:00 -03:00
LOuroboros
e11fa09632 Implemented Intrepid Sword and Dauntless Shield and... 
-Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd
-Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin

Their labels reflect the instances of a battle in which they can be called.
 2020-12-02 19:07:08 -03:00
ExpoSeed
aa7facf57b
Merge pull request #1243 from ghoulslash/abilities 
Finish Switch In Ability Activation Messages
 2020-11-28 20:27:32 -06:00
Eduardo Quezada D'Ottone
7aa999af59
Merge pull request #1235 from ultima-soul/ability_expansion 
Expand Ability IDs to u16, Add SWSH Ability Data, and Remove Cacophony
 2020-11-28 14:56:01 -03:00
Evan
07a4400d50 finish switch in ability messages 2020-11-19 11:42:00 -07:00
ultima-soul
06e3097d44
Merge pull request #1234 from LOuroboros/guts 
Implemented Guts' missing effect
 2020-11-16 20:24:35 -08:00
Eduardo Quezada D'Ottone
27166a7147 Fixed UndoFormChange bug at the end of battles 2020-11-16 20:56:11 -03:00
LOuroboros
9c6a5f1ab6 Implemented Guts' missing effect 2020-11-16 20:22:59 -03:00
ultima-soul
e32659d4bb Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities. 2020-11-16 13:50:26 -08:00
Eduardo Quezada D'Ottone
4da357aef4 Fixed compatibility with Pokémon Expansion 2020-11-15 13:35:02 -03:00
ghoulslash
686ff59b11
Merge pull request #13 from AsparagusEduardo/PR-LGPE_IOA_Moves 
LGPE & Isle of Armor move data.
 2020-11-15 08:29:10 -07:00
Evan
66152538ec add back accidentally deleted item theft battle type checks 2020-11-13 13:42:49 -07:00
Evan
a05d8f7d43 fix conflicts 2020-11-13 11:21:15 -07:00
Evan
435f928aa4 opponent trainer theft config option. Clean up code a bit 2020-11-13 11:00:44 -07:00
Eduardo Quezada D'Ottone
e87f0f1ddb Review changes 2020-11-13 14:51:50 -03:00
ultima-soul
236d7145ae
Merge pull request #1220 from AsparagusEduardo/BE-SteelResistances 
Added config option for Steel type resistances.
 2020-11-12 23:25:21 -08:00
Evan
64bcac4589 move pickpocket to back of moveend sequence 2020-11-12 23:30:00 -07:00
ultima-soul
c3423b4212
Merge pull request #1206 from ExpoSeed/type-changing-moves 
Refactor move effects for type changing moves
 2020-11-12 19:10:48 -08:00
Evan
520f00f4ae add pickpocket 2020-11-11 18:08:46 -07:00
Eduardo Quezada D'Ottone
4b9d0d8e24 Added config option for Steel type resistances. 2020-11-11 17:48:02 -03: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
Eduardo Quezada D'Ottone
ddb6142709 Review changes 3. 2020-11-08 21:08:58 -03:00
Eduardo Quezada D'Ottone
35d5324324 Review changes. 2020-11-08 21:02:34 -03:00
ExpoSeed
7ea34968f9 Add damage calc for plates 2020-11-08 01:57:52 -06:00
ultima-soul
99fdc13e61 Merge branch 'master' into battle_engine_sync 2020-11-07 15:59:20 -08:00
Eduardo Quezada D'Ottone
09a5d6c722 Implemented Wish Mega Evolution 2020-11-07 10:13:32 -03:00
aaaaaa123456789
1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
Kurausukun
fe40c0c466 re-match BattleIntroOpponent1SendsOutMonAnimation 
a lot of functions and a bit of data had to be moved from battle_main.c
to battle_util.c; I have added a note to battle_util.c stating the
reason for this
 2020-10-26 05:52:00 -04:00
Kurausukun
077a2c23dc port HasNoMonsToSwitch fakematch fix (from #1181) 2020-10-25 23:45:42 -04:00
Eduardo Quezada
d596fa7e12 Merge remote-tracking branch 'RHH/battle_engine' into PR-MoveSplitOption 
# Conflicts:
#	include/battle_util.h
#	include/constants/battle_config.h
#	src/battle_util.c
 2020-10-23 21:49:59 -03:00
ultima-soul
84c134779a
Merge pull request #521 from AsparagusEduardo/BE-Identation 
Fixed indentation for various files.
 2020-10-23 08:46:17 -07:00
LOuroboros
00bc6ab96b More review corrections 2020-10-21 16:39:06 -03:00
LOuroboros
682d29b088 Removed the static variable from the ShouldGetStatBadgeBoost function 2020-10-21 15:30:20 -03:00
LOuroboros
503134167a Review corrections 2020-10-21 15:01:53 -03:00
LOuroboros
4794c63066 Reincorporated badge based stat boosts 2020-10-21 12:57:57 -03:00
Eduardo Quezada
1bc38feca5 Fixed indentation for various files. 2020-10-19 18:01:19 -03:00
Eduardo Quezada
a6e88b82ee Review changes and option to hide split icon. 2020-10-15 20:15:44 -03:00
LOuroboros
1635585e68
Removed duplicate inclusion of battle_config.h 
## Description
I think the title is self-explanatory, but the header file that is `include/constants/battle_config.h` is included twice unnecessarily.

## **Discord contact info**
Lunos#4026

As usual, if there's anything wrong please let me know.
 2020-10-15 02:59:48 -03:00
Eduardo Quezada
0d39b29691 Option to use Gen 3 Physical/Special split. 2020-10-15 00:16:50 -03:00
ExpoSeed
d4e58d9746 Fix style, sync moved functions properly 2020-10-13 09:40:01 -05:00
ExpoSeed
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -05:00
GriffinR
5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05:00
kiliwily
56848fb891 Update battle_util.c 2020-09-19 20:44:16 +02:00
aaaaaa123456789
7dc95a0103 Undo PokeCodec's PRs 
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.

Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
 2020-09-13 06:30:55 -03:00
kiliwily
5c3669e0cd Bug documenting 2020-09-12 18:43:20 +02:00
PokeCodec
34f54dd438 Fix Battle util fakematch 2020-09-08 20:46:08 -04:00
PokeCodec
6bb1d58a11 Finished header includes 2020-09-08 19:17:33 -04:00
PokeCodec
e84da39d8a Match BattleIntroOpponent1SendsOutMonAnimation 2020-09-08 18:54:51 -04:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
GriffinR
078c341b2b
Merge pull request #1122 from GriffinRichards/clean-battlemsg 
Add stat stage constants, clean up misc battle msg data
 2020-08-10 14:29:27 -04:00
GriffinR
5e8ffff62f Add stat stage constants 2020-08-04 20:38:57 -04:00
DizzyEggg
427bad6413 Fix Switch-in ability battler sometimes not properly printed 2020-07-28 10:18:44 +02:00
ExpoSeed
b401e2eb86 Fix naming style of function 2020-07-27 21:22:16 -05:00
ExpoSeed
71dc5edf2e Document some battle_util.c 2020-07-27 17:10:42 -05:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +02:00
DizzyEggg
1ad76ff3d2 Fix Aftermath on fainted 2020-07-26 12:32:02 +02:00
GriffinR
aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
DizzyEggg
14daa9f4a5 Inverse battles 2020-07-17 20:53:22 +02:00
DizzyEggg
42f48d1a61 Power Construct 2020-07-16 15:40:56 +02:00
DizzyEggg
759bde46bb Cheek Pouch 2020-07-16 15:20:03 +02:00
DizzyEggg
60d5d00dba Unnerve 2020-07-16 14:17:38 +02:00
DizzyEggg
ec4c73711e Rest Sleep Talk wake up awaraness 2020-07-15 21:30:24 +02:00
DizzyEggg
1a94d27fe6 Emergency Exit 2020-07-15 17:21:12 +02:00
DizzyEggg
3e27de72fa AI learns abilities which halve/double damage 2020-07-12 10:09:23 +02:00
DizzyEggg
1b56216d7c Dry Skin Weather fix 2020-07-11 14:25:57 +02:00
DizzyEggg
8c4f5f946d Curse defiant 2020-07-11 12:28:42 +02:00
DizzyEggg
fc510a6b44 oran berry doesnt activate when mons is kill 2020-07-08 17:22:10 +02:00
DizzyEggg
08a5ba0db2 Sitrus berry gen4 effect code 2020-06-29 18:56:19 +02:00
DizzyEggg
5a2d9fe9fe Fix Grassy Terrain bad loop 2020-06-29 18:26:53 +02:00
DizzyEggg
5ddb4634f5 berries work like in gen4 2020-06-29 18:04:13 +02:00
DizzyEggg
36aec5658c Transform Imposter Illusion fix 2020-06-29 13:45:27 +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
59ddebd727 Rocky Helmet softlock fix 2020-06-26 21:56:18 +02:00
DizzyEggg
5698af3742 Magic Guard leech seed and slight ai tweaks 2020-06-26 15:14:15 +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
LOuroboros
fa1e5d1a37
Fix Brine (#388) 
Addresses #387
 2020-05-24 10:05:26 +02:00
AJ Fontaine
12b08670f1
Fix confusion not working at all (#385) 2020-05-24 10:02:58 +02:00
ultima-soul
9ee5db6a96 Expand ability ids to u16. Thanks to ghoulslash for some assistance! 2020-05-18 14:54:12 -07:00
Eduardo Alvaro Quezada D'Ottone
4c5de0998a
Fixed chances of confusion self-damage. (#371) 2020-05-18 14:51:30 +02:00
DizzyEggg
98b2e88e56 Forewarn 2020-04-28 15:36:13 +02:00
DizzyEggg
36b52eb063 Shed Shell 2020-04-28 11:14:20 +02:00
DizzyEggg
432ae46570 Fix Acrobatics gem boost 2020-04-27 10:58:35 +02:00
Eduardo Alvaro Quezada D'Ottone
d529ac3b60
More Battle config (#352) 
* Binding move turns.

* Binding damage.

* Incineratable Gems.

* Flash Fire while frozen.

* Sleep turns.

* Synchronized natures %

* Confusion self damage chance.

* Fixed confused self-damage check
 2020-04-23 09:01:28 +02:00
DizzyEggg
d56aaf7c0b Destiny Knot 2020-04-22 14:40:44 +02:00
DizzyEggg
e2524bed49 Metronome item 2020-04-22 12:49:25 +02:00
DizzyEggg
633ebe6148 Schooling 2020-04-21 20:43:47 +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
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
Eduardo Alvaro Quezada D'Ottone
30900879a9
Option for setting Payback's damage double damage if the opponent switches out. (#338) 
* Option for setting Payback's damage double damage if the opponent switches out.

* Simplified

* Moody moved to ability settings
 2020-04-20 00:00:44 +02:00
DizzyEggg
dd17360ab0 Zen Mode and Shields Down 2020-04-19 21:18:39 +02:00
DizzyEggg
726af8efaa Moody small fix 2020-04-19 16:51:29 +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
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
ee8a00be81 some ability tweaks 2020-04-18 20:34:09 +02:00
DizzyEggg
6ef28be22b Innards Out 2020-04-18 20:12:29 +02:00
DizzyEggg
307bbcfe97 Stakeout 2020-04-18 19:15:24 +02:00
DizzyEggg
cbc0d8a57d Healer 2020-04-18 19:09:17 +02:00
DizzyEggg
1395a7d382 Loafing Around bug fix 2020-04-18 13:04:28 +02:00
DizzyEggg
a2813e63de Slow Start 2020-04-18 12:52:15 +02:00
DizzyEggg
b5ba1de7cf Intimidate affects defiant 2020-04-18 12:29:35 +02:00
DizzyEggg
34f5d9e2ae Burn Up And Purify 2020-04-17 21:14:26 +02:00
DizzyEggg
83b251a69c Stamina, Liquid Voice, Water Compaction 2020-04-15 09:37:12 +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
8f61445dfe Berserk 2020-04-12 12:41:26 +02:00
DizzyEggg
458809c5f7 Fix Payback not boosting on switching 2020-04-12 12:14:22 +02:00
DizzyEggg
d28992d2ed Anticipation clean-up 2020-04-11 12:34:53 +02:00
Eduardo Alvaro Quezada D'Ottone
6078cd3e15
Anticipation ability (#282) 2020-04-11 12:24:25 +02:00
DizzyEggg
bfd1874945 Assurance, attacker -> target fix 2020-04-11 12:18:58 +02:00
LOuroboros
3a202ea850
Made the opponent's self damage induced by the confusion status affect Assurance's power (#313) 2020-04-11 12:18:45 +02:00
DizzyEggg
1435cd4692 Change inner structure of semi invulerable moves 2020-04-11 11:47:13 +02:00
DizzyEggg
3d1b546e05 Eviolite 2020-03-14 12:23:51 +01:00
Eduardo Alvaro Quezada D'Ottone
1fc89941ac
Fixed Ability Pop Up for Immunity-type abilities with Mold Breaker. (#301) 
* Fixed Ability Pop Up for Immunity-type abilities with Mold Breaker

When a mon with Mold Breaker caused a status move to another one with an Immunity-type ability such as that mon healed inmiediatly from it, the ability pop up would incorrectly show the attacker's ability instead.

* Compressed 3 lines into one.
 2020-03-14 12:16:18 +01:00
DizzyEggg
cf4d5f6e59 Merge with master 2020-03-13 23:02:17 +01:00
Eduardo Quezada
f821303429 Using True/False on SetMoveEffect. 2020-03-07 16:54:13 -06:00
DizzyEggg
517974ebcb Can't Knock Off mega stones 2020-02-22 17:30:07 +01:00
Eduardo Alvaro Quezada D'Ottone
1acd82ece6
Added non-traceable abilities. (#275) 
* Added non-traceable abilities.

* Added ABILITIES_COUNT to array size
 2020-02-17 10:59:39 +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
14bc2f65f3 Fix AI trying to switch when it can't, also ghosts can escape 2020-02-08 14:20:02 +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
Eduardo Alvaro Quezada D'Ottone
b87dac459b Implemented missing Neuroforce. (#242) 
* Added ID, name and description.

* Added damage multiplier.
 2020-01-18 18:34:04 +01:00
DizzyEggg
ed46cde304 Fix Persim Berry and cure attract battler assignment 2020-01-06 21:33:44 +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
7051f261d1 Fix Queenly Majesty 2019-12-31 13:33:54 +01:00
DizzyEggg
770a57bec7 Fix some moves hitting the user 2019-12-30 13:14:20 +01:00
DizzyEggg
77842b0376 Contact moves for Aftermath and Bestow for Unburden 2019-12-25 12:19:09 +01:00
DizzyEggg
eb029d557b
Merge pull request #215 from LOuroboros/aftermath 
Implemented Aftermath's effect
 2019-12-25 12:04: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
63621da46c Heatproof lowers burn dmg 2019-12-23 17:41:42 +01:00
DizzyEggg
cec9e177d6 Gooey add check for not displaying ability pop up when not necessary 2019-12-23 17:26:48 +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
ultima-soul
1146de4561 Implement Unburden. 2019-12-21 23:09:06 -08:00
LOuroboros
c690d577a5 Implemented Aftermath's effect 2019-12-21 05:01:42 -03:00
Fontbane
40b7d8573d Gooey and Tangling Hair 2019-12-20 17:38:38 -05:00
Fontbane
186822ed0c Fix missing parentheses 2019-12-19 13:53:07 -05:00
Fontbane
8b3a40162b Queenly Majesty 2019-12-19 13:50:19 -05:00
ultima-soul
029ab67ff4 Implement Leaf Guard. 2019-12-16 00:29:20 -08: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
a4191040c9 Sync weather names 2019-12-06 19:05:28 -06:00
DizzyEggg
149b3453f6 Fix Punishment dmg 2019-11-03 19:58:04 +01:00
DizzyEggg
1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01:00
DizzyEggg
780517fec7 Fix weather for pre gen6 2019-10-26 18:28:02 +02:00
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
GriffinR
73b96fe145 Rename CONTACT macros to ON_DAMAGE 2019-09-27 12:27:36 -04:00
GriffinR
1016b23918
Merge branch 'master' into rename-tablecmds 2019-09-26 15:02:38 -04:00
GriffinR
06af24bce5 Use misc ScrCmd constants 2019-09-16 19:44:47 -05:00
GriffinR
bb236b490d Update BS constants for Cmd rename 2019-09-15 17:58:12 -04:00
DizzyEggg
f979987c2f Fix Intimidate and Trace on new switch in system 2019-08-30 12:25:21 +02:00
DizzyEggg
63355d6a3b Fix no targets issue and switching faint issu 2019-08-26 14:55:55 +02: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
2c2b807a57 Special Def boost for rock types in sandstorm 2019-08-05 11:48:50 +02:00
DizzyEggg
34a7b8bf76 Burn affects physical moves only 2019-08-05 11:30:25 +02:00
DizzyEggg
2863045241 Fix switch-in abilities text/pop-up 2019-08-05 11:24:49 +02:00
DizzyEggg
48c801245c Fix Synchronize 2019-06-25 13:04:14 +02:00
DizzyEggg
aade9f5f5a Cherrim 2019-06-16 09:30:05 +02:00
DizzyEggg
c80861d85e Add hopefully support for Cherrim 2019-06-15 14:46:35 +02:00
DizzyEggg
594b363730 Fix Assurance 2019-06-12 13:57:14 +02:00
DizzyEggg
dd5c9c790d Fix Flash Fire string 2019-06-11 10:57:02 +02:00
DizzyEggg
01ee73adf6 Fix Flame Body Static ability pop-up activation 2019-05-23 09:47:21 +02:00
DizzyEggg
e00890a555 Fix Air Baloon msg 2019-05-20 12:20:49 +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
a9b4d0208b Move new species to battle_config.h 2019-05-17 10:38:48 +02:00
DizzyEggg
6624306024 Ring Target 2019-05-16 10:40:44 +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
Papa Cancer
c4acc3dbf8
Merge branch 'battle_engine_v2' into beta 2019-04-20 16:49:57 +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
31222ef64b Add held effect debug override 2019-04-13 14:56:26 +02:00
DizzyEggg
549a9cdcc2
Merge pull request #118 from thechurchofcage/beta 
Stomping Tantrum
 2019-04-13 14:09:15 +02:00
DizzyEggg
cf73a3ba28
Merge pull request #126 from thechurchofcage/zeta 
Ability-ignoring moves
 2019-04-08 15:21:08 +02:00
Papa Cancer
fc8e59403a Ability-ignoring moves 
Just Moongeist Meme and Sunsteel Strike for now. Added a special flag and modified "GetBattlerAbility" to check the current move for it.
 2019-04-07 13:03:40 +01: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
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
DizzyEggg
b0223f691f Clean up data headers 2019-04-05 07:53:23 -05:00
DizzyEggg
89f766b75b Remove unneded variable 2019-04-02 00:17:15 +02: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
DizzyEggg
944dc4f6bf Merge with master 2019-04-01 13:40:42 +02:00
DizzyEggg
62192b86f7 Aroma Veil 2019-04-01 11:42:37 +02:00
DizzyEggg
b12334c88b Remove cases from ABE, add functionality of Flower Veil 2019-03-31 21:38:58 +02:00
Marcus Huderle
462b196abc Give battle_anim files appropriate names 2019-03-31 12:15:39 -05:00
DizzyEggg
86e8bf0ecb Cursed Body PP check 2019-03-30 11:58:19 +01:00
DizzyEggg
e2268bd938 Imposter check for semi invulnerable 2019-03-30 11:56:15 +01:00
DizzyEggg
876be1d9cd
Merge pull request #104 from thechurchofcage/beta 
Spiky Shield
 2019-03-30 11:21:27 +01:00
Papa Cancer
a3b4767dd2 Spiky Shield 
Created generic string "Atk was hurt by Def's BUFF" for use for both Spiky Shield and Rough Skin - can also be used for Aftermath and Rocky Helmet, when programmed
 2019-03-26 17:45:34 +00:00
AJ Fontaine
cf0e38b11f
Can't Knock Griseous Orb Off Giratina 
I'll do Plates Drives and Memories later
 2019-03-24 22:33:54 -04:00
Papa Cancer
61a7bd2788 Taunt fix etc. 
Taunt now works for the correct number of turns and has its own ending string - made by reusing the "Heal Block ends" string as a multi-purpose "X wore off" one. Fixed a bug in PREPARE_STRING_BUFFER and touched up the ENDTURN timers for various STATUS3's.
Heal Block now displays the correct string when preventing usage of a move.
 2019-03-24 12:54:01 +00:00
DizzyEggg
7018745230 Fix Defiant stat raise by allies 2019-03-23 17:21:14 +01:00
DizzyEggg
d1fb5fa148 Remove unnecessary condition from Cursed Body 2019-03-23 16:59:58 +01:00
DizzyEggg
b8a634770f Touch up Weak Armor 2019-03-23 16:56:56 +01:00
DizzyEggg
b9052fb37d Touch Up Justified and Rattled 2019-03-23 16:37:56 +01:00
DizzyEggg
e135ea47e5 Touch up Anger Point 2019-03-23 16:33:08 +01:00
DizzyEggg
34cbb26e5e Synchronoise third type support 2019-03-08 10:30:23 +01:00
DizzyEggg
fddb5159b4 Merge with master 2019-03-05 21:46:45 +01:00
Papa Cancer
2050ac3963 Grassy Terrain v2 
All corrected, simplest version
Also includes proper ending strings for all terrains
 2019-03-05 19:13:25 +00:00
DizzyEggg
b150091436 Rename an erroneously named battlescript 2019-03-05 17:06:29 +01:00
Phlosioneer
4ea5e85bed Fix typos 
This is an updated version of #554, since it hasn't been updated in two
weeks.
 2019-03-03 09:31:47 -06: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
DizzyEggg
5c3d755ac6 Effect Spore not affected by overcoat 2019-03-02 22:48:55 +01:00
DizzyEggg
bf70861798 Powder moves on grass types 2019-03-02 13:08:50 +01:00
DizzyEggg
eea162d3d8 Effect Spore ability pop-up 2019-03-01 13:59:08 +01:00
DizzyEggg
df9e6a6889 Free up two status3 flags 2019-02-25 16:17:23 +01:00
DizzyEggg
a16a5f43a0 Fix Pursuit dbl damage on switch 2019-02-24 09:55:21 +01:00
DizzyEggg
a001faeced New AI command for using priority moves in death situatiions 2019-02-16 14:54:17 +01:00
DizzyEggg
c1f9032989 Defiant and Competitive 2019-02-16 12:54:11 +01:00
DizzyEggg
94cd547e9a Change move effect to u16 2019-02-14 13:17:27 +01:00
DizzyEggg
3d616dfffe Add Surge Abilities 2019-02-09 14:30:16 +01:00
DizzyEggg
872389b15c Fix Download raising the wrong stat 2019-02-09 13:30:45 +01:00
DizzyEggg
6a186b5d5a Fix Sap Sipper 2019-02-07 21:33:03 +01:00
DizzyEggg
f415871369 Merge with master 2019-02-03 10:44:05 +01:00
DizzyEggg
a3460c9e45 Code Belch effect 2019-02-01 14:17:24 +01:00
DizzyEggg
d46e60765d Rename a palace battle field 2019-01-29 22:22:02 +01:00
DizzyEggg
7bc4a3b3f7 Merge with master 2019-01-29 22:12:53 +01:00
Marcus Huderle
e81838dba3 Misc. documentation and move some data into .c files 2019-01-29 14:36:02 -06:00
DizzyEggg
736826e863 New feature - battle 2 vs 1 opponent 2019-01-27 20:54:34 +01:00
DizzyEggg
abd518b668 Refactor GF's idiotic coding 2019-01-27 13:52:02 +01:00
DizzyEggg
6653ecf676 Fix Safari zone bug 2019-01-27 11:47:36 +01:00
DizzyEggg
fac9631235 Fix Sandstorm raining 2019-01-19 11:22:49 +01:00
DizzyEggg
aecc87447a Use more damage look-up tables 2019-01-05 19:02:01 +01:00
DizzyEggg
78d7c29290 Move buffers to allocated reousrces, get rid of old type effectiveness table 2019-01-05 16:00:57 +01:00
DizzyEggg
97b246368d Add Contrary 2018-12-26 19:12:07 +01:00
DizzyEggg
517573eb4b Update with master 2018-12-26 17:46:51 +01:00
melthelesbian
2dd706ca54 use max mon moves constant where able (#480) 
* use max mon moves constant where able

* fix errors in script commands file

* fix more errors
 2018-12-25 11:50:15 -06:00
DizzyEggg
bd817d70d6 Refactor battle intro, allow to speed it up 2018-12-23 18:47:00 +01:00
DizzyEggg
f7a7ddde0c Fix Quick Guard 2018-12-22 15:10:24 +01:00
DizzyEggg
e54dd6a02b Merge with master 2018-12-22 13:53:07 +01:00
DizzyEggg
180aa839c4 Fix conflicts 2018-12-09 13:12:02 +01:00
DizzyEggg
5caca7a4d6 Clean up field weather 2018-12-08 19:43:21 +01:00
DizzyEggg
4c23adb5f5 Decompile field weather 2018-12-08 19:05:03 +01:00
DizzyEggg
6068495619 Document trainer battle scripts (#430) 2018-12-07 16:50:56 -06:00
DizzyEggg
b9e711bbf4 Add Powder 2018-12-03 12:50:32 +01:00
DizzyEggg
d46c3ebe5b Fix Future Sight 2018-12-02 18:47:39 +01:00
DizzyEggg
945575f5d6 Fix atk canceller 2018-12-02 17:58:21 +01:00
DizzyEggg
6ae949e360 Psychic Terrain blocks priority moves 2018-12-01 11:35:49 +01:00
DizzyEggg
1a8859b1d8 Add Dazzling 2018-11-30 22:12:18 +01:00
DizzyEggg
5aff99b015 Fix Stored Power's Power 2018-11-30 20:52:39 +01:00
DizzyEggg
7a69f9cb0d Add Dream Eater blocked by heal block 2018-11-30 20:48:43 +01:00
DizzyEggg
a0699dba52 Add Aromatic Mist 2018-11-25 12:59:22 +01:00
DizzyEggg
5fea7e3216 Fix overworld weather 2018-11-23 23:07:02 +01:00
DizzyEggg
623f1963b7 Merge with master 2018-11-18 20:49:52 +01:00
DizzyEggg
1b0cfb0757 Party Size and Num Stats 2018-11-18 20:00:36 +01:00
DizzyEggg
6cb262aa20 un-static a function 2018-11-18 11:09:40 +01:00
DizzyEggg
c2a3cff814 Fix physical atk stat stage and third type 2018-11-17 23:47:35 +01:00
DizzyEggg
15b8046b2b Add third type 2018-11-17 12:10:24 +01:00
DizzyEggg
65036b9a09 Merge with master 2018-11-15 21:53:32 +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
b3ad32bbe6 Merge with master 2018-10-14 20:51:34 +02:00
DizzyEggg
b73611bccb clean battle structs 2018-10-14 18:10:54 +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
ada76cbe4f Synchronoise and Smack Down 2018-09-29 15:43:56 +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
60e8c80c4c Merge branch 'master' into battle_engine_v2 2018-09-22 19:14:56 +02:00
DizzyEggg
e362c06aea gRandomMove to gCalledMove 2018-09-22 18:41:00 +02:00
DizzyEggg
db44a7e25a Techno Blast and Autotomize 2018-09-22 17:27:51 +02:00
DizzyEggg
ca9876b0b4 Updated Wrap Mechanics, Infestation, stat changing move effects 2018-09-22 12:20:33 +02:00
DizzyEggg
0755240fbc link battles mega evo fix hopefully????? 2018-09-20 17:59:17 +02:00
DizzyEggg
2bae70a66b Convert mega related struct fields to a seperate struct 2018-09-20 17:33:27 +02:00
DizzyEggg
c7ca7b6e8e Fix mega evolution allowing to evolve two mons in doubles 2018-09-20 12:55:12 +02:00
DizzyEggg
602c1322e4 almost full support for link battles mega evolution 2018-09-20 11:23:12 +02:00
DizzyEggg
abebf479a6 Tweak mega evo to hopefully be compatibile with recorded battles. 2018-09-17 20:37:33 +02:00
DizzyEggg
2042788fdc Mega Evolution done except sprites. 2018-09-16 21:08:49 +02:00
DizzyEggg
55f21c1776 Mega Evolution support is mostly done. 2018-09-16 18:55:32 +02:00
DizzyEggg
f9af3bec9b merge with master 2018-09-02 00:07:19 +02:00
DizzyEggg
44ba432dad Label various battle scripts 2018-09-01 20:00:13 +02:00
DizzyEggg
674d35861c Couple bug fixes 2018-08-11 12:16:00 +02:00
DizzyEggg
de85f88bbb Support for two typed moves. 2018-08-05 13:57:37 +02:00
DizzyEggg
5fbeef860c Bulletproof and a couple of new moves 2018-08-05 13:39:22 +02:00
DizzyEggg
2218949d7c Topsy Turvy and Ion Deluge. 2018-08-04 23:34:29 +02:00
DizzyEggg
eb4d9f6fed Tabs to spaces 2018-08-03 00:24:10 +02:00
DizzyEggg
d6537c811b Battle code enums in case switches 2018-08-03 00:13:44 +02:00
DizzyEggg
92f3d89598 Gravity and Heal Block preventing after choosing a move 2018-08-02 21:27:28 +02:00
DizzyEggg
198a1a8646 Proper Sound moves and substitute 2018-08-02 20:24:18 +02:00
DizzyEggg
0f29610a61 Flying type pokemon can take ground type moves damage if grounded 2018-07-31 23:21:42 +02:00
DizzyEggg
b73075f822 Update Unusable Moves 2018-07-31 23:09:47 +02:00
DizzyEggg
3d93da7133 Add Imposter 2018-07-29 12:21:28 +02:00
DizzyEggg
d628d1f5fd Move Weather Ball, Hidden power, AI support for dynamic type moves and AI debug support 2018-07-29 11:32:40 +02:00
DizzyEggg
ec9693c797 ate abilities 2018-07-28 18:41:57 +02:00
DizzyEggg
3a0c244f40 Add Harvest 2018-07-28 17:13:47 +02:00
DizzyEggg
b3e6dc8457 Add Gluttony 2018-07-28 16:33:01 +02:00
DizzyEggg
9088c0bdb5 Introduce battle config; Snow Warning Done. 2018-07-27 23:40:10 +02:00
DizzyEggg
16d38f5343 Add a couple of gen5 abilities 2018-07-26 21:56:23 +02:00
DizzyEggg
f8b1f0a45c Stealth Rock and Toxic Spikes 2018-07-24 21:47:00 +02:00
DizzyEggg
6570324432 New crit calculator. 2018-07-23 21:36:05 +02:00
DizzyEggg
831816e9b2 Switch-in abilities with a message 2018-07-22 22:21:47 +02:00
DizzyEggg
6a7d58003b Add Bad Dreams 2018-07-22 21:05:12 +02:00
DizzyEggg
fdd8765256 Add Storm Drain redirection 2018-07-22 19:34:13 +02:00
DizzyEggg
fee81d03ab A couple of gen4 abilities 2018-07-22 18:40:18 +02:00
DizzyEggg
b203cf4ca4 Add a couple of gen4 moves battlescripts 2018-07-21 16:34:43 +02:00
DizzyEggg
6cffd5b045 Add new field end turn effects 2018-07-21 13:24:20 +02:00
DizzyEggg
66a3c13f49 Add new Side turn effects 2018-07-21 12:56:07 +02:00
DizzyEggg
382f640809 Start Side/Field end turn 2018-07-21 12:10:08 +02:00
DizzyEggg
1468107002 Add Roost endturn effect 2018-07-19 21:18:20 +02:00
DizzyEggg
f3be5ad22d Do new battler end turn effects. 2018-07-18 22:07:48 +02:00
DizzyEggg
81b29ae7c1 Merge with pokeemerald 2018-07-16 22:45:06 +02:00
DizzyEggg
bf0178238a Battle files - review changes 2018-07-16 20:47:30 +02:00
DizzyEggg
9c7db9f45e New AI damage and type functions 2018-07-15 12:39:07 +02:00
DizzyEggg
5a38bb61db Basic damage calc is ready. 2018-07-14 22:56:03 +02:00
DizzyEggg
c00fa14b66 Create template of new dmg calc 2018-07-14 19:29:25 +02:00
DizzyEggg
2ebf14a83d Get rid of scripting dmg multiplier 2018-07-14 18:58:45 +02:00
DizzyEggg
939127bfff Important battle util functions 2018-07-14 16:41:14 +02:00
DizzyEggg
b24427f3bf Introduce Field Statuses 2018-07-14 13:17:10 +02:00
DizzyEggg
008d961b2a add party menu defines 2018-07-07 19:57:09 +02:00
DizzyEggg
d2e47323fe document frontier related 2018-07-01 11:15:42 +02:00
DizzyEggg
272b98da6c document party status summary 2018-06-28 21:06:32 +02:00
DizzyEggg
b846015343 more battle files cleaning 2018-03-01 00:59:52 +01:00
DizzyEggg
919f803214 correct move target defines 2018-02-26 13:24:46 +01:00
DizzyEggg
2736c0fd4a add more const pokemon data, clear include 2018-02-11 23:46:50 +01:00
DizzyEggg
084ba7a7a4 decompile all pokemon files 2018-02-10 13:24:03 +01:00
DizzyEggg
9df5e16343 more battle labels 2018-02-08 12:13:29 +01:00
DizzyEggg
96290f4ee3 pokemon and battle constants 2018-02-08 11:17:41 +01:00
DizzyEggg
a10fd5a7c4 create more battle constants 2018-02-08 00:35:13 +01:00
DizzyEggg
caf9af321d get rid of unnecessary externs 2018-02-08 00:00:25 +01:00
DizzyEggg
5ac6cc4860 move battle vars to c file 2018-02-07 22:53:40 +01:00
camthesaxman
c3dc14ba66 more renaming 2018-02-06 16:09:39 -06:00
camthesaxman
6a4967689e more renaming 2018-02-06 13:48:02 -06:00
camthesaxman
f78fa6aabf rename bank to battler 2018-02-05 19:46:59 -06:00
camthesaxman
c3c13d0acf more renaming 2018-01-16 15:12:38 -06:00
camthesaxman
157b88b6db identity -> position 2018-01-16 14:01:31 -06:00
DizzyEggg
4f950d698c dump battle animation scripts 2017-12-31 16:28:57 +01:00
camthesaxman
c681b482c2 convert more constants 2017-12-11 12:27:51 -06:00
camthesaxman
19fbf024ff fix merge conflicts 2017-12-05 12:42:30 -06:00
camthesaxman
00896cb3b5 rename rng.c to random.c and rom4.c to overworld.c 2017-12-05 12:27:33 -06:00
camthesaxman
caa13f8777 convert some constants to C headers 2017-12-05 11:55:48 -06:00
DizzyEggg
790df7159e more battlescript labels 2017-12-03 00:47:21 +01:00
DizzyEggg
d75e7ace1d label battle stuff 2017-12-02 14:08:55 +01:00
DizzyEggg
7144b3b7af fix flavour flavor not building, fuccing americans 2017-11-27 21:24:34 +01:00
Cameron Hall
6e317c6463
Merge pull request #124 from DizzyEggg/dump_battlescripts 
Dump Battle Scripts
 2017-11-27 14:00:29 -06:00
DizzyEggg
237261e193 berry blender review changes 2017-11-27 20:03:41 +01:00
DizzyEggg
d48392e677 change battle variables names 2017-11-26 18:07:00 +01:00
DizzyEggg
59f64c622b name more battlescripts 2017-11-26 17:26:11 +01:00
DizzyEggg
1bb5b1fd07 more battle labels 2017-11-26 17:15:28 +01:00
DizzyEggg
8c30c42c36 more labelling and changes 2017-11-26 14:17:02 +01:00
DizzyEggg
9886eeb5d8 fix, rename, label battle labels and battlescripts 2017-11-26 13:26:58 +01:00
DizzyEggg
cc572f7c00 clear battle code and battlescripts 2017-11-26 11:55:17 +01:00
DizzyEggg
9151a6d094 dump battlescripts, rename battlescripts 2017-11-25 18:42:31 +01:00
Diegoisawesome
ce0e5cbfe4 Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps 2017-11-15 00:47:34 -06:00
DizzyEggg
716590c165 one more battle label change 2017-11-12 17:11:06 +01:00
DizzyEggg
9febe24d9f label some battle struct fields 2017-11-12 17:06:31 +01:00
Diegoisawesome
09e431077a Merge remote-tracking branch 'pret/master' into dump_maps 2017-11-09 20:30:56 -06:00
Diegoisawesome
e6ef86e4b0 Update variable and flag names 2017-11-08 15:20:10 -06:00
DizzyEggg
1f3a867a0b battle link partner controller is done 2017-10-23 16:38:11 +02:00
Diegoisawesome
f6af9e7013 Merge pull request #77 from DizzyEggg/match_abe 
ABE
 2017-10-13 13:30:46 -05:00
PikalaxALT
52db3ad5aa Decompile TV (#80) 
* ClearTVShowData

* special_0x44

* DoTVShow (nonmatching because align)

* DoTVShowBravoTrainerPokemonProfile

* Update field names

* DoTVShowBravoTrainerBattleTower

* Renaming of struct fields

* sub_80EBFF4 and UpdateTVScreensOnMap

* SetTVMetatilesOnMap

* Power buttons for the TV screens on the map

* special_0x45

* sub_80EC18C

* special_0x4a

* ResetGabbyAndTy

* GabbyAndTyBeforeInterview

* GabbyAndTyAfterInterview

* Through IsTVShowInSearchOfTrainersAiring

* GabbyAndTyGetLastQuote

* GabbyAndTyGetLastBattleTrivia

* GabbyAndTySetScriptVarsToFieldObjectLocalIds

* InterviewAfter; use TVShow as a precursor for making the individual show structs anonymous

* Make TV structs anonymous within the union

* Move the TV union to its own subheader

* Move TV show enums to the global.tv.h subheader

* Funcion renaming

* Apply static attributes where able

* PutPokemonTodayCaughtOnAir

* sub_80EC8A4

* PutPokemonTodayFailedOnTheAir

* sub_80EC9E8, sub_80ECA10

* sub_80ECA38

* sub_80ECB00

* Put3CheersForPokeblocksOnTheAir

* PutFanClubSpecialOnTheAir

* ContestLiveUpdates_BeforeInterview

* Other before-interview Contest Live Updates functions

* ContestLiveUpdates_BeforeInterview_5

* InterviewAfter_BravoTrainerPokemonProfile

* BravoTrainerPokemonProfile_BeforeInterview1

* BravoTrainerPokemonProfile_BeforeInterview2

* Disassemble TV data

* Decompile TV data

* InterviewAfter_BravoTrainerBattleTowerProfile

* SaveRecordedItemPurchasesForTVShow

* PutNameRaterShowOnTheAir

* StartMassOutbreak

* PutLilycoveContestLadyShowOnTheAir

* InterviewAfter_FanClubLetter

* Rip TV strings

* InterviewAfter_RecentHappenings

* InterviewAfter_PkmnFanClubOpinions

* sub_80ED718

* EndMassOutbreak

* sub_80ED888

* sub_80ED8B4

* UpdateMassOutbreakTimeLeft

* sub_80ED950

* PutFishingAdviceShowOnTheAir

* through sub_80EDA80

* ewram and common syms are now fetched from the object files

* BSS symbols are taken from the tv.o file

* through sub_80EDC60

* sub_80EDCE8

* sub_80EDD78

* through sub_80EDE84

* nomatching sub_80EDE98

* sub_80EDFB4

* sub_80EE104

* sub_80EE104

* sub_80EE184

* sub_80EE2CC

* sub_80EE35C

* sub_80EE44C

* sub_80EE4DC

* sub_80EE5A4

* sub_80EE69C

* sub_80EE72C

* sub_80EE7C0

* sub_80EE818

* sub_80EE8C8

* sub_80EEA70

* sub_80EEB98

* sub_80EEBF4

* through sub_80EED60

* Functions relating to Pokemon News

* sub_80EEF6C

* GetPriceReduction

* IsPriceDiscounted

* sub_80EF120

* through sub_80EF370

* sub_80EF40C

* HasMixableShowAlreadyBeenSpawnedWithPlayerID

* TV_SortPurchasesByQuantity

* FindActiveBroadcastByShowType_SetScriptResult

* InterviewBefore

* through sub_80EF88C

* through sub_80EF93C

* through sub_80EFA24

* through TV_BernoulliTrial

* sub_80EFB58

* sub_80EFBA4

* sub_80EFBDC

* through sub_80EFD98

* ChangePokemonNickname

* ChangeBoxPokemonNickname

* sub_80EFF9C

* through player_id_to_dword

* CheckForBigMovieOrEmergencyNewsOnTV

* GetMomOrDadStringForTVMessage

* sub_80F01E8

* sub_80F0358

* sub_80F049C

* TV record mixing functions

* sub_80F06D0

* sub_80F0708 nonmatching

* through sub_80F0B24

* sub_80F0B64

* through sub_80F0C04

* sub_80F0C7C

* sub_80F0D60

* sub_80F0E58

* sub_80F0E84

* through sub_80F0F24

* sub_80F0F64

* sub_80F1208

* sub_80F1254

* sub_80F1290

* sub_80F12A4

* sub_80F14F8

* DoTVShowTodaysSmartShopper

* DoTVShowTheNameRaterShow

* DoTVShowPokemonTodaySuccessfulCapture

* DoTVShowPokemonTodayFailedCapture

* DoTVShowPokemonFanClubLetter

* DoTVShowRecentHappenings

* DoTVShowPokemonFanClubOpinions

* DoTVShowPokemonNewsMassOutbreak

* DoTVShowPokemonContestLiveUpdates

* DoTVShowPokemonBattleUpdate

* DoTVShow3CheersForPokeblocks

* DoTVShowInSearchOfTrainers

* Label GabbyAndTyData fields; remove ddump comments from data/text/tv.inc

* DoTVShowPokemonAngler

* DoTVShowTheWorldOfMasters; update RAM symbols and field names

* Decorate static functions

* DoTVShowTodaysRivalTrainer; region map enums

* TVDewfordTrendWatcherNetworkTextGroup

* DoTVShowHoennTreasureInvestigators

* DoTVShowFindThatGamer

* DoTVShowBreakingNewsTV

* DoTVShowSecretBaseVisit

* DoTVShowPokemonLotterWinnerFlashReport

* DoTVShowThePokemonBattleSeminar

* DoTVShowTrainerFanClubSpecial, DoTVShowTrainerFanClub

* DoTVShowSpotTheCuties

* DoTVShowPokemonNewsBattleFrontier

* DoTVShowWhatsNo1InHoennToday

* Helpers for DoTVShowSecretBaseSecrets

* DoTVShowSecretBaseSecrets

* DoTVShowSafariFanClub

* Finish decompilation of tv.s

* Some renaming

* Rename text group pointers

* revoke statis; pokenews enums

* Labels are number one

* Label all TV struct fields

* Make data/text/tv.inc more readable

* Split data/text/tv.inc

* Rename pokenews text pointers

* Frontier Symbol constants; indicate static rodata objects with 's' prefix

* Fix leading spaces/tabs

F*** CLion sometimes

* Fix inconsequential warning
 2017-10-13 10:09:36 -05:00
DizzyEggg
4178e32ec9 ABE is matching 2017-10-12 17:49:24 +02:00
DizzyEggg
7b88c7f2f0 move const data to battle files 2017-10-06 19:09:37 +02:00
DizzyEggg
3cc20c7c3f battle 2 is done 2017-10-06 17:06:45 +02:00