ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,847 Commits 1 Branch 0 Tags 235 MiB
75ac960365
Commit Graph

10847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduardo Quezada
75ac960365 Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms 2022-08-22 17:27:21 -04:00
ExpoSeed
807c3fd17f Delete item and ability defines in configs 2022-08-02 00:28:42 -05:00
ExpoSeed
49da2ee53f Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION 2022-08-02 00:15:55 -05:00
ultima-soul
6b35dd5774
Merge pull request #2208 from AsparagusEduardo/RHH_masterMerge 
RHH master merge
 2022-08-01 21:06:40 -07:00
Eduardo Quezada
c6cdb2a281 Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 2022-07-31 22:57:46 -04:00
Eduardo Quezada D'Ottone
1f9b57f1fc
Merge pull request #2217 from benicioneto/battle_engine 
Fix the AI
 2022-07-31 13:08:26 -04:00
benicioneto
3d8aeeac77 Fix the AI 
The AI was using only the first move, and soft locking when the first move's PP ends
 2022-07-30 17:33:48 -03:00
ghoulslash
154c38050a
Merge pull request #2215 from AsparagusEduardo/BE_steamEruption 
Fixed Steam Eruption's long name
 2022-07-30 09:06:20 -04:00
Eduardo Quezada D'Ottone
22ab78e2f8 Fixed Steam Eruption's long name 2022-07-30 00:10:20 -04:00
ghoulslash
aa00812f81
Merge pull request #2183 from Greenphx9/16-letter-move-names 
16-letter Move Names
 2022-07-29 08:17:43 -04:00
Greenphx9
05cbd6a906 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 16-letter-move-names 2022-07-29 18:49:25 +10:00
ghoulslash
0c79d04dec
Merge pull request #1928 from AsparagusEduardo/BE_fixTransformForm 
Prevent Transforming Pokémon from changing forms
 2022-07-28 22:26:56 -04:00
ghoulslash
5a850b0b4e
Merge pull request #2212 from AsparagusEduardo/BE_healBallFix 
Fixed Heal Ball not always healing caught Pokémon
 2022-07-28 22:22:20 -04:00
Eduardo Quezada
e1c15a9cf6 Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 2022-07-27 08:16:10 -04:00
Eduardo Quezada D'Ottone
0f6186d8ab
Merge pull request #2211 from AsparagusEduardo/BE_Gen3Switch 
Config for Gen 3 faint switch mechanics
 2022-07-27 08:14:13 -04:00
Eduardo Quezada
7af85b0c49 Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 2022-07-27 08:12:08 -04:00
BuffelSaft
8d8c25b341
Merge pull request #2213 from AsparagusEduardo/BE_aiFixes 
Small AI fixes by mrgriffin
 2022-07-27 17:50:28 +12:00
Eduardo Quezada D'Ottone
aebd667260 Merge remote-tracking branch 'RHH/battle_engine' into BE_fixTransformForm 
# Conflicts:
#	src/battle_ai_main.c
 2022-07-26 17:00:53 -04:00
Eduardo Quezada D'Ottone
611b192e8c Small AI fixes by mrgriffin 2022-07-26 09:53:39 -04:00
Eduardo Quezada D'Ottone
8d18fc0dd8 Fixed Heal Ball not always healing caught Pokémon 2022-07-25 08:54:03 -04:00
Eduardo Quezada D'Ottone
bfb86fdc86 Config for Gen 3 faint switch mechanics 2022-07-24 14:57:47 -04:00
Eduardo Quezada
be22f299f8 Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 2022-07-24 14:00:10 -04:00
ghoulslash
57e2de092b
Merge pull request #2210 from LOuroboros/prankster 
Corrected usage of B_PRANKSTER_DARK_TYPES in AI_CheckBadMove
 2022-07-24 07:29:03 -04:00
LOuroboros
f1d8d006f3 Corrected usage of B_PRANKSTER_DARK_TYPES in AI_CheckBadMove 2022-07-24 06:47:50 -03:00
Eduardo Quezada
e96c9c87fa Merge remote-tracking branch 'RHH/item_expansion' into RHH_masterMerge 
# Conflicts:
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-22 23:38:52 -04:00
Eduardo Quezada
231727d02b Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge 
# Conflicts:
#	asm/macros/event.inc
#	data/specials.inc
#	include/constants/species.h
#	src/data/pokemon/base_stats.h
 2022-07-22 23:33:04 -04:00
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
ghoulslash
1260666c91
Merge pull request #1911 from AsparagusEduardo/PE_breedOverrides 
Added Egg breeding species overrides.
 2022-07-22 14:05:14 -04:00
ghoulslash
cef730e451
Merge pull request #2196 from AsparagusEduardo/IE_pretmerge 
Item Expansion pret merge
 2022-07-22 14:01:50 -04:00
ghoulslash
0588bba193
Merge pull request #2195 from AsparagusEduardo/PE_pretmerge 
Pokémon Expansion pret merge
 2022-07-22 14:01:27 -04:00
ghoulslash
3a77b52bad
Merge pull request #2194 from AsparagusEduardo/BE_pretmerge 
Battle Engine pret merge
 2022-07-22 14:00:40 -04:00
ghoulslash
a51acab9e3
Merge pull request #2193 from AsparagusEduardo/BE_plusMinus 
Config for Plus and Minus interaction
 2022-07-21 16:48:04 -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
ghoulslash
24bb2f7ed0
Merge pull request #2179 from LOuroboros/pinch 
Removed global and unused IsPinchBerryItemEffect
 2022-07-21 16:14:56 -04:00
ghoulslash
49a932a892
Merge pull request #2205 from AsparagusEduardo/BE_LightThatBurnsTheSky 
Fixed Light That Burns The Sky not using the calculated damage category
 2022-07-21 16:14:38 -04:00
ghoulslash
30a494f964
Merge pull request #2197 from AsparagusEduardo/BE_explosion 
Config for Explosion halving defense
 2022-07-21 16:11:32 -04:00
ghoulslash
504600c996
Merge pull request #2201 from AsparagusEduardo/BE_sturdy 
Config for Sturdy's Gen5+ effect.
 2022-07-21 16:09:01 -04:00
ghoulslash
2ce32afeaa
Merge pull request #2202 from AsparagusEduardo/BE_SkyDrop 
Sky Drop fixes
 2022-07-21 16:06:42 -04:00
ghoulslash
2fc15ab779
Merge pull request #2203 from AsparagusEduardo/BE_ghostEscapeAiFix 
Ghost Escape config AI fix
 2022-07-21 16:00:33 -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
ghoulslash
462a144956
Merge pull request #2200 from AsparagusEduardo/BE_ZMove_power 
Updated Z-Move power for Gen 8 moves and moves with power varying by Gen
 2022-07-20 18:10:31 -04:00
ghoulslash
6b28ff6ccf
Merge pull request #2199 from AsparagusEduardo/BE_charge 
Config for Charge raising Sp. Def., adjusted Growth's config
 2022-07-20 18:09:59 -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