GriffinR
32a9ac6eb1
Merge pull request #1575 from LOuroboros/benriBotan
...
[LEAK INFORMED] Documented the unk19 item field
2021-12-17 22:27:45 -05:00
LOuroboros
4a74d288d4
Review corrections
2021-12-18 00:01:50 -03:00
LOuroboros
dbca24aa82
[LEAK INFORMED] Documented the unk19 item field
2021-12-17 19:41:39 -03:00
ultima-soul
84ce9745d5
Merge pull request #1990 from AsparagusEduardo/BE_debugArrows
...
Improved battle debug number value changing
2021-12-17 09:21:04 -08:00
ghoulslash
31bbc4ddde
prevent stat-raising damage effects if battle will end
2021-12-17 10:24:07 -05:00
Eduardo Quezada D'Ottone
837641f304
Update src/battle_debug.c
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-12-17 06:47:46 -03:00
Eduardo Quezada D'Ottone
8005db5040
Update src/battle_debug.c
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-12-17 06:47:35 -03:00
Eduardo Quezada D'Ottone
3a12cdb8cb
Update src/battle_debug.c
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-12-17 06:47:02 -03:00
ultima-soul
961710ddd9
Merge pull request #1986 from AsparagusEduardo/BE_steamEngine
...
Added Steam Engine's overworld effect
2021-12-16 16:15:58 -08:00
Eduardo Quezada D'Ottone
d23e7069bd
Merge pull request #1998 from ultima-soul/be/enigma_berry_3
...
Eliminate Item Expansion Conflicts for ITEM_ENIGMA_BERRY_E_READER Constant
2021-12-16 21:07:15 -03:00
GriffinR
6e5520207f
Merge pull request #1573 from GriffinRichards/tilesetanim
...
Clean up tileset_anims
2021-12-15 09:47:54 -05:00
GriffinR
961dbee5e3
Clean up tileset_anims
2021-12-14 21:41:07 -05:00
GriffinR
df371fdda5
Merge pull request #1572 from LOuroboros/patch-2
...
Update trade.c
2021-12-14 12:54:09 -05:00
LOuroboros
660a3df929
Update trade.c
2021-12-14 14:47:04 -03:00
Eduardo Quezada D'Ottone
abe9910251
Fixed speed to be more like vanilla's
2021-12-12 12:42:14 -03:00
Eduardo Quezada D'Ottone
7ca07527fa
Config for HP bars moving faster for higher HP amounts. Credit to Dat.H
2021-12-12 12:33:49 -03:00
ultima-soul
a2ad860ae4
Merge branch 'pret/enigma_berry_2' into be/enigma_berry_3
2021-12-11 19:11:13 -08:00
ultima-soul
f4af5ea206
Merge conflict resolution trick.
2021-12-11 18:52:39 -08:00
Eduardo Quezada D'Ottone
bbf7b62ceb
Config for lost money after losing a battle
2021-12-11 23:03:50 -03:00
Eduardo Quezada D'Ottone
6f363b219e
Improved battle debug value change
2021-12-11 16:41:04 -03:00
Eduardo Quezada D'Ottone
2773b14de5
Updated AI debug hold effect name display.
2021-12-11 00:09:47 -03:00
Eduardo Quezada D'Ottone
aa2b2e6a70
Merge pull request #1929 from ultima-soul/battle_engine_sync
...
Battle Engine Upstream Sync
2021-12-09 20:02:45 -03:00
GriffinR
d8e405c4f6
Merge pull request #1571 from GriffinRichards/fix-evergrandeflowers
...
Fix incorrect ever grande flower animation palettes
2021-12-08 18:02:41 -05:00
ultima-soul
a5afdac0ae
Resolved review suggestions for upstream Battle Engine sync.
2021-12-08 12:08:16 -08:00
DizzyEggg
0a7dd2edd6
Fix Intimidate affecting fainted mons
2021-12-07 12:19:27 +01:00
Eduardo Quezada D'Ottone
756700ff4d
Added Steam Engine's overworld effect
2021-12-06 20:52:32 -03:00
GriffinR
cc05b08227
Fix incorrect ever grande flower animation palettes
2021-12-06 11:17:42 -05:00
DizzyEggg
dff72b97dd
Merge pull request #1971 from sphericalice/patch-2
...
Remove extra spaces in battle strings
2021-12-06 14:13:39 +01:00
DizzyEggg
97539d7443
Merge pull request #1951 from ghoulslash/be/sheercold
...
Ice Types immune to Sheer Cold
2021-12-06 14:12:06 +01:00
sphericalice
5c02facde4
Use more specific enum names for throwable Balls
2021-12-05 23:17:44 +00:00
sphericalice
3db871c49a
Refactor CanThrowLastUsedBall and related functions
2021-12-05 23:10:05 +00:00
ghoulslash
1e644c9d4c
fix spacing
2021-12-05 14:45:48 -05:00
ghoulslash
c0e408bfab
fix aqua ring heal anim
2021-12-05 14:44:22 -05:00
LOuroboros
a5659f3339
AI partners no longer get exp.
2021-12-04 23:00:57 -03:00
Eduardo Quezada D'Ottone
1708ac4b1b
Wild mon that have a natural enemy or preys on other mon will attack them whem partnered in double wild battles.
2021-12-04 22:13:29 -03:00
kleeenexfeu
340d505116
Moxie/follow me fix
2021-12-04 17:41:31 +01:00
kleeenexfeu
e7321c22f2
Moxie spread move fix
2021-12-04 17:38:26 +01:00
ultima-soul
7369f60c06
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
2021-12-03 17:30:45 -08:00
GriffinR
888bb4ae9e
Merge pull request #1570 from GriffinRichards/fix-flag
...
Fix incorrect flag animation palettes
2021-12-03 18:44:24 -05:00
GriffinR
8cbb207795
Merge pull request #1568 from GriffinRichards/fix-roamerstatus
...
Add BUGFIX for roamer's status
2021-12-03 16:58:53 -05:00
GriffinR
d501636730
Fix incorrect flag animation palettes
2021-12-03 16:36:18 -05:00
sphericalice
10c6630ffd
Remove extra spaces in battle strings
2021-12-03 19:34:03 +00:00
Eduardo Quezada D'Ottone
ae1d124a0c
Merge pull request #1969 from LOuroboros/patch-2
...
Removed ITEM_ENIGMA_BERRY_E_READER usage
2021-12-03 15:53:46 -03:00
LOuroboros
ac606364e9
Removed ITEM_ENIGMA_BERRY_E_READER usage
2021-12-03 15:44:12 -03:00
Eduardo Quezada D'Ottone
8058da5b88
Merge pull request #1963 from ghoulslash/be/aifix
...
Fix AI protect struct reset
2021-12-02 16:24:52 -03:00
ghoulslash
0434bf22e6
Merge pull request #1962 from LOuroboros/patch-2
...
One more merge conflict rejected
2021-12-02 13:20:14 -05:00
ultima-soul
23bf41713c
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-12-01 20:17:08 -08:00
ghoulslash
fbf74a9988
fix protect struct reset
2021-12-01 15:30:07 -05:00
LOuroboros
e7bef25fb1
Updated hold_effects.h
2021-12-01 13:32:43 -03:00
LOuroboros
19af517bbb
Edited pointless or useless Primal Reversion code
...
Also added an equivalent to GetMegaEvolutionSpecies and GetWishMegaEvolutionSpecies for Primal Reversion.
Also also modified how CanBattlerGetOrLoseItem checks for Primal Reversion.
Also also also rewrote the check that triggers Primal Reversion in TryDoEventsBeforeFirstTurn.
2021-12-01 00:56:33 -03:00
