Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,047 Commits 1 Branch 0 Tags
b6b5d862f4410566f8bba22fc3fb15404ffbc0bf
Commit Graph
9047 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ghoulslash b6b5d862f4 update role play mechanics 2021-12-23 08:37:11 -05:00
ghoulslash 4b5c5d14fc Merge pull request #1989 from AsparagusEduardo/BE_debugHoldEffects 
Updated AI debug hold effect name display.
 2021-12-20 14:07:29 -05:00
ghoulslash 78b42fabef Merge pull request #2001 from AsparagusEduardo/BE_debugDoc 
Using TAG_NONE in battle debug
 2021-12-20 14:06:59 -05:00
Eduardo Quezada D'Ottone a57043b589 Merge pull request #1983 from sphericalice/last_ball_refactor 
Refactor CanThrowLastUsedBall and related functions
 2021-12-19 20:21:50 -03:00
Eduardo Quezada D'Ottone 6d17156f74 Merge pull request #1934 from BuffelSaft/fix-burmy 
Fix Burmy form change
 2021-12-19 20:18:19 -03:00
Eduardo Quezada D'Ottone 4ca9f406f6 Merge pull request #1947 from LOuroboros/lightBall 
Updated Light Ball's effect and improved readability
 2021-12-18 15:03:18 -03:00
Eduardo Quezada D'Ottone 66e6b140ac Merge pull request #1987 from rh-hideout/DizzyEggg-patch-1 
Fix Intimidate affecting fainted mons
 2021-12-18 15:01:19 -03:00
Eduardo Quezada D'Ottone 3a24bc8298 Merge branch 'battle_engine' into DizzyEggg-patch-1 2021-12-18 14:52:19 -03:00
Eduardo Quezada D'Ottone 1772997082 Merge pull request #1994 from AsparagusEduardo/BE_HPDrain 
Config for HP bars moving faster for higher HP amounts. Credit to Dat.H
 2021-12-18 13:50:05 -03:00
Eduardo Quezada D'Ottone a075cca448 Merge branch 'battle_engine' into fix-burmy 2021-12-18 13:38:12 -03:00
Eduardo Quezada D'Ottone bd75ee9688 Using TAG_NONE in battle debug 2021-12-18 10:55:04 -03:00
ultima-soul 84ce9745d5 Merge pull request #1990 from AsparagusEduardo/BE_debugArrows 
Improved battle debug number value changing
 2021-12-17 09:21:04 -08:00
Eduardo Quezada D'Ottoneandultima-soul 837641f304 Update src/battle_debug.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-12-17 06:47:46 -03:00
Eduardo Quezada D'Ottoneandultima-soul 8005db5040 Update src/battle_debug.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-12-17 06:47:35 -03:00
Eduardo Quezada D'Ottoneandultima-soul 3a12cdb8cb Update src/battle_debug.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-12-17 06:47:02 -03:00
ultima-soul 961710ddd9 Merge pull request #1986 from AsparagusEduardo/BE_steamEngine 
Added Steam Engine's overworld effect
 2021-12-16 16:15:58 -08:00
Eduardo Quezada D'Ottone d23e7069bd Merge pull request #1998 from ultima-soul/be/enigma_berry_3 
Eliminate Item Expansion Conflicts for ITEM_ENIGMA_BERRY_E_READER Constant
 2021-12-16 21:07:15 -03:00
Eduardo Quezada D'Ottone abe9910251 Fixed speed to be more like vanilla's 2021-12-12 12:42:14 -03:00
Eduardo Quezada D'Ottone 7ca07527fa Config for HP bars moving faster for higher HP amounts. Credit to Dat.H 2021-12-12 12:33:49 -03:00
ultima-soul a2ad860ae4 Merge branch 'pret/enigma_berry_2' into be/enigma_berry_3 2021-12-11 19:11:13 -08:00
ultima-soul f4af5ea206 Merge conflict resolution trick. 2021-12-11 18:52:39 -08:00
Eduardo Quezada D'Ottone 6f363b219e Improved battle debug value change 2021-12-11 16:41:04 -03:00
Eduardo Quezada D'Ottone 2773b14de5 Updated AI debug hold effect name display. 2021-12-11 00:09:47 -03:00
Eduardo Quezada D'Ottone aa2b2e6a70 Merge pull request #1929 from ultima-soul/battle_engine_sync 
Battle Engine Upstream Sync
 2021-12-09 20:02:45 -03:00
ultima-soul a5afdac0ae Resolved review suggestions for upstream Battle Engine sync. 2021-12-08 12:08:16 -08:00
DizzyEggg 0a7dd2edd6 Fix Intimidate affecting fainted mons 2021-12-07 12:19:27 +01:00
Eduardo Quezada D'Ottone 756700ff4d Added Steam Engine's overworld effect 2021-12-06 20:52:32 -03:00
DizzyEggg dff72b97dd Merge pull request #1971 from sphericalice/patch-2 
Remove extra spaces in battle strings
 2021-12-06 14:13:39 +01:00
DizzyEggg 97539d7443 Merge pull request #1951 from ghoulslash/be/sheercold 
Ice Types immune to Sheer Cold
 2021-12-06 14:12:06 +01:00
sphericalice 5c02facde4 Use more specific enum names for throwable Balls 2021-12-05 23:17:44 +00:00
sphericalice 3db871c49a Refactor CanThrowLastUsedBall and related functions 2021-12-05 23:10:05 +00:00
ultima-soul 7369f60c06 Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync 2021-12-03 17:30:45 -08:00
sphericalice 10c6630ffd Remove extra spaces in battle strings 2021-12-03 19:34:03 +00:00
Eduardo Quezada D'Ottone ae1d124a0c Merge pull request #1969 from LOuroboros/patch-2 
Removed ITEM_ENIGMA_BERRY_E_READER usage
 2021-12-03 15:53:46 -03:00
LOuroboros ac606364e9 Removed ITEM_ENIGMA_BERRY_E_READER usage 2021-12-03 15:44:12 -03:00
Eduardo Quezada D'Ottone 8058da5b88 Merge pull request #1963 from ghoulslash/be/aifix 
Fix AI protect struct reset
 2021-12-02 16:24:52 -03:00
ghoulslash 0434bf22e6 Merge pull request #1962 from LOuroboros/patch-2 
One more merge conflict rejected
 2021-12-02 13:20:14 -05:00
ultima-soul 23bf41713c Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-12-01 20:17:08 -08:00
ghoulslash fbf74a9988 fix protect struct reset 2021-12-01 15:30:07 -05:00
LOuroboros e7bef25fb1 Updated hold_effects.h 2021-12-01 13:32:43 -03:00
Eduardo Quezada D'Ottone 14f974c9a9 Merge pull request #1954 from ghoulslash/be/aifix 
revert ai item usage code
 2021-11-30 14:06:25 -03:00
GriffinR 83be1bfc8f Remove sFiller from malloc.c 2021-11-29 11:19:30 -05:00
ghoulslash d108f77aa4 revert ai item usage code 2021-11-28 13:12:56 -05:00
ultima-soul 0312c5be8b Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-27 21:38:26 -08:00
GriffinR 4c64863bc5 Merge pull request #1567 from LOuroboros/sBattleTerrainTable 
Renamed gBattleTerrainTable
 2021-11-27 23:43:22 -05:00
GriffinR 01859a63ff Merge pull request #1566 from cbt6/move-speed 
Rename speed parameter to distance in jump functions
 2021-11-27 23:37:50 -05:00
LOuroboros b042eb6436 gBattleTerrainTable -> sBattleTerrainTable 2021-11-28 01:22:27 -03:00
cbt6 c59c7b0518 Use enums for jump distances 2021-11-28 12:01:29 +08:00
cbt6 b6430098d4 Rename speed parameter to distance in jump functions 2021-11-28 12:01:29 +08:00
GriffinR e677a00676 Merge pull request #1560 from GriffinRichards/retire-ok 
Retire OK bot
 2021-11-27 21:27:14 -05:00