ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 20:24:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,413 Commits 1 Branch 0 Tags 235 MiB
7b3f72f5ff
Commit Graph

649 Commits

Author SHA1 Message Date
ghoulslash
a1e64fce4f handle simple beam, gastro acid 2021-11-01 13:50:57 -04:00
BuffelSaft
fb25e1ac98 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2021-11-01 22:37:23 +13:00
ghoulslash
28bc7dc14d start ability 2021-10-29 22:32:19 -04:00
ghoulslash
204748e01a fix recycle and harvest 2021-10-28 17:52:52 -04:00
LOuroboros
a77f058146 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser 2021-10-28 14:24:43 -03: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
8c35a68060 Quick syntax tweaks 2021-10-27 11:19:39 -03:00
LOuroboros
fc7f1acf20 Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser 2021-10-27 11:13:59 -03:00
Eduardo Quezada D'Ottone
382ec13492
Merge pull request #1752 from ghoulslash/quick_draw 
Quick Draw
 2021-10-22 22:39:03 -03:00
Eduardo Quezada D'Ottone
d0253640fb
Merge pull request #1739 from LOuroboros/primalReversionBE 
Implemented Primal Reversion
 2021-10-22 22:27:45 -03:00
ghoulslash
416c517e49
Merge pull request #1786 from Xavion3/damage_debug 
Adds simulated damage to the debug menu
 2021-10-19 12:14:38 -04:00
ghoulslash
eda99fcf29
Merge pull request #1742 from AsparagusEduardo/be_gStatuses4 
Add gStatutes4
 2021-10-19 08:45:47 -04:00
Xavion3
150dd7c633 Add damage information to the debug menus 2021-10-19 22:39:07 +11: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
5509ceea04 expand move target field 2021-10-16 16:10:45 -04:00
BuffelSaft
df2223a5bc
Merge pull request #1745 from LOuroboros/retaliate 
Implemented Retaliate's effect
 2021-10-16 22:49:32 +13:00
LOuroboros
3b6ceb1dfa Turned Retaliate into a side timer 2021-10-16 06:04:04 -03:00
LOuroboros
3a25bce185 Turned Retaliate's effect into a side status 2021-10-15 06:03:48 -03:00
LOuroboros
1f97198267 Oops, I forgot to take the opponent's side into account 2021-10-15 05:02:14 -03:00
BuffelSaft
e59be67023 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2021-10-15 16:25:11 +13:00
Eduardo Quezada D'Ottone
21837b659a
Merge branch 'battle_engine' into bug_bite 2021-10-14 19:46:50 -03:00
ghoulslash
a3d2bdc9cf merge with be 2021-10-13 18:30:53 -04:00
GriffinR
def6cc8158 Label battle script macro arguments 2021-10-13 17:44:04 -04:00
GriffinR
fc15b0d5f0 Add controller buffer constants, finish misc battle doc 2021-10-13 16:21:39 -04:00
ghoulslash
3248bd796a add quick draw 2021-10-12 21:49:18 -04:00
GriffinR
b0598b1aef Clean up recorded_battle, add MOVE_IS_PERMANENT 2021-10-12 01:14:17 -04:00
LOuroboros
6c550cd749 Implemented Retaliate's effect 2021-10-11 03:19:21 -03:00
ghoulslash
06bcfea3b8 merge with be 2021-10-10 19:56:33 -04:00
Eduardo Quezada D'Ottone
cf6e3873b4 Moved Electrified to Status4. 2021-10-10 01:13:23 -03:00
LOuroboros
91a68cd5db Implemented Primal Reversion 2021-10-09 00:36:41 -03:00
BuffelSaft
07bdd2ffe6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2021-10-09 15:18:51 +13:00
GriffinR
31b501e7eb Start misc battle documentation 2021-10-08 16:39:46 -04:00
ghoulslash
4aeadd96c9 merge with be 2021-10-06 14:49:23 -04:00
ghoulslash
ee3a2c97ee Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball 2021-10-06 13:54:40 -04:00
GriffinR
739e7d3c31 Document summary screen sprite manager 2021-10-02 23:47:59 -04:00
ghoulslash
761006a164 merge with be 2021-09-26 19:19:32 -04:00
Eduardo Quezada D'Ottone
e87c170db0 Merge branch 'BattleEngine' into booleanStandard 
# Conflicts:
#	src/battle_main.c
#	src/battle_script_commands.c
 2021-09-23 18:20:35 -03:00
ghoulslash
2f69748e0d merge with be 2021-09-23 14:38:01 -04:00
ghoulslash
33972b5493 merge with be 2021-09-23 12:04:13 -04:00
ghoulslash
3f34fec42f change last ball graphic based on config. replace saveblock field with ewram field 2021-09-23 12:03:01 -04:00
BuffelSaft
530998c4b7 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2021-09-23 16:41:35 +12:00
Eduardo Quezada D'Ottone
d084d2a68d Merge branch 'BattleEngine' into booleanStandard 
# Conflicts:
#	include/battle.h
#	src/battle_main.c
#	src/battle_script_commands.c
 2021-09-22 23:42:00 -03: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
Eduardo Quezada D'Ottone
075c0299a1 Better names for Micle and Custap flags 2021-09-22 23:29:26 -03:00
ghoulslash
9bf2ffe459 fix lash out stat fell 2021-09-22 21:15:02 -04:00
ghoulslash
13062b5a8f fix lash out, obstruct, and decorate 2021-09-22 09:43:40 -04:00
ghoulslash
fc84ebbd3e redo prankster checks to handle assist 2021-09-22 08:06:42 -04:00
ghoulslash
0ea6c65b83 merge with be 2021-09-17 09:10:09 -04:00
ghoulslash
9d8672e3df merge with be 2021-09-16 13:12:59 -04:00
ghoulslash
9c94eb6140 but it failed check for rototiller 2021-09-16 10:24:32 -04:00
ghoulslash
c4ce4c150d fix eject pack 2021-09-14 15:38:16 -04:00
ghoulslash
95af97593b fix some comment styling. fix throat spray for multi-target moves 2021-09-14 11:53:35 -04:00
ghoulslash
f3f26d1a6f merge with be 2021-09-13 19:40:28 -04:00
ghoulslash
6915b029bd fix echoed voice power boost 2021-09-09 11:15:58 -04:00
DizzyEggg
68c33895fd
Merge pull request #1622 from BuffelSaft/money-boost 
Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE
 2021-09-06 11:32:53 +02:00
DizzyEggg
fa081d1fc5
Merge pull request #1618 from BuffelSaft/protect-like 
Fix protect-like moves
 2021-09-06 10:24:29 +02: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
BuffelSaft
13636f8691 Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE 
moneyMultiplier should only ever be 1, 2 or 4. This adds some flags to moneyMultiplier that prevent HOLD_EFFECT_DOUBLE_PRIZE and Happy Hour from infinitely increasing it.
 2021-09-02 16:15:58 +12:00
BuffelSaft
3371773e5c Move touchedProtectLike to protect structs 
This makes more sense than putting it in DisableStruct.
 2021-09-01 21:34:47 +12:00
BuffelSaft
ea6ce80ad4 Fix protect-like moves 
Make Protect-like moves (King's Shield etc.) activate only if the attacker would've touched the target.
This does not handle Sucker Punch, because that's not working correctly with Protect currently and will need to be addressed separately.
 2021-09-01 19:57:03 +12:00
ExpoSeed
0f99d9d4c6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-08-30 13:26:40 -05:00
ghoulslash
a2d885c0d4 merge with be 2021-08-12 14:48:58 -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
ghoulslash
c06029bc72 add last used ball 2021-06-25 13:37:59 -06:00
Xhyzi
c2bd046ea6 Shell Trap 2021-06-15 20:22:50 +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
ultima-soul
bca67ac683 Refactor Poke Ball code to not rely on Master Ball being the first item internally. 2021-06-11 18:22:50 -07: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
DizzyEggg
f27dcab784 Rage powder has powder moves qualities when forcing a target 2021-06-10 12:55:05 +02:00
MissingNoL
c876de5a5b Done! Merge branch 'battle_engine' into Photon_Geyser 2021-06-05 17:40:06 -07:00
DizzyEggg
4b744374c8 Allow larger exp gains 2021-06-03 23:17:44 +02: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
c3e28e9b1a merge with be 2021-05-23 12:22:52 -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
d89e2c1775 merge with be 2021-04-02 08:55:54 -06:00
ghoulslash
a595b213b4 merge with be 2021-03-28 17:29:22 -06:00
ultima-soul
5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07:00
PikalaxALT
925e68c03f Update newly named fields 2021-03-15 15:22:41 -04:00
PikalaxALT
8d4dcb228a More documentation in battle_main 2021-03-12 16:55:58 -05:00
PikalaxALT
e32a1571af Resolve link comm buffers in gBattleStruct 2021-03-12 15:37:31 -05: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
ultima-soul
e5fa583a08
Merge pull request #1334 from ghoulslash/gen8_abilities 
More Gen 8 Abilities
 2021-03-01 10:40:09 -08:00
Evan
f4d4cf262e fix screen cleaner, curious medicine, as one 2021-02-02 09:00:07 -07:00
Evan
f428e5e2dc some quick claw/custap berry fixes 2021-01-31 23:31:27 -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
a392cca928 Misc battle documentation 2021-01-23 00:40:31 -05:00
GriffinR
c106f7f130 Document battle_controller_opponent.c 2021-01-22 21:35:16 -05:00
GriffinR
63a7828772 Document battle_controller_player.c 2021-01-22 20:03:27 -05:00
GriffinR
4eca05ccf5 Document remainder of battle_controllers.c 2021-01-22 02:48:22 -05:00
Evan
4611c71bd1 merge with be 2021-01-21 08:55:14 -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
6b59a9ac01 add ai info debug option 2021-01-19 12:58:58 -07:00
Evan
9902f6e603 merge with be 2021-01-13 14:32:14 -07:00
Evan
8ef6a2c80d merge with be 2021-01-13 14:23:30 -07: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
Evan
1e22ae4cf2 merge with be 2021-01-10 09:08:25 -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
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
Evan
0cdab790dc add blunder policy 2021-01-06 15:40:20 -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
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
Evan
5bdf266000 add additional item theft check 2020-12-20 19:06:50 -07:00
Evan
a0b9ece980 merge with BE 2020-12-20 16:39:50 -07:00
Evan
21e7d6d318 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2020-12-20 16:33:43 -07:00
Evan
7988a1f41d Ai_TryOnAlly and reorganize files 2020-12-20 14:47:20 -07:00
Evan
31ec3e8479 non-partner good move checks 2020-12-19 21:58:23 -07:00
Evan
8a544665e4 move common ai params to preloaded struct 2020-12-16 22:56:10 -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
67fefd0261 var terrain, surge fixes 2020-12-13 19:42:48 -07:00
Evan
28698a982d try to faint script -> c 2020-12-11 08:05:00 -07:00
Kurausukun
58976ebaa8 Merge remote-tracking branch 'upstream/master' into berry_crush 2020-12-10 23:30:52 -05:00
Evan
34dd11448b sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem 2020-12-09 10:28:18 -07:00
Evan
426ea191ad style fix 2020-12-05 21:04:12 -07:00
Evan
d5ad14c349 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into popup 2020-12-05 21:03:20 -07:00
Evan
21cab1b7a7 better negative totem boost system, totems occur before switch in abilities 2020-12-05 21:00:51 -07:00
Evan
39cbc21925 fix trainer theft, update config option 2020-12-03 08:42:12 -05: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
25abdeacc5 tidy up z move code 2020-12-01 16:36:44 -05:00
Evan
2bfc7ea9b1 merge upstream 2020-12-01 15:42:04 -05:00
Evan
f54cd0b25d fix z effect scripts 2020-12-01 15:35:39 -05:00
Evan
ce19e33cc4 handle double and multi battles 2020-12-01 13:43:15 -05:00
Evan
fd8951d040 trainer z move ai 2020-12-01 08:24:33 -05:00
Evan
a0bde70493 z move effects 2020-11-30 10:55:46 -05:00
Evan
2b1dfe73cf z move unleash anim, fix active/used flags 2020-11-27 23:38:29 -05:00
Evan
4060b09bd6 expand top left move window. add z move init anim 2020-11-27 17:06:36 -05:00
Evan
348d70b309 z move indicator and some data 2020-11-26 15:56:18 -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
ultima-soul
e15a86caae Add ifdef for Hidden Abilities from Pokémon Expansion and change gBattlerAbility back to a u8. 2020-11-17 10:32:24 -08: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
Evan
435f928aa4 opponent trainer theft config option. Clean up code a bit 2020-11-13 11:00:44 -07:00
Evan
64bcac4589 move pickpocket to back of moveend sequence 2020-11-12 23:30:00 -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
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
MCboy
e31158d017 add spaces around - and remove comment from include in battle.h 2020-11-06 23:29:52 +03:30
MCboy
3b91735e63 use constants for ball throw count 2020-11-06 22:59:46 +03:30
aaaaaa123456789
1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
Kurausukun
90211248af re-match Cmd_unknown_24 (from #1140) 
changes to data structs are necessary. other things that look
unnecessary, like the order of operands, are also necessary. fuck this
function.
 2020-10-23 20:47:10 -04:00
Eduardo Quezada
0d39b29691 Option to use Gen 3 Physical/Special split. 2020-10-15 00:16:50 -03:00
ExpoSeed
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -05:00
GriffinR
65a4e06737 Add ITEM6_HEAL constants, change move flags to shifts 2020-10-05 18:48:51 -04:00
Kaz
847878eae9 battle_gfx_sfx_util.c: Very annoying fakematch fix. 
daycare.c: -g eliminates the need for the brace hack.
battle_transition.c: Fix Phase2_Ripple_Func2...?
 2020-09-19 17:12:25 -04: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
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02:00
GriffinR
afb3472282 Minor battle_anim_throw cleanup 2020-08-30 15:11:44 -04:00
hondew
e46b35455d Merge branch 'master' into pokeball-doc 2020-08-30 14:14:38 -04:00
hondew
328aecc96e Document throwing pokeball 
continue

Document more

Doc more funcs

Remove workspace

Document shiny stars

Document PokeBlock

Clean up

Clean more
 2020-08-30 14:08:06 -04: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
aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
DizzyEggg
42f48d1a61 Power Construct 2020-07-16 15:40:56 +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
ghoulslash
8f669bb57d
Add critical capture (#402) 
* add critical capture

* synax and format fixes
 2020-07-14 17:47:15 +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
DizzyEggg
f19ba68cb9 Fix mega indicator sprite overwriting ram 2020-06-24 12:55:08 +02:00
ultima-soul
9ee5db6a96 Expand ability ids to u16. Thanks to ghoulslash for some assistance! 2020-05-18 14:54:12 -07:00
DizzyEggg
ee68f0f826 Fix switch-in abilities when shift style switch 2020-04-25 11:17:59 +02:00
DizzyEggg
e2524bed49 Metronome item 2020-04-22 12:49:25 +02:00
DizzyEggg
0f628c8ff2 Fairy Lock 2020-04-20 19:41:07 +02:00
DizzyEggg
ad481c8688 Moody 2020-04-19 15:44:44 +02:00
DizzyEggg
6a3944d27c Frisk, would be easier if it didnt scan 2 opponents 2020-04-19 13:37:56 +02:00
DizzyEggg
e42ead10c9 Soul Heart 2020-04-18 19:59:09 +02:00
DizzyEggg
8ea7fcc348 better ai debug 2020-04-14 13:40:27 +02:00
DizzyEggg
8f61445dfe Berserk 2020-04-12 12:41:26 +02:00
DizzyEggg
6968124529 Merge battle anim documentation 2020-02-29 13:59:41 +01:00
GriffinR
afa1ae2209 Finish documenting move anim scripts 2020-02-25 12:54:08 -06: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
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
GriffinR
1016b23918
Merge branch 'master' into rename-tablecmds 2019-09-26 15:02:38 -04:00
GriffinR
85d97542cd Use MAX_MON_MOVES constants 2019-09-16 19:21:23 -05:00
DizzyEggg
91b364e8d6 Ai use most powerful move smarrter 2019-08-27 18:29:34 +02: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
3e476adf4a Stockpile gen4 effect and fixed spit up 2019-07-09 19:06:12 +02:00
DizzyEggg
48c801245c Fix Synchronize 2019-06-25 13:04:14 +02:00
DizzyEggg
272fa07799 AI switch mons if all moves are not usable 2019-06-11 10:45:12 +02:00
DizzyEggg
e00890a555 Fix Air Baloon msg 2019-05-20 12:20:49 +02:00
DizzyEggg
d027bb0d7a Life Flame toxic orbs 2019-05-10 11:03:33 +02:00
DizzyEggg
bb8e397e5b Gems and dmg reducing berries 2019-05-07 15:26:58 +02:00
Papa Cancer
b50007e861 Instruct 
Re-PR'd due to excess "merges"
 2019-04-20 20:11:49 +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
f8713f9c15 Merge with master 2019-04-06 20:43:13 +02:00
Marcus Huderle
033580da96 Document secret base 2019-04-05 16:24:57 -05:00
DizzyEggg
b0223f691f Clean up data headers 2019-04-05 07:53:23 -05:00
DizzyEggg
dd24597d52 Finish up menu specialised 2019-04-05 07:53:23 -05: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
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
PikalaxALT
2f57d6bc0f sub_8018220 2019-03-30 09:18:58 -04:00
DizzyEggg
7018745230 Fix Defiant stat raise by allies 2019-03-23 17:21:14 +01:00
DizzyEggg
e135ea47e5 Touch up Anger Point 2019-03-23 16:33:08 +01:00
DizzyEggg
fddb5159b4 Merge with master 2019-03-05 21:46:45 +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
DizzyEggg
df9e6a6889 Free up two status3 flags 2019-02-25 16:17:23 +01:00
DizzyEggg
08892d19f2 Modify the stat changer, so it supports raise/lower by 12 2019-02-14 19:48:21 +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
f415871369 Merge with master 2019-02-03 10:44:05 +01:00
DizzyEggg
a740bc7190 Name action 11 2019-02-02 11:32:00 +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
abd518b668 Refactor GF's idiotic coding 2019-01-27 13:52:02 +01:00
DizzyEggg
b667c20d80 Remove unused vars in battle main.c 2019-01-05 18:52:33 +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
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
6fa5f33519 Merge branch 'master' into battle_engine_v2 2018-12-24 09:07:18 +01:00
DizzyEggg
9320fe8f85 Clear includes 2018-12-24 00:02:29 +01:00
DizzyEggg
bd817d70d6 Refactor battle intro, allow to speed it up 2018-12-23 18:47:00 +01:00
DizzyEggg
53b9d4a224 Dont clear AI flags on move choose. Will come in handy in smart ai switch logic 2018-12-22 20:57:12 +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
Marcus Huderle
c74468fd11 Document a bunch of battle anim stuff 2018-12-17 22:16:17 -06:00
Marcus Huderle
2c6849bee8
Decompile battle_anim_8170478.c (#445) 2018-12-13 21:33:54 -06:00
DizzyEggg
180aa839c4 Fix conflicts 2018-12-09 13:12:02 +01:00
DizzyEggg
b60915539d Fix Phantom Force 2018-12-08 16:19:50 +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
3be070f0c3 Fix string overflowing issue 2018-12-01 11:12:31 +01:00
DizzyEggg
1a8859b1d8 Add Dazzling 2018-11-30 22:12:18 +01:00