GriffinR
|
aadab8b016
|
Move pokemon and easy chat constants to global, misc clean-up
|
2021-12-28 18:07:41 -05:00 |
|
GriffinR
|
aba5264260
|
RGB macro use in slot_machine
|
2021-12-28 17:46:05 -05:00 |
|
GriffinR
|
4fc345fff5
|
Rename unused frontier pass tilemap
|
2021-12-28 14:54:09 -05:00 |
|
GriffinR
|
3acf002a9c
|
Rename generic jp contest tilemaps
|
2021-12-28 13:16:40 -05:00 |
|
GriffinR
|
ee5e65d9ed
|
Rename generic title screen tilemaps
|
2021-12-28 03:57:44 -05:00 |
|
GriffinR
|
f554f09aed
|
Merge pull request #1582 from LOuroboros/patch-2
Update main_menu.c
|
2021-12-27 16:29:08 -05:00 |
|
LOuroboros
|
599ca58059
|
Update main_menu.c
|
2021-12-25 07:04:19 -03:00 |
|
GriffinR
|
84925a892b
|
Merge pull request #1576 from Kurausukun/aif2pcm16
Accept 16-bit AIFF Files and Convert to 8-bit
|
2021-12-24 02:48:48 -05:00 |
|
GriffinR
|
94c2b7f1c6
|
Merge pull request #1581 from LOuroboros/patch-2
Fixed typo in src/battle_script_commands.c
|
2021-12-24 00:07:24 -05:00 |
|
LOuroboros
|
03205c995d
|
Update battle_script_commands.c
|
2021-12-24 01:59:40 -03:00 |
|
GriffinR
|
f663e310b1
|
Merge pull request #1580 from LOuroboros/patch-2
Removed some commented out addresses
|
2021-12-21 20:55:41 -05:00 |
|
LOuroboros
|
d94dae18f7
|
Removed more commented out addresses
I like to help.
|
2021-12-21 22:49:30 -03:00 |
|
LOuroboros
|
e28fa7f91c
|
Update event_scripts.s
|
2021-12-21 22:10:54 -03:00 |
|
ghoulslash
|
7839750d7e
|
Merge pull request #1926 from AsparagusEduardo/IE_itemDesc
Update to item descriptions based on configured effect.
|
2021-12-21 09:39:11 -05:00 |
|
Eduardo Quezada D'Ottone
|
b21dc1e562
|
Merge pull request #2003 from LOuroboros/patch-2
Fixed a typo in the items' data
|
2021-12-19 20:37:40 -03:00 |
|
LOuroboros
|
211c8c684d
|
Update items.h
|
2021-12-19 20:30:03 -03:00 |
|
Eduardo Quezada D'Ottone
|
bc43b5c650
|
Merge pull request #2000 from ultima-soul/master_sync
Master Upstream Sync
|
2021-12-18 11:00:50 -03:00 |
|
ultima-soul
|
18afd06f6d
|
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-12-18 00:28:18 -08:00 |
|
ultima-soul
|
b0b8b9bf46
|
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-12-17 23:51:29 -08:00 |
|
ultima-soul
|
4f2e3bf214
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-12-17 21:23:54 -08:00 |
|
Kurausukun
|
39f493287f
|
one more lel
|
2021-12-17 23:03:09 -05:00 |
|
Kurausukun
|
f336acb3a9
|
fix indentation again
|
2021-12-17 23:00:03 -05:00 |
|
Kurausukun
|
efee1288a0
|
fix indentation
|
2021-12-17 22:56:20 -05:00 |
|
Kurausukun
|
0f6311b470
|
accept 16-bit aiff files and convert to 8-bit
|
2021-12-17 22:49:45 -05:00 |
|
GriffinR
|
32a9ac6eb1
|
Merge pull request #1575 from LOuroboros/benriBotan
[LEAK INFORMED] Documented the unk19 item field
|
2021-12-17 22:27:45 -05:00 |
|
LOuroboros
|
4a74d288d4
|
Review corrections
|
2021-12-18 00:01:50 -03:00 |
|
LOuroboros
|
dbca24aa82
|
[LEAK INFORMED] Documented the unk19 item field
|
2021-12-17 19:41:39 -03:00 |
|
ultima-soul
|
84ce9745d5
|
Merge pull request #1990 from AsparagusEduardo/BE_debugArrows
Improved battle debug number value changing
|
2021-12-17 09:21:04 -08:00 |
|
Eduardo Quezada D'Ottone
|
837641f304
|
Update src/battle_debug.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-12-17 06:47:46 -03:00 |
|
Eduardo Quezada D'Ottone
|
8005db5040
|
Update src/battle_debug.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-12-17 06:47:35 -03:00 |
|
Eduardo Quezada D'Ottone
|
3a12cdb8cb
|
Update src/battle_debug.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-12-17 06:47:02 -03:00 |
|
ultima-soul
|
961710ddd9
|
Merge pull request #1986 from AsparagusEduardo/BE_steamEngine
Added Steam Engine's overworld effect
|
2021-12-16 16:15:58 -08:00 |
|
ultima-soul
|
5788caef39
|
Merge pull request #1996 from ghoulslash/pe/evo_weather
fix EVO_LEVEL_RAIN
|
2021-12-16 16:14:08 -08:00 |
|
Eduardo Quezada D'Ottone
|
8422ad6ccd
|
Merge pull request #1997 from ultima-soul/ie/enigma_berry_2
Add Back Enigma Berry e-Reader Constant With Less Conflicts and Update Berry Data
|
2021-12-16 21:07:21 -03:00 |
|
Eduardo Quezada D'Ottone
|
d23e7069bd
|
Merge pull request #1998 from ultima-soul/be/enigma_berry_3
Eliminate Item Expansion Conflicts for ITEM_ENIGMA_BERRY_E_READER Constant
|
2021-12-16 21:07:15 -03:00 |
|
ultima-soul
|
f0ffc749e9
|
Fix formatting for EVO_LEVEL_RAIN checks.
|
2021-12-16 16:05:51 -08:00 |
|
ultima-soul
|
356cf96654
|
Match berry data to new berry order, correct Gen 4+ berry data, and add back Enigma Berry e-Reader data entries.
|
2021-12-15 19:33:35 -08:00 |
|
GriffinR
|
6e5520207f
|
Merge pull request #1573 from GriffinRichards/tilesetanim
Clean up tileset_anims
|
2021-12-15 09:47:54 -05:00 |
|
GriffinR
|
961dbee5e3
|
Clean up tileset_anims
|
2021-12-14 21:41:07 -05:00 |
|
ghoulslash
|
bb9fb72436
|
fix evo_level_rain
|
2021-12-14 13:56:25 -05:00 |
|
GriffinR
|
df371fdda5
|
Merge pull request #1572 from LOuroboros/patch-2
Update trade.c
|
2021-12-14 12:54:09 -05:00 |
|
LOuroboros
|
660a3df929
|
Update trade.c
|
2021-12-14 14:47:04 -03:00 |
|
ultima-soul
|
a2ad860ae4
|
Merge branch 'pret/enigma_berry_2' into be/enigma_berry_3
|
2021-12-11 19:11:13 -08:00 |
|
ultima-soul
|
00b536f9ca
|
Merge branch 'pret/enigma_berry_2' into ie/enigma_berry_2
|
2021-12-11 18:54:18 -08:00 |
|
ultima-soul
|
f4af5ea206
|
Merge conflict resolution trick.
|
2021-12-11 18:52:39 -08:00 |
|
Eduardo Quezada D'Ottone
|
6f363b219e
|
Improved battle debug value change
|
2021-12-11 16:41:04 -03:00 |
|
ultima-soul
|
26f29a04fd
|
Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync"
This reverts commit ac2bcece75, reversing
changes made to 349262ebc3.
|
2021-12-10 09:41:54 -08:00 |
|
Eduardo Quezada D'Ottone
|
3c9074a867
|
Merge pull request #1931 from ultima-soul/item_expansion_sync
Item Expansion Upstream Sync
|
2021-12-09 20:02:56 -03:00 |
|
Eduardo Quezada D'Ottone
|
e4315c89e9
|
Merge pull request #1930 from ultima-soul/pokemon_expansion_sync
Pokemon Expansion Upstream Sync
|
2021-12-09 20:02:52 -03:00 |
|
Eduardo Quezada D'Ottone
|
aa2b2e6a70
|
Merge pull request #1929 from ultima-soul/battle_engine_sync
Battle Engine Upstream Sync
|
2021-12-09 20:02:45 -03:00 |
|