ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-05 17:13:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,300 Commits 1 Branch 0 Tags 235 MiB
b197da077f
Commit Graph

7300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GriffinR
45e8cd4b84
Merge pull request #1589 from sphericalice/patch-2 
Use SPECIES_NONE and ITEM_NONE in battle_tower.c
 2022-01-04 08:55:33 -05:00
sphericalice
48bf1ab98d
Use SPECIES_NONE and ITEM_NONE in battle_tower.c 2022-01-04 13:46:46 +00:00
Eduardo Quezada D'Ottone
4f9e6faa48
Merge branch 'item_expansion' into flingIE 2022-01-02 18:31:03 -03:00
GriffinR
ac47489216
Merge pull request #1588 from sphericalice/patch-1 
Use TEXT_SKIP_DRAW in CreateAvailableDecorationsMenu
 2022-01-02 16:09:31 -05:00
sphericalice
2d536bf560
Use TEXT_SKIP_DRAW in CreateAvailableDecorationsMenu 2022-01-02 21:02:53 +00: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
GriffinR
434086be69
Merge pull request #1585 from sphericalice/patch-2 
Update field_specials.c to match the style
 2021-12-31 12:39:43 -05:00
sphericalice
61a0036c47
Clarify ScrollableMultichoice_ProcessInput comment 2021-12-31 17:34:46 +00:00
sphericalice
9e660b2cdf
Update src/field_specials.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-12-31 16:29:11 +00:00
sphericalice
4f6323606f
Update field_specials.c to match the style 2021-12-31 16:24:44 +00:00
LOuroboros
d4dc672088 Filled in missing item data 2021-12-31 13:23:06 -03:00
GriffinR
23f5c9fd5c Clean up pokedex_area_screen 2021-12-31 00:16:56 -05:00
GriffinR
643cc62f73
Merge pull request #1584 from sphericalice/patch-1 
Remove some magic numbers from TryPushBoulder
 2021-12-30 09:00:08 -05:00
sphericalice
50522fdea4
Remove some magic numbers from TryPushBoulder 2021-12-30 12:21:47 +00:00
GriffinR
4192a40adf
Merge pull request #1583 from GriffinRichards/renametilemaps 
Give less generic names to some tilemaps, some misc fixes
 2021-12-29 00:57:37 -05:00
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
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
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