ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 11:43:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'battle_engine_v2' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2

Browse Source
This commit is contained in:
DizzyEggg 2019-04-05 23:47:55 +02:00
commit 0aefbe1098
19 changed files with 427 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/battle_ai_scripts.s
View File

@ -3628,7 +3628,6 @@ AI_HPAware_DiscouragedEffectsWhenTargetLowHP: @ 82DE2B1
.byte EFFECT_LIGHT_SCREEN .byte EFFECT_LIGHT_SCREEN
.byte EFFECT_OHKO .byte EFFECT_OHKO
.byte EFFECT_SUPER_FANG .byte EFFECT_SUPER_FANG
.byte EFFECT_SUPER_FANG
.byte EFFECT_MIST .byte EFFECT_MIST
.byte EFFECT_FOCUS_ENERGY .byte EFFECT_FOCUS_ENERGY
.byte EFFECT_CONFUSE .byte EFFECT_CONFUSE

23
data/battle_scripts_1.s
View File

@ -100,7 +100,7 @@ gBattleScriptsForMoveEffects:: @ 82D86A8
.4byte BattleScript_EffectMimic .4byte BattleScript_EffectMimic
.4byte BattleScript_EffectMetronome .4byte BattleScript_EffectMetronome
.4byte BattleScript_EffectLeechSeed .4byte BattleScript_EffectLeechSeed
.4byte BattleScript_EffectSplash .4byte BattleScript_EffectDoNothing
.4byte BattleScript_EffectDisable .4byte BattleScript_EffectDisable
.4byte BattleScript_EffectLevelDamage .4byte BattleScript_EffectLevelDamage
.4byte BattleScript_EffectPsywave .4byte BattleScript_EffectPsywave
@ -345,7 +345,7 @@ gBattleScriptsForMoveEffects:: @ 82D86A8
.4byte BattleScript_EffectPartingShot .4byte BattleScript_EffectPartingShot
.4byte BattleScript_EffectSpectralThief .4byte BattleScript_EffectSpectralThief
.4byte BattleScript_EffectVCreate .4byte BattleScript_EffectVCreate
BattleScript_EffectVCreate: BattleScript_EffectVCreate:
setmoveeffect MOVE_EFFECT_V_CREATE | MOVE_EFFECT_AFFECTS_USER setmoveeffect MOVE_EFFECT_V_CREATE | MOVE_EFFECT_AFFECTS_USER
goto BattleScript_EffectHit goto BattleScript_EffectHit
@ -2835,16 +2835,33 @@ BattleScript_DoLeechSeed::
waitmessage 0x40 waitmessage 0x40
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_EffectSplash:: BattleScript_EffectDoNothing::
attackcanceler attackcanceler
attackstring attackstring
ppreduce ppreduce
jumpifmove MOVE_HOLD_HANDS, BattleScript_EffectHoldHands
attackanimation attackanimation
waitanimation waitanimation
jumpifmove MOVE_CELEBRATE, BattleScript_EffectCelebrate
jumpifmove MOVE_HAPPY_HOUR, BattleScript_EffectHappyHour
incrementgamestat GAME_STAT_USED_SPLASH incrementgamestat GAME_STAT_USED_SPLASH
printstring STRINGID_BUTNOTHINGHAPPENED printstring STRINGID_BUTNOTHINGHAPPENED
waitmessage 0x40 waitmessage 0x40
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_EffectHoldHands:
jumpifsideaffecting BS_TARGET, SIDE_STATUS_CRAFTY_SHIELD, BattleScript_ButItFailed
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_DOUBLE, BattleScript_ButItFailed
attackanimation
waitanimation
goto BattleScript_MoveEnd
BattleScript_EffectCelebrate:
printstring STRINGID_CELEBRATEMESSAGE
waitmessage 0x40
goto BattleScript_MoveEnd
BattleScript_EffectHappyHour:
setmoveeffect MOVE_EFFECT_HAPPY_HOUR
seteffectprimary
goto BattleScript_MoveEnd
BattleScript_EffectDisable:: BattleScript_EffectDisable::
attackcanceler attackcanceler

19
graphics/items/icon_palettes/honey.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
48 48 48
120 80 32
200 112 0
80 152 152
232 144 0
96 184 192
248 184 72
248 240 184
216 248 248
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

1
include/constants/battle.h
View File

@ -326,6 +326,7 @@
#define MOVE_EFFECT_FEINT 0x3E #define MOVE_EFFECT_FEINT 0x3E
#define MOVE_EFFECT_SPECTRAL_THIEF 0x3F #define MOVE_EFFECT_SPECTRAL_THIEF 0x3F
#define MOVE_EFFECT_V_CREATE 0x40 #define MOVE_EFFECT_V_CREATE 0x40
#define MOVE_EFFECT_HAPPY_HOUR 0x41
#define MOVE_EFFECT_AFFECTS_USER 0x4000 #define MOVE_EFFECT_AFFECTS_USER 0x4000
#define MOVE_EFFECT_CERTAIN 0x8000 #define MOVE_EFFECT_CERTAIN 0x8000

2
include/constants/battle_move_effects.h
View File

@ -86,7 +86,7 @@
#define EFFECT_MIMIC 82 #define EFFECT_MIMIC 82
#define EFFECT_METRONOME 83 #define EFFECT_METRONOME 83
#define EFFECT_LEECH_SEED 84 #define EFFECT_LEECH_SEED 84
#define EFFECT_SPLASH 85 #define EFFECT_DO_NOTHING 85
#define EFFECT_DISABLE 86 #define EFFECT_DISABLE 86
#define EFFECT_LEVEL_DAMAGE 87 #define EFFECT_LEVEL_DAMAGE 87
#define EFFECT_PSYWAVE 88 #define EFFECT_PSYWAVE 88

1
include/constants/battle_string_ids.h
View File

@ -527,6 +527,7 @@
#define STRINGID_FLOWERVEILPROTECTED 523 #define STRINGID_FLOWERVEILPROTECTED 523
#define STRINGID_SWEETVEILPROTECTED 524 #define STRINGID_SWEETVEILPROTECTED 524
#define STRINGID_AROMAVEILPROTECTED 525 #define STRINGID_AROMAVEILPROTECTED 525
#define STRINGID_CELEBRATEMESSAGE 526
#define BATTLESTRINGS_COUNT 529 #define BATTLESTRINGS_COUNT 529

169
include/constants/items.h
View File

@ -509,98 +509,99 @@
#define ITEM_DRACO_PLATE 420 #define ITEM_DRACO_PLATE 420
#define ITEM_DREAD_PLATE 421 #define ITEM_DREAD_PLATE 421
#define ITEM_IRON_PLATE 422 #define ITEM_IRON_PLATE 422
#define ITEM_HONEY 423
// Gen 5 Items // Gen 5 Items
#define ITEM_EVIOLITE 423 #define ITEM_EVIOLITE 424
#define ITEM_FLOAT_STONE 424 #define ITEM_FLOAT_STONE 425
#define ITEM_BINDING_BAND 425 #define ITEM_BINDING_BAND 426
#define ITEM_DOUSE_DRIVE 426 #define ITEM_DOUSE_DRIVE 427
#define ITEM_SHOCK_DRIVE 427 #define ITEM_SHOCK_DRIVE 428
#define ITEM_BURN_DRIVE 428 #define ITEM_BURN_DRIVE 429
#define ITEM_CHILL_DRIVE 429 #define ITEM_CHILL_DRIVE 430
#define ITEM_FIRE_GEM 430 #define ITEM_FIRE_GEM 431
#define ITEM_WATER_GEM 431 #define ITEM_WATER_GEM 432
#define ITEM_ELECTRIC_GEM 432 #define ITEM_ELECTRIC_GEM 433
#define ITEM_GRASS_GEM 433 #define ITEM_GRASS_GEM 434
#define ITEM_ICE_GEM 434 #define ITEM_ICE_GEM 435
#define ITEM_FIGHTING_GEM 435 #define ITEM_FIGHTING_GEM 436
#define ITEM_POISON_GEM 436 #define ITEM_POISON_GEM 437
#define ITEM_GROUND_GEM 437 #define ITEM_GROUND_GEM 438
#define ITEM_FLYING_GEM 438 #define ITEM_FLYING_GEM 439
#define ITEM_PSYCHIC_GEM 439 #define ITEM_PSYCHIC_GEM 440
#define ITEM_BUG_GEM 440 #define ITEM_BUG_GEM 441
#define ITEM_ROCK_GEM 441 #define ITEM_ROCK_GEM 442
#define ITEM_GHOST_GEM 442 #define ITEM_GHOST_GEM 443
#define ITEM_DRAGON_GEM 443 #define ITEM_DRAGON_GEM 444
#define ITEM_DARK_GEM 444 #define ITEM_DARK_GEM 445
#define ITEM_STEEL_GEM 445 #define ITEM_STEEL_GEM 446
#define ITEM_NORMAL_GEM 446 #define ITEM_NORMAL_GEM 447
#define ITEM_FAIRY_GEM 447 #define ITEM_FAIRY_GEM 448
// Gen6 Items // Gen6 Items
#define ITEM_ASSAULT_VEST 448 #define ITEM_ASSAULT_VEST 449
#define ITEM_PIXIE_PLATE 449 #define ITEM_PIXIE_PLATE 450
#define ITEM_SAFETY_GOGGLES 450 #define ITEM_SAFETY_GOGGLES 451
#define ITEM_GENGARITE 451 #define ITEM_GENGARITE 452
#define ITEM_GARDEVOIRITE 452 #define ITEM_GARDEVOIRITE 453
#define ITEM_AMPHAROSITE 453 #define ITEM_AMPHAROSITE 454
#define ITEM_VENUSAURITE 454 #define ITEM_VENUSAURITE 455
#define ITEM_CHARIZARDITE_X 455 #define ITEM_CHARIZARDITE_X 456
#define ITEM_BLASTOISINITE 456 #define ITEM_BLASTOISINITE 457
#define ITEM_MEWTWONITE_X 457 #define ITEM_MEWTWONITE_X 458
#define ITEM_MEWTWONITE_Y 458 #define ITEM_MEWTWONITE_Y 459
#define ITEM_BLAZIKENITE 459 #define ITEM_BLAZIKENITE 460
#define ITEM_MEDICHAMITE 460 #define ITEM_MEDICHAMITE 461
#define ITEM_HOUNDOOMINITE 461 #define ITEM_HOUNDOOMINITE 462
#define ITEM_AGGRONITE 462 #define ITEM_AGGRONITE 463
#define ITEM_BANETTITE 463 #define ITEM_BANETTITE 464
#define ITEM_TYRANITARITE 464 #define ITEM_TYRANITARITE 465
#define ITEM_SCIZORITE 465 #define ITEM_SCIZORITE 466
#define ITEM_PINSIRITE 466 #define ITEM_PINSIRITE 467
#define ITEM_AERODACTYLITE 467 #define ITEM_AERODACTYLITE 468
#define ITEM_LUCARIONITE 468 #define ITEM_LUCARIONITE 469
#define ITEM_ABOMASITE 469 #define ITEM_ABOMASITE 470
#define ITEM_KANGASKHANITE 470 #define ITEM_KANGASKHANITE 471
#define ITEM_GYARADOSITE 471 #define ITEM_GYARADOSITE 472
#define ITEM_ABSOLITE 472 #define ITEM_ABSOLITE 473
#define ITEM_CHARIZARDITE_Y 473 #define ITEM_CHARIZARDITE_Y 474
#define ITEM_ALAKAZITE 474 #define ITEM_ALAKAZITE 475
#define ITEM_HERACRONITE 475 #define ITEM_HERACRONITE 476
#define ITEM_MAWILITE 476 #define ITEM_MAWILITE 477
#define ITEM_MANECTITE 477 #define ITEM_MANECTITE 478
#define ITEM_GARCHOMPITE 478 #define ITEM_GARCHOMPITE 479
#define ITEM_LATIASITE 479 #define ITEM_LATIASITE 480
#define ITEM_LATIOSITE 480 #define ITEM_LATIOSITE 481
#define ITEM_SWAMPERTITE 481 #define ITEM_SWAMPERTITE 482
#define ITEM_SCEPTILITE 482 #define ITEM_SCEPTILITE 483
#define ITEM_SABLENITE 483 #define ITEM_SABLENITE 484
#define ITEM_ALTARIANITE 484 #define ITEM_ALTARIANITE 485
#define ITEM_GALLADITE 485 #define ITEM_GALLADITE 486
#define ITEM_AUDINITE 486 #define ITEM_AUDINITE 487
#define ITEM_METAGROSSITE 487 #define ITEM_METAGROSSITE 488
#define ITEM_SHARPEDONITE 488 #define ITEM_SHARPEDONITE 489
#define ITEM_SLOWBRONITE 489 #define ITEM_SLOWBRONITE 490
#define ITEM_STEELIXITE 490 #define ITEM_STEELIXITE 491
#define ITEM_PIDGEOTITE 491 #define ITEM_PIDGEOTITE 492
#define ITEM_GLALITITE 492 #define ITEM_GLALITITE 493
#define ITEM_DIANCITE 493 #define ITEM_DIANCITE 494
#define ITEM_CAMERUPTITE 494 #define ITEM_CAMERUPTITE 495
#define ITEM_LOPUNNITE 495 #define ITEM_LOPUNNITE 496
#define ITEM_SALAMENCITE 496 #define ITEM_SALAMENCITE 497
#define ITEM_BEEDRILLITE 497 #define ITEM_BEEDRILLITE 498
#define ITEM_MEGA_BRACELET 498 #define ITEM_MEGA_BRACELET 499
// Gen7 hold effects // Gen7 hold effects
#define ITEM_PROTECTIVE_PADS 499 #define ITEM_PROTECTIVE_PADS 500
#define ITEM_TERRAIN_EXTENDER 500 #define ITEM_TERRAIN_EXTENDER 501
#define ITEM_ELECTRIC_SEED 501 #define ITEM_ELECTRIC_SEED 502
#define ITEM_GRASSY_SEED 502 #define ITEM_GRASSY_SEED 503
#define ITEM_MISTY_SEED 503 #define ITEM_MISTY_SEED 504
#define ITEM_PSYCHIC_SEED 504 #define ITEM_PSYCHIC_SEED 505
#define ITEM_ADRENALINE_ORB 505 #define ITEM_ADRENALINE_ORB 506
#define ITEMS_COUNT 506 #define ITEMS_COUNT 507
#define ITEM_FIELD_ARROW ITEMS_COUNT #define ITEM_FIELD_ARROW ITEMS_COUNT
#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY #define FIRST_BERRY_INDEX ITEM_CHERI_BERRY

2
include/graphics.h
View File

@ -3940,6 +3940,8 @@ extern const u32 gItemIcon_DreadPlate[];
extern const u32 gItemIconPalette_DreadPlate[]; extern const u32 gItemIconPalette_DreadPlate[];
extern const u32 gItemIcon_IronPlate[]; extern const u32 gItemIcon_IronPlate[];
extern const u32 gItemIconPalette_IronPlate[]; extern const u32 gItemIconPalette_IronPlate[];
extern const u32 gItemIcon_Honey[];
extern const u32 gItemIconPalette_Honey[];
// Gen 5 Items // Gen 5 Items
extern const u32 gItemIcon_Eviolite[]; extern const u32 gItemIcon_Eviolite[];
extern const u32 gItemIconPalette_Eviolite[]; extern const u32 gItemIconPalette_Eviolite[];

2
src/battle_message.c
View File

@ -653,9 +653,11 @@ static const u8 sText_SafetyGooglesProtected[] = _("{B_DEF_NAME_WITH_PREFIX} is
static const u8 sText_FlowerVeilProtected[] = _("{B_DEF_NAME_WITH_PREFIX} surrounded itself\nwith a veil of petals!"); static const u8 sText_FlowerVeilProtected[] = _("{B_DEF_NAME_WITH_PREFIX} surrounded itself\nwith a veil of petals!");
static const u8 sText_SweetVeilProtected[] = _("{B_DEF_NAME_WITH_PREFIX} surrounded itself\nwith a veil of sweetness!"); static const u8 sText_SweetVeilProtected[] = _("{B_DEF_NAME_WITH_PREFIX} surrounded itself\nwith a veil of sweetness!");
static const u8 sText_AromaVeilProtected[] = _("{B_DEF_NAME_WITH_PREFIX} is protected\nby an aromatic veil!"); static const u8 sText_AromaVeilProtected[] = _("{B_DEF_NAME_WITH_PREFIX} is protected\nby an aromatic veil!");
static const u8 sText_CelebrateMessage[] = _("Congratulations, {B_PLAYER_NAME}!");
const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] =
{ {
[STRINGID_CELEBRATEMESSAGE - 12] = sText_CelebrateMessage,
[STRINGID_AROMAVEILPROTECTED - 12] = sText_AromaVeilProtected, [STRINGID_AROMAVEILPROTECTED - 12] = sText_AromaVeilProtected,
[STRINGID_SWEETVEILPROTECTED - 12] = sText_SweetVeilProtected, [STRINGID_SWEETVEILPROTECTED - 12] = sText_SweetVeilProtected,
[STRINGID_FLOWERVEILPROTECTED - 12] = sText_FlowerVeilProtected, [STRINGID_FLOWERVEILPROTECTED - 12] = sText_FlowerVeilProtected,

19
src/battle_script_commands.c
View File

@ -2006,6 +2006,11 @@ void SetMoveEffect(bool32 primary, u32 certain)
affectsUser = MOVE_EFFECT_AFFECTS_USER; affectsUser = MOVE_EFFECT_AFFECTS_USER;
gBattleScripting.battler = gBattlerTarget; // theoretically the attacker gBattleScripting.battler = gBattlerTarget; // theoretically the attacker
} }
// Just in case this flag is still set
if (gBattleScripting.moveEffect & MOVE_EFFECT_CERTAIN)
gBattleScripting.moveEffect &= ~(MOVE_EFFECT_CERTAIN);
else else
{ {
gEffectBattler = gBattlerTarget; gEffectBattler = gBattlerTarget;
@ -2364,6 +2369,13 @@ void SetMoveEffect(bool32 primary, u32 certain)
BattleScriptPush(gBattlescriptCurrInstr + 1); BattleScriptPush(gBattlescriptCurrInstr + 1);
gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleScripting.moveEffect]; gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleScripting.moveEffect];
break; break;
case MOVE_EFFECT_HAPPY_HOUR:
if (GET_BATTLER_SIDE(gBattlerAttacker) == B_SIDE_PLAYER)
{
gBattleStruct->moneyMultiplier *= 2;
}
gBattlescriptCurrInstr++;
break;
case MOVE_EFFECT_TRI_ATTACK: case MOVE_EFFECT_TRI_ATTACK:
if (gBattleMons[gEffectBattler].status1) if (gBattleMons[gEffectBattler].status1)
{ {
@ -10546,6 +10558,7 @@ static void atkE5_pickup(void)
s32 i; s32 i;
u16 species, heldItem; u16 species, heldItem;
u8 ability; u8 ability;
u8 lvlDivBy10;
if (InBattlePike()) if (InBattlePike())
{ {
@ -10580,6 +10593,9 @@ static void atkE5_pickup(void)
{ {
species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2); species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2);
heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
lvlDivBy10 = (GetMonData(&gPlayerParty[i], MON_DATA_LEVEL)-1) / 10; //Moving this here makes it easier to add in abilities like Honey Gather
if (lvlDivBy10 > 9)
lvlDivBy10 = 9;
if (GetMonData(&gPlayerParty[i], MON_DATA_ALT_ABILITY)) if (GetMonData(&gPlayerParty[i], MON_DATA_ALT_ABILITY))
ability = gBaseStats[species].ability2; ability = gBaseStats[species].ability2;
@ -10594,9 +10610,6 @@ static void atkE5_pickup(void)
{ {
s32 j; s32 j;
s32 rand = Random() % 100; s32 rand = Random() % 100;
u8 lvlDivBy10 = (GetMonData(&gPlayerParty[i], MON_DATA_LEVEL) - 1) / 10;
if (lvlDivBy10 > 9)
lvlDivBy10 = 9;
for (j = 0; j < 9; j++) for (j = 0; j < 9; j++)
{ {

4
src/battle_util.c
View File

@ -3700,7 +3700,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
{ {
case HOLD_EFFECT_DOUBLE_PRIZE: case HOLD_EFFECT_DOUBLE_PRIZE:
if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) if (GetBattlerSide(battlerId) == B_SIDE_PLAYER)
gBattleStruct->moneyMultiplier = 2; gBattleStruct->moneyMultiplier *= 2;
break; break;
case HOLD_EFFECT_RESTORE_STATS: case HOLD_EFFECT_RESTORE_STATS:
for (i = 0; i < NUM_BATTLE_STATS; i++) for (i = 0; i < NUM_BATTLE_STATS; i++)
@ -5886,6 +5886,8 @@ bool32 CanBattlerGetOrLoseItem(u8 battlerId, u16 itemId)
return FALSE; return FALSE;
else if (ItemId_GetHoldEffect(itemId) == HOLD_EFFECT_MEGA_STONE && GetMegaEvolutionSpecies(species, itemId) != SPECIES_NONE) else if (ItemId_GetHoldEffect(itemId) == HOLD_EFFECT_MEGA_STONE && GetMegaEvolutionSpecies(species, itemId) != SPECIES_NONE)
return FALSE; return FALSE;
else if (species == SPECIES_GIRATINA && itemId == ITEM_GRISEOUS_ORB)
return FALSE;
else else
return TRUE; return TRUE;
} }

10
src/data/battle_moves.h
View File

@ -2103,7 +2103,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_SPLASH] = [MOVE_SPLASH] =
{ {
.effect = EFFECT_SPLASH, .effect = EFFECT_DO_NOTHING,
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 0, .accuracy = 0,
@ -8463,7 +8463,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_HAPPY_HOUR] = [MOVE_HAPPY_HOUR] =
{ {
.effect = EFFECT_PLACEHOLDER, // Needs a custom move effect .effect = EFFECT_DO_NOTHING,
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 0, .accuracy = 0,
@ -8505,7 +8505,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_CELEBRATE] = [MOVE_CELEBRATE] =
{ {
.effect = EFFECT_PLACEHOLDER, // Needs a custom move effect .effect = EFFECT_DO_NOTHING,
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 0, .accuracy = 0,
@ -8519,13 +8519,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_HOLD_HANDS] = [MOVE_HOLD_HANDS] =
{ {
.effect = EFFECT_PLACEHOLDER, // Needs a custom move effect .effect = EFFECT_DO_NOTHING,
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 0, .accuracy = 0,
.pp = 40, .pp = 40,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_ALLY,
.priority = 0, .priority = 0,
.flags = 0, .flags = 0,
.split = SPLIT_STATUS, .split = SPLIT_STATUS,

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

@ -877,6 +877,9 @@ const u32 gItemIconPalette_DreadPlate[] = INCBIN_U32("graphics/items/icon_palett
const u32 gItemIcon_IronPlate[] = INCBIN_U32("graphics/items/icons/iron_plate.4bpp.lz"); const u32 gItemIcon_IronPlate[] = INCBIN_U32("graphics/items/icons/iron_plate.4bpp.lz");
const u32 gItemIconPalette_IronPlate[] = INCBIN_U32("graphics/items/icon_palettes/iron_plate.gbapal.lz"); const u32 gItemIconPalette_IronPlate[] = INCBIN_U32("graphics/items/icon_palettes/iron_plate.gbapal.lz");
const u32 gItemIcon_Honey[] = INCBIN_U32("graphics/items/icons/honey.4bpp.lz");
const u32 gItemIconPalette_Honey[] = INCBIN_U32("graphics/items/icon_palettes/honey.gbapal.lz");
// Gen 5 Items // Gen 5 Items
const u32 gItemIcon_Eviolite[] = INCBIN_U32("graphics/items/icons/eviolite.4bpp.lz"); const u32 gItemIcon_Eviolite[] = INCBIN_U32("graphics/items/icons/eviolite.4bpp.lz");

1
src/data/item_icon_table.h
View File

@ -449,6 +449,7 @@ const u32 *const gItemIconTable[][2] =
[ITEM_DRACO_PLATE] = {gItemIcon_DracoPlate, gItemIconPalette_DracoPlate}, [ITEM_DRACO_PLATE] = {gItemIcon_DracoPlate, gItemIconPalette_DracoPlate},
[ITEM_DREAD_PLATE] = {gItemIcon_DreadPlate, gItemIconPalette_DreadPlate}, [ITEM_DREAD_PLATE] = {gItemIcon_DreadPlate, gItemIconPalette_DreadPlate},
[ITEM_IRON_PLATE] = {gItemIcon_IronPlate, gItemIconPalette_IronPlate}, [ITEM_IRON_PLATE] = {gItemIcon_IronPlate, gItemIconPalette_IronPlate},
[ITEM_HONEY] = {gItemIcon_Honey, gItemIconPalette_Honey},
// Gen 5 Items // Gen 5 Items
[ITEM_EVIOLITE] = {gItemIcon_Eviolite, gItemIconPalette_Eviolite}, [ITEM_EVIOLITE] = {gItemIcon_Eviolite, gItemIconPalette_Eviolite},
[ITEM_FLOAT_STONE] = {gItemIcon_FloatStone, gItemIconPalette_FloatStone}, [ITEM_FLOAT_STONE] = {gItemIcon_FloatStone, gItemIconPalette_FloatStone},

17
src/data/items.h
View File

@ -9136,4 +9136,21 @@ const struct Item gItems[] =
.battleUseFunc = NULL, .battleUseFunc = NULL,
.secondaryId = 0, .secondaryId = 0,
}, },
[ITEM_HONEY] =
{
.name = _("Honey"),
.itemId = ITEM_HONEY,
.price = 100,
.holdEffect = HOLD_EFFECT_NONE,
.holdEffectParam = 0,
.description = gHoneyItemDescription,
.importance = 0,
.unk19 = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 0,
},
}; };

498
src/data/text/abilities.h
View File

@ -1,7 +1,7 @@
static const u8 sNoneDescription[] = _("No special ability."); static const u8 sNoneDescription[] = _("No special ability.");
static const u8 sStenchDescription[] = _("Helps repel wild POKéMON."); static const u8 sStenchDescription[] = _("Helps repel wild POKéMON.");
static const u8 sDrizzleDescription[] = _("Summons rain in battle."); static const u8 sDrizzleDescription[] = _("Summons rain in battle.");
static const u8 sSpeedBoostDescription[] = _("Gradually boosts SPEED."); static const u8 sSpeedBoostDescription[] = _("Gradually boosts Speed.");
static const u8 sBattleArmorDescription[] = _("Blocks critical hits."); static const u8 sBattleArmorDescription[] = _("Blocks critical hits.");
static const u8 sSturdyDescription[] = _("Negates 1-hit KO attacks."); static const u8 sSturdyDescription[] = _("Negates 1-hit KO attacks.");
static const u8 sDampDescription[] = _("Prevents self-destruction."); static const u8 sDampDescription[] = _("Prevents self-destruction.");
@ -20,27 +20,27 @@ static const u8 sFlashFireDescription[] = _("Powers up if hit by fire.");
static const u8 sShieldDustDescription[] = _("Prevents added effects."); static const u8 sShieldDustDescription[] = _("Prevents added effects.");
static const u8 sOwnTempoDescription[] = _("Prevents confusion."); static const u8 sOwnTempoDescription[] = _("Prevents confusion.");
static const u8 sSuctionCupsDescription[] = _("Firmly anchors the body."); static const u8 sSuctionCupsDescription[] = _("Firmly anchors the body.");
static const u8 sIntimidateDescription[] = _("Lowers the foe's ATTACK."); static const u8 sIntimidateDescription[] = _("Lowers the foe's Attack.");
static const u8 sShadowTagDescription[] = _("Prevents the foe's escape."); static const u8 sShadowTagDescription[] = _("Prevents the foe's escape.");
static const u8 sRoughSkinDescription[] = _("Hurts to touch."); static const u8 sRoughSkinDescription[] = _("Hurts to touch.");
static const u8 sWonderGuardDescription[] = _("“Super effective” hits."); static const u8 sWonderGuardDescription[] = _("“Super effective” hits.");
static const u8 sLevitateDescription[] = _("Not hit by GROUND attacks."); static const u8 sLevitateDescription[] = _("Not hit by Ground attacks.");
static const u8 sEffectSporeDescription[] = _("Leaves spores on contact."); static const u8 sEffectSporeDescription[] = _("Leaves spores on contact.");
static const u8 sSynchronizeDescription[] = _("Passes on status problems."); static const u8 sSynchronizeDescription[] = _("Passes on status problems.");
static const u8 sClearBodyDescription[] = _("Prevents ability reduction."); static const u8 sClearBodyDescription[] = _("Prevents ability reduction.");
static const u8 sNaturalCureDescription[] = _("Heals upon switching out."); static const u8 sNaturalCureDescription[] = _("Heals upon switching out.");
static const u8 sLightningRodDescription[] = _("Draws electrical moves."); static const u8 sLightningRodDescription[] = _("Draws electrical moves.");
static const u8 sSereneGraceDescription[] = _("Promotes added effects."); static const u8 sSereneGraceDescription[] = _("Promotes added effects.");
static const u8 sSwiftSwimDescription[] = _("Raises SPEED in rain."); static const u8 sSwiftSwimDescription[] = _("Raises Speed in rain.");
static const u8 sChlorophyllDescription[] = _("Raises SPEED in sunshine."); static const u8 sChlorophyllDescription[] = _("Raises Speed in sunshine.");
static const u8 sIlluminateDescription[] = _("Encounter rate increases."); static const u8 sIlluminateDescription[] = _("Encounter rate increases.");
static const u8 sTraceDescription[] = _("Copies special ability."); static const u8 sTraceDescription[] = _("Copies special ability.");
static const u8 sHugePowerDescription[] = _("Raises ATTACK."); static const u8 sHugePowerDescription[] = _("Raises Attack.");
static const u8 sPoisonPointDescription[] = _("Poisons foe on contact."); static const u8 sPoisonPointDescription[] = _("Poisons foe on contact.");
static const u8 sInnerFocusDescription[] = _("Prevents flinching."); static const u8 sInnerFocusDescription[] = _("Prevents flinching.");
static const u8 sMagmaArmorDescription[] = _("Prevents freezing."); static const u8 sMagmaArmorDescription[] = _("Prevents freezing.");
static const u8 sWaterVeilDescription[] = _("Prevents burns."); static const u8 sWaterVeilDescription[] = _("Prevents burns.");
static const u8 sMagnetPullDescription[] = _("Traps STEEL-type POKéMON."); static const u8 sMagnetPullDescription[] = _("Traps Steel-type POKéMON.");
static const u8 sSoundproofDescription[] = _("Avoids sound-based moves."); static const u8 sSoundproofDescription[] = _("Avoids sound-based moves.");
static const u8 sRainDishDescription[] = _("Slight HP recovery in rain."); static const u8 sRainDishDescription[] = _("Slight HP recovery in rain.");
static const u8 sSandStreamDescription[] = _("Summons a sandstorm."); static const u8 sSandStreamDescription[] = _("Summons a sandstorm.");
@ -50,29 +50,29 @@ static const u8 sEarlyBirdDescription[] = _("Awakens quickly from sleep.");
static const u8 sFlameBodyDescription[] = _("Burns the foe on contact."); static const u8 sFlameBodyDescription[] = _("Burns the foe on contact.");
static const u8 sRunAwayDescription[] = _("Makes escaping easier."); static const u8 sRunAwayDescription[] = _("Makes escaping easier.");
static const u8 sKeenEyeDescription[] = _("Prevents loss of accuracy."); static const u8 sKeenEyeDescription[] = _("Prevents loss of accuracy.");
static const u8 sHyperCutterDescription[] = _("Prevents ATTACK reduction."); static const u8 sHyperCutterDescription[] = _("Prevents Attack reduction.");
static const u8 sPickupDescription[] = _("May pick up items."); static const u8 sPickupDescription[] = _("May pick up items.");
static const u8 sTruantDescription[] = _("Moves only every two turns."); static const u8 sTruantDescription[] = _("Moves only every two turns.");
static const u8 sHustleDescription[] = _("Trades accuracy for power."); static const u8 sHustleDescription[] = _("Trades accuracy for power.");
static const u8 sCuteCharmDescription[] = _("Infatuates on contact."); static const u8 sCuteCharmDescription[] = _("Infatuates on contact.");
static const u8 sPlusDescription[] = _("Powers up with MINUS."); static const u8 sPlusDescription[] = _("Powers up with Minus.");
static const u8 sMinusDescription[] = _("Powers up with PLUS."); static const u8 sMinusDescription[] = _("Powers up with Plus.");
static const u8 sForecastDescription[] = _("Changes with the weather."); static const u8 sForecastDescription[] = _("Changes with the weather.");
static const u8 sStickyHoldDescription[] = _("Prevents item theft."); static const u8 sStickyHoldDescription[] = _("Prevents item theft.");
static const u8 sShedSkinDescription[] = _("Heals the body by shedding."); static const u8 sShedSkinDescription[] = _("Heals the body by shedding.");
static const u8 sGutsDescription[] = _("Ups ATTACK if suffering."); static const u8 sGutsDescription[] = _("Ups Attack if suffering.");
static const u8 sMarvelScaleDescription[] = _("Ups DEFENSE if suffering."); static const u8 sMarvelScaleDescription[] = _("Ups Defense if suffering.");
static const u8 sLiquidOozeDescription[] = _("Draining causes injury."); static const u8 sLiquidOozeDescription[] = _("Draining causes injury.");
static const u8 sOvergrowDescription[] = _("Ups GRASS moves in a pinch."); static const u8 sOvergrowDescription[] = _("Ups Grass moves in a pinch.");
static const u8 sBlazeDescription[] = _("Ups FIRE moves in a pinch."); static const u8 sBlazeDescription[] = _("Ups Fire moves in a pinch.");
static const u8 sTorrentDescription[] = _("Ups WATER moves in a pinch."); static const u8 sTorrentDescription[] = _("Ups Water moves in a pinch.");
static const u8 sSwarmDescription[] = _("Ups BUG moves in a pinch."); static const u8 sSwarmDescription[] = _("Ups Bug moves in a pinch.");
static const u8 sRockHeadDescription[] = _("Prevents recoil damage."); static const u8 sRockHeadDescription[] = _("Prevents recoil damage.");
static const u8 sDroughtDescription[] = _("Summons sunlight in battle."); static const u8 sDroughtDescription[] = _("Summons sunlight in battle.");
static const u8 sArenaTrapDescription[] = _("Prevents fleeing."); static const u8 sArenaTrapDescription[] = _("Prevents fleeing.");
static const u8 sVitalSpiritDescription[] = _("Prevents sleep."); static const u8 sVitalSpiritDescription[] = _("Prevents sleep.");
static const u8 sWhiteSmokeDescription[] = _("Prevents ability reduction."); static const u8 sWhiteSmokeDescription[] = _("Prevents ability reduction.");
static const u8 sPurePowerDescription[] = _("Raises ATTACK."); static const u8 sPurePowerDescription[] = _("Raises Attack.");
static const u8 sShellArmorDescription[] = _("Blocks critical hits."); static const u8 sShellArmorDescription[] = _("Blocks critical hits.");
static const u8 sCacophonyDescription[] = _("Avoids sound-based moves."); static const u8 sCacophonyDescription[] = _("Avoids sound-based moves.");
static const u8 sAirLockDescription[] = _("Negates weather effects."); static const u8 sAirLockDescription[] = _("Negates weather effects.");
@ -224,239 +224,239 @@ static const u8 sFullMetalBodyDescription[] = _("Prevents stat reduction.");
const u8 gAbilityNames[ABILITIES_COUNT_GEN7][ABILITY_NAME_LENGTH + 1] = const u8 gAbilityNames[ABILITIES_COUNT_GEN7][ABILITY_NAME_LENGTH + 1] =
{ {
[ABILITY_NONE] = _("-------"), [ABILITY_NONE] = _("-------"),
[ABILITY_STENCH] = _("STENCH"), [ABILITY_STENCH] = _("Stench"),
[ABILITY_DRIZZLE] = _("DRIZZLE"), [ABILITY_DRIZZLE] = _("Drizzle"),
[ABILITY_SPEED_BOOST] = _("SPEED BOOST"), [ABILITY_SPEED_BOOST] = _("Speed Boost"),
[ABILITY_BATTLE_ARMOR] = _("BATTLE ARMOR"), [ABILITY_BATTLE_ARMOR] = _("Battle Armor"),
[ABILITY_STURDY] = _("STURDY"), [ABILITY_STURDY] = _("Sturdy"),
[ABILITY_DAMP] = _("DAMP"), [ABILITY_DAMP] = _("Damp"),
[ABILITY_LIMBER] = _("LIMBER"), [ABILITY_LIMBER] = _("Limber"),
[ABILITY_SAND_VEIL] = _("SAND VEIL"), [ABILITY_SAND_VEIL] = _("Sand Veil"),
[ABILITY_STATIC] = _("STATIC"), [ABILITY_STATIC] = _("Static"),
[ABILITY_VOLT_ABSORB] = _("VOLT ABSORB"), [ABILITY_VOLT_ABSORB] = _("Volt Absorb"),
[ABILITY_WATER_ABSORB] = _("WATER ABSORB"), [ABILITY_WATER_ABSORB] = _("Water Absorb"),
[ABILITY_OBLIVIOUS] = _("OBLIVIOUS"), [ABILITY_OBLIVIOUS] = _("Oblivious"),
[ABILITY_CLOUD_NINE] = _("CLOUD NINE"), [ABILITY_CLOUD_NINE] = _("Cloud Nine"),
[ABILITY_COMPOUND_EYES] = _("COMPOUNDEYES"), [ABILITY_COMPOUND_EYES] = _("CompoundEyes"),
[ABILITY_INSOMNIA] = _("INSOMNIA"), [ABILITY_INSOMNIA] = _("Insomnia"),
[ABILITY_COLOR_CHANGE] = _("COLOR CHANGE"), [ABILITY_COLOR_CHANGE] = _("Color Change"),
[ABILITY_IMMUNITY] = _("IMMUNITY"), [ABILITY_IMMUNITY] = _("Immunity"),
[ABILITY_FLASH_FIRE] = _("FLASH FIRE"), [ABILITY_FLASH_FIRE] = _("Flash Fire"),
[ABILITY_SHIELD_DUST] = _("SHIELD DUST"), [ABILITY_SHIELD_DUST] = _("Shield Dust"),
[ABILITY_OWN_TEMPO] = _("OWN TEMPO"), [ABILITY_OWN_TEMPO] = _("Own Tempo"),
[ABILITY_SUCTION_CUPS] = _("SUCTION CUPS"), [ABILITY_SUCTION_CUPS] = _("Suction Cups"),
[ABILITY_INTIMIDATE] = _("INTIMIDATE"), [ABILITY_INTIMIDATE] = _("Intimidate"),
[ABILITY_SHADOW_TAG] = _("SHADOW TAG"), [ABILITY_SHADOW_TAG] = _("Shadow Tag"),
[ABILITY_ROUGH_SKIN] = _("ROUGH SKIN"), [ABILITY_ROUGH_SKIN] = _("Rough Skin"),
[ABILITY_WONDER_GUARD] = _("WONDER GUARD"), [ABILITY_WONDER_GUARD] = _("Wonder Guard"),
[ABILITY_LEVITATE] = _("LEVITATE"), [ABILITY_LEVITATE] = _("Levitate"),
[ABILITY_EFFECT_SPORE] = _("EFFECT SPORE"), [ABILITY_EFFECT_SPORE] = _("Effect Spore"),
[ABILITY_SYNCHRONIZE] = _("SYNCHRONIZE"), [ABILITY_SYNCHRONIZE] = _("Synchronize"),
[ABILITY_CLEAR_BODY] = _("CLEAR BODY"), [ABILITY_CLEAR_BODY] = _("Clear Body"),
[ABILITY_NATURAL_CURE] = _("NATURAL CURE"), [ABILITY_NATURAL_CURE] = _("Natural Cure"),
[ABILITY_LIGHTNING_ROD] = _("LIGHTNINGROD"), [ABILITY_LIGHTNING_ROD] = _("Lightningrod"),
[ABILITY_SERENE_GRACE] = _("SERENE GRACE"), [ABILITY_SERENE_GRACE] = _("Serene Grace"),
[ABILITY_SWIFT_SWIM] = _("SWIFT SWIM"), [ABILITY_SWIFT_SWIM] = _("Swift Swim"),
[ABILITY_CHLOROPHYLL] = _("CHLOROPHYLL"), [ABILITY_CHLOROPHYLL] = _("Chlorophyll"),
[ABILITY_ILLUMINATE] = _("ILLUMINATE"), [ABILITY_ILLUMINATE] = _("Illuminate"),
[ABILITY_TRACE] = _("TRACE"), [ABILITY_TRACE] = _("Trace"),
[ABILITY_HUGE_POWER] = _("HUGE POWER"), [ABILITY_HUGE_POWER] = _("Huge Power"),
[ABILITY_POISON_POINT] = _("POISON POINT"), [ABILITY_POISON_POINT] = _("Poison Point"),
[ABILITY_INNER_FOCUS] = _("INNER FOCUS"), [ABILITY_INNER_FOCUS] = _("Inner Focus"),
[ABILITY_MAGMA_ARMOR] = _("MAGMA ARMOR"), [ABILITY_MAGMA_ARMOR] = _("Magma Armor"),
[ABILITY_WATER_VEIL] = _("WATER VEIL"), [ABILITY_WATER_VEIL] = _("Water Veil"),
[ABILITY_MAGNET_PULL] = _("MAGNET PULL"), [ABILITY_MAGNET_PULL] = _("Magnet Pull"),
[ABILITY_SOUNDPROOF] = _("SOUNDPROOF"), [ABILITY_SOUNDPROOF] = _("Soundproof"),
[ABILITY_RAIN_DISH] = _("RAIN DISH"), [ABILITY_RAIN_DISH] = _("Rain Dish"),
[ABILITY_SAND_STREAM] = _("SAND STREAM"), [ABILITY_SAND_STREAM] = _("Sand Stream"),
[ABILITY_PRESSURE] = _("PRESSURE"), [ABILITY_PRESSURE] = _("PRESSURE"),
[ABILITY_THICK_FAT] = _("THICK FAT"), [ABILITY_THICK_FAT] = _("Thick Fat"),
[ABILITY_EARLY_BIRD] = _("EARLY BIRD"), [ABILITY_EARLY_BIRD] = _("Early Bird"),
[ABILITY_FLAME_BODY] = _("FLAME BODY"), [ABILITY_FLAME_BODY] = _("Flame Body"),
[ABILITY_RUN_AWAY] = _("RUN AWAY"), [ABILITY_RUN_AWAY] = _("Run Away"),
[ABILITY_KEEN_EYE] = _("KEEN EYE"), [ABILITY_KEEN_EYE] = _("Keen Eye"),
[ABILITY_HYPER_CUTTER] = _("HYPER CUTTER"), [ABILITY_HYPER_CUTTER] = _("Hyper Cutter"),
[ABILITY_PICKUP] = _("PICKUP"), [ABILITY_PICKUP] = _("Pickup"),
[ABILITY_TRUANT] = _("TRUANT"), [ABILITY_TRUANT] = _("Truant"),
[ABILITY_HUSTLE] = _("HUSTLE"), [ABILITY_HUSTLE] = _("Hustle"),
[ABILITY_CUTE_CHARM] = _("CUTE CHARM"), [ABILITY_CUTE_CHARM] = _("Cute Charm"),
[ABILITY_PLUS] = _("PLUS"), [ABILITY_PLUS] = _("Plus"),
[ABILITY_MINUS] = _("MINUS"), [ABILITY_MINUS] = _("Minus"),
[ABILITY_FORECAST] = _("FORECAST"), [ABILITY_FORECAST] = _("Forecast"),
[ABILITY_STICKY_HOLD] = _("STICKY HOLD"), [ABILITY_STICKY_HOLD] = _("Sticky Hold"),
[ABILITY_SHED_SKIN] = _("SHED SKIN"), [ABILITY_SHED_SKIN] = _("Shed Skin"),
[ABILITY_GUTS] = _("GUTS"), [ABILITY_GUTS] = _("Guts"),
[ABILITY_MARVEL_SCALE] = _("MARVEL SCALE"), [ABILITY_MARVEL_SCALE] = _("Marvel Scale"),
[ABILITY_LIQUID_OOZE] = _("LIQUID OOZE"), [ABILITY_LIQUID_OOZE] = _("Liquid Ooze"),
[ABILITY_OVERGROW] = _("OVERGROW"), [ABILITY_OVERGROW] = _("Overgrow"),
[ABILITY_BLAZE] = _("BLAZE"), [ABILITY_BLAZE] = _("Blaze"),
[ABILITY_TORRENT] = _("TORRENT"), [ABILITY_TORRENT] = _("Torrent"),
[ABILITY_SWARM] = _("SWARM"), [ABILITY_SWARM] = _("Swarm"),
[ABILITY_ROCK_HEAD] = _("ROCK HEAD"), [ABILITY_ROCK_HEAD] = _("Rock Head"),
[ABILITY_DROUGHT] = _("DROUGHT"), [ABILITY_DROUGHT] = _("Drought"),
[ABILITY_ARENA_TRAP] = _("ARENA TRAP"), [ABILITY_ARENA_TRAP] = _("Arena Trap"),
[ABILITY_VITAL_SPIRIT] = _("VITAL SPIRIT"), [ABILITY_VITAL_SPIRIT] = _("Vital Spirit"),
[ABILITY_WHITE_SMOKE] = _("WHITE SMOKE"), [ABILITY_WHITE_SMOKE] = _("White Smoke"),
[ABILITY_PURE_POWER] = _("PURE POWER"), [ABILITY_PURE_POWER] = _("Pure Power"),
[ABILITY_SHELL_ARMOR] = _("SHELL ARMOR"), [ABILITY_SHELL_ARMOR] = _("Shell Armor"),
[ABILITY_CACOPHONY] = _("CACOPHONY"), [ABILITY_CACOPHONY] = _("Cacophony"),
[ABILITY_AIR_LOCK] = _("AIR LOCK"), [ABILITY_AIR_LOCK] = _("Air Lock"),
[ABILITY_TANGLED_FEET] = _("TANGLED FEET"), [ABILITY_TANGLED_FEET] = _("Tangled Feet"),
[ABILITY_MOTOR_DRIVE] = _("MOTOR DRIVE"), [ABILITY_MOTOR_DRIVE] = _("Motor Drive"),
[ABILITY_RIVALRY] = _("RIVALRY"), [ABILITY_RIVALRY] = _("Rivalry"),
[ABILITY_STEADFAST] = _("STEADFAST"), [ABILITY_STEADFAST] = _("Steadfast"),
[ABILITY_SNOW_CLOAK] = _("SNOW CLOAK"), [ABILITY_SNOW_CLOAK] = _("Snow Cloak"),
[ABILITY_GLUTTONY] = _("GLUTTONY"), [ABILITY_GLUTTONY] = _("Gluttony"),
[ABILITY_ANGER_POINT] = _("ANGER POINT"), [ABILITY_ANGER_POINT] = _("Anger Point"),
[ABILITY_UNBURDEN] = _("UNBURDEN"), [ABILITY_UNBURDEN] = _("Unburden"),
[ABILITY_HEATPROOF] = _("HEATPROOF"), [ABILITY_HEATPROOF] = _("Heatproof"),
[ABILITY_SIMPLE] = _("SIMPLE"), [ABILITY_SIMPLE] = _("Simple"),
[ABILITY_DRY_SKIN] = _("DRY SKIN"), [ABILITY_DRY_SKIN] = _("Dry Skin"),
[ABILITY_DOWNLOAD] = _("DOWNLOAD"), [ABILITY_DOWNLOAD] = _("Download"),
[ABILITY_IRON_FIST] = _("IRON FIST"), [ABILITY_IRON_FIST] = _("Iron Fist"),
[ABILITY_POISON_HEAL] = _("POISON HEAL"), [ABILITY_POISON_HEAL] = _("Poison Heal"),
[ABILITY_ADAPTABILITY] = _("ADAPTABILITY"), [ABILITY_ADAPTABILITY] = _("Adaptability"),
[ABILITY_SKILL_LINK] = _("SKILL LINK"), [ABILITY_SKILL_LINK] = _("Skill Link"),
[ABILITY_HYDRATION] = _("HYDRATION"), [ABILITY_HYDRATION] = _("Hydration"),
[ABILITY_SOLAR_POWER] = _("SOLAR POWER"), [ABILITY_SOLAR_POWER] = _("Solar Power"),
[ABILITY_QUICK_FEET] = _("QUICK FEET"), [ABILITY_QUICK_FEET] = _("Quick Feet"),
[ABILITY_NORMALIZE] = _("NORMALIZE"), [ABILITY_NORMALIZE] = _("Normalize"),
[ABILITY_SNIPER] = _("SNIPER"), [ABILITY_SNIPER] = _("Sniper"),
[ABILITY_MAGIC_GUARD] = _("MAGIC GUARD"), [ABILITY_MAGIC_GUARD] = _("Magic Guard"),
[ABILITY_NO_GUARD] = _("NO GUARD"), [ABILITY_NO_GUARD] = _("No Guard"),
[ABILITY_STALL] = _("STALL"), [ABILITY_STALL] = _("Stall"),
[ABILITY_TECHNICIAN] = _("TECHNICIAN"), [ABILITY_TECHNICIAN] = _("Technician"),
[ABILITY_LEAF_GUARD] = _("LEAF GUARD"), [ABILITY_LEAF_GUARD] = _("Leaf Guard"),
[ABILITY_KLUTZ] = _("KLUTZ"), [ABILITY_KLUTZ] = _("Klutz"),
[ABILITY_MOLD_BREAKER] = _("MOLD BREAKER"), [ABILITY_MOLD_BREAKER] = _("Mold Breaker"),
[ABILITY_SUPER_LUCK] = _("SUPER LUCK"), [ABILITY_SUPER_LUCK] = _("Super Luck"),
[ABILITY_AFTERMATH] = _("AFTERMATH"), [ABILITY_AFTERMATH] = _("Aftermath"),
[ABILITY_ANTICIPATION] = _("ANTICIPATION"), [ABILITY_ANTICIPATION] = _("Anticipation"),
[ABILITY_FOREWARN] = _("FOREWARN"), [ABILITY_FOREWARN] = _("Forewarn"),
[ABILITY_UNAWARE] = _("UNAWARE"), [ABILITY_UNAWARE] = _("Unaware"),
[ABILITY_TINTED_LENS] = _("TINTED LENS"), [ABILITY_TINTED_LENS] = _("Tinted Lens"),
[ABILITY_FILTER] = _("FILTER"), [ABILITY_FILTER] = _("Filter"),
[ABILITY_SLOW_START] = _("SLOW START"), [ABILITY_SLOW_START] = _("Slow Start"),
[ABILITY_SCRAPPY] = _("SCRAPPY"), [ABILITY_SCRAPPY] = _("Scrappy"),
[ABILITY_STORM_DRAIN] = _("STORM DRAIN"), [ABILITY_STORM_DRAIN] = _("Storm Drain"),
[ABILITY_ICE_BODY] = _("ICE BODY"), [ABILITY_ICE_BODY] = _("Ice Body"),
[ABILITY_SOLID_ROCK] = _("SOLID ROCK"), [ABILITY_SOLID_ROCK] = _("Solid Rock"),
[ABILITY_SNOW_WARNING] = _("SNOW WARNING"), [ABILITY_SNOW_WARNING] = _("Snow Warning"),
[ABILITY_HONEY_GATHER] = _("HONEY GATHER"), [ABILITY_HONEY_GATHER] = _("Honey Gather"),
[ABILITY_FRISK] = _("FRISK"), [ABILITY_FRISK] = _("Frisk"),
[ABILITY_RECKLESS] = _("RECKLESS"), [ABILITY_RECKLESS] = _("Reckless"),
[ABILITY_MULTITYPE] = _("MULTITYPE"), [ABILITY_MULTITYPE] = _("Multitype"),
[ABILITY_FLOWER_GIFT] = _("FLOWER GIFT"), [ABILITY_FLOWER_GIFT] = _("Flower Gift"),
[ABILITY_BAD_DREAMS] = _("BAD DREAMS"), [ABILITY_BAD_DREAMS] = _("Bad Dreams"),
[ABILITY_PICKPOCKET] = _("PICKPOCKET"), [ABILITY_PICKPOCKET] = _("Pickpocket"),
[ABILITY_SHEER_FORCE] = _("SHEER FORCE"), [ABILITY_SHEER_FORCE] = _("Sheer Force"),
[ABILITY_CONTRARY] = _("CONTRARY"), [ABILITY_CONTRARY] = _("Contrary"),
[ABILITY_UNNERVE] = _("UNNERVE"), [ABILITY_UNNERVE] = _("Unnerve"),
[ABILITY_DEFIANT] = _("DEFIANT"), [ABILITY_DEFIANT] = _("Defiant"),
[ABILITY_DEFEATIST] = _("DEFEATIST"), [ABILITY_DEFEATIST] = _("Defeatist"),
[ABILITY_CURSED_BODY] = _("CURSED BODY"), [ABILITY_CURSED_BODY] = _("Cursed Body"),
[ABILITY_HEALER] = _("HEALER"), [ABILITY_HEALER] = _("Healer"),
[ABILITY_FRIEND_GUARD] = _("FRIEND GUARD"), [ABILITY_FRIEND_GUARD] = _("Friend Guard"),
[ABILITY_WEAK_ARMOR] = _("WEAK ARMOR"), [ABILITY_WEAK_ARMOR] = _("Weak Armor"),
[ABILITY_HEAVY_METAL] = _("HEAVY METAL"), [ABILITY_HEAVY_METAL] = _("Heavy Metal"),
[ABILITY_LIGHT_METAL] = _("LIGHT METAL"), [ABILITY_LIGHT_METAL] = _("Light Metal"),
[ABILITY_MULTISCALE] = _("MULTISCALE"), [ABILITY_MULTISCALE] = _("Multiscale"),
[ABILITY_TOXIC_BOOST] = _("TOXIC BOOST"), [ABILITY_TOXIC_BOOST] = _("Toxic Boost"),
[ABILITY_FLARE_BOOST] = _("FLARE BOOST"), [ABILITY_FLARE_BOOST] = _("Flare Boost"),
[ABILITY_HARVEST] = _("HARVEST"), [ABILITY_HARVEST] = _("Harvest"),
[ABILITY_TELEPATHY] = _("TELEPATHY"), [ABILITY_TELEPATHY] = _("Telepathy"),
[ABILITY_MOODY] = _("MOODY"), [ABILITY_MOODY] = _("Moody"),
[ABILITY_OVERCOAT] = _("OVERCOAT"), [ABILITY_OVERCOAT] = _("Overcoat"),
[ABILITY_POISON_TOUCH] = _("POISON TOUCH"), [ABILITY_POISON_TOUCH] = _("Poison Touch"),
[ABILITY_REGENERATOR] = _("REGENERATOR"), [ABILITY_REGENERATOR] = _("Regenerator"),
[ABILITY_BIG_PECKS] = _("BIG PECKS"), [ABILITY_BIG_PECKS] = _("Big Pecks"),
[ABILITY_SAND_RUSH] = _("SAND RUSH"), [ABILITY_SAND_RUSH] = _("Sand Rush"),
[ABILITY_WONDER_SKIN] = _("WONDER SKIN"), [ABILITY_WONDER_SKIN] = _("Wonder Skin"),
[ABILITY_ANALYTIC] = _("ANALYTIC"), [ABILITY_ANALYTIC] = _("Analytic"),
[ABILITY_ILLUSION] = _("ILLUSION"), [ABILITY_ILLUSION] = _("Illusion"),
[ABILITY_IMPOSTER] = _("IMPOSTER"), [ABILITY_IMPOSTER] = _("Imposter"),
[ABILITY_INFILTRATOR] = _("INFILTRATOR"), [ABILITY_INFILTRATOR] = _("Infiltrator"),
[ABILITY_MUMMY] = _("MUMMY"), [ABILITY_MUMMY] = _("Mummy"),
[ABILITY_MOXIE] = _("MOXIE"), [ABILITY_MOXIE] = _("Moxie"),
[ABILITY_JUSTIFIED] = _("JUSTIFIED"), [ABILITY_JUSTIFIED] = _("Justified"),
[ABILITY_RATTLED] = _("RATTLED"), [ABILITY_RATTLED] = _("Rattled"),
[ABILITY_MAGIC_BOUNCE] = _("MAGIC BOUNCE"), [ABILITY_MAGIC_BOUNCE] = _("Magic Bounce"),
[ABILITY_SAP_SIPPER] = _("SAP SIPPER"), [ABILITY_SAP_SIPPER] = _("Sap Sipper"),
[ABILITY_PRANKSTER] = _("PRANKSTER"), [ABILITY_PRANKSTER] = _("Prankster"),
[ABILITY_SAND_FORCE] = _("SAND FORCE"), [ABILITY_SAND_FORCE] = _("Sand Force"),
[ABILITY_IRON_BARBS] = _("IRON BARBS"), [ABILITY_IRON_BARBS] = _("Iron Barbs"),
[ABILITY_ZEN_MODE] = _("ZEN MODE"), [ABILITY_ZEN_MODE] = _("Zen Mode"),
[ABILITY_VICTORY_STAR] = _("VICTORY STAR"), [ABILITY_VICTORY_STAR] = _("Victory Star"),
[ABILITY_TURBOBLAZE] = _("TURBOBLAZE"), [ABILITY_TURBOBLAZE] = _("Turboblaze"),
[ABILITY_TERAVOLT] = _("TERAVOLT"), [ABILITY_TERAVOLT] = _("Teravolt"),
[ABILITY_AROMA_VEIL] = _("AROMA VEIL"), [ABILITY_AROMA_VEIL] = _("Aroma Veil"),
[ABILITY_FLOWER_VEIL] = _("FLOWER VEIL"), [ABILITY_FLOWER_VEIL] = _("Flower Veil"),
[ABILITY_CHEEK_POUCH] = _("CHEEK POUCH"), [ABILITY_CHEEK_POUCH] = _("Cheek Pouch"),
[ABILITY_PROTEAN] = _("PROTEAN"), [ABILITY_PROTEAN] = _("Protean"),
[ABILITY_FUR_COAT] = _("FUR COAT"), [ABILITY_FUR_COAT] = _("Fur Coat"),
[ABILITY_MAGICIAN] = _("MAGICIAN"), [ABILITY_MAGICIAN] = _("Magician"),
[ABILITY_BULLETPROOF] = _("BULLETPROOF"), [ABILITY_BULLETPROOF] = _("Bulletproof"),
[ABILITY_COMPETITIVE] = _("COMPETITIVE"), [ABILITY_COMPETITIVE] = _("Competitive"),
[ABILITY_STRONG_JAW] = _("STRONG JAW"), [ABILITY_STRONG_JAW] = _("Strong Jaw"),
[ABILITY_REFRIGERATE] = _("REFRIGERATE"), [ABILITY_REFRIGERATE] = _("Refrigerate"),
[ABILITY_SWEET_VEIL] = _("SWEET VEIL"), [ABILITY_SWEET_VEIL] = _("Sweet Veil"),
[ABILITY_STANCE_CHANGE] = _("STANCE CHANG"), [ABILITY_STANCE_CHANGE] = _("StanceChange"),
[ABILITY_GALE_WINGS] = _("GALE WINGS"), [ABILITY_GALE_WINGS] = _("Gale Wings"),
[ABILITY_MEGA_LAUNCHER] = _("MEGA LAUNCHE"), [ABILITY_MEGA_LAUNCHER] = _("MegaLauncher"),
[ABILITY_GRASS_PELT] = _("GRASS PELT"), [ABILITY_GRASS_PELT] = _("Grass Pelt"),
[ABILITY_SYMBIOSIS] = _("SYMBIOSIS"), [ABILITY_SYMBIOSIS] = _("Symbiosis"),
[ABILITY_TOUGH_CLAWS] = _("TOUGH CLAWS"), [ABILITY_TOUGH_CLAWS] = _("Tough Claws"),
[ABILITY_PIXILATE] = _("PIXILATE"), [ABILITY_PIXILATE] = _("Pixilate"),
[ABILITY_GOOEY] = _("GOOEY"), [ABILITY_GOOEY] = _("Gooey"),
[ABILITY_AERILATE] = _("AERILATE"), [ABILITY_AERILATE] = _("Aerilate"),
[ABILITY_PARENTAL_BOND] = _("PARENTAL BON"), [ABILITY_PARENTAL_BOND] = _("ParentalBond"),
[ABILITY_DARK_AURA] = _("DARK AURA"), [ABILITY_DARK_AURA] = _("Dark Aura"),
[ABILITY_FAIRY_AURA] = _("FAIRY AURA"), [ABILITY_FAIRY_AURA] = _("Fairy Aura"),
[ABILITY_AURA_BREAK] = _("AURA BREAK"), [ABILITY_AURA_BREAK] = _("Aura Break"),
[ABILITY_PRIMORDIAL_SEA] = _("PRIMORDIAL S"), [ABILITY_PRIMORDIAL_SEA] = _("Primordial S"),
[ABILITY_DESOLATE_LAND] = _("DESOLATE LAN"), [ABILITY_DESOLATE_LAND] = _("DesolateLand"),
[ABILITY_DELTA_STREAM] = _("DELTA STREAM"), [ABILITY_DELTA_STREAM] = _("Delta Stream"),
[ABILITY_STAMINA] = _("STAMINA"), [ABILITY_STAMINA] = _("Stamina"),
[ABILITY_WIMP_OUT] = _("WIMP OUT"), [ABILITY_WIMP_OUT] = _("Wimp Out"),
[ABILITY_EMERGENCY_EXIT] = _("EMERGENCY EX"), [ABILITY_EMERGENCY_EXIT] = _("Emergency Ex"),
[ABILITY_WATER_COMPACTION] = _("WATER COMPAC"), [ABILITY_WATER_COMPACTION] = _("Water Compac"),
[ABILITY_MERCILESS] = _("MERCILESS"), [ABILITY_MERCILESS] = _("Merciless"),
[ABILITY_SHIELDS_DOWN] = _("SHIELDS DOWN"), [ABILITY_SHIELDS_DOWN] = _("Shields Down"),
[ABILITY_STAKEOUT] = _("STAKEOUT"), [ABILITY_STAKEOUT] = _("Stakeout"),
[ABILITY_WATER_BUBBLE] = _("WATER BUBBLE"), [ABILITY_WATER_BUBBLE] = _("Water Bubble"),
[ABILITY_STEELWORKER] = _("STEELWORKER"), [ABILITY_STEELWORKER] = _("Steelworker"),
[ABILITY_BERSERK] = _("BERSERK"), [ABILITY_BERSERK] = _("Berserk"),
[ABILITY_SLUSH_RUSH] = _("SLUSH RUSH"), [ABILITY_SLUSH_RUSH] = _("Slush Rush"),
[ABILITY_LONG_REACH] = _("LONG REACH"), [ABILITY_LONG_REACH] = _("Long Reach"),
[ABILITY_LIQUID_VOICE] = _("LIQUID VOICE"), [ABILITY_LIQUID_VOICE] = _("Liquid Voice"),
[ABILITY_TRIAGE] = _("TRIAGE"), [ABILITY_TRIAGE] = _("Triage"),
[ABILITY_GALVANIZE] = _("GALVANIZE"), [ABILITY_GALVANIZE] = _("Galvanize"),
[ABILITY_SURGE_SURFER] = _("SURGE SURFER"), [ABILITY_SURGE_SURFER] = _("Surge Surfer"),
[ABILITY_SCHOOLING] = _("SCHOOLING"), [ABILITY_SCHOOLING] = _("Schooling"),
[ABILITY_DISGUISE] = _("DISGUISE"), [ABILITY_DISGUISE] = _("Disguise"),
[ABILITY_BATTLE_BOND] = _("BATTLE BOND"), [ABILITY_BATTLE_BOND] = _("Battle Bond"),
[ABILITY_POWER_CONSTRUCT] = _("POWER CONSTR"), [ABILITY_POWER_CONSTRUCT] = _("Power Constr"),
[ABILITY_CORROSION] = _("CORROSION"), [ABILITY_CORROSION] = _("Corrosion"),
[ABILITY_COMATOSE] = _("COMATOSE"), [ABILITY_COMATOSE] = _("Comatose"),
[ABILITY_QUEENLY_MAJESTY] = _("QUEENLY MAJE"), [ABILITY_QUEENLY_MAJESTY] = _("Queenly Majesty"),
[ABILITY_INNARDS_OUT] = _("INNARDS OUT"), [ABILITY_INNARDS_OUT] = _("Innards Out"),
[ABILITY_DANCER] = _("DANCER"), [ABILITY_DANCER] = _("Dancer"),
[ABILITY_BATTERY] = _("BATTERY"), [ABILITY_BATTERY] = _("Battery"),
[ABILITY_FLUFFY] = _("FLUFFY"), [ABILITY_FLUFFY] = _("Fluffy"),
[ABILITY_DAZZLING] = _("DAZZLING"), [ABILITY_DAZZLING] = _("Dazzling"),
[ABILITY_SOUL_HEART] = _("SOUL HEART"), [ABILITY_SOUL_HEART] = _("Soul-Heart"),
[ABILITY_TANGLING_HAIR] = _("TANGLING HAI"), [ABILITY_TANGLING_HAIR] = _("TanglingHair"),
[ABILITY_RECEIVER] = _("RECEIVER"), [ABILITY_RECEIVER] = _("Receiver"),
[ABILITY_POWER_OF_ALCHEMY] = _("POWER OF ALC"), [ABILITY_POWER_OF_ALCHEMY] = _("Power Of Alc"),
[ABILITY_BEAST_BOOST] = _("BEAST BOOST"), [ABILITY_BEAST_BOOST] = _("Beast Boost"),
[ABILITY_RKS_SYSTEM] = _("RKS SYSTEM"), [ABILITY_RKS_SYSTEM] = _("RKS System"),
[ABILITY_ELECTRIC_SURGE] = _("ELECTRIC SUR"), [ABILITY_ELECTRIC_SURGE] = _("Elec Surge"),
[ABILITY_PSYCHIC_SURGE] = _("PSYCHIC SUR"), [ABILITY_PSYCHIC_SURGE] = _("Psy Surge"),
[ABILITY_MISTY_SURGE] = _("MISTY SURGE"), [ABILITY_MISTY_SURGE] = _("Misty Surge"),
[ABILITY_GRASSY_SURGE] = _("GRASSY SURGE"), [ABILITY_GRASSY_SURGE] = _("Grassy Surge"),
[ABILITY_FULL_METAL_BODY] = _("FULL METAL B"), [ABILITY_FULL_METAL_BODY] = _("FullMetalBod"),
[ABILITY_SHADOW_SHIELD] = _("SHADOW SHIEL"), [ABILITY_SHADOW_SHIELD] = _("ShadowShield"),
[ABILITY_PRISM_ARMOR] = _("PRISM ARMOR"), [ABILITY_PRISM_ARMOR] = _("Prism Armor"),
}; };
const u8 *const gAbilityDescriptionPointers[ABILITIES_COUNT_GEN7] = const u8 *const gAbilityDescriptionPointers[ABILITIES_COUNT_GEN7] =

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

@ -452,3 +452,4 @@ const u8 gGrassySeedItemDescription[] = _("Boosts Defense on\nGrassy Terrain,\nb
const u8 gMistySeedItemDescription[] = _("Boosts Sp. Def. on\nMisty Terrain,\nbut only one time."); const u8 gMistySeedItemDescription[] = _("Boosts Sp. Def. on\nMisty Terrain,\nbut only one time.");
const u8 gPsychicSeedItemDescription[] = _("Boosts Sp. Def. on\nPsychic Terrain,\nbut only one time."); const u8 gPsychicSeedItemDescription[] = _("Boosts Sp. Def. on\nPsychic Terrain,\nbut only one time.");
const u8 gAdrenalineOrbItemDescription[] = _("Boosts Speed if the\nuser is intimidated,\nbut only one time."); const u8 gAdrenalineOrbItemDescription[] = _("Boosts Speed if the\nuser is intimidated,\nbut only one time.");
const u8 gHoneyItemDescription[] = _("A sweet honey that\nattracts wild Pokémon\nin grass or on trees.");

1
src/item_use.c
View File

@ -1119,3 +1119,4 @@ void ItemUseOutOfBattle_CannotUse(u8 taskId)
{ {
DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[3]); DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[3]);
} }