ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-22 11:20:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,128 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

1986 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
755b31bee0 Enable form change for the Forces of Nature 2022-02-26 12:19:38 -03:00
BuffelSaft
6a119c5a30 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-02-13 21:06:15 +13:00
Eduardo Quezada D'Ottone
dde65d5cea Config for Sheer Cold being less accurate when not used by Ice type Pokémon 2022-02-13 01:07:42 -03:00
Eduardo Quezada D'Ottone
c849197a88 Config for Minimize raising 2 stages 2022-02-13 00:45:35 -03:00
Eduardo Quezada D'Ottone
d73e6faab8 Config for Growth being affected by sunlight 2022-02-13 00:30:37 -03:00
Eduardo Quezada D'Ottone
748ce99de3 Config for Ingrain grounding the user 2022-02-13 00:17:37 -03:00
Eduardo Quezada D'Ottone
76e0b38960 Config for Pokémon with Oblivious being affected by Taunt 2022-02-12 23:57:23 -03:00
Eduardo Quezada D'Ottone
389a38b3cd Config for Facade being affected by burns 2022-02-12 23:55:54 -03:00
Eduardo Quezada D'Ottone
0dd2de988a
Merge branch 'battle_engine' into primalReversionTweaks 2022-02-12 23:08:12 -03:00
LOuroboros
92d8268603
Update include/constants/battle_config.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-02-12 00:18:24 -03:00
LOuroboros
b52233ec31 Updated Conversion's effect 2022-02-11 21:42:39 -03:00
GriffinR
7d2344c07b
Merge pull request #1616 from GriffinRichards/missing-req 
Add missing :req, remove old macros
 2022-02-02 22:09:36 -05:00
BuffelSaft
9d1800f53e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-01-27 17:18:51 +13:00
GriffinR
2495d18132 Add missing :req, remove old macros 2022-01-23 18:52:04 -05:00
ghoulslash
bc94a2bb16
Merge pull request #1979 from AsparagusEduardo/BE_wildNaturalEnemies 
Wild mon natural enemies in double wild battles
 2022-01-23 18:43:12 -05:00
LOuroboros
8eaf0718ec Review changes 
Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.
 2022-01-23 19:13:04 -03:00
LOuroboros
a8a8c7e2fa Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2022-01-23 02:37:07 -03:00
Eduardo Quezada D'Ottone
e880e4afdd
Merge branch 'battle_engine' into be_recalc_turn_order_after_actions 2022-01-22 19:01:45 -03:00
GriffinR
c4f33f2b2b TRAVERSABLE->UNUSED, rename MB_SECRET_BASE_OBSTACLE 2022-01-19 12:54:55 -05:00
GriffinR
e682c12519 sTileBitAttributes to sparse array, rename MB_UNNUSED_CAVE 2022-01-19 12:39:11 -05:00
GriffinR
8200fda14e Fix decorations metatile attribute names 2022-01-19 10:56:54 -05:00
Eduardo Quezada D'Ottone
925f65c450 Realigned config to previous state 2022-01-16 21:10:09 -03:00
GriffinR
69759b2d12
Merge pull request #1601 from GriffinRichards/fix-decor-flag 
Fix FLAG_DECORATION_0 name
 2022-01-16 17:44:58 -05:00
Eduardo Quezada D'Ottone
02da6cc627 Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb 
# Conflicts:
#	include/graphics.h
#	src/data/graphics/items.h
#	src/data/item_icon_table.h
#	src/data/items.h
#	src/data/text/item_descriptions.h
 2022-01-16 18:44:03 -03:00
Eduardo Quezada D'Ottone
d40119010e Merge branch 'BattleEngine' into BE_wildNaturalEnemies 
# Conflicts:
#	include/constants/battle_config.h
 2022-01-16 16:23:12 -03:00
Eduardo Quezada D'Ottone
6aabe58649
Merge branch 'battle_engine' into magician 2022-01-15 13:06:13 -03:00
Eduardo Quezada D'Ottone
b86694876c
Merge pull request #1508 from Scott-Bonner/get_ability 
Handle GetAbilityBySpecies edge cases
 2022-01-15 12:56:50 -03:00
ghoulslash
a0aaad2856
Merge pull request #2016 from AsparagusEduardo/PE_genderDiff 
Optimized SpeciesHasGenderDifference into Base Stat flag
 2022-01-13 11:55:29 -05:00
ghoulslash
46c2a9ada5
Merge pull request #2033 from LOuroboros/galarianZenMode 
Allow Galarian Darmanitan's Zen Mode to work
 2022-01-13 11:42:54 -05:00
ghoulslash
543252bc6c
Merge pull request #2034 from LOuroboros/proteanMsgboxFlush 
Tweaked Protean's effect's InGame appearance
 2022-01-13 11:42:31 -05:00
LOuroboros
a4f0de5106 Removed the last bits of HOLD_EFFECT_GRACIDEA 2022-01-12 01:54:29 -03:00
LOuroboros
b2965e5522 Added a pause to BattleScript_ProteanActivates 2022-01-11 20:15:47 -03:00
LOuroboros
24b5a5709a Allow Galarian Darmanitan's Zen Mode to work 2022-01-10 23:01:18 -03:00
GriffinR
4024b3f1b3
Merge pull request #1590 from GriffinRichards/dex-enum 
Convert pokedex defines to enums
 2022-01-10 14:56:26 -05:00
GriffinR
8b920691e6 Fix FLAG_DECORATION_0 name 2022-01-09 01:31:42 -05:00
LOuroboros
5281fe63fc
Update NUM_TECHNICAL_MACHINES 2022-01-08 21:27:29 -03:00
Eduardo Quezada D'Ottone
97baedbd5e
Merge pull request #1923 from WiserVisor/battle_engine 
Added Sky Drop to Battle Engine
 2022-01-07 18:14:40 -03:00
GriffinR
577e6cc740
Merge pull request #1586 from GriffinRichards/clean-areascreen 
Clean up pokedex_area_screen
 2022-01-06 23:02:23 -05:00
GriffinR
5d033c2e4d Convert pokedex defines to enums 2022-01-05 12:18:49 -05:00
TheXaman
44a6c4c0ec changed EGG_MOVES_ARRAY_COUN to 19 to include all the added egg moves (19 is max value (Buneary)) 2022-01-04 00:23:24 +01:00
Eduardo Quezada D'Ottone
221e38ff86
Merge pull request #1957 from ghoulslash/be/ability_popup 
Ability Popup Fixes + Longer Ability Names config
 2022-01-01 19:39:55 -03:00
Eduardo Quezada D'Ottone
3bbaf5a15d Optimized SpeciesHasGenderDifference into Base Stat flag 2022-01-01 19:24:34 -03:00
Eduardo Quezada D'Ottone
b25c89f8a1 Removed Redundant Key Stone item 2021-12-31 18:22:23 -03:00
LOuroboros
9b1fd796ae Gave the Gracidea's old hold effect slot to the Enigma Berry 2021-12-31 18:07:33 -03:00
Eduardo Quezada D'Ottone
313df31e7e Removed Jade Orb, since it has no use besides being a key-lock item. 2021-12-31 17:44:03 -03:00
LOuroboros
0c5652596b Removed HOLD_EFFECT_GRACIDEA 2021-12-31 17:34:16 -03:00
GriffinR
23f5c9fd5c Clean up pokedex_area_screen 2021-12-31 00:16:56 -05:00
Eduardo Quezada D'Ottone
5b54986e6b
Merge pull request #1980 from LOuroboros/multiBattles 
Multi battle updates
 2021-12-29 22:09:06 -03:00
GriffinR
aadab8b016 Move pokemon and easy chat constants to global, misc clean-up 2021-12-28 18:07:41 -05:00
LOuroboros
ce7815ebcc
Update pokemon.h 2021-12-28 15:11:52 -03:00