atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11840 commits 2 branches 40 tags 600 MiB
Commit graph

4825 commits

Author SHA1 Message Date
Eduardo Quezada
9d1ab936d5 Moved Gen 6 data to gBaseStats 2022-11-28 09:45:46 -03:00
Eduardo Quezada
bb703bfd03 Fixed palette loading in summary screen 2022-11-27 14:04:11 -03:00
Eduardo Quezada
45eab8a292 Finally removed gLevelUpLearnsets and gTeachableLearnsets 2022-11-25 15:37:56 -03:00
Eduardo Quezada
df49fbedac Get species name from National Dex number 2022-11-24 14:07:06 -03:00
Eduardo Quezada
5b8be2a144 Merge remote-tracking branch 'RHH_origin/wip-2.0.0' into RHH/pr/breaking/speciesReorder 
# Conflicts:
#	data/battle_scripts_1.s
#	src/data/pokemon/level_up_learnsets.h
#	src/data/pokemon_graphics/front_pic_anims.h
#	src/pokemon.c
 2022-11-21 17:52:19 -03:00
Eduardo Quezada
50117e8b4f Removing data 2022-11-21 12:17:53 -03:00
Eduardo Quezada
f2d0e547ac Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030 
# Conflicts:
#	src/rom_header_gf.c
 2022-11-09 19:54:44 -03:00
BuffelSaft
1da4eb3b14
Merge pull request #2428 from AsparagusEduardo/RHH/pr/feature/DarkVoid 
Config for Dark Void being only usable by Darkrai
 2022-11-05 22:42:51 +13:00
ghoulslash
7a0e541413 workaround for GetBattlerHoldEffectParam to handle bug bite different battler id 2022-11-04 10:29:05 -04:00
ghoulslash
1e6903840a Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into be/bugbite 2022-11-04 09:29:45 -04:00
ghoulslash
d13431b4ab merge w rhh master 2022-11-04 09:29:39 -04:00
Eduardo Quezada
edf4e45c4d Config for Dark Void being only usable by Darkrai 2022-11-03 21:36:12 -03:00
BuffelSaft
c169a9523e
Merge branch 'upcoming' into fix-stat-boost-on-hit 2022-11-03 22:01:30 +13:00
BuffelSaft
736ca893b6 Fix abilities that raise target's stat after hit 
Fix Justified, Berserk, Rattled, Stamina and Water Compaction printing the wrong message when they activate. Steam Engine was also updated to follow the gen 5+ ability activation method style.
 2022-11-03 21:54:56 +13:00
Eduardo Quezada D'Ottone
b8371500d3
Merge pull request #1676 from BuffelSaft/multistrike 
Multi-hit refactor and Parental Bond
 2022-11-01 21:16:04 -03:00
ghoulslash
53061c7d62
Merge pull request #2391 from AsparagusEduardo/RHH/pr/sugardoodoodoodoodoodooaahhoneyhoney 
Implemented Honey's Sweet Scent functionality
 2022-11-01 20:09:30 -04:00
ghoulslash
c6cb54b54e
Merge pull request #2319 from AsparagusEduardo/RHH/pr/Lures 
Implemented Lures and Repel/Lure "use another" menu
 2022-11-01 20:05:15 -04:00
LOuroboros
5ebc996c51 Removed worthless DEBUG_FLAG_PC_FROM_DEBUG_MENU config 2022-10-30 22:03:14 -03:00
Eduardo Quezada
e4a439aa46 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 
# Conflicts:
#	src/data/bard_music/moves.h
#	src/data/bard_music/pokemon.h
 2022-10-30 12:30:38 -03:00
Eduardo Quezada
3172273c73 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures 
# Conflicts:
#	src/pokemon.c
 2022-10-30 12:16:09 -03:00
GriffinR
c76beed989
Merge pull request #1807 from pret/porymap-5 
Update for Porymap 5.0.0
 2022-10-30 11:01:37 -04:00
Eduardo Quezada
85c0d2dac8 Review changes 2022-10-27 11:26:09 -03:00
Eduardo Quezada
aedaf3f45f Reordered struct to reduce padding 2022-10-27 10:29:41 -03:00
Eduardo Quezada
a3d84b0cc8 Merge remote-tracking branch 'RHH_origin/wip-2.0.0' into RHH/pr/breaking/speciesReorder 
# Conflicts:
#	src/data/pokemon/level_up_learnsets.h
 2022-10-27 09:21:30 -03:00
BuffelSaft
224ca256ce Requested clean up 
Rename constants, remove white space, improve B_BEAT_UP description.

* Rename B_BEAT_UP_DMG to B_BEAT_UP
* Shorten B_PARENTAL_BOND_DAMAGE to B_PARENTAL_BOND_DMG
* Remove trailing whitespace
* Replace boolean 1 with TRUE in MOVEEND_MULTIHIT_MOVE
 2022-10-27 22:25:33 +13:00
Eduardo Quezada
8fc6cf7a14 Macros 2022-10-26 22:17:00 -03:00
Eduardo Quezada
ffdb18cfdd Ordered mon graphics in include/graphics.h 2022-10-26 12:52:55 -03:00
BuffelSaft
3327758cdb Move B_BEAT_UP_DMG to other move settings 
This is more of a mechanical change like gen 8's change to Teleport, so it should go in the same block of settings.
 2022-10-26 23:29:09 +13:00
Eduardo Quezada
14ef537b73 Ordered Gen 4 mon graphics in src/data/graphics/pokemon.h 2022-10-25 18:26:23 -03:00
Eduardo Quezada
eed8e19529 Removed extra Toxtricity and Alcremie Gigantamax forms 2022-10-25 16:51:12 -03:00
Eduardo Quezada
db999624ba Added animation delay + enemy elevation fields 2022-10-25 16:28:51 -03:00
Eduardo Quezada
ecd34a351b Ordered Gen 1-3 mon to vanilla order 2022-10-25 16:28:18 -03:00
Eduardo Quezada
8462176667 Tentative version for base stat changes 2022-10-25 14:45:42 -03:00
Eduardo Quezada
77ce81888b Removed the double question mark 2022-10-24 15:55:13 -03:00
BuffelSaft
d9cc98a4fe Suggested changes 
- Various style fixes
- Add BATTLE_ALIVE_EXCEPT_ATTACKER case to CountAliveMonsInBattle
 2022-10-24 22:19:35 +13:00
BuffelSaft
a5ede1ee90 Move B_PARENTAL_BOND_DAMAGE to damage settings 
Title.
 2022-10-23 21:41:42 +13:00
BuffelSaft
9b076a9dcf Fix spread moves, tidy up CANCELLER_MULTIHIT_MOVES 
- Parental Bond spread moves should now strike twice whenever there is a single target, even if the target is the user's ally.
- Random chance to hit 2-5 times is now set in SetRandomMultiHitCounter().
 2022-10-23 21:40:04 +13:00
BuffelSaft
1b056f9044 Fix various Parental Bond issues 
- Dragon Tail and Circle Throw strike twice and then switch the target
- Z moves are unaffected by Parental Bond
- Renamed parentalBondOn to parentalBondState
- Added constants for possible values of parentalBondState
- Fixed broken stat change animations and removed unused MOVE_EFFECT_SKY_DROP
 2022-10-23 17:37:23 +13:00
BuffelSaft
3775c5d00c Fix move effects 
Restore unintentionally removed MOVEEND_DEFROST, fix move effect definitions.
 2022-10-22 18:54:25 +13:00
BuffelSaft
6035c5a280 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-10-22 14:31:13 +13:00
GriffinR
e752c8a2f9
Merge pull request #1805 from tustin2121/tustin2121-patch-runimmedeately 
Document seldom-used trigger functionality
 2022-10-20 11:45:35 -04:00
GriffinR
3e8baa5b04
Merge branch 'master' into porymap-5 2022-10-18 22:54:25 -04:00
GriffinR
a418f8d976
Merge pull request #1755 from GriffinRichards/map-dynamic 
Rename special map constants, treat warp ids as strings
 2022-10-18 22:45:56 -04:00
tustin2121
4730870646 VAR_RUN_TRIGGER_IMMEDIATELY -> TRIGGER_RUN_IMMEDIATELY 
Getting rid of the VAR_ prefix, to avoid the porymap problem.
 2022-10-18 21:12:31 -04:00
GriffinR
e33581ff9c
Merge pull request #1671 from sphericalice/heal-location-none 
Add the HEAL_LOCATION_NONE constant
 2022-10-18 18:41:04 -04:00
Abaresk
7f09894045 Merge branch 'master' into thunder 2022-10-18 04:37:56 +00:00
Marcus Huderle
48ab684b48 Fix weather color map documentation 2022-10-17 17:41:27 -07:00
Eduardo Quezada
911a9aaf02 Reading dex data from base stats 2022-10-17 00:04:12 -03:00
Eduardo Quezada
713b646a46 Moved Gen 1 dex entries to base stats 2022-10-16 23:24:20 -03:00
tustin2121
327c648e87 Document seldom-used trigger functionality 
Added a define for use in overworld triggers where the goal is to run the provided script in the immediate script context instead of the global one like normal. This is used in triggers in the desert, on faraway island, and a couple other places to do weather effects quickly and on the same frame. Suggestions for a better define name are welcome.
 2022-10-16 20:46:50 -04:00