atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'RHH/master' into RHH/upcoming

Browse source
This commit is contained in:
Eduardo Quezada 2023-11-14 12:54:16 -03:00
commit a8564cf8a9
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/data/items.h
View file

@ -4989,7 +4989,6 @@ const struct Item gItems[] =
.name = _("Luck Incense"),
.price = 11000,
.holdEffect = HOLD_EFFECT_DOUBLE_PRIZE,
.holdEffectParam = 10,
.description = sLuckIncenseDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
@ -5703,7 +5702,6 @@ const struct Item gItems[] =
.name = _("Amulet Coin"),
.price = 10000,
.holdEffect = HOLD_EFFECT_DOUBLE_PRIZE,
.holdEffectParam = 10,
.description = sAmuletCoinDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,

2
src/daycare.c
View file

@ -28,7 +28,7 @@
extern const struct Evolution gEvolutionTable[][EVOS_PER_MON];
#define IS_DITTO(species) (gBaseStats[species].eggGroup1 == EGG_GROUP_DITTO || gBaseStats[species].eggGroup2 == EGG_GROUP_DITTO)
#define IS_DITTO(species) (gSpeciesInfo[species].eggGroups[0] == EGG_GROUP_DITTO || gSpeciesInfo[species].eggGroups[1] == EGG_GROUP_DITTO)
static void ClearDaycareMonMail(struct DaycareMail *mail);
static void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare);

9
test/test_runner.c
View file

@ -162,17 +162,18 @@ void CB2_TestRunner(void)
break;
case STATE_ASSIGN_TEST:
while (1)
{
if (gTestRunnerState.test == __stop_tests)
{
gTestRunnerState.state = STATE_EXIT;
return;
}
if (gTestRunnerState.test->runner != &gAssumptionsRunner
&& !PrefixMatch(gTestRunnerArgv, gTestRunnerState.test->name))
{
gTestRunnerState.state = STATE_NEXT_TEST;
return;
++gTestRunnerState.test;
else
break;
}
MgbaPrintf_(":N%s", gTestRunnerState.test->name);