ExpoSeed
d2566c8988
Refactor Multi-Attack, Judgment, and Techno Blast to use the same move effect
2020-11-07 23:34:04 -06:00
ultima-soul
99fdc13e61
Merge branch 'master' into battle_engine_sync
2020-11-07 15:59:20 -08:00
ExpoSeed
31b19400f9
Merge pull request #568 from LOuroboros/hurricane
...
Changed Hurricane's animation
2020-11-07 14:44:49 -06:00
Eduardo Quezada D'Ottone
09a5d6c722
Implemented Wish Mega Evolution
2020-11-07 10:13:32 -03:00
LOuroboros
ea99195194
Added functionality to the B_NEW_SURF_PARTICLE_PALETTE anim. config label
2020-11-06 22:29:20 -03:00
LOuroboros
d66b2fc820
Fixed anim. settings labels in src/battle_anim.c
2020-11-06 21:37:04 -03:00
LOuroboros
c66b77fbf8
Changed Hurricane's animation
2020-11-06 21:06:04 -03:00
ultima-soul
7fb457a30e
Merge pull request #564 from LOuroboros/patch-1
...
Fixed the descriptions of Freeze Dry and Flying Press
2020-11-06 15:56:37 -08:00
GriffinR
8b1c2c946b
Merge pull request #1247 from PidgeyALT/attemptcountfix
...
use constants for ball throw count
2020-11-06 15:41:25 -05:00
PikalaxALT
75b12b86dc
Merge pull request #1246 from PikalaxALT/simplify_ram_reset
...
Simplify RAM reset adaptation for modern
2020-11-06 15:00:40 -05:00
MCboy
e31158d017
add spaces around - and remove comment from include in battle.h
2020-11-06 23:29:52 +03:30
MCboy
3b91735e63
use constants for ball throw count
2020-11-06 22:59:46 +03:30
LOuroboros
93d9ad0997
Fixed the descriptions of Freeze Dry and Flying Press
...
Addresses https://github.com/DizzyEggg/pokeemerald/issues/508
2020-11-06 15:24:00 -03:00
PikalaxALT
3112cf5726
swi --> svc
2020-11-06 12:34:57 -05:00
PikalaxALT
c70c44fa48
Simplify RAM reset adaptation for modern
2020-11-06 12:29:40 -05:00
GriffinR
42b7f11db0
Merge pull request #1245 from GriffinRichards/modernfactoryfix
...
Fix battle factory on gcc 10
2020-11-04 18:34:53 -05:00
GriffinR
1220f0655c
Revert to original battle factory gcc 10 fix
2020-11-04 17:46:07 -05:00
GriffinR
c3080a5a2a
Fix typo
2020-11-04 16:46:26 -05:00
GriffinR
70ff0d1735
Condense fix for battle factory on gcc 10
2020-11-04 16:43:59 -05:00
GriffinR
c59a818462
Fix battle factory on gcc 10
2020-11-04 15:35:22 -05:00
Evan
b3d1e8b5b8
turn crit capture odds into a ratio
2020-11-03 08:57:11 -07:00
PikalaxALT
99dd461bef
Merge pull request #1189 from aaaaaa123456789/reverts
...
Undo PokeCodec's PRs and port changes
2020-11-03 09:28:45 -05:00
aaaaaa123456789
ca950a8daf
Solve merge conflicts from previous commit
2020-11-02 22:18:26 -03:00
aaaaaa123456789
bacc831aa9
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
Kurausukun
6545745e59
Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts
2020-11-02 18:43:40 -05:00
Kurausukun
8bf401c227
address comments
2020-11-02 18:43:11 -05:00
Evan
e7372e7c5b
add B_ prefix to critical capture configs
2020-11-01 21:50:34 -07:00
Evan
59692e8e7f
styling fix
2020-11-01 21:08:58 -07:00
Evan
a6c3d950f6
critical capture config option and catching charm
2020-11-01 16:15:42 -07:00
Eduardo Quezada D'Ottone
3af9a65506
Fix ability description strings ( #553 ) from ghoulslash
2020-11-01 19:45:51 -03:00
Eduardo Quezada D'Ottone
5a201f006f
More exp options in battle_config ( #530 ) from MandL27
2020-11-01 19:41:29 -03:00
Evan
6c39977a8d
HGSS supereffective change
2020-11-01 15:16:51 -07:00
MandL27
5c6b8376fc
long equations on one line
2020-11-01 11:45:01 -05:00
Evan
9ad9dbff9f
fix ability descriptions
2020-11-01 09:22:28 -07:00
ExpoSeed
1b65e1a1f0
Merge pull request #520 from ghoulslash/battle_engine
...
Add Toggle Healthbox Visibility Feature
2020-10-31 23:07:39 -05:00
GriffinR
9e55ae22b1
Merge pull request #1242 from GriffinRichards/constants-menuinfoicons
...
Use constants for menu info icon table
2020-10-29 23:50:43 -04:00
GriffinR
fbff087e9a
Merge pull request #1238 from ketsuban/master
...
Eliminate goto in ItemUseCB_Medicine
2020-10-29 23:50:17 -04:00
GriffinR
be1685c87f
Use constants for menu info icon table
2020-10-29 16:34:33 -04:00
ultima-soul
ae892febba
Merge pull request #15 from AsparagusEduardo/PR-MoveSplitOption
...
Option to use Gen 3 Physical/Special split.
2020-10-29 09:14:08 -07:00
aaaaaa123456789
9794b077b5
Update src/digit_obj_util.c
...
Co-authored-by: Seija <71219152+PokeCodec@users.noreply.github.com>
2020-10-26 19:14:08 -03:00
aaaaaa123456789
bcbd05e151
Fix whitespace issues
2020-10-26 15:52:44 -03:00
aaaaaa123456789
4bbc14ecdd
Remove unused variable
...
Co-authored-by: Seija <71219152+PokeCodec@users.noreply.github.com>
2020-10-26 15:51:10 -03:00
aaaaaa123456789
00db69a302
Port back improvements from later commits
2020-10-26 12:31:07 -03:00
aaaaaa123456789
1c3d75f673
Merge branch 'master' into reverts
2020-10-26 12:16:36 -03:00
Kurausukun
fe40c0c466
re-match BattleIntroOpponent1SendsOutMonAnimation
...
a lot of functions and a bit of data had to be moved from battle_main.c
to battle_util.c; I have added a note to battle_util.c stating the
reason for this
2020-10-26 05:52:00 -04:00
Kurausukun
539fd463c8
port MovementAction_StoreAndLockAnim_Step0 fix
2020-10-26 03:46:08 -04:00
Kurausukun
43701c3860
port PrintMonWeight fakematch fix
2020-10-26 00:49:57 -04:00
Kurausukun
b2b363159f
port sub_80C6104 fakematch fix
2020-10-26 00:46:01 -04:00
Kurausukun
072797844a
port TrendyPhraseIdOld fakematch fix
2020-10-26 00:29:55 -04:00
Kurausukun
e8fd0bd2c3
port InitPaintingMonOamData fakematch fix
2020-10-26 00:26:15 -04:00
