From c2a93ea21e35635634b72c44587d405de146a6ac Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Thu, 20 Oct 2016 19:14:38 -0700 Subject: new game PC items --- src/new_game.c | 2 +- src/scrcmd.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/new_game.c b/src/new_game.c index 0dab6116c..92810615e 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -119,7 +119,7 @@ void NewGameInitData(void) sub_813420C(); gSaveBlock1.registeredItem = 0; sub_80A3714(); - sub_8139C18(); + NewGameInitPCItems(); sub_810C994(); sub_8133F80(); sub_80E6764(); diff --git a/src/scrcmd.c b/src/scrcmd.c index d613e2c79..8e6bb987b 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -132,8 +132,8 @@ extern void sub_80586E0(u32, u32); extern void sub_810E7AC(u8, u8, u8, u8); extern void sub_810E824(void); extern u16 GetCoins(void); -extern bool8 sub_811A840(u16); -extern bool8 sub_811A898(u16); +extern bool8 GiveCoins(u16); +extern bool8 TakeCoins(u16); extern u8 sub_80C5374(u16, u8, u16, u32, u32, u8); extern u8 sub_80C53F8(u16); extern void sub_80C5530(u8, u16, u8); @@ -1956,7 +1956,7 @@ bool8 ScrCmd_checkcoins(struct ScriptContext *ctx) bool8 ScrCmd_givecoins(struct ScriptContext *ctx) { u16 v2 = VarGet(ScriptReadHalfword(ctx)); - if (sub_811A840(v2) == TRUE) + if (GiveCoins(v2) == TRUE) gScriptResult = 0; else gScriptResult = 1; @@ -1967,7 +1967,7 @@ bool8 ScrCmd_givecoins(struct ScriptContext *ctx) bool8 ScrCmd_removecoins(struct ScriptContext *ctx) { u16 v2 = VarGet(ScriptReadHalfword(ctx)); - if (sub_811A898(v2) == TRUE) + if (TakeCoins(v2) == TRUE) gScriptResult = 0; else gScriptResult = 1; -- cgit v1.2.3