Merge pull request #7 from pixel-stuck/master

add .set reorder to the end of all asm files to prevent issues when including an asm file
2024-11-09 20:42:41 +01:00 · 2020-07-18 01:22:16 -04:00 · 2020-07-18 01:22:16 -04:00 · 75e553d3f6
commit 75e553d3f6
parent 26e4191ba4 be7c78bca3
202 changed files with 412 additions and 1 deletions
--- a/papermario/asm/boot.s
+++ b/papermario/asm/boot.s
@ -789,3 +789,5 @@ func_A4000AC4:
 /* 000B64 A4000B64 00000000 */  nop   
 /* 000B68 A4000B68 00000000 */  nop   
 /* 000B6C A4000B6C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_1000_len_60.s
+++ b/papermario/asm/code_1000_len_60.s
@ -37,3 +37,5 @@ entry_point:
 /* 001054 80025C54 00000000 */  nop   
 /* 001058 80025C58 00000000 */  nop   
 /* 00105C 80025C5C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_101b90_len_8f0.s
+++ b/papermario/asm/code_101b90_len_8f0.s
@ -665,3 +665,5 @@ func_802DF2D8:
 /* 102478 802DF388 27BD0020 */   addiu $sp, $sp, 0x20

 /* 10247C 802DF38C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_102610_len_2330.s
+++ b/papermario/asm/code_102610_len_2330.s
@ -2434,3 +2434,5 @@ func_802E246C:
 /* 104934 802E30B4 00000000 */  nop   
 /* 104938 802E30B8 00000000 */  nop   
 /* 10493C 802E30BC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_10400_len_d30.s
+++ b/papermario/asm/code_10400_len_d30.s
@ -936,3 +936,5 @@

 /* 011128 80035D28 00000000 */  nop   
 /* 01112C 80035D2C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_104940_len_dc0.s
+++ b/papermario/asm/code_104940_len_dc0.s
@ -983,3 +983,5 @@ func_802E3A00:
 /* 1056F4 802E3E74 00000000 */  nop   
 /* 1056F8 802E3E78 00000000 */  nop   
 /* 1056FC 802E3E7C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_105700_len_2130.s
+++ b/papermario/asm/code_105700_len_2130.s
@ -2298,3 +2298,5 @@ func_802E581C:

 /* 107828 802E5FA8 00000000 */  nop   
 /* 10782C 802E5FAC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_1060_len_310.s
+++ b/papermario/asm/code_1060_len_310.s
@ -223,3 +223,5 @@ func_80025CFC:

 /* 001368 80025F68 00000000 */  nop   
 /* 00136C 80025F6C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_107830_len_e70.s
+++ b/papermario/asm/code_107830_len_e70.s
@ -1003,3 +1003,5 @@ func_802E6B6C:
 /* 108694 802E6E14 00000000 */  nop   
 /* 108698 802E6E18 00000000 */  nop   
 /* 10869C 802E6E1C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_1086a0_len_fc0.s
+++ b/papermario/asm/code_1086a0_len_fc0.s
@ -1104,3 +1104,5 @@ func_802E7D38:

 /* 109658 802E7DD8 00000000 */  nop   
 /* 10965C 802E7DDC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_109660_len_1270.s
+++ b/papermario/asm/code_109660_len_1270.s
@ -1349,3 +1349,5 @@ push_entity_matrix:
 /* 10A9E8 802E9168 27BD0028 */   addiu $sp, $sp, 0x28

 /* 10A9EC 802E916C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_111f0_len_860.s
+++ b/papermario/asm/code_111f0_len_860.s
@ -610,3 +610,5 @@ func_80035E54:

 /* 011A48 80036648 00000000 */  nop   
 /* 011A4C 8003664C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_11a50_len_7a0.s
+++ b/papermario/asm/code_11a50_len_7a0.s
@ -535,3 +535,5 @@ func_80036650:

 /* 0121E8 80036DE8 00000000 */  nop   
 /* 0121EC 80036DEC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_121f0_len_1290.s
+++ b/papermario/asm/code_121f0_len_1290.s
@ -1280,3 +1280,5 @@ func_80037E14:

 /* 013478 80038078 00000000 */  nop   
 /* 01347C 8003807C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_13480_len_3f0.s
+++ b/papermario/asm/code_13480_len_3f0.s
@ -280,3 +280,5 @@ next_demo_scene:
 /* 013864 80038464 00000000 */  nop   
 /* 013868 80038468 00000000 */  nop   
 /* 01386C 8003846C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_1370_len_7d0.s
+++ b/papermario/asm/code_1370_len_7d0.s
@ -535,3 +535,5 @@ gfxPreNMI_Callback:
 /* 001B34 80026734 00000000 */  nop   
 /* 001B38 80026738 00000000 */  nop   
 /* 001B3C 8002673C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_13870_len_6980.s
+++ b/papermario/asm/code_13870_len_6980.s
@ -7506,3 +7506,5 @@ get_enemy_safe:

 /* 01A1E8 8003EDE8 00000000 */  nop   
 /* 01A1EC 8003EDEC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_163400.s
+++ b/papermario/asm/code_163400.s
@ -7817,3 +7817,5 @@ func_80249AB8:

 /* 16A3D8 80249B78 00000000 */  nop   
 /* 16A3DC 80249B7C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_16c8e0.s
+++ b/papermario/asm/code_16c8e0.s
@ -75570,3 +75570,5 @@ func_802809C4:
 /* 1AF2B4 802809D4 8FB00010 */  lw    $s0, 0x10($sp)
 /* 1AF2B8 802809D8 24020002 */  addiu $v0, $zero, 2
 /* 1AF2BC 802809DC 03E00008 */  jr    $ra
+
+.set reorder
--- a/papermario/asm/code_1a1f0_len_5390.s
+++ b/papermario/asm/code_1a1f0_len_5390.s
@ -5907,3 +5907,5 @@ func_80044148:
 /* 01F574 80044174 00000000 */  nop   
 /* 01F578 80044178 00000000 */  nop   
 /* 01F57C 8004417C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_1b40_len_20b0.s
+++ b/papermario/asm/code_1b40_len_20b0.s
@ -2255,3 +2255,5 @@ func_80027E10:
 /* 003BE4 800287E4 00000000 */  nop   
 /* 003BE8 800287E8 00000000 */  nop   
 /* 003BEC 800287EC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_1f580_len_1940.s
+++ b/papermario/asm/code_1f580_len_1940.s
@ -1819,3 +1819,5 @@ GetSelfAnimationFromTable:
 /* 020EB4 80045AB4 00000000 */  nop   
 /* 020EB8 80045AB8 00000000 */  nop   
 /* 020EBC 80045ABC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_20ec0_len_5040.s
+++ b/papermario/asm/code_20ec0_len_5040.s
@ -5646,3 +5646,5 @@ func_8004A784:

 /* 025EF8 8004AAF8 00000000 */  nop   
 /* 025EFC 8004AAFC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_25f00_len_940.s
+++ b/papermario/asm/code_25f00_len_940.s
@ -667,3 +667,5 @@ alUnlink:
 /* 026838 8004B438 00000000 */   nop   

 /* 02683C 8004B43C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_26840_len_20d0.s
+++ b/papermario/asm/code_26840_len_20d0.s
@ -2440,3 +2440,5 @@ func_8004D4BC:
 /* 028908 8004D508 00000000 */   nop   

 /* 02890C 8004D50C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_28910_len_5090.s
+++ b/papermario/asm/code_28910_len_5090.s
@ -5891,3 +5891,5 @@ func_8005232C:

 /* 02D998 80052598 00000000 */  nop   
 /* 02D99C 8005259C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_2d9a0_len_890.s
+++ b/papermario/asm/code_2d9a0_len_890.s
@ -635,3 +635,5 @@ func_80052CFC:

 /* 02E228 80052E28 00000000 */  nop   
 /* 02E22C 80052E2C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_2e230_len_2190.s
+++ b/papermario/asm/code_2e230_len_2190.s
@ -2441,3 +2441,5 @@ al_CopyWords:
 /* 0303B8 80054FB8 00000000 */   nop   

 /* 0303BC 80054FBC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_303c0_len_3e10.s
+++ b/papermario/asm/code_303c0_len_3e10.s
@ -4453,3 +4453,5 @@ func_80058C6C:
 /* 0341C4 80058DC4 00000000 */  nop   
 /* 0341C8 80058DC8 00000000 */  nop   
 /* 0341CC 80058DCC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3169f0.s
+++ b/papermario/asm/code_3169f0.s
@ -47,3 +47,5 @@ func_80200000:

 /* 316A68 80200078 00000000 */  nop   
 /* 316A6C 8020007C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_316a70.s
+++ b/papermario/asm/code_316a70.s
@ -121,3 +121,5 @@ func_80200080:

 /* 316BF8 80200208 00000000 */  nop   
 /* 316BFC 8020020C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_316d90.s
+++ b/papermario/asm/code_316d90.s
@ -124,3 +124,5 @@ func_802AE000:
 /* 316F24 802AE194 8FB00018 */  lw    $s0, 0x18($sp)
 /* 316F28 802AE198 03E00008 */  jr    $ra
 /* 316F2C 802AE19C 27BD0040 */   addiu $sp, $sp, 0x40
+
+.set reorder
--- a/papermario/asm/code_341d0_len_20d0.s
+++ b/papermario/asm/code_341d0_len_20d0.s
@ -2321,3 +2321,5 @@ get_asset_offset:
 /* 036294 8005AE94 00000000 */  nop   
 /* 036298 8005AE98 00000000 */  nop   
 /* 03629C 8005AE9C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_362a0_len_2f70.s
+++ b/papermario/asm/code_362a0_len_2f70.s
@ -3257,3 +3257,5 @@ test_ray_entities:
 /* 039204 8005DE04 00000000 */  nop   
 /* 039208 8005DE08 00000000 */  nop   
 /* 03920C 8005DE0C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_39210_len_aa0.s
+++ b/papermario/asm/code_39210_len_aa0.s
@ -750,3 +750,5 @@ get_npc_pos:

 /* 039CA8 8005E8A8 00000000 */  nop   
 /* 039CAC 8005E8AC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_39cb0_len_100.s
+++ b/papermario/asm/code_39cb0_len_100.s
@ -81,3 +81,5 @@ boot_idle:
 /* 039DA4 8005E9A4 00000000 */  nop   
 /* 039DA8 8005E9A8 00000000 */  nop   
 /* 039DAC 8005E9AC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_39db0_len_8a0.s
+++ b/papermario/asm/code_39db0_len_8a0.s
@ -632,3 +632,5 @@ nuScWaitTaskReady:

 /* 03A648 8005F248 00000000 */  nop   
 /* 03A64C 8005F24C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3a650_len_40.s
+++ b/papermario/asm/code_3a650_len_40.s
@ -29,3 +29,5 @@ nuGfxFuncSet:
 /* 03A688 8005F288 27BD0018 */   addiu $sp, $sp, 0x18

 /* 03A68C 8005F28C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3a690_len_40.s
+++ b/papermario/asm/code_3a690_len_40.s
@ -29,3 +29,5 @@ nuGfxPreNMIFuncSet:

 /* 03A6C8 8005F2C8 00000000 */  nop   
 /* 03A6CC 8005F2CC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3a6d0_len_20.s
+++ b/papermario/asm/code_3a6d0_len_20.s
@ -22,3 +22,5 @@ nuGfxTaskAllEndWait:

 /* 03A6E8 8005F2E8 00000000 */  nop   
 /* 03A6EC 8005F2EC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3a6f0_len_110.s
+++ b/papermario/asm/code_3a6f0_len_110.s
@ -90,3 +90,5 @@ nuGfxSetCfb:
 /* 03A7F8 8005F3F8 27BD0020 */   addiu $sp, $sp, 0x20

 /* 03A7FC 8005F3FC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3a800_len_30.s
+++ b/papermario/asm/code_3a800_len_30.s
@ -25,3 +25,5 @@ nuGfxDisplayOff:
 /* 03A824 8005F424 00000000 */  nop   
 /* 03A828 8005F428 00000000 */  nop   
 /* 03A82C 8005F42C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3a830_len_20.s
+++ b/papermario/asm/code_3a830_len_20.s
@ -21,3 +21,5 @@ nuGfxDisplayOn:
 /* 03A844 8005F444 00000000 */  nop   
 /* 03A848 8005F448 00000000 */  nop   
 /* 03A84C 8005F44C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3a850_le_a40.s
+++ b/papermario/asm/code_3a850_le_a40.s
@ -755,3 +755,5 @@ contRmbStartMesg:
 /* 03B284 8005FE84 00000000 */  nop   
 /* 03B288 8005FE88 00000000 */  nop   
 /* 03B28C 8005FE8C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3b290_len_100.s
+++ b/papermario/asm/code_3b290_len_100.s
@ -83,3 +83,5 @@ nuContRmbCheck:
 /* 03B384 8005FF84 00000000 */  nop   
 /* 03B388 8005FF88 00000000 */  nop   
 /* 03B38C 8005FF8C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3b390_len_110.s
+++ b/papermario/asm/code_3b390_len_110.s
@ -91,3 +91,5 @@ nuContRmbModeSet:
 /* 03B494 80060094 00000000 */  nop   
 /* 03B498 80060098 00000000 */  nop   
 /* 03B49C 8006009C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3b4a0_len_270.s
+++ b/papermario/asm/code_3b4a0_len_270.s
@ -186,3 +186,5 @@ nuGfxThread:

 /* 03B708 80060308 00000000 */  nop   
 /* 03B70C 8006030C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3b710_len_40.s
+++ b/papermario/asm/code_3b710_len_40.s
@ -29,3 +29,5 @@ nuGfxSwapCfbFuncSet:

 /* 03B748 80060348 00000000 */  nop   
 /* 03B74C 8006034C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3b770_len_80.s
+++ b/papermario/asm/code_3b770_len_80.s
@ -47,3 +47,5 @@ nuGfxRetraceWait:
 /* 03B7E4 800603E4 00000000 */  nop   
 /* 03B7E8 800603E8 00000000 */  nop   
 /* 03B7EC 800603EC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3b7f0_len_120.s
+++ b/papermario/asm/code_3b7f0_len_120.s
@ -96,3 +96,5 @@ nuSiCallBackRemove:

 /* 03B908 80060508 00000000 */  nop   
 /* 03B90C 8006050C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3b910_len_410.s
+++ b/papermario/asm/code_3b910_len_410.s
@ -301,3 +301,5 @@ nuContDataUnLock:
 /* 03BD18 80060918 27BD0018 */   addiu $sp, $sp, 0x18

 /* 03BD1C 8006091C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3bd20_len_c0.s
+++ b/papermario/asm/code_3bd20_len_c0.s
@ -63,3 +63,5 @@ osSetIntMask:
 /* 03BDD4 800609D4 00000000 */  nop   
 /* 03BDD8 800609D8 03E00008 */  jr    $ra
 /* 03BDDC 800609DC 00000000 */   nop   
+
+.set reorder
--- a/papermario/asm/code_3bde0_len_3e0.s
+++ b/papermario/asm/code_3bde0_len_3e0.s
@ -287,3 +287,5 @@ osEPiWriteIo:

 /* 03C1B8 80060DB8 00000000 */  nop   
 /* 03C1BC 80060DBC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3bf0_len_6f0.s
+++ b/papermario/asm/code_3bf0_len_6f0.s
@ -517,3 +517,5 @@ update_input:
 /* 0042D4 80028ED4 00000000 */  nop   
 /* 0042D8 80028ED8 00000000 */  nop   
 /* 0042DC 80028EDC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3c1c0_len_60.s
+++ b/papermario/asm/code_3c1c0_len_60.s
@ -37,3 +37,5 @@ osEPiReadIo:

 /* 03C218 80060E18 00000000 */  nop   
 /* 03C21C 80060E1C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3c220_len_a0.s
+++ b/papermario/asm/code_3c220_len_a0.s
@ -61,3 +61,5 @@ osEPiStartDma:
 /* 03C2B4 80060EB4 00000000 */  nop   
 /* 03C2B8 80060EB8 00000000 */  nop   
 /* 03C2BC 80060EBC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3c2c0_len_50.s
+++ b/papermario/asm/code_3c2c0_len_50.s
@ -33,3 +33,5 @@ osEPiLinkHandle:
 /* 03C304 80060F04 00000000 */  nop   
 /* 03C308 80060F08 00000000 */  nop   
 /* 03C30C 80060F0C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3c310_len_180.s
+++ b/papermario/asm/code_3c310_len_180.s
@ -112,3 +112,5 @@ osCartRomInit:

 /* 03C488 80061088 00000000 */  nop   
 /* 03C48C 8006108C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3c490_len_3c0.s
+++ b/papermario/asm/code_3c490_len_3c0.s
@ -270,3 +270,5 @@ osDevMgrMain:

 /* 03C848 80061448 00000000 */  nop   
 /* 03C84C 8006144C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3c850_len_f0.s
+++ b/papermario/asm/code_3c850_len_f0.s
@ -78,3 +78,5 @@ osPiRelAccess:

 /* 03C938 80061538 00000000 */  nop   
 /* 03C93C 8006153C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3c940_len_140.s
+++ b/papermario/asm/code_3c940_len_140.s
@ -105,3 +105,5 @@ osAiSetFrequency:

 /* 03CA78 80061678 00000000 */  nop   
 /* 03CA7C 8006167C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3ca80_len_a0.s
+++ b/papermario/asm/code_3ca80_len_a0.s
@ -58,3 +58,5 @@ osAiSetNextBuffer:
 /* 03CB14 80061714 00000000 */  nop   
 /* 03CB18 80061718 00000000 */  nop   
 /* 03CB1C 8006171C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3cb20_len_130.s
+++ b/papermario/asm/code_3cb20_len_130.s
@ -102,3 +102,5 @@ osInvalICache:
 /* 03CC44 80061844 00000000 */  nop   
 /* 03CC48 80061848 00000000 */  nop   
 /* 03CC4C 8006184C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3cc50_len_80.s
+++ b/papermario/asm/code_3cc50_len_80.s
@ -50,3 +50,5 @@ osWritebackDCache:
 /* 03CCC4 800618C4 00000000 */  nop   
 /* 03CCC8 800618C8 00000000 */  nop   
 /* 03CCCC 800618CC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3ccd0_len_30.s
+++ b/papermario/asm/code_3ccd0_len_30.s
@ -26,3 +26,5 @@ osWritebackDCacheAll:

 /* 03CCF8 800618F8 00000000 */  nop   
 /* 03CCFC 800618FC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3cd00_len_5f0.s
+++ b/papermario/asm/code_3cd00_len_5f0.s
@ -431,3 +431,5 @@ osVirtualToPhysical:
 /* 03D2E4 80061EE4 00000000 */  nop   
 /* 03D2E8 80061EE8 00000000 */  nop   
 /* 03D2EC 80061EEC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3d2f0_len_10.s
+++ b/papermario/asm/code_3d2f0_len_10.s
@ -17,3 +17,5 @@ sqrtf:

 /* 03D2F8 80061EF8 00000000 */  nop   
 /* 03D2FC 80061EFC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3d300_len_30.s
+++ b/papermario/asm/code_3d300_len_30.s
@ -25,3 +25,5 @@ coss:

 /* 03D328 80061F28 00000000 */  nop   
 /* 03D32C 80061F2C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3d330_len_990.s
+++ b/papermario/asm/code_3d330_len_990.s
@ -641,3 +641,5 @@ guLookAt:
 /* 03DCB4 800628B4 00000000 */  nop   
 /* 03DCB8 800628B8 00000000 */  nop   
 /* 03DCBC 800628BC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3dcc0_len_a60.s
+++ b/papermario/asm/code_3dcc0_len_a60.s
@ -708,3 +708,5 @@ guLookAtHilite:

 /* 03E718 80063318 00000000 */  nop   
 /* 03E71C 8006331C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3e720_len_5f0.s
+++ b/papermario/asm/code_3e720_len_5f0.s
@ -416,3 +416,5 @@ guLookAtReflect:
 /* 03ED04 80063904 00000000 */  nop   
 /* 03ED08 80063908 00000000 */  nop   
 /* 03ED0C 8006390C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3ed10_len_600.s
+++ b/papermario/asm/code_3ed10_len_600.s
@ -421,3 +421,5 @@ guPerspective:

 /* 03F308 80063F08 00000000 */  nop   
 /* 03F30C 80063F0C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3f310_len_3c0.s
+++ b/papermario/asm/code_3f310_len_3c0.s
@ -255,3 +255,5 @@ guPosition:

 /* 03F6C8 800642C8 00000000 */  nop   
 /* 03F6CC 800642CC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3f6d0_len_320.s
+++ b/papermario/asm/code_3f6d0_len_320.s
@ -215,3 +215,5 @@ guRotateAngles:
 /* 03F9E4 800645E4 00000000 */  nop   
 /* 03F9E8 800645E8 00000000 */  nop   
 /* 03F9EC 800645EC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3f9f0_len_60.s
+++ b/papermario/asm/code_3f9f0_len_60.s
@ -43,3 +43,5 @@ sins:
 /* 03FA44 80064644 00000000 */  nop   
 /* 03FA48 80064648 00000000 */  nop   
 /* 03FA4C 8006464C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_3fa50_len_f60.s
+++ b/papermario/asm/code_3fa50_len_f60.s
@ -1139,3 +1139,5 @@ osCreateMesgQueue:
 /* 0409A4 800655A4 00000000 */  nop   
 /* 0409A8 800655A8 00000000 */  nop   
 /* 0409AC 800655AC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_409b0_len_140.s
+++ b/papermario/asm/code_409b0_len_140.s
@ -101,3 +101,5 @@ osJamMesg:
 /* 040AE4 800656E4 00000000 */  nop   
 /* 040AE8 800656E8 00000000 */  nop   
 /* 040AEC 800656EC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_40af0_len_130.s
+++ b/papermario/asm/code_40af0_len_130.s
@ -98,3 +98,5 @@ osRecvMesg:
 /* 040C14 80065814 00000000 */  nop   
 /* 040C18 80065818 00000000 */  nop   
 /* 040C1C 8006581C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_40c20_len_1f0.s
+++ b/papermario/asm/code_40c20_len_1f0.s
@ -151,3 +151,5 @@ osGetCount:
 /* 040E08 80065A08 00000000 */   nop   

 /* 040E0C 80065A0C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_40e10_len_240.s
+++ b/papermario/asm/code_40e10_len_240.s
@ -172,3 +172,5 @@ osSpTaskStartGo:

 /* 041048 80065C48 00000000 */  nop   
 /* 04104C 80065C4C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_41050_len_120.s
+++ b/papermario/asm/code_41050_len_120.s
@ -97,3 +97,5 @@ osSiRawStartDma:
 /* 041164 80065D64 00000000 */  nop   
 /* 041168 80065D68 00000000 */  nop   
 /* 04116C 80065D6C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_41170_len_f0.s
+++ b/papermario/asm/code_41170_len_f0.s
@ -78,3 +78,5 @@ osSiRelAccess:

 /* 041258 80065E58 00000000 */  nop   
 /* 04125C 80065E5C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_41260_len_f0.s
+++ b/papermario/asm/code_41260_len_f0.s
@ -76,3 +76,5 @@ osGetThreadPri:

 /* 041348 80065F48 00000000 */  nop   
 /* 04134C 80065F4C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_41350_len_d0.s
+++ b/papermario/asm/code_41350_len_d0.s
@ -68,3 +68,5 @@ osSetThreadPri:

 /* 041418 80066018 00000000 */  nop   
 /* 04141C 8006601C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_41420_len_120.s
+++ b/papermario/asm/code_41420_len_120.s
@ -95,3 +95,5 @@ osStartThread:

 /* 041538 80066138 00000000 */  nop   
 /* 04153C 8006613C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_41540_len_c0.s
+++ b/papermario/asm/code_41540_len_c0.s
@ -69,3 +69,5 @@ osStopThread:
 /* 0415F4 800661F4 00000000 */  nop   
 /* 0415F8 800661F8 00000000 */  nop   
 /* 0415FC 800661FC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_415D90.s
+++ b/papermario/asm/code_415D90.s
@ -11543,3 +11543,5 @@ func_802AB2EC:
 /* 4200B4 802AB324 D7B40090 */  ldc1  $f20, 0x90($sp)
 /* 4200B8 802AB328 03E00008 */  jr    $ra
 /* 4200BC 802AB32C 27BD00A8 */   addiu $sp, $sp, 0xa8
+
+.set reorder
--- a/papermario/asm/code_41600_len_40.s
+++ b/papermario/asm/code_41600_len_40.s
@ -33,3 +33,5 @@ osDequeueThread:
 /* 041634 80066234 00000000 */  nop   
 /* 041638 80066238 00000000 */  nop   
 /* 04163C 8006623C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_41640_len_50.s
+++ b/papermario/asm/code_41640_len_50.s
@ -33,3 +33,5 @@ osYieldThread:

 /* 041688 80066288 00000000 */  nop   
 /* 04168C 8006628C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_41690_len_10.s
+++ b/papermario/asm/code_41690_len_10.s
@ -17,3 +17,5 @@ osGetActiveQueue:
 /* 041698 80066298 8C42465C */   lw    $v0, 0x465c($v0)

 /* 04169C 8006629C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_416a0_len_90.s
+++ b/papermario/asm/code_416a0_len_90.s
@ -49,3 +49,5 @@ osGetTime:
 /* 041724 80066324 00000000 */  nop   
 /* 041728 80066328 00000000 */  nop   
 /* 04172C 8006632C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_41730_len_20.s
+++ b/papermario/asm/code_41730_len_20.s
@ -21,3 +21,5 @@ osSetTime:
 /* 041744 80066344 00000000 */  nop   
 /* 041748 80066348 00000000 */  nop   
 /* 04174C 8006634C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_41750_len_450.s
+++ b/papermario/asm/code_41750_len_450.s
@ -320,3 +320,5 @@ osInsertTimer:

 /* 041B98 80066798 00000000 */  nop   
 /* 041B9C 8006679C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_41ba0_len_c0.s
+++ b/papermario/asm/code_41ba0_len_c0.s
@ -67,3 +67,5 @@ osMapTLB:
 /* 041C54 80066854 00000000 */  nop   
 /* 041C58 80066858 00000000 */  nop   
 /* 041C5C 8006685C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_41c60_len_c0.s
+++ b/papermario/asm/code_41c60_len_c0.s
@ -65,3 +65,5 @@ osProbeTLB:

 /* 041D18 80066918 00000000 */  nop   
 /* 041D1C 8006691C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_41d20_len_40.s
+++ b/papermario/asm/code_41d20_len_40.s
@ -29,3 +29,5 @@ osUnmapTLB:
 /* 041D58 80066958 00000000 */   nop   

 /* 041D5C 8006695C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_41d60_len_50.s
+++ b/papermario/asm/code_41d60_len_50.s
@ -34,3 +34,5 @@ osUnmapTLBAll:
 /* 041DA4 800669A4 00000000 */  nop   
 /* 041DA8 800669A8 00000000 */  nop   
 /* 041DAC 800669AC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_41db0_len_40.s
+++ b/papermario/asm/code_41db0_len_40.s
@ -29,3 +29,5 @@ osViGetCurrentFramebuffer:

 /* 041DE8 800669E8 00000000 */  nop   
 /* 041DEC 800669EC 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_41df0_len_40.s
+++ b/papermario/asm/code_41df0_len_40.s
@ -29,3 +29,5 @@ osViGetNextFramebuffer:

 /* 041E28 80066A28 00000000 */  nop   
 /* 041E2C 80066A2C 00000000 */  nop   
+
+.set reorder
--- a/papermario/asm/code_41e30_len_40.s
+++ b/papermario/asm/code_41e30_len_40.s
@ -29,3 +29,5 @@ osViGetCurrentMode:
 /* 041E68 80066A68 27BD0018 */   addiu $sp, $sp, 0x18

 /* 041E6C 80066A6C 00000000 */  nop   
+
+.set reorder
--- a/Show More
+++ b/Show More