ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,062 Commits 1 Branch 0 Tags 235 MiB
345987c9f9
Commit Graph

7062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
29343ce1ec
Remove synonyms 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-01-11 15:00:11 -05:00
ultima-soul
e804e4c4ba
Merge pull request #1242 from ghoulslash/totem 
Totem Boosts
 2021-01-10 18:43:46 -08: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
3d124944b3 Review correction to B_X_ITEMS_BUFF's comment 2021-01-07 16:09:23 -03:00
LOuroboros
cb22cbd3f6 Tweaked preprocessor constant in include/constants/item_effects.h 2021-01-07 16:06:55 -03: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