Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,899 Commits 1 Branch 0 Tags
fa39dc76dc880b9ccb7ccaf14875fa9578b81817
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
BuffelSaft 8118f3bb44 Fix Brick Break 
Should remove the target's screens, not the attacker's.
 2021-11-22 16:17:10 +13:00
BuffelSaft c4f27174c3 Implement Unseen Fist 
Unseen Fist allows contact moves to bypass protect effects, but doesn't lift the effect.
 2021-11-19 16:21:33 +13:00
BuffelSaft d4fa346540 Fix Dark Aura and Fairy Aura 
Damage boost should be 33%, not 25%.
 2021-11-15 21:40:20 +13:00
BuffelSaft cedc2e07bd Fix Cherrim softlock 
Fix typo that caused infinite loop.
 2021-11-14 13:31:06 +13:00
BuffelSaft bdbdd0564f Fix Knock Off, add config 
Added a config for Knock Off's damage boost. Also fixed the conditions it checks to do bonus damage.
 2021-11-12 21:05:42 +13:00
BuffelSaft e606e54f9d Fix Big Pecks/Octolock animation 
Also removed MOVE_EFFECT_AFFECTS_USER because that shouldn't be part of playstatchangeanimation. The stat drops still bypass Mirror Armor without this.
 2021-11-11 14:32:38 +13:00
BuffelSaft e47317aa73 Fix Big Pecks 
ChangeStatBuffs was missing a check for Big Pecks.
 2021-11-10 21:24:48 +13:00
BuffelSaft e637714e1b Requested changes 
Various bug fixes, syntax corrections etc.
 2021-11-10 21:11:15 +13:00
BuffelSaft e2599c2469 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1 2021-11-10 14:31:32 +13:00
BuffelSaft e886076998 Merge pull request #1877 from kleeenexfeu/patch-1 
Fix heat crash/heavy slam calculation
 2021-11-10 14:18:57 +13:00
BuffelSaft 03cab2058a Fix goof, make AI check PP in move limitations 
Was skipping valid moves instead of invalid ones in CanAIFaintTarget. Also, remove all instances of ~MOVE_LIMITATION_PP from the AI as it seemed detrimental.
 2021-11-08 23:57:16 +13:00
BuffelSaft d3a845d511 Fix CanAIFaintTarget 
Rename CanAIFaintTarget to CanIndexMoveFaintTarget and create a new function, CanAIFaintTarget, that checks if any known move can KO the target.
 2021-11-08 20:37:28 +13:00
BuffelSaft 3a113e33b2 Uncomment AI Full Metal Body checks 
This ability is Clear Body with a different name, so it should be working and doesn't need to be commented out.
 2021-11-08 19:28:09 +13:00
BuffelSaft 5ac465bc2f Merge pull request #1862 from ghoulslash/be/speeduphit 
Dont have XX_UP_HIT effects trigger at end of battle
 2021-11-08 19:16:54 +13:00
BuffelSaft 5acebe32aa Merge pull request #1817 from LOuroboros/photonGeyser 
Implemented Photon Geyser and Shell Side Arm
 2021-11-06 16:04:53 +13:00
BuffelSaftandEduardo Quezada D'Ottone 14ebba04af Align comment with others 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-11-06 12:43:57 +13:00
BuffelSaft 4007a8d1f8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into relic_song 2021-11-06 11:52:51 +13:00
BuffelSaft ee83d1142c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1 2021-11-05 21:40:05 +13:00
BuffelSaft d91d6c9162 Merge pull request #1856 from ghoulslash/be/ai_magicguard 
Fix AI discouraging own magic guard
 2021-11-05 18:52:34 +13:00
BuffelSaft 3f1ce399e6 Account for terminator in sTrappingMoves 2021-11-05 18:37:45 +13:00
BuffelSaft bf786c6c9a Fix Magma Storm 
Fix the strings and animation displayed when Magma Storm. Also move gTrappingMoves to battle_script_message.c as it's only sued in this file, and this allows ARRAY_COUNT(sTrappingMoves) to replace the constant in SetMoveEffect.
 2021-11-05 18:22:52 +13:00
BuffelSaft a8d44f84a1 Merge pull request #1852 from Blackforest92/battle_engine_2 
Update waterfall, trick room, & focus blast BG
 2021-11-05 15:27:52 +13:00
BuffelSaft 6df3975fc6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2 2021-11-05 14:32:33 +13:00
BuffelSaft c9ae140bd1 Fix Clangourous Soul 
I broke this while trying to tidy up the code, it worked perfectly before. Also, make sure the "recoil' doesn't break Disguise.
 2021-11-04 21:50:42 +13:00
BuffelSaft ecbe048f96 Fix Octolock 
Fixed two issues:
- Octolock doesn't have an end of turn animation in gen 8
- The def drop anim wasn't played if Sp. Def was at -6 and def could still drop
 2021-11-04 21:26:04 +13:00
BuffelSaft cecd341011 Fix Tar Shot 
If Tar Shot can't do anything to the target it should fail. Checking this is clunky, but it works.
 2021-11-04 20:47:45 +13:00
BuffelSaft fb62479d85 Assign Tar Shot's effect 
Missed this change. Tar Shot works perfectly now.
 2021-11-04 20:28:11 +13:00
BuffelSaft 3baf2aa331 Remove trynextdart, update waitmessage 0x40 
Not dealing with Dragon Darts in this PR. Updated waitmessage 0x40 to waitmessage B_WAIT_TIME_LONG.
 2021-11-04 20:19:18 +13:00
BuffelSaft 28e78cb6c4 Gen 8 moves initial commit 
Full credit to Nunuchu42 and cfmnephrite for this code.
 2021-11-04 19:50:54 +13:00
BuffelSaft b615bc6dcd Merge pull request #1854 from AsparagusEduardo/BE_UndoForm 
Refactored UndoFormChange to make it more user friendly
 2021-11-04 17:30:55 +13:00
BuffelSaft 7d10097684 Replace IsTwoStrikesMove with FLAG_TWO_STRIKES 
Note that this flag does nothing until the Parental Bond PR is merged - it's just for the AI until then.
 2021-11-04 17:11:56 +13:00
BuffelSaft a2574b55cc Fix dynamic move damage calculation 
Can't check effectiveness here without breaking the AI. After testing, it also appears that it doesn't need to be checked here after all.
 2021-11-04 16:09:28 +13:00
BuffelSaft 4a7ddb737b Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai_improvements 2021-11-04 15:51:11 +13:00
BuffelSaft e930dae278 Remove ability pop up for Hunger Switch 
Morpeko should change form each turn without showing its ability.
 2021-11-04 15:40:26 +13:00
BuffelSaft 616be576fc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2 2021-11-04 15:29:38 +13:00
BuffelSaft eeb40daede Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil2 2021-11-04 13:52:58 +13:00
BuffelSaft 6132f9a9fe Merge pull request #1750 from ghoulslash/mirror_armor 
Mirror Armor
 2021-11-04 11:43:59 +13:00
BuffelSaft 5a855db4ad Fix prototype of CanBePoisoned 2021-11-04 11:08:37 +13:00
BuffelSaft 5141e84296 Fix base stats 
Clean up mess from testing.
 2021-11-03 20:01:09 +13:00
BuffelSaft 6ce1f01b8c Hunger Switch and Aura Wheel 
Implement the ability Hunger Switch and the move Aura Wheel.
 2021-11-03 19:45:03 +13:00
BuffelSaft 18b87416d5 Fixes 
- Fix Sheer Force interaction (needed after adding | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN)
- Fix "X Transformed!" target
- Allow switching between both forms
- Allow form change if target is KO'ed
 2021-11-03 17:56:16 +13:00
BuffelSaft 74c85b5818 Implement Relic Song's form change 
Meloetta transforms into its pirouette form after using Relic Song, unless it has Sheer Force or the move has no effect. It also has a chance to put both targets to sleep.
 2021-11-03 17:23:33 +13:00
BuffelSaft d33bcc335b Revert Poison Touch target check 
This would prevent Poison Touch activating if the target hurt itself.
 2021-11-03 14:49:14 +13:00
BuffelSaft f323e2c047 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil 2021-11-03 14:18:28 +13:00
BuffelSaft d99fd30e4d Looping battle script, correct message 
Testing in Sword showed that the pop up should happen once if two mons are cured, and that the correct message is "X was cured of its poisoning!"
 2021-11-03 11:51:20 +13:00
BuffelSaft 4668e11765 Looping battlescript version 1 
Would be better if it simply updated the target, cured the status and returned I think, needs testing.
 2021-11-03 00:45:24 +13:00
BuffelSaft 95435b5f7f Pastel Veil switchin effect attempt 
Battle script isn't working for partner for some reason.
 2021-11-02 23:06:10 +13:00
BuffelSaft 40bced517a Pastel Veil blocks poison for whole side 
Tested vs Toxic, Toxic Thread and Sludge with 100% effect chance.
 2021-11-02 20:00:57 +13:00
BuffelSaft 1e3b3d482b Merge pull request #1838 from Blackforest92/battle_engine 
Edit Spacial Rend and Hurricane background
 2021-11-02 17:11:47 +13:00
BuffelSaft 8af882348a Fix Parental Bond Super Fang 
Min damage should be 2
 2021-11-02 16:56:12 +13:00
BuffelSaft b97a250acc Merge pull request #1512 from ghoulslash/utility_umbrella 
Utility Umbrella
 2021-11-02 16:28:52 +13:00
BuffelSaft 4edee8f5d4 Merge pull request #1839 from AsparagusEduardo/BE_fixPlasmaFists 
Fixed Plasma Fists target
 2021-11-01 20:09:41 +13:00
BuffelSaft fbce8b2ff0 Merge pull request #1749 from ghoulslash/wandering_spirit 
Wandering Spirit
 2021-11-01 11:26:53 +13:00
BuffelSaft 2282c4fb5c Fix MOVEEND_CHOICE_MOVE 
Oops
 2021-10-31 12:09:40 +13:00
BuffelSaft 52054e4bfe Fix Corrosion, Poison Touch 
- CanBePoisoned now calls CanPoisonType instead of overriding it. Poison Touch now activates only if the attacker actually damaged the target. Partially implemented Pastel Veil.
 2021-10-30 21:12:18 +13:00
BuffelSaft da30f023e8 Revert "Ex fix move bg tilemaps" 2021-10-30 19:32:37 +13:00
BuffelSaft 47bfeaeecd Implement Gorilla Tactics 
It's Choice Band but as an ability.
 2021-10-30 18:31:44 +13:00
BuffelSaft 6b65ef5bcf Merge pull request #1824 from ghoulslash/itemheal_fix 
Fix iteam healing after a failed move
 2021-10-30 15:25:28 +13:00
BuffelSaft f0e9b09258 Merge pull request #1822 from ghoulslash/harvest 
fix recycle and harvest
 2021-10-30 15:00:56 +13:00
BuffelSaft 378e66ee9a Fix Mega Gardevoir's front sprite 
The shiny didn't have its black "dress" due to the normal palette having duplicate colours to handle the shiny's extra colours.
 2021-10-30 13:20:18 +13:00
BuffelSaft 1429170d16 Fix long descriptions 
Just noticed some of these didn't fit in the box.
 2021-10-26 16:45:49 +13:00
BuffelSaft adcf563ba1 Add missing berry data 
Certain gen 4+ berries were missing graphics and berry data. Adding this data allows them to be viewed and planted.
 2021-10-26 14:42:06 +13:00
BuffelSaft 4faa077641 Triple Kick, Super Fang tweaks 
Ignore accuracy for Triple Kick and assume all hits will connect. Super Fang always does at least 1 damage, so this should be accounted for.
 2021-10-26 13:41:08 +13:00
BuffelSaft 4310868bee AI handles multi-strike and fixed dmg moves 
Does not account for Parental Bond or Beat Up yet as those require some functions from #1676.
 2021-10-24 18:49:17 +13:00
BuffelSaft bbe2eccf62 Fix typo 
CanBeParayzed to CanBeParalyzed
 2021-10-24 17:57:06 +13:00
BuffelSaft d64dc2bbe8 Sleep moves don't check target's type 
Dark types aren't immune to Hypnosis, Ghost types aren't immune to Yawn or Lovely Kiss, so this check isn't needed.
 2021-10-24 17:55:37 +13:00
BuffelSaft a374bbf9f3 Merge pull request #1785 from SonikkuA-DatH/SonikkuA-DatH-patch-1 
For Magnemite sprite errors
 2021-10-19 18:08:42 +13:00
BuffelSaft b2969b6782 Merge pull request #1699 from AsparagusEduardo/PE_ArceusAnimations 
Updated Arceus' forms' animations
 2021-10-19 16:35:03 +13:00
BuffelSaft 910fdfa94a Revert "Fix multi target moves" 
This reverts commit b5293cc3e2.
 2021-10-19 16:25:01 +13:00
BuffelSaft 0b7072e007 Merge pull request #1780 from rh-hideout/revert-1666-bKGD_PE 
Revert "Fix the 'bKGD: invalid index' error"
 2021-10-17 23:49:26 +13:00
BuffelSaft df2223a5bc Merge pull request #1745 from LOuroboros/retaliate 
Implemented Retaliate's effect
 2021-10-16 22:49:32 +13:00
BuffelSaft 4861f2eea2 Merge pull request #1755 from ghoulslash/prankster_fix 
Fix protect struct fields being set during ai calcs
 2021-10-16 17:59:30 +13:00
BuffelSaft 791f4164a2 Fix PP being checked when HITMARKER_NO_PPDEDUCT is set 
This fixes multi target moves and seems like it should be done anyway,
 2021-10-16 17:31:27 +13:00
BuffelSaft b5293cc3e2 Fix multi target moves 
Only run CANCELLER_PRANKSTER when moving to the next target of a multi target move. If more cancellers are needed they can be added/moved after CANCELLER_PRANKSTER.
 2021-10-16 17:04:36 +13:00
BuffelSaft 3631561638 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald into genders-in-PSS 2021-10-15 16:17:55 +13:00
BuffelSaft 7610a9abad Fix bug with female icon sprites 
Thanks to AsparagusEduardo for this code!
 2021-10-15 16:17:08 +13:00
BuffelSaft 85dd7ff63c Fix Storm Drain/Dive bug 
If Storm Drain is triggered by dive it should clear the attacker's semi-invulnerable status.
 2021-10-14 16:40:18 +13:00
BuffelSaft fc6e8f598c Merge branch 'battle_engine' into battle_bond 2021-10-14 16:24:59 +13:00
BuffelSaft bb8d0e3d6b Fix Battle Bond 
Battle Bond Greninja transforms only after a KO, and doesn't revert when switched out.
 2021-10-14 16:18:11 +13:00
BuffelSaft 8a7e6379b6 Merge pull request #1732 from ghoulslash/perish_song 
Fix Soundproof cancelling out user's Perish Song
 2021-10-10 22:55:20 +13:00
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
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
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
BuffelSaft 2119c33989 Merge pull request #1723 from AsparagusEduardo/fix_PsychicFangs 
Fixed Psychic Fangs power
 2021-10-06 14:36:53 +13: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
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
BuffelSaft 75c2832afe Merge pull request #1697 from AsparagusEduardo/fix_cobaBerry 
Fixed Coba Berry's typing
 2021-09-29 15:43:31 +13: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
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
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
BuffelSaft dc5259ed3f PSS supports gender differences (kinda) 
Update the PSS to show gender-specific icons for mons that have them. Comes with a small but harmless bug - could use some suggestions for fixing it!
 2021-09-11 16:59:39 +12:00
BuffelSaft 4aa7c096b7 Show gender differences in evo scene 2021-09-11 16:30:09 +12:00
BuffelSaft db928a1329 Data entry for new sprites 
Add sprite defines, entries to gender tables, etc.
 2021-09-11 14:12:41 +12:00
BuffelSaft 0f5444d331 Add sprites and icons for major gender differences 
Credit to MrDollSteak for the sprites - I palette swapped the hippos and made some of the icons, but everything else is MrDS!
 2021-09-11 13:52:09 +12:00
BuffelSaft b598efa956 Add alolan Sandshrew line to gSpeciesToNationalPokedexNum 2021-09-10 13:47:53 +12:00
BuffelSaft bd92552fb6 Add new line to burn was healed string 2021-09-07 16:39:42 +12:00