atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7685 commits 2 branches 40 tags 617 MiB
Commit graph

7685 commits

This branch
This branch
All branches
Author SHA1 Message Date
LOuroboros
b552db7193 Tweaked the Oblivious immunities 
Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.
 2021-06-04 19:23:07 -03:00
LOuroboros
c21a00a5d1 Replaced magic numbers with constants in BattleScript_NotAffectedAbilityPopUp 2021-06-01 18:20:33 -03:00
LOuroboros
d48a6e00d4 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into oblivious 2021-06-01 18:15:01 -03:00
DizzyEggg
72b7cb2dad
Merge pull request #1474 from LOuroboros/overdrive 
Fixed Overdrive's animation
 2021-06-01 13:33:11 +02:00
ultima-soul
0420332270
Merge pull request #1396 from amiosi/old_findings 
Update Many moves' data to Gen 8 Standard
 2021-05-28 17:06:53 -07:00
amiosi
b588e94395 more requested changes 2021-05-28 15:05:33 -04:00
amiosi
7b530a34bf finish requested changes 2021-05-27 20:14:46 -04:00
amiosi
03a7020512 double oops 2021-05-27 16:16:12 -04:00
amiosi
36c977d9eb oopsie 2021-05-27 16:01:34 -04:00
amiosi
f7651fd592 most fixes from requested changes 2021-05-27 15:55:19 -04:00
amiosi
fc81994579 Merge branch 'battle_engine' into old_findings 2021-05-27 15:28:02 -04:00
ExpoSeed
f7d6d42e6c
Merge pull request #1506 from AsparagusEduardo/Fix_BE_Compile 
Fixed compile error & updated names and value to correspond to the change.
 2021-05-23 14:49:57 -05:00
Eduardo Quezada D'Ottone
6afe2ec74e Fixed compile error & updated names and value to correspond to the change. 2021-05-23 15:28:29 -04:00
MandL27
28273af5ed
Merge pull request #1308 from ghoulslash/ai 
Overhaul AI
 2021-05-23 14:43:58 -04:00
ghoulslash
c3e28e9b1a merge with be 2021-05-23 12:22:52 -06:00
ghoulslash
54b03a474d fix SIDE_STATUS_SCREEN_ANY 2021-05-23 12:22:07 -06:00
ultima-soul
265824531e
Merge pull request #1399 from LOuroboros/2turn_move_tweaks 
Corrected the order of actions in BattleScript_FirstChargingTurn
 2021-05-22 13:50:24 -07:00
LOuroboros
9b46b6fb45
pause 0x40 -> pause B_WAIT_TIME_LONG 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-05-22 16:34:39 -03:00
LOuroboros
8cbdde3fba waitmessage 0x40 -> waitmessage B_WAIT_TIME_LONG 2021-05-21 20:22:04 -03:00
LOuroboros
1bd451e232 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 2turn_move_tweaks 2021-05-21 20:21:51 -03:00
Eduardo Quezada D'Ottone
04c6331a60
Merge pull request #1432 from BuffelSaft/thousand_arrows 
Fix Thousand Arrows
 2021-05-21 11:40:13 -04:00
ghoulslash
cd84e8f05c
Merge pull request #1468 from ultima-soul/battle_engine_sync 
Battle Engine Upstream Sync
 2021-05-13 21:49:56 -06:00
LOuroboros
64a86d0285 Swapped launchtemplate calls with createsprite calls 2021-05-04 15:36:00 -03:00
ultima-soul
e864c39a5d Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync 2021-05-04 10:04:35 -07:00
ghoulslash
fd3605b023
Merge pull request #1443 from AmbientDinosaur/patch-1 
Keen Eye evasion ignoring effect from Gen 6
 2021-05-04 09:49:56 -06:00
ghoulslash
3d22799cda
Merge pull request #1465 from ExpoSeed/BE/num_ability_slots 
Introduce NUM_ABILITY_SLOTS
 2021-05-04 09:49:35 -06:00
ghoulslash
6b7a7ca260
Merge pull request #1406 from ghoulslash/be_bugfix 
Fix data corruption from HideMegaTriggerSprite
 2021-05-04 09:45:03 -06:00
ghoulslash
1ccf43b5f7
Merge pull request #1451 from LOuroboros/stench 
Implemented Stench's battle effect
 2021-05-04 09:41:13 -06:00
ghoulslash
a3e6fe1ef4
Merge pull request #1442 from LOuroboros/patch-1 
Fixed Punk Rock
 2021-05-04 09:37:54 -06:00
ghoulslash
984f49747f
Merge pull request #1454 from LOuroboros/HandleAction_UseMove 
Minor syntax tweaks to HandleAction_UseMove
 2021-05-04 09:37:10 -06:00
ghoulslash
97ae2fe1be
Merge pull request #1460 from AmbientDinosaur/patch-2 
Corrected the move data for Gen 4 Overheat
 2021-05-04 09:36:36 -06:00
ghoulslash
d73efc45e4
Merge pull request #1462 from AmbientDinosaur/patch-3 
Remove superfluous define of LEVEL_UP_END
 2021-05-04 09:33:23 -06:00
ghoulslash
e803b42827
Merge pull request #1467 from LOuroboros/gravity_acc 
Added Gravity's missing acc boost
 2021-05-04 09:32:58 -06:00
ghoulslash
afea2cf5fa
Merge pull request #1482 from BuffelSaft/room_moves_text 
Fix Wonder Room, Magic Room battle messages
 2021-05-04 09:32:37 -06:00
ghoulslash
22fc9733e5
Merge pull request #1480 from BuffelSaft/big_root_fix 
Make Big Root affect absorb moves
 2021-05-04 09:32:18 -06:00
ghoulslash
e343090a8b
Merge pull request #1479 from BuffelSaft/orb_fix 
Fix Toxic Orb and Flame Orb affecting Pokemon they shouldn't
 2021-05-04 09:31:58 -06:00
ghoulslash
34cd23619f
Merge pull request #1471 from LOuroboros/magic_gaurd 
Fixed a typo in the battle_engine
 2021-05-04 09:30:19 -06:00
BuffelSaft
ec4012e95d Fix "Room" move battle messages 
Move new line so these messages fit in the text box.
 2021-05-04 23:57:43 +12:00
BuffelSaft
5d177f0a15 Make Big Root affect absorb moves 
Big Root should increase the HP recovered by Absorb, Giga Drain etc.
 2021-05-04 23:20:22 +12:00
BuffelSaft
542201dd4f Add missing ability checks to orbs 
Flame Orb shouldn't burn mons with Water Bubble and neither orb should affect mons with Comatose.
 2021-05-04 23:08:48 +12:00
BuffelSaft
e8598076a8 Fix Toxic and Flame Orb 
Shouldn't inflict status conditions on a fainted mon.
 2021-05-04 22:55:19 +12:00
LOuroboros
fa0d3a351e Fixed Overdrive's animation 2021-05-02 20:10:48 -03:00
LOuroboros
5489ab97e4 MAGIC_GAURD_CHECK -> MAGIC_GUARD_CHECK 2021-05-01 07:37:23 -03:00
ultima-soul
56fc420187 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-28 21:34:30 -07:00
GriffinR
f7a699c686
Merge pull request #1421 from GriffinRichards/doc-tvrecordmix 
Document TV
 2021-04-29 00:25:01 -04:00
LOuroboros
3dbb096393 Added Gravity's missing acc boost 2021-04-28 23:31:58 -03:00
GriffinR
6c38837b26
Merge pull request #1420 from GriffinRichards/doc-dataanims 
Document battler affine anims, default pokeball throw
 2021-04-28 13:56:42 -04:00
GriffinR
58cef0ae52
Merge pull request #1418 from GriffinRichards/sync-ereaderhelp 
Sync e-reader helpers, document trainer hill e-reader
 2021-04-28 06:08:57 -04:00
ultima-soul
14a0303e2f Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-27 18:36:37 -07:00
GriffinR
c6300b5325
Merge pull request #1417 from GriffinRichards/doc-pyramidbag 
Document Battle Pyramid Bag
 2021-04-27 14:48:09 -04:00