atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11496 commits 2 branches 40 tags 600 MiB
Commit graph

11496 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
e7bef25fb1
Updated hold_effects.h 2021-12-01 13:32:43 -03:00
Blackforest92
2ad3c3f6be Palette Conversion GEN4 2021-12-01 19:57:50 +07: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
Eduardo Quezada D'Ottone
14f974c9a9
Merge pull request #1954 from ghoulslash/be/aifix 
revert ai item usage code
 2021-11-30 14:06:25 -03:00
Blackforest92
98e5b1f031 Palette conversion GEN3 2021-11-30 23:29:44 +07: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
Blackforest92
5a197aa258 Palette conversion GEN2 2021-11-30 16:40:09 +07:00
TheXaman
b0f8408fb6 added gender based sprites, added textbox line, adjusted sprite offset to match line 2021-11-30 02:29:33 +01:00
TheXaman
6c520659aa implemented a inital pokemon debug menu based on code from Gamer2020 and AsparagusEduardo 2021-11-29 22:52:08 +01:00
GriffinR
1a08d8fcb4 Add BUGFIX for roamer's status 2021-11-29 12:56:03 -05:00
ghoulslash
e731d93c0b update a couple gen 3 ability names 2021-11-29 12:46:14 -05:00
ghoulslash
7a7c6afc39 larger ability popup, fix ability name printing/clearing, and config for longer ability names 2021-11-29 12:42:01 -05:00
Blackforest92
8668e5c833 Remove GEN1 junk files 2021-11-29 23:20:02 +07:00
GriffinR
83be1bfc8f Remove sFiller from malloc.c 2021-11-29 11:19:30 -05:00
Blackforest92
7ae424eac8 Palette conversion GEN1 2021-11-29 23:18:57 +07:00
TheXaman
df8dfd9a65 added #ifdef TX_DEBUGGING for wild encounter, bag use and catching flags 2021-11-28 20:53:23 +01:00
TheXaman
5780560007 fixed some bugs, thanks to cbt 2021-11-28 20:28:54 +01:00
ghoulslash
d108f77aa4 revert ai item usage code 2021-11-28 13:12:56 -05:00
Eduardo Quezada D'Ottone
b6b74b1656
Oops 
Update src/pokemon.c

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-11-28 11:39:08 -03:00
ultima-soul
01a90ca6c2 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-11-27 22:17:05 -08:00
ultima-soul
d0623d7b71 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-11-27 21:40:08 -08:00
ultima-soul
0312c5be8b Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-27 21:38:26 -08:00
GriffinR
4c64863bc5
Merge pull request #1567 from LOuroboros/sBattleTerrainTable 
Renamed gBattleTerrainTable
 2021-11-27 23:43:22 -05:00
GriffinR
01859a63ff
Merge pull request #1566 from cbt6/move-speed 
Rename speed parameter to distance in jump functions
 2021-11-27 23:37:50 -05:00
LOuroboros
b042eb6436 gBattleTerrainTable -> sBattleTerrainTable 2021-11-28 01:22:27 -03:00
cbt6
c59c7b0518 Use enums for jump distances 2021-11-28 12:01:29 +08:00
cbt6
b6430098d4 Rename speed parameter to distance in jump functions 2021-11-28 12:01:29 +08:00