Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,854 Commits 1 Branch 0 Tags
Commit Graph

18854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduardo Quezada D'Ottone
75fbc5c0ab
Merge pull request #1981 from ghoulslash/be/aquaring 
Fix aqua ring heal anim
 2021-12-24 15:11:28 -03:00
ghoulslash
93a7e139ec merge w be 2021-12-24 09:40:12 -05:00
GriffinR
84925a892b
Merge pull request #1576 from Kurausukun/aif2pcm16 
Accept 16-bit AIFF Files and Convert to 8-bit
 2021-12-24 02:48:48 -05:00
GriffinR
94c2b7f1c6
Merge pull request #1581 from LOuroboros/patch-2 
Fixed typo in src/battle_script_commands.c
 2021-12-24 00:07:24 -05:00
LOuroboros
03205c995d
Update battle_script_commands.c 2021-12-24 01:59:40 -03:00
Eduardo Quezada D'Ottone
2ebe427a42 Merge branch 'BattleEngine' into BE_wildNaturalEnemies 
# Conflicts:
#	src/battle_controller_opponent.c
 2021-12-23 21:19:59 -03:00
ghoulslash
770224d341 increase TEXT_BUFF_ARRAY_COUNT for expanded ability names 2021-12-23 18:58:15 -05:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine 2021-12-23 15:29:10 -08:00
Eduardo Quezada D'Ottone
934ffd5a7e
Merge pull request #2002 from LOuroboros/gen78footprints 
Added the footprints of all Gen. 7 and 8 species
 2021-12-23 20:28:55 -03:00
W1serV1ser
58a5a9cbec Simplified skyDropTargets storage and made other minor improvements 
A lot of these changes are based on ghoulslash's version of Sky Drop.
 2021-12-23 15:27:11 -08:00
Eduardo Quezada D'Ottone
a725592a6b
Merge pull request #1999 from ghoulslash/be/moveeffect 
More battle-will-end checks on stat-changing damaging effects
 2021-12-23 20:23:16 -03:00
Eduardo Quezada D'Ottone
67697d2de3
Merge pull request #1582 from ghoulslash/smart_wild_ai 
Smart Wild AI Option
 2021-12-23 20:18:18 -03:00
ghoulslash
0a95a31ee9 fix formatting 2021-12-23 08:44:54 -05:00
ghoulslash
b6b5d862f4 update role play mechanics 2021-12-23 08:37:11 -05:00
Ariel A
ced9fcd509 Merge branch 'romhack' into lighting 2021-12-23 04:20:38 -05:00
Ariel A
58a3e55b39 Fixed follower appearance in shops. 2021-12-23 04:13:31 -05:00
Ariel A
febdb7616e Updated README.md. 2021-12-22 23:28:27 -05:00
Ariel A
11c7eee285 Restored lighting & shadows code removed from follower branch. 2021-12-22 23:20:11 -05:00
Ariel A
e1c56d76ac Merge branch 'romhack-no-lighting' into lighting 2021-12-22 23:08:32 -05:00
Ariel A
5034d14ffb Merge branch 'romhack' into lighting 2021-12-22 22:59:59 -05:00
Ariel A
26c38e8093 Removed lighting/day-night/shadow code from follower branch. 2021-12-22 22:58:52 -05:00
Ariel A
c29516bc2f Fixed bug with follower update after the party was healed. Credit: Jaizu 2021-12-22 22:14:28 -05:00
Ariel A
29150322ce Fixed follower script release bug. 2021-12-22 22:13:23 -05:00
LOuroboros
713d97891f
Update include/constants/battle_config.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-12-22 21:32:10 -03:00
LOuroboros
d6a78f386f Implemented evolution moves 
Thanks to UltimaSoul and Sagiri/Zeturic
 2021-12-22 18:02:23 -03:00
GriffinR
f663e310b1
Merge pull request #1580 from LOuroboros/patch-2 
Removed some commented out addresses
 2021-12-21 20:55:41 -05:00
LOuroboros
d94dae18f7 Removed more commented out addresses 
I like to help.
 2021-12-21 22:49:30 -03:00
LOuroboros
e28fa7f91c
Update event_scripts.s 2021-12-21 22:10:54 -03:00
ghoulslash
7839750d7e
Merge pull request #1926 from AsparagusEduardo/IE_itemDesc 
Update to item descriptions based on configured effect.
 2021-12-21 09:39:11 -05:00
ghoulslash
2736223b1b
Merge pull request #1698 from AsparagusEduardo/PE_FormChangeHoldItems 
Form changing by holding items
 2021-12-21 09:10:23 -05:00
TheXaman
c9704e1a11
Merge pull request #11 from LOuroboros/patch-2 
Update pokedex.c
 2021-12-21 09:52:32 +01:00
LOuroboros
f4f3058266
Update pokedex.c 2021-12-21 05:45:32 -03:00
ghoulslash
b4cc5e3cd8
Merge pull request #1952 from AsparagusEduardo/PE_natureEvo 
Added Nature evolution methods
 2021-12-20 14:08:47 -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
ghoulslash
05f91bc243
Update include/constants/battle_config.h 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-12-20 14:06:32 -05:00
ghoulslash
02fe96cc08 fix config settings 2021-12-20 13:06:23 -05:00
ghoulslash
a626b4be19 fix end rock climb 2021-12-20 13:04:04 -05:00
ghoulslash
8461ea7c16 merge rock climb 2021-12-20 12:59:06 -05:00
ghoulslash
f9856c2833 merge w pret 2021-12-20 12:32:24 -05:00
ghoulslash
ad514cf3fd Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav 2021-12-20 11:49:23 -05:00
ghoulslash
7a70fc0d73 Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs 2021-12-20 11:25:14 -05:00
LOuroboros
cb44de13b3 B_NEW_MULTI_BATTLE_DEFEAT_CONDITION -> B_MULTI_BATTLE_WHITEOUT 2021-12-19 20:53:57 -03:00
Eduardo Quezada D'Ottone
4ab4250d5d
Merge branch 'battle_engine' into be/sports 2021-12-19 20:42:15 -03:00
Eduardo Quezada D'Ottone
b21dc1e562
Merge pull request #2003 from LOuroboros/patch-2 
Fixed a typo in the items' data
 2021-12-19 20:37:40 -03:00
LOuroboros
211c8c684d
Update items.h 2021-12-19 20:30:03 -03: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
7e3282fba5
Merge pull request #1972 from LOuroboros/spaces 
Removed weird spaces in 7 dex descriptions
 2021-12-19 20:14:05 -03:00
Eduardo Quezada D'Ottone
793de70068 Fixed reference to PlayCry2 2021-12-19 13:09:01 -03:00