add default rewriting rules

Author: E-Sh4rk

Boxes/boxes.ml

@@ -1,8 +1,20 @@
 
 exception BoxFittingError of string
 
+type rewrite_rules = (int list * int list) list
+let parse_code s =
+  let n = String.length s in
+  if n mod 8 <> 0 then failwith "Invalid byte sequence length" ;
+  List.init (n / 2) (fun i -> int_of_string ("0x" ^ String.sub s (i * 2) 2))
+let parse_rewrite_rule s =
+  match String.split_on_char ':' s with
+  | [pre; post] -> (parse_code pre, parse_code post)
+  | _ -> failwith "Invalid rule format"
+let parse_rewrite_rules str =
+  List.map parse_rewrite_rule (String.split_on_char ';' str)
+
 type fillers =
-  { nop_code:int list ; nop_code_alt:int list; fillers:int list array; rewriting:(int list * int list) list }
+  { nop_code:int list ; nop_code_alt:int list; fillers:int list array; rewriting:rewrite_rules }
 let default_fillers () = {
   nop_code =
     if !Settings.game = Ruby || !Settings.game = Sapphire then
@@ -41,7 +53,10 @@ let default_fillers () = {
       [0x00 ; 0x00 ; 0x00 ; 0xFF](* FF000000 *) ;
     |]
     ;
-    rewriting = []
+    rewriting = [
+      parse_rewrite_rule "FFBBBBBB00000000FFFFBBBB:FFBBFFFFFFFFFFFFFFFFBBBB" ;
+      parse_rewrite_rule "FFFFBBBB00000000FFFFFFBB:FFFFBBFFFFFFFFFFFFFFFFBB"
+    ]
   }
 
 let padding = [0x00 ; 0x00 ; 0x00 ; 0x00]

Boxes/boxes.mli

@@ -1,8 +1,10 @@
 
 exception BoxFittingError of string
 
+type rewrite_rules = (int list * int list) list
+val parse_rewrite_rules : string -> rewrite_rules
 type fillers =
-  { nop_code:int list ; nop_code_alt:int list; fillers:int list array; rewriting:(int list * int list) list }
+  { nop_code:int list ; nop_code_alt:int list; fillers:int list array; rewriting:rewrite_rules }
 val default_fillers : unit -> fillers
 
 val fit_codes_into_boxes :

Main/ace_common.ml

@@ -33,19 +33,6 @@ let compare_and_print_commands fmt data descr exit =
   in
   aux data descr false 0
 
-let parse_rewrite str =
-  let parse_code s =
-    let n = String.length s in
-    if n mod 8 <> 0 then failwith "Invalid byte sequence length" ;
-    List.init (n / 2) (fun i -> int_of_string ("0x" ^ String.sub s (i * 2) 2))
-  in
-  let parse_rule s =
-    match String.split_on_char ':' s with
-    | [pre; post] -> (parse_code pre, parse_code post)
-    | _ -> failwith "Invalid rule format"
-  in
-  List.map parse_rule (String.split_on_char ';' str)
-
 let main fmt env (headers,headers2) parsed exit =
   let onlyraw =
     match Preprocess.get_param headers "onlyraw" with
@@ -89,7 +76,7 @@ let main fmt env (headers,headers2) parsed exit =
   let rewriting =
     match Preprocess.get_param headers "rewrite" with
     | HNone -> default_fillers.rewriting
-    | HString str -> parse_rewrite str
+    | HString str -> Boxes.parse_rewrite_rules str
     | _ -> failwith "Invalid headers."
   in
   let fill_last =