diff --git a/papermario/asm/boot.s b/papermario/asm/boot.s index 84565ec156..345dcf2b97 100644 --- 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 diff --git a/papermario/asm/code_1000_len_60.s b/papermario/asm/code_1000_len_60.s index 2dbaba4af7..c627e4d521 100644 --- 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 diff --git a/papermario/asm/code_101b90_len_8f0.s b/papermario/asm/code_101b90_len_8f0.s index 91987ae7c3..9f5e1f0422 100644 --- 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 diff --git a/papermario/asm/code_102610_len_2330.s b/papermario/asm/code_102610_len_2330.s index 5ac3bb8bbf..84ffc88e2c 100644 --- 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 diff --git a/papermario/asm/code_10400_len_d30.s b/papermario/asm/code_10400_len_d30.s index 2d79d37d4e..7d5f70b3ff 100644 --- 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 diff --git a/papermario/asm/code_104940_len_dc0.s b/papermario/asm/code_104940_len_dc0.s index 30dcc24ee1..c483aac4b2 100644 --- 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 diff --git a/papermario/asm/code_105700_len_2130.s b/papermario/asm/code_105700_len_2130.s index 2086d372b2..4ed15f0b56 100644 --- 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 diff --git a/papermario/asm/code_1060_len_310.s b/papermario/asm/code_1060_len_310.s index 5d089c4de9..90bda6ecd0 100644 --- 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 diff --git a/papermario/asm/code_107830_len_e70.s b/papermario/asm/code_107830_len_e70.s index 9a4e865142..16be42aec4 100644 --- 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 diff --git a/papermario/asm/code_1086a0_len_fc0.s b/papermario/asm/code_1086a0_len_fc0.s index b50820f25f..b398eca50e 100644 --- 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 diff --git a/papermario/asm/code_109660_len_1270.s b/papermario/asm/code_109660_len_1270.s index 3f4c9eaffa..745ae4a2ec 100644 --- 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 diff --git a/papermario/asm/code_111f0_len_860.s b/papermario/asm/code_111f0_len_860.s index 9612434e5f..75a24258df 100644 --- 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 diff --git a/papermario/asm/code_11a50_len_7a0.s b/papermario/asm/code_11a50_len_7a0.s index e7059d783e..8788da8f89 100644 --- 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 diff --git a/papermario/asm/code_121f0_len_1290.s b/papermario/asm/code_121f0_len_1290.s index 6fca706b31..fc0213e722 100644 --- 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 diff --git a/papermario/asm/code_13480_len_3f0.s b/papermario/asm/code_13480_len_3f0.s index c568e0c18e..036f3e21d1 100644 --- 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 diff --git a/papermario/asm/code_1370_len_7d0.s b/papermario/asm/code_1370_len_7d0.s index eb037a97c2..e2b6258cdd 100644 --- 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 diff --git a/papermario/asm/code_13870_len_6980.s b/papermario/asm/code_13870_len_6980.s index aaf190ee7c..fa7bceb19f 100644 --- 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 diff --git a/papermario/asm/code_163400.s b/papermario/asm/code_163400.s index 3539b3a784..ad9fb97187 100644 --- 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 diff --git a/papermario/asm/code_16c8e0.s b/papermario/asm/code_16c8e0.s index c47a6c5461..8d91fc9467 100644 --- 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 diff --git a/papermario/asm/code_1a1f0_len_5390.s b/papermario/asm/code_1a1f0_len_5390.s index cbc0a49e92..f095f92b70 100644 --- 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 diff --git a/papermario/asm/code_1b40_len_20b0.s b/papermario/asm/code_1b40_len_20b0.s index c12179a666..50577b178d 100644 --- 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 diff --git a/papermario/asm/code_1f580_len_1940.s b/papermario/asm/code_1f580_len_1940.s index acd8a54ef5..2156d8a8c9 100644 --- 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 diff --git a/papermario/asm/code_20ec0_len_5040.s b/papermario/asm/code_20ec0_len_5040.s index 0b1a31b5fd..f2e265dbb7 100644 --- 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 diff --git a/papermario/asm/code_25f00_len_940.s b/papermario/asm/code_25f00_len_940.s index ff3a4d5ecf..79d9524f80 100644 --- 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 diff --git a/papermario/asm/code_26840_len_20d0.s b/papermario/asm/code_26840_len_20d0.s index 7b4ecc1541..95a290cb16 100644 --- 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 diff --git a/papermario/asm/code_28910_len_5090.s b/papermario/asm/code_28910_len_5090.s index 6bb62d2b2b..02e70499f6 100644 --- 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 diff --git a/papermario/asm/code_2d9a0_len_890.s b/papermario/asm/code_2d9a0_len_890.s index e963bb76e6..f257ff4d6d 100644 --- 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 diff --git a/papermario/asm/code_2e230_len_2190.s b/papermario/asm/code_2e230_len_2190.s index eb5da87f34..86f238bc0e 100644 --- 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 diff --git a/papermario/asm/code_303c0_len_3e10.s b/papermario/asm/code_303c0_len_3e10.s index a8e1e50d95..c2bd487f1a 100644 --- 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 diff --git a/papermario/asm/code_3169f0.s b/papermario/asm/code_3169f0.s index 6d6c64bab2..6f68ad06a5 100644 --- 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 diff --git a/papermario/asm/code_316a70.s b/papermario/asm/code_316a70.s index 49906a0524..9fdc46f9bf 100644 --- 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 diff --git a/papermario/asm/code_316d90.s b/papermario/asm/code_316d90.s index 63d1604942..8deba2cf18 100644 --- 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 diff --git a/papermario/asm/code_341d0_len_20d0.s b/papermario/asm/code_341d0_len_20d0.s index e394eb496e..4f3438f314 100644 --- 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 diff --git a/papermario/asm/code_362a0_len_2f70.s b/papermario/asm/code_362a0_len_2f70.s index f4cf4e231f..8e5e1a31fe 100644 --- 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 diff --git a/papermario/asm/code_39210_len_aa0.s b/papermario/asm/code_39210_len_aa0.s index ca3781e251..f4ee2dc8c9 100644 --- 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 diff --git a/papermario/asm/code_39cb0_len_100.s b/papermario/asm/code_39cb0_len_100.s index b6dc5a24fd..62725e0119 100644 --- 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 diff --git a/papermario/asm/code_39db0_len_8a0.s b/papermario/asm/code_39db0_len_8a0.s index 4daf274f0d..e168c18782 100644 --- 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 diff --git a/papermario/asm/code_3a650_len_40.s b/papermario/asm/code_3a650_len_40.s index e2bfd7d07e..832d3caad1 100644 --- 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 diff --git a/papermario/asm/code_3a690_len_40.s b/papermario/asm/code_3a690_len_40.s index 4c9a266734..2700e9664f 100644 --- 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 diff --git a/papermario/asm/code_3a6d0_len_20.s b/papermario/asm/code_3a6d0_len_20.s index cfc843a163..cda5ce8895 100644 --- 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 diff --git a/papermario/asm/code_3a6f0_len_110.s b/papermario/asm/code_3a6f0_len_110.s index a6c080828c..09dcb44be4 100644 --- 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 diff --git a/papermario/asm/code_3a800_len_30.s b/papermario/asm/code_3a800_len_30.s index 522e0bf9e4..3b8930371f 100644 --- 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 diff --git a/papermario/asm/code_3a830_len_20.s b/papermario/asm/code_3a830_len_20.s index a5cd619c4d..e2196c54b5 100644 --- 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 diff --git a/papermario/asm/code_3a850_le_a40.s b/papermario/asm/code_3a850_le_a40.s index ececfa3124..f4a7d06860 100644 --- 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 diff --git a/papermario/asm/code_3b290_len_100.s b/papermario/asm/code_3b290_len_100.s index 50ebc918f6..10d34c4e55 100644 --- 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 diff --git a/papermario/asm/code_3b390_len_110.s b/papermario/asm/code_3b390_len_110.s index 72018ff544..dfbe5ae9f4 100644 --- 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 diff --git a/papermario/asm/code_3b4a0_len_270.s b/papermario/asm/code_3b4a0_len_270.s index c15c432271..f2f28aefb4 100644 --- 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 diff --git a/papermario/asm/code_3b710_len_40.s b/papermario/asm/code_3b710_len_40.s index 8308727d04..6cebf2ba23 100644 --- 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 diff --git a/papermario/asm/code_3b770_len_80.s b/papermario/asm/code_3b770_len_80.s index 1d2843e474..04893c769d 100644 --- 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 diff --git a/papermario/asm/code_3b7f0_len_120.s b/papermario/asm/code_3b7f0_len_120.s index 37b71a6d4f..157dc87158 100644 --- 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 diff --git a/papermario/asm/code_3b910_len_410.s b/papermario/asm/code_3b910_len_410.s index 53be8fc7ba..8b31c0a560 100644 --- 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 diff --git a/papermario/asm/code_3bd20_len_c0.s b/papermario/asm/code_3bd20_len_c0.s index 415d499d96..f57670702c 100644 --- 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 diff --git a/papermario/asm/code_3bde0_len_3e0.s b/papermario/asm/code_3bde0_len_3e0.s index e01fd0dc73..e250d18107 100644 --- 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 diff --git a/papermario/asm/code_3bf0_len_6f0.s b/papermario/asm/code_3bf0_len_6f0.s index b6a7e87ed7..28f258c435 100644 --- 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 diff --git a/papermario/asm/code_3c1c0_len_60.s b/papermario/asm/code_3c1c0_len_60.s index a57163d06c..9845c49f24 100644 --- 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 diff --git a/papermario/asm/code_3c220_len_a0.s b/papermario/asm/code_3c220_len_a0.s index 0d83af8d3b..739df407f7 100644 --- 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 diff --git a/papermario/asm/code_3c2c0_len_50.s b/papermario/asm/code_3c2c0_len_50.s index f5b4df88b1..fa88618192 100644 --- 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 diff --git a/papermario/asm/code_3c310_len_180.s b/papermario/asm/code_3c310_len_180.s index 3754b91590..b45c86478f 100644 --- 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 diff --git a/papermario/asm/code_3c490_len_3c0.s b/papermario/asm/code_3c490_len_3c0.s index d75a923aef..43835bf714 100644 --- 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 diff --git a/papermario/asm/code_3c850_len_f0.s b/papermario/asm/code_3c850_len_f0.s index 25b9815a29..909c518595 100644 --- 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 diff --git a/papermario/asm/code_3c940_len_140.s b/papermario/asm/code_3c940_len_140.s index 812eac04ed..5e121d480d 100644 --- 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 diff --git a/papermario/asm/code_3ca80_len_a0.s b/papermario/asm/code_3ca80_len_a0.s index ceaf83570f..0e5c4fbac8 100644 --- 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 diff --git a/papermario/asm/code_3cb20_len_130.s b/papermario/asm/code_3cb20_len_130.s index a6933b3b72..a9302805b8 100644 --- 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 diff --git a/papermario/asm/code_3cc50_len_80.s b/papermario/asm/code_3cc50_len_80.s index 53e1d9f3e5..07bf68ae11 100644 --- 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 diff --git a/papermario/asm/code_3ccd0_len_30.s b/papermario/asm/code_3ccd0_len_30.s index 1fbf735cb3..657ea49a67 100644 --- 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 diff --git a/papermario/asm/code_3cd00_len_5f0.s b/papermario/asm/code_3cd00_len_5f0.s index 643a778d20..34f31e4c49 100644 --- 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 diff --git a/papermario/asm/code_3d2f0_len_10.s b/papermario/asm/code_3d2f0_len_10.s index bf6726c737..32479facf5 100644 --- 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 diff --git a/papermario/asm/code_3d300_len_30.s b/papermario/asm/code_3d300_len_30.s index ef4b8237c0..3945be55ae 100644 --- 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 diff --git a/papermario/asm/code_3d330_len_990.s b/papermario/asm/code_3d330_len_990.s index 9b5e7b8bc3..9d36e3844f 100644 --- 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 diff --git a/papermario/asm/code_3dcc0_len_a60.s b/papermario/asm/code_3dcc0_len_a60.s index 38f57c1947..27f0cd05fb 100644 --- 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 diff --git a/papermario/asm/code_3e720_len_5f0.s b/papermario/asm/code_3e720_len_5f0.s index 9aaa4b9f75..82fdf05577 100644 --- 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 diff --git a/papermario/asm/code_3ed10_len_600.s b/papermario/asm/code_3ed10_len_600.s index d51d529089..7d220524e6 100644 --- 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 diff --git a/papermario/asm/code_3f310_len_3c0.s b/papermario/asm/code_3f310_len_3c0.s index 771dbaf19e..9a79e0f2c2 100644 --- 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 diff --git a/papermario/asm/code_3f6d0_len_320.s b/papermario/asm/code_3f6d0_len_320.s index 2fdddc8d91..b54eda3993 100644 --- 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 diff --git a/papermario/asm/code_3f9f0_len_60.s b/papermario/asm/code_3f9f0_len_60.s index 59ae12f1d7..bec5673dcb 100644 --- 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 diff --git a/papermario/asm/code_3fa50_len_f60.s b/papermario/asm/code_3fa50_len_f60.s index 4b156abf7b..e664a25eb4 100644 --- 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 diff --git a/papermario/asm/code_409b0_len_140.s b/papermario/asm/code_409b0_len_140.s index 8803799f01..00016bf968 100644 --- 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 diff --git a/papermario/asm/code_40af0_len_130.s b/papermario/asm/code_40af0_len_130.s index c904d4cb24..e3804e3158 100644 --- 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 diff --git a/papermario/asm/code_40c20_len_1f0.s b/papermario/asm/code_40c20_len_1f0.s index 80310faac9..10f5636673 100644 --- 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 diff --git a/papermario/asm/code_40e10_len_240.s b/papermario/asm/code_40e10_len_240.s index 171cb05bbe..e75aa0ba06 100644 --- 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 diff --git a/papermario/asm/code_41050_len_120.s b/papermario/asm/code_41050_len_120.s index 9f0961f77f..ee79530828 100644 --- 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 diff --git a/papermario/asm/code_41170_len_f0.s b/papermario/asm/code_41170_len_f0.s index ed6791b894..135ef73af1 100644 --- 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 diff --git a/papermario/asm/code_41260_len_f0.s b/papermario/asm/code_41260_len_f0.s index 7063ee8b53..a1f660e597 100644 --- 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 diff --git a/papermario/asm/code_41350_len_d0.s b/papermario/asm/code_41350_len_d0.s index 336dee1d92..3bd09879d7 100644 --- 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 diff --git a/papermario/asm/code_41420_len_120.s b/papermario/asm/code_41420_len_120.s index 90412e4f0c..c5083c7988 100644 --- 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 diff --git a/papermario/asm/code_41540_len_c0.s b/papermario/asm/code_41540_len_c0.s index d9faff48c4..9436077b99 100644 --- 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 diff --git a/papermario/asm/code_415D90.s b/papermario/asm/code_415D90.s index 7a449599a1..fbacee3467 100644 --- 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 diff --git a/papermario/asm/code_41600_len_40.s b/papermario/asm/code_41600_len_40.s index 90aa8653fb..d4dd3168a8 100644 --- 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 diff --git a/papermario/asm/code_41640_len_50.s b/papermario/asm/code_41640_len_50.s index 53a17af399..9649f00c5f 100644 --- 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 diff --git a/papermario/asm/code_41690_len_10.s b/papermario/asm/code_41690_len_10.s index 2b2fa93b81..bce3301131 100644 --- 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 diff --git a/papermario/asm/code_416a0_len_90.s b/papermario/asm/code_416a0_len_90.s index 8f2b73cce0..5c337686f3 100644 --- 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 diff --git a/papermario/asm/code_41730_len_20.s b/papermario/asm/code_41730_len_20.s index 076e02e10f..9d2f83e012 100644 --- 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 diff --git a/papermario/asm/code_41750_len_450.s b/papermario/asm/code_41750_len_450.s index b3a7bca571..a4f71f9902 100644 --- 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 diff --git a/papermario/asm/code_41ba0_len_c0.s b/papermario/asm/code_41ba0_len_c0.s index 6c3e22fdcf..3872160488 100644 --- 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 diff --git a/papermario/asm/code_41c60_len_c0.s b/papermario/asm/code_41c60_len_c0.s index f99062b804..3ae9db330c 100644 --- 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 diff --git a/papermario/asm/code_41d20_len_40.s b/papermario/asm/code_41d20_len_40.s index 809cfb5f3a..686285c2a7 100644 --- 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 diff --git a/papermario/asm/code_41d60_len_50.s b/papermario/asm/code_41d60_len_50.s index 6a00bcc6e7..6a2a2811eb 100644 --- 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 diff --git a/papermario/asm/code_41db0_len_40.s b/papermario/asm/code_41db0_len_40.s index 929090d07c..44ecb57f09 100644 --- 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 diff --git a/papermario/asm/code_41df0_len_40.s b/papermario/asm/code_41df0_len_40.s index 2a1c4c5096..3c3167a48d 100644 --- 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 diff --git a/papermario/asm/code_41e30_len_40.s b/papermario/asm/code_41e30_len_40.s index f04f739a52..89116d912b 100644 --- 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 diff --git a/papermario/asm/code_41e70_len_340.s b/papermario/asm/code_41e70_len_340.s index 8bfbd82f65..6d8bc06d65 100644 --- a/papermario/asm/code_41e70_len_340.s +++ b/papermario/asm/code_41e70_len_340.s @@ -235,3 +235,5 @@ viMgrMain: /* 0421A8 80066DA8 00000000 */ nop /* 0421AC 80066DAC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_421b0_len_60.s b/papermario/asm/code_421b0_len_60.s index 5ead05b964..9091854d1d 100644 --- a/papermario/asm/code_421b0_len_60.s +++ b/papermario/asm/code_421b0_len_60.s @@ -37,3 +37,5 @@ osViSetEvent: /* 042208 80066E08 00000000 */ nop /* 04220C 80066E0C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_42210_len_50.s b/papermario/asm/code_42210_len_50.s index cfa7eb70b3..69e464f74a 100644 --- a/papermario/asm/code_42210_len_50.s +++ b/papermario/asm/code_42210_len_50.s @@ -33,3 +33,5 @@ osViSetMode: /* 042258 80066E58 27BD0018 */ addiu $sp, $sp, 0x18 /* 04225C 80066E5C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_42260_len_170.s b/papermario/asm/code_42260_len_170.s index 189aac061a..087c094282 100644 --- a/papermario/asm/code_42260_len_170.s +++ b/papermario/asm/code_42260_len_170.s @@ -113,3 +113,5 @@ osViSetSpecialFeatures: /* 0423C4 80066FC4 00000000 */ nop /* 0423C8 80066FC8 00000000 */ nop /* 0423CC 80066FCC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_423d0_len_50.s b/papermario/asm/code_423d0_len_50.s index 09b83e45fa..bb529d3993 100644 --- a/papermario/asm/code_423d0_len_50.s +++ b/papermario/asm/code_423d0_len_50.s @@ -33,3 +33,5 @@ osViSetYScale: /* 042414 80067014 00000000 */ nop /* 042418 80067018 00000000 */ nop /* 04241C 8006701C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_42420_len_50.s b/papermario/asm/code_42420_len_50.s index 1b093effe4..5de0cd9e28 100644 --- a/papermario/asm/code_42420_len_50.s +++ b/papermario/asm/code_42420_len_50.s @@ -33,3 +33,5 @@ osViSwapBuffer: /* 042464 80067064 00000000 */ nop /* 042468 80067068 00000000 */ nop /* 04246C 8006706C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_42470_len_310.s b/papermario/asm/code_42470_len_310.s index fb9be4dd46..59a1c448ee 100644 --- a/papermario/asm/code_42470_len_310.s +++ b/papermario/asm/code_42470_len_310.s @@ -222,3 +222,5 @@ osViSwapContext: /* 042778 80067378 00000000 */ nop /* 04277C 8006737C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_42780_len_120.s b/papermario/asm/code_42780_len_120.s index 9f21484825..29e2ea27a4 100644 --- a/papermario/asm/code_42780_len_120.s +++ b/papermario/asm/code_42780_len_120.s @@ -95,3 +95,5 @@ guMtxIdent: /* 042894 80067494 00000000 */ nop /* 042898 80067498 00000000 */ nop /* 04289C 8006749C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_428a0_len_60.s b/papermario/asm/code_428a0_len_60.s index 74e87bbb1a..0e4bbb36fe 100644 --- a/papermario/asm/code_428a0_len_60.s +++ b/papermario/asm/code_428a0_len_60.s @@ -37,3 +37,5 @@ guMtxIdentF: /* 0428F4 800674F4 00000000 */ nop /* 0428F8 800674F8 00000000 */ nop /* 0428FC 800674FC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_42900_len_80.s b/papermario/asm/code_42900_len_80.s index f1cdb1f01e..0b145bcf6d 100644 --- a/papermario/asm/code_42900_len_80.s +++ b/papermario/asm/code_42900_len_80.s @@ -46,3 +46,5 @@ guMtxF2L: /* 042974 80067574 00000000 */ nop /* 042978 80067578 00000000 */ nop /* 04297C 8006757C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_42980_len_80.s b/papermario/asm/code_42980_len_80.s index a4d6c1f9cf..8a855405c6 100644 --- a/papermario/asm/code_42980_len_80.s +++ b/papermario/asm/code_42980_len_80.s @@ -46,3 +46,5 @@ guMtxL2F: /* 0429F4 800675F4 00000000 */ nop /* 0429F8 800675F8 00000000 */ nop /* 0429FC 800675FC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_42a00_len_100.s b/papermario/asm/code_42a00_len_100.s index a082ae7c54..9a37b6e888 100644 --- a/papermario/asm/code_42a00_len_100.s +++ b/papermario/asm/code_42a00_len_100.s @@ -79,3 +79,5 @@ guMtxCatF: /* 042AF4 800676F4 00000000 */ nop /* 042AF8 800676F8 00000000 */ nop /* 042AFC 800676FC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_42b00_len_c0.s b/papermario/asm/code_42b00_len_c0.s index 43b9d6e828..751f5fb365 100644 --- a/papermario/asm/code_42b00_len_c0.s +++ b/papermario/asm/code_42b00_len_c0.s @@ -61,3 +61,5 @@ guScale: /* 042BB8 800677B8 00000000 */ nop /* 042BBC 800677BC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_42bc0_len_60.s b/papermario/asm/code_42bc0_len_60.s index 6bc89e0899..ffeac35e11 100644 --- a/papermario/asm/code_42bc0_len_60.s +++ b/papermario/asm/code_42bc0_len_60.s @@ -37,3 +37,5 @@ guScaleF: /* 042C14 80067814 00000000 */ nop /* 042C18 80067818 00000000 */ nop /* 042C1C 8006781C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_42c20_len_e0.s b/papermario/asm/code_42c20_len_e0.s index c3f5935e8a..385a0fb242 100644 --- a/papermario/asm/code_42c20_len_e0.s +++ b/papermario/asm/code_42c20_len_e0.s @@ -69,3 +69,5 @@ guTranslate: /* 042CF8 800678F8 00000000 */ nop /* 042CFC 800678FC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_42d00_len_60.s b/papermario/asm/code_42d00_len_60.s index fed37529e3..54b0dbeb88 100644 --- a/papermario/asm/code_42d00_len_60.s +++ b/papermario/asm/code_42d00_len_60.s @@ -37,3 +37,5 @@ guTranslateF: /* 042D54 80067954 00000000 */ nop /* 042D58 80067958 00000000 */ nop /* 042D5C 8006795C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_42d60_len_80.s b/papermario/asm/code_42d60_len_80.s index dead5ff928..5ce019f941 100644 --- a/papermario/asm/code_42d60_len_80.s +++ b/papermario/asm/code_42d60_len_80.s @@ -45,3 +45,5 @@ guMtxCat: /* 042DD4 800679D4 00000000 */ nop /* 042DD8 800679D8 00000000 */ nop /* 042DDC 800679DC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_42de0_len_90.s b/papermario/asm/code_42de0_len_90.s index 486ddee783..c0b57a6e89 100644 --- a/papermario/asm/code_42de0_len_90.s +++ b/papermario/asm/code_42de0_len_90.s @@ -49,3 +49,5 @@ guMtxXFML: /* 042E68 80067A68 27BD0088 */ addiu $sp, $sp, 0x88 /* 042E6C 80067A6C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_42e0_len_1f60.s b/papermario/asm/code_42e0_len_1f60.s index 12c97ec7c3..c2242c21bf 100644 --- a/papermario/asm/code_42e0_len_1f60.s +++ b/papermario/asm/code_42e0_len_1f60.s @@ -2273,3 +2273,5 @@ collision_heap_free: /* 006238 8002AE38 00000000 */ nop /* 00623C 8002AE3C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_42e70_len_390.s b/papermario/asm/code_42e70_len_390.s index 466106ac27..081cac5613 100644 --- a/papermario/asm/code_42e70_len_390.s +++ b/papermario/asm/code_42e70_len_390.s @@ -245,3 +245,5 @@ guRotate: /* 0431F8 80067DF8 00000000 */ nop /* 0431FC 80067DFC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_43200_len_7c0.s b/papermario/asm/code_43200_len_7c0.s index fad1771fd7..d6263f45a0 100644 --- a/papermario/asm/code_43200_len_7c0.s +++ b/papermario/asm/code_43200_len_7c0.s @@ -570,3 +570,5 @@ osPfsDeclearPage: /* 0439B4 800685B4 00000000 */ nop /* 0439B8 800685B8 00000000 */ nop /* 0439BC 800685BC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_439c0_len_220.s b/papermario/asm/code_439c0_len_220.s index 7c08ec61bf..f84b100bb6 100644 --- a/papermario/asm/code_439c0_len_220.s +++ b/papermario/asm/code_439c0_len_220.s @@ -161,3 +161,5 @@ osPfsReleasePages: /* 043BD4 800687D4 00000000 */ nop /* 043BD8 800687D8 00000000 */ nop /* 043BDC 800687DC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_43be0_len_5e0.s b/papermario/asm/code_43be0_len_5e0.s index 572e516ca5..3deb66ee1c 100644 --- a/papermario/asm/code_43be0_len_5e0.s +++ b/papermario/asm/code_43be0_len_5e0.s @@ -430,3 +430,5 @@ osPfsFileState: /* 0441B4 80068DB4 00000000 */ nop /* 0441B8 80068DB8 00000000 */ nop /* 0441BC 80068DBC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_441c0_len_1c0.s b/papermario/asm/code_441c0_len_1c0.s index 982e252616..b6f011dcfb 100644 --- a/papermario/asm/code_441c0_len_1c0.s +++ b/papermario/asm/code_441c0_len_1c0.s @@ -140,3 +140,5 @@ osPfsFindFile: /* 044378 80068F78 00000000 */ nop /* 04437C 80068F7C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_44380_len_4e0.s b/papermario/asm/code_44380_len_4e0.s index 99eea9709f..573c7d5d12 100644 --- a/papermario/asm/code_44380_len_4e0.s +++ b/papermario/asm/code_44380_len_4e0.s @@ -358,3 +358,5 @@ osPfsCheckRamArea: /* 044854 80069454 00000000 */ nop /* 044858 80069458 00000000 */ nop /* 04485C 8006945C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_44860_len_60.s b/papermario/asm/code_44860_len_60.s index c812fb69b8..335c35b357 100644 --- a/papermario/asm/code_44860_len_60.s +++ b/papermario/asm/code_44860_len_60.s @@ -39,3 +39,5 @@ osPfsRepairId: /* 0448B8 800694B8 00000000 */ nop /* 0448BC 800694BC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_448c0_len_210.s b/papermario/asm/code_448c0_len_210.s index 44d7774b86..b8b0a3f11d 100644 --- a/papermario/asm/code_448c0_len_210.s +++ b/papermario/asm/code_448c0_len_210.s @@ -158,3 +158,5 @@ osPfsGetOneChannelData: /* 044AC4 800696C4 00000000 */ nop /* 044AC8 800696C8 00000000 */ nop /* 044ACC 800696CC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_44ad0_len_70.s b/papermario/asm/code_44ad0_len_70.s index e54a3d3f55..c1ffe98223 100644 --- a/papermario/asm/code_44ad0_len_70.s +++ b/papermario/asm/code_44ad0_len_70.s @@ -43,3 +43,5 @@ osPfsSelectBank: /* 044B34 80069734 00000000 */ nop /* 044B38 80069738 00000000 */ nop /* 044B3C 8006973C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_44b40_len_a90.s b/papermario/asm/code_44b40_len_a90.s index 5645d70539..36fd46bd92 100644 --- a/papermario/asm/code_44b40_len_a90.s +++ b/papermario/asm/code_44b40_len_a90.s @@ -767,3 +767,5 @@ osPfsRWInode: /* 0455C4 8006A1C4 00000000 */ nop /* 0455C8 8006A1C8 00000000 */ nop /* 0455CC 8006A1CC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_455d0_len_1f0.s b/papermario/asm/code_455d0_len_1f0.s index 42558a5c9a..c03c644e99 100644 --- a/papermario/asm/code_455d0_len_1f0.s +++ b/papermario/asm/code_455d0_len_1f0.s @@ -148,3 +148,5 @@ osContRamRead: /* 0457B8 8006A3B8 00000000 */ nop /* 0457BC 8006A3BC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_457c0_len_270.s b/papermario/asm/code_457c0_len_270.s index c5b01b708c..e31b6daee2 100644 --- a/papermario/asm/code_457c0_len_270.s +++ b/papermario/asm/code_457c0_len_270.s @@ -178,3 +178,5 @@ osContRamWrite: /* 045A24 8006A624 00000000 */ nop /* 045A28 8006A628 00000000 */ nop /* 045A2C 8006A62C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_45a30_len_20.s b/papermario/asm/code_45a30_len_20.s index 614a0e1316..feb2a6564c 100644 --- a/papermario/asm/code_45a30_len_20.s +++ b/papermario/asm/code_45a30_len_20.s @@ -21,3 +21,5 @@ osAfterPreNMI: /* 045A48 8006A648 27BD0018 */ addiu $sp, $sp, 0x18 /* 045A4C 8006A64C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_45a50_len_3a0.s b/papermario/asm/code_45a50_len_3a0.s index e78645f4a9..b2910b2fa5 100644 --- a/papermario/asm/code_45a50_len_3a0.s +++ b/papermario/asm/code_45a50_len_3a0.s @@ -258,3 +258,5 @@ osInitialize: /* 045DE8 8006A9E8 00000000 */ nop /* 045DEC 8006A9EC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_45df0_len_970.s b/papermario/asm/code_45df0_len_970.s index 9ca4737fb8..f96c78fb37 100644 --- a/papermario/asm/code_45df0_len_970.s +++ b/papermario/asm/code_45df0_len_970.s @@ -690,3 +690,5 @@ osCleanupThread: /* 046754 8006B354 0C01B254 */ jal osDestroyThread /* 046758 8006B358 00000000 */ nop /* 04675C 8006B35C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_46760_len_90.s b/papermario/asm/code_46760_len_90.s index 241845e471..dd453f103f 100644 --- a/papermario/asm/code_46760_len_90.s +++ b/papermario/asm/code_46760_len_90.s @@ -52,3 +52,5 @@ osRestoreInt: /* 0467E8 8006B3E8 00000000 */ nop /* 0467EC 8006B3EC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_467f0_len_90.s b/papermario/asm/code_467f0_len_90.s index b82f6c51d1..f2a004954d 100644 --- a/papermario/asm/code_467f0_len_90.s +++ b/papermario/asm/code_467f0_len_90.s @@ -51,3 +51,5 @@ osResetGlobalIntMask: /* 046878 8006B478 00000000 */ nop /* 04687C 8006B47C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_46880_len_260.s b/papermario/asm/code_46880_len_260.s index 688a824d06..be32ed6bca 100644 --- a/papermario/asm/code_46880_len_260.s +++ b/papermario/asm/code_46880_len_260.s @@ -191,3 +191,5 @@ osEPiRawReadIo: /* 046AD8 8006B6D8 00000000 */ nop /* 046ADC 8006B6DC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_46ae0_len_170.s b/papermario/asm/code_46ae0_len_170.s index 6d7c1afc05..0fdf96eda5 100644 --- a/papermario/asm/code_46ae0_len_170.s +++ b/papermario/asm/code_46ae0_len_170.s @@ -118,3 +118,5 @@ osEPiRawWriteIo: /* 046C44 8006B844 00000000 */ nop /* 046C48 8006B848 00000000 */ nop /* 046C4C 8006B84C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_46c50_len_20.s b/papermario/asm/code_46c50_len_20.s index a948b5dec8..ffedbfd1a6 100644 --- a/papermario/asm/code_46c50_len_20.s +++ b/papermario/asm/code_46c50_len_20.s @@ -21,3 +21,5 @@ osAiDeviceBusy: /* 046C64 8006B864 00000000 */ nop /* 046C68 8006B868 00000000 */ nop /* 046C6C 8006B86C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_46c70_len_e00.s b/papermario/asm/code_46c70_len_e00.s index df415eb3f1..c8f2077b80 100644 --- a/papermario/asm/code_46c70_len_e00.s +++ b/papermario/asm/code_46c70_len_e00.s @@ -1027,3 +1027,5 @@ osGetCause: /* 047A68 8006C668 00000000 */ nop /* 047A6C 8006C66C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_47a70_len_10.s b/papermario/asm/code_47a70_len_10.s index a3d36e8206..c7c6c99fad 100644 --- a/papermario/asm/code_47a70_len_10.s +++ b/papermario/asm/code_47a70_len_10.s @@ -17,3 +17,5 @@ osGetSR: /* 047A78 8006C678 00000000 */ nop /* 047A7C 8006C67C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_47a80_len_10.s b/papermario/asm/code_47a80_len_10.s index 88126fb7b7..224913e780 100644 --- a/papermario/asm/code_47a80_len_10.s +++ b/papermario/asm/code_47a80_len_10.s @@ -17,3 +17,5 @@ osSetCompare: /* 047A88 8006C688 00000000 */ nop /* 047A8C 8006C68C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_47a90_len_50.s b/papermario/asm/code_47a90_len_50.s index 56e3462faf..a094642dac 100644 --- a/papermario/asm/code_47a90_len_50.s +++ b/papermario/asm/code_47a90_len_50.s @@ -39,3 +39,5 @@ osSpDeviceBusy: /* 047AD8 8006C6D8 00000000 */ nop /* 047ADC 8006C6DC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_47ae0_len_e0.s b/papermario/asm/code_47ae0_len_e0.s index e256b5c4c3..2366fbde38 100644 --- a/papermario/asm/code_47ae0_len_e0.s +++ b/papermario/asm/code_47ae0_len_e0.s @@ -82,3 +82,5 @@ osSpRawStartDma: /* 047BB8 8006C7B8 27BD0028 */ addiu $sp, $sp, 0x28 /* 047BBC 8006C7BC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_47bc0_len_50.s b/papermario/asm/code_47bc0_len_50.s index 29f948e70a..108c141468 100644 --- a/papermario/asm/code_47bc0_len_50.s +++ b/papermario/asm/code_47bc0_len_50.s @@ -34,3 +34,5 @@ osSiRawReadIo: /* 047C08 8006C808 27BD0020 */ addiu $sp, $sp, 0x20 /* 047C0C 8006C80C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_47c10_len_50.s b/papermario/asm/code_47c10_len_50.s index 27c3e82fc4..ce1e6ba317 100644 --- a/papermario/asm/code_47c10_len_50.s +++ b/papermario/asm/code_47c10_len_50.s @@ -34,3 +34,5 @@ osSiRawWriteIo: /* 047C58 8006C858 00000000 */ nop /* 047C5C 8006C85C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_47c60_len_f0.s b/papermario/asm/code_47c60_len_f0.s index c9da60809a..7a2c7d5307 100644 --- a/papermario/asm/code_47c60_len_f0.s +++ b/papermario/asm/code_47c60_len_f0.s @@ -88,3 +88,5 @@ osContDataCrc: /* 047D48 8006C948 00000000 */ nop /* 047D4C 8006C94C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_47d50_len_e0.s b/papermario/asm/code_47d50_len_e0.s index 58271b7c79..8b68aacb80 100644 --- a/papermario/asm/code_47d50_len_e0.s +++ b/papermario/asm/code_47d50_len_e0.s @@ -79,3 +79,5 @@ osDestroyThread: /* 047E28 8006CA28 00000000 */ nop /* 047E2C 8006CA2C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_47e30_len_60.s b/papermario/asm/code_47e30_len_60.s index f6dde2e02e..2c96a4007d 100644 --- a/papermario/asm/code_47e30_len_60.s +++ b/papermario/asm/code_47e30_len_60.s @@ -37,3 +37,5 @@ osMapTLBRdb: /* 047E88 8006CA88 00000000 */ nop /* 047E8C 8006CA8C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_47e90_len_110.s b/papermario/asm/code_47e90_len_110.s index ceacb365cb..5cbd09e132 100644 --- a/papermario/asm/code_47e90_len_110.s +++ b/papermario/asm/code_47e90_len_110.s @@ -88,3 +88,5 @@ osViInit: /* 047F94 8006CB94 00000000 */ nop /* 047F98 8006CB98 00000000 */ nop /* 047F9C 8006CB9C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_47fa0_len_20.s b/papermario/asm/code_47fa0_len_20.s index cfbbd68c92..0fac3c7334 100644 --- a/papermario/asm/code_47fa0_len_20.s +++ b/papermario/asm/code_47fa0_len_20.s @@ -21,3 +21,5 @@ osViGetCurrentContext: /* 047FB4 8006CBB4 00000000 */ nop /* 047FB8 8006CBB8 00000000 */ nop /* 047FBC 8006CBBC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_47fc0_len_60.s b/papermario/asm/code_47fc0_len_60.s index 5c2685a38d..a329c960f9 100644 --- a/papermario/asm/code_47fc0_len_60.s +++ b/papermario/asm/code_47fc0_len_60.s @@ -37,3 +37,5 @@ guNormalize: /* 048014 8006CC14 00000000 */ nop /* 048018 8006CC18 00000000 */ nop /* 04801C 8006CC1C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_48020_len_a00.s b/papermario/asm/code_48020_len_a00.s index 2cfc7c839e..55b06f8316 100644 --- a/papermario/asm/code_48020_len_a00.s +++ b/papermario/asm/code_48020_len_a00.s @@ -732,3 +732,5 @@ osPfsGetInitData: /* 048A14 8006D614 00000000 */ nop /* 048A18 8006D618 00000000 */ nop /* 048A1C 8006D61C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_48a20_len_1c0.s b/papermario/asm/code_48a20_len_1c0.s index 6dcd1a228c..0c35d2b08b 100644 --- a/papermario/asm/code_48a20_len_1c0.s +++ b/papermario/asm/code_48a20_len_1c0.s @@ -132,3 +132,5 @@ lldiv: /* 048BD8 8006D7D8 00000000 */ nop /* 048BDC 8006D7DC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_48be0_len_20.s b/papermario/asm/code_48be0_len_20.s index d2b737dd1f..4c5dbb2cb1 100644 --- a/papermario/asm/code_48be0_len_20.s +++ b/papermario/asm/code_48be0_len_20.s @@ -21,3 +21,5 @@ osSiDeviceBusy: /* 048BF8 8006D7F8 00000000 */ nop /* 048BFC 8006D7FC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_48c00_len_5c0.s b/papermario/asm/code_48c00_len_5c0.s index f295880a25..5b9b693fb8 100644 --- a/papermario/asm/code_48c00_len_5c0.s +++ b/papermario/asm/code_48c00_len_5c0.s @@ -432,3 +432,5 @@ func_8006D800: /* 0491B8 8006DDB8 00000000 */ nop /* 0491BC 8006DDBC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_491c0_len_f80.s b/papermario/asm/code_491c0_len_f80.s index 0982ac093c..dfba68eae4 100644 --- a/papermario/asm/code_491c0_len_f80.s +++ b/papermario/asm/code_491c0_len_f80.s @@ -1148,3 +1148,5 @@ func_8006E870: /* 04A138 8006ED38 27BD0008 */ addiu $sp, $sp, 8 /* 04A13C 8006ED3C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_4a140_len_70.s b/papermario/asm/code_4a140_len_70.s index 1747438a34..32372a5a95 100644 --- a/papermario/asm/code_4a140_len_70.s +++ b/papermario/asm/code_4a140_len_70.s @@ -49,3 +49,5 @@ strcmp: /* 04A1A4 8006EDA4 00000000 */ nop /* 04A1A8 8006EDA8 00000000 */ nop /* 04A1AC 8006EDAC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_4a1b0_len_40.s b/papermario/asm/code_4a1b0_len_40.s index a7e38f568e..a8c899f88d 100644 --- a/papermario/asm/code_4a1b0_len_40.s +++ b/papermario/asm/code_4a1b0_len_40.s @@ -31,3 +31,5 @@ memset: /* 04A1E4 8006EDE4 00000000 */ nop /* 04A1E8 8006EDE8 00000000 */ nop /* 04A1EC 8006EDEC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_4a1f0_len_170.s b/papermario/asm/code_4a1f0_len_170.s index e6dd4d3632..bc0d1c1f9d 100644 --- a/papermario/asm/code_4a1f0_len_170.s +++ b/papermario/asm/code_4a1f0_len_170.s @@ -115,3 +115,5 @@ decode_yay0: /* 04A358 8006EF58 03E00008 */ jr $ra /* 04A35C 8006EF5C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_4a360_len_930.s b/papermario/asm/code_4a360_len_930.s index 9055055e3a..ed4e86365e 100644 --- a/papermario/asm/code_4a360_len_930.s +++ b/papermario/asm/code_4a360_len_930.s @@ -646,3 +646,5 @@ osFlashReadArray: /* 04AC88 8006F888 00000000 */ nop /* 04AC8C 8006F88C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_4ac90_len_3910.s b/papermario/asm/code_4ac90_len_3910.s index 9b3f3d42ea..105d0a27d7 100644 --- a/papermario/asm/code_4ac90_len_3910.s +++ b/papermario/asm/code_4ac90_len_3910.s @@ -3829,3 +3829,5 @@ load_demo_battle: /* 04E598 80073198 27BD0020 */ addiu $sp, $sp, 0x20 /* 04E59C 8007319C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_6240_len_c00.s b/papermario/asm/code_6240_len_c00.s index 65ff4a7f29..5fcd28839e 100644 --- a/papermario/asm/code_6240_len_c00.s +++ b/papermario/asm/code_6240_len_c00.s @@ -855,3 +855,5 @@ fio_erase_flash: /* 006E38 8002BA38 00000000 */ nop /* 006E3C 8002BA3C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_6e40_len_500.s b/papermario/asm/code_6e40_len_500.s index 71e9e4572b..59b55ea6f0 100644 --- a/papermario/asm/code_6e40_len_500.s +++ b/papermario/asm/code_6e40_len_500.s @@ -355,3 +355,5 @@ func_8002BF24: /* 007338 8002BF38 00000000 */ nop /* 00733C 8002BF3C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_7340_len_b00.s b/papermario/asm/code_7340_len_b00.s index ee465e23b0..c71c1f67e9 100644 --- a/papermario/asm/code_7340_len_b00.s +++ b/papermario/asm/code_7340_len_b00.s @@ -776,3 +776,5 @@ crash_create_monitor: /* 007E34 8002CA34 00000000 */ nop /* 007E38 8002CA38 00000000 */ nop /* 007E3C 8002CA3C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_7e0e80.s b/papermario/asm/code_7e0e80.s index 6eb9d32f13..c038a87381 100644 --- a/papermario/asm/code_7e0e80.s +++ b/papermario/asm/code_7e0e80.s @@ -4404,3 +4404,5 @@ SetPushBlockFallEffect: /* 7E4CF8 80283E78 00000000 */ nop /* 7E4CFC 80283E7C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_7e40_len_3f0.s b/papermario/asm/code_7e40_len_3f0.s index bf1dc7385d..70391cd1a4 100644 --- a/papermario/asm/code_7e40_len_3f0.s +++ b/papermario/asm/code_7e40_len_3f0.s @@ -282,3 +282,5 @@ nuGfxTaskStart: /* 008224 8002CE24 00000000 */ nop /* 008228 8002CE28 00000000 */ nop /* 00822C 8002CE2C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_8230_len_1ae0.s b/papermario/asm/code_8230_len_1ae0.s index b6617166f3..96fcf70c58 100644 --- a/papermario/asm/code_8230_len_1ae0.s +++ b/papermario/asm/code_8230_len_1ae0.s @@ -1850,3 +1850,5 @@ get_screen_coords: /* 009D08 8002E908 00000000 */ nop /* 009D0C 8002E90C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_9d10_len_1080.s b/papermario/asm/code_9d10_len_1080.s index 2f9ddc0f4e..23983f9be2 100644 --- a/papermario/asm/code_9d10_len_1080.s +++ b/papermario/asm/code_9d10_len_1080.s @@ -1099,3 +1099,5 @@ do_camera_type_0: /* 00AD88 8002F988 00000000 */ nop /* 00AD8C 8002F98C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_a5dd0_len_114e0.s b/papermario/asm/code_a5dd0_len_114e0.s index 0c78480957..a077c1f599 100644 --- a/papermario/asm/code_a5dd0_len_114e0.s +++ b/papermario/asm/code_a5dd0_len_114e0.s @@ -19558,3 +19558,5 @@ func_801206F8: /* 0B72A4 80120BA4 00000000 */ nop /* 0B72A8 80120BA8 00000000 */ nop /* 0B72AC 80120BAC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_ad90_len_2880.s b/papermario/asm/code_ad90_len_2880.s index a9d69507fc..06906addd6 100644 --- a/papermario/asm/code_ad90_len_2880.s +++ b/papermario/asm/code_ad90_len_2880.s @@ -2786,3 +2786,5 @@ do_camera_type_3: /* 00D604 80032204 00000000 */ nop /* 00D608 80032208 00000000 */ nop /* 00D60C 8003220C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_b72b0_len_15ed0.s b/papermario/asm/code_b72b0_len_15ed0.s index 1f7f77d467..580885c5c8 100644 --- a/papermario/asm/code_b72b0_len_15ed0.s +++ b/papermario/asm/code_b72b0_len_15ed0.s @@ -24379,3 +24379,5 @@ func_801363A0: /* 0CD174 80136A74 00000000 */ nop /* 0CD178 80136A78 00000000 */ nop /* 0CD17C 80136A7C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_cd180_len_38f0.s b/papermario/asm/code_cd180_len_38f0.s index 091e11ab4f..f29a404f28 100644 --- a/papermario/asm/code_cd180_len_38f0.s +++ b/papermario/asm/code_cd180_len_38f0.s @@ -3880,3 +3880,5 @@ func_80139F10: /* 0D0A64 8013A364 00000000 */ nop /* 0D0A68 8013A368 00000000 */ nop /* 0D0A6C 8013A36C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_d0a70_len_4fe0.s b/papermario/asm/code_d0a70_len_4fe0.s index 726bbdf769..0af1f7a27d 100644 --- a/papermario/asm/code_d0a70_len_4fe0.s +++ b/papermario/asm/code_d0a70_len_4fe0.s @@ -5518,3 +5518,5 @@ func_8013F1F8: /* 0D5A44 8013F344 00000000 */ nop /* 0D5A48 8013F348 00000000 */ nop /* 0D5A4C 8013F34C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_d5a50_len_5fd0.s b/papermario/asm/code_d5a50_len_5fd0.s index dabfb839d6..18b33f1a9d 100644 --- a/papermario/asm/code_d5a50_len_5fd0.s +++ b/papermario/asm/code_d5a50_len_5fd0.s @@ -6740,3 +6740,5 @@ func_801452E8: /* 0DBA14 80145314 00000000 */ nop /* 0DBA18 80145318 00000000 */ nop /* 0DBA1C 8014531C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_d610_len_1330.s b/papermario/asm/code_d610_len_1330.s index f13ee6d4eb..a1b8814f97 100644 --- a/papermario/asm/code_d610_len_1330.s +++ b/papermario/asm/code_d610_len_1330.s @@ -1346,3 +1346,5 @@ get_game_mode: /* 00E938 80033538 00000000 */ nop /* 00E93C 8003353C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_dba20_len_350.s b/papermario/asm/code_dba20_len_350.s index 84e9904bb5..de030b83d6 100644 --- a/papermario/asm/code_dba20_len_350.s +++ b/papermario/asm/code_dba20_len_350.s @@ -269,3 +269,5 @@ get_area_byte: /* 0DBD64 80145664 00000000 */ nop /* 0DBD68 80145668 00000000 */ nop /* 0DBD6C 8014566C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_dbd70_len_700.s b/papermario/asm/code_dbd70_len_700.s index 12314a5add..80b6fbec58 100644 --- a/papermario/asm/code_dbd70_len_700.s +++ b/papermario/asm/code_dbd70_len_700.s @@ -527,3 +527,5 @@ func_80145CE8: /* 0DC468 80145D68 00000000 */ nop /* 0DC46C 80145D6C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_dc470_len_14c0.s b/papermario/asm/code_dc470_len_14c0.s index 387e0a7224..4e209aae4e 100644 --- a/papermario/asm/code_dc470_len_14c0.s +++ b/papermario/asm/code_dc470_len_14c0.s @@ -1402,3 +1402,5 @@ func_80145EC0: /* 0DD928 80147228 00000000 */ nop /* 0DD92C 8014722C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_dd930_len_1c0/UpdateMusicPlayers.s b/papermario/asm/code_dd930_len_1c0/UpdateMusicPlayers.s index 3dcb41dd3a..4e5c2e4386 100644 --- a/papermario/asm/code_dd930_len_1c0/UpdateMusicPlayers.s +++ b/papermario/asm/code_dd930_len_1c0/UpdateMusicPlayers.s @@ -81,3 +81,5 @@ UpdateMusicPlayers: /* 0DDA5C 8014735C 8FB00010 */ lw $s0, 0x10($sp) /* 0DDA60 80147360 03E00008 */ jr $ra /* 0DDA64 80147364 27BD0018 */ addiu $sp, $sp, 0x18 + +.set reorder diff --git a/papermario/asm/code_dd930_len_1c0/play_ambient_sounds.s b/papermario/asm/code_dd930_len_1c0/play_ambient_sounds.s index bb88775b3b..11636d8dde 100644 --- a/papermario/asm/code_dd930_len_1c0/play_ambient_sounds.s +++ b/papermario/asm/code_dd930_len_1c0/play_ambient_sounds.s @@ -40,3 +40,5 @@ play_ambient_sounds: /* 0DDAD8 801473D8 8FB00010 */ lw $s0, 0x10($sp) /* 0DDADC 801473DC 03E00008 */ jr $ra /* 0DDAE0 801473E0 27BD0018 */ addiu $sp, $sp, 0x18 + +.set reorder diff --git a/papermario/asm/code_ddaf0_len_c50.s b/papermario/asm/code_ddaf0_len_c50.s index 84148119a9..0fc2888ef1 100644 --- a/papermario/asm/code_ddaf0_len_c50.s +++ b/papermario/asm/code_ddaf0_len_c50.s @@ -866,3 +866,5 @@ func_80147F30: /* 0DE738 80148038 00000000 */ nop /* 0DE73C 8014803C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_de740_len_23f0.s b/papermario/asm/code_de740_len_23f0.s index ffa8fd4e25..78e0722430 100644 --- a/papermario/asm/code_de740_len_23f0.s +++ b/papermario/asm/code_de740_len_23f0.s @@ -2542,3 +2542,5 @@ func_8014A1B4: /* 0E0B24 8014A424 00000000 */ nop /* 0E0B28 8014A428 00000000 */ nop /* 0E0B2C 8014A42C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_e0b30_len_b80.s b/papermario/asm/code_e0b30_len_b80.s index ebc372e424..801e49debe 100644 --- a/papermario/asm/code_e0b30_len_b80.s +++ b/papermario/asm/code_e0b30_len_b80.s @@ -872,3 +872,5 @@ func_8014AF8C: /* 0E16A8 8014AFA8 00000000 */ nop /* 0E16AC 8014AFAC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_e20eb0.s b/papermario/asm/code_e20eb0.s index 11fdc3cfbb..7817bf0272 100644 --- a/papermario/asm/code_e20eb0.s +++ b/papermario/asm/code_e20eb0.s @@ -500,3 +500,5 @@ func_802B71E8: /* E215B8 802B7708 00000000 */ nop /* E215BC 802B770C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_e79b0_len_1920.s b/papermario/asm/code_e79b0_len_1920.s index b23b415599..d210394ebc 100644 --- a/papermario/asm/code_e79b0_len_1920.s +++ b/papermario/asm/code_e79b0_len_1920.s @@ -1836,3 +1836,5 @@ clear_script_flags: /* 0E92C8 802C4918 00000000 */ nop /* 0E92CC 802C491C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_e92d0_len_5da0.s b/papermario/asm/code_e92d0_len_5da0.s index 45f085ca97..dba077c585 100644 --- a/papermario/asm/code_e92d0_len_5da0.s +++ b/papermario/asm/code_e92d0_len_5da0.s @@ -6930,3 +6930,5 @@ PlaySoundAtCollider: /* 0EF068 802CA6B8 00000000 */ nop /* 0EF06C 802CA6BC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_e940_len_290.s b/papermario/asm/code_e940_len_290.s index 310f85cf3d..f54891f5df 100644 --- a/papermario/asm/code_e940_len_290.s +++ b/papermario/asm/code_e940_len_290.s @@ -185,3 +185,5 @@ /* 00EBC4 800337C4 00000000 */ nop /* 00EBC8 800337C8 00000000 */ nop /* 00EBCC 800337CC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_ebd0_len_6a0.s b/papermario/asm/code_ebd0_len_6a0.s index 1b42c9e57b..a7a45a1553 100644 --- a/papermario/asm/code_ebd0_len_6a0.s +++ b/papermario/asm/code_ebd0_len_6a0.s @@ -476,3 +476,5 @@ step_battle: /* 00F268 80033E68 00000000 */ nop /* 00F26C 80033E6C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_ef070_len_3400.s b/papermario/asm/code_ef070_len_3400.s index 32cdb2753e..3b34ab1c7a 100644 --- a/papermario/asm/code_ef070_len_3400.s +++ b/papermario/asm/code_ef070_len_3400.s @@ -3535,3 +3535,5 @@ func_802CD57C: /* 0F2464 802CDAB4 00000000 */ nop /* 0F2468 802CDAB8 00000000 */ nop /* 0F246C 802CDABC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_f2470_len_27f0.s b/papermario/asm/code_f2470_len_27f0.s index 121b8213af..c07fd43334 100644 --- a/papermario/asm/code_f2470_len_27f0.s +++ b/papermario/asm/code_f2470_len_27f0.s @@ -2780,3 +2780,5 @@ PlaySoundAtNpc: /* 0F4C54 802D02A4 00000000 */ nop /* 0F4C58 802D02A8 00000000 */ nop /* 0F4C5C 802D02AC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_f270_len_1190.s b/papermario/asm/code_f270_len_1190.s index 6915d27441..2ed50cd9d2 100644 --- a/papermario/asm/code_f270_len_1190.s +++ b/papermario/asm/code_f270_len_1190.s @@ -1203,3 +1203,5 @@ step_pause_menu: /* 0103F8 80034FF8 00000000 */ nop /* 0103FC 80034FFC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_f4c60_len_4300.s b/papermario/asm/code_f4c60_len_4300.s index 22d9e58059..4dce738fc9 100644 --- a/papermario/asm/code_f4c60_len_4300.s +++ b/papermario/asm/code_f4c60_len_4300.s @@ -4671,3 +4671,5 @@ func_802D4560: /* 0F8F54 802D45A4 00000000 */ nop /* 0F8F58 802D45A8 00000000 */ nop /* 0F8F5C 802D45AC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_f8f60_len_1560.s b/papermario/asm/code_f8f60_len_1560.s index 8d0995ab08..4a844089e1 100644 --- a/papermario/asm/code_f8f60_len_1560.s +++ b/papermario/asm/code_f8f60_len_1560.s @@ -1492,3 +1492,5 @@ ClampAngleFloat: /* 0FA4B4 802D5B04 00000000 */ nop /* 0FA4B8 802D5B08 00000000 */ nop /* 0FA4BC 802D5B0C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_fa4c0_len_3bf0.s b/papermario/asm/code_fa4c0_len_3bf0.s index 23ce7d1bc9..d431dc71b3 100644 --- a/papermario/asm/code_fa4c0_len_3bf0.s +++ b/papermario/asm/code_fa4c0_len_3bf0.s @@ -4196,3 +4196,5 @@ PlayEffect: /* 0FE0A4 802D96F4 00000000 */ nop /* 0FE0A8 802D96F8 00000000 */ nop /* 0FE0AC 802D96FC 00000000 */ nop + +.set reorder diff --git a/papermario/asm/code_fe0b0_len_5a0/DemoJoystickRadial.s b/papermario/asm/code_fe0b0_len_5a0/DemoJoystickRadial.s index a5be36174b..62dfa717eb 100644 --- a/papermario/asm/code_fe0b0_len_5a0/DemoJoystickRadial.s +++ b/papermario/asm/code_fe0b0_len_5a0/DemoJoystickRadial.s @@ -48,4 +48,5 @@ DemoJoystickRadial: /* 0FE5B8 802D9C08 03E00008 */ jr $ra /* 0FE5BC 802D9C0C 27BD0030 */ addiu $sp, $sp, 0x30 -.set reorder \ No newline at end of file +.set reorder + diff --git a/papermario/asm/code_fe0b0_len_5a0/DemoJoystickXY.s b/papermario/asm/code_fe0b0_len_5a0/DemoJoystickXY.s index 62afcc2f51..bbc4f41efb 100644 --- a/papermario/asm/code_fe0b0_len_5a0/DemoJoystickXY.s +++ b/papermario/asm/code_fe0b0_len_5a0/DemoJoystickXY.s @@ -37,3 +37,5 @@ DemoJoystickXY: /* 0FE638 802D9C88 24020002 */ addiu $v0, $zero, 2 /* 0FE63C 802D9C8C 03E00008 */ jr $ra /* 0FE640 802D9C90 27BD0028 */ addiu $sp, $sp, 0x28 + +.set reorder diff --git a/papermario/asm/code_fe0b0_len_5a0/SetSpriteShading.s b/papermario/asm/code_fe0b0_len_5a0/SetSpriteShading.s index 14843617fa..4763c2366e 100644 --- a/papermario/asm/code_fe0b0_len_5a0/SetSpriteShading.s +++ b/papermario/asm/code_fe0b0_len_5a0/SetSpriteShading.s @@ -216,3 +216,5 @@ SetSpriteShading: /* 0FE3E8 802D9A38 27BD0068 */ addiu $sp, $sp, 0x68 .set reorder + +.set reorder diff --git a/papermario/asm/code_fee30_len_2d60.s b/papermario/asm/code_fee30_len_2d60.s index 2d2c3bd677..9bea77ec2d 100644 --- a/papermario/asm/code_fee30_len_2d60.s +++ b/papermario/asm/code_fee30_len_2d60.s @@ -3238,3 +3238,5 @@ func_802DEA6C: /* 101B88 802DEA98 00000000 */ nop /* 101B8C 802DEA9C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/giantchunk.s b/papermario/asm/giantchunk.s index de97bd7b6a..005bbaf4ac 100644 --- a/papermario/asm/giantchunk.s +++ b/papermario/asm/giantchunk.s @@ -30614,3 +30614,5 @@ draw_box: /* 090FD8 800F7B28 00000000 */ nop /* 090FDC 800F7B2C 00000000 */ nop + +.set reorder diff --git a/papermario/asm/header.s b/papermario/asm/header.s index 53557ca634..abdbdbe189 100644 --- a/papermario/asm/header.s +++ b/papermario/asm/header.s @@ -14,3 +14,5 @@ .ascii "E" # country .byte 0x00 # version + +.set reorder diff --git a/papermario/tools/set_reorder_asm.sh b/papermario/tools/set_reorder_asm.sh new file mode 100755 index 0000000000..629b7ef7c4 --- /dev/null +++ b/papermario/tools/set_reorder_asm.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +shopt -s globstar + +LIST=$(ls asm/**/*.s) + +for i in $LIST +do + printf "\n.set reorder\n" >> $i +done