From 7860ce8dbe3d4abca3a8d3fb336705e3d09b32e0 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Tue, 16 Jan 2018 14:00:52 -0500
Subject: split data2a and make shop.c stuff static

---
 src/field/scrcmd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/field/scrcmd.c')

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;
 }
-- 
cgit v1.2.3


From 003ed9293b2c51f0481ed31f0e0459cbecbf757e Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Sat, 20 Jan 2018 14:17:03 -0800
Subject: More documentation of field_weather

---
 src/field/scrcmd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/field/scrcmd.c')

diff --git a/src/field/scrcmd.c b/src/field/scrcmd.c
index 36edbe472..bc5cd0b1d 100644
--- a/src/field/scrcmd.c
+++ b/src/field/scrcmd.c
@@ -626,7 +626,7 @@ bool8 IsPaletteNotActive(void)
 
 bool8 ScrCmd_fadescreen(struct ScriptContext *ctx)
 {
-    fade_screen(ScriptReadByte(ctx), 0);
+    FadeScreen(ScriptReadByte(ctx), 0);
     SetupNativeScript(ctx, IsPaletteNotActive);
     return TRUE;
 }
@@ -636,7 +636,7 @@ bool8 ScrCmd_fadescreenspeed(struct ScriptContext *ctx)
     u8 duration = ScriptReadByte(ctx);
     u8 delay = ScriptReadByte(ctx);
 
-    fade_screen(duration, delay);
+    FadeScreen(duration, delay);
     SetupNativeScript(ctx, IsPaletteNotActive);
     return TRUE;
 }
-- 
cgit v1.2.3