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,686 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

6847 Commits

Author SHA1 Message Date
sneed
b17d1f7816 Add generation specific interactions 2022-05-02 17:56:09 +03:00
sneed
be6148d876 Add missing Heal Block functionalities 2022-05-02 04:54:25 +03: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
GriffinR
2b223acd87 Fix math in CreateBerrySprite 2022-04-26 21:44:11 -04: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
GriffinR
fc5747f0f7
Merge pull request #1649 from GriffinRichards/clean-trainer 
Trainer hill clean up
 2022-04-20 00:20:44 -04:00
sbird
59cff2190d fix building without NDEBUG on agbcc 2022-04-16 19:03:20 +02: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
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
dafb5ca74d Fixed trapping moves not reflecting the configured turn config 2022-04-03 13:03:53 -04:00
GriffinR
00e0eefe09 Document trainer hill prize selection 2022-04-01 01:37:48 -04: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
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
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
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
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
d664135572 Add usage of battle strings table offset constant 2022-03-10 10:44:04 -05:00
SubzeroEclipse
d3589103b3 Fixed some move descriptions 2022-03-09 15:23:08 +01: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
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
GriffinR
2142ad96d5
Merge pull request #1638 from GriffinRichards/menu-arr-count 
Add missing menu array counts
 2022-02-28 01:49:09 -05:00
GriffinR
3d0663fe81 Additional trader clean up 2022-02-27 13:58:48 -05:00
GriffinR
36e5d5e759 Add missing menu array counts 2022-02-27 13:47:50 -05: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
ghoulslash
7c2bbf1df3 fix struggle bug anim 2022-02-25 08:54:35 -05:00
ghoulslash
92487db470 add config check for B_GLARE_GHOST 2022-02-25 08:20:56 -05:00