ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-28 12:44:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,415 Commits 1 Branch 0 Tags 235 MiB
adfb336a3f
Commit Graph

3885 Commits

Author SHA1 Message Date
ghoulslash
adfb336a3f
Merge pull request #2105 from Sneed69/healblock 
Add missing Heal Block functionalities
 2022-05-07 09:13:18 -04:00
ghoulslash
e5b777695c
Merge pull request #2107 from Sneed69/steelbeam 
Steel Beam Move Effect Implementation
 2022-05-07 08:40:34 -04:00
sneed
ef7cd3cdfe BattleScript_DefiantActivates rename 2022-05-06 11:15:24 +03:00
sneed
865b771db7 initial commit 2022-05-05 00:57:19 +03:00
sneed
60d7d8f97e Initial Commit 2022-05-03 03:38:44 +03:00
sneed
b17d1f7816 Add generation specific interactions 2022-05-02 17:56:09 +03: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
b6e2945072 Merge branch 'master' of https://github.com/pret/pokeemerald into bePret 2022-04-11 01:22:10 -03:00
GriffinR
66cbe29c14 Add bugfix for Battle Factory trainer IVs 2022-03-30 09:37:03 -04: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
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
d664135572 Add usage of battle strings table offset constant 2022-03-10 10:44:04 -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
ghoulslash
7c2bbf1df3 fix struggle bug anim 2022-02-25 08:54:35 -05:00
sphericalice
40efac0ddf Rename GetBattlePyramindTrainerEncounterMusicId to fix typo 2022-02-22 19:13:17 +00:00
BuffelSaft
6a119c5a30 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-02-13 21:06:15 +13:00
LOuroboros
92d8268603
Update include/constants/battle_config.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-02-12 00:18:24 -03:00
LOuroboros
b52233ec31 Updated Conversion's effect 2022-02-11 21:42:39 -03:00
GriffinR
7d2344c07b
Merge pull request #1616 from GriffinRichards/missing-req 
Add missing :req, remove old macros
 2022-02-02 22:09:36 -05:00
BuffelSaft
9d1800f53e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-01-27 17:18:51 +13:00
LOuroboros
88b7326325 Ported the IE's flingPower item field and ItemId_GetFlingPower 2022-01-26 21:48:01 -03:00
LOuroboros
21244d6393 Modified and moved IsPinchBerryItemEffect 2022-01-26 21:45:24 -03:00
GriffinR
2efbd5f549
Merge pull request #1608 from GriffinRichards/fix-fieldmap 
Fix some incorrect fieldmap names
 2022-01-26 17:51:56 -05:00
GriffinR
2495d18132 Add missing :req, remove old macros 2022-01-23 18:52:04 -05:00
ghoulslash
bc94a2bb16
Merge pull request #1979 from AsparagusEduardo/BE_wildNaturalEnemies 
Wild mon natural enemies in double wild battles
 2022-01-23 18:43:12 -05:00
LOuroboros
8eaf0718ec Review changes 
Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.
 2022-01-23 19:13:04 -03:00
LOuroboros
a8a8c7e2fa Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2022-01-23 02:37:07 -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
GriffinR
3d0326106e Z coord / height -> elevation 2022-01-21 12:48:19 -05:00
GriffinR
79dfac92c9
Merge pull request #1604 from GriffinRichards/clean-spinda 
Document Spinda spot algorithm
 2022-01-21 09:55:43 -05:00
GriffinR
fb81d9ad4a Correct map data comment 2022-01-20 23:26:39 -05:00
Eduardo Quezada D'Ottone
7d75e16312 Small documentation and cleanup 2022-01-20 12:25:48 -03:00
GriffinR
062cdbe01c
Merge pull request #1599 from GriffinRichards/fix-tilemaps 
Break up graphics/interface and graphics/misc
 2022-01-20 08:53:44 -05:00
GriffinR
a7e6045d71
Merge pull request #1597 from GriffinRichards/misc-cleanup 
Miscellaneous fixes
 2022-01-19 22:17:37 -05:00
GriffinR
c4f33f2b2b TRAVERSABLE->UNUSED, rename MB_SECRET_BASE_OBSTACLE 2022-01-19 12:54:55 -05:00
GriffinR
e682c12519 sTileBitAttributes to sparse array, rename MB_UNNUSED_CAVE 2022-01-19 12:39:11 -05:00
GriffinR
8200fda14e Fix decorations metatile attribute names 2022-01-19 10:56:54 -05:00
GriffinR
a8b466dc80 Disambiguate fieldmap names 2022-01-19 10:15:32 -05:00
GriffinR
f127e64a3c Name overworld tilemaps for their bg, add layer type constants 2022-01-19 09:37:12 -05:00
GriffinR
225147a94f Document Spinda spot algorithm 2022-01-17 15:34:18 -05:00
Eduardo Quezada D'Ottone
925f65c450 Realigned config to previous state 2022-01-16 21:10:09 -03:00
GriffinR
69759b2d12
Merge pull request #1601 from GriffinRichards/fix-decor-flag 
Fix FLAG_DECORATION_0 name
 2022-01-16 17:44:58 -05:00
LOuroboros
a4d31da923
Updated the value of MAX_MAP_DATA_SIZE 2022-01-16 19:22:28 -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
ghoulslash
46c2a9ada5
Merge pull request #2033 from LOuroboros/galarianZenMode 
Allow Galarian Darmanitan's Zen Mode to work
 2022-01-13 11:42:54 -05:00