Skip to content

Commit 4f77033

Browse files
committed
restore frlg fillers (for now)
1 parent 04755f3 commit 4f77033

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

Boxes/boxes.ml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ let default_fillers () = {
88
if !Settings.game = Ruby || !Settings.game = Sapphire then
99
[0x00 ; 0x00 ; 0x00 ; 0x00] (* 00000000 : andeq r0, r0, r0 *)
1010
else if !Settings.game = FireRed || !Settings.game = Settings.LeafGreen then
11-
[0xBB ; 0xBB ; 0xBB ; 0xBB] (* BBBBBBBB *)
11+
[0x00 ; 0x00 ; 0x00 ; 0x00] (* 00000000 : andeq r0, r0, r0 *)
1212
else
1313
[0x00 ; 0x00 ; 0x00 ; 0x00] (* 00000000 : andeq r0, r0, r0 *)
1414
;
1515
nop_code_alt =
1616
if !Settings.game = Ruby || !Settings.game = Sapphire then
1717
[0x00 ; 0x00 ; 0x00 ; 0xB0] (* B0000000 : andlt r0, r0, r0 *)
1818
else if !Settings.game = FireRed || !Settings.game = Settings.LeafGreen then
19-
[0xBB ; 0xBB ; 0xBB ; 0xBB] (* BBBBBBBB *)
19+
[0x00 ; 0x00 ; 0x00 ; 0xB0] (* B0000000 : andlt r0, r0, r0 *)
2020
else
2121
[0x00 ; 0x00 ; 0x00 ; 0xB0] (* B0000000 : andlt r0, r0, r0 *)
2222
;
@@ -29,9 +29,9 @@ let default_fillers () = {
2929
|]
3030
else if !Settings.game = FireRed || !Settings.game = Settings.LeafGreen
3131
then [|
32-
[0xFF ; 0xBB ; 0xBB ; 0xBB](* BBBBBBFF *) ;
33-
[0xFF ; 0xFF ; 0xBB ; 0xBB](* BBBBFFFF *) ;
34-
[0xFF ; 0xFF ; 0xFF ; 0xBB](* BBFFFFFF *) ;
32+
[0xFF ; 0x00 ; 0x00 ; 0x00](* 000000FF *) ;
33+
[0x00 ; 0xFF ; 0x00 ; 0x00](* 0000FF00 *) ;
34+
[0x00 ; 0x00 ; 0xFF ; 0x00](* 00FF0000 *) ;
3535
[0xFF ; 0xFF ; 0xFF ; 0xFF](* FFFFFFFF *) ;
3636
|]
3737
else [|

html/doc/index.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ <h3>Headers</h3>
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>
5151
<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>
52+
Default: <code>0x00000000</code>/<code>0x00000000</code>/<code>0x00000000</code> (E/FRLG/RS).</td></tr>
5353
<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>
54+
Used when a box name contains only spaces. Default: <code>0xB0000000</code>/<code>0xB0000000</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>0xBBBBBBFF</code>/<code>0xB00000FF</code> (E/FRLG/RS).</td></tr>
56+
Should be of the form <code>0x......FF</code>. Default: <code>0x000000FF</code>/<code>0x000000FF</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>0xBBBBFFFF</code>/<code>0xB000FF00</code> (E/FRLG/RS).</td></tr>
58+
Should be of the form <code>0x....FF..</code>. Default: <code>0x0000FF00</code>/<code>0x0000FF00</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>0xBBFFFFFF</code>/<code>0xB0FF0000</code> (E/FRLG/RS).</td></tr>
60+
Should be of the form <code>0x..FF....</code>. Default: <code>0x00FF0000</code>/<code>0x00FF0000</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.
6262
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.

0 commit comments

Comments
 (0)