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

11838 commits

This branch
This branch
All branches
Author SHA1 Message Date
BuffelSaft
cbf0a6704b Set Sticky Web user to Court Change user 
This is for Mirror Armor to track the current user of Sticky Web/the mon that caused the stat drop.
 2022-05-01 12:54:33 +12:00
ghoulslash
a60b814904
Merge pull request #2071 from AsparagusEduardo/PE_KadabraEverstone 
Config for Kadabra ignoring Everstone upon evolving
 2022-04-27 12:31:12 -04:00
Eduardo Quezada D'Ottone
cb9cace04f Merge remote-tracking branch 'RHH/pokemon_expansion' into PE_KadabraEverstone 
# Conflicts:
#	include/constants/pokemon_config.h
 2022-04-27 12:05:33 -04:00
ghoulslash
2a1733349a
Merge pull request #2101 from LOuroboros/patch-3 
Updated trainer slide-in array
 2022-04-27 10:03:02 -04:00
LOuroboros
66d8409075 Update post review 2022-04-27 10:03:32 -03:00
ghoulslash
7bc50392d0
Merge pull request #2072 from AsparagusEduardo/PE_ShellBlastEverstone 
Fixed Shelmet and Karrablast being able to evolve if the partner is holding an Everstone
 2022-04-27 08:51:37 -04:00
ghoulslash
909602ae58
Merge pull request #2064 from AsparagusEduardo/PE_dexShinyGenderFix 
Addressed inconsistency in behavior with Shiny mon with gender differences upon catch
 2022-04-27 08:49:49 -04:00
ghoulslash
166b16d22c
Merge pull request #2091 from AsparagusEduardo/PE_LegendaryIV 
Config for Legendaries, Mythicals and Ultra Beasts to have at least 3 perfect IVs
 2022-04-27 08:48:22 -04:00
ghoulslash
29d8ed9602
Merge pull request #2083 from AsparagusEduardo/BE_moveDesc 
Adjusted description of Glacial Lance and Astral Barrage
 2022-04-27 08:46:48 -04:00
ghoulslash
fccd4d14b1
Merge pull request #2085 from AsparagusEduardo/PE_PokemonJump 
Added Pokémon Jump data.
 2022-04-27 08:45:35 -04:00
ghoulslash
574be40f26
Merge pull request #2099 from Greenphx9/calyrex_rider_icons 
Calyrex Rider Icons
 2022-04-27 08:43:53 -04:00
BuffelSaft
746d9ea6c5 Add AI_GetBattlerMoveTargetType() 
Add AI version of the function that handles move target selection, as it needs to have ability and item info that it may not have access to.
 2022-04-27 22:23:20 +12:00
BuffelSaft
af6242f2e0 Requested changes, Sticky Web edge case 
Fix issues found by ghoulslash, and make sure Defiant works properly with Sticky Web and Court Change.
 2022-04-27 21:51:10 +12:00
GriffinR
2b223acd87 Fix math in CreateBerrySprite 2022-04-26 21:44:11 -04:00
BuffelSaft
5358cc0a00 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-04-25 13:38:13 +12:00
LOuroboros
487e3c46d1
Updated trainer slide-in array 2022-04-24 17:27:23 -03:00
Eduardo Quezada D'Ottone
5f463733a2
Merge pull request #2100 from LOuroboros/spShellSideArm 
Improved the special animation of Shell Side Arm
 2022-04-23 10:52:33 -04:00
LOuroboros
055c72a384 Improved the special animation of Shell Side Arm 2022-04-23 04:29:15 -03:00
Greenphx9
b3294c60a2 Calyrex Rider Icons 2022-04-22 16:31:17 +10:00
GriffinR
ef4d99c87e
Merge pull request #1645 from acidghost/fix-find-libpng 
Fix finding libpng in gbagfx and rsfont on macOS M1
 2022-04-20 10:47:12 -04:00
Kurausukun
0bda107188 don't build modern with -g by default 2022-04-20 01:07:10 -04:00
GriffinR
fc5747f0f7
Merge pull request #1649 from GriffinRichards/clean-trainer 
Trainer hill clean up
 2022-04-20 00:20:44 -04:00
Eduardo Quezada D'Ottone
239ebe9973
Revert "Removed ternary from CanMonLearnTMTutor" 2022-04-17 09:17:52 -04:00
Eduardo Quezada D'Ottone
2983152358
Merge pull request #2095 from LOuroboros/CanMonLearnTMTutor 
Removed ternary from CanMonLearnTMTutor
 2022-04-17 08:53:19 -04:00
LOuroboros
95f5950811 Removed ternary from CanMonLearnTMTutor 2022-04-17 09:43:09 -03:00
TheXaman
c54bf21b01 Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system 2022-04-16 23:18:35 +02:00
Eduardo Quezada D'Ottone
16283b47c7 Fixed compile. I had these changes in a testing branch but forgot to add them back here. 2022-04-16 15:57:38 -04:00
GriffinR
493210d66f
Merge pull request #1653 from SBird1337/fix/agbprint 
fix building without NDEBUG on agbcc
 2022-04-16 14:57:06 -04:00
sbird
59cff2190d fix building without NDEBUG on agbcc 2022-04-16 19:03:20 +02:00
Eduardo Quezada D'Ottone
a6175d2622 Config for Legendaries, Mythicals and Ultra Beasts to have at least 3 perfect IVs 2022-04-16 13:01:15 -04:00
Eduardo Quezada D'Ottone
84d713a50f Legendary and Mythical flags 2022-04-14 18:44:20 -04:00
ghoulslash
f0eba648c3
Merge pull request #2090 from TheXaman/rhh_master_merge 
Rhh master merge
 2022-04-14 12:51:56 -04:00
TheXaman
51ec1b5ca1 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhh_master_merge 2022-04-13 20:52:06 +02:00
TheXaman
e9ff50c898 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhh_master_merge 2022-04-13 20:51:53 +02:00
TheXaman
2fa812df26 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into rhh_master_merge 2022-04-13 20:51:35 +02:00
Eduardo Quezada D'Ottone
f8aa4d8e3a
Merge pull request #2089 from LOuroboros/pePret 
Pret merge for the pokemon_expansion
 2022-04-13 12:32:27 -04:00
Eduardo Quezada D'Ottone
bb44db79f7
Merge pull request #2087 from LOuroboros/bePret 
Pret merge for the battle_engine
 2022-04-13 12:32:16 -04:00
Eduardo Quezada D'Ottone
8a7e8e9805
Apply suggestions from code review 2022-04-12 21:13:48 -04:00
Eduardo Quezada D'Ottone
97462e7d2a
Merge pull request #2088 from LOuroboros/iePret 
Pret merge for the item_expansion
 2022-04-12 21:01:50 -04:00
LOuroboros
446bcd3181 Merge branch 'master' of https://github.com/pret/pokeemerald into pePret 2022-04-11 01:23:18 -03:00
LOuroboros
eb1834ce84 Merge branch 'master' of https://github.com/pret/pokeemerald into iePret 2022-04-11 01:22:48 -03:00
LOuroboros
b6e2945072 Merge branch 'master' of https://github.com/pret/pokeemerald into bePret 2022-04-11 01:22:10 -03:00
Eduardo Quezada D'Ottone
17f5f96f74 Added Pokémon Jump data. 2022-04-10 15:45:23 -04:00
Eduardo Quezada D'Ottone
5fc72c2bfe Heights and weights in Pokédex Orders lists 2022-04-09 22:40:36 -04:00
garakmon
3fe423a6f4 use json for region map sections 
- update nlohmann/json and pantor/inja in tools/
  - create new inja template
 2022-04-04 23:32:03 -04:00
ghoulslash
d8ab6c3b14
Merge pull request #2084 from AsparagusEduardo/BE_SkyDropBattleString 
Moved Sky Drop battle string to where other battle strings are
 2022-04-04 17:27:59 -04:00
Eduardo Quezada D'Ottone
454068095c Moved Sky Drop battle string to where other battle strings are 2022-04-04 16:59:01 -04:00
Eduardo Quezada D'Ottone
d604d99d6e Adjusted description of Glacial Lance and Astral Barrage 2022-04-03 16:54:07 -04:00
Eduardo Quezada D'Ottone
f3414e5c89
Merge pull request #2082 from LOuroboros/rhh_mastermerge 
Master merge
 2022-04-03 13:37:28 -04:00
LOuroboros
3ca9ac5b37 Post merge corrections 2022-04-03 14:27:33 -03:00