11626 Commits

Author SHA1 Message Date
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
00b536f9ca Merge branch 'pret/enigma_berry_2' into ie/enigma_berry_2 2021-12-11 18:54:18 -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
LOuroboros
f317b542e2 Updated Teleport 2021-12-11 21:20:04 -03:00
Eduardo Quezada D'Ottone
6f363b219e Improved battle debug value change 2021-12-11 16:41:04 -03:00
TheXaman
a249737e0e removed dead code (arrows dont have a left animation) 2021-12-11 15:06:54 +01:00
TheXaman
51371661c2 Added new menu naviagtion, now all options can be changed 2021-12-11 15:03:56 +01:00
TheXaman
bbe918941e added include/constants/pokemon_debug,h for defines, restructured code order 2021-12-11 12:13:14 +01:00
Eduardo Quezada D'Ottone
2773b14de5 Updated AI debug hold effect name display. 2021-12-11 00:09:47 -03:00
TheXaman
8c23ad34ee fixed 2021-12-10 20:59:34 +01:00
TheXaman
44121b041c added battle bg's and platforms and a function LoadBattleBg to change them 2021-12-10 20:40:34 +01:00
ultima-soul
26f29a04fd Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync"
This reverts commit ac2bcece75fa3bf5bc4018ce659e51a635d46b97, reversing
changes made to 349262ebc35abb090e51c689c74ee839713c83c6.
2021-12-10 09:41:54 -08:00
TheXaman
ef01c401f7 another fix for the shared front and back palette 2021-12-10 17:50:55 +01:00
TheXaman
f6d9b74a1a Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into pokemon_expansion_debug 2021-12-10 16:48:46 +01:00
TheXaman
963642d309 added the option to change a sprites animation to check which animation fits the best 2021-12-10 16:18:39 +01:00
TheXaman
31330bef96 proper Window usage 2021-12-10 12:29:50 +01:00
TheXaman
5bef2d0fb2 moved pokemon icon to the top left 2021-12-10 11:14:25 +01:00
Eduardo Quezada D'Ottone
3c9074a867
Merge pull request #1931 from ultima-soul/item_expansion_sync
Item Expansion Upstream Sync
2021-12-09 20:02:56 -03:00
Eduardo Quezada D'Ottone
e4315c89e9
Merge pull request #1930 from ultima-soul/pokemon_expansion_sync
Pokemon Expansion Upstream Sync
2021-12-09 20:02:52 -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
ultima-soul
ac2bcece75 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync 2021-12-09 14:16:05 -08:00
ultima-soul
d99ac2e44a Resolved review suggestions for upstream Pokemon Expansion sync. 2021-12-09 09:51:28 -08: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
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