Commit graph

12770 commits

Author SHA1 Message Date
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
SonikkuA-DatH
9d14cb3309
Add files via upload
Teapot sprited by me. Based on this: https://cdn.discordapp.com/attachments/425852970689626123/914062336476708874/unknown.png
2021-11-28 19:59:38 -08:00
SonikkuA-DatH
ec596cf9b2
Update battle_moves.h
Not sure why it works better with User than "All targets"
2021-11-28 19:58:18 -08:00
SonikkuA-DatH
5258ddcc8e
Update graphics.c 2021-11-28 19:57:05 -08:00
SonikkuA-DatH
492f8d8f29
Update battle_util.c 2021-11-28 19:55:49 -08:00
SonikkuA-DatH
1a882dddb4
Update battle_script_commands.c 2021-11-28 19:54:34 -08:00
SonikkuA-DatH
3c33a4b3d7
Update battle_anim_effects_1.c 2021-11-28 19:50:25 -08:00
SonikkuA-DatH
7fe8e956e7
Update battle_anim.c 2021-11-28 19:49:03 -08:00
SonikkuA-DatH
adecc77fe8
Update battle_anim_scripts.s 2021-11-28 19:47:09 -08:00
SonikkuA-DatH
10a870a568
Update battle_scripts_1.s 2021-11-28 19:45:47 -08:00
SonikkuA-DatH
7b5dfa83af
Update battle_move_effects.h 2021-11-28 19:44:02 -08:00
SonikkuA-DatH
002556cf3f
Update battle_script_commands.h 2021-11-28 19:42:32 -08:00
SonikkuA-DatH
ca4207d497
Update battle_anim.h 2021-11-28 19:40:55 -08:00
SonikkuA-DatH
c8fba3fa90
Update graphics.h 2021-11-28 19:36:17 -08:00
SonikkuA-DatH
1de476da84
Update battle_script.inc 2021-11-28 19:33:58 -08: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
GriffinR
e677a00676
Merge pull request #1560 from GriffinRichards/retire-ok
Retire OK bot
2021-11-27 21:27:14 -05:00
Eduardo Quezada D'Ottone
fa995894b7 Added Nature evolution methods 2021-11-27 20:46:19 -03:00
Eduardo Quezada D'Ottone
7c6f76323a Added NidoranM/Volbeat Ditto breeding config + Rotom & Furfrou 2021-11-26 22:56:48 -03:00