Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-09-30 21:10:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

updated items

Browse Source
This commit is contained in:
cawtds
2024-06-18 20:41:00 +02:00
parent f276da42e8
commit 12d8da7135
8 changed files with 2300 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
graphics/items/icon_palettes/stellar_tera_shard.pal Normal file
View File

@@ -0,0 +1,18 @@
JASC-PAL
0100
15
0 255 92
147 87 0
0 161 79
0 0 0
209 155 7
57 67 189
167 25 135
217 120 165
189 109 220
167 219 139
255 239 132
246 240 183
171 225 199
137 195 227
233 240 241

BIN
graphics/items/icons/stellar_tera_shard.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 259 B

1
include/constants/items.h
View File

@@ -1077,7 +1077,6 @@
#define EFFECT_ITEM_REVIVE 9
#define EFFECT_ITEM_RESTORE_PP 10
#define EFFECT_ITEM_INCREASE_ALL_STATS 11
#define EFFECT_ITEM_OPEN_BERRY_POUCH 12
// Enigma Berry dummy constant
#define EFFECT_ITEM_ENIGMA_BERRY_EREADER 1

3
include/graphics.h
View File

@@ -4177,6 +4177,9 @@ extern const u32 gItemIconPalette_DragonTeraShard[];
extern const u32 gItemIconPalette_SteelTeraShard[];
extern const u32 gItemIconPalette_FairyTeraShard[];
extern const u32 gItemIcon_StellarTeraShard[];
extern const u32 gItemIconPalette_StellarTeraShard[];
extern const u32 gItemIcon_AdamantCrystal[];
extern const u32 gItemIconPalette_AdamantCrystal[];
extern const u32 gItemIcon_GriseousCore[];

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

@@ -2025,6 +2025,9 @@ const u32 gItemIconPalette_DragonTeraShard[] = INCBIN_U32("graphics/items/icon_p
const u32 gItemIconPalette_SteelTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/steel_tera_shard.gbapal.lz");
const u32 gItemIconPalette_FairyTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/fairy_tera_shard.gbapal.lz");
const u32 gItemIcon_StellarTeraShard[] = INCBIN_U32("graphics/items/icons/stellar_tera_shard.4bpp.lz");
const u32 gItemIconPalette_StellarTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/stellar_tera_shard.gbapal.lz");
// Mochi
const u32 gItemIcon_Mochi[] = INCBIN_U32("graphics/items/icons/mochi.4bpp.lz");

3099
src/data/items.h
View File

File diff suppressed because it is too large Load Diff

2
src/item.c
View File

@@ -2,6 +2,7 @@
#include "gflib.h"
#include "berry.h"
#include "event_data.h"
#include "graphics.h"
#include "item.h"
#include "item_use.h"
#include "item_menu.h"
@@ -11,6 +12,7 @@
#include "strings.h"
#include "constants/hold_effects.h"
#include "constants/item_effects.h"
#include "constants/item.h"
#include "constants/items.h"
#include "constants/maps.h"

4
src/party_menu.c
View File

@@ -4428,7 +4428,7 @@ static void CB2_UseItem(void)
{
GiveMoveToMon(&gPlayerParty[gPartyMenu.slotId], ItemIdToBattleMoveId(gSpecialVar_ItemId));
AdjustFriendship(&gPlayerParty[gPartyMenu.slotId], FRIENDSHIP_EVENT_LEARN_TMHM);
if (gSpecialVar_ItemId < ITEM_HM01)
if (!ItemId_GetImportance(gSpecialVar_ItemId))
RemoveBagItem(gSpecialVar_ItemId, 1);
SetMainCallback2(gPartyMenu.exitCallback);
}
@@ -4448,7 +4448,7 @@ static void CB2_UseTMHMAfterForgettingMove(void)
SetMonMoveSlot(mon, ItemIdToBattleMoveId(gSpecialVar_ItemId), moveIdx);
AdjustFriendship(mon, FRIENDSHIP_EVENT_LEARN_TMHM);
ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, mon, gSpecialVar_ItemId, move);
if (gSpecialVar_ItemId < ITEM_HM01)
if (!ItemId_GetImportance(gSpecialVar_ItemId))
RemoveBagItem(gSpecialVar_ItemId, 1);
SetMainCallback2(gPartyMenu.exitCallback);
}