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

11596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Eduardo Quezada D'Ottone
dafb5ca74d Fixed trapping moves not reflecting the configured turn config 2022-04-03 13:03:53 -04:00
LOuroboros
f82c946ff3 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge 2022-04-03 13:26:27 -03:00
LOuroboros
af2f70e000 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge 2022-04-03 13:21:40 -03:00
GriffinR
8103caea15
Merge pull request #1650 from ISSOtm/patch-1 
Add Arch Linux install instructions
 2022-04-03 10:59:25 -04:00
Eldred Habert
e1f89c70d9 Add Arch Linux install instructions 
I didn't test the devkitARM install instructions, but they are pretty much transcribed from the Ubuntu/Deb ones, so that should be fine.
 2022-04-03 11:37:22 +02:00
LOuroboros
fa39dc76dc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
Eduardo Quezada D'Ottone
8262e967a3
Merge pull request #1906 from LOuroboros/flingBE 
Implemented Fling (1/2)
 2022-04-02 16:22:58 -03:00
GriffinR
00e0eefe09 Document trainer hill prize selection 2022-04-01 01:37:48 -04:00
GriffinR
44b44d3e77
Merge pull request #1648 from GriffinRichards/factory-bugfix 
Add bugfix for Battle Factory trainer IVs
 2022-03-31 22:26:03 -04:00
GriffinR
328b925a08 Move trainer hill map data to bin files 2022-03-31 14:08:31 -04:00
GriffinR
62f3f144ab Clean up some trainer hill 2022-03-31 12:54:07 -04:00
GriffinR
66cbe29c14 Add bugfix for Battle Factory trainer IVs 2022-03-30 09:37:03 -04:00
LOuroboros
a127cb32bb Removed pointless use of preproc directives 2022-03-30 02:05:54 -03:00