10206 Commits

Author SHA1 Message Date
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
ghoulslash
2736223b1b
Merge pull request #1698 from AsparagusEduardo/PE_FormChangeHoldItems
Form changing by holding items
2021-12-21 09:10:23 -05:00
ghoulslash
b4cc5e3cd8
Merge pull request #1952 from AsparagusEduardo/PE_natureEvo
Added Nature evolution methods
2021-12-20 14:08:47 -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
7e3282fba5
Merge pull request #1972 from LOuroboros/spaces
Removed weird spaces in 7 dex descriptions
2021-12-19 20:14:05 -03:00
Eduardo Quezada D'Ottone
793de70068 Fixed reference to PlayCry2 2021-12-19 13:09:01 -03:00
Eduardo Quezada D'Ottone
8b49f8f925
Merge branch 'pokemon_expansion' into PE_FormChangeHoldItems 2021-12-19 12:08:52 -03:00
LOuroboros
a21d2ca98f Fixed syntax in footprint_table.h 2021-12-18 18:35:18 -03:00
LOuroboros
614c0ee8d7 Added Gen. 8 footprint sprites 2021-12-18 18:24:49 -03:00
LOuroboros
834ab37b2c Added Gen. 7 footprint sprites 2021-12-18 17:48:45 -03:00
Eduardo Quezada D'Ottone
39ef356be1
Merge pull request #1935 from LOuroboros/someGenderDiffs
Added gender differences for a couple of Gen. 4 Pokémon
2021-12-18 13:46:23 -03:00
Eduardo Quezada D'Ottone
c3939cd32b
Merge pull request #1978 from LOuroboros/pikaPal
Fixed the palette of Pikachu Partner Cap's back
2021-12-18 13:28:23 -03:00
Eduardo Quezada D'Ottone
9adbf3350e
Merge pull request #1965 from TheXaman/pokemon_expansion_debug
Pokemon expansion debug
2021-12-18 13:08:37 -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
TheXaman
cbd6553c43 changed L/R Button position to account for numbered animations 2021-12-14 10:15:13 +01:00
TheXaman
7a669565cc fixed the back button, didnt work as intended 2021-12-14 10:04:57 +01:00
TheXaman
9ce83b559e if elevation is changed to != 0 the shadow is shown 2021-12-14 10:01:04 +01:00
TheXaman
c4fea6a189 fixed Groudon terrain (dont forget your breaks...) 2021-12-14 09:46:26 +01:00
TheXaman
e23d49d802
Merge pull request #10 from AsparagusEduardo/PR_PEDebug
Fixed form wrapping to the left in PE debug
2021-12-14 09:44:26 +01:00
Eduardo Quezada D'Ottone
7738d67314 Slight documentation 2021-12-13 23:52:16 -03:00
Eduardo Quezada D'Ottone
037370fe19 Showing animation number 2021-12-13 23:33:25 -03:00
Eduardo Quezada D'Ottone
5d7ac2171f Animations reload when switching Forms 2021-12-13 22:57:39 -03:00