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

11845 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eduardo Quezada
cbb36b02a1 Now returns SPECIES_NONE data when there's no data defined for a species 2022-11-29 15:26:36 -03:00
Eduardo Quezada
8a285ac830 Fixed graphics during evolution scene 2022-11-29 11:41:17 -03:00
Eduardo Quezada
755df9b1cf Ported female differences 2022-11-28 21:45:49 -03:00
Eduardo Quezada
a993c6c793 Removed enemyMonElevation from FRONT_SPRITE macro 2022-11-28 11:28:16 -03:00
Eduardo Quezada
6b8494036d Removed unused species argument in DecompressPicFromTable 2022-11-28 10:49:32 -03:00
Eduardo Quezada
9d1ab936d5 Moved Gen 6 data to gBaseStats 2022-11-28 09:45:46 -03:00
Eduardo Quezada
46c99b040f Moved Gen 5 data to gBaseStats 2022-11-27 20:25:08 -03:00
Eduardo Quezada
bb703bfd03 Fixed palette loading in summary screen 2022-11-27 14:04:11 -03:00
Eduardo Quezada
d6096c9c52 Moved Gen 4 data to gBaseStats 2022-11-27 12:20:10 -03:00
Eduardo Quezada
45eab8a292 Finally removed gLevelUpLearnsets and gTeachableLearnsets 2022-11-25 15:37:56 -03:00
Eduardo Quezada
88d9017237 Moved Gen 3 data to gBaseStats 2022-11-25 15:37:18 -03:00
Eduardo Quezada
5acc22a41d Moved Gen 2 data to gBaseStats 2022-11-25 12:58:27 -03:00
Eduardo Quezada
7e12f5418f Moved the rest of the Gen 1 data to gBaseStats 2022-11-25 10:48:52 -03:00
Eduardo Quezada
e3cffc0328 Ported Gen 4 dex entries 2022-11-24 18:34:45 -03:00
Eduardo Quezada
7a925a0611 Removed sSpeciesToBackAnimSet 2022-11-24 14:08:37 -03:00
Eduardo Quezada
df49fbedac Get species name from National Dex number 2022-11-24 14:07:06 -03:00
Eduardo Quezada
a4c2a325f0 Changed gen 1-3 dex data into the dex macros 2022-11-24 13:15:19 -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 D'Ottone
b48f057fe7
Merge pull request #1589 from cynderquil/pokemon_expansion 
Fix Bastiodon's second icon frame
 2022-11-20 20:47:07 -03:00
Eduardo Quezada D'Ottone
49b7328d32
Merge pull request #2451 from eatthepear/patch-1 
Fix Berries that were broken after Bug Bite fix
 2022-11-12 17:26:29 -03:00
eatthepear
bd4b660983
Fix Berries that were broken after Bug Bite fix 
Issue #2448 
Haven't tested extensively, but regular Berries work and Bug Bite w/ Berries also works.
I believe this line was missing by accident (you can look at the merged Bug Bite PR #2433 to see that this line was deleted and never replaced).
 2022-11-11 21:28:44 -05:00
Eduardo Quezada D'Ottone
6197e76875
Merge pull request #2449 from LOuroboros/patch-1 
Uncommented level up moves
 2022-11-11 01:46:42 -03:00
LOuroboros
7260478c54 Uncommented level up moves 2022-11-11 01:31:22 -03:00
Eduardo Quezada D'Ottone
a2b355f2a4
Merge pull request #2422 from AsparagusEduardo/RHH/pr/sync/pretmerge_20221030 
Support for Porymap 5.0.0 (pret merge 2022-10-30)
 2022-11-09 20:15:15 -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
Eduardo Quezada
bd63ef18af Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 
# Conflicts:
#	src/pokemon_storage_system.c
 2022-11-09 19:33:26 -03:00
GriffinR
9e24fe6ec8
Merge pull request #1816 from LOuroboros/patch-1 
Fixed indentation in ScrCmd_faceplayer
 2022-11-08 19:07:34 -05:00
LOuroboros
a35986fd9c Fixed indentation in ScrCmd_faceplayer 2022-11-08 21:01:50 -03:00
Eduardo Quezada D'Ottone
e6ae0bd01e
Merge pull request #2434 from LOuroboros/badDreams 
Optimized Bad Dreams' code
 2022-11-08 08:16:07 -03:00
GriffinR
0a6de12b5e
Merge pull request #1814 from AsparagusEduardo/pret/pr/storageDoc 
Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System
 2022-11-06 23:35:53 -05:00
Eduardo Quezada
237877e21b Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System 2022-11-07 00:00:23 -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
BuffelSaft
bbd7b205fd
Merge pull request #2433 from ghoulslash/be/bug_bite 
Redo Bug Bite
 2022-11-05 22:08:47 +13:00
LOuroboros
f56df74576 Optimized Bad Dreams' code 
Misc:
-Made the ability pop up stick around until the ability's effect ends just like in ORAS.
-Updated sText_BadDreamsDmg accordingly while I was at it.
 2022-11-04 14:58:58 -03:00
Eduardo Quezada D'Ottone
fa8bf80905
Merge pull request #2420 from LOuroboros/teleport 
Updated CanTeleport
 2022-11-04 12:40:25 -03:00
Eduardo Quezada D'Ottone
2b5aff2764
Merge pull request #2426 from tustin2121-2/patch-linker 
GF Header and Modern Builds
 2022-11-04 12:27:13 -03:00
BuffelSaft
d05c74b9e9
Merge pull request #2430 from AsparagusEduardo/RHH/pr/fix/BadDreams 
Fixed Bad Dream's ability popup message
 2022-11-05 03:42:44 +13:00
ghoulslash
7a0e541413 workaround for GetBattlerHoldEffectParam to handle bug bite different battler id 2022-11-04 10:29:05 -04:00
Eduardo Quezada
5b1552514e Review changes 2022-11-04 11:10:06 -03:00
GriffinR
b1af66ebe5
Merge pull request #1812 from tustin2121/patch-linker 
GF Header and Modern Builds
 2022-11-04 09:31:31 -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
ghoulslash
f3d44f04f0
Merge pull request #1927 from AsparagusEduardo/PE_monAnimations 
Ported Gen 5 & 6 mon animations from Inclement Emerald + added most missing Gen 7 form animations
 2022-11-04 09:17:31 -04:00
Eduardo Quezada
8c66b318eb Fixed Bad Dream's ability popup message 2022-11-04 00:46:07 -03:00
Eduardo Quezada
d23b5c95c9 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/monAnimations 
# Conflicts:
#	src/data/pokemon_graphics/front_pic_anims.h
#	src/pokemon.c
 2022-11-03 23:31:20 -03:00
Eduardo Quezada
fbc71b3686 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 2022-11-03 21:46:37 -03:00
Eduardo Quezada
edf4e45c4d Config for Dark Void being only usable by Darkrai 2022-11-03 21:36:12 -03:00
Eduardo Quezada D'Ottone
9ea3ad8938
Merge pull request #2427 from BuffelSaft/fix-stat-boost-on-hit 
Fix abilities that raise target's stat after hit
 2022-11-03 08:50:18 -03:00
BuffelSaft
c169a9523e
Merge branch 'upcoming' into fix-stat-boost-on-hit 2022-11-03 22:01:30 +13:00