ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-16 16:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,428 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

9428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BuffelSaft
57003c62fd EFFECT_SOLAR_BEAM 
Fix definition.
 2022-05-07 14:20:56 +12:00
BuffelSaft
3e1934ebe3 Rework VARIOUS_IS_PARENTAL_BOND_LAST_STRIKE 
Make this more versatile by allowing it to check parentalBondOn instead of only checking if parentalBondOn == 2. Also, fix Dragon Tail/Circle Throw switching the target on the first hit.
 2022-05-07 14:20:37 +12:00
BuffelSaft
8693db632b Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-05-07 12:27:20 +12:00
ghoulslash
f0d74b60ff
Merge pull request #1932 from BuffelSaft/gen_8_moves_batch2 
Gen 8 moves batch + Beak Blast
 2022-05-01 07:47:11 -04:00
BuffelSaft
cbf0a6704b Set Sticky Web user to Court Change user 
This is for Mirror Armor to track the current user of Sticky Web/the mon that caused the stat drop.
 2022-05-01 12:54:33 +12:00
ghoulslash
2a1733349a
Merge pull request #2101 from LOuroboros/patch-3 
Updated trainer slide-in array
 2022-04-27 10:03:02 -04:00
LOuroboros
66d8409075 Update post review 2022-04-27 10:03:32 -03:00
ghoulslash
29d8ed9602
Merge pull request #2083 from AsparagusEduardo/BE_moveDesc 
Adjusted description of Glacial Lance and Astral Barrage
 2022-04-27 08:46:48 -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
LOuroboros
487e3c46d1
Updated trainer slide-in array 2022-04-24 17:27:23 -03: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
LOuroboros
055c72a384 Improved the special animation of Shell Side Arm 2022-04-23 04:29:15 -03: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
LOuroboros
b6e2945072 Merge branch 'master' of https://github.com/pret/pokeemerald into bePret 2022-04-11 01:22:10 -03:00
ghoulslash
d8ab6c3b14
Merge pull request #2084 from AsparagusEduardo/BE_SkyDropBattleString 
Moved Sky Drop battle string to where other battle strings are
 2022-04-04 17:27:59 -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
GriffinR
8103caea15
Merge pull request #1650 from ISSOtm/patch-1 
Add Arch Linux install instructions
 2022-04-03 10:59:25 -04:00
Eldred Habert
e1f89c70d9 Add Arch Linux install instructions 
I didn't test the devkitARM install instructions, but they are pretty much transcribed from the Ubuntu/Deb ones, so that should be fine.
 2022-04-03 11:37:22 +02: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
GriffinR
44b44d3e77
Merge pull request #1648 from GriffinRichards/factory-bugfix 
Add bugfix for Battle Factory trainer IVs
 2022-03-31 22:26:03 -04:00
GriffinR
66cbe29c14 Add bugfix for Battle Factory trainer IVs 2022-03-30 09:37:03 -04:00
LOuroboros
a127cb32bb Removed pointless use of preproc directives 2022-03-30 02:05:54 -03: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
BuffelSaft
4b769901bc
Merge pull request #2059 from AsparagusEduardo/BE_SandForce 
Remove repeated ability check in battle_ai_util.c
 2022-03-26 15:40:47 +13: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
LOuroboros
387bf07e3c
Update battle_scripts_1.s 2022-03-20 19:00:21 -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
LOuroboros
0a65fd316c Fixed Enigma Berry check in CanMegaEvolve 2022-03-20 12:21:15 -03: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
GriffinR
33c05cefe2
Merge pull request #1644 from GriffinRichards/name-jump-long-grass 
Name unknown_16.png
 2022-03-14 16:32:08 -04:00
GriffinR
058783c148 Fix comment mistake 2022-03-14 16:01:17 -04:00
GriffinR
0a0157b62c Name unknown_16.png 2022-03-14 15:54:47 -04:00
LOuroboros
aca51e843e
Update battle_scripts_1.s 2022-03-14 16:14:32 -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
GriffinR
ce227aa055
Merge pull request #1640 from GriffinRichards/doc-egg-hatch 
Improve egg hatch documentation
 2022-03-12 09:41:14 -05:00
GriffinR
bb91b1b0d1 Update generic macro argument names 2022-03-10 16:36:41 -05:00
GriffinR
d664135572 Add usage of battle strings table offset constant 2022-03-10 10:44:04 -05:00
ghoulslash
daf5095c27
Merge pull request #2077 from SubzeroEclipse/BE_DescriptionFixes 
Fixed some move descriptions
 2022-03-09 21:30:49 -05:00
SubzeroEclipse
d3589103b3 Fixed some move descriptions 2022-03-09 15:23:08 +01: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
ghoulslash
f53de6ae87 fix toxic/flame orb. use CanBeX'ed functions 2022-03-08 15:16:17 -05:00
GriffinR
b1d61b9227
Merge pull request #1641 from GriffinRichards/subsprite-arr-count 
Use ARRAY_COUNT for obj event subsprite tables
 2022-03-03 23:08:52 -05:00
GriffinR
f78f46a1e2 Use ARRAY_COUNT for obj event subsprite tables 2022-03-03 14:54:05 -05:00
GriffinR
8bf7e7b6f5 Improve egg hatch documentation 2022-03-03 01:33:49 -05:00
ultima-soul
86089ce935 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2022-02-28 22:13:14 -08:00