ExpoSeed
|
a9e9837b25
|
Merge pull request #1596 from ultima-soul/master_sync
Master Upstream Sync
|
2021-08-17 16:46:02 -05:00 |
|
ultima-soul
|
43e8f76338
|
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-08-17 11:55:48 -07:00 |
|
ultima-soul
|
4c3ed52c2f
|
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-08-17 11:39:11 -07:00 |
|
ultima-soul
|
988320b89a
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-08-17 11:25:13 -07:00 |
|
ExpoSeed
|
5493333ff5
|
Merge pull request #1594 from ultima-soul/pokemon_expansion_sync
Pokemon Expansion Upstream Sync
|
2021-08-16 19:47:41 -05:00 |
|
ExpoSeed
|
29b6276e64
|
Merge pull request #1595 from ultima-soul/item_expansion_sync
Item Expansion Upstream Sync
|
2021-08-16 19:47:39 -05:00 |
|
ExpoSeed
|
38120afbac
|
Merge pull request #1593 from ultima-soul/battle_engine_sync
Battle Engine Upstream Sync
|
2021-08-16 19:47:35 -05:00 |
|
ultima-soul
|
840e2bc3f9
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2021-08-16 16:33:34 -07:00 |
|
ultima-soul
|
76a7a2720d
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-08-16 16:10:59 -07:00 |
|
ultima-soul
|
b620349da0
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-08-16 15:43:27 -07:00 |
|
GriffinR
|
ee5eee6ccc
|
Merge pull request #1493 from GriffinRichards/doc-itemmenu2
Document item menu
|
2021-08-15 12:01:57 -04:00 |
|
ultima-soul
|
64a48800c9
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2021-08-11 17:10:57 -07:00 |
|
PikalaxALT
|
c7fc6ac893
|
Merge pull request #1492 from Kurausukun/cgbsound
Fix CgbSound Fakematches (Thanks to Revo)
|
2021-08-11 19:55:44 -04:00 |
|
ultima-soul
|
3f75a58137
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-08-11 16:55:29 -07:00 |
|
ultima-soul
|
02c9e040df
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-08-11 16:33:10 -07:00 |
|
GriffinR
|
034b7f0513
|
Fix conflicting PC window names
|
2021-08-11 19:14:50 -04:00 |
|
GriffinR
|
80348e7188
|
Merge branch 'master' into doc-itemmenu2
|
2021-08-11 19:01:47 -04:00 |
|
GriffinR
|
cc51627465
|
Merge pull request #1489 from GriffinRichards/doc-playerpc
Document player pc
|
2021-08-11 18:59:58 -04:00 |
|
GriffinR
|
0bc26d9d79
|
Merge pull request #1488 from GriffinRichards/doc-frontierpass2
Document frontier pass
|
2021-08-11 17:40:55 -04:00 |
|
GriffinR
|
3a14f4472d
|
Merge pull request #1495 from GriffinRichards/fix-symbols
Fix symbols branch commit message, limit to upstream
|
2021-08-11 17:35:31 -04:00 |
|
GriffinR
|
1860b7682f
|
Allow symbols branch on forks
|
2021-08-11 17:19:21 -04:00 |
|
GriffinR
|
5098fbf7bb
|
Fix symbols branch commit message, limit to upstream
|
2021-08-11 17:09:03 -04:00 |
|
GriffinR
|
2fb7440315
|
Merge pull request #1494 from GriffinRichards/tag-regionmap
Use tag constants in region_map.c
|
2021-08-11 12:24:36 -04:00 |
|
GriffinR
|
d951d7c363
|
Use tag constants in region_map.c
|
2021-08-11 09:31:20 -04:00 |
|
GriffinR
|
28a8fe191a
|
Document item menu
|
2021-08-10 22:13:02 -04:00 |
|
Kurausukun
|
2e892c6961
|
unsigned int -> u32
|
2021-08-08 22:22:50 -04:00 |
|
Kurausukun
|
ddb3911d0d
|
oops
|
2021-08-08 20:49:29 -04:00 |
|
Kurausukun
|
0bceaab046
|
rename variable
|
2021-08-08 20:34:16 -04:00 |
|
Kurausukun
|
b51d025f1c
|
port cgb fakematching fixes (thanks to revo)
|
2021-08-08 20:33:21 -04:00 |
|
GriffinR
|
0e33df21b9
|
Merge pull request #1491 from LOuroboros/inconsFlag
Corrected inconsistent flag label spelling
|
2021-08-05 16:41:10 -04:00 |
|
LOuroboros
|
b4c4650186
|
Corrected inconsistent flag label spelling
|
2021-08-05 17:26:03 -03:00 |
|
GriffinR
|
3714963f0d
|
Merge pull request #1490 from GriffinRichards/align-marts
Add align directives to all marts
|
2021-08-05 14:35:45 -04:00 |
|
GriffinR
|
44cd9eed6b
|
Add align directives to all marts
|
2021-08-04 11:50:33 -04:00 |
|
GriffinR
|
bd5cf07059
|
Merge branch 'master' into doc-playerpc
|
2021-08-02 14:08:10 -04:00 |
|
GriffinR
|
06b909bcd8
|
Document player pc
|
2021-08-02 13:58:40 -04:00 |
|
GriffinR
|
3e60a78406
|
Merge branch 'master' into doc-frontierpass2
|
2021-07-31 13:30:40 -04:00 |
|
GriffinR
|
602855ea99
|
Document frontier pass
|
2021-07-31 13:28:08 -04:00 |
|
GriffinR
|
d391486247
|
Merge pull request #1484 from GriffinRichards/remove-addrcomments
Remove address comments
|
2021-07-27 18:08:10 -04:00 |
|
GriffinR
|
459b20d762
|
Merge pull request #1479 from PikalaxALT/flatten_sprite_pos
Flatten pos fields in struct Sprite
|
2021-07-27 18:02:00 -04:00 |
|
GriffinR
|
80c77fc120
|
Merge pull request #1487 from LOuroboros/hidden_item_flags
Re-ordered the hidden item flags list
|
2021-07-27 10:36:20 -04:00 |
|
LOuroboros
|
8012f4b25a
|
Re-ordered the hidden item flags list
Instead of sorting them by location, it makes more sense to sort them by their value.
|
2021-07-26 20:18:11 -03:00 |
|
GriffinR
|
b5bc762dc7
|
Merge pull request #1486 from sphericalice/pss-constant-fix
Use the correct constant for PSS page comparison
|
2021-07-25 12:49:35 -04:00 |
|
sphericalice
|
71de6ea939
|
Use the correct constant for PSS page comparison
|
2021-07-24 18:54:37 +01:00 |
|
ghoulslash
|
e6a2d2226f
|
Merge pull request #1540 from DizzyEggg/rage_powder
Rage powder updated to gen6
|
2021-07-24 07:15:58 -06:00 |
|
ghoulslash
|
72d346fa46
|
Merge pull request #1560 from rh-hideout/DizzyEggg-patch-3
Fix White Smoke affecting Shell Smash's def drop
|
2021-07-24 07:14:08 -06:00 |
|
ghoulslash
|
fd69375489
|
Merge pull request #1575 from Blackforest92/pokemon_expansion
Fix Arctozolt, Heliolisk, and Chespin
|
2021-07-24 07:13:16 -06:00 |
|
Blackforest92
|
365b578a66
|
Fix Arctozolt, Heliolisk, and Chespin
|
2021-07-24 13:46:02 +07:00 |
|
GriffinR
|
0e22b21b14
|
Merge pull request #1485 from LOuroboros/patch-3
Removed unused status ailment constants
|
2021-07-23 13:15:46 -04:00 |
|
LOuroboros
|
bfa824f761
|
Removed unused status ailment constants
|
2021-07-23 13:18:24 -03:00 |
|
GriffinR
|
e67729f647
|
Remove address comments in sound directory
|
2021-07-21 00:56:04 -04:00 |
|