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 |
|
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
|
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
|
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 |
|
ultima-soul
|
2d3ba500c9
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2022-03-01 15:10:19 -08:00 |
|
ultima-soul
|
84a7f960c8
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2022-02-28 23:37:41 -08:00 |
|
GriffinR
|
2142ad96d5
|
Merge pull request #1638 from GriffinRichards/menu-arr-count
Add missing menu array counts
|
2022-02-28 01:49:09 -05:00 |
|
GriffinR
|
3d0663fe81
|
Additional trader clean up
|
2022-02-27 13:58:48 -05:00 |
|
GriffinR
|
36e5d5e759
|
Add missing menu array counts
|
2022-02-27 13:47:50 -05:00 |
|
GriffinR
|
6262080e9c
|
Merge pull request #1614 from laqieer/patch-1
Install libpng using pacman instead of manual build for msys2
|
2022-02-23 08:07:23 -05:00 |
|
GriffinR
|
f7ba502c52
|
Merge pull request #1637 from cbt6/pc-location
Use constants for PC locations
|
2022-02-23 08:04:16 -05:00 |
|
cbt6
|
f826a5a82d
|
Use constants for PC locations
|
2022-02-23 15:07:22 +08:00 |
|
GriffinR
|
3765c1e7f1
|
Merge pull request #1635 from sphericalice/battle-pyramind
Rename GetBattlePyramindTrainerEncounterMusicId to fix typo
|
2022-02-22 14:22:35 -05:00 |
|
sphericalice
|
40efac0ddf
|
Rename GetBattlePyramindTrainerEncounterMusicId to fix typo
|
2022-02-22 19:13:17 +00:00 |
|
GriffinR
|
eca5233abe
|
Merge pull request #1633 from abaresk/slot-cleanup
Clean up and document Slot Machines more
|
2022-02-20 17:59:14 -05:00 |
|
hondew
|
08bf2587ce
|
Fix typos
|
2022-02-20 17:47:24 -05:00 |
|
hondew
|
39fc1cd414
|
Switch to 'symbol' nomenclature
|
2022-02-20 17:02:37 -05:00 |
|
hondew
|
26e87eed0a
|
Address comments
|
2022-02-20 15:32:32 -05:00 |
|
hondew
|
a578fa5e2b
|
Minor fixes
|
2022-02-20 12:06:29 -05:00 |
|
hondew
|
50cb504d4c
|
Remove stuff
|
2022-02-20 10:15:07 -05:00 |
|
Abaresk
|
c39b0ff6d7
|
Document slot machine more (unabridged)
|
2022-02-20 10:09:49 -05:00 |
|
Eduardo Quezada D'Ottone
|
7e7060b299
|
Merge pull request #2050 from SubzeroEclipse/IE_decaps
Decapitalization of berries 'names
|
2022-02-19 18:01:44 -03:00 |
|
SubzeroEclipse
|
58c4829a3c
|
Missed a few ones
|
2022-02-18 22:25:35 +01:00 |
|
Eduardo Quezada D'Ottone
|
66b4df0362
|
Merge pull request #2062 from Jaizu/patch-23
Use TM constant in CanMonLearnTMTutor
|
2022-02-18 16:32:57 -03:00 |
|
Eduardo Quezada D'Ottone
|
466cd9f69b
|
Merge pull request #2061 from Jaizu/patch-22
Fix MIME_JR #ifdef
|
2022-02-18 16:29:37 -03:00 |
|
Jaizu
|
9b437a99b3
|
Use TM constant in CanMonLearnTMTutor
|
2022-02-18 16:03:57 +01:00 |
|
Jaizu
|
4538990d47
|
Fix MIME_JR #ifdef
|
2022-02-18 15:40:54 +01:00 |
|
GriffinR
|
8c64ba335c
|
Merge pull request #1630 from GriffinRichards/party-menu-slots
Convert party menu slots to bin files
|
2022-02-16 13:00:13 -05:00 |
|
GriffinR
|
3b75cd13d0
|
Merge pull request #1631 from GriffinRichards/missing-colors
Add some missing RGB constant usage
|
2022-02-16 09:24:16 -05:00 |
|
GriffinR
|
0710a5467b
|
Add some missing RGB constant usage
|
2022-02-15 21:55:51 -05:00 |
|
GriffinR
|
131ed1916e
|
Generalize name of party slot without HP
|
2022-02-15 16:24:19 -05:00 |
|
GriffinR
|
49eca60955
|
Convert party menu slots to bin files
|
2022-02-15 16:12:54 -05:00 |
|
GriffinR
|
2fcd57eab2
|
Merge pull request #1629 from GriffinRichards/connection-dir
Add missing direction constant usage
|
2022-02-14 23:50:06 -05:00 |
|
GriffinR
|
7ddb9cb84c
|
Add missing direction constant usage
|
2022-02-14 17:34:01 -05:00 |
|
SubzeroEclipse
|
c9004c6cc4
|
Decapped Gen 3 Berries (names and descriptions)
|
2022-02-14 14:49:13 +01:00 |
|
BuffelSaft
|
74766c9a6e
|
Merge pull request #2056 from AsparagusEduardo/PE_DexGenderFix
Fixed Pokédex entry upon catch not properly handling gender differences
|
2022-02-13 20:57:04 +13:00 |
|
Eduardo Quezada D'Ottone
|
e7df0acafb
|
Fixed Pokédex entry upon catch not properly handling gender differences
|
2022-02-13 01:56:40 -03:00 |
|
GriffinR
|
eb07617a20
|
Merge pull request #1623 from kiliwily/master
Update money.c
|
2022-02-09 08:34:10 -05:00 |
|
kiliwily
|
a86a279184
|
Update money.c
|
2022-02-06 16:25:56 +01:00 |
|
SubzeroEclipse
|
888ab0b96e
|
Decapped berries' names
|
2022-02-03 13:56:19 +01:00 |
|
GriffinR
|
7d2344c07b
|
Merge pull request #1616 from GriffinRichards/missing-req
Add missing :req, remove old macros
|
2022-02-02 22:09:36 -05:00 |
|
GriffinR
|
f494238a9d
|
Merge pull request #1621 from GriffinRichards/constants-collision
Add missing collision constant usage
|
2022-01-30 23:00:05 -05:00 |
|
GriffinR
|
1ff0b0efa9
|
Add missing collision constant usage
|
2022-01-29 21:13:46 -05:00 |
|
GriffinR
|
e30b16f0fd
|
Fix Swap_HandleQuitSwappingResposne typo
|
2022-01-26 21:50:15 -05:00 |
|
GriffinR
|
2efbd5f549
|
Merge pull request #1608 from GriffinRichards/fix-fieldmap
Fix some incorrect fieldmap names
|
2022-01-26 17:51:56 -05:00 |
|