ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-09 21:25:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,056 Commits 1 Branch 0 Tags 235 MiB
7c9ddd23c1
Commit Graph

4870 Commits

Author SHA1 Message Date
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
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
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
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
8647895f1a
Merge pull request #1259 from ghoulslash/be_config 
anim particle configs false by default
 2021-01-16 10:41:18 -08: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
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
ghoulslash
fba17a96a4
Merge pull request #1253 from surskitty/battle_engine 
Increase readability of too-long names
 2021-01-12 09:20:53 -07:00
surskitty
f58539b602 Renaming the last two and fixing the merge conflict with PE. 2021-01-10 15:48:57 -05:00
surskitty
a0f1dcb9cf Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2021-01-10 15:40:21 -05:00
Evan
1e22ae4cf2 merge with be 2021-01-10 09:08:25 -07:00
LOuroboros
3ffa7f993a Renamed some X Defend labels to reflect its new name in the IE 2021-01-10 01:58:02 -03:00
ultima-soul
b5b4efdaa0
Merge pull request #1314 from LOuroboros/battle_debug_constant 
battle_config.h tweaks
 2021-01-09 12:36:37 -08:00
ultima-soul
1caed479de
Merge pull request #1298 from ghoulslash/mummy 
Fix Early Mummy Activation
 2021-01-09 12:33:04 -08: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
LOuroboros
a481233304 Review correction to case 2 of PokemonUseItemEffects 2021-01-07 18:20:53 -03:00
LOuroboros
8511ed57e4 Tweaked Steam Engine's battle string 2021-01-07 18:13:16 -03:00
LOuroboros
de9b0328ec Corrections to Steam Engine 2021-01-07 16:33:52 -03:00
ghoulslash
c392a2011e
Merge pull request #1325 from ExpoSeed/BE/sync 
Sync battle engine
 2021-01-07 12:13:26 -07:00
LOuroboros
8d9c10224d Removed pointless EmptyString print 2021-01-07 15:51:52 -03: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
LOuroboros
3246c20be5 Moved Power Spot's effect to CalcMoveBasePowerAfterModifiers 2021-01-05 19:51:52 -03:00
LOuroboros
adf039fe12 Made BufferStatRoseMessage print an extra string if B_X_ITEMS_BUFF == GEN_7 
Also turned sText_StatSharply into gText_StatSharply.
 2021-01-04 07:41:56 -03:00
LOuroboros
be46ed84ea Made the old X Items buff code make use of B_X_ITEMS_BUFF 2021-01-04 04:15:58 -03:00
LOuroboros
dbc3690282 Tweaked preprocessor directives 
Changed #ifdef X_ITEMS_REWORK == FALSE to #ifndef ITEM_EXPANSION
Changed #ifdef X_ITEMS_REWORK == TRUE to #ifdef ITEM_EXPANSION
 2021-01-04 03:58:31 -03: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
LOuroboros
da1f525d45 Made Alolan Marowak be affected by Thick Club 2021-01-03 09:58:19 -03:00
ultima-soul
c2a3c5687b Add Fairy-type icon to fix Fairy TM info icon being blank. 2021-01-02 21:11:47 -08:00
surskitty
a96179a308 Changed Neutralizing Gas. 2021-01-02 17:16:44 -05:00
Evan
f172245ad6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into totem 2021-01-01 08:49:43 -07:00
ExpoSeed
8cfdbaefeb
Merge pull request #1294 from LOuroboros/flower_gift 
Added missing check to Flower Gift (offensive)
 2020-12-31 18:41:50 -06:00
ExpoSeed
b7b1b26b57
Merge pull request #1289 from LOuroboros/final_gambit 
Corrected Final Gambit's move data and tweaked its effect
 2020-12-31 18:39:00 -06:00
ExpoSeed
24362e8bed
Merge pull request #1250 from ghoulslash/infestation 
infestation between turn anim
 2020-12-31 18:06:13 -06:00
surskitty
aa9796a6ae Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip. 2020-12-31 18:57:36 -05:00
surskitty
533d9f1c54 Updating move names and ability names. 2020-12-31 18:45:25 -05:00
Sierraffinity
ef7832a55c Change how mon affine transform fix is handled 2020-12-30 17:36:53 -08:00
Sierraffinity
127bb97c0e Add UBFIX for division by zero in SpriteCB_PokedexListMonSprite 2020-12-26 18:25:21 -08:00
Sierraffinity
bafbf9240d Add UBFIX for null deref in sub_80D08CC 2020-12-26 17:47:36 -08:00
Sierraffinity
86fdd033c6 Add UBFIX for null derefs in sub_8088950 2020-12-26 17:39:52 -08:00