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
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ghoulslash be3d9c1c6d Merge pull request #2015 from AsparagusEduardo/RHH_discord 
Updated README.md in master
 2022-01-13 11:54:40 -05:00
ghoulslash 0434bf22e6 Merge pull request #1962 from LOuroboros/patch-2 
One more merge conflict rejected
 2021-12-02 13:20:14 -05:00
ghoulslash 3ac480076c Merge pull request #1933 from BuffelSaft/brick-break 
Fix Brick Break
 2021-11-21 22:30:38 -05:00
ghoulslash 3404039330 Merge pull request #1918 from kleeenexfeu/be_mega_evo_alter_turn 
Mega Evolution alters turn order
 2021-11-21 08:12:21 -05:00
ghoulslash cb0266fb86 Merge pull request #1920 from LOuroboros/vitamins 
Fixed an incorrect #elif
 2021-11-19 16:57:19 -05:00
ghoulslash b2411dbbc4 Merge pull request #1909 from AsparagusEduardo/BE_Leek 
Updated Leek's effect with config
 2021-11-16 08:50:31 -05:00
ghoulslash 56565b029c Merge pull request #1900 from AsparagusEduardo/IE_JabocaTreePalette 
Fixed Jacoba Berry Tree not using its own palette
 2021-11-15 08:54:10 -05:00
ghoulslash 0e397c43fe Merge pull request #1898 from AsparagusEduardo/BE_postIETweaks 
Adjusted elements to simplify the conflicts between BE and IE
 2021-11-15 08:27:28 -05:00
ghoulslash 03fad8ab32 Merge pull request #1897 from AsparagusEduardo/IE_spacing 
Fixed Hold Effect file spacing
 2021-11-15 08:26:51 -05:00
ghoulslash 8b296b97a8 Merge pull request #1887 from BuffelSaft/knock-off 
Fix Knock Off, add config
 2021-11-14 08:27:51 -05:00
ghoulslash 23104a02e7 Merge pull request #1891 from AsparagusEduardo/BE_assaultVestText 
Fix Assault Vest's battle message and effect on Me First
 2021-11-13 09:06:12 -05:00
ghoulslash 9df66f4ac1 Merge pull request #1843 from Blackforest92/battle_engine 
Update Giga Impact's graphic and use fade-in battle animation.
 2021-11-13 08:54:37 -05:00
ghoulslashandEduardo Quezada D'Ottone b68c596ce5 Update src/battle_script_commands.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-11-13 08:50:30 -05:00
ghoulslashandEduardo Quezada D'Ottone a4204e5491 Update include/constants/battle_config.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-11-13 08:50:24 -05:00
ghoulslash c779d7f0b0 Merge pull request #1894 from AsparagusEduardo/BE_fixRelicSong 
Fixed Relic Song's SE
 2021-11-13 08:50:01 -05:00
ghoulslash 2ae7627f34 Merge pull request #1895 from AsparagusEduardo/PE_fixFurfrou 
Fix Furfrou's form's backsprite coordinates
 2021-11-13 08:49:23 -05:00
ghoulslashandultima-soul cdb20e89fc Update src/battle_script_commands.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-11-12 13:12:05 -05:00
ghoulslashandLOuroboros 0634d3e541 Update src/battle_script_commands.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-11-12 13:07:53 -05:00
ghoulslashandultima-soul d5db329318 Update src/battle_script_commands.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-11-12 13:07:41 -05:00
ghoulslash e2e43444ad Merge pull request #1882 from kleeenexfeu/battle_engine 
Serene Grace affects King's rock
 2021-11-11 16:43:08 -05:00
ghoulslash 3336ba811f Merge pull request #1878 from BuffelSaft/big-pecks 
Fix Big Pecks
 2021-11-11 16:36:28 -05:00
ghoulslash d9aa0e67a2 Merge pull request #1859 from BuffelSaft/gen_8_moves_batch1 
Gen 8 moves batch 1
 2021-11-10 20:45:35 -05:00
ghoulslash 4f56d0a2b5 Merge pull request #1875 from BuffelSaft/fix_ai_status_logic2 
Fix AI status logic and CanAttackerFaintTarget
 2021-11-08 10:34:10 -05:00
ghoulslash a90cf4a501 Merge pull request #1724 from AsparagusEduardo/BE_TerrainMoves 
Moves affected by Terrain: Camouflage, Secret Power & Terrain Pulse
 2021-11-07 17:39:03 -05:00
ghoulslash f7d11527aa Merge pull request #1867 from AsparagusEduardo/BE_synchroToxic 
Config for Synchronize's interaction with toxic poisoning
 2021-11-06 10:36:50 -04:00
ghoulslash 6070c70b36 Merge pull request #1865 from BuffelSaft/magma_storm 
Fix Magma Storm
 2021-11-05 09:26:02 -04:00
ghoulslash dd91cbd08f Merge pull request #1851 from BuffelSaft/hunger_switch2 
Hunger Switch and Aura Wheel
 2021-11-04 21:40:59 -04:00
ghoulslash a30573f317 Merge pull request #1858 from Jaizu/patch-20 
Fix comment typo
 2021-11-04 15:08:54 -04:00
ghoulslash 0ac6860855 Merge pull request #1810 from BuffelSaft/ai_improvements 
AI: Multi-strike moves, variable power moves, sleep check
 2021-11-04 12:28:00 -04:00
ghoulslash 9685d7bae1 Merge pull request #1845 from LOuroboros/mimicry 
Implemented Mimicry
 2021-11-04 12:11:41 -04:00
ghoulslash 90ddc8d706 Merge pull request #1849 from BuffelSaft/pastel_veil2 
Add Pastel Veil, fix Corrosion and Poison Touch
 2021-11-03 21:01:28 -04:00
ghoulslash 86ad65df76 Merge pull request #1675 from AsparagusEduardo/booleanStandard 
Using boolean for flags
 2021-11-03 19:52:52 -04:00
ghoulslash 4c9f48e9d8 Merge pull request #1842 from AsparagusEduardo/be_Gen8ContestData 
Added Gen 8 contest data
 2021-11-02 12:50:45 -04:00
ghoulslash 25f200d7ce Merge pull request #1840 from LOuroboros/patch-2 
Fixed battlerId in Poison Touch's confusionSelfDmg check
 2021-11-01 11:39:51 -04:00
ghoulslash e9f6fd9766 Merge pull request #1837 from Blackforest92/battle_engine 
Minor fix to Steel Beam
 2021-10-31 11:37:58 -04:00
ghoulslash e1f0e6285b Merge pull request #1828 from BuffelSaft/gorilla-tactics 
Implement Gorilla Tactics
 2021-10-30 21:44:33 -04:00
ghoulslashandLOuroboros bcf272353c Update src/battle_script_commands.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-10-30 11:54:09 -04:00
ghoulslashandLOuroboros 915054e84e Update src/battle_script_commands.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-10-30 11:54:04 -04:00
ghoulslashandLOuroboros dc9e418155 Update src/battle_script_commands.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-10-30 11:53:58 -04:00
ghoulslash de6140193a Merge pull request #1833 from LOuroboros/patch-2 
Fixed Move_SPECIAL_REND typo
 2021-10-30 11:34:54 -04:00
ghoulslash a872e975a4 Merge pull request #1826 from BuffelSaft/fix-gard 
Fix Mega Gardevoir's front sprite
 2021-10-30 09:22:32 -04:00
ghoulslash eedd255b18 Merge pull request #1832 from Blackforest92/battle_engine 
Alternate fix to Steel Beam
 2021-10-30 09:19:54 -04:00
ghoulslash cb9f4fbb42 Merge pull request #1760 from PikalaxALT/ex_fix_move_bg_tilemaps 
Ex fix move bg tilemaps
 2021-10-29 09:12:15 -04:00
ghoulslash 34e966fdee Merge pull request #1815 from LOuroboros/hyperspaceFury 
Implemented Hyperspace Fury
 2021-10-28 13:20:33 -04:00
ghoulslash 3a86881fb3 Merge pull request #1819 from LOuroboros/patch-2 
Fixed Shadow Force
 2021-10-28 13:19:24 -04:00
ghoulslash 289ec6ad40 Merge pull request #1808 from AsparagusEduardo/BE_ghostEscape 
Completed Ghost type trapping inmunity
 2021-10-26 22:22:13 -04:00
ghoulslash 56bd570d7d Merge pull request #1812 from BuffelSaft/berry_data 
Add missing berry data
 2021-10-26 08:36:03 -04:00
ghoulslash 07d2f73306 Merge pull request #1804 from AsparagusEduardo/PE_shedinjaball 
Config for Shedinja needing a Poké Ball to be created
 2021-10-25 15:49:25 -04:00
ghoulslash 83c1170698 Merge pull request #1802 from LOuroboros/rapidSpin 
Fixed Rapid Spin
 2021-10-25 15:47:27 -04:00
ghoulslash bd268ba3d1 Merge pull request #1811 from AsparagusEduardo/BE_config 
battle_config.h reordering and new configs
 2021-10-25 14:52:41 -04:00
ghoulslash 09143c89e4 Merge pull request #1798 from LOuroboros/retaliateTimer 
Fixed Retaliate timer's value decrease
 2021-10-22 10:51:37 -04:00
ghoulslash 416c517e49 Merge pull request #1786 from Xavion3/damage_debug 
Adds simulated damage to the debug menu
 2021-10-19 12:14:38 -04:00
ghoulslashandLOuroboros fa8fa32259 Update src/battle_main.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-10-19 11:52:50 -04:00
ghoulslash eda99fcf29 Merge pull request #1742 from AsparagusEduardo/be_gStatuses4 
Add gStatutes4
 2021-10-19 08:45:47 -04:00
ghoulslash 305a12161c Merge pull request #1771 from BuffelSaft/mulit_target 
Fix multi target moves
 2021-10-19 08:43:46 -04:00
ghoulslash 91e6c8fb0e Merge pull request #1784 from LOuroboros/gravAppleAI 
Small AI improvement related to Grav Apple
 2021-10-18 09:18:25 -04:00
ghoulslash 8dc77e6fe3 Merge pull request #1782 from LOuroboros/glare 
Updated Glare
 2021-10-17 22:11:33 -04:00
ghoulslash ba741421d9 Merge pull request #1777 from AsparagusEduardo/fix_pyroarF 
Fixed Female Pyroar's sprite position
 2021-10-17 22:04:09 -04:00
ghoulslash 16a133bf54 Merge pull request #1766 from AsparagusEduardo/fix_gogglesIE 
Saftety Goggles typo for Item Expansion
 2021-10-15 10:13:53 -04:00
ghoulslash 2e75325806 Merge pull request #1764 from BuffelSaft/storm_drain 
Fix Storm Drain/Dive bug
 2021-10-14 10:17:35 -04:00
ghoulslash e66820e646 Merge pull request #1744 from AsparagusEduardo/BE_configHiddenPow 
Setting for pre-Gen6 Hidden Power Damage.
 2021-10-11 15:13:16 -04:00
ghoulslash 6212a3c431 Merge pull request #1703 from AsparagusEduardo/fix_ConfuseBerries 
Fixed confuse berries affecting the wrong battler.
 2021-10-10 20:21:03 -04:00
ghoulslash 471eab40c8 Merge pull request #1729 from rh-hideout/ai_dynamic_move_types 
AI handles dynamic move types
 2021-10-06 09:34:08 -04:00
ghoulslash 1f4844c7f5 Merge pull request #1710 from AsparagusEduardo/BE_Struggle 
Implemented modern effect of struggle with config
 2021-10-06 09:27:10 -04:00
ghoulslash 2a45d9041c Merge pull request #1716 from AsparagusEduardo/fix_Howl 
Updated sound flags for Howl and Heal Bell
 2021-10-06 09:25:57 -04:00
ghoulslash 5959eac924 Merge pull request #1705 from AsparagusEduardo/fix_UnnerveResist 
Fix Unnerve not canceling out type resist berries.
 2021-10-06 09:22:34 -04:00
ghoulslash 245ef1ad2d Merge pull request #1715 from AsparagusEduardo/BE_ShadowTag 
Config for Shadow Tag vs Shadow Tag
 2021-10-06 09:02:58 -04:00
ghoulslash 1ec8b84492 Merge pull request #1727 from rh-hideout/simple_beam 
Fix Simple Beam
 2021-10-06 09:00:19 -04:00
ghoulslash 5bf236fc0d Merge pull request #1712 from AsparagusEduardo/fix_stickyHold 
Fix instances where Gastro Acid is not affecting the ability
 2021-10-06 08:55:46 -04:00
ghoulslash 1125459259 Merge pull request #1680 from LOuroboros/blackSludge 
Completed Black Sludge's effect
 2021-09-24 06:48:40 -06:00
ghoulslashandultima-soul 767e25bfed Update asm/macros/battle_script.inc 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-09-23 13:19:12 -06:00
ghoulslashandultima-soul 8a9d28d97f Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-09-23 12:21:36 -06:00
ghoulslashandultima-soul 2cea541b2a Update src/battle_script_commands.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-09-23 12:21:26 -06:00
ghoulslashandultima-soul d4a153bf14 Update data/battle_scripts_1.s 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-09-23 12:21:16 -06:00
ghoulslash a10a8714fc Merge pull request #1672 from rh-hideout/revert-1671-scaldThawConfig 
Revert "Scald thaw flag config for Gen 5"
 2021-09-22 11:48:29 -06:00
ghoulslash f7b90bab93 Merge pull request #1670 from SBird1337/ai/expected-value 
[ai] use expected value move dmg calculation
 2021-09-22 10:15:37 -06:00
ghoulslash 8cc0bb6ac0 Merge pull request #1652 from BuffelSaft/multi-hit-resist-berry 
Fix multihit moves vs damage reducing berries
 2021-09-22 09:42:53 -06:00
ghoulslash a01690cd57 Merge pull request #1665 from BuffelSaft/download 
Fix Download
 2021-09-22 09:40:48 -06:00
ghoulslash fb17176a26 Merge pull request #1667 from AsparagusEduardo/fix_IllusionEgg 
Adds missing check for Egg in Illusion
 2021-09-22 09:01:31 -06:00
ghoulslash c5eeab88dc Merge pull request #1671 from AsparagusEduardo/scaldThawConfig 
Scald thaw flag config for Gen 5
 2021-09-22 09:01:11 -06:00
ghoulslash 0cd7f3ffcd Merge pull request #1635 from rh-hideout/DizzyEggg-galvanize_explosion 
fix galvanize explosion + lightning rod
 2021-09-09 12:04:42 -06:00
ghoulslash 9d3f906fda Merge pull request #1537 from DizzyEggg/intimidate_popup 
Fix lag caused by ability pop-up while it's set to False
 2021-09-09 09:34:50 -06:00
ghoulslash acee60ff3c Merge pull request #1633 from BuffelSaft/smellysalt 
Fix MOVE_EFFECT_REMOVE_STATUS
 2021-09-07 06:34:45 -06:00
ghoulslash 4f5c98d5b1 Merge pull request #1631 from LOuroboros/milotic 
Fix Milotic's shiny palette
 2021-09-07 06:34:15 -06:00
ghoulslash b362ce7f33 Merge pull request #1621 from BuffelSaft/move-data 
Correct Liquidation and Sparkling Aria move data
 2021-09-03 13:02:33 -06:00
ghoulslash dd83e37261 Merge pull request #1615 from LOuroboros/choiceUTurn 
Fixed U-turn and Choice Items interaction
 2021-09-01 06:00:02 -06:00
ghoulslash 03e21bb27e Merge pull request #1591 from BuffelSaft/mienshao 
Fix Mienshao's front sprite
 2021-09-01 05:58:51 -06:00
ghoulslash b6d0996467 Merge pull request #1606 from BuffelSaft/venoshock 
Fix Venoshock
 2021-08-25 13:53:24 -06:00
ghoulslash e6a2d2226f Merge pull request #1540 from DizzyEggg/rage_powder 
Rage powder updated to gen6
 2021-07-24 07:15:58 -06:00
ghoulslash 72d346fa46 Merge pull request #1560 from rh-hideout/DizzyEggg-patch-3 
Fix White Smoke affecting Shell Smash's def drop
 2021-07-24 07:14:08 -06:00
ghoulslash fd69375489 Merge pull request #1575 from Blackforest92/pokemon_expansion 
Fix Arctozolt, Heliolisk, and Chespin
 2021-07-24 07:13:16 -06:00
ghoulslash 25f9458fea Merge pull request #1573 from LOuroboros/undoformchange 
Fixed calls to UndoFormChange in battle_script_commands.c
 2021-07-18 11:16:41 -06:00
ghoulslash a29c9f9339 Merge pull request #1569 from LOuroboros/cotton_down 
Fixed Cotton Down
 2021-07-13 11:06:59 -06:00
ghoulslash ebc187c16d Merge pull request #1536 from DizzyEggg/gravity 
Fix Gravity's animation
 2021-07-13 10:54:45 -06:00
ghoulslash b723015390 Merge pull request #1554 from ExpoSeed/IE/fix-redefinition-error 
Fix redefinition error in item_config.h
 2021-07-04 09:32:17 -06:00
ghoulslash 3189cc548f Merge pull request #1553 from ExpoSeed/PE/fix-redefinition-error 
Fix redefinition error in pokemon_config.h
 2021-07-04 09:32:01 -06:00
ghoulslash 171329aabd Merge pull request #1552 from ExpoSeed/BE/fix-redefinition-error 
Fix redefinition error in battle_config.h
 2021-07-04 09:31:46 -06:00
ghoulslash 70fd98a009 Merge pull request #1541 from rh-hideout/DizzyEggg-patch-2 
Fix Imposter looplock
 2021-06-10 11:59:29 -06:00
ghoulslash de21636f97 Merge pull request #1539 from rh-hideout/DizzyEggg-patch-1 
Fix mon shadow when caught and learn new move
 2021-06-10 11:59:10 -06:00
ghoulslash a683c698fb Merge pull request #1524 from Jaizu/patch-13 
Change the ability popup sound
 2021-06-08 08:41:41 -06:00