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

4488 commits

Author SHA1 Message Date
sneed
60d7d8f97e Initial Commit 2022-05-03 03:38:44 +03:00
sneed
b17d1f7816 Add generation specific interactions 2022-05-02 17:56:09 +03:00
Eduardo Quezada D'Ottone
cb9cace04f Merge remote-tracking branch 'RHH/pokemon_expansion' into PE_KadabraEverstone 
# Conflicts:
#	include/constants/pokemon_config.h
 2022-04-27 12:05:33 -04:00
ghoulslash
7bc50392d0
Merge pull request #2072 from AsparagusEduardo/PE_ShellBlastEverstone 
Fixed Shelmet and Karrablast being able to evolve if the partner is holding an Everstone
 2022-04-27 08:51:37 -04:00
ghoulslash
166b16d22c
Merge pull request #2091 from AsparagusEduardo/PE_LegendaryIV 
Config for Legendaries, Mythicals and Ultra Beasts to have at least 3 perfect IVs
 2022-04-27 08:48:22 -04:00
ghoulslash
574be40f26
Merge pull request #2099 from Greenphx9/calyrex_rider_icons 
Calyrex Rider Icons
 2022-04-27 08:43:53 -04:00
BuffelSaft
746d9ea6c5 Add AI_GetBattlerMoveTargetType() 
Add AI version of the function that handles move target selection, as it needs to have ability and item info that it may not have access to.
 2022-04-27 22:23:20 +12:00
BuffelSaft
af6242f2e0 Requested changes, Sticky Web edge case 
Fix issues found by ghoulslash, and make sure Defiant works properly with Sticky Web and Court Change.
 2022-04-27 21:51:10 +12:00
BuffelSaft
5358cc0a00 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-04-25 13:38:13 +12:00
Greenphx9
b3294c60a2 Calyrex Rider Icons 2022-04-22 16:31:17 +10:00
GriffinR
fc5747f0f7
Merge pull request #1649 from GriffinRichards/clean-trainer 
Trainer hill clean up
 2022-04-20 00:20:44 -04:00
Eduardo Quezada D'Ottone
a6175d2622 Config for Legendaries, Mythicals and Ultra Beasts to have at least 3 perfect IVs 2022-04-16 13:01:15 -04:00
Eduardo Quezada D'Ottone
84d713a50f Legendary and Mythical flags 2022-04-14 18:44:20 -04:00
TheXaman
2fa812df26 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into rhh_master_merge 2022-04-13 20:51:35 +02:00
LOuroboros
446bcd3181 Merge branch 'master' of https://github.com/pret/pokeemerald into pePret 2022-04-11 01:23:18 -03:00
LOuroboros
eb1834ce84 Merge branch 'master' of https://github.com/pret/pokeemerald into iePret 2022-04-11 01:22:48 -03:00
LOuroboros
b6e2945072 Merge branch 'master' of https://github.com/pret/pokeemerald into bePret 2022-04-11 01:22:10 -03:00
LOuroboros
3ca9ac5b37 Post merge corrections 2022-04-03 14:27:33 -03:00
LOuroboros
f82c946ff3 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge 2022-04-03 13:26:27 -03:00
LOuroboros
af2f70e000 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge 2022-04-03 13:21:40 -03:00
LOuroboros
fa39dc76dc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
GriffinR
328b925a08 Move trainer hill map data to bin files 2022-03-31 14:08:31 -04:00
GriffinR
62f3f144ab Clean up some trainer hill 2022-03-31 12:54:07 -04:00
GriffinR
66cbe29c14 Add bugfix for Battle Factory trainer IVs 2022-03-30 09:37:03 -04:00
LOuroboros
434f6cf5ad Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2022-03-26 08:43:55 -03:00
ExpoSeed
5fd468f507 Review comments. Commented code removed, ShouldAIUseZMove moved to battle_ai_util and renamed to be consistent with other fns 2022-03-22 13:10:24 -05:00
ExpoSeed
f50a406b18 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2022-03-22 12:56:23 -05:00
GriffinR
5160520639
Merge pull request #1642 from GriffinRichards/bstrings 
Add usage of battle strings table offset constant
 2022-03-14 16:40:54 -04:00
Eduardo Quezada D'Ottone
ff9556cb44
Update include/constants/pokedex.h 2022-03-13 11:25:44 -03:00
Eduardo Quezada D'Ottone
8f34249ab2
Update include/constants/pokedex.h 2022-03-13 11:25:37 -03:00
GriffinR
d664135572 Add usage of battle strings table offset constant 2022-03-10 10:44:04 -05:00
ultima-soul
2d3ba500c9 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2022-03-01 15:10:19 -08:00
ultima-soul
84a7f960c8 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2022-02-28 23:37:41 -08:00
ultima-soul
86089ce935 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2022-02-28 22:13:14 -08:00
GriffinR
a2ee0c8393
Merge pull request #1639 from GriffinRichards/typo-hoppy 
Fix bunny hoppy typo
 2022-02-28 22:34:24 -05:00
GriffinR
5d58cdd297 Fix bunny hoppy typo 2022-02-28 13:34:39 -05:00
Eduardo Quezada D'Ottone
054f667446 Config for Kadabra ignoring Everstone upon evolving 2022-02-26 22:04:24 -03:00
Eduardo Quezada D'Ottone
ed1ea69759 Fixed Shelmet and Karrablast being able to evolve if the partner is holding an Everstone 2022-02-26 21:40:20 -03:00
Eduardo Quezada D'Ottone
755b31bee0 Enable form change for the Forces of Nature 2022-02-26 12:19:38 -03:00
ghoulslash
7c2bbf1df3 fix struggle bug anim 2022-02-25 08:54:35 -05:00
sphericalice
40efac0ddf Rename GetBattlePyramindTrainerEncounterMusicId to fix typo 2022-02-22 19:13:17 +00: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
LOuroboros
88b7326325 Ported the IE's flingPower item field and ItemId_GetFlingPower 2022-01-26 21:48:01 -03:00
LOuroboros
21244d6393 Modified and moved IsPinchBerryItemEffect 2022-01-26 21:45:24 -03:00
GriffinR
2efbd5f549
Merge pull request #1608 from GriffinRichards/fix-fieldmap 
Fix some incorrect fieldmap names
 2022-01-26 17:51:56 -05: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
LOuroboros
367ba2d5bf Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into flingIE 2022-01-22 05:39:48 -03:00
GriffinR
3d0326106e Z coord / height -> elevation 2022-01-21 12:48:19 -05:00
GriffinR
79dfac92c9
Merge pull request #1604 from GriffinRichards/clean-spinda 
Document Spinda spot algorithm
 2022-01-21 09:55:43 -05:00
GriffinR
fb81d9ad4a Correct map data comment 2022-01-20 23:26:39 -05:00
Eduardo Quezada D'Ottone
7d75e16312 Small documentation and cleanup 2022-01-20 12:25:48 -03:00
GriffinR
062cdbe01c
Merge pull request #1599 from GriffinRichards/fix-tilemaps 
Break up graphics/interface and graphics/misc
 2022-01-20 08:53:44 -05:00
GriffinR
a7e6045d71
Merge pull request #1597 from GriffinRichards/misc-cleanup 
Miscellaneous fixes
 2022-01-19 22:17:37 -05: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
GriffinR
a8b466dc80 Disambiguate fieldmap names 2022-01-19 10:15:32 -05:00
GriffinR
f127e64a3c Name overworld tilemaps for their bg, add layer type constants 2022-01-19 09:37:12 -05:00
GriffinR
225147a94f Document Spinda spot algorithm 2022-01-17 15:34:18 -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
LOuroboros
a4d31da923
Updated the value of MAX_MAP_DATA_SIZE 2022-01-16 19:22:28 -03: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
ghoulslash
035b2332af cache ai damage, effectiveness calcs 2022-01-13 11:28:27 -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
GriffinR
694aa3c65d Move balls, shop, link, map popups, and bag out of interface 2022-01-11 13:53:23 -05:00
GriffinR
7103839a61 Move summary screen graphics out of interface, fix some names 2022-01-11 11:22:45 -05:00
GriffinR
fde18b4774 Fix berry crusher graphics name 2022-01-11 10:42:00 -05:00
GriffinR
0a78cb5c9e Fix some battle dome graphics names 2022-01-11 10:04:47 -05: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
GriffinR
ce55e58ad8 Misc cleanup 2022-01-04 10:09:42 -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
4f9e6faa48
Merge branch 'item_expansion' into flingIE 2022-01-02 18:31:03 -03: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
LOuroboros
74aa4f29df Corrections and additions 
-Fixed a handful of prices
-Re-added the Todo comment to the entries of the TMs 51-100 in gItemIconTable.
-Added the data and sprites of the LGPE Lures, thanks to AsparagusEduardo.
-Fixed small syntax mistakes in src/data/text/item_descriptions.h
-Slightly changed some item descriptions based on AsparagusEduardo's suggestions.
-Fixed the Exp. Charm's description, and the usage of "Exp." in the Exp. Candies' descriptions.
 2022-01-01 17:17:21 -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
LOuroboros
5a8e51d858 Filled in missing items' sprite data 2021-12-31 16:27:06 -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
LOuroboros
677da7b5e7 Fixed struct names 2021-12-28 14:48:57 -03:00
Eduardo Quezada D'Ottone
e405bd8ad3
Merge pull request #2005 from LOuroboros/evoMoves 
Implemented evolution moves
 2021-12-26 17:24:37 -03:00
Eduardo Quezada D'Ottone
7bffe6d1d5
Merge pull request #2004 from ghoulslash/be/sports 
Add sport effects back
 2021-12-24 18:59:50 -03:00
ghoulslash
93a7e139ec merge w be 2021-12-24 09:40:12 -05:00
Eduardo Quezada D'Ottone
2ebe427a42 Merge branch 'BattleEngine' into BE_wildNaturalEnemies 
# Conflicts:
#	src/battle_controller_opponent.c
 2021-12-23 21:19:59 -03:00
ghoulslash
770224d341 increase TEXT_BUFF_ARRAY_COUNT for expanded ability names 2021-12-23 18:58:15 -05:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine 2021-12-23 15:29:10 -08:00
Eduardo Quezada D'Ottone
934ffd5a7e
Merge pull request #2002 from LOuroboros/gen78footprints 
Added the footprints of all Gen. 7 and 8 species
 2021-12-23 20:28:55 -03:00
Eduardo Quezada D'Ottone
67697d2de3
Merge pull request #1582 from ghoulslash/smart_wild_ai 
Smart Wild AI Option
 2021-12-23 20:18:18 -03:00
ghoulslash
0a95a31ee9 fix formatting 2021-12-23 08:44:54 -05:00
LOuroboros
713d97891f
Update include/constants/battle_config.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-12-22 21:32:10 -03:00
LOuroboros
d6a78f386f Implemented evolution moves 
Thanks to UltimaSoul and Sagiri/Zeturic
 2021-12-22 18:02:23 -03:00
ghoulslash
2736223b1b
Merge pull request #1698 from AsparagusEduardo/PE_FormChangeHoldItems 
Form changing by holding items
 2021-12-21 09:10:23 -05:00
ghoulslash
b4cc5e3cd8
Merge pull request #1952 from AsparagusEduardo/PE_natureEvo 
Added Nature evolution methods
 2021-12-20 14:08:47 -05:00
ghoulslash
05f91bc243
Update include/constants/battle_config.h 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-12-20 14:06:32 -05:00
ghoulslash
02fe96cc08 fix config settings 2021-12-20 13:06:23 -05:00
LOuroboros
cb44de13b3 B_NEW_MULTI_BATTLE_DEFEAT_CONDITION -> B_MULTI_BATTLE_WHITEOUT 2021-12-19 20:53:57 -03:00
Eduardo Quezada D'Ottone
4ab4250d5d
Merge branch 'battle_engine' into be/sports 2021-12-19 20:42:15 -03:00
Eduardo Quezada D'Ottone
a57043b589
Merge pull request #1983 from sphericalice/last_ball_refactor 
Refactor CanThrowLastUsedBall and related functions
 2021-12-19 20:21:50 -03:00
Eduardo Quezada D'Ottone
6d17156f74
Merge pull request #1934 from BuffelSaft/fix-burmy 
Fix Burmy form change
 2021-12-19 20:18:19 -03:00
Eduardo Quezada D'Ottone
8b49f8f925
Merge branch 'pokemon_expansion' into PE_FormChangeHoldItems 2021-12-19 12:08:52 -03:00
LOuroboros
ffe35fbb06 Updated defeat condition on multi battles 2021-12-19 08:30:43 -03:00
Eduardo Quezada D'Ottone
39ef356be1
Merge pull request #1935 from LOuroboros/someGenderDiffs 
Added gender differences for a couple of Gen. 4 Pokémon
 2021-12-18 13:46:23 -03:00
Eduardo Quezada D'Ottone
a075cca448
Merge branch 'battle_engine' into fix-burmy 2021-12-18 13:38:12 -03:00
ultima-soul
18afd06f6d Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-12-18 00:28:18 -08:00
ultima-soul
b0b8b9bf46 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-12-17 23:51:29 -08:00
ultima-soul
4f2e3bf214 Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-12-17 21:23:54 -08:00
LOuroboros
4a74d288d4 Review corrections 2021-12-18 00:01:50 -03:00
LOuroboros
dbca24aa82 [LEAK INFORMED] Documented the unk19 item field 2021-12-17 19:41:39 -03:00
ExpoSeed
d6747527da Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-12-16 21:44:01 -06:00
ultima-soul
356cf96654 Match berry data to new berry order, correct Gen 4+ berry data, and add back Enigma Berry e-Reader data entries. 2021-12-15 19:33:35 -08:00
TheXaman
fe95e88938 added option to view changes for front/back sprite picCoords and elevation live 2021-12-13 22:31:37 +01:00
TheXaman
f1f4082f62 added footprints 2021-12-13 19:24:19 +01:00
TheXaman
d113d5efd9
Update include/battle_bg.h 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-12-13 18:56:50 +01:00
LOuroboros
46977b52fa Added the footprints of all Gen. 7 and 8 species 2021-12-13 13:39:12 -03:00
TheXaman
123969f093 fixed front sprite position including elevation and shadow for flying mon's (shadow palette too dark atm) 2021-12-13 15:05:17 +01:00
Eduardo Quezada D'Ottone
7ca07527fa Config for HP bars moving faster for higher HP amounts. Credit to Dat.H 2021-12-12 12:33:49 -03:00
Eduardo Quezada D'Ottone
bbf7b62ceb Config for lost money after losing a battle 2021-12-11 23:03:50 -03:00
TheXaman
51371661c2 Added new menu naviagtion, now all options can be changed 2021-12-11 15:03:56 +01:00
TheXaman
bbe918941e added include/constants/pokemon_debug,h for defines, restructured code order 2021-12-11 12:13:14 +01:00
ultima-soul
26f29a04fd Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync" 
This reverts commit ac2bcece75, reversing
changes made to 349262ebc3.
 2021-12-10 09:41:54 -08:00
TheXaman
f6d9b74a1a Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into pokemon_expansion_debug 2021-12-10 16:48:46 +01:00
Eduardo Quezada D'Ottone
aa2b2e6a70
Merge pull request #1929 from ultima-soul/battle_engine_sync 
Battle Engine Upstream Sync
 2021-12-09 20:02:45 -03:00
ultima-soul
ac2bcece75 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync 2021-12-09 14:16:05 -08:00
ultima-soul
d99ac2e44a Resolved review suggestions for upstream Pokemon Expansion sync. 2021-12-09 09:51:28 -08:00
ultima-soul
a5afdac0ae Resolved review suggestions for upstream Battle Engine sync. 2021-12-08 12:08:16 -08:00
DizzyEggg
97539d7443
Merge pull request #1951 from ghoulslash/be/sheercold 
Ice Types immune to Sheer Cold
 2021-12-06 14:12:06 +01:00
sphericalice
5c02facde4 Use more specific enum names for throwable Balls 2021-12-05 23:17:44 +00:00
sphericalice
3db871c49a Refactor CanThrowLastUsedBall and related functions 2021-12-05 23:10:05 +00:00
ghoulslash
c0e408bfab fix aqua ring heal anim 2021-12-05 14:44:22 -05:00
Eduardo Quezada D'Ottone
1708ac4b1b Wild mon that have a natural enemy or preys on other mon will attack them whem partnered in double wild battles. 2021-12-04 22:13:29 -03:00
SonikkuA-DatH
b6fff16a7d
Update battle.h 2021-12-03 18:04:44 -08:00
ultima-soul
349262ebc3 Merge remote-tracking branch 'rhh/item_expansion' into item_expansion_sync 2021-12-03 17:31:02 -08:00
ultima-soul
7369f60c06 Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync 2021-12-03 17:30:45 -08:00
Eduardo Quezada D'Ottone
96b8d21b7a Added form switching + Button icons 2021-12-03 19:32:31 -03:00
TheXaman
40f7247e11 changed P_ENABLE_DEBUG to TRUE/FALSE 2021-12-03 11:02:22 +01:00
TheXaman
bf0d2b8393 Changed definition of P_ENABLE_DEBUG to pokemon_config.h 2021-12-02 19:29:04 +01:00
ultima-soul
d408b56549 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-12-01 20:18:57 -08:00
ultima-soul
a68a39e35f Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-12-01 20:17:49 -08:00
ultima-soul
23bf41713c Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-12-01 20:17:08 -08:00
LOuroboros
2e67153982 Renamed the Enigma Berries' constants 2021-12-01 22:16:38 -03:00
LOuroboros
e7bef25fb1
Updated hold_effects.h 2021-12-01 13:32:43 -03:00
LOuroboros
19af517bbb Edited pointless or useless Primal Reversion code 
Also added an equivalent to GetMegaEvolutionSpecies and GetWishMegaEvolutionSpecies for Primal Reversion.
Also also modified how CanBattlerGetOrLoseItem checks for Primal Reversion.
Also also also rewrote the check that triggers Primal Reversion in TryDoEventsBeforeFirstTurn.
 2021-12-01 00:56:33 -03:00
LOuroboros
f2dd7bce99 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionTweaks 2021-11-30 20:39:58 -03:00
TheXaman
c402a840b1 changed to P_ENABLE_DEBUG 2021-11-30 11:20:26 +01:00
TheXaman
50e95878e9 added Select button text, added gender based icons, imrpoved code 2021-11-30 11:16:30 +01:00
TheXaman
b0f8408fb6 added gender based sprites, added textbox line, adjusted sprite offset to match line 2021-11-30 02:29:33 +01:00
TheXaman
6c520659aa implemented a inital pokemon debug menu based on code from Gamer2020 and AsparagusEduardo 2021-11-29 22:52:08 +01:00
ghoulslash
7a7c6afc39 larger ability popup, fix ability name printing/clearing, and config for longer ability names 2021-11-29 12:42:01 -05:00
ghoulslash
d108f77aa4 revert ai item usage code 2021-11-28 13:12:56 -05:00
ultima-soul
01a90ca6c2 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-11-27 22:17:05 -08:00
ultima-soul
d0623d7b71 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-11-27 21:40:08 -08:00
ultima-soul
0312c5be8b Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-27 21:38:26 -08:00
Eduardo Quezada D'Ottone
fa995894b7 Added Nature evolution methods 2021-11-27 20:46:19 -03:00
Eduardo Quezada D'Ottone
7c6f76323a Added NidoranM/Volbeat Ditto breeding config + Rotom & Furfrou 2021-11-26 22:56:48 -03:00
ghoulslash
e2af9ec3b4 ice type immunity to sheer cold 2021-11-26 11:49:49 -05:00
ghoulslash
5c52abd856 gen3 sport move functionality behind config 2021-11-23 21:20:32 -05:00
ghoulslash
e3ddad2d11 add sport effects back 2021-11-23 18:36:10 -05:00
BuffelSaft
cca7ec8c58 Fix and rename GetMoveTargetType 
Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.
 2021-11-24 12:09:54 +13:00
kleeenexfeu
9b25e0147c
Update include/constants/battle_config.h 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-11-23 14:35:37 +01:00
kleeenexfeu
f2755ad970
reword B_RECALC_TURN_AFTER_ACTIONS explanation 2021-11-23 14:28:52 +01:00
kleeenexfeu
84e6e083f7
hate the explanations about turn order ._. 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-11-23 14:24:30 +01:00
kleeenexfeu
6ceffaaf3e recalculate turn order after relevant actions 2021-11-23 13:46:36 +01:00
kleeenexfeu
1a5d3191e2 battle_engine merge 2021-11-23 13:38:36 +01:00
BuffelSaft
a89ce0c38a Swapped webs don't trigger Defiant 
Track the side that originally set Sticky Web, and if it matches the side the target of the speed drop is on, don't activate Defiant. Hard to tell if this is a bug or a feature in gen 8 - maybe the swapped webs are considered a "friendly" effect?

Also, fix Sticky Web not activating Defiant.
 2021-11-23 22:54:30 +13:00
BuffelSaft
499fb8071d Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2021-11-23 17:12:24 +13:00
BuffelSaft
fa0b5188bb Dynamic move targeting 
Properly implement Expanding Force by replacing all  instances that read move target from gBattleMoves with a function.
 2021-11-23 16:56:11 +13:00