ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into flingIE

Browse Source
This commit is contained in:
LOuroboros 2022-01-22 05:39:48 -03:00
commit 367ba2d5bf
7 changed files with 469 additions and 519 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

938
include/constants/items.h
View File

File diff suppressed because it is too large Load Diff

4
include/graphics.h
View File

@ -3903,8 +3903,6 @@ extern const u32 gItemIcon_RedOrb[];
extern const u32 gItemIconPalette_RedOrb[];
extern const u32 gItemIcon_BlueOrb[];
extern const u32 gItemIconPalette_BlueOrb[];
extern const u32 gItemIcon_JadeOrb[];
extern const u32 gItemIconPalette_JadeOrb[];
// Mega Stones
extern const u32 gItemIcon_Venusaurite[];
extern const u32 gItemIconPalette_Venusaurite[];
@ -4540,8 +4538,6 @@ extern const u32 gItemIconPalette_NLunarizer[];
extern const u32 gItemIcon_ReinsOfUnity[];
extern const u32 gItemIconPalette_ReinsOfUnity[];
// Battle Mechanic Key Items
extern const u32 gItemIcon_KeyStone[];
extern const u32 gItemIconPalette_KeyStone[];
extern const u32 gItemIcon_MegaRing[];
extern const u32 gItemIconPalette_MegaRing[];
extern const u32 gItemIcon_ZPowerRing[];

6
src/data/graphics/items.h
View File

@ -791,9 +791,6 @@ const u32 gItemIconPalette_RedOrb[] = INCBIN_U32("graphics/items/icon_palettes/r
const u32 gItemIcon_BlueOrb[] = INCBIN_U32("graphics/items/icons/blue_orb.4bpp.lz");
const u32 gItemIconPalette_BlueOrb[] = INCBIN_U32("graphics/items/icon_palettes/blue_orb.gbapal.lz");
const u32 gItemIcon_JadeOrb[] = INCBIN_U32("graphics/items/icons/jade_orb.4bpp.lz");
const u32 gItemIconPalette_JadeOrb[] = INCBIN_U32("graphics/items/icon_palettes/jade_orb.gbapal.lz");
// Mega Stones
const u32 gItemIcon_Venusaurite[] = INCBIN_U32("graphics/items/icons/venusaurite.4bpp.lz");
@ -1769,9 +1766,6 @@ const u32 gItemIconPalette_ReinsOfUnity[] = INCBIN_U32("graphics/items/icon_pale
// Battle Mechanic Key Items
const u32 gItemIcon_KeyStone[] = INCBIN_U32("graphics/items/icons/key_stone.4bpp.lz");
const u32 gItemIconPalette_KeyStone[] = INCBIN_U32("graphics/items/icon_palettes/key_stone.gbapal.lz");
const u32 gItemIcon_MegaRing[] = INCBIN_U32("graphics/items/icons/mega_ring.4bpp.lz");
const u32 gItemIconPalette_MegaRing[] = INCBIN_U32("graphics/items/icon_palettes/mega_ring.gbapal.lz");

2
src/data/item_icon_table.h
View File

@ -316,7 +316,6 @@ const u32 *const gItemIconTable[][2] =
// Colored Orbs
[ITEM_RED_ORB] = {gItemIcon_RedOrb, gItemIconPalette_RedOrb},
[ITEM_BLUE_ORB] = {gItemIcon_BlueOrb, gItemIconPalette_BlueOrb},
[ITEM_JADE_ORB] = {gItemIcon_JadeOrb, gItemIconPalette_JadeOrb},
// Mega Stones
[ITEM_VENUSAURITE] = {gItemIcon_Venusaurite, gItemIconPalette_Venusaurite},
[ITEM_CHARIZARDITE_X] = {gItemIcon_CharizarditeX, gItemIconPalette_CharizarditeX},
@ -747,7 +746,6 @@ const u32 *const gItemIconTable[][2] =
[ITEM_N_LUNARIZER] = {gItemIcon_NecrozmaFuser, gItemIconPalette_NLunarizer},
[ITEM_REINS_OF_UNITY] = {gItemIcon_ReinsOfUnity, gItemIconPalette_ReinsOfUnity},
// Battle Mechanic Key Items
[ITEM_KEY_STONE] = {gItemIcon_KeyStone, gItemIconPalette_KeyStone},
[ITEM_MEGA_RING] = {gItemIcon_MegaRing, gItemIconPalette_MegaRing},
[ITEM_Z_POWER_RING] = {gItemIcon_ZPowerRing, gItemIconPalette_ZPowerRing},
[ITEM_DYNAMAX_BAND] = {gItemIcon_DynamaxBand, gItemIconPalette_DynamaxBand},

24
src/data/items.h
View File

@ -3869,19 +3869,6 @@ const struct Item gItems[] =
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_JADE_ORB] =
{
.name = _("Jade Orb"),
.itemId = ITEM_JADE_ORB,
.price = 0,
.description = sJadeOrbDesc,
.importance = 1,
.unk19 = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
// Mega Stones
[ITEM_VENUSAURITE] =
@ -9334,17 +9321,6 @@ const struct Item gItems[] =
// Battle Mechanic Key Items
[ITEM_KEY_STONE] =
{
.name = _("Key Stone"),
.itemId = ITEM_KEY_STONE,
.price = 0,
.description = sKeyStoneDesc,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_MEGA_RING] =
{
.name = _("Mega Ring"),

10
src/data/text/item_descriptions.h
View File

@ -1535,11 +1535,6 @@ static const u8 sBlueOrbDesc[] = _(
"said to contain an\n"
"ancient power.");
static const u8 sJadeOrbDesc[] = _(
"A green, shiny orb\n"
"said to have a leg-\n"
"end tied to it.");
// Mega Stones
static const u8 sVenusauriteDesc[] = _(
"This stone enables\n"
@ -3523,11 +3518,6 @@ static const u8 sReinsOfUnityDesc[] = _(
"beloved steed.");
// Battle Mechanic Key Items
static const u8 sKeyStoneDesc[] = _(
"A stone of untold\n"
"power that allows\n"
"Mega Evolution.");
static const u8 sMegaRingDesc[] = _(
"Enables {PKMN} holding\n"
"their Mega Stone to\n"

4
src/party_menu.c
View File

@ -1962,9 +1962,7 @@ static u8 CanMonLearnTMTutor(struct Pokemon *mon, u16 item, u8 tutor)
if (item >= ITEM_TM01)
{
if (item > ITEM_TM50 && item < ITEM_HM01)
return CANNOT_LEARN_MOVE;
else if (!CanMonLearnTMHM(mon, item - ITEM_TM01 - ((item > ITEM_TM100) ? 50 : 0)))
if (!CanMonLearnTMHM(mon, item - ITEM_TM01 - ((item > ITEM_TM100) ? 50 : 0)))
return CANNOT_LEARN_MOVE;
else
move = ItemIdToBattleMoveId(item);