Commit Graph

7889 Commits

Author SHA1 Message Date
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
e6a2d2226f
Merge pull request #1540 from DizzyEggg/rage_powder
Rage powder updated to gen6
2021-07-24 07:15:58 -06:00
ghoulslash
72d346fa46
Merge pull request #1560 from rh-hideout/DizzyEggg-patch-3
Fix White Smoke affecting Shell Smash's def drop
2021-07-24 07:14:08 -06:00
ghoulslash
25f9458fea
Merge pull request #1573 from LOuroboros/undoformchange
Fixed calls to UndoFormChange in battle_script_commands.c
2021-07-18 11:16:41 -06:00
LOuroboros
29b1ba2a3c Fixed calls to UndoFormChange in battle_script_commands.c 2021-07-18 12:34:17 -03:00
DizzyEggg
312583de5e
Merge pull request #1564 from BuffelSaft/form-capture
Undo form changes on capture
2021-07-16 09:22:23 +02:00
DizzyEggg
304f3b9203
Merge pull request #1565 from BuffelSaft/disguise-fix
Fix Disguise reverting on switch out
2021-07-16 09:17:10 +02:00
BuffelSaft
d2d7b6ffef Remove Mimikyu check from loop
More efficient than checking in each loop iteration.
2021-07-16 18:09:41 +12:00
BuffelSaft
90fdb74ccb Remove UndoFormChangeOnSwitch
Handle switching out Mimikyu Busted in UndoFormChange.
2021-07-16 17:56:53 +12:00
DizzyEggg
d6400448fd
Merge pull request #1563 from ghoulslash/battle_ai
AI_IsTerrainAffected checks
2021-07-15 09:36:47 +02:00
ghoulslash
a29c9f9339
Merge pull request #1569 from LOuroboros/cotton_down
Fixed Cotton Down
2021-07-13 11:06:59 -06:00
ghoulslash
ebc187c16d
Merge pull request #1536 from DizzyEggg/gravity
Fix Gravity's animation
2021-07-13 10:54:45 -06:00
LOuroboros
02eace4574 Fixed Cotton Down
It will no longer affect fainted 'mons.
2021-07-13 13:54:33 -03:00
BuffelSaft
63faa6e3a9 Fix Disguise reverting on switch out
Make Mimikyu's disguise stay busted when it's switched out.
2021-07-11 14:15:24 +12:00
BuffelSaft
8d432e4e34 Undo form changes on capture
This will revert busted Mimikyu, Schooling Wishiwashi etc. to their base forms when caught.
2021-07-11 12:51:27 +12:00
ghoulslash
59c16ff1cf AI_IsTerrainAffected checks 2021-07-10 16:41:41 -06:00
DizzyEggg
34f869ef40
Fix White Smoke affecting Shell Smash's def drop 2021-07-06 10:37:17 +02:00
ultima-soul
4d1c63e3d3
Merge pull request #1556 from ExpoSeed/BE/fix-redefinition-error
Include expansion_branches.h in global.h
2021-07-04 13:41:42 -07:00
ExpoSeed
0ed1d29ece Include expansion_branches.h in global.h 2021-07-04 12:39:30 -05:00
ghoulslash
171329aabd
Merge pull request #1552 from ExpoSeed/BE/fix-redefinition-error
Fix redefinition error in battle_config.h
2021-07-04 09:31:46 -06:00
ExpoSeed
fb69b65337 Fix redefinition error in battle_config.h 2021-07-02 14:36:55 -05:00
DizzyEggg
800e2395c0
Merge pull request #1542 from BuffelSaft/thaw_moves_2
Fix Thawing Moves, Add FLAG_THAW_USER
2021-06-19 13:47:51 +02:00
BuffelSaft
4c18cb7fe7 Remove EFFECT_THAW_HIT 2021-06-19 11:49:00 +12:00
BuffelSaft
06111bdc63 Replace EFFECT_THAW_HIT
Both moves that used EFFECT_THAW_HIT now use EFFECT_BURN_HIT.
2021-06-19 11:43:29 +12:00
BuffelSaft
87279ecab9 Fix CANCELLER_FROZEN
Now checks if current move will thaw user before trying to defrost it.
2021-06-19 11:31:46 +12:00
ghoulslash
70fd98a009
Merge pull request #1541 from rh-hideout/DizzyEggg-patch-2
Fix Imposter looplock
2021-06-10 11:59:29 -06:00
ghoulslash
de21636f97
Merge pull request #1539 from rh-hideout/DizzyEggg-patch-1
Fix mon shadow when caught and learn new move
2021-06-10 11:59:10 -06:00
BuffelSaft
e6a8faec1e Fix thawing moves
Replace IsThawingMove with a move flag and add a check for it to CANCELLER_FROZEN. This makes thawing moves actually thaw the user.
2021-06-10 23:48:18 +12:00
DizzyEggg
179ac9c1e1
Fix Imposter looplock 2021-06-10 13:45:24 +02:00
DizzyEggg
f27dcab784 Rage powder has powder moves qualities when forcing a target 2021-06-10 12:55:05 +02:00
DizzyEggg
c6f3b7f571
Merge pull request #1532 from LOuroboros/emergency_exit
Fixed Emergency Exit
2021-06-10 10:41:07 +02:00
DizzyEggg
1e855cf469
Fix mon shadow when caught and learn new move
Fixes #1477
2021-06-09 09:49:42 +02:00
ultima-soul
1ff3718d1f
Merge pull request #1446 from LOuroboros/inner_focus
Tweaked Inner Focus
2021-06-08 13:18:35 -07:00
LOuroboros
d849c31ee8 Followed Ghoulslash's suggestion 2021-06-08 11:56:03 -03:00
ghoulslash
a683c698fb
Merge pull request #1524 from Jaizu/patch-13
Change the ability popup sound
2021-06-08 08:41:41 -06:00
DizzyEggg
e2f14d43db Fix Gravity's animation 2021-06-08 12:13:40 +02:00
LOuroboros
2c1237365b Fixed Emergency Exit
The ability was getting triggered even if the user was the only Pokémon alive in the party.
2021-06-07 22:39:53 -03:00
LOuroboros
588b3638d3 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into inner_focus 2021-06-07 19:22:20 -03:00
LOuroboros
8726107d42 Removed BattleScript_FlinchPrevention
Also reverted a nonsensical change in SetMoveEffect's case MOVE_EFFECT_FLINCH.
2021-06-07 19:18:15 -03:00
ExpoSeed
339f297949
Merge pull request #1525 from ultima-soul/battle_engine_sync
Battle Engine Upstream Sync
2021-06-07 15:56:43 -05:00
ultima-soul
092f02f119 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-06-07 12:00:23 -07:00
ultima-soul
2563bc5c83
Merge pull request #1521 from DizzyEggg/largeexp
Allow larger exp gains
2021-06-06 13:33:33 -07:00
Jaizu
3ae783aa16
Change the ability popup sound 2021-06-06 22:19:17 +02:00
luckytyphlosion
7a7ebe1827
Merge pull request #1461 from Fontbane/patch-1
Rename sText_WildPkmnAppeared2 to reflect its use
2021-06-04 22:42:24 -04:00
ultima-soul
3448e19275
Merge pull request #1459 from ExpoSeed/BE/rename-flags
Rename flags
2021-06-04 19:33:45 -07:00
AJ Fontaine
2fe7184d10
Rename sText_WildPkmnAppeared2 to reflect its use
sText_WildPkmnAppeared2 is used for Legendary battles, so sText_LegendaryPkmnAppeared would be more informative.
2021-06-04 22:32:33 -04:00
ExpoSeed
12a155bd9a FLAG_DMG_2X_IN_AIR can now hit targets 2021-06-04 21:28:28 -05:00