ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,740 Commits 1 Branch 0 Tags 235 MiB
a5659f3339
Commit Graph

646 Commits

Author SHA1 Message Date
ghoulslash
940a165be7 merge w be 2021-11-13 09:09:15 -05: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
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
ghoulslash
41bf1dc2f4 merge w be 2021-11-06 10:40:57 -04:00
Eduardo Quezada D'Ottone
ae8de0f07a Merge branch 'BattleEngine' into BE_TerrainMoves 
# Conflicts:
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
#	src/battle_util.c
 2021-11-06 10:44:05 -03: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
BuffelSaft
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
LOuroboros
5f458c9cd3 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser 2021-11-05 10:58:53 -03: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
6df3975fc6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2 2021-11-05 14:32:33 +13:00
LOuroboros
22f7e81bef Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry 2021-11-04 12:25:26 -03:00
LOuroboros
4f251e6ec2 Moved VARIOUS_TRY_TO_REVERT_MIMICRY to VARIOUS_REMOVE_TERRAIN 2021-11-04 12:13:55 -03: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
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
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
LOuroboros
b931e34172 Handled Mimicry's interaction with Steel Roller's effect 2021-11-03 23:23:28 -03: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
LOuroboros
f6628e301f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry 2021-11-03 20:43:33 -03:00
LOuroboros
f0d7c75ec8 Syntax corrections 2021-11-03 17:48:04 -03:00
ghoulslash
48c29a9cd8 proper mirror armor sticky web targeting 2021-11-03 15:05:52 -04:00
LOuroboros
af6e72ecfe Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser 2021-11-03 08:56:01 -03: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
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
LOuroboros
69b42de0d9 Implemented Mimicry 
Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
 2021-11-02 14:44:55 -03:00
ghoulslash
592a1dab63 fix mirror armor setstatchanger, handle reflected stat blockage 2021-11-02 12:02:58 -04:00
ghoulslash
ffcba355b0 merge w be 2021-11-02 10:36:08 -04: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
ghoulslash
e4242d04ab remove battler skipping in neutralizing gas exit bs 2021-11-01 14:28:41 -04:00
ghoulslash
48bea554a3 fix tryendneutralizinggas placement 2021-11-01 14:21:28 -04:00
ghoulslash
98b4b821dc merge with be 2021-11-01 13:55:55 -04:00
ghoulslash
a1e64fce4f handle simple beam, gastro acid 2021-11-01 13:50:57 -04:00
ghoulslash
b5d20da927 merge with be 2021-11-01 11:36:18 -04:00
ghoulslash
52d4d1cd34 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella 2021-10-31 11:40:00 -04:00
ghoulslash
bc170f3a43 merge with be 2021-10-31 11:04:39 -04:00
ghoulslash
468ee66cd8 fix synthesis and leaf guard w utility umbrella 2021-10-30 11:04:50 -04:00
ghoulslash
3e364b4870 switchin abilities activate after wandering spirit 2021-10-30 09:16:33 -04:00
ghoulslash
f4537b1213 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into wandering_spirit 2021-10-30 09:14:32 -04:00
ghoulslash
4b0325dbe4 neutralizing gas switchout 2021-10-30 09:13:08 -04:00
BuffelSaft
47bfeaeecd Implement Gorilla Tactics 
It's Choice Band but as an ability.
 2021-10-30 18:31:44 +13:00