Evan
|
6cb8c6309a
|
merge with be
|
2021-03-01 11:28:51 -07:00 |
|
ultima-soul
|
f6147ee054
|
Merge pull request #1356 from ghoulslash/tailwind_turns
Update tailwind timer To Gen5
|
2021-03-01 08:51:40 -08:00 |
|
ultima-soul
|
ef054c5d48
|
Merge pull request #1342 from ghoulslash/fixes
Magic Room Affects Macho Brace/Power Item Speed Drop
|
2021-03-01 08:50:59 -08:00 |
|
ultima-soul
|
7a237595c9
|
Merge pull request #1389 from LOuroboros/syntax
Removed trailing spaces from various files
|
2021-02-02 11:04:34 -08:00 |
|
ghoulslash
|
a00db597ba
|
Merge pull request #1383 from ultima-soul/battle_engine_sync
Battle Engine Upstream Sync
|
2021-02-02 10:02:31 -07: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 |
|
LOuroboros
|
fc04c6974b
|
Edit->Blank Operations->Trim Trailing Space for the win
|
2021-02-01 17:05:49 -03: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 |
|
luckytyphlosion
|
740c0a6bc1
|
Merge pull request #1294 from luckytyphlosion/aif2pcm-fix
Fix bug in pcm delta compression.
|
2021-01-26 15:23:11 -05:00 |
|
luckytyphlosion
|
b0de03356b
|
Merge pull request #1315 from PokeCodec/patch-3
Use INTR_FLAG_VBLANK instead of constant 0x1
|
2021-01-26 15:22:24 -05:00 |
|
luckytyphlosion
|
ff8952a3f0
|
Merge pull request #1308 from PokeCodec/pain
Get rid of Task_data_OP macro
|
2021-01-26 15:22:13 -05:00 |
|
N
|
b1a29e5017
|
Use INTR_FLAG_VBLANK instead of constant 0x1
|
2021-01-25 21:37:04 -05: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 |
|
N
|
07d19ba526
|
Update main.c
|
2021-01-22 18:40:08 -05:00 |
|
N
|
3102d94e3c
|
Undo change
|
2021-01-22 17:41:57 -05:00 |
|
N
|
c636b7c3ae
|
Some more tweaks
|
2021-01-22 17:41:07 -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 |
|
GriffinR
|
8fe4d004e3
|
Merge pull request #1305 from GriffinRichards/doc-battletv
Document battle tv data
|
2021-01-21 12:27:14 -05:00 |
|
Evan
|
8ec12c665c
|
merge with be
|
2021-01-20 17:36:13 -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 |
|
GriffinR
|
3ceb43177d
|
Merge pull request #1312 from sphericalice/pokeemerald
Fix misnamed ground effect flags & document reflections
|
2021-01-20 18:50:31 -05:00 |
|
SphericalIce
|
c0489199c0
|
Rename GetObjEventReflectionType & fix fakematch in GetGroundEffectFlags_Reflection
|
2021-01-20 22:32:04 +00: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 |
|