Skip to content

Commit 74b3cb1

Browse files
E-Sh4rkE-Sh4rk
authored
Merge pull request #8 from it-is-final/trailing_spaces_filler
Remove trailing spaces from all fillers
2 parents c400619 + 401eb2f commit 74b3cb1

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎Boxes/boxes.ml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,39 +18,39 @@ type fillers =
1818
let default_fillers () = {
1919
nop_code =
2020
if !Settings.game = Ruby || !Settings.game = Sapphire then
21-
[0x00 ; 0x00 ; 0x00 ; 0x00] (* 00000000 : andeq r0, r0, r0 *)
21+
[0xFF ; 0XFF ; 0xFF ; 0xFF] (* FFFFFFFF *)
2222
else if !Settings.game = FireRed || !Settings.game = Settings.LeafGreen then
23-
[0x00 ; 0x00 ; 0x00 ; 0x00] (* 00000000 : andeq r0, r0, r0 *)
23+
[0xFF ; 0XFF ; 0xFF ; 0xFF] (* FFFFFFFF *)
2424
else
25-
[0x00 ; 0x00 ; 0x00 ; 0x00] (* 00000000 : andeq r0, r0, r0 *)
25+
[0xFF ; 0XFF ; 0xFF ; 0xFF] (* FFFFFFFF *)
2626
;
2727
nop_code_alt =
2828
if !Settings.game = Ruby || !Settings.game = Sapphire then
29-
[0x00 ; 0x00 ; 0x00 ; 0xB0] (* B0000000 : andlt r0, r0, r0 *)
29+
[0xBB ; 0XFF ; 0xFF ; 0xFF] (* FFFFFFBB *)
3030
else if !Settings.game = FireRed || !Settings.game = Settings.LeafGreen then
31-
[0x00 ; 0x00 ; 0x00 ; 0xB0] (* B0000000 : andlt r0, r0, r0 *)
31+
[0xBB ; 0XFF ; 0xFF ; 0xFF] (* FFFFFFBB *)
3232
else
33-
[0x00 ; 0x00 ; 0x00 ; 0xB0] (* B0000000 : andlt r0, r0, r0 *)
33+
[0xBB ; 0XFF ; 0xFF ; 0xFF] (* FFFFFFBB *)
3434
;
3535
fillers = if !Settings.game = Ruby || !Settings.game = Sapphire
3636
then [|
37-
[0xFF ; 0x00 ; 0x00 ; 0xB0](* B00000FF *) ;
38-
[0x00 ; 0xFF ; 0x00 ; 0xB0](* B000FF00 *) ;
39-
[0x00 ; 0x00 ; 0xFF ; 0xB0](* B0FF0000 *) ;
40-
[0x00 ; 0x00 ; 0x00 ; 0xFF](* FF000000 *) ;
37+
[0xFF ; 0xBB ; 0xBB ; 0xBB](* BBBBBBFF *) ;
38+
[0xFF ; 0xFF ; 0xBB ; 0xBB](* BBBBFFFF *) ;
39+
[0xFF ; 0xFF ; 0xFF ; 0xBB](* BBFFFFFF *) ;
40+
[0xFF ; 0xFF ; 0xFF ; 0xFF](* FFFFFFFF *) ;
4141
|]
4242
else if !Settings.game = FireRed || !Settings.game = Settings.LeafGreen
4343
then [|
44-
[0xFF ; 0x00 ; 0x00 ; 0x00](* 000000FF *) ;
45-
[0x00 ; 0xFF ; 0x00 ; 0x00](* 0000FF00 *) ;
46-
[0x00 ; 0x00 ; 0xFF ; 0x00](* 00FF0000 *) ;
44+
[0xFF ; 0xBB ; 0xBB ; 0xBB](* BBBBBBFF *) ;
45+
[0xFF ; 0xFF ; 0xBB ; 0xBB](* BBBBFFFF *) ;
46+
[0xFF ; 0xFF ; 0xFF ; 0xBB](* BBFFFFFF *) ;
4747
[0xFF ; 0xFF ; 0xFF ; 0xFF](* FFFFFFFF *) ;
4848
|]
4949
else [|
50-
[0xFF ; 0x00 ; 0x00 ; 0x00](* 000000FF *) ;
51-
[0x00 ; 0xFF ; 0x00 ; 0x00](* 0000FF00 *) ;
52-
[0x00 ; 0x00 ; 0xFF ; 0x00](* 00FF0000 *) ;
53-
[0x00 ; 0x00 ; 0x00 ; 0xFF](* FF000000 *) ;
50+
[0xFF ; 0xBB ; 0xBB ; 0xBB](* BBBBBBFF *) ;
51+
[0xFF ; 0xFF ; 0xBB ; 0xBB](* BBBBFFFF *) ;
52+
[0xFF ; 0xFF ; 0xFF ; 0xBB](* BBFFFFFF *) ;
53+
[0xFF ; 0xFF ; 0xFF ; 0xFF](* FFFFFFFF *) ;
5454
|]
5555
;
5656
rewriting = [

‎html/doc/index.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@ <h3>Headers</h3>
5050
<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.
5151
If not specified (or if <code>null</code> is specified), no exit code will be inserted.</td></tr>
5252
<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.
53-
Default: <code>0x00000000</code>/<code>0x00000000</code>/<code>0x00000000</code> (E/FRLG/RS).</td></tr>
53+
Default: <code>0xFFFFFFFF</code>/<code>0xFFFFFFFF</code>/<code>0xFFFFFFFF</code> (E/FRLG/RS).</td></tr>
5454
<tr><td><code>filler0_alt</code></td><td>Integer</td><td>Optional</td><td>An alternative no-op command to use when filling the space inside a box name.
55-
Used when <code>filler0</code> cannot be used. Default: <code>0xB0000000</code>/<code>0xB0000000</code>/<code>0xB0000000</code> (E/FRLG/RS).</td></tr>
55+
Used when <code>filler0</code> cannot be used. Default: <code>0xFFFFFFBB</code>/<code>0xFFFFFFBB</code>/<code>0xFFFFFFBB</code> (E/FRLG/RS).</td></tr>
5656
<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.
57-
Should be of the form <code>0x......FF</code>. Default: <code>0x000000FF</code>/<code>0x000000FF</code>/<code>0xB00000FF</code> (E/FRLG/RS).</td></tr>
57+
Should be of the form <code>0x......FF</code>. Default: <code>0xBBBBBBFF</code>/<code>0xBBBBBBFF</code>/<code>0xBBBBBBFF</code> (E/FRLG/RS).</td></tr>
5858
<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.
59-
Should be of the form <code>0x....FF..</code>. Default: <code>0x0000FF00</code>/<code>0x0000FF00</code>/<code>0xB000FF00</code> (E/FRLG/RS).</td></tr>
59+
Should be of the form <code>0x....FF..</code>. Default: <code>0xBBBBFFFF</code>/<code>0xBBBBFFFF</code>/<code>0xBBBBFFFF</code> (E/FRLG/RS).</td></tr>
6060
<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.
61-
Should be of the form <code>0x..FF....</code>. Default: <code>0x00FF0000</code>/<code>0x00FF0000</code>/<code>0xB0FF0000</code> (E/FRLG/RS).</td></tr>
61+
Should be of the form <code>0x..FF....</code>. Default: <code>0xBBFFFFFF</code>/<code>0xBBFFFFFF</code>/<code>0xBBFFFFFF</code> (E/FRLG/RS).</td></tr>
6262
<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.
63-
Should be of the form <code>0xFF......</code>. Default: <code>0xFF000000</code>/<code>0xFFFFFFFF</code>/<code>0xFF000000</code> (E/FRLG/RS).</td></tr>
63+
Should be of the form <code>0xFF......</code>. Default: <code>0xFFFFFFFF</code>/<code>0xFFFFFFFF</code>/<code>0xFFFFFFFF</code> (E/FRLG/RS).</td></tr>
6464
<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.
6565
If specified in both the main code headers and the exit code headers, the value must be the same. Default: true.</td></tr>
6666
<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
@@ -130,7 +130,7 @@ <h2>Exit codes</h2>
130130

131131
<p>Exit codes are pieces of code that can be included at the end of an ACE code in order to
132132
branch back to the game's code without crashing.</p>
133-
133+
134134
<p>The <q>Exit codes</q> textarea contains a library of multiple exit codes.
135135
Each exit code is separated from the next by the following separator:
136136
<code>==========</code></p>

0 commit comments

Comments
 (0)