Merge branch 'upcoming' into timefunctionfixes

This commit is contained in:
Alex 2023-11-20 20:20:04 +01:00 committed by GitHub
commit 428a23d313
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -214,7 +214,11 @@ static const u8 sDisableDescription[] = _(
static const u8 sAcidDescription[] = _(
"Sprays a hide-melting acid.\n"
#if B_UPDATED_MOVE_DATA >= GEN_4
"May lower Sp. Def.");
#else
"May lower Defense.");
#endif
static const u8 sEmberDescription[] = _(
"A weak fire attack that may\n"
@ -986,7 +990,11 @@ static const u8 sSunnyDayDescription[] = _(
static const u8 sCrunchDescription[] = _(
"Crunches with sharp fangs.\n"
#if B_UPDATED_MOVE_DATA >= GEN_4
"May lower Defense.");
#else
"May lower Sp. Def.");
#endif
static const u8 sMirrorCoatDescription[] = _(
"Counters the foe's special\n"