Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,108 Commits 1 Branch 0 Tags
Commit Graph

7861 Commits

Author SHA1 Message Date
TheXaman
5bef2d0fb2 moved pokemon icon to the top left 2021-12-10 11:14:25 +01: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
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
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
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
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
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
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
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
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
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
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
LOuroboros
2e67153982 Renamed the Enigma Berries' constants 2021-12-01 22:16:38 -03:00
ghoulslash
fbf74a9988 fix protect struct reset 2021-12-01 15:30:07 -05: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
LOuroboros
f2dd7bce99 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionTweaks 2021-11-30 20:39:58 -03:00
TheXaman
cb1c753b63 removed unused code 2021-11-30 13:48:11 +01:00
TheXaman
dcf7dd6ce6 small fix 2021-11-30 12:28:13 +01:00
TheXaman
c402a840b1 changed to P_ENABLE_DEBUG 2021-11-30 11:20:26 +01:00
TheXaman
50e95878e9 added Select button text, added gender based icons, imrpoved code 2021-11-30 11:16:30 +01:00
TheXaman
b0f8408fb6 added gender based sprites, added textbox line, adjusted sprite offset to match line 2021-11-30 02:29:33 +01:00