ghoulslash
|
18f5c7c914
|
Merge pull request #2171 from LOuroboros/patch-1
Update README.md
|
2022-07-01 08:43:34 -04:00 |
|
LOuroboros
|
7200992ef8
|
Update README.md
|
2022-06-20 14:35:31 -03: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 |
|
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
|
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 |
|
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
|
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
|
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 |
|
LOuroboros
|
434f6cf5ad
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
|
2022-03-26 08:43:55 -03:00 |
|
BuffelSaft
|
4b769901bc
|
Merge pull request #2059 from AsparagusEduardo/BE_SandForce
Remove repeated ability check in battle_ai_util.c
|
2022-03-26 15:40:47 +13:00 |
|
Eduardo Quezada D'Ottone
|
c4dea447ee
|
Merge pull request #2080 from LOuroboros/patch-3
Update battle_scripts_1.s
|
2022-03-20 19:22:50 -03:00 |
|
LOuroboros
|
387bf07e3c
|
Update battle_scripts_1.s
|
2022-03-20 19:00:21 -03:00 |
|
Eduardo Quezada D'Ottone
|
c4e5d93dc5
|
Merge pull request #2078 from LOuroboros/patch-3
BattleScript_EffectFlinchWithStatus -> BattleScript_EffectFlinchStatus
|
2022-03-20 18:57:35 -03:00 |
|
Eduardo Quezada D'Ottone
|
f371288bc2
|
Merge pull request #2079 from LOuroboros/patch-4
Fix Enigma Berry check in CanMegaEvolve
|
2022-03-20 18:57:09 -03:00 |
|
LOuroboros
|
0a65fd316c
|
Fixed Enigma Berry check in CanMegaEvolve
|
2022-03-20 12:21:15 -03:00 |
|
GriffinR
|
5160520639
|
Merge pull request #1642 from GriffinRichards/bstrings
Add usage of battle strings table offset constant
|
2022-03-14 16:40:54 -04:00 |
|
GriffinR
|
33c05cefe2
|
Merge pull request #1644 from GriffinRichards/name-jump-long-grass
Name unknown_16.png
|
2022-03-14 16:32:08 -04:00 |
|
GriffinR
|
058783c148
|
Fix comment mistake
|
2022-03-14 16:01:17 -04:00 |
|
GriffinR
|
0a0157b62c
|
Name unknown_16.png
|
2022-03-14 15:54:47 -04:00 |
|
LOuroboros
|
aca51e843e
|
Update battle_scripts_1.s
|
2022-03-14 16:14:32 -03:00 |
|
Eduardo Quezada D'Ottone
|
48ce04279b
|
Merge pull request #2075 from ultima-soul/item_expansion_sync
Item Expansion Upstream Sync
|
2022-03-13 18:15:54 -03:00 |
|
Eduardo Quezada D'Ottone
|
c00873cbc4
|
Merge pull request #2073 from ultima-soul/battle_engine_sync
Battle Engine Upstream Sync
|
2022-03-13 18:15:45 -03:00 |
|
Eduardo Quezada D'Ottone
|
ff4c391e47
|
Merge pull request #2074 from ultima-soul/pokemon_expansion_sync
Pokemon Expansion Upstream Sync
|
2022-03-13 18:15:35 -03:00 |
|
Eduardo Quezada D'Ottone
|
ff9556cb44
|
Update include/constants/pokedex.h
|
2022-03-13 11:25:44 -03:00 |
|
Eduardo Quezada D'Ottone
|
8f34249ab2
|
Update include/constants/pokedex.h
|
2022-03-13 11:25:37 -03:00 |
|
GriffinR
|
ce227aa055
|
Merge pull request #1640 from GriffinRichards/doc-egg-hatch
Improve egg hatch documentation
|
2022-03-12 09:41:14 -05:00 |
|
GriffinR
|
bb91b1b0d1
|
Update generic macro argument names
|
2022-03-10 16:36:41 -05:00 |
|
GriffinR
|
d664135572
|
Add usage of battle strings table offset constant
|
2022-03-10 10:44:04 -05:00 |
|
ghoulslash
|
daf5095c27
|
Merge pull request #2077 from SubzeroEclipse/BE_DescriptionFixes
Fixed some move descriptions
|
2022-03-09 21:30:49 -05:00 |
|
SubzeroEclipse
|
d3589103b3
|
Fixed some move descriptions
|
2022-03-09 15:23:08 +01:00 |
|
Eduardo Quezada D'Ottone
|
20da792f90
|
Merge pull request #2076 from ghoulslash/be/orbfix
fix toxic/flame orb. use CanBeX'ed functions
|
2022-03-08 17:25:01 -03:00 |
|
ghoulslash
|
f53de6ae87
|
fix toxic/flame orb. use CanBeX'ed functions
|
2022-03-08 15:16:17 -05:00 |
|