Commit graph

12770 commits

Author SHA1 Message Date
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
LOuroboros
be05ff2e3b Fixed the palette of Pikachu Partner Cap's back 2021-12-04 16:32:53 -03:00
TheXaman
f07f31f401
Update src/pokemon_debug.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-12-04 19:37:35 +01:00
TheXaman
9306b19ced fixed wrong icon palettes on some icons 2021-12-04 19:36:51 +01: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
TheXaman
fa435b058c fixed sprite animations overlapping 2021-12-04 12:51:36 +01:00
TheXaman
6a15b938e9 front and back sprites now used separate palettes 2021-12-04 12:42:22 +01:00
TheXaman
1cf4824575 Prevents the debug menu beeing opened in battle and breaking the game 2021-12-04 10:57:40 +01:00
TheXaman
be0e576ee6
Merge pull request #9 from AsparagusEduardo/PE_debug_improvements
Form switching added, pic coords aligned
2021-12-04 10:45:23 +01:00
SonikkuA-DatH
78ab05e650
Update battle_script_commands.c 2021-12-03 18:09:07 -08:00
SonikkuA-DatH
76136c4858
Update battle_main.c 2021-12-03 18:07:35 -08:00
SonikkuA-DatH
a32ac0d290
Update battle_message.c 2021-12-03 18:05:39 -08:00
SonikkuA-DatH
b6fff16a7d
Update battle.h 2021-12-03 18:04:44 -08:00
ultima-soul
349262ebc3 Merge remote-tracking branch 'rhh/item_expansion' into item_expansion_sync 2021-12-03 17:31:02 -08: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
Eduardo Quezada D'Ottone
faca2fbef6 Adjusted Front pic coords so they align to single battle 2021-12-03 20:24:10 -03:00
Eduardo Quezada D'Ottone
96b8d21b7a Added form switching + Button icons 2021-12-03 19:32:31 -03: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
LOuroboros
4ca9005797 Removed weird spaces in 7 dex descriptions 2021-12-03 18:34:14 -03: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
TheXaman
42ed047bc0
Update src/pokemon_summary_screen.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-12-03 11:42:14 +01:00
TheXaman
7ff8c1c9eb
Update src/pokemon_icon.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-12-03 11:42:11 +01:00
TheXaman
44dab3cc93
Update src/pokemon_icon.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-12-03 11:42:07 +01:00
TheXaman
99d03259ff
Update src/pokemon_icon.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-12-03 11:42:02 +01:00
TheXaman
5a63cbd527
Update src/pokemon_icon.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-12-03 11:41:58 +01:00
TheXaman
378152c1a3
Update src/decompress.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-12-03 11:41:54 +01:00
TheXaman
40f7247e11 changed P_ENABLE_DEBUG to TRUE/FALSE 2021-12-03 11:02:22 +01:00
Eduardo Quezada D'Ottone
37d784af31
Merge pull request #1964 from LOuroboros/enigma
Renamed the Enigma Berries' constants
2021-12-02 21:48:37 -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
TheXaman
bf0d2b8393 Changed definition of P_ENABLE_DEBUG to pokemon_config.h 2021-12-02 19:29:04 +01:00
ghoulslash
0434bf22e6
Merge pull request #1962 from LOuroboros/patch-2
One more merge conflict rejected
2021-12-02 13:20:14 -05:00
TheXaman
a36445ea11 Changed opening to summary screen SELECT 2021-12-02 18:16:41 +01:00
ultima-soul
d408b56549 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-12-01 20:18:57 -08:00
ultima-soul
a68a39e35f Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-12-01 20:17:49 -08:00
ultima-soul
23bf41713c Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-12-01 20:17:08 -08:00