summaryrefslogtreecommitdiff
path: root/src/field/scrcmd.c
diff options
context:
space:
mode:
authorMarco Willems (M17.1) <progreon@gmail.com>2018-01-19 13:23:17 +0100
committerMarco Willems (M17.1) <progreon@gmail.com>2018-01-19 13:23:17 +0100
commitd4cd912eb85411a4be1ea97441f929a16f455f34 (patch)
tree31f54c8322ac4a7be5f2509b0903248cf993e24b /src/field/scrcmd.c
parent05ab3f96218b58001aa2d90cef951f7e4087c4ae (diff)
parent1d8798203e86b61e889ea1c0fba851cbdbdd03d7 (diff)
Merge remote-tracking branch 'upstream/master' into various_data
Diffstat (limited to 'src/field/scrcmd.c')
-rw-r--r--src/field/scrcmd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field/scrcmd.c b/src/field/scrcmd.c
index e795fd8ed..36edbe472 100644
--- a/src/field/scrcmd.c
+++ b/src/field/scrcmd.c
@@ -1755,7 +1755,7 @@ bool8 ScrCmd_pokemart(struct ScriptContext *ctx)
{
void *ptr = (void *)ScriptReadWord(ctx);
- CreatePokemartMenu(ptr);
+ Shop_CreatePokemartMenu(ptr);
ScriptContext1_Stop();
return TRUE;
}
@@ -1764,7 +1764,7 @@ bool8 ScrCmd_pokemartdecoration(struct ScriptContext *ctx)
{
void *ptr = (void *)ScriptReadWord(ctx);
- CreateDecorationShop1Menu(ptr);
+ Shop_CreateDecorationShop1Menu(ptr);
ScriptContext1_Stop();
return TRUE;
}
@@ -1773,7 +1773,7 @@ bool8 ScrCmd_pokemartdecoration2(struct ScriptContext *ctx)
{
void *ptr = (void *)ScriptReadWord(ctx);
- CreateDecorationShop2Menu(ptr);
+ Shop_CreateDecorationShop2Menu(ptr);
ScriptContext1_Stop();
return TRUE;
}