Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,898 Commits 1 Branch 0 Tags
be3d9c1c6d8fbdb2dd3ff48f346bffd742a5988b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduardo Quezada D'Ottone 1137f72f4e Updated README.md 2021-12-31 22:14:03 -03:00
Eduardo Quezada D'Ottone bc43b5c650 Merge pull request #2000 from ultima-soul/master_sync 
Master Upstream Sync
 2021-12-18 11:00:50 -03:00
Eduardo Quezada D'Ottoneandultima-soul 837641f304 Update src/battle_debug.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-12-17 06:47:46 -03:00
Eduardo Quezada D'Ottoneandultima-soul 8005db5040 Update src/battle_debug.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-12-17 06:47:35 -03:00
Eduardo Quezada D'Ottoneandultima-soul 3a12cdb8cb Update src/battle_debug.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-12-17 06:47:02 -03:00
Eduardo Quezada D'Ottone 8422ad6ccd Merge pull request #1997 from ultima-soul/ie/enigma_berry_2 
Add Back Enigma Berry e-Reader Constant With Less Conflicts and Update Berry Data
 2021-12-16 21:07:21 -03:00
Eduardo Quezada D'Ottone d23e7069bd Merge pull request #1998 from ultima-soul/be/enigma_berry_3 
Eliminate Item Expansion Conflicts for ITEM_ENIGMA_BERRY_E_READER Constant
 2021-12-16 21:07:15 -03:00
Eduardo Quezada D'Ottone 6f363b219e Improved battle debug value change 2021-12-11 16:41:04 -03:00
Eduardo Quezada D'Ottone 3c9074a867 Merge pull request #1931 from ultima-soul/item_expansion_sync 
Item Expansion Upstream Sync
 2021-12-09 20:02:56 -03:00
Eduardo Quezada D'Ottone e4315c89e9 Merge pull request #1930 from ultima-soul/pokemon_expansion_sync 
Pokemon Expansion Upstream Sync
 2021-12-09 20:02:52 -03: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
Eduardo Quezada D'Ottone 756700ff4d Added Steam Engine's overworld effect 2021-12-06 20:52:32 -03:00
Eduardo Quezada D'Ottone ae1d124a0c Merge pull request #1969 from LOuroboros/patch-2 
Removed ITEM_ENIGMA_BERRY_E_READER usage
 2021-12-03 15:53:46 -03:00
Eduardo Quezada D'Ottone 37d784af31 Merge pull request #1964 from LOuroboros/enigma 
Renamed the Enigma Berries' constants
 2021-12-02 21:48:37 -03:00
Eduardo Quezada D'Ottone 8058da5b88 Merge pull request #1963 from ghoulslash/be/aifix 
Fix AI protect struct reset
 2021-12-02 16:24:52 -03:00
Eduardo Quezada D'Ottone 14f974c9a9 Merge pull request #1954 from ghoulslash/be/aifix 
revert ai item usage code
 2021-11-30 14:06:25 -03:00
Eduardo Quezada D'Ottone 0f801b110b Merge pull request #1696 from ghoulslash/battle_ai 
AI Item Usage Considers Move Choice
 2021-11-21 14:51:20 -03:00
Eduardo Quezada D'Ottone dee7f97a8d Merge branch 'battle_engine' into battle_ai 2021-11-21 14:46:09 -03:00
Eduardo Quezada D'Ottone 30a4ef3723 Merge pull request #1924 from ghoulslash/be/wish 
Fix wish
 2021-11-21 14:04:06 -03:00
Eduardo Quezada D'Ottone 29172d6357 Merge pull request #1925 from ghoulslash/be/rampage 
fix rampage cancelling
 2021-11-21 00:15:53 -03:00
Eduardo Quezada D'Ottone 31d7719429 Merge pull request #1913 from LOuroboros/healingItems 
Changed I_LEGACY_HEALING_ITEMS
 2021-11-20 23:37:24 -03:00
Eduardo Quezada D'Ottone 377c313771 Merge pull request #1919 from ghoulslash/be/unseenfist 
Fix unseen fist check
 2021-11-19 18:48:58 -03:00
Eduardo Quezada D'Ottone 1696e60b9f Merge pull request #1876 from ghoulslash/be/ai_updates 
Some more CanAIFaintTarget checks and other AI updates
 2021-11-19 17:33:21 -03:00
Eduardo Quezada D'Ottone ef3f573cc2 Merge pull request #1917 from BuffelSaft/unseen_fist 
Implement Unseen Fist
 2021-11-19 17:29:25 -03:00
Eduardo Quezada D'Ottone 0c448fdf6e Merge pull request #1910 from LOuroboros/vitamins 
Updated Vitamins cap
 2021-11-17 22:25:59 -03:00
Eduardo Quezada D'Ottone 7dbc94deef Fixed undef 2021-11-15 23:36:52 -03:00
Eduardo Quezada D'Ottone 0af63c04eb Removed redundant uses of STATUS3_GASTRO_ACID check. 2021-11-15 23:29:54 -03:00
Eduardo Quezada D'Ottone cc833ebb59 Created macro + config for always critting when using high-crit moves 2021-11-15 23:21:46 -03:00
Eduardo Quezada D'Ottone a1bd6bd52f Updated species that benefit from Leek 2021-11-15 22:30:20 -03:00
Eduardo Quezada D'Ottone bef896c65a Merge pull request #1908 from kleeenexfeu/kleeenexfeu-PartyBattlerShouldAvoidHazardsfix 
PartyBattlerShouldAvoidHazards fix
 2021-11-15 19:54:46 -03:00
Eduardo Quezada D'Ottone 2a5fed3c65 Merge pull request #1905 from BuffelSaft/aura 
Fix Dark Aura and Fairy Aura
 2021-11-15 08:40:11 -03:00
Eduardo Quezada D'Ottone 70609ac742 Fixed Jacoba Berry Tree not using its own palette 2021-11-14 00:41:00 -03:00
Eduardo Quezada D'Ottone 5b63f53262 Merge pull request #1834 from ghoulslash/be/neutralizing_gas 
Add Neutralizing Gas
 2021-11-14 00:27:16 -03:00
Eduardo Quezada D'Ottone 80f531e03b Merge pull request #1899 from BuffelSaft/softlock 
Fix Cherrim softlock
 2021-11-13 23:03:27 -03:00
Eduardo Quezada D'Ottone bcbdb353f5 Adjusted elements to simplify the conflicts between BE and IE 2021-11-13 12:10:20 -03:00
Eduardo Quezada D'Ottone 67f12ef782 Fixed Hold Effect file spacing 2021-11-13 11:56:17 -03:00
Eduardo Quezada D'Ottone 8f52996144 Merge pull request #1892 from ghoulslash/be/wish 
wish update
 2021-11-13 11:01:04 -03:00
Eduardo Quezada D'Ottone ad393385ac Oops 2021-11-13 10:58:18 -03:00
Eduardo Quezada D'Ottone bcb0f1b915 Merge pull request #1890 from kleeenexfeu/battle_engine 
Bypassing screens and protections correctly
 2021-11-13 10:11:02 -03:00
Eduardo Quezada D'Ottone 492effca86 Fix Furfrou's form's backsprite coordinates 2021-11-13 07:43:12 -03:00
Eduardo Quezada D'Ottone 704957efb9 Fixed Relic Song's SE 2021-11-13 07:30:12 -03:00
Eduardo Quezada D'Ottone 2489023332 Fixed assault Vest restricting Me First 2021-11-12 19:24:50 -03:00
Eduardo Quezada D'Ottone 45fcb50e09 Merge pull request #1889 from ghoulslash/be/brickbreak 
Update Brick Break with config
 2021-11-12 19:03:43 -03:00
Eduardo Quezada D'Ottone 2e3aafe81b Fix Assault Vest's battle message 2021-11-12 18:53:46 -03:00
Eduardo Quezada D'Ottone 34555b46e8 Oops 2021-11-12 14:47:35 -03:00
Eduardo Quezada D'Ottone 1f1b45e165 Review changes 2021-11-12 14:34:04 -03:00
Eduardo Quezada D'Ottone 3fa5f1f085 Merge pull request #1885 from LOuroboros/buffMyFlow 
Fixed a small buffer overflow in AI_CV_Recycle_ItemsToEncourage
 2021-11-11 23:15:45 -03:00
Eduardo Quezada D'Ottone 67f78ce960 Removed comment 2021-11-11 22:43:14 -03:00
Eduardo Quezada D'Ottone ae26a7529c Restored FRLG items 2021-11-11 22:26:58 -03:00
Eduardo Quezada D'Ottone 6f728f2fa1 Merge pull request #1561 from ultima-soul/item_id_revamp 
Item ID Revamp
 2021-11-11 06:23:58 -03:00
Eduardo Quezada D'Ottone 1311ee9d60 Merge pull request #1731 from ultima-soul/ball_effects 
Ported New Ball Catch Rate Modifier Effects from Item Expansion
 2021-11-11 06:23:36 -03:00
Eduardo Quezada D'Ottone fd46beb3dd Merge pull request #1869 from LOuroboros/patch-2 
Fixed the offensive boost (Gen. 3-6 specifically) of the Soul Dew
 2021-11-07 15:42:24 -03:00
Eduardo Quezada D'Ottone c2a17510a9 Terrain Pulse animations 2021-11-07 11:25:08 -03:00
Eduardo Quezada D'Ottone 4e6a459b14 Optimized terrain timers 2021-11-06 19:46:52 -03:00
Eduardo Quezada D'Ottone 8773e552ac Organized config and added failsafe to AnimTask_SetCamouflageBlend 2021-11-06 19:24:06 -03:00
Eduardo Quezada D'Ottone 1c4a0c205a Camouflage types config + extra terrains 2021-11-06 19:09:35 -03:00
Eduardo Quezada D'Ottone b220da1d2a Updated NaturePowerMoves table for new terrains + added failsafe in case the terrain isn't defined in the table 2021-11-06 18:50:01 -03:00
Eduardo Quezada D'Ottone e9804a5023 Secret Power animation config 2021-11-06 17:32:34 -03:00
Eduardo Quezada D'Ottone 328976bf81 Secret Power effect config 2021-11-06 17:05:13 -03:00
Eduardo Quezada D'Ottone b282bbc270 Using WEATHER_SANDSTORM in battle_setup 2021-11-06 14:55:27 -03:00
Eduardo Quezada D'Ottone 62b6accbcc Using IsBattlerTerrainAffected 2021-11-06 11:07:40 -03:00
Eduardo Quezada D'Ottone ae8de0f07a Merge branch 'BattleEngine' into BE_TerrainMoves 
# Conflicts:
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
#	src/battle_util.c
 2021-11-06 10:44:05 -03:00
Eduardo Quezada D'OttoneandLOuroboros 202827068c a 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-11-05 21:25:42 -03:00
Eduardo Quezada D'Ottone 63a7618f07 Merge pull request #1850 from BuffelSaft/relic_song 
Finish Relic Song's effect
 2021-11-05 21:17:00 -03:00
Eduardo Quezada D'Ottone 8e49e3e653 Config for Synchronize's interaction with toxic poisoning 2021-11-05 21:16:13 -03:00
Eduardo Quezada D'Ottone 75d9f1ccb5 Merge pull request #1866 from LOuroboros/orbs 
Gave a holdEffectParam to the Adamant, Lustrous and Griseous Orbs
 2021-11-05 17:50:17 -03:00
Eduardo Quezada D'Ottone 18c84fc732 Merge pull request #1864 from LOuroboros/soulDewIE 
Added an item config for the Soul Dew
 2021-11-05 17:09:58 -03:00
Eduardo Quezada D'Ottone 6c70a6b872 Merge pull request #1863 from LOuroboros/soulDewBE 
Added a battle config for the Soul Dew
 2021-11-05 17:09:44 -03:00
Eduardo Quezada D'Ottone 5eb8f1c158 Merge pull request #1855 from ghoulslash/be/abilityonside 
AI versions of CanPoisonType, CanBePoisoned and IsAbilityOnSide
 2021-11-04 21:49:31 -03:00
Eduardo Quezada D'Ottone 05850f0f65 Refactored UndoFormChange to make it more user friendly 2021-11-03 22:05:02 -03:00
Eduardo Quezada D'Ottone 6ee2a3aba1 Merge branch 'BattleEngine' into booleanStandard 
# Conflicts:
#	src/battle_main.c
 2021-11-03 20:44:25 -03:00
Eduardo Quezada D'Ottone 11e93aee69 Merge pull request #1848 from SBird1337/fix/ub 
[battle_debug] fix charbase overflow
 2021-11-02 21:24:46 -03:00
Eduardo Quezada D'Ottone 10306d046c Fixed Steam Roller's define 2021-11-01 22:07:54 -03:00
Eduardo Quezada D'Ottone 8332bfae46 Gen 8 combo moves 2021-11-01 21:59:34 -03:00
Eduardo Quezada D'Ottone c4aa2a1e92 Added Gen 8 contest data (minus combos), also fixed Bubble's category 2021-11-01 21:36:08 -03:00
Eduardo Quezada D'Ottone f3013d8ee9 Standarized Solarbeam into Solar Beam 2021-11-01 18:36:35 -03:00
Eduardo Quezada D'Ottone d4638eaf1a Fixed Plasma Fists target 2021-10-31 19:50:31 -03:00
Eduardo Quezada D'Ottone 31e62e9321 Merge pull request #1835 from LOuroboros/bgTilemapsFix 
Fixed new BG tilemaps
 2021-10-30 21:41:32 -03:00
Eduardo Quezada D'Ottone 1811d75c23 Merge pull request #1829 from rh-hideout/revert-1760-ex_fix_move_bg_tilemaps 
Revert "Ex fix move bg tilemaps"
 2021-10-30 09:08:25 -03:00
Eduardo Quezada D'Ottone 8b45320b9a Merge pull request #1820 from ghoulslash/skill_swap 
Gen 4+ Skill Swap
 2021-10-28 20:16:59 -03:00
Eduardo Quezada D'Ottone d4eaa73292 Added check in IsRunningFromBattleImpossible. 2021-10-26 20:45:59 -03:00
Eduardo Quezada D'Ottone 773c773bac Merge remote-tracking branch 'RHH/battle_engine' into BE_ghostEscape 
# Conflicts:
#	include/constants/battle_config.h
 2021-10-26 20:35:01 -03:00
Eduardo Quezada D'Ottone 44625561e5 Taunt turn config 2021-10-24 20:21:54 -03:00
Eduardo Quezada D'Ottone 70aeaf288f Rough Skin damage config 2021-10-24 20:07:22 -03:00
Eduardo Quezada D'Ottone 8699db942b More ordering 2021-10-24 20:03:21 -03:00
Eduardo Quezada D'Ottone 71ff664700 Ordered config into new categories 2021-10-23 20:11:02 -03:00
Eduardo Quezada D'Ottone d95351dd97 Merge branch 'BattleEngine' into BE_config 
# Conflicts:
#	include/constants/battle_config.h
 2021-10-23 19:46:33 -03:00
Eduardo Quezada D'Ottone 11ae046abe Merge pull request #1809 from LOuroboros/orbsSprites 
Replaced the Red and Blue Orbs' sprites
 2021-10-23 14:12:58 -03:00
Eduardo Quezada D'Ottone abb8a97d21 Merge pull request #1616 from LOuroboros/statCalcs 
Added configs for modern post-battle stat calcs
 2021-10-23 13:35:21 -03:00
Eduardo Quezada D'Ottone 9a8b88bdb3 Updated config description 2021-10-23 11:59:57 -03:00
Eduardo Quezada D'Ottone 0f95adf77a Fixed AI check for Mean Look in case it's set to be GEN_5 or lower. 2021-10-23 11:56:56 -03:00
Eduardo Quezada D'Ottone f4ff76c8ae MOVE_EFFECT_MEAN_LOOK now fails on ghost types. 2021-10-23 11:42:33 -03:00
Eduardo Quezada D'Ottone 8bdcbb856d Ghosts can now escape any wild battle 2021-10-23 11:41:31 -03:00
Eduardo Quezada D'Ottone 3b746de1d4 Merge pull request #1789 from LOuroboros/plasmaFists 
Implemented Plasma Fists
 2021-10-23 11:11:42 -03:00
Eduardo Quezada D'Ottone 76b6250104 Merge branch 'battle_engine' into plasmaFists 2021-10-23 11:06:34 -03:00
Eduardo Quezada D'Ottone 382ec13492 Merge pull request #1752 from ghoulslash/quick_draw 
Quick Draw
 2021-10-22 22:39:03 -03:00
Eduardo Quezada D'Ottone e80a266578 Merge pull request #1741 from LOuroboros/primalReversionPE 
Primal Reversion related tweaks for the PE
 2021-10-22 22:28:43 -03:00
Eduardo Quezada D'Ottone d769920a15 Merge pull request #1740 from LOuroboros/primalReversionIE 
Primal Reversion related tweaks for the IE
 2021-10-22 22:28:15 -03:00
Eduardo Quezada D'Ottone d0253640fb Merge pull request #1739 from LOuroboros/primalReversionBE 
Implemented Primal Reversion
 2021-10-22 22:27:45 -03:00
Eduardo Quezada D'Ottone 35d5bc4367 Config for Shedinja needing a Poké Ball to be created 2021-10-22 20:50:53 -03:00