Merge branch 'master' into unkk_020851B8

1 files changed, 24 insertions, 24 deletions

diff --git a/arm9/src/scrcmd_flags.c b/arm9/src/scrcmd_flags.c
index c0f6a519..ee13ebc0 100644
--- a/arm9/src/scrcmd_flags.c
+++ b/arm9/src/scrcmd_flags.c
@@ -47,7 +47,7 @@ THUMB_FUNC BOOL ScrCmd_GiveSinnohDex(struct ScriptContext* ctx)
     return FALSE;
 }
 
-THUMB_FUNC BOOL ScrCmd_Unk0159(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_HasRunningShoes(struct ScriptContext* ctx)
 {
     u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
     void* unk_sav_ptr = FUN_02034E30(ctx->unk80->saveBlock2);
@@ -58,7 +58,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0159(struct ScriptContext* ctx)
     return FALSE;
 }
 
-THUMB_FUNC BOOL ScrCmd_Unk015A(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_GiveRunningShoes(struct ScriptContext* ctx)
 {
     void* unk_sav_ptr = FUN_02034E30(ctx->unk80->saveBlock2);
     void* unk = FUN_02034E20(unk_sav_ptr);
@@ -91,7 +91,7 @@ THUMB_FUNC BOOL ScrCmd_GiveBadge(struct ScriptContext* ctx)
     return FALSE;
 }
 
-THUMB_FUNC BOOL ScrCmd_Unk015E(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_GiveBag(struct ScriptContext* ctx)
 {
     u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
     struct ScriptState* state = SavArray_Flags_get(ctx->unk80->saveBlock2);
@@ -121,7 +121,7 @@ THUMB_FUNC BOOL ScrCmd_GetTotalEarnedBadges(struct ScriptContext* ctx)
     return FALSE;
 }
 
-THUMB_FUNC BOOL ScrCmd_Unk015F(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_HasBag(struct ScriptContext* ctx)
 {
     struct ScriptState* state = SavArray_Flags_get(ctx->unk80->saveBlock2);
     
@@ -186,7 +186,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0165(struct ScriptContext* ctx)
     return 0;
 }
 
-THUMB_FUNC BOOL ScrCmd_Unk0166(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_CheckGameCompleted(struct ScriptContext* ctx)
 {
     u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
     struct ScriptState* state = SavArray_Flags_get(ctx->unk80->saveBlock2);
@@ -196,7 +196,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0166(struct ScriptContext* ctx)
     return FALSE;
 }
 
-THUMB_FUNC BOOL ScrCmd_Unk0167(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_SetGameCompleted(struct ScriptContext* ctx)
 {
     struct ScriptState* state = SavArray_Flags_get(ctx->unk80->saveBlock2);
 
@@ -205,21 +205,21 @@ THUMB_FUNC BOOL ScrCmd_Unk0167(struct ScriptContext* ctx)
     return 0;
 }
 
-THUMB_FUNC BOOL ScrCmd_Unk01CF(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_GetSetStrength(struct ScriptContext* ctx)
 {
     struct ScriptState* state = SavArray_Flags_get(ctx->unk80->saveBlock2);
-    u8 unk = ScriptReadByte(ctx);
+    u8 option = ScriptReadByte(ctx);
     u16* ret_ptr;
 
-    switch (unk)
+    switch (option)
     {
-    case 1:
+    case 1: //set strength to on
         FUN_0205F264(state, 1);
         break;
-    case 0:
+    case 0: //set strength to off
         FUN_0205F264(state, 0);
         break;
-    case 2:
+    case 2: //get whether strength is on or off
         ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
         *ret_ptr = (u16)FUN_0205F264(state, 2);
         break;
@@ -231,21 +231,21 @@ THUMB_FUNC BOOL ScrCmd_Unk01CF(struct ScriptContext* ctx)
     return FALSE;
 }
 
-THUMB_FUNC BOOL ScrCmd_Unk01D0(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_GetSetFlash(struct ScriptContext* ctx)
 {
     struct ScriptState* state = SavArray_Flags_get(ctx->unk80->saveBlock2);
-    u8 unk = ScriptReadByte(ctx);
+    u8 option = ScriptReadByte(ctx);
     u16* ret_ptr;
 
-    switch (unk)
+    switch (option)
     {
-    case 1:
+    case 1: //set flash to on
         FUN_0205F274(state);
         break;
-    case 0:
+    case 0: //set flash to off
         FUN_0205F284(state);
         break;
-    case 2:
+    case 2: //get whether flash is on or off
         ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
         *ret_ptr = (u16)FUN_0205F294(state);
         break;
@@ -257,21 +257,21 @@ THUMB_FUNC BOOL ScrCmd_Unk01D0(struct ScriptContext* ctx)
     return FALSE;
 }
 
-THUMB_FUNC BOOL ScrCmd_Unk01D1(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_GetSetDefog(struct ScriptContext* ctx)
 {
     struct ScriptState* state = SavArray_Flags_get(ctx->unk80->saveBlock2);
-    u8 unk = ScriptReadByte(ctx);
+    u8 option = ScriptReadByte(ctx);
     u16* ret_ptr;
 
-    switch (unk)
+    switch (option)
     {
-    case 1:
+    case 1: //set defog to on
         FUN_0205F2A4(state);
         break;
-    case 0:
+    case 0: //set defog to off
         FUN_0205F2B4(state);
         break;
-    case 2:
+    case 2: //get whether defog is on or off
         ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
         *ret_ptr = (u16)FUN_0205F2C4(state);
         break;