Merge code lines into multiblock code

Author: Tony Wasserka

content/10.4.0-29.md

@@ -166,9 +166,11 @@ to launch the app without updating), prior to doing the actual
 application launch. When that returns 0, Home Menu will display a
 message using the following text from new message-strings:
 
-`You need to update this `
-`software before you can`
-`launch it.`
+```
+You need to update this 
+software before you can
+launch it.
+```
 
 ### SpotPass sysmodule
 
@@ -188,18 +190,20 @@ codebin("ratPEGI_U_02" and "detailPEGI_D_01").
 
 The message files were updated:
 
-`diff --git a/v19465/tiger.msbt.lz.decom.wstrs b/v20482/tiger.msbt.lz.decom.wstrs`
-`index 2a3a24e..55358d0 100644`
-`--- a/v19465/tiger.msbt.lz.decom.wstrs`
-`+++ b/v20482/tiger.msbt.lz.decom.wstrs`
-`@@ -258,6 +258,7 @@ Charts`
-` Search Results: `
-` Price: TBD`
-` Offers in-game purchases`
-`+Video `
-` This software is currently unavailable.`
-` Page `
-` Go to Page`
+```
+diff --git a/v19465/tiger.msbt.lz.decom.wstrs b/v20482/tiger.msbt.lz.decom.wstrs
+index 2a3a24e..55358d0 100644
+--- a/v19465/tiger.msbt.lz.decom.wstrs
++++ b/v20482/tiger.msbt.lz.decom.wstrs
+@@ -258,6 +258,7 @@ Charts
+ Search Results: 
+ Price: TBD
+ Offers in-game purchases
++Video 
+ This software is currently unavailable.
+ Page 
+ Go to Page
+```
 
 ### mint
 
@@ -213,14 +217,16 @@ The USA 0004009B00012302 CFA(and the equivalent titleIDs for the other
 regions) was updated, the following message was added to
 20000_msbt_LZ.bin:
 
-`An error has occurred.`
-`Please check if there is corrupted data`
-`in Data Management `
-` Nintendo 3DS`
-`in the System Settings.`
-`If the problem persists, please`
-`make a note of the error code`
-`and visit support.nintendo.com.`
+```
+An error has occurred.
+Please check if there is corrupted data
+in Data Management 
+ Nintendo 3DS
+in the System Settings.
+If the problem persists, please
+make a note of the error code
+and visit support.nintendo.com.
+```
 
 ## See Also
 

content/10.7.0-32.md

@@ -49,61 +49,65 @@ to the updated message files mentioned below.
 
 The following files in RomFS were updated(USA title diff):
 
-`/cad/Common.arc.lz`
-`/cad/CommonWin.arc.lz`
-`/cad/Entrance.arc.lz`
-`/cad/Register.arc.lz`
-`/cad/TitleInfo.arc.lz`
-`/message/america/US_English/RI.mstl.lz`
-`/message/america/US_English/tiger.msbt.lz`
-`/message/america/US_French/RI.mstl.lz`
-`/message/america/US_French/tiger.msbt.lz`
-`/message/america/US_Portuguese/RI.mstl.lz`
-`/message/america/US_Portuguese/tiger.msbt.lz`
-`/message/america/US_Spanish/RI.mstl.lz`
-`/message/america/US_Spanish/tiger.msbt.lz`
-
-`git diff v20482/tiger.msbt.lz.decom.wstrs v21506/US_English_tiger.msbt.lz.decom_wstrs`
-`diff --git a/v20482/tiger.msbt.lz.decom.wstrs b/v21506/US_English_tiger.msbt.lz.decom_wstrs`
-`index 55358d0..3c3938f 100644`
-`--- a/v20482/tiger.msbt.lz.decom.wstrs`
-`+++ b/v21506/US_English_tiger.msbt.lz.decom_wstrs`
-`@@ -357,10 +357,10 @@ Please read before purchasing`
-` this software license.`
-` Next`
-` Back`
-`-Please check the ESRB rating`
-`-information on the upper screen.`
-`+Please check the rating information`
-`+on the upper screen.`
-` Title Information`
-`-ESRB Rating`
-`+Rating Information`
-` Change of Address`
-` Your address information is out of date.`
-` You must enter your current address in`
-`@@ -421,6 +421,12 @@ Please enter the coupon code`
-` correctly. Do not use any special`
-` characters or symbols.`
-` K(incl. tax)`
-`+A Just for You offer is available.`
-`+Would you like to redeem it?`
-`+Redeem offer`
-`+Purchase without redeeming offer`
-`+K(incl. tax) `
-`+K(incl. tax) `
-` Downloadable-Content Information`
-` In order to view information about`
-` downloadable content, Nintendo`
-`@@ -461,7 +467,7 @@ Genre`
-` Languages`
-` Important Information`
-` Compatible Features/Accessories`
-`-ESRB Rating`
-`+Rating Information`
-` Related Keywords`
-` Repair`
-` Repair Software`
+```
+/cad/Common.arc.lz
+/cad/CommonWin.arc.lz
+/cad/Entrance.arc.lz
+/cad/Register.arc.lz
+/cad/TitleInfo.arc.lz
+/message/america/US_English/RI.mstl.lz
+/message/america/US_English/tiger.msbt.lz
+/message/america/US_French/RI.mstl.lz
+/message/america/US_French/tiger.msbt.lz
+/message/america/US_Portuguese/RI.mstl.lz
+/message/america/US_Portuguese/tiger.msbt.lz
+/message/america/US_Spanish/RI.mstl.lz
+/message/america/US_Spanish/tiger.msbt.lz
+```
+
+```
+git diff v20482/tiger.msbt.lz.decom.wstrs v21506/US_English_tiger.msbt.lz.decom_wstrs
+diff --git a/v20482/tiger.msbt.lz.decom.wstrs b/v21506/US_English_tiger.msbt.lz.decom_wstrs
+index 55358d0..3c3938f 100644
+--- a/v20482/tiger.msbt.lz.decom.wstrs
++++ b/v21506/US_English_tiger.msbt.lz.decom_wstrs
+@@ -357,10 +357,10 @@ Please read before purchasing
+ this software license.
+ Next
+ Back
+-Please check the ESRB rating
+-information on the upper screen.
++Please check the rating information
++on the upper screen.
+ Title Information
+-ESRB Rating
++Rating Information
+ Change of Address
+ Your address information is out of date.
+ You must enter your current address in
+@@ -421,6 +421,12 @@ Please enter the coupon code
+ correctly. Do not use any special
+ characters or symbols.
+ K(incl. tax)
++A Just for You offer is available.
++Would you like to redeem it?
++Redeem offer
++Purchase without redeeming offer
++K(incl. tax) 
++K(incl. tax) 
+ Downloadable-Content Information
+ In order to view information about
+ downloadable content, Nintendo
+@@ -461,7 +467,7 @@ Genre
+ Languages
+ Important Information
+ Compatible Features/Accessories
+-ESRB Rating
++Rating Information
+ Related Keywords
+ Repair
+ Repair Software
+```
 
 ### Internet Browser
 

content/11.0.0-33.md

@@ -70,7 +70,9 @@ memory region. This was implemented with the following checks which are
 done for each memchunk separately - right before clearing and mapping
 each one to the requested vaddr.
 
-`if((region_base > memchunk_addr) || ((region_base + region_size) < (memchunk_addr + memchunk_size<<12))) { kernel_panic(); }`
+```
+if((region_base > memchunk_addr) || ((region_base + region_size) < (memchunk_addr + memchunk_size<<12))) { kernel_panic(); }
+```
 
 The actual ToCToU race has not been fixed (see
 [memchunkhax2.1](3DS_System_Flaws "wikilink")).
@@ -85,45 +87,57 @@ detect when it is modified by an outside DMA device
 The MAC itself is custom based on xor-rot-sub-mul, and is calculated as
 follows (pseudo-code):
 
-`u32* crypto_state = (u32*) r4; // Safe kernel memory. This is actually the `[`RegionDescriptor`](Memory_Management#RegionDescriptor "wikilink")`.`
-`u32* data_ptr = (u32*) lr; // Unsafe FCRAM pointer.`
-
-`r0 = crypto_state[16/4] // Load "key".`
-`r1 = crypto_state[20/4]`
-`r2 = crypto_state[28/4]`
-`r3 = crypto_state[24/4]`
-
-`for(size_t i=0; i<2; i++) {`
-`    for(size_t j=0; j<5; j++) {`
-`        r0 -= (r1 >>> 3) - data_ptr[j]`
-`        r1 -= (r3 >>> ((r2 & 0xf) + 3)) ^ (r2 >>> ((r0 & 0xf) + 13))`
-`        r3 -= (r2 >>> r0) * r1`
-`        r2 -= (r0 >>> r1) * r3`
-`    }`
-`}`
-`    `
-`// Verify MAC.`
-`if(data_ptr[5] != (r0 ^ r1)) {`
-`    kernel_panic()`
-`}`
+```
+u32* crypto_state = (u32*) r4; // Safe kernel memory. This is actually the `[`RegionDescriptor`](Memory_Management#RegionDescriptor "wikilink")`.
+u32* data_ptr = (u32*) lr; // Unsafe FCRAM pointer.
+```
+
+```
+r0 = crypto_state[16/4] // Load "key".
+r1 = crypto_state[20/4]
+r2 = crypto_state[28/4]
+r3 = crypto_state[24/4]
+```
+
+```
+for(size_t i=0; i<2; i++) {
+    for(size_t j=0; j<5; j++) {
+        r0 -= (r1 >>> 3) - data_ptr[j]
+        r1 -= (r3 >>> ((r2 & 0xf) + 3)) ^ (r2 >>> ((r0 & 0xf) + 13))
+        r3 -= (r2 >>> r0) * r1
+        r2 -= (r0 >>> r1) * r3
+    }
+}
+    
+// Verify MAC.
+if(data_ptr[5] != (r0 ^ r1)) {
+    kernel_panic()
+}
+```
 
 The function which initializes a memalloc heap had a major update (used
 for FCRAM memregions and the SlabHeap container). It generates a random
 MAC key based on svcGetSystemTick, like this:
 
-`crypto_state[16/4] = 0 //This is actually the `[`RegionDescriptor`](Memory_Management#RegionDescriptor "wikilink")`.`
-`crypto_state[20/4] = 0`
-`crypto_state[24/4] = 0`
-`crypto_state[28/4] = 0`
-
-`u32* key = &crypto_state[16/4];`
-
-`for(size_t i=0; i<0x40; i++) {`
-`    for(size_t j=0; j<4; j++) { `
-`        r0 = key[j] - GetSystemTick()`
-`        key[j] = r0 ^ ((r0 >>> 7) - (key[(i+j) % 4] >>> 17))`
-`    }`
-`}`
+```
+crypto_state[16/4] = 0 //This is actually the `[`RegionDescriptor`](Memory_Management#RegionDescriptor "wikilink")`.
+crypto_state[20/4] = 0
+crypto_state[24/4] = 0
+crypto_state[28/4] = 0
+```
+
+```
+u32* key = &crypto_state[16/4];
+```
+
+```
+for(size_t i=0; i<0x40; i++) {
+    for(size_t j=0; j<4; j++) { 
+        r0 = key[j] - GetSystemTick()
+        key[j] = r0 ^ ((r0 >>> 7) - (key[(i+j) % 4] >>> 17))
+    }
+}
+```
 
 However, it's unknown how much the svcGetSystemTick() output really
 varies if anything(?) for each hard-boot during initialization of the

content/11.1.0-34.md

@@ -53,7 +53,9 @@ to exploit the memory-management code.
 
 The first function ("validateChunk") now makes sure that:
 
-`chunk + currentChunkSize >= currentChunk`
+```
+chunk + currentChunkSize >= currentChunk
+```
 
 when checking that the current chunk doesn't overlap with either the
 previous or next one.
@@ -62,13 +64,17 @@ The second function ("Kern::ControlMemory"), aside from other small
 changes, now makes additional checks on the previously allocated memory
 chunk; the code for that is now:
 
-`if(chunkSizeInPages >= regionSize >> 12 || chunk < regionBase || chunk + chunkSize < chunk || chunk + chunkSize > regionBase + regionSize) panic;`
+```
+if(chunkSizeInPages >= regionSize >> 12 || chunk < regionBase || chunk + chunkSize < chunk || chunk + chunkSize > regionBase + regionSize) panic;
+```
 
 The third function ("insertChunk") now makes the following checks:
 
-`if(chunkSizeInPages >= regionSize >> 12 || regionBase + regionSize < chunk + chunkSize) panic;`
-`// ...`
-`if(leftChunk && leftChunk + leftChunkSize <= leftChunk) panic; // this check was already done on 'right'`
+```
+if(chunkSizeInPages >= regionSize >> 12 || regionBase + regionSize < chunk + chunkSize) panic;
+// ...
+if(leftChunk && leftChunk + leftChunkSize <= leftChunk) panic; // this check was already done on 'right'
+```
 
 #### FIRM-modules