ghoulslash
|
720b919994
|
Merge pull request #2135 from LOuroboros/iePretMerge
Pret merge for the item_expansion
|
2022-07-01 09:23:41 -04:00 |
|
BuffelSaft
|
b5e75a536b
|
Merge pull request #2157 from Sneed69/berry-trees-fix
Add missing berry tree spritesheet rules
|
2022-06-04 14:51:12 +12:00 |
|
sneed
|
bcf9ed3fb8
|
Update spritesheet_rules.mk
|
2022-05-30 03:11:56 +03:00 |
|
LOuroboros
|
1d75f3ffde
|
Moved order of defined header files in include/global.h
|
2022-05-13 10:51:49 -03:00 |
|
LOuroboros
|
12d956872b
|
Merge branch 'master' of https://github.com/pret/pokeemerald into iePretMerge
|
2022-05-13 03:18:37 -03:00 |
|
GriffinR
|
ed1cc203c6
|
Merge pull request #1654 from Kurausukun/better_dinfo
Don't Build Modern with -g by Default
|
2022-05-12 22:41:15 -04:00 |
|
Kurausukun
|
7d224197c0
|
Update INSTALL.md
|
2022-05-12 22:33:17 -04:00 |
|
Kurausukun
|
1c13335d16
|
Update INSTALL.md
|
2022-05-12 22:05:44 -04:00 |
|
GriffinR
|
1842af7570
|
Merge pull request #1655 from GriffinRichards/fix-berry-id
Fix math in CreateBerrySprite
|
2022-05-12 18:04:30 -04:00 |
|
Eduardo Quezada D'Ottone
|
a896f9aed7
|
Merge pull request #2133 from Sneed69/cobaberry
Coba berry fix
|
2022-05-12 13:39:50 -04:00 |
|
sneed
|
0c0bea33c7
|
Update items.h
|
2022-05-12 18:39:10 +03:00 |
|
Eduardo Quezada D'Ottone
|
7b53a4646c
|
Merge pull request #2122 from Sneed69/confuseberry_item
Update Confuse Berry Hold Effect (Item Expansion)
|
2022-05-08 09:02:36 -04:00 |
|
sneed
|
eebfed20ad
|
#elif
|
2022-05-08 09:58:06 +03:00 |
|
sneed
|
d8256663e3
|
fix syntax
|
2022-05-07 22:12:10 +03:00 |
|
sneed
|
5592fa434a
|
catch < gen7 with engine
|
2022-05-07 22:01:35 +03:00 |
|
sneed
|
7008c01f25
|
Update items.h
|
2022-05-07 21:41:21 +03:00 |
|
ghoulslash
|
5dae95d8f8
|
Merge pull request #2096 from rh-hideout/revert-2095-CanMonLearnTMTutor
Revert "Removed ternary from CanMonLearnTMTutor"
|
2022-05-07 11:31:48 -04:00 |
|
ghoulslash
|
b876e24a34
|
Merge pull request #2108 from AsparagusEduardo/IE_AbilityPatch
Ability Patch
|
2022-05-07 08:17:02 -04:00 |
|
Eduardo Quezada D'Ottone
|
49905cee04
|
Ability Patch
|
2022-05-03 14:14:04 -04:00 |
|
GriffinR
|
2b223acd87
|
Fix math in CreateBerrySprite
|
2022-04-26 21:44:11 -04: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 |
|
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
|
97462e7d2a
|
Merge pull request #2088 from LOuroboros/iePret
Pret merge for the item_expansion
|
2022-04-12 21:01:50 -04:00 |
|
LOuroboros
|
eb1834ce84
|
Merge branch 'master' of https://github.com/pret/pokeemerald into iePret
|
2022-04-11 01:22:48 -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 |
|
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 |
|
Andrea Jemmett
|
f8b3a1c658
|
Fix finding libpng in gbagfx and rsfont
On macOS 12, Homebrew installs libpng in a custom location.
|
2022-03-16 14:41:12 +01: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 |
|
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 |
|
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 |
|
GriffinR
|
b1d61b9227
|
Merge pull request #1641 from GriffinRichards/subsprite-arr-count
Use ARRAY_COUNT for obj event subsprite tables
|
2022-03-03 23:08:52 -05:00 |
|
GriffinR
|
f78f46a1e2
|
Use ARRAY_COUNT for obj event subsprite tables
|
2022-03-03 14:54:05 -05:00 |
|
GriffinR
|
8bf7e7b6f5
|
Improve egg hatch documentation
|
2022-03-03 01:33:49 -05:00 |
|
ultima-soul
|
2d3ba500c9
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2022-03-01 15:10:19 -08:00 |
|