ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 05:35:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,719 Commits 1 Branch 0 Tags 235 MiB
8810809849
Commit Graph

7719 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduardo Quezada D'Ottone
04c6331a60
Merge pull request #1432 from BuffelSaft/thousand_arrows 
Fix Thousand Arrows
 2021-05-21 11:40:13 -04:00
Eduardo Quezada D'Ottone
d1d95df409 Fixed B_X_ITEMS_BUFF boosting 2 stages only in Gen 7 2021-05-21 11:29:13 -04:00
LOuroboros
83a1351e82 Tweaked Task_ShowAiPoints to comply with the PE 
Due to the removal of the Deoxys hack, this function needed some minor adjustments that could have always been handled by using the #ifdef preproc directive.
 2021-05-17 18:33:12 -03: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
95d41524a2 Implemented Clanging Scales' effect 2021-05-09 18:20:03 -03: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
GriffinR
18f85b5cf0
Merge pull request #1415 from GriffinRichards/doc-contestutil 
Some Contest clean up
 2021-04-27 02:29:41 -04:00
GriffinR
d74017d256
Merge pull request #1419 from GriffinRichards/doc-animstatus 
Label more unused battle anims
 2021-04-26 13:32:15 -04:00
GriffinR
c0aedf8df4
Merge pull request #1410 from GriffinRichards/doc-tradedata 
Document trade sequence animation, some trade cleanup
 2021-04-26 13:26:12 -04:00
GriffinR
aad090e154 Document TV 2021-04-26 12:35:35 -04:00
GriffinR
e40f89b175 Move unknown data table, reference with species 2021-04-25 02:19:01 -04:00
GriffinR
bee60f4c64 Document battler sprite affine anims, default pokeball throw 2021-04-25 02:18:34 -04:00
GriffinR
e065c0c285 Label more unused battle anims 2021-04-24 18:26:25 -04:00
GriffinR
86475c5ded Document trainer hill ereader 2021-04-24 18:04:27 -04:00
GriffinR
004c37bf02 Sync ereader_helpers with pokefirered 2021-04-24 18:03:06 -04:00
GriffinR
8c820878bf Document Battle Pyramid Bag 2021-04-23 15:07:36 -04:00
GriffinR
f823cd224f
Merge pull request #1416 from ProjectRevoTPP/apprentice_fix 
[LEAK INFORMED] Fix apprentice.c do{}while(0)
 2021-04-22 17:25:52 -04:00
ProjectRevoTPP
6ebd0ccb57 add NO_COND macro 2021-04-22 17:20:28 -04:00
ProjectRevoTPP
5c51a3ecc6 get rid of apprentice fakematching(s) 2021-04-22 16:40:46 -04:00
GriffinR
bc9fc38254 Misc contest cleanup 2021-04-22 15:51:04 -04:00
GriffinR
e874dfcbc8
Merge pull request #1408 from GriffinRichards/doc-pokemonstorage 
Document Pokémon Storage System
 2021-04-22 01:32:16 -04:00
GriffinR
8dd6af1db1
Merge pull request #1414 from ProjectRevoTPP/rfu_NI_stopReceivingData 
fix rfu_NI_stopReceivingData fakematching; i guess it aint over yet cowboy
 2021-04-22 01:26:45 -04:00
ProjectRevoTPP
ddc1534098 idiot, get rid of code in block 2021-04-21 21:38:42 -04:00