ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 12:07:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,118 Commits 1 Branch 0 Tags 235 MiB
4538990d47
Commit Graph

7118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaizu
4538990d47
Fix MIME_JR #ifdef 2022-02-18 15:40:54 +01:00
Eduardo Quezada D'Ottone
b38011eb3f
Merge pull request #1907 from LOuroboros/flingIE 
Implemented Fling (2/2)
 2022-01-22 12:37:51 -03:00
LOuroboros
52e3cf4f59 Added missing flingPower values 2022-01-22 05:40:29 -03:00
LOuroboros
367ba2d5bf Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into flingIE 2022-01-22 05:39:48 -03:00
ghoulslash
da6543f8fd
Merge pull request #2014 from AsparagusEduardo/IE_noJadeOrb 
Removed Jade Orb and Key Stone items
 2022-01-20 19:43:57 -05:00
Eduardo Quezada D'Ottone
02da6cc627 Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb 
# Conflicts:
#	include/graphics.h
#	src/data/graphics/items.h
#	src/data/item_icon_table.h
#	src/data/items.h
#	src/data/text/item_descriptions.h
 2022-01-16 18:44:03 -03:00
Eduardo Quezada D'Ottone
0eb1c2c858
Merge pull request #2032 from LOuroboros/patch-3 
Tweaked CanMonLearnTMTutor
 2022-01-09 18:16:06 -03:00
LOuroboros
1980320aa4 Tweaked CanMonLearnTMTutor 2022-01-09 15:30:31 -03:00
Eduardo Quezada D'Ottone
1374662998
Merge pull request #2030 from LOuroboros/patch-2 
Update NUM_TECHNICAL_MACHINES
 2022-01-08 21:42:54 -03:00
LOuroboros
5281fe63fc
Update NUM_TECHNICAL_MACHINES 2022-01-08 21:27:29 -03:00
Eduardo Quezada D'Ottone
4f9e6faa48
Merge branch 'item_expansion' into flingIE 2022-01-02 18:31:03 -03:00
Eduardo Quezada D'Ottone
797f41920c
Merge pull request #2013 from LOuroboros/items 
Filled in missing item data
 2022-01-01 19:45:00 -03:00
LOuroboros
b88d9c4cdc Updated gItemEffectTable 
-Rearranged the entries therein, keeping them consistent with the item ID order.
-Removed pointless duplicates of certain effects such as the Full Heal's.
-Added entries for the items that needed one.
-gItemEffect_EvoStone -> gItemEffect_EvoItem.
 2022-01-01 19:02:40 -03:00
LOuroboros
5cdfe0a9fb Fixed the Lures and adjusted 2 charms' descriptions 2022-01-01 18:03:00 -03:00
LOuroboros
74aa4f29df Corrections and additions 
-Fixed a handful of prices
-Re-added the Todo comment to the entries of the TMs 51-100 in gItemIconTable.
-Added the data and sprites of the LGPE Lures, thanks to AsparagusEduardo.
-Fixed small syntax mistakes in src/data/text/item_descriptions.h
-Slightly changed some item descriptions based on AsparagusEduardo's suggestions.
-Fixed the Exp. Charm's description, and the usage of "Exp." in the Exp. Candies' descriptions.
 2022-01-01 17:17:21 -03:00
Eduardo Quezada D'Ottone
b25c89f8a1 Removed Redundant Key Stone item 2021-12-31 18:22:23 -03:00
LOuroboros
9b1fd796ae Gave the Gracidea's old hold effect slot to the Enigma Berry 2021-12-31 18:07:33 -03:00
Eduardo Quezada D'Ottone
313df31e7e Removed Jade Orb, since it has no use besides being a key-lock item. 2021-12-31 17:44:03 -03:00
LOuroboros
0c5652596b Removed HOLD_EFFECT_GRACIDEA 2021-12-31 17:34:16 -03:00
LOuroboros
e961bdee14 Fixes 
-Used Buffel Saft's sprite for the Ability Patch.
-Fixed the Mints' descriptions.
-Fixed the Damp Mulch's palette.
-Decapped the Pokémon Box Link's name.
-Fixed the target pocket of the Key Stone and the Dynamax Band.
 2021-12-31 17:10:02 -03:00
LOuroboros
c70e73713f Added the missing items' sprites 2021-12-31 16:28:05 -03:00
LOuroboros
5a8e51d858 Filled in missing items' sprite data 2021-12-31 16:27:06 -03:00
LOuroboros
d4dc672088 Filled in missing item data 2021-12-31 13:23:06 -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
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
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
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
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
ultima-soul
ac2bcece75 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync 2021-12-09 14:16:05 -08:00
ultima-soul
349262ebc3 Merge remote-tracking branch 'rhh/item_expansion' into item_expansion_sync 2021-12-03 17:31:02 -08:00
Eduardo Quezada D'Ottone
37d784af31
Merge pull request #1964 from LOuroboros/enigma 
Renamed the Enigma Berries' constants
 2021-12-02 21:48:37 -03:00
ultima-soul
d408b56549 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-12-01 20:18:57 -08:00
LOuroboros
2e67153982 Renamed the Enigma Berries' constants 2021-12-01 22:16:38 -03:00
GriffinR
83be1bfc8f Remove sFiller from malloc.c 2021-11-29 11:19:30 -05:00
ultima-soul
d0623d7b71 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-11-27 21:40:08 -08:00
GriffinR
4c64863bc5
Merge pull request #1567 from LOuroboros/sBattleTerrainTable 
Renamed gBattleTerrainTable
 2021-11-27 23:43:22 -05:00
GriffinR
01859a63ff
Merge pull request #1566 from cbt6/move-speed 
Rename speed parameter to distance in jump functions
 2021-11-27 23:37:50 -05:00
LOuroboros
b042eb6436 gBattleTerrainTable -> sBattleTerrainTable 2021-11-28 01:22:27 -03:00
cbt6
c59c7b0518 Use enums for jump distances 2021-11-28 12:01:29 +08:00
cbt6
b6430098d4 Rename speed parameter to distance in jump functions 2021-11-28 12:01:29 +08:00
GriffinR
e677a00676
Merge pull request #1560 from GriffinRichards/retire-ok 
Retire OK bot
 2021-11-27 21:27:14 -05:00
GriffinR
e0fae879da
Merge pull request #1558 from GriffinRichards/update-macros 
Update event macro comments
 2021-11-22 19:10:49 -05:00
ultima-soul
a8f9a54787 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-11-21 10:41:32 -08:00
GriffinR
f81565163e Retire OK bot 2021-11-21 11:48:50 -05:00
GriffinR
5cb875b6cb
Merge pull request #1559 from GriffinRichards/remove-flower 
Fix incorrect flower animation palettes
 2021-11-21 11:29:11 -05:00
GriffinR
23dd1dad7f Fix incorrect palettes in Mauville flower tileset anims 2021-11-21 11:23:03 -05:00