Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,899 Commits 1 Branch 0 Tags
fa39dc76dc880b9ccb7ccaf14875fa9578b81817
Commit Graph
89 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ExpoSeed 2e9eb0e490 Merge pull request #1718 from ultima-soul/form_change_item_data 
Assign FORM_ITEM_USE Constants
 2021-10-05 15:37:53 -05:00
ExpoSeed 7bce603039 Merge pull request #1714 from ultima-soul/form_change_table_fixes 
Refactor Form Change Table Code
 2021-10-05 15:37:51 -05:00
ExpoSeed a58641cd70 Merge pull request #1603 from LOuroboros/megaEvoString 
Tweaked sText_MegaEvoEvolved
 2021-08-26 19:33:39 -05:00
ExpoSeed 1f75f6e201 Merge pull request #1605 from LOuroboros/canEvolve 
Corrected `CanEvolve` function
 2021-08-26 19:32:22 -05:00
ExpoSeed a6f6be4e54 Merge pull request #1598 from LOuroboros/bronzor 
Corrected Bronzor's evo level
 2021-08-22 21:29:59 -05:00
ExpoSeed a9e9837b25 Merge pull request #1596 from ultima-soul/master_sync 
Master Upstream Sync
 2021-08-17 16:46:02 -05:00
ExpoSeed 5493333ff5 Merge pull request #1594 from ultima-soul/pokemon_expansion_sync 
Pokemon Expansion Upstream Sync
 2021-08-16 19:47:41 -05:00
ExpoSeed 29b6276e64 Merge pull request #1595 from ultima-soul/item_expansion_sync 
Item Expansion Upstream Sync
 2021-08-16 19:47:39 -05:00
ExpoSeed 38120afbac Merge pull request #1593 from ultima-soul/battle_engine_sync 
Battle Engine Upstream Sync
 2021-08-16 19:47:35 -05:00
ExpoSeed de3caaccfb Include expansion_branches.h in global.h 2021-07-04 12:42:34 -05:00
ExpoSeed 630d172393 Include expansion_branches.h in global.h 2021-07-04 12:41:21 -05:00
ExpoSeed 0ed1d29ece Include expansion_branches.h in global.h 2021-07-04 12:39:30 -05:00
ExpoSeed fb69b65337 Fix redefinition error in battle_config.h 2021-07-02 14:36:55 -05:00
ExpoSeed 788b9f675f Fix redefinition error in pokemon_config.h 2021-07-02 14:36:02 -05:00
ExpoSeed ebe0d21c54 Fix redefinition error in item_config.h 2021-07-02 14:34:29 -05:00
ExpoSeed b6b0062bd6 Change map header flags to use a bitfield 2021-06-13 17:02:06 -05:00
ExpoSeed 0b225b3f5c Merge pull request #1534 from ultima-soul/master_sync 
Master Upstream Sync
 2021-06-07 23:52:10 -05:00
ExpoSeed 6f25c47d6b Merge pull request #1528 from ultima-soul/num_species_back_animation_fix 
Add back NUM_SPECIES to sSpeciesToBackAnimSet definition.
 2021-06-07 17:16:10 -05:00
ExpoSeed 0ad01bce50 Merge pull request #1527 from ultima-soul/item_expansion_sync 
Item Expansion Upstream Sync
 2021-06-07 15:56:48 -05:00
ExpoSeed e7c19f3d9b Merge pull request #1526 from ultima-soul/pokemon_expansion_sync 
Pokemon Expansion Upstream Sync
 2021-06-07 15:56:45 -05:00
ExpoSeed 339f297949 Merge pull request #1525 from ultima-soul/battle_engine_sync 
Battle Engine Upstream Sync
 2021-06-07 15:56:43 -05:00
ExpoSeedandultima-soul aefd5e26d1 Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-06-04 21:26:15 -05:00
ExpoSeed 5731dd3240 Merge pull request #1517 from LOuroboros/holdEffects_IE 
Adjusted the list of item hold effects
 2021-06-02 16:05:59 -05:00
ExpoSeed 27516ed81c Merge pull request #1516 from LOuroboros/holdEffects_BE 
Adjusted the list of item hold effects
 2021-06-02 16:05:57 -05:00
ExpoSeed 22478b857b Add {FORM_CHANGE_END} to Silvally and Genesect 2021-05-28 19:24:44 -05:00
ExpoSeed f7d6d42e6c Merge pull request #1506 from AsparagusEduardo/Fix_BE_Compile 
Fixed compile error & updated names and value to correspond to the change.
 2021-05-23 14:49:57 -05:00
ExpoSeed 2ad251cec3 Merge pull request #1491 from surskitty/mega_evolution_hidden_abilities 
Pokemon with no ability recheck first ability slot.
 2021-05-22 14:59:06 -05:00
ExpoSeed e11fd352fa Merge pull request #1364 from ghoulslash/two-turn 
Fix Two-Turn Moves Failing Innapropriately
 2021-04-07 16:12:13 -05:00
ExpoSeed 45405e95b0 Merge pull request #1418 from BuffelSaft/rage_powder_fix_1 
Fix powder immunity for self-targeting moves
 2021-04-07 16:06:57 -05:00
ExpoSeed d24ee25c94 Merge pull request #1431 from LOuroboros/misaligned_icons 
Corrected the position of some icon sprites
 2021-04-07 16:06:19 -05:00
ExpoSeed d624e34afc Merge pull request #1457 from LOuroboros/patch-2 
Fixed Blacephalon's species name
 2021-04-07 16:03:49 -05:00
ExpoSeed f2ad600cdc Merge pull request #1445 from LOuroboros/the_potion_seller 
Added a config for the amount of HP recovered by healing items
 2021-04-07 15:42:25 -05:00
ExpoSeed 8a49d66622 Revert "Made Thousand Arrows bypass type immunity" 2021-04-07 15:03:11 -05:00
ExpoSeed f8d3029537 Merge pull request #1453 from LOuroboros/thousand_arrows 
Made Thousand Arrows bypass type immunity
 2021-04-07 14:58:48 -05:00
ExpoSeed 2bbab03eba Merge pull request #1430 from LOuroboros/decap_battle_types 
Decapped the in battle type strings
 2021-04-04 15:11:13 -05:00
ExpoSeed afb97abba0 Merge pull request #1425 from LOuroboros/nature_names 
Decapped nature names
 2021-04-04 15:11:12 -05:00
ExpoSeed df900ca310 Merge pull request #1419 from LOuroboros/mega_bracelet 
Added a check for the Mega Bracelet in CanMegaEvolve
 2021-04-04 15:06:40 -05:00
ExpoSeed 685c8283ed Merge pull request #1411 from BuffelSaft/Batte_Engine_Only 
Fix Spiky Shield/Jump Kick freeze
 2021-03-08 17:24:36 -06:00
ExpoSeed 9ec04fcce8 Merge pull request #1397 from ghoulslash/escape 
Fix Ghost Types Unable to Escape
 2021-03-08 17:24:00 -06:00
ExpoSeed 4a8e18cea2 Merge pull request #1336 from LOuroboros/cries_PE_redux 
Various tweaks related to Pokémon cries
 2021-02-03 11:26:44 -06:00
ExpoSeed f93bd60c93 Merge pull request #1371 from LOuroboros/keldeo_resolute 
Fixed Keldeo Resolute's animation
 2021-02-02 11:18:23 -06:00
ExpoSeed 2d1384e88f Merge pull request #1370 from LOuroboros/deoxys 
Fixed Deoxys Attack Form's animation
 2021-02-02 11:17:25 -06:00
ExpoSeed 8b8d4d4a9f Merge pull request #1376 from ghoulslash/fire_blast 
Fix Fire Blast Power
 2021-01-31 15:24:52 -06:00
ExpoSeed 0f8e47547a Merge pull request #1382 from amiosi/kings_rock 
Kings rock build fix
 2021-01-29 17:52:49 -06:00
ExpoSeed 857fc9ce95 Merge pull request #1320 from amiosi/item_expansion 
update item effects, prices, names & descriptions
 2021-01-28 12:15:11 -06:00
ExpoSeed 2e0b02e491 Merge pull request #1322 from amiosi/pokemon_expansion 
Dex colors, mawile footprint, hoopa friendship, koffing abilities, config fix
 2021-01-21 19:16:59 -06:00
ExpoSeed 61db82e64a Revert "Included global.h into battle_config.h" 2021-01-19 22:55:08 -06:00
ExpoSeed 3698b4f304 Merge pull request #1361 from LOuroboros/global 
Included global.h into battle_config.h
 2021-01-19 18:09:50 -06:00
ExpoSeed 162476c012 Merge pull request #1353 from Syreldar/patch-1 
Updated berries' path on spritesheet_rules.mk
 2021-01-16 17:38:25 -06:00
ExpoSeed bd8950e8a0 Merge pull request #1348 from LOuroboros/intimidate_preproc 
Fixed incorrect preprocessor directive in ASM file
 2021-01-15 12:45:05 -06:00
ExpoSeed 98b4af151c Merge pull request #1346 from luckytyphlosion/origin/battle_engine 
Fix AI corruption bug.
 2021-01-15 12:44:27 -06:00
ExpoSeed b166e9a5e3 Merge pull request #1276 from LOuroboros/x_items_BE 
Reworked the effects of the X Items #1
 2021-01-15 12:05:07 -06:00
ExpoSeed 5250aaf265 Merge pull request #1277 from LOuroboros/x_items_IE 
Reworked the effects of the X Items #2
 2021-01-15 12:04:54 -06:00
ExpoSeed 8cfdbaefeb Merge pull request #1294 from LOuroboros/flower_gift 
Added missing check to Flower Gift (offensive)
 2020-12-31 18:41:50 -06:00
ExpoSeed b7b1b26b57 Merge pull request #1289 from LOuroboros/final_gambit 
Corrected Final Gambit's move data and tweaked its effect
 2020-12-31 18:39:00 -06:00
ExpoSeed 24362e8bed Merge pull request #1250 from ghoulslash/infestation 
infestation between turn anim
 2020-12-31 18:06:13 -06:00
ExpoSeed 76e40fe2dd Fix incorrect bug description 2020-12-09 16:45:27 -06:00
ExpoSeed aa7facf57b Merge pull request #1243 from ghoulslash/abilities 
Finish Switch In Ability Activation Messages
 2020-11-28 20:27:32 -06:00
ExpoSeed 7b4806c85e Merge pull request #1249 from LOuroboros/patch-1 
A few evolution updates
 2020-11-28 20:26:45 -06:00
ExpoSeed 914c830616 Remove Techno Blast and Judgment from battle scripts 2020-11-19 21:21:34 -06:00
ExpoSeed 7dcc7dae23 Merge pull request #1239 from ghoulslash/battle_anims 
redo power trick anim
 2020-11-17 16:36:45 -06:00
ExpoSeed e5f043ff72 Fix grammar 2020-11-15 16:28:09 -06:00
ExpoSeed 3f157b5293 Document bugged IV inheritance difference 2020-11-15 16:24:19 -06:00
ExpoSeed 994f4893d9 Merge pull request #1223 from LOuroboros/patch-1 
Defined Isle of Armor moves
 2020-11-15 11:07:37 -06:00
ExpoSeed 0912577ea1 Merge pull request #575 from AsparagusEduardo/BE-WishMegaEvo 
Implemented Wish Mega Evolution
 2020-11-11 11:05:06 -06:00
ExpoSeed 3e3c655f43 Merge pull request #563 from AsparagusEduardo/Fix-LitleoPyroarGender 
Fixing Litleo's and Pyroar's gender ratio.
 2020-11-10 11:42:25 -06:00
ExpoSeed 429df3c319 Merge pull request #571 from LOuroboros/new_surf_pal 
Added functionality to the B_NEW_SURF_PARTICLE_PALETTE anim. config label
 2020-11-10 11:37:07 -06:00
ExpoSeed 17f7af747c Merge pull request #569 from LOuroboros/anim_settings_label_fixes 
Fixed anim. settings labels in src/battle_anim.c
 2020-11-10 11:36:27 -06:00
ExpoSeed ebaeeb7594 Merge pull request #1213 from AsparagusEduardo/BE-GlobalDefine 
Moved BATTLE_ENGINE define to global.h to fix reading from other bran…
 2020-11-09 12:01:44 -06:00
ExpoSeed 6829c5880d Merge pull request #1214 from AsparagusEduardo/PE-GlobalDefine 
Moved POKEMON_EXPANSION define to global.h to fix reading from other branches
 2020-11-09 12:01:43 -06:00
ExpoSeed 79d9cb02ce Merge pull request #1212 from AsparagusEduardo/IE-GlobalDefine 
Moved ITEM_EXPANSION define to global.h to fix reading from other branches like Battle Engine
 2020-11-09 12:01:41 -06:00
ExpoSeed 31b19400f9 Merge pull request #568 from LOuroboros/hurricane 
Changed Hurricane's animation
 2020-11-07 14:44:49 -06:00
ExpoSeed c2e8f51e35 Merge pull request #145 from AsparagusEduardo/IE-Config 
Item Expansion config file.
 2020-11-02 11:31:51 -06:00
ExpoSeed d6cbbc71a5 Merge pull request #29 from AsparagusEduardo/PR-CommentGen4Abilities 
Toggle options for abilities and Egg Groups.
 2020-11-01 21:07:24 -06:00
ExpoSeed 3573c467e7 Merge pull request #552 from LOuroboros/gen4_footprints_corrections 
Corrected a few Gen. 4 footprints after accidentally screwing them up
 2020-11-01 20:59:24 -06:00
ExpoSeed 1b65e1a1f0 Merge pull request #520 from ghoulslash/battle_engine 
Add Toggle Healthbox Visibility Feature
 2020-10-31 23:07:39 -05:00
ExpoSeed c71f0ed1b7 Merge pull request #547 from LOuroboros/gen4_footprints 
Added footprints for the Gen. 4 species
 2020-10-31 22:37:41 -05:00
ExpoSeed c6dc1df0b5 Merge pull request #541 from LOuroboros/trashless_item_expansion 
Removed unused labels for expanded TMs
 2020-10-25 01:22:26 -05:00
ExpoSeed 640d94960c Merge pull request #540 from LOuroboros/item_expansion_fixes 
Items corrections
 2020-10-25 01:17:51 -05:00
ExpoSeed 34729ce99c Merge pull request #150 from AsparagusEduardo/PR-MoreBattleConfigs 
More Battle Config options
 2020-10-23 10:59:12 -05:00
ExpoSeed 3de4df5b76 Merge pull request #528 from LOuroboros/magnemite 
Fixed Magnemite's and Magneton's battle sprites
 2020-10-22 20:26:48 -05:00
ExpoSeed 1a024b0826 Merge pull request #12 from AsparagusEduardo/PR-TradeSpecificEvo 
Added Karrablast/Shelmet evolution method.
 2020-10-16 20:55:15 -05:00
ExpoSeed beb19380ce Merge pull request #21 from LOuroboros/power_items_rhh_be 
Implemented the main effect of the Power Items
 2020-10-15 10:02:06 -05:00
ExpoSeed 0043104379 Merge pull request #22 from LOuroboros/power_items_rhh_itemexp 
Renamed the HOLD_EFFECT_EV_BOOST label
 2020-10-15 09:50:46 -05:00
ExpoSeed 3b01cd3a64 Merge pull request #19 from LOuroboros/patch-4 
Removed duplicate inclusion of battle_config.h
 2020-10-15 09:43:20 -05:00
ExpoSeed 00fade28c0 Merge pull request #8 from ExpoSeed/sync-battle-engine-v2 
Sync battle engine v2
 2020-10-13 12:13:56 -05:00
ExpoSeed 857251d7f4 Merge pull request #4 from ExpoSeed/sync-pokemon-expansion 
Sync pokemon expansion
 2020-10-13 12:13:46 -05:00
ExpoSeed 4277b06d1c Merge pull request #2 from ExpoSeed/sync-item-expansion 
Sync item expansion
 2020-10-13 12:13:34 -05:00
ExpoSeed 8d2d34aae9 Merge pull request #5 from pret/master 
Sync master
 2020-10-12 17:09:38 -05:00