ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,097 Commits 1 Branch 0 Tags 235 MiB
e961bdee14
Commit Graph

7097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eduardo Quezada D'Ottone
5500954129 Update to item descriptions based on configured effect. 2021-11-21 00:08:46 -03:00
Eduardo Quezada D'Ottone
31d7719429
Merge pull request #1913 from LOuroboros/healingItems 
Changed I_LEGACY_HEALING_ITEMS
 2021-11-20 23:37:24 -03:00
ghoulslash
cb0266fb86
Merge pull request #1920 from LOuroboros/vitamins 
Fixed an incorrect #elif
 2021-11-19 16:57:19 -05:00
LOuroboros
ad8582064b #elif without condition bad, #else good 2021-11-19 18:49:30 -03:00
GriffinR
42a83ee50e Use STR_VAR names for apprentice_buff and frontier_gettrainername 2021-11-18 23:20:05 -05:00
GriffinR
e66ea0cb99 Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
GriffinR
c57efdba5d Allow compare + goto_if/call_if as a single statement 2021-11-18 22:06:53 -05:00
GriffinR
6c6487dd7a Missing spaces to tabs in scripts files 2021-11-18 21:02:22 -05:00
GriffinR
591ab7241f Macro comment typo fix, Object->object 2021-11-18 17:24:43 -05:00
GriffinR
c89dfd9f56 Finish updating macro comments 2021-11-18 01:47:58 -05:00
GriffinR
b5b5d95de6 Distinguish 'virtual object' names from object events 2021-11-17 23:40:53 -05:00
GriffinR
1b35f9adad Use specific name limits for string limit functions 2021-11-17 22:11:03 -05:00
GriffinR
b9fa18bdd4 Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros 2021-11-17 22:03:37 -05:00
GriffinR
c4f8f4d11a Add STR_VAR_# ids to string buffer macros 2021-11-17 22:00:44 -05:00
Eduardo Quezada D'Ottone
0c448fdf6e
Merge pull request #1910 from LOuroboros/vitamins 
Updated Vitamins cap
 2021-11-17 22:25:59 -03:00
GriffinR
c940b67716 Continue macro comment updating 2021-11-17 17:45:59 -05:00
GriffinR
700425ef5f Index sMapHealLocations 2021-11-17 15:52:04 -05:00
GriffinR
c1970a4bc8 Remove dead sub references 2021-11-17 15:47:47 -05:00
GriffinR
cfb9ae40d7
Merge pull request #1557 from GriffinRichards/fix-calcrom-0 
Fix calcrom's handling of 0s
 2021-11-17 15:11:23 -05:00