14358 Commits

Author SHA1 Message Date
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
TheXaman
499fe6b2e5 small improvements 2021-11-28 13:18:41 +01: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
TheXaman
3acc0f4e94 further improved the windows, reworked a lot of code, massivly reduced the flickering on the stats page 2021-11-27 23:04:09 +01:00
TheXaman
07de572e5c Reworked stats screen to use windows 2021-11-27 20:56:04 +01:00
TheXaman
8f94b91365 Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss 2021-11-27 12:11:24 +01:00
Eduardo Quezada D'Ottone
7c6f76323a Added NidoranM/Volbeat Ditto breeding config + Rotom & Furfrou 2021-11-26 22:56:48 -03:00
Eduardo Quezada D'Ottone
56836420bd Added Vivillon forms to override 2021-11-26 22:24:03 -03:00
ghoulslash
e2af9ec3b4 ice type immunity to sheer cold 2021-11-26 11:49:49 -05:00
LOuroboros
68c557fd46 Updated Light Ball's effect and improved readability 2021-11-24 19:04:15 -03:00
ghoulslash
95ad508868 baton pass status4_xx_sport 2021-11-23 21:25:03 -05:00
ghoulslash
5c52abd856 gen3 sport move functionality behind config 2021-11-23 21:20:32 -05:00
ghoulslash
b5bc8bb346 fix B_SPORT_DMG_REDUCTION 2021-11-23 18:37:27 -05:00
ghoulslash
e3ddad2d11 add sport effects back 2021-11-23 18:36:10 -05:00
BuffelSaft
cca7ec8c58 Fix and rename GetMoveTargetType
Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.
2021-11-24 12:09:54 +13:00
kleeenexfeu
9b25e0147c
Update include/constants/battle_config.h
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-11-23 14:35:37 +01:00
kleeenexfeu
f2755ad970
reword B_RECALC_TURN_AFTER_ACTIONS explanation 2021-11-23 14:28:52 +01:00
kleeenexfeu
84e6e083f7
hate the explanations about turn order ._.
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-11-23 14:24:30 +01:00
kleeenexfeu
1a3561bb0b space 2021-11-23 13:48:03 +01:00
kleeenexfeu
6ceffaaf3e recalculate turn order after relevant actions 2021-11-23 13:46:36 +01:00
kleeenexfeu
1a5d3191e2 battle_engine merge 2021-11-23 13:38:36 +01:00
BuffelSaft
fd4414fe62 Spaces instead of tabs 2021-11-23 23:01:43 +13:00
BuffelSaft
a89ce0c38a Swapped webs don't trigger Defiant
Track the side that originally set Sticky Web, and if it matches the side the target of the speed drop is on, don't activate Defiant. Hard to tell if this is a bug or a feature in gen 8 - maybe the swapped webs are considered a "friendly" effect?

Also, fix Sticky Web not activating Defiant.
2021-11-23 22:54:30 +13:00