Merge pull request #231 from KDSKardabox/master

Player PC

src/decoration.c

@@ -562,7 +562,7 @@ void SecretBasePC_Cancel(u8 taskId)
     }
     else
     {
-        sub_816B060(taskId);
+        ReshowPlayerPC(taskId);
     }
 }
 

src/international_string_util.c

@@ -42,7 +42,7 @@ s32 GetMaxWidthInMenuTable(const struct MenuAction *str, s32 arg1)
     return convert_pixel_width_to_tile_width(var);
 }
 
-s32 sub_81DB3D8(const struct MenuAction *str, u8* arg1, s32 arg2)
+s32 sub_81DB3D8(const struct MenuAction *str, const u8* arg1, s32 arg2)
 {
     s32 i, var;
 

src/pokeblock.c

@@ -460,7 +460,7 @@ static bool8 InitPokeblockMenu(void)
         gMain.state++;
         break;
     case 10:
-        sub_8122344(&sPokeblockMenu->field_E75, FIELD_E75_COUNT);
+        sub_8122344(sPokeblockMenu->field_E75, FIELD_E75_COUNT);
         gMain.state++;
         break;
     case 11: