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.
This commit is contained in:
LOuroboros 2022-01-01 16:50:51 -03:00
parent 9b1fd796ae
commit 74aa4f29df
9 changed files with 174 additions and 111 deletions

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
245 218 38
32 32 32
189 205 213
230 238 238
139 164 172
255 255 255
90 123 131
57 98 106
90 213 90
148 230 139
213 255 205
57 172 82
49 131 65
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
245 218 38
32 32 32
230 189 49
255 230 65
197 139 41
255 255 189
255 255 255
164 90 32
139 57 24
222 82 123
238 139 172
255 205 222
205 57 57
139 41 49
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
245 218 38
32 32 32
148 189 205
189 213 213
115 156 172
230 246 255
255 255 255
98 115 139
65 82 98
82 164 222
139 197 238
205 238 255
57 106 205
41 74 139
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 384 B

View File

@ -3575,9 +3575,7 @@ extern const u32 gItemIconPalette_SuperRepel[];
extern const u32 gItemIconPalette_MaxRepel[];
extern const u32 gItemIcon_Lure[];
extern const u32 gItemIconPalette_Lure[];
extern const u32 gItemIcon_SuperLure[];
extern const u32 gItemIconPalette_SuperLure[];
extern const u32 gItemIcon_MaxLure[];
extern const u32 gItemIconPalette_MaxLure[];
extern const u32 gItemIcon_EscapeRope[];
extern const u32 gItemIconPalette_EscapeRope[];

View File

@ -288,14 +288,10 @@ const u32 gItemIconPalette_SuperRepel[] = INCBIN_U32("graphics/items/icon_palett
const u32 gItemIconPalette_MaxRepel[] = INCBIN_U32("graphics/items/icon_palettes/max_repel.gbapal.lz");
const u32 gItemIcon_Lure[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz");
const u32 gItemIconPalette_Lure[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz");
const u32 gItemIcon_SuperLure[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz");
const u32 gItemIconPalette_SuperLure[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz");
const u32 gItemIcon_MaxLure[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz");
const u32 gItemIconPalette_MaxLure[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz");
const u32 gItemIcon_Lure[] = INCBIN_U32("graphics/items/icons/lure.4bpp.lz");
const u32 gItemIconPalette_Lure[] = INCBIN_U32("graphics/items/icon_palettes/lure.gbapal.lz");
const u32 gItemIconPalette_SuperLure[] = INCBIN_U32("graphics/items/icon_palettes/super_lure.gbapal.lz");
const u32 gItemIconPalette_MaxLure[] = INCBIN_U32("graphics/items/icon_palettes/max_lure.gbapal.lz");
const u32 gItemIcon_EscapeRope[] = INCBIN_U32("graphics/items/icons/escape_rope.4bpp.lz");
const u32 gItemIconPalette_EscapeRope[] = INCBIN_U32("graphics/items/icon_palettes/escape_rope.gbapal.lz");

View File

@ -128,9 +128,9 @@ const u32 *const gItemIconTable[][2] =
[ITEM_REPEL] = {gItemIcon_Repel, gItemIconPalette_Repel},
[ITEM_SUPER_REPEL] = {gItemIcon_Repel, gItemIconPalette_SuperRepel},
[ITEM_MAX_REPEL] = {gItemIcon_Repel, gItemIconPalette_MaxRepel},
[ITEM_LURE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_SUPER_LURE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_MAX_LURE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
[ITEM_LURE] = {gItemIcon_Lure, gItemIconPalette_Lure},
[ITEM_SUPER_LURE] = {gItemIcon_Lure, gItemIconPalette_SuperLure},
[ITEM_MAX_LURE] = {gItemIcon_Lure, gItemIconPalette_MaxLure},
[ITEM_ESCAPE_ROPE] = {gItemIcon_EscapeRope, gItemIconPalette_EscapeRope},
// X Items
[ITEM_X_ATTACK] = {gItemIcon_BattleStatItem, gItemIconPalette_XAttack},
@ -673,56 +673,56 @@ const u32 *const gItemIconTable[][2] =
[ITEM_TM48] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
[ITEM_TM49] = {gItemIcon_TM, gItemIconPalette_DarkTMHM},
[ITEM_TM50] = {gItemIcon_TM, gItemIconPalette_FireTMHM},
[ITEM_TM51] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM52] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM53] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM54] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM55] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM56] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM57] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM58] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM59] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM60] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM61] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM62] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM63] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM64] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM65] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM66] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM67] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM68] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM69] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM70] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM71] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM72] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM73] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM74] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM75] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM76] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM77] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM78] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM79] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM80] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM81] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM82] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM83] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM84] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM85] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM86] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM87] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM88] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM89] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM90] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM91] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM92] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM93] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM94] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM95] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM96] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM97] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM98] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM99] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM100] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
[ITEM_TM51] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM52] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM53] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM54] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM55] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM56] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM57] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM58] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM59] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM60] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM61] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM62] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM63] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM64] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM65] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM66] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM67] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM68] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM69] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM70] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM71] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM72] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM73] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM74] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM75] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM76] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM77] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM78] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM79] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM80] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM81] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM82] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM83] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM84] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM85] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM86] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM87] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM88] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM89] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM90] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM91] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM92] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM93] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM94] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM95] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM96] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM97] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM98] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM99] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_TM100] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo
[ITEM_HM01] = {gItemIcon_HM, gItemIconPalette_NormalTMHM},
[ITEM_HM02] = {gItemIcon_HM, gItemIconPalette_FlyingTMHM},
[ITEM_HM03] = {gItemIcon_HM, gItemIconPalette_WaterTMHM},

View File

@ -815,7 +815,7 @@ const struct Item gItems[] =
{
.name = _("CasteliaCone"),
.itemId = ITEM_CASTELIACONE,
.price = 400,
.price = 350,
.description = sCasteliaconeDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_PARTY_MENU,
@ -828,7 +828,7 @@ const struct Item gItems[] =
{
.name = _("LumioseGlete"),
.itemId = ITEM_LUMIOSE_GALETTE,
.price = 400,
.price = 350,
.description = sLumioseGaletteDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_PARTY_MENU,
@ -841,7 +841,7 @@ const struct Item gItems[] =
{
.name = _("ShalourSable"),
.itemId = ITEM_SHALOUR_SABLE,
.price = 400,
.price = 350,
.description = sShalourSableDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_PARTY_MENU,
@ -1308,7 +1308,7 @@ const struct Item gItems[] =
{
.name = _("Exp.Candy S"),
.itemId = ITEM_EXP_CANDY_S,
.price = 20,
.price = 240,
.description = sExpCandyXSDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
@ -1319,7 +1319,7 @@ const struct Item gItems[] =
{
.name = _("Exp.Candy M"),
.itemId = ITEM_EXP_CANDY_M,
.price = 20,
.price = 1000,
.description = sExpCandyMDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
@ -1330,7 +1330,7 @@ const struct Item gItems[] =
{
.name = _("Exp.Candy L"),
.itemId = ITEM_EXP_CANDY_L,
.price = 20,
.price = 3000,
.description = sExpCandyLDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
@ -1341,7 +1341,7 @@ const struct Item gItems[] =
{
.name = _("Exp.Candy XL"),
.itemId = ITEM_EXP_CANDY_XL,
.price = 20,
.price = 10000,
.description = sExpCandyXLDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
@ -1464,37 +1464,43 @@ const struct Item gItems[] =
.fieldUseFunc = ItemUseOutOfBattle_Repel,
},
[ITEM_LURE] = // Todo
[ITEM_LURE] =
{
.name = _("????????"),
.itemId = ITEM_NONE,
.price = 0,
.description = sDummyDesc,
.name = _("Lure"),
.itemId = ITEM_LURE,
.price = 350,
.holdEffectParam = 100,
.description = sLureDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0,
},
[ITEM_SUPER_LURE] = // Todo
[ITEM_SUPER_LURE] =
{
.name = _("????????"),
.itemId = ITEM_NONE,
.price = 0,
.description = sDummyDesc,
.name = _("Super Lure"),
.itemId = ITEM_SUPER_LURE,
.price = 500,
.holdEffectParam = 200,
.description = sSuperLureDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0,
},
[ITEM_MAX_LURE] = // Todo
[ITEM_MAX_LURE] =
{
.name = _("????????"),
.itemId = ITEM_NONE,
.price = 0,
.description = sDummyDesc,
.name = _("Max Lure"),
.itemId = ITEM_MAX_LURE,
.price = 700,
.holdEffectParam = 250,
.description = sMaxLureDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0,
},
[ITEM_ESCAPE_ROPE] =
@ -2019,7 +2025,7 @@ const struct Item gItems[] =
{
.name = _("StrngeSouvnr"),
.itemId = ITEM_STRANGE_SOUVENIR,
.price = 30000,
.price = 3000,
.description = sStrangeSouvenirDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,

View File

@ -542,27 +542,27 @@ static const u8 sRareCandyDesc[] = _(
static const u8 sExpCandyXSDesc[] = _(
"Gives a very small\n"
"amount of exp. to\n"
"amount of Exp. to\n"
"a single Pokémon.");
static const u8 sExpCandySDesc[] = _(
"Gives a small\n"
"amount of exp. to\n"
"amount of Exp. to\n"
"a single Pokémon.");
static const u8 sExpCandyMDesc[] = _(
"Gives a moderate\n"
"amount of exp. to\n"
"amount of Exp. to\n"
"a single Pokémon.");
static const u8 sExpCandyLDesc[] = _(
"Gives a large\n"
"amount of exp. to\n"
"amount of Exp. to\n"
"a single Pokémon.");
static const u8 sExpCandyXLDesc[] = _(
"Gives a very large\n"
"amount of exp. to\n"
"amount of Exp. to\n"
"a single Pokémon.");
static const u8 sDynamaxCandyDesc[] = _(
@ -612,14 +612,20 @@ static const u8 sMaxRepelDesc[] = _(
"Pokémon for 250\n"
"steps.");
static const u8 sLureDesc[] = _( // Todo
"?????");
static const u8 sLureDesc[] = _(
"Makes Pokémon more\n"
"likely to appear\n"
"for 100 steps.");
static const u8 sSuperLureDesc[] = _( // Todo
"?????");
static const u8 sSuperLureDesc[] = _(
"Makes Pokémon more\n"
"likely to appear\n"
"for 200 steps.");
static const u8 sMaxLureDesc[] = _( // Todo
"?????");
static const u8 sMaxLureDesc[] = _(
"Makes Pokémon more\n"
"likely to appear\n"
"for 250 steps.");
static const u8 sEscapeRopeDesc[] = _(
"Use to escape\n"
@ -1039,8 +1045,8 @@ static const u8 sBlackApricornDesc[] = _(
"scribable scent.");
static const u8 sWishingPieceDesc[] = _(
"Throw into a Poké-\n"
"mon Den to attract\n"
"Throw into a\n"
"{PKMN} Den to attract\n"
"Dynamax Pokémon.");
static const u8 sGalaricaTwigDesc[] = _(
@ -3456,23 +3462,23 @@ static const u8 sOvalCharmDesc[] = _(
"at the daycare.");
static const u8 sShinyCharmDesc[] = _(
"A charm that will\n"
"A charm that will\n"
"raise the chance\n"
"of Shiny Pokémon.");
static const u8 sCatchingCharmDesc[] = _(
"This charm raises\n"
"the chance of Crit-\n"
"ical Captures.");
"This charm raises\n"
"the chance of\n"
"Critical Captures.");
static const u8 sExpCharmDesc[] = _(
"This charm raises\n"
"the amount of expe-\n"
"rience obtained.");
"This charm raises\n"
"the amount of Exp.\n"
"obtained.");
// Form-changing Key Items
static const u8 sRotomCatalogDesc[] = _(
"A catalog full of\n"
"A catalog full of\n"
"deviced liked by\n"
"Rotom.");
@ -3488,8 +3494,8 @@ static const u8 sRevealGlassDesc[] = _(
static const u8 sDNASplicersDesc[] = _(
"Splicer that fuses\n"
"Kyurem and a cer-\n"
"tain Pokémon.");
"Kyurem and a\n"
"certain Pokémon.");
static const u8 sZygardeCubeDesc[] = _(
"An item to store\n"
@ -3595,8 +3601,8 @@ static const u8 sBerryPouchDesc[] = _(
static const u8 sPokemonBoxLinkDesc[] = _(
"This device grants\n"
"access to the Poké-\n"
"mon Storage System.");
"access to the {PKMN}\n"
"Storage System.");
static const u8 sCoinCaseDesc[] = _(
"A case that holds\n"