Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

2
src/daycare.c
View File

@ -28,7 +28,7 @@
extern const struct Evolution gEvolutionTable[][EVOS_PER_MON]; 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 ClearDaycareMonMail(struct DaycareMail *mail);
static void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare); static void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare);

21
test/test_runner.c
View File

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