GriffinR
b71b10623b
Add palette selection constants
2021-02-24 11:03:51 -05:00
GriffinR
8634710996
Document PokemonUseItemEffects
2021-02-12 16:02:04 -05:00
Evan
f3d975e239
merge with be
2021-02-12 08:59:55 -07:00
amiosi
e5ff25ccbf
partial update to nature/secret power and camouflage
2021-02-11 17:38:18 -05:00
amiosi
eb56488b81
fix build errors
2021-02-06 20:08:25 -05:00
amiosi
30434b92de
update even more moves to Gen 8 standard
2021-02-06 19:41:38 -05:00
amiosi
d8e592bf46
update many moves to Gen 8 standard
2021-02-06 19:08:46 -05:00
Evan
00cbe61e13
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities
2021-02-02 09:00:12 -07:00
Evan
f4d4cf262e
fix screen cleaner, curious medicine, as one
2021-02-02 09:00:07 -07:00
ultima-soul
2a20d50904
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-02-01 15:54:08 -08:00
Evan
1c75483f51
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ripen
2021-01-31 23:31:38 -07:00
Evan
f428e5e2dc
some quick claw/custap berry fixes
2021-01-31 23:31:27 -07:00
LOuroboros
d0e0ff34b4
Updated the list of abilities unaffected by Gastro Acid
...
https://bulbapedia.bulbagarden.net/wiki/Category:Abilities_that_cannot_be_suppressed
2021-01-24 23:09:23 -03:00
GriffinR
4eca05ccf5
Document remainder of battle_controllers.c
2021-01-22 02:48:22 -05:00
Evan
bfb7333507
memento gen4 failing
2021-01-21 12:03:30 -07:00
Evan
4611c71bd1
merge with be
2021-01-21 08:55:14 -07:00
Evan
8ec12c665c
merge with be
2021-01-20 17:36:13 -07:00
Evan
57c460f40a
fix two turn moves failing on turn 1 w no target
2021-01-19 22:10:03 -07:00
Evan
544d598506
update tailwind timer
2021-01-15 18:34:47 -07:00
Evan
d26605c9fe
fix bad bg fade if no permanent terrain
2021-01-13 16:01:47 -07:00
GriffinR
b9e1b050e1
Label remaining battle types
2021-01-13 15:20:29 -05:00
Evan
56395a060f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
2021-01-13 09:23:07 -07:00
Evan
1e22ae4cf2
merge with be
2021-01-10 09:08:25 -07:00
Evan
d4e4405cf5
merge with be
2021-01-10 09:04:21 -07:00
Evan
e748db8ef4
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
2021-01-10 08:58:16 -07:00
ultima-soul
d2d961e447
Merge pull request #1262 from LOuroboros/gen8_abilities_BE
...
Implemented various Gen. 8 abilities
2021-01-07 13:31:17 -08:00
ghoulslash
c392a2011e
Merge pull request #1325 from ExpoSeed/BE/sync
...
Sync battle engine
2021-01-07 12:13:26 -07:00
LOuroboros
339aa95c1d
Review corrections
...
-Intrepid Sword and Dauntless Shield are now properly affecting the user
-Slightly tweaked Ball Fetch's effect, since an operation involving gBattleResults.catchAttempts was being done twice unnecessarily.
2021-01-07 04:31:26 -03:00
Evan
efa4fe89ad
micle berry
2021-01-06 10:47:07 -07:00
Evan
4c1e8f2f2e
add curious medicine
2021-01-05 20:02:11 -07:00
Evan
0a3908ee92
add neigh and as one abilities
2021-01-05 19:37:23 -07:00
Evan
5ae1e3c25b
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
2021-01-04 11:43:36 -07:00
LOuroboros
517c8ffdd0
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities_BE
2021-01-03 22:05:14 -03:00
ExpoSeed
7dadcb94b8
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-03 17:14:43 -06:00
BuffelSaft
10cf5b3673
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into Batte_Engine_Only
2021-01-04 10:55:30 +13:00
Evan
21e7d6d318
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
2020-12-20 16:33:43 -07:00
Evan
7988a1f41d
Ai_TryOnAlly and reorganize files
2020-12-20 14:47:20 -07:00
Evan
916d0416e3
outline AI_CheckGoodMove
2020-12-15 21:57:33 -07:00
GriffinR
15c2856b24
Merge pull request #1265 from Kurausukun/berry_crush
...
fakematch fixes, begin documenting Berry Crush (based on #1187 )
2020-12-14 23:22:41 -05:00
Evan
b85dacce9d
fix conflicts
2020-12-14 08:50:41 -07:00
Evan
ac332d5e98
check bad move
2020-12-13 15:02:21 -07:00
Eduardo Quezada D'Ottone
47d96aed3c
Merge pull request #1285 from LOuroboros/spite
...
Updated Spite
2020-12-12 22:27:26 -03:00
LOuroboros
55bc2b4bb9
Corrected small inconsistency in move flag names
2020-12-12 12:18:56 -03:00
LOuroboros
9ec2e44f4c
Updated Spite
2020-12-11 21:36:59 -03:00
Kurausukun
58976ebaa8
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
BuffelSaft
a3b891bd65
Cap recoil for Gen 4 Jump Kick
...
Jump Kick's recoil in Gen 4 cannot exceed half of the target's maximum HP.
2020-12-07 19:41:49 +13:00
BuffelSaft
72b769ec75
Add config options for Jump Kick
...
Added options for:
- Gen 4 style recoil when target is immune (user takes 50% of target's max HP)
- Gen 3 style recoil when target is immune (i.e no recoil)
- Gen 5+ recoil was already implemented but was bugged
2020-12-07 19:30:31 +13:00
Evan
d5ad14c349
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into popup
2020-12-05 21:03:20 -07:00
Evan
21cab1b7a7
better negative totem boost system, totems occur before switch in abilities
2020-12-05 21:00:51 -07:00
BuffelSaft
ef41a4c14d
Fix Jump Kick
...
* Now inflicts recoil damage on the user if the target was immune to the attack
* Gen V+ recoil damage is now half of the user's HP instead of half of the target's HP.
2020-12-06 16:14:02 +13:00
LOuroboros
9e1d7cc827
Implemented Ball Fetch
2020-12-02 23:09:35 -03:00
LOuroboros
3d8308844c
Implemented Libero
...
Kappa.
2020-12-02 19:09:59 -03:00
Evan
4ad5e368a9
fix merge conflicts
2020-12-01 17:57:57 -05:00
Evan
5478179464
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_anims
2020-12-01 17:46:26 -05:00
Evan
ef43596a79
toggleable manual ability popup destruction
2020-11-19 15:16:27 -07:00
Evan
99d9a36860
add totem boosts
2020-11-19 10:35:37 -07:00
Evan
c026f705b3
permanent terrain move bgs
2020-11-17 19:45:27 -07:00
ultima-soul
e32659d4bb
Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities.
2020-11-16 13:50:26 -08:00
ExpoSeed
0912577ea1
Merge pull request #575 from AsparagusEduardo/BE-WishMegaEvo
...
Implemented Wish Mega Evolution
2020-11-11 11:05:06 -06:00
Eduardo Quezada D'Ottone
e6f8d57f08
Merge remote-tracking branch 'RHH/battle_engine' into BE-WishMegaEvo
...
# Conflicts:
# include/constants/battle_string_ids.h
2020-11-10 17:28:17 -03:00
Evan
03f480fa17
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine
2020-11-08 15:21:48 -07:00
Evan
980f208b78
use NATIONAL_DEX_COUNT for critical capture odds
2020-11-08 14:07:43 -07:00
ultima-soul
99fdc13e61
Merge branch 'master' into battle_engine_sync
2020-11-07 15:59:20 -08:00
Eduardo Quezada D'Ottone
09a5d6c722
Implemented Wish Mega Evolution
2020-11-07 10:13:32 -03:00
Evan
b3d1e8b5b8
turn crit capture odds into a ratio
2020-11-03 08:57:11 -07:00
aaaaaa123456789
bacc831aa9
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
Evan
e7372e7c5b
add B_ prefix to critical capture configs
2020-11-01 21:50:34 -07:00
Evan
a6c3d950f6
critical capture config option and catching charm
2020-11-01 16:15:42 -07:00
Eduardo Quezada D'Ottone
5a201f006f
More exp options in battle_config ( #530 ) from MandL27
2020-11-01 19:41:29 -03:00
MandL27
5c6b8376fc
long equations on one line
2020-11-01 11:45:01 -05:00
aaaaaa123456789
1c3d75f673
Merge branch 'master' into reverts
2020-10-26 12:16:36 -03:00
Kurausukun
9ca406b15d
port Cmd_forcerandomswitch fakematch fix
2020-10-26 00:17:26 -04:00
MandL27
bc5ba41f80
Document sExperienceScalingFactors
2020-10-24 02:02:58 -04:00
Kurausukun
90211248af
re-match Cmd_unknown_24 (from #1140 )
...
changes to data structs are necessary. other things that look
unnecessary, like the order of operands, are also necessary. fuck this
function.
2020-10-23 20:47:10 -04:00
MandL27
9c574f3adb
Fixed some comparison operators
2020-10-23 19:49:27 -04:00
MandL27
f8dabc37ae
Use #if more often
...
Avoided it on a couple lines to avoid splitting compound ifs.
2020-10-23 12:44:20 -04:00
ExpoSeed
34729ce99c
Merge pull request #150 from AsparagusEduardo/PR-MoreBattleConfigs
...
More Battle Config options
2020-10-23 10:59:12 -05:00
Eduardo Quezada
d7c5ce3602
Idented battle_script_commands.c comments
2020-10-22 09:33:46 -03:00
MandL27
37aff56cc7
turns out gen 7 did indeed use a denominator of 5
2020-10-21 16:57:54 -04:00
MandL27
efdaa25640
Add B_SCALED_EXP and B_SPLIT_EXP
2020-10-21 16:19:07 -04:00
Eduardo Quezada
1bc38feca5
Fixed indentation for various files.
2020-10-19 18:01:19 -03:00
Eduardo Quezada
faca6c4867
Organized interface settings into their own category.
2020-10-17 14:31:58 -03:00
ExpoSeed
d4e58d9746
Fix style, sync moved functions properly
2020-10-13 09:40:01 -05:00
ExpoSeed
9e2c8a95c1
Sync bev2 with pret
2020-10-11 01:01:47 -05:00
GriffinR
5259898325
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
Kaz
5a70f99e16
battle_script_commands.c: Eliminate the last nonmatching (swapped expressions).
2020-09-16 21:39:44 -04:00
Kaz
171154a097
Convert to -g; will be required for eliminating fakematches.
2020-09-16 19:36:30 -04:00
aaaaaa123456789
7dc95a0103
Undo PokeCodec's PRs
...
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.
Reverts #1104 , #1108 , #1115 , #1118 , #1119 , #1124 , #1126 , #1127 , #1132 , #1136 ,
#1137 , #1139 , #1140 , #1144 , #1148 , #1149 , #1150 , #1153 , #1155 , #1177 , #1179 ,
#1180 , #1181 , #1182 and #1183 .
2020-09-13 06:30:55 -03:00
PokeCodec
c1286c2fe2
Change according to feedback
2020-09-10 18:07:46 -04:00
PokeCodec
029db24adb
Make return
2020-09-10 09:32:36 -04:00
PokeCodec
56afdee7fc
Remove register variable mention
2020-09-09 14:43:41 -04:00
PokeCodec
a3a8c23e00
Match battle_script commands
2020-09-09 11:18:04 -04:00
PokeCodec
779764b70d
Fix Battle_Script_commands fakematch
2020-09-09 10:35:40 -04:00
DizzyEggg
97d0643110
Merge with master
2020-09-08 12:48:28 +02:00
PokeCodec
28ef2fb774
Switch to button macros
2020-09-04 21:11:55 -04:00
GriffinR
7c8bc0fbe3
Merge pull request #1149 from PokeCodec/datatypes
...
gflib documenting
2020-09-01 14:25:21 -04:00
hondew
e46b35455d
Merge branch 'master' into pokeball-doc
2020-08-30 14:14:38 -04:00
hondew
328aecc96e
Document throwing pokeball
...
continue
Document more
Doc more funcs
Remove workspace
Document shiny stars
Document PokeBlock
Clean up
Clean more
2020-08-30 14:08:06 -04:00
DizzyEggg
f70a9ce153
Merge with master
2020-08-27 12:01:28 +02:00
PokeCodec
86a1e89879
Documentation of unk field
2020-08-23 21:34:31 -04:00