12991 Commits

Author SHA1 Message Date
ghoulslash
2502820e83 document a couple hitmarkers. fix failing moves not updating hp from own healing effects 2021-10-29 09:03:14 -04:00
ghoulslash
204748e01a fix recycle and harvest 2021-10-28 17:52:52 -04:00
ghoulslash
f342e7c590 merge with be 2021-10-28 17:03:10 -04:00
LOuroboros
a77f058146 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser 2021-10-28 14:24:43 -03:00
ghoulslash
34e966fdee
Merge pull request #1815 from LOuroboros/hyperspaceFury
Implemented Hyperspace Fury
2021-10-28 13:20:33 -04:00
LOuroboros
82101d3581 Optimizations 2021-10-28 14:02:43 -03:00
LOuroboros
2803b840e5
Updated Shadow Force's move data 2021-10-28 13:52:35 -03:00
LOuroboros
28522f3ffb Fixed Hyperspace Fury not breaking through protections
Also repositioned VARIOUS_JUMP_IF_SPECIES.
2021-10-28 12:09:44 -03:00
GriffinR
7f49f26331 Restore ModifyStatByNature bug notes 2021-10-27 22:38:48 -04:00
ghoulslash
bebaded415 merge with be 2021-10-27 16:48:38 -04:00
GriffinR
41ecae91f8 Label remaining symbols in graphics.c 2021-10-27 13:47:18 -04:00
LOuroboros
8c35a68060 Quick syntax tweaks 2021-10-27 11:19:39 -03:00
LOuroboros
de157919b0 Added animations for Shell Side Arm 2021-10-27 11:14:17 -03:00
LOuroboros
ad95fa3d15 Updated Shell Side Arm's description 2021-10-27 11:14:12 -03:00
LOuroboros
fc7f1acf20 Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser 2021-10-27 11:13:59 -03:00
LOuroboros
1ab8c84f41 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury 2021-10-26 21:23:21 -03:00
Eduardo Quezada D'Ottone
d4eaa73292 Added check in IsRunningFromBattleImpossible. 2021-10-26 20:45:59 -03:00
Eduardo Quezada D'Ottone
773c773bac Merge remote-tracking branch 'RHH/battle_engine' into BE_ghostEscape
# Conflicts:
#	include/constants/battle_config.h
2021-10-26 20:35:01 -03:00
GriffinR
b0c27a8521 Document ereader screen 2021-10-26 15:44:42 -04:00
GriffinR
f9f91be60a
Merge pull request #1527 from cbt6/field-player
Document field player functions
2021-10-26 14:29:44 -04:00
cbt6
bd9ea23925 Rename as StaticCollision instead 2021-10-27 02:21:51 +08:00
GriffinR
d6571f2355
Merge pull request #1525 from GriffinRichards/doc-recmix
Document remainder of Record Mixing
2021-10-26 14:18:38 -04:00
cbt6
b3d779fd0d Document field player functions 2021-10-27 01:39:00 +08:00
ghoulslash
782c16209d Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs 2021-10-26 13:24:33 -04:00
ghoulslash
222d1d3194 merge with pret 2021-10-26 13:21:50 -04:00
GriffinR
bf87faa922 Clean up battle_transition_frontier 2021-10-26 02:00:28 -04:00
GriffinR
1056209d8e Start battle_transition documenting 2021-10-26 01:39:28 -04:00
BuffelSaft
1429170d16 Fix long descriptions
Just noticed some of these didn't fit in the box.
2021-10-26 16:45:49 +13:00
BuffelSaft
adcf563ba1 Add missing berry data
Certain gen 4+ berries were missing graphics and berry data. Adding this data allows them to be viewed and planted.
2021-10-26 14:42:06 +13:00
BuffelSaft
4faa077641 Triple Kick, Super Fang tweaks
Ignore accuracy for Triple Kick and assume all hits will connect. Super Fang always does at least 1 damage, so this should be accounted for.
2021-10-26 13:41:08 +13:00
GriffinR
4f7f6c1082
Merge pull request #1526 from sphericalice/doc-curtain-special
Document the CloseBattlePikeCurtain special
2021-10-25 16:10:45 -04:00
sphericalice
7b5267c799 Rename TILESET_WIDTH to METATILE_ROW_WIDTH 2021-10-25 20:51:04 +01:00
ghoulslash
07d2f73306
Merge pull request #1804 from AsparagusEduardo/PE_shedinjaball
Config for Shedinja needing a Poké Ball to be created
2021-10-25 15:49:25 -04:00
sphericalice
0637910f58 Use the TILESET_WIDTH constant in rotating_tile_puzzle.c 2021-10-25 18:07:46 +01:00
sphericalice
120e75d275 Document the CloseBattlePikeCurtain special 2021-10-25 18:03:14 +01:00
GriffinR
a612c27f2d Drop battle transition 'phase' terminology 2021-10-25 10:20:48 -04:00
GriffinR
6dc3c9864c
Merge pull request #1520 from GriffinRichards/doc-random
Document random remaining symbols
2021-10-24 23:43:17 -04:00
Katelyn Gigante
d3911128f0 Better compatibility 2021-10-25 13:26:17 +11:00
Katelyn Gigante
347a173402 Prevent text glitch if a pokemon has an unspecified custom evolution 2021-10-25 13:24:48 +11:00
Eduardo Quezada D'Ottone
44625561e5 Taunt turn config 2021-10-24 20:21:54 -03:00
Eduardo Quezada D'Ottone
70aeaf288f Rough Skin damage config 2021-10-24 20:07:22 -03:00
GriffinR
7a89ad98c3 Document record mixing hall records 2021-10-24 16:13:07 -04:00
GriffinR
ab80264921
Merge pull request #1519 from GriffinRichards/doc-mgift
Document Mystery Gift
2021-10-24 15:50:39 -04:00
GriffinR
7f3c529935 Document record mixing mail swap 2021-10-24 15:49:19 -04:00
TheXaman
475bb8a624 added preEvolutions to the EvoScreen! 2021-10-24 16:31:19 +02:00
TheXaman
48c21df8ee added special eevee handling for PE to show all possible evolution icons 2021-10-24 14:32:22 +02:00
TheXaman
e42929dec7 added comments for BE users, removed dead code, imrpoved compatibility 2021-10-24 13:46:47 +02:00
BuffelSaft
4310868bee AI handles multi-strike and fixed dmg moves
Does not account for Parental Bond or Beat Up yet as those require some functions from #1676.
2021-10-24 18:49:17 +13:00
BuffelSaft
bbe2eccf62 Fix typo
CanBeParayzed to CanBeParalyzed
2021-10-24 17:57:06 +13:00
BuffelSaft
d64dc2bbe8 Sleep moves don't check target's type
Dark types aren't immune to Hypnosis, Ghost types aren't immune to Yawn or Lovely Kiss, so this check isn't needed.
2021-10-24 17:55:37 +13:00