Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,727 Commits 1 Branch 0 Tags
f3bebcd12c61d29ee7a2ff1f3b4215d7adce8adf
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduardo Quezada f3bebcd12c Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 
# Conflicts:
#	include/battle_anim.h
#	include/global.h
#	include/pokemon.h
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-22 22:57:02 -04:00
Eduardo Quezada D'Ottone af72fb0d32 Simplified pre-gen5 checks 2022-07-21 16:36:07 -04:00
Eduardo Quezada D'Ottone 56b9a50109 Merge remote-tracking branch 'RHH/battle_engine' into BE_plusMinus 
# Conflicts:
#	include/constants/battle_config.h
 2022-07-21 16:28:16 -04:00
Eduardo Quezada D'Ottone e4ae280ca6 Fixed calls to IsZMove 2022-07-21 15:32:14 -04:00
Eduardo Quezada D'Ottone 25397e5794 Fixed Light That Burns The Sky not using the calculated damage category 
Also:
- Modified move defines to ease with future move expansion.
- Enabled Instruct's check for Z Moves in AI_CheckBadMove.
 2022-07-21 15:13:00 -04:00
Eduardo Quezada D'Ottone eb582b1355 Merge pull request #2178 from ghoulslash/be/ai_fix 
fix GetAiLogicData logic
 2022-07-21 14:47:21 -04:00
Eduardo Quezada D'Ottone d87610a1e0 Ghost Escape config AI fix 2022-07-20 15:31:08 -04:00
Eduardo Quezada D'Ottone 76f5926743 Sky Drop check in IsBattlerTrapped 2022-07-20 15:29:40 -04:00
Eduardo Quezada D'Ottone 343e685537 Sky Drop fixes 
- Sky Drop was using lbs in the formula instead of hectograms. This has been fixed.
- Sky Drop is now affected by weight modifiers like Float Stone.
- Enabled AI_CheckBadMove for Sky Drop.
 2022-07-20 15:13:53 -04:00
Eduardo Quezada D'Ottone b8ea412e61 AI logic for Charge 2022-07-20 14:44:57 -04:00
Eduardo Quezada D'Ottone 212ecb98ce Added AI checks. 2022-07-20 14:28:49 -04:00
Eduardo Quezada D'Ottone 0f3fdd410a Config for Sturdy's Gen5+ effect. 2022-07-20 13:06:41 -04:00
Eduardo Quezada D'Ottone f00beac3f9 Updated Z-Move power for Gen 8 moves and moves with power varying by Gen 2022-07-20 11:32:16 -04:00
Eduardo Quezada D'Ottone e14afd8957 Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5. 2022-07-20 10:33:18 -04:00
Eduardo Quezada D'Ottone cb34119711 Config for Charge raising Sp. Def. 2022-07-20 10:13:18 -04:00
Eduardo Quezada D'Ottone fe63dafcc1 Merge branch 'battle_engine' into BE_pretmerge 
# Conflicts:
#	src/battle_anim_fire.c
#	src/battle_controller_player.c
 2022-07-20 08:50:30 -04:00
Eduardo Quezada D'Ottone 9d1c0a7597 Merge pull request #2190 from ghoulslash/be/zmoves 
Z Moves for real
 2022-07-19 19:17:04 -04:00
Eduardo Quezada D'Ottone 1cfb267b34 Config for Explosion halving defense 2022-07-18 13:10:27 -04:00
Eduardo Quezada D'Ottone e55fea47f3 Added missing MOVE_UNAVAILABLE to Gorilla Tactics check 2022-07-18 09:24:08 -04:00
Eduardo Quezada D'Ottone 1dcbf59686 Config for Plus and Minus interaction 2022-07-18 08:11:02 -04:00
Eduardo Quezada D'Ottone e791cf90ad Merge tag 'pretmaster' into BE_pretmerge2 
# Conflicts:
#	data/battle_anim_scripts.s
#	include/battle_anim.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/battle_main.h
#	include/battle_setup.h
#	include/constants/battle_anim.h
#	include/constants/battle_string_ids.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_fire.c
#	src/battle_anim_normal.c
#	src/battle_controllers.c
#	src/battle_dome.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/pokemon.c
 2022-07-15 12:58:46 -04:00
Eduardo Quezada D'Ottone 6cb483bc9b Merge pull request #2185 from LOuroboros/patch-3 
Updated MOVE_ROUND's move flags
 2022-07-15 08:20:55 -04:00
Eduardo Quezada D'Ottone 6be8151981 Merge pull request #2146 from Sneed69/castform_battle 
Fix castform battle interactions
 2022-05-20 10:54:49 -04:00
Eduardo Quezada D'Ottone df55a185ae Merge pull request #2147 from Sneed69/r-ball-pike 
Disable last used ball in battle pike
 2022-05-19 22:04:21 -04:00
Eduardo Quezada D'Ottone 671323c3e2 Merge pull request #2139 from ghoulslash/be/wildmon 
prevent overwriting wild mon held items
 2022-05-13 21:07:46 -04:00
Eduardo Quezada D'Ottone 9685afd981 Merge pull request #2127 from Sneed69/evolution-after-whiteout 
Allow evolutions after whiting out
 2022-05-10 07:49:17 -04:00
Eduardo Quezada D'Ottone f80bab897f Merge pull request #2112 from AgustinGDLV/evo_battle 
Gen 8 Evolution Mechanics (Battle Engine)
 2022-05-09 17:40:19 -04:00
Eduardo Quezada D'Ottone 78cbbb51bb Merge pull request #2124 from ghoulslash/be/innerfocus 
add inner focus ability popup msg
 2022-05-08 20:37:35 -04:00
Eduardo Quezada D'Ottone 13f9919b9e Merge pull request #2123 from Sneed69/wikiberry_battle 
Update Confuse Berry Hold Effect (Battle Engine)
 2022-05-08 09:02:33 -04:00
Eduardo Quezada D'Ottone 989ec641f4 Merge pull request #2120 from ghoulslash/be/healblock 
Heal Block AI and Pollen Puff Selection Prevention
 2022-05-07 19:29:24 -04:00
Eduardo Quezada D'Ottone dc25bc6145 Merge branch 'battle_engine' into BE_WhiteOutMoney 
# Conflicts:
#	include/constants/battle_string_ids.h
#	src/battle_message.c
 2022-05-07 11:16:34 -04:00
Eduardo Quezada D'Ottone cbe73de8c8 Merge pull request #1861 from LOuroboros/primalReversionTweaks 
Primal Reversion Tweaks
 2022-05-07 11:04:23 -04:00
Eduardo Quezada D'Ottone 096fe3c11d Removed unecessary B_LEEK_ALWAYS_CRIT config 2022-05-07 10:56:31 -04:00
Eduardo Quezada D'Ottone 89816b62ba Added Sheer Cold accuracy change to ShouldTryOHKO 2022-05-07 10:38:16 -04:00
Eduardo Quezada D'Ottone 4e7ce0b663 Merge branch 'battle_engine' into BE_configs 
# Conflicts:
#	include/constants/battle_config.h
 2022-05-07 10:25:34 -04:00
Eduardo Quezada D'Ottone 5f463733a2 Merge pull request #2100 from LOuroboros/spShellSideArm 
Improved the special animation of Shell Side Arm
 2022-04-23 10:52:33 -04:00
Eduardo Quezada D'Ottone f8aa4d8e3a Merge pull request #2089 from LOuroboros/pePret 
Pret merge for the pokemon_expansion
 2022-04-13 12:32:27 -04:00
Eduardo Quezada D'Ottone bb44db79f7 Merge pull request #2087 from LOuroboros/bePret 
Pret merge for the battle_engine
 2022-04-13 12:32:16 -04:00
Eduardo Quezada D'Ottone 8a7e8e9805 Apply suggestions from code review 2022-04-12 21:13:48 -04:00
Eduardo Quezada D'Ottone 97462e7d2a Merge pull request #2088 from LOuroboros/iePret 
Pret merge for the item_expansion
 2022-04-12 21:01:50 -04:00
Eduardo Quezada D'Ottone 454068095c Moved Sky Drop battle string to where other battle strings are 2022-04-04 16:59:01 -04:00
Eduardo Quezada D'Ottone d604d99d6e Adjusted description of Glacial Lance and Astral Barrage 2022-04-03 16:54:07 -04:00
Eduardo Quezada D'Ottone f3414e5c89 Merge pull request #2082 from LOuroboros/rhh_mastermerge 
Master merge
 2022-04-03 13:37:28 -04:00
Eduardo Quezada D'Ottone dafb5ca74d Fixed trapping moves not reflecting the configured turn config 2022-04-03 13:03:53 -04:00
Eduardo Quezada D'Ottone 8262e967a3 Merge pull request #1906 from LOuroboros/flingBE 
Implemented Fling (1/2)
 2022-04-02 16:22:58 -03:00
Eduardo Quezada D'Ottone c4dea447ee Merge pull request #2080 from LOuroboros/patch-3 
Update battle_scripts_1.s
 2022-03-20 19:22:50 -03:00
Eduardo Quezada D'Ottone c4e5d93dc5 Merge pull request #2078 from LOuroboros/patch-3 
BattleScript_EffectFlinchWithStatus -> BattleScript_EffectFlinchStatus
 2022-03-20 18:57:35 -03:00
Eduardo Quezada D'Ottone f371288bc2 Merge pull request #2079 from LOuroboros/patch-4 
Fix Enigma Berry check in CanMegaEvolve
 2022-03-20 18:57:09 -03:00
Eduardo Quezada D'Ottone 48ce04279b Merge pull request #2075 from ultima-soul/item_expansion_sync 
Item Expansion Upstream Sync
 2022-03-13 18:15:54 -03:00
Eduardo Quezada D'Ottone c00873cbc4 Merge pull request #2073 from ultima-soul/battle_engine_sync 
Battle Engine Upstream Sync
 2022-03-13 18:15:45 -03:00
Eduardo Quezada D'Ottone ff4c391e47 Merge pull request #2074 from ultima-soul/pokemon_expansion_sync 
Pokemon Expansion Upstream Sync
 2022-03-13 18:15:35 -03: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
Eduardo Quezada D'Ottone 20da792f90 Merge pull request #2076 from ghoulslash/be/orbfix 
fix toxic/flame orb. use CanBeX'ed functions
 2022-03-08 17:25:01 -03:00
Eduardo Quezada D'Ottone ed464a9e8d Merge pull request #2068 from ghoulslash/be/strugglebug 
Fix struggle bug anim
 2022-02-25 12:50:55 -03:00
Eduardo Quezada D'Ottone ab5630813c Merge pull request #2067 from ghoulslash/be/glare 
move glare effectiveness exception to code
 2022-02-25 12:47:14 -03:00
Eduardo Quezada D'Ottone 7e7060b299 Merge pull request #2050 from SubzeroEclipse/IE_decaps 
Decapitalization of berries 'names
 2022-02-19 18:01:44 -03:00
Eduardo Quezada D'Ottone 66b4df0362 Merge pull request #2062 from Jaizu/patch-23 
Use TM constant in CanMonLearnTMTutor
 2022-02-18 16:32:57 -03:00
Eduardo Quezada D'Ottone 466cd9f69b Merge pull request #2061 from Jaizu/patch-22 
Fix MIME_JR #ifdef
 2022-02-18 16:29:37 -03:00
Eduardo Quezada D'Ottone 9a88021448 Remove repeated ability check in battle_ai_util.c 2022-02-17 21:39:15 -03:00
Eduardo Quezada D'Ottone e7df0acafb Fixed Pokédex entry upon catch not properly handling gender differences 2022-02-13 01:56:40 -03:00
Eduardo Quezada D'Ottone 5e9767e067 Fixed actually checking for Sheer Cold instead of affecting all OHKO moves 2022-02-13 01:13:44 -03: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
Eduardo Quezada D'Ottone eebe664bfc Merge pull request #2054 from LOuroboros/conversion 
Updated Conversion's effect
 2022-02-12 22:08:00 -03:00
Eduardo Quezada D'Ottone 1454384b1b Merge pull request #2052 from ghoulslash/be/ai_whostrikesfirst 
Fix AI_WhoStrikesFirst
 2022-02-11 17:56:53 -03:00
Eduardo Quezada D'Ottone 5c552cd070 Merge pull request #2043 from ghoulslash/be/psychoshift 
Psycho Shift uses CanBeStatused Functions
 2022-02-11 17:55:11 -03:00
Eduardo Quezada D'Ottone 69d62f1cb9 Merge pull request #2049 from ghoulslash/be/quickdraw 
Fix ability pop up for quick draw
 2022-02-03 21:07:34 -03:00
Eduardo Quezada D'Ottone 5dc6f1caa4 Merge pull request #2047 from SubzeroEclipse/BE_decaps 
Decapitalization of some battle strings
 2022-02-01 14:57:52 -03:00
Eduardo Quezada D'Ottone 3b4f219180 Merge pull request #2044 from SubzeroEclipse/BE_MoveDescriptions 
Fixed format of move descriptions' labels
 2022-01-28 18:24:51 -03:00
Eduardo Quezada D'Ottone 60f46a710c Removed redundant checks for Unnerve 2022-01-22 21:04:59 -03:00
Eduardo Quezada D'Ottone b7df21b263 Optimized use of GetBattlerAbility 2022-01-22 20:25:51 -03:00
Eduardo Quezada D'Ottone 88d4b188cc Merge pull request #1943 from kleeenexfeu/be_recalc_turn_order_after_actions 
Turn order is recalculated after some actions
 2022-01-22 19:07:34 -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
Eduardo Quezada D'Ottone b38011eb3f Merge pull request #1907 from LOuroboros/flingIE 
Implemented Fling (2/2)
 2022-01-22 12:37:51 -03:00
Eduardo Quezada D'Ottone f42c4cd689 Merge pull request #1734 from ghoulslash/magician 
Magician
 2022-01-21 16:03:15 -03:00
Eduardo Quezada D'Ottone 7d75e16312 Small documentation and cleanup 2022-01-20 12:25:48 -03:00
Eduardo Quezada D'Ottone 925f65c450 Realigned config to previous state 2022-01-16 21:10:09 -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 ddfc3502f7 Fixed Pokémon Expansion flag name 2022-01-16 17:21:05 -03:00
Eduardo Quezada D'Ottone 8ce9b2241a Merge pull request #2037 from ghoulslash/be/harvest 
Fix harvest activation msg
 2022-01-16 16:34:49 -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
Eduardo Quezada D'Ottone 80c1e11245 Merge branch 'BattleEngine' into BE_Instruct 
# Conflicts:
#	src/battle_script_commands.c
 2022-01-13 20:13:01 -03:00
Eduardo Quezada D'Ottone 0441682af5 Merge pull request #2035 from LOuroboros/enigmaticGracidea 
Removed the last bits of HOLD_EFFECT_GRACIDEA
 2022-01-12 18:25:37 -03:00
Eduardo Quezada D'Ottone 0eb1c2c858 Merge pull request #2032 from LOuroboros/patch-3 
Tweaked CanMonLearnTMTutor
 2022-01-09 18:16:06 -03:00
Eduardo Quezada D'Ottone 3afda445ce Merge pull request #2031 from LOuroboros/patch-2 
Fixed usage of B_MULTI_BATTLE_WHITEOUT
 2022-01-09 15:04:05 -03:00
Eduardo Quezada D'Ottone 1374662998 Merge pull request #2030 from LOuroboros/patch-2 
Update NUM_TECHNICAL_MACHINES
 2022-01-08 21:42:54 -03:00
Eduardo Quezada D'Ottone 8d0548f732 Fixed Wormadam sprite. Credit to Jaizu 2022-01-08 20:26:16 -03:00
Eduardo Quezada D'Ottone f6b32c8d17 Fixed Anchor Shot description. 2022-01-08 20:19:53 -03:00
Eduardo Quezada D'Ottone 241aea9dfd Missing actually adding Hoopa Unbound 2022-01-08 19:58:01 -03:00
Eduardo Quezada D'Ottone 787b9a0402 Gen VIII and missing forms 2022-01-08 18:24:21 -03:00
Eduardo Quezada D'Ottone eba4c36189 Merge pull request #2024 from TheXaman/rhh_BE_B_SLEEP_TURNS 
Yawn now uses B_SLEEP_TURNS
 2022-01-07 21:56:06 -03:00
Eduardo Quezada D'Ottone fa2657bb61 Gen VII 2022-01-07 21:36:50 -03:00