Skip to content

Commit 04755f3

Browse files
E-Sh4rkE-Sh4rk
committed
change frlg default fillers + add frlg revisions
1 parent 1afb3e0 commit 04755f3

3 files changed

Lines changed: 48 additions & 20 deletions

File tree

‎Boxes/boxes.ml‎

Lines changed: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,42 @@ exception BoxFittingError of string
44
type fillers =
55
{ nop_code:int list ; nop_code_alt:int list; fillers:int list array }
66
let default_fillers () = {
7-
nop_code = [0x00 ; 0x00 ; 0x00 ; 0x00] (* 00000000 : andeq r0, r0, r0 *);
8-
nop_code_alt = [0x00 ; 0x00 ; 0x00 ; 0xB0] (* B0000000 : andlt r0, r0, r0 *);
7+
nop_code =
8+
if !Settings.game = Ruby || !Settings.game = Sapphire then
9+
[0x00 ; 0x00 ; 0x00 ; 0x00] (* 00000000 : andeq r0, r0, r0 *)
10+
else if !Settings.game = FireRed || !Settings.game = Settings.LeafGreen then
11+
[0xBB ; 0xBB ; 0xBB ; 0xBB] (* BBBBBBBB *)
12+
else
13+
[0x00 ; 0x00 ; 0x00 ; 0x00] (* 00000000 : andeq r0, r0, r0 *)
14+
;
15+
nop_code_alt =
16+
if !Settings.game = Ruby || !Settings.game = Sapphire then
17+
[0x00 ; 0x00 ; 0x00 ; 0xB0] (* B0000000 : andlt r0, r0, r0 *)
18+
else if !Settings.game = FireRed || !Settings.game = Settings.LeafGreen then
19+
[0xBB ; 0xBB ; 0xBB ; 0xBB] (* BBBBBBBB *)
20+
else
21+
[0x00 ; 0x00 ; 0x00 ; 0xB0] (* B0000000 : andlt r0, r0, r0 *)
22+
;
923
fillers = if !Settings.game = Ruby || !Settings.game = Sapphire
1024
then [|
11-
[0xFF ; 0x00 ; 0x00 ; 0xB0](* B00000FF *) ;
12-
[0x00 ; 0xFF ; 0x00 ; 0xB0](* B000FF00 *) ;
13-
[0x00 ; 0x00 ; 0xFF ; 0xB0](* B0FF0000 *) ;
14-
[0x00 ; 0x00 ; 0x00 ; 0xFF](* FF000000 *) ;
15-
|] else [|
16-
[0xFF ; 0x00 ; 0x00 ; 0x00](* 000000FF *) ;
17-
[0x00 ; 0xFF ; 0x00 ; 0x00](* 0000FF00 *) ;
18-
[0x00 ; 0x00 ; 0xFF ; 0x00](* 00FF0000 *) ;
19-
[0x00 ; 0x00 ; 0x00 ; 0xFF](* FF000000 *) ;
20-
|]
25+
[0xFF ; 0x00 ; 0x00 ; 0xB0](* B00000FF *) ;
26+
[0x00 ; 0xFF ; 0x00 ; 0xB0](* B000FF00 *) ;
27+
[0x00 ; 0x00 ; 0xFF ; 0xB0](* B0FF0000 *) ;
28+
[0x00 ; 0x00 ; 0x00 ; 0xFF](* FF000000 *) ;
29+
|]
30+
else if !Settings.game = FireRed || !Settings.game = Settings.LeafGreen
31+
then [|
32+
[0xFF ; 0xBB ; 0xBB ; 0xBB](* BBBBBBFF *) ;
33+
[0xFF ; 0xFF ; 0xBB ; 0xBB](* BBBBFFFF *) ;
34+
[0xFF ; 0xFF ; 0xFF ; 0xBB](* BBFFFFFF *) ;
35+
[0xFF ; 0xFF ; 0xFF ; 0xFF](* FFFFFFFF *) ;
36+
|]
37+
else [|
38+
[0xFF ; 0x00 ; 0x00 ; 0x00](* 000000FF *) ;
39+
[0x00 ; 0xFF ; 0x00 ; 0x00](* 0000FF00 *) ;
40+
[0x00 ; 0x00 ; 0xFF ; 0x00](* 00FF0000 *) ;
41+
[0x00 ; 0x00 ; 0x00 ; 0xFF](* FF000000 *) ;
42+
|]
2143
}
2244

2345
let name_size = 8

‎html/doc/index.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,18 @@ <h3>Headers</h3>
4848
It should be a multiple of 4. If not specified (or if <code>null</code> is specified), then the code will start immediately.</td></tr>
4949
<tr><td><code>exit</code></td><td>String</td><td>Optional</td><td>Specify the name of the exit code to include at the end of the code.
5050
If not specified (or if <code>null</code> is specified), no exit code will be inserted.</td></tr>
51-
<tr><td><code>filler0</code></td><td>Integer</td><td>Optional</td><td>A no-op command to use when filling the space inside a box name.
52-
Default: <code>0x00000000</code>.</td></tr>
53-
<tr><td><code>filler0_alt</code></td><td>Integer</td><td>Optional</td><td>A command that substitutes the command <code>0x00000000</code>.
54-
Used when a box name only contain spaces. Default: <code>0xB0000000</code>.</td></tr>
51+
<tr><td><code>filler0</code></td><td>Integer</td><td>Optional</td><td>A no-op command to use when filling the space inside a box name.
52+
Default: <code>0x00000000</code>/<code>0xBBBBBBBB</code>/<code>0x00000000</code> (E/FRLG/RS).</td></tr>
53+
<tr><td><code>filler0_alt</code></td><td>Integer</td><td>Optional</td><td>A command that substitutes the command <code>0x00000000</code>.
54+
Used when a box name contains only spaces. Default: <code>0xB0000000</code>/<code>0xBBBBBBBB</code>/<code>0xB0000000</code> (E/FRLG/RS).</td></tr>
5555
<tr><td><code>filler1</code></td><td>Integer</td><td>Optional</td><td>One of the 4-bytes commands to use when filling the space between two box names.
56-
Should be of the form <code>0x......FF</code>. Default: <code>0x000000FF</code> (<code>0xB00000FF</code> for RS).</td></tr>
56+
Should be of the form <code>0x......FF</code>. Default: <code>0x000000FF</code>/<code>0xBBBBBBFF</code>/<code>0xB00000FF</code> (E/FRLG/RS).</td></tr>
5757
<tr><td><code>filler2</code></td><td>Integer</td><td>Optional</td><td>One of the 4-bytes commands to use when filling the space between two box names.
58-
Should be of the form <code>0x....FF..</code>. Default: <code>0x0000FF00</code> (<code>0xB000FF00</code> for RS).</td></tr>
58+
Should be of the form <code>0x....FF..</code>. Default: <code>0x0000FF00</code>/<code>0xBBBBFFFF</code>/<code>0xB000FF00</code> (E/FRLG/RS).</td></tr>
5959
<tr><td><code>filler3</code></td><td>Integer</td><td>Optional</td><td>One of the 4-bytes commands to use when filling the space between two box names.
60-
Should be of the form <code>0x..FF....</code>. Default: <code>0x00FF0000</code> (<code>0xB0FF0000</code> for RS).</td></tr>
60+
Should be of the form <code>0x..FF....</code>. Default: <code>0x00FF0000</code>/<code>0xBBFFFFFF</code>/<code>0xB0FF0000</code> (E/FRLG/RS).</td></tr>
6161
<tr><td><code>filler4</code></td><td>Integer</td><td>Optional</td><td>One of the 4-bytes commands to use when filling the space between two box names.
62-
Should be of the form <code>0xFF......</code>. Default: <code>0xFF000000</code>.</td></tr>
62+
Should be of the form <code>0xFF......</code>. Default: <code>0xFF000000</code>/<code>0xFFFFFFFF</code>/<code>0xFF000000</code> (E/FRLG/RS).</td></tr>
6363
<tr><td><code>fill</code></td><td>Boolean</td><td>Optional</td><td>When set to true, the remaining space of the last box will be filled with spaces.
6464
If specified in both the main code headers and the exit code headers, the value must be the same. Default: true.</td></tr>
6565
<tr><td><code>onlyraw</code></td><td>Boolean</td><td>Optional</td><td>For dev only. When set to <code>true</code>, the generator will not try to fit the commands

‎html/index_frlg.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ <h2><a class="tablinks-active">Main code</a> /
3030
<option value="ger">German</option>
3131
<option value="jap1">Japanese 1.1</option>
3232
<option value="jap0">Japanese 1.0</option>
33+
<option value="eng10">English Switch</option>
34+
<option value="spa10">Spanish Switch</option>
35+
<option value="fra10">French Switch</option>
36+
<option value="ita10">Italian Switch</option>
37+
<option value="ger10">German Switch</option>
38+
<option value="jap10">Japanese Switch</option>
3339
</select>
3440
<select id="game" class="middle">
3541
<option value="fr">Fire-Red</option>

0 commit comments

Comments
 (0)