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 |
|
ultima-soul
|
a41300a6dc
|
Merge pull request #1386 from Lukien/battle_engine
Added weather check for ability sand force
|
2021-01-31 22:01:21 -08:00 |
|
Lukien
|
9704049818
|
Merge remote-tracking branch 'upstream/battle_engine' into battle_engine
|
2021-01-31 22:46:27 -05:00 |
|
Lukien
|
f69bff6605
|
Update battle_util.c
Added weather check for the ability Sand Force.
|
2021-01-31 22:43:16 -05:00 |
|
ultima-soul
|
eb78b5434c
|
Merge pull request #1377 from ghoulslash/thaw
Update Thawing Moves
|
2021-01-31 13:57:44 -08:00 |
|
Evan
|
be0326301d
|
erge branch 'thaw' of https://github.com/ghoulslash/pokeemerald into thaw
|
2021-01-31 14:55:56 -07:00 |
|
Evan
|
552f548700
|
fix IsThawingMove
|
2021-01-31 14:55:44 -07:00 |
|
ghoulslash
|
9499469337
|
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-01-31 14:43:24 -07:00 |
|
ExpoSeed
|
8b8d4d4a9f
|
Merge pull request #1376 from ghoulslash/fire_blast
Fix Fire Blast Power
|
2021-01-31 15:24:52 -06:00 |
|
ExpoSeed
|
0f8e47547a
|
Merge pull request #1382 from amiosi/kings_rock
Kings rock build fix
|
2021-01-29 17:52:49 -06:00 |
|
amiosi
|
ae2b8be147
|
Update battle_moves.h
|
2021-01-29 18:07:36 -05:00 |
|
ghoulslash
|
00085d9d90
|
Merge pull request #1321 from amiosi/battle_engine
remove redundant minimize interactions and add move config ifs
|
2021-01-29 12:24:56 -07:00 |
|
Evan
|
a104c156cc
|
thaw move list function
|
2021-01-28 09:00:46 -07:00 |
|
Evan
|
34908a2252
|
fix fire blast power
|
2021-01-27 19:56:11 -07:00 |
|
ghoulslash
|
345987c9f9
|
Merge pull request #1367 from LOuroboros/gastro_acid
Updated the list of abilities unaffected by Gastro Acid
|
2021-01-26 21:42:12 -07:00 |
|
ghoulslash
|
ef5faf94de
|
Merge pull request #1369 from LOuroboros/trace
Updated the list of untraceable abilities
|
2021-01-26 21:41:50 -07:00 |
|
ghoulslash
|
55b9bc7e17
|
Merge pull request #1366 from LOuroboros/patch-1
Fixed Mind Blown's category
|
2021-01-26 21:41:07 -07:00 |
|
LOuroboros
|
c4a7205b6f
|
Added As One to the untraceable abilities list
|
2021-01-25 15:37:11 -03:00 |
|
LOuroboros
|
7c9ddd23c1
|
Updated the list of untraceable abilities
|
2021-01-25 14:55:51 -03:00 |
|
ultima-soul
|
833218cc5b
|
Merge pull request #1354 from SBird1337/fix/wrap
Fix wrap-style move damage
|
2021-01-25 09:50:12 -08: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 |
|
amiosi
|
c6ea2c28f8
|
fix steamroller
|
2021-01-24 18:22:51 -05:00 |
|
LOuroboros
|
267bbe2f70
|
Fixed Mind Blown's category
As it was pointed out by BigAngryDev on Discord, Mind Blown is supposed to be a Special move, not a Physical one.
|
2021-01-22 19:20:55 -03:00 |
|
amiosi
|
50ce6b2374
|
Merge branch 'battle_engine' into battle_engine
|
2021-01-22 07:39:47 -05:00 |
|
ghoulslash
|
a3a2d881fa
|
Merge pull request #1327 from ultima-soul/add_fairy_frlg_icon_be
Add Fairy-type FRLG Icon to Fix Fairy TM Info Icon Being Blank
|
2021-01-21 12:18:42 -07:00 |
|
Evan
|
4611c71bd1
|
merge with be
|
2021-01-21 08:55:14 -07:00 |
|
ghoulslash
|
7e2ec88bfd
|
Merge pull request #1330 from LOuroboros/thick_club
Made Alolan Marowak be affected by Thick Club
|
2021-01-20 17:32:03 -07:00 |
|
LOuroboros
|
2a888a7b3e
|
Corrected base species check for Thick Club's effect
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-01-20 19:30:48 -03:00 |
|
LOuroboros
|
412c28bb7a
|
Removed unneeded constant label for Alolan Marowak
|
2021-01-20 18:29:53 -03:00 |
|
LOuroboros
|
a6b03d45a8
|
Made the Thick Club's effect use the new GET_BASE_SPECIES_ID macro
|
2021-01-20 18:16:02 -03:00 |
|
LOuroboros
|
c90cbc0021
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into thick_club
|
2021-01-20 18:15:37 -03:00 |
|
ghoulslash
|
71f18bfbf4
|
Merge pull request #1316 from ultima-soul/form_species_tables_be
Add Form Species ID Tables
|
2021-01-20 13:54:39 -07:00 |
|
ultima-soul
|
d3b0e98325
|
Merge branch 'form_species_tables' into form_species_tables_be
|
2021-01-20 11:40:48 -08:00 |
|
ultima-soul
|
267900bdcb
|
Add Form Species ID tables and functions to access them.
|
2021-01-20 11:31:20 -08:00 |
|
ultima-soul
|
f8550603e1
|
Merge pull request #1362 from rh-hideout/revert-1361-global
Revert "Included global.h into battle_config.h"
|
2021-01-19 20:56:19 -08:00 |
|
ExpoSeed
|
61db82e64a
|
Revert "Included global.h into battle_config.h"
|
2021-01-19 22:55:08 -06:00 |
|
ExpoSeed
|
3698b4f304
|
Merge pull request #1361 from LOuroboros/global
Included global.h into battle_config.h
|
2021-01-19 18:09:50 -06:00 |
|
LOuroboros
|
77d714ead5
|
Included global.h into battle_config.h
Fixes the dupplicated defines issue.
|
2021-01-16 20:37:34 -03:00 |
|
ultima-soul
|
8647895f1a
|
Merge pull request #1259 from ghoulslash/be_config
anim particle configs false by default
|
2021-01-16 10:41:18 -08:00 |
|
Eduardo Quezada D'Ottone
|
4ce3572f80
|
Merge pull request #1357 from LOuroboros/focus_blast
Fixed Focus Blast animation
|
2021-01-16 14:22:13 -03:00 |
|
LOuroboros
|
af3dcf7543
|
Fixed Focus Blast animation
Its gSuperpowerOrbSpriteTemplate was overlapping the battle textbox.
|
2021-01-16 03:57:47 -03:00 |
|
ExpoSeed
|
bd8950e8a0
|
Merge pull request #1348 from LOuroboros/intimidate_preproc
Fixed incorrect preprocessor directive in ASM file
|
2021-01-15 12:45:05 -06:00 |
|
ExpoSeed
|
98b4af151c
|
Merge pull request #1346 from luckytyphlosion/origin/battle_engine
Fix AI corruption bug.
|
2021-01-15 12:44:27 -06:00 |
|
Evan
|
f1d89b2d79
|
merge with be
|
2021-01-15 11:17:45 -07:00 |
|
ExpoSeed
|
b166e9a5e3
|
Merge pull request #1276 from LOuroboros/x_items_BE
Reworked the effects of the X Items #1
|
2021-01-15 12:05:07 -06:00 |
|
sbird
|
5d02cc2059
|
[battle_engine] fix wrap style move damage
|
2021-01-15 16:04:09 +01:00 |
|
LOuroboros
|
c21c0f8c37
|
Fixed incorrect preprocessor directive in ASM file
|
2021-01-13 22:42:56 -03:00 |
|
luckytyphlosion
|
cb7b77500f
|
Just remove the commented out function and notes.
|
2021-01-12 18:52:37 -05:00 |
|
luckytyphlosion
|
f626fac9dc
|
Fix AI corruption bug.
|
2021-01-12 18:43:16 -05:00 |
|