ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-05 00:53:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,590 Commits 1 Branch 0 Tags 235 MiB
1c4a0c205a
Commit Graph

6035 Commits

Author SHA1 Message Date
BuffelSaft
274e964d91 Fix Safety Googles 
Fix typo and update gLastUsedItem before calling the safety goggles battle script.
 2021-10-09 15:05:01 +13:00
ghoulslash
db0d9f6235 sound moves targeting user not blocked by own soundproof 2021-10-08 08:22:49 -04:00
BuffelSaft
fbc4d7584e
Merge pull request #1610 from LOuroboros/primalAbilities 
Implement Desolate Land, Primordial Sea and Delta Stream
 2021-10-08 20:01:09 +13:00
LOuroboros
359da5313e Handled some edge cases 
Gastro Acid, Worry Seed, Simple Beam, Core Enforcer and Transform
 2021-10-07 01:53:20 -03:00
LOuroboros
7548e74013 Forgot to clear the primal weathers in some places 2021-10-07 00:43:23 -03:00
ghoulslash
1afc43a0e8 fix DoesSubstituteBlockMove calls 2021-10-06 15:30:44 -04:00
ghoulslash
5f5df066d6 fix perish song + soundproof 2021-10-06 15:18:42 -04:00
ghoulslash
4aeadd96c9 merge with be 2021-10-06 14:49:23 -04:00
ghoulslash
11f4f0f08e update move data to those that target all battlers 2021-10-06 14:41:48 -04:00
ghoulslash
391cfabcac merge with be 2021-10-06 14:31:21 -04:00
ghoulslash
33d19d4e34 syntax fix 2021-10-06 14:19:15 -04:00
ghoulslash
3d24fd5f30 last ball defaults to first bag pocket item 2021-10-06 13:56:04 -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
ghoulslash
1ad8448532 remove saveblock field 2021-10-06 13:54:33 -04:00
ghoulslash
4382420dd2 merge with be 2021-10-06 13:32:59 -04:00
ghoulslash
471eab40c8
Merge pull request #1729 from rh-hideout/ai_dynamic_move_types 
AI handles dynamic move types
 2021-10-06 09:34:08 -04:00
ghoulslash
1f4844c7f5
Merge pull request #1710 from AsparagusEduardo/BE_Struggle 
Implemented modern effect of struggle with config
 2021-10-06 09:27:10 -04:00
ghoulslash
2a45d9041c
Merge pull request #1716 from AsparagusEduardo/fix_Howl 
Updated sound flags for Howl and Heal Bell
 2021-10-06 09:25:57 -04:00
ghoulslash
5959eac924
Merge pull request #1705 from AsparagusEduardo/fix_UnnerveResist 
Fix Unnerve not canceling out type resist berries.
 2021-10-06 09:22:34 -04:00
ghoulslash
245ef1ad2d
Merge pull request #1715 from AsparagusEduardo/BE_ShadowTag 
Config for Shadow Tag vs Shadow Tag
 2021-10-06 09:02:58 -04:00
ghoulslash
1ec8b84492
Merge pull request #1727 from rh-hideout/simple_beam 
Fix Simple Beam
 2021-10-06 09:00:19 -04:00
ghoulslash
5bf236fc0d
Merge pull request #1712 from AsparagusEduardo/fix_stickyHold 
Fix instances where Gastro Acid is not affecting the ability
 2021-10-06 08:55:46 -04:00
LOuroboros
2b32581c14 Fixed infinite loop 2021-10-06 09:27:33 -03:00
LOuroboros
a646c3311b Another set of fixes 
The ability pop up is supposed to show as weather changing abilities try but fail to activate.
 2021-10-06 08:20:50 -03:00
LOuroboros
0f2cc99f45 WEATHER_STRONG_WINDS modifier fix 
MulByTypeEffectiveness was the right answer all along.
I also added a short pause to BattleScript_AttackWeakenedByStrongWinds before STRINGID_ATTACKWEAKENEDBSTRONGWINDS is printed.
 2021-10-06 07:33:54 -03:00
LOuroboros
b93c746a49 Reverted comment after the previous commit 2021-10-06 06:04:56 -03:00
LOuroboros
dc451167d1 More fixes 
-Removed ability popup when Strong Winds weakens a SE Flying-type move
-Went back to the way I handled the dmg calculation for that originally
-Made sure to try to clear the primal weathers in a couple of other battle scripts
-Allowed Drought, Drizzle, Sand Stream and Snow Warning to activate but fail if WEATHER_STRONG_WINDS is in effect.
 2021-10-06 05:54:28 -03:00
BuffelSaft
38b816ccdd AI handles dynamic move types 
This will make the AI account for the type of moves like Weather Ball, Hidden Power and Revelation Dance when considering abilities that make the useless. E.g. Water-type Hidden Power vs. Storm Drain.
 2021-10-06 21:53:30 +13:00
BuffelSaft
a48dec2e31
Merge pull request #1721 from AsparagusEduardo/fix_TrumpCard 
Fixed Trump Card's damage check
 2021-10-06 15:55:21 +13:00
BuffelSaft
1b663feafb
Merge pull request #1722 from AsparagusEduardo/fix_HeatCrash 
Fixed Heat Crash's power table name
 2021-10-06 15:39:09 +13:00
BuffelSaft
a6198e5d46 Fix Simple Beam 
- No longer freezes the game
- Now fails if the target already has simple
- Explicitly checks and changes the target's ability instead of gActiveBattler's ability
 2021-10-06 15:30:52 +13:00
Eduardo Quezada D'Ottone
43d42c95cf Terrain Pulse effect implemented 2021-10-04 22:45:37 -03:00
Eduardo Quezada D'Ottone
aa7484bba0 Camouflage with field terrains. 2021-10-04 22:07:28 -03:00
Eduardo Quezada D'Ottone
e2bf660c97 Secret Power field terrain animations 2021-10-04 21:51:51 -03:00
Eduardo Quezada D'Ottone
563ce8f416 Field terrain move effect 2021-10-04 21:32:08 -03:00
Eduardo Quezada D'Ottone
5019615be1 Refactored Secret Power move effect into a function 2021-10-04 21:28:15 -03:00
Eduardo Quezada D'Ottone
92f0f6f820 Fixed Psychic Fangs power 2021-10-04 20:20:00 -03:00
Eduardo Quezada D'Ottone
4ab8c95207 Fixed Heat Crash's power table name 2021-10-04 20:17:43 -03:00
Eduardo Quezada D'Ottone
b3167b7d53 Fixed Trump Card's damage check 2021-10-04 19:40:36 -03:00
LOuroboros
dcefb523f8 Tweaks and fixes 
-Fixed the Flying-type checks of WEATHER_STRONG_WINDS.
-Fixed the order of actions involving the printing of STRINGID_ATTACKWEAKENEDBSTRONGWINDS.
 2021-10-04 08:12:41 -03:00
BuffelSaft
142a83ca96
Merge pull request #1708 from AsparagusEduardo/fix_SleepTalk 
Fixed Sleep talk being canceled by the user being asleep..
 2021-10-04 00:35:00 +13:00
LOuroboros
64a45d8f48 Tweaked trytoclearprimalweather 
Made it so it won't actually try to clear a primal weather if a Pokémon with Desolate Land, Primordial Sea or Delta Stream is present on the field.
 2021-10-03 08:24:54 -03:00
LOuroboros
b85b3094c8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalAbilitiesDev 2021-10-03 07:05:56 -03:00
Eduardo Quezada D'Ottone
b5e0a07932
Merge pull request #1704 from LOuroboros/battle_bond 
Implemented Battle Bond
 2021-10-02 20:07:35 -03:00
Eduardo Quezada D'Ottone
76bdbf164e Updated sound flags for Howl and Heal Bell 2021-10-02 20:00:00 -03:00
Eduardo Quezada D'Ottone
978f73475b Config for Shadow Tag vs Shadow Tag 2021-10-02 19:01:11 -03:00
Eduardo Quezada D'Ottone
2d5da7852c Fixed Yawn + Vital Spirit + Gastro Acid 2021-10-02 18:44:04 -03:00
Eduardo Quezada D'Ottone
9d64a26625 Fix preasure + Gastro Acid 2021-10-02 18:31:09 -03:00
Eduardo Quezada D'Ottone
a22a456268 Fixed heal bell + soundproof + gastro acid 2021-10-02 18:21:02 -03:00
Eduardo Quezada D'Ottone
b29f5c801f Fixed Gastro Acid's effect on Early Bird 2021-10-02 18:16:14 -03:00
Eduardo Quezada D'Ottone
ebe5e03998 Added Gen 8 abilities affected by Mold Breaker 2021-10-02 17:07:29 -03:00
Eduardo Quezada D'Ottone
8d54e5666d Fixed waking up from uproar 2021-10-02 17:05:23 -03:00
Eduardo Quezada D'Ottone
5abb0c0dfe Fixed perish song + soundproof + gastro acid 2021-10-02 16:48:45 -03:00
Eduardo Quezada D'Ottone
6208995606 Fixed Run Away. 2021-10-02 15:52:55 -03:00
Eduardo Quezada D'Ottone
9aee8cbea5 Fixed Sticky Hold not being negated by Gastro Acid when stealing and switching items 2021-10-02 14:47:38 -03:00
Eduardo Quezada D'Ottone
57ea20bc6d Implemented modern effect of struggle with config 2021-10-02 13:32:36 -03:00
LOuroboros
a18b9c5b32 Quick tweaks 
-Use the species name for sText_AttackerBecameAshSpecies
-Make Battle Bond not activate if the opposing party doesn't have 2 members or more.
 2021-10-02 11:21:11 -03:00
Eduardo Quezada D'Ottone
63c6e73eb8 Fixed Sleep talk being canceled by the user being asleep.. 2021-10-02 09:38:43 -03:00
Eduardo Quezada D'Ottone
16d032e99d Fix Unnerve not canceling out type resist berries. 2021-10-02 02:01:34 -03:00
BuffelSaft
57d2e21117 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into shields-down 2021-10-02 15:51:48 +13:00
BuffelSaft
611da31ae3 Fix form ID check 
The six here should be a seven, and replacing it with this function call is better than hard-coding it.
 2021-10-02 15:51:16 +13:00
LOuroboros
c464b1b5dd STRINGID_ATTACKERBECAMEASHGRENINJA -> STRINGID_ATTACKERBECAMEASHSPECIES 2021-10-01 23:12:59 -03:00
LOuroboros
f3ded43a88 Implemented Battle Bond 2021-10-01 22:49:17 -03:00
Eduardo Quezada D'Ottone
f616760fc9
Merge pull request #1349 from LOuroboros/gulp_missile 
Implemented Gulp Missile
 2021-10-01 16:53:51 -03:00
LOuroboros
43e73ac576 Fixed Safari Zone 2021-10-01 05:25:25 -03:00
LOuroboros
0389dbf9f2 More fixes 
-Removed IsBattlerAlive check for case ABILITY_GULP_MISSILE in ABILITYEFFECT_MOVE_END_ATTACKER. Turns out Cramorant can change form even on single wild battles.
-Added a check for IsBattlerAlive in the case ABILITY_GULP_MISSILE of ABILITYEFFECT_MOVE_END, because otherwise, for whatever reason, the user was trying to trigger the Gulping effect even in its base form.
-Set the stat to change for the Gulping effect from within the battle script. The rest of the effect is handled there, so may as well.
-Fixed the check for case ABILITY_GULP_MISSILE in ABILITYEFFECT_MOVE_END_ATTACKER. Apparently, a silent species change was happening because of the order of the checks. Thanks to AsparagusEduardo for pointing this one out.
-Fixed the secondary effect of a target's Gulp Missile affecting an attacker that has fainted.
-Fixed the Defense reduction of the Gulping effect bypassing Clear Body.
 2021-09-29 23:18:22 -03:00
LOuroboros
e783cde387 Another small condition fix and small optimization 
-Checking for IsBattlerAlive is incorrect because Gulp Missile's counterattack should happen even if Cramorant faints.
-Made the code a bit more readable.
 2021-09-27 21:33:19 -03:00
LOuroboros
ceffaa4e76 Another condition fix 
I accidentally broke Gulp Missile's interaction with the user's Dive, lol.
 2021-09-27 20:12:32 -03:00
LOuroboros
a49ea33dd0 A lot of fixes 
-Fixed Gulp Missile's activation. Its effects were happening even if the conditions weren't actually met in battle.
-Fixed Gulp Missile activating if the only/last target has already fainted.
-Fixed Gulp Missile's Gorging animation, though it still uses Tackle's.
-Fixed Gulp Missile's Gorging attack affecting an opponent with Magic Guard.
-Fixed Gulp Missile changing Cramorant's form if Surf failed.
 2021-09-27 08:57:09 -03:00
ghoulslash
761006a164 merge with be 2021-09-26 19:19:32 -04:00
Eduardo Quezada D'Ottone
b4e456aeca
Merge pull request #1607 from BuffelSaft/mega-icon 
Move mega indicator for lv 100 mons
 2021-09-26 17:40:36 -03:00
LOuroboros
1b039062da Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-09-25 22:20:34 -03:00
Syreldar
4c05520bf3 Fixed Retaliate's naming. 2021-09-24 16:02:26 +02:00
LOuroboros
8a2921ef71 Completed Black Sludge's effect 2021-09-24 07:01:48 -03: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
Eduardo Quezada D'Ottone
13a464ffa4
Merge pull request #1673 from ghoulslash/gen8_move_effects 
Gen8 move effects Fixes
 2021-09-23 18:04:20 -03:00
ghoulslash
2f69748e0d merge with be 2021-09-23 14:38:01 -04:00
ghoulslash
94ec25319f syntax fixes. Use BlocksPrankster for perish song battle script 2021-09-23 14:35:37 -04:00
ghoulslash
8a9d28d97f
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-09-23 12:21:36 -06:00
ghoulslash
2cea541b2a
Update src/battle_script_commands.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-09-23 12:21:26 -06:00
ghoulslash
3925c07c1a fix l graphic 2021-09-23 13:20:32 -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
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
Eduardo Quezada D'Ottone
075c0299a1 Better names for Micle and Custap flags 2021-09-22 23:29:26 -03:00
Eduardo Quezada D'Ottone
380e1e470c Applied use of TRUE and FALSE for flags. 2021-09-22 23:29:00 -03:00
ghoulslash
6ec1a74948 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_move_effects 2021-09-22 21:51:45 -04:00
ghoulslash
936f2c7bcb fix eject pack weak armor special case 2021-09-22 21:51:37 -04:00
Eduardo Quezada D'Ottone
2c66aa84b6
Merge pull request #1378 from ghoulslash/gen8_move_effects 
Several Gen 8 Move Effects
 2021-09-22 22:48:29 -03:00
ghoulslash
9bf2ffe459 fix lash out stat fell 2021-09-22 21:15:02 -04:00
ghoulslash
d738297f24 merge with be 2021-09-22 16:26:09 -04:00
ghoulslash
3559a1b8e6 fix prankster + magic coat 2021-09-22 16:09:23 -04:00
ghoulslash
a10a8714fc
Merge pull request #1672 from rh-hideout/revert-1671-scaldThawConfig 
Revert "Scald thaw flag config for Gen 5"
 2021-09-22 11:48:29 -06:00
ghoulslash
f7b90bab93
Merge pull request #1670 from SBird1337/ai/expected-value 
[ai] use expected value move dmg calculation
 2021-09-22 10:15:37 -06:00
sbird
303e31ae25 [ai] use expected value to simulate EFFECT_PSYWAVE 2021-09-22 18:05:58 +02:00
ghoulslash
8cc0bb6ac0
Merge pull request #1652 from BuffelSaft/multi-hit-resist-berry 
Fix multihit moves vs damage reducing berries
 2021-09-22 09:42:53 -06:00
ghoulslash
a01690cd57
Merge pull request #1665 from BuffelSaft/download 
Fix Download
 2021-09-22 09:40:48 -06:00
Eduardo Quezada D'Ottone
707d49242e
Revert "Scald thaw flag config for Gen 5" 2021-09-22 12:31:23 -03:00
ghoulslash
fb17176a26
Merge pull request #1667 from AsparagusEduardo/fix_IllusionEgg 
Adds missing check for Egg in Illusion
 2021-09-22 09:01:31 -06:00
ghoulslash
c5eeab88dc
Merge pull request #1671 from AsparagusEduardo/scaldThawConfig 
Scald thaw flag config for Gen 5
 2021-09-22 09:01:11 -06:00
ghoulslash
1309eea8ec Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_move_effects 2021-09-22 09:43:48 -04:00
ghoulslash
13062b5a8f fix lash out, obstruct, and decorate 2021-09-22 09:43:40 -04:00
Eduardo Quezada D'Ottone
53d985eedd Scald thaw flag config for <Gen 5 2021-09-22 10:29:32 -03:00
ghoulslash
fc84ebbd3e redo prankster checks to handle assist 2021-09-22 08:06:42 -04:00
sbird
0ee13418dc [ai] use expected value move dmg calculation 2021-09-22 13:15:43 +02:00
BuffelSaft
35af7a9cc1 Fix Foul Play 
if != else if. Pretty sure I broke this when adding Body Press.
 2021-09-22 15:44:13 +12:00
Eduardo Quezada D'Ottone
b65b27c0dd Adds missing check for Egg in Illusion 2021-09-22 00:20:34 -03:00
Eduardo Quezada D'Ottone
9a72178fa2
Merge pull request #1548 from StubbornOne/battle_engine 
Add Telepathy's damage prevention effect
 2021-09-21 23:02:41 -03:00
Eduardo Quezada D'Ottone
7571d56140
Applied Egg's implementation of telepathy 2021-09-21 22:57:05 -03:00
Eduardo Quezada D'Ottone
287ffff2e2
Merge branch 'battle_engine' into burmy-form-change 2021-09-21 22:34:37 -03:00
BuffelSaft
6eced3f7a4 Fix Download 
Raises user's stat instead of a random target's, and determines stat boosts using the opposing Pokemon's stats.
 2021-09-22 11:53:44 +12:00
ghoulslash
80a48de702 ally cannot block prankster + perish song 2021-09-21 11:54:59 -04:00
ghoulslash
9c79ba05fc allies do not block prankster 2021-09-21 11:38:37 -04:00
Eduardo Quezada D'Ottone
f338813c6a
Merge pull request #1538 from DizzyEggg/double_onemon_battles 
Support for double battles with only one pokemon
 2021-09-20 23:40:08 -03:00
ghoulslash
b38761e6a8 add fairy to dex search 2021-09-20 22:26:02 -04:00
ghoulslash
32d19a9b19 syntax fixes. add B_PRANKSTER_DARK_TYPES check to perish song 2021-09-20 21:36:10 -04:00
Ariel Antonitis
e037cb9276 Fixed Nature Power move on different terrains. 2021-09-20 19:06:48 -04:00
ghoulslash
0ea6c65b83 merge with be 2021-09-17 09:10:09 -04:00
ghoulslash
faa963fd04 merge with be 2021-09-17 09:07:38 -04:00
ghoulslash
b916d7991c merge with be 2021-09-16 21:52:29 -04:00
ghoulslash
e756b0accc merge with be 2021-09-16 21:41:29 -04:00
ghoulslash
40fcd257a0 fixes 2021-09-16 19:36:06 -04:00
ghoulslash
806be64935 format fixes 2021-09-16 17:10:41 -04:00
ghoulslash
b6862a4153 fix jumptocalledmove for assist + attackcanceler 2021-09-16 14:01:19 -04:00
ghoulslash
af8d86f0c9 merge with be 2021-09-16 13:33:35 -04:00
ghoulslash
9d8672e3df merge with be 2021-09-16 13:12:59 -04:00
ghoulslash
ac42b19de7 some formatting fixes 2021-09-16 11:54:27 -04:00
ghoulslash
a50f03a06b magic bounce overrides prankster blockage 2021-09-16 11:53:24 -04:00
ghoulslash
2067f563cd cannot block your own prankster elevated perish song 2021-09-16 11:47:05 -04:00
ghoulslash
aeafd9e222 perish song + prankster interaction 2021-09-16 11:34:01 -04:00
ghoulslash
aac7ae3595 add MOVE_TARGET_ALL_BATTLERS 2021-09-16 10:45:33 -04:00
ghoulslash
9c94eb6140 but it failed check for rototiller 2021-09-16 10:24:32 -04:00
ghoulslash
85f3982fb9 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into prankster 2021-09-15 17:52:45 -04:00
ghoulslash
f61d516aad some syntax/format fixes 2021-09-15 17:15:50 -04:00
ghoulslash
845e333ba1 fix electric/misty terrain interactions with yawn/rest failures 2021-09-15 17:11:42 -04:00
ghoulslash
aa475ab300 merge with be 2021-09-15 16:42:23 -04:00
ghoulslash
705b765067 update multistring chooser labels in GetMentalHerbEffect 2021-09-15 14:51:24 -04:00
ghoulslash
0bca01cb74 mental herb fixes 2021-09-15 12:56:58 -04:00
ghoulslash
b85586a33a merge with be 2021-09-15 12:54:39 -04:00
ghoulslash
801ba039d6 fix red card 2021-09-14 19:18:53 -04:00
ghoulslash
c4ce4c150d fix eject pack 2021-09-14 15:38:16 -04:00
ghoulslash
55c3e152cf replace some BufferStatChange, fix room service and terrain seeds 2021-09-14 15:07:15 -04:00
ghoulslash
60713a8f2d fix room service activation msg, stat target 2021-09-14 12:50:36 -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
BuffelSaft
7d3980de58 Fix multihit moves vs damage reducing berries 
The extra waitmessage command is ugly but appears to be needed - if it's moved before the printstring, the message isn't displayed long enough on single hit moves.
 2021-09-12 18:33:04 +12:00
StubbornOne
b21740b757
Merge branch 'rh-hideout:battle_engine' into battle_engine 2021-09-10 10:09:09 +08:00
ghoulslash
f9cc09dc48 tweak formula 2021-09-09 13:54:16 -04:00
ghoulslash
92429c7649 better echoed voice power boost 2021-09-09 13:38:46 -04:00
ghoulslash
6915b029bd fix echoed voice power boost 2021-09-09 11:15:58 -04:00
ghoulslash
875bc52d48 fix resist berry item print msg 2021-09-09 10:15:18 -04:00
ghoulslash
5c9c425590 fix power herb actiation message 2021-09-09 10:03:24 -04:00
ghoulslash
d7938bc2dc Merge branch 'prankster' of github.com:ghoulslash/pokeemerald into prankster 2021-09-09 09:44:25 -04:00
ghoulslash
b8a71cabd1 merge with be 2021-09-09 09:44:18 -04:00
DizzyEggg
4c9660bff1
Merge pull request #1579 from ghoulslash/embargo 
Add Embargo Effect
 2021-09-08 20:03:08 +02:00
DizzyEggg
decf65a025
Merge pull request #1580 from ghoulslash/water_bubble 
Water Bubble Prevents Burn
 2021-09-08 20:00:45 +02:00
BuffelSaft
bd92552fb6 Add new line to burn was healed string 2021-09-07 16:39:42 +12:00
BuffelSaft
a4b630e6b5 Fix MOVE_EFFECT_REMOVE_STATUS 
Wake-Up Slap and Sparkling Aria now print the correct message when the target is cured.

Also, fix Ice Hammer's effect chance.
 2021-09-07 16:34:32 +12:00
ghoulslash
e93ad2e255 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into water_bubble 2021-09-06 09:24:28 -04:00
LOuroboros
3113e4fa12 Moved stat recalculation to HandleEndTurn_FinishBattle 2021-09-06 07:40:35 -03: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
BuffelSaft
734e0aa74d Add brackets 
Oops!
 2021-09-06 20:56:02 +12:00
DizzyEggg
cdec3077b2
Merge pull request #1630 from BuffelSaft/disguise2 
Fix many Disguise bugs
 2021-09-06 10:32:37 +02:00
DizzyEggg
fa081d1fc5
Merge pull request #1618 from BuffelSaft/protect-like 
Fix protect-like moves
 2021-09-06 10:24:29 +02:00
DizzyEggg
67fd379771
Merge pull request #1632 from BuffelSaft/hammer-arm 
Fix Hammer arm's effect chance
 2021-09-06 10:16:47 +02:00
BuffelSaft
4c8a12006c Fix Hammer Arm's effect chance 2021-09-06 19:45:30 +12:00
BuffelSaft
bdbb4b5f7e Fix many Disguise bugs 
Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.
 2021-09-06 18:27:42 +12:00
ghoulslash
a9cbaa5966 fix mental herb encore, heal block 2021-09-04 08:40:43 -04:00
ghoulslash
e475813799 revert mental herb desc 2021-09-04 08:18:38 -04:00
ghoulslash
d66f3910d9 Merge branch 'mental_herb' of github.com:ghoulslash/pokeemerald into mental_herb 2021-09-03 17:41:09 -04:00
ghoulslash
933696b3cd merge with be 2021-09-03 17:41:00 -04:00
ghoulslash
b362ce7f33
Merge pull request #1621 from BuffelSaft/move-data 
Correct Liquidation and Sparkling Aria move data
 2021-09-03 13:02:33 -06:00
ghoulslash
79f39a1fd0 fix eject button 2021-09-03 14:56:36 -04:00
ghoulslash
5c5276b04d red card fixes 2021-09-03 14:29:28 -04:00
ghoulslash
4e2948012f poison type still absorbs toxic spikes with heavy duty boots 2021-09-03 13:18:33 -04:00
ghoulslash
c7a587913b replace statStages checks with CompareStat 2021-09-03 13:13:02 -04:00
ghoulslash
93e2e09148 fix terrain seeds. create generic CompareStat function 2021-09-03 12:17:38 -04:00
ghoulslash
7f4accdae4 fix room service switching in effect 2021-09-03 11:16:16 -04:00
ghoulslash
6ce1227447 fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case 2021-09-03 11:05:11 -04:00
ghoulslash
7c53214dad merge with be 2021-09-02 15:33:42 -04:00
ultima-soul
a10a02a536
Merge pull request #1221 from ghoulslash/battle_engine 
Implement Pickpocket
 2021-09-02 11:33:34 -07: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
7d251c39f7 Correct Liquidation and Sparkling Aria 
Liquidation is affected by Sheer Force, Sparkling Aria should hit both foes and ally.
 2021-09-02 16:05:36 +12:00
BuffelSaft
cdb28f038f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into shields-down 2021-09-02 11:36:55 +12:00
LOuroboros
46fb92c4da Optimized checks 2021-09-01 17:40:12 -03:00
ghoulslash
39a254f80d fix sprite pos changes 2021-09-01 07:45:41 -04:00
ghoulslash
dfe59992d3 merge with be 2021-09-01 07:37:45 -04: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
eb0f0b7ce8 Fix Sucker Punch vs Protect moves 
Might as well do this here too. Sucker Punch should fail against Protect, not trigger Protect's effects.
 2021-09-01 21:32:07 +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
LOuroboros
9990bda7a4 Fixed if statement for stat recalculation 
Thanks to Syreldar.
 2021-09-01 02:55:15 -03:00
LOuroboros
d2bcc2ad5b Added configs for modern post-battle stat calcs 2021-09-01 00:31:50 -03:00
LOuroboros
d60545af7a Fixed U-turn and Choice Items interaction 2021-08-31 23:49:23 -03:00
ghoulslash
88476e0ac2 remove 2nd case in CanThrowBall 2021-08-31 12:59:20 -04:00
ghoulslash
e4fb9c4593 fix throwing ball in wild doubles 2021-08-31 12:51:03 -04:00
LOuroboros
69b7910f47 Gave an entrance animation to Delta Stream 2021-08-31 00:15:17 -03:00
LOuroboros
97ce02464b Removed small redundancy 2021-08-30 22:09:33 -03:00
LOuroboros
d0fd883ec7 Small comment tweak 2021-08-30 21:49:45 -03:00
LOuroboros
0a38054925 Print STRINGID_ATTACKWEAKENEDBSTRONGWINDS properly 2021-08-30 21:21:07 -03:00
LOuroboros
e39dc493fc A couple of improvements, courtesy of Syreldar 
-Optimized the checks for `WEATHER_RAIN_PRIMAL` and `WEATHER_SUN_PRIMAL` in `Cmd_attackcanceler`.
-Moved the dmg calculation effect of `WEATHER_STRONG_WINDS` to the `CalcFinalDmg` function.
 2021-08-30 20:55:48 -03:00
LOuroboros
c0c6821f62 Made AI_CheckBadMove take the primal weathers into account 
Credits to Syreldar.
Also took the chance and removed trailing spaces from the file.
 2021-08-30 20:55:43 -03:00
LOuroboros
216d8f0608 Solved game freezing issue 
My approach with BattleScript_AttackWeakenedByStrongWinds was incorrect and thus caused the game to freeze when Battle Scene is enabled, so I resorted to printing the string directly, which I don't like because there is no pauses between `attackstring` and `STRINGID_ATTACKWEAKENEDBSTRONGWINDS`.
 2021-08-27 18:28:34 -03:00
LOuroboros
9e4f33d09e Implemented Desolate Land, Primordial Sea and Delta Stream 2021-08-27 17:56:43 -03:00
ExpoSeed
a58641cd70
Merge pull request #1603 from LOuroboros/megaEvoString 
Tweaked sText_MegaEvoEvolved
 2021-08-26 19:33:39 -05:00
ExpoSeed
1f75f6e201
Merge pull request #1605 from LOuroboros/canEvolve 
Corrected `CanEvolve` function
 2021-08-26 19:32:22 -05:00
BuffelSaft
1d1546c7b2 Suggested changes 2021-08-26 19:00:43 +12:00
BuffelSaft
bc298d242f Move mega indicator for lv 100 mons 
Indicator sprite overlaps the "100" without this.
 2021-08-25 23:15:30 +12:00
BuffelSaft
bb89d03a1d Fix Venoshock 
Damage should double if target is poisoned, not attacker.
 2021-08-25 22:57:10 +12:00
LOuroboros
e42d329fc6 Small tweak 2021-08-25 02:16:38 -03:00
LOuroboros
d270892a6b Corrected CanEvolve function 2021-08-25 01:56:25 -03:00
LOuroboros
2c35006627 Tweaked sText_MegaEvoEvolved 2021-08-24 18:33:56 -03:00
ultima-soul
b620349da0 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-16 15:43:27 -07:00
GriffinR
ee5eee6ccc
Merge pull request #1493 from GriffinRichards/doc-itemmenu2 
Document item menu
 2021-08-15 12:01:57 -04:00
ghoulslash
d344612346 fix last used ball window in wild doubles 2021-08-12 14:49:17 -06:00
ghoulslash
a2d885c0d4 merge with be 2021-08-12 14:48:58 -06:00
ghoulslash
0bbbd1e7a9 fix electric/misty yawn/rest interactions 2021-08-12 14:08:41 -06:00
ghoulslash
5e250853c6 misty terrain blocks toxic spikes 2021-08-12 13:45:50 -06:00
ghoulslash
f050168c55 misty terrain blocks toxic spikes 2021-08-12 13:41:18 -06:00
ghoulslash
c7c0fbc296 merge with be, make AI CanBeStatused functions separate from general util ones 2021-08-12 13:37:53 -06:00
ghoulslash
7b0e60c705 some tweaks 2021-08-12 12:44:53 -06:00
ghoulslash
e3d30602d9 record item effect with trick 2021-08-12 01:29:52 -04:00
ghoulslash
d218322b2c merge with be 2021-08-12 01:26:13 -04:00
PikalaxALT
c7fc6ac893
Merge pull request #1492 from Kurausukun/cgbsound 
Fix CgbSound Fakematches (Thanks to Revo)
 2021-08-11 19:55:44 -04:00
ultima-soul
02c9e040df Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-11 16:33:10 -07:00
GriffinR
034b7f0513 Fix conflicting PC window names 2021-08-11 19:14:50 -04:00
GriffinR
80348e7188
Merge branch 'master' into doc-itemmenu2 2021-08-11 19:01:47 -04:00
GriffinR
cc51627465
Merge pull request #1489 from GriffinRichards/doc-playerpc 
Document player pc
 2021-08-11 18:59:58 -04:00
GriffinR
0bc26d9d79
Merge pull request #1488 from GriffinRichards/doc-frontierpass2 
Document frontier pass
 2021-08-11 17:40:55 -04:00
GriffinR
d951d7c363 Use tag constants in region_map.c 2021-08-11 09:31:20 -04:00
GriffinR
28a8fe191a Document item menu 2021-08-10 22:13:02 -04:00
Kurausukun
2e892c6961 unsigned int -> u32 2021-08-08 22:22:50 -04:00
Kurausukun
ddb3911d0d oops 2021-08-08 20:49:29 -04:00
Kurausukun
0bceaab046 rename variable 2021-08-08 20:34:16 -04:00
Kurausukun
b51d025f1c port cgb fakematching fixes (thanks to revo) 2021-08-08 20:33:21 -04:00
BuffelSaft
e1ca2af8b3
Update src/battle_util.c 
Fix copy/paste typo

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-08-08 00:52:27 +12:00
BuffelSaft
6c6363f7cf Use form table in species check 2021-08-07 20:59:04 +12:00
BuffelSaft
f0cb6190e0 Implement Burmy form change 
Burmy changes form based on where it last battled.
 2021-08-07 20:56:10 +12:00
BuffelSaft
1f3983cb05 Shields Down protects all meteor form Minior 
This was only working with red core minior.
 2021-08-07 20:38:35 +12:00
GriffinR
bd5cf07059
Merge branch 'master' into doc-playerpc 2021-08-02 14:08:10 -04:00
GriffinR
06b909bcd8 Document player pc 2021-08-02 13:58:40 -04:00
GriffinR
3e60a78406
Merge branch 'master' into doc-frontierpass2 2021-07-31 13:30:40 -04:00
GriffinR
602855ea99 Document frontier pass 2021-07-31 13:28:08 -04:00
GriffinR
459b20d762
Merge pull request #1479 from PikalaxALT/flatten_sprite_pos 
Flatten pos fields in struct Sprite
 2021-07-27 18:02:00 -04:00
ghoulslash
ab529b4e89 add stuff cheeks 2021-07-27 10:31:48 -06:00
LOuroboros
f1195e1884 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-07-27 09:08:52 -03: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
fd61770c34 water bubble prevents burn 2021-07-25 07:53:44 -06:00
ghoulslash
eadd09bebd block item use under embargo 2021-07-25 07:39:02 -06:00