diff --git a/.gitignore b/.gitignore index b989f6c0aa..005f699d3b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,6 @@ papermario/COMPRESSED.* papermario/SOUND.* papermario/bin papermario/audio -.vscode/ \ No newline at end of file +papermario/build/ +.vscode/ +.idea/ diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000..fd747b3bda --- /dev/null +++ b/Dockerfile @@ -0,0 +1,24 @@ +FROM ubuntu:18.04 as build + +RUN apt-get update && \ + apt-get install -y \ + binutils-mips-linux-gnu \ + build-essential \ + pkg-config \ + python3 \ + python3-pip \ + wget \ + git \ + unzip + +RUN wget \ + https://github.com/n64decomp/qemu-irix/releases/download/v2.11-deb/qemu-irix-2.11.0-2169-g32ab296eef_amd64.deb \ + -O qemu.deb && \ + echo 8170f37cf03a08cc2d7c1c58f10d650ea0d158f711f6916da9364f6d8c85f741 qemu.deb | sha256sum --check && \ + dpkg -i qemu.deb && \ + rm qemu.deb + +RUN python3 -m pip install --user colorama ansiwrap attrs watchdog python-Levenshtein + +RUN mkdir /pm +WORKDIR /pm diff --git a/PAPER_MARIO.u.yaml b/PAPER_MARIO.u.yaml index 4c75f930c9..d028ab0902 100644 --- a/PAPER_MARIO.u.yaml +++ b/PAPER_MARIO.u.yaml @@ -67,8 +67,8 @@ ranges: - [0xd9dd0, 0xdbdd0, "asm", "CODE_d9dd0_len_2000", 0x001436D0] # frame:0x00000001 header: 0x24000000 trace: Tbl mapped:801456cc - [0xdbdd0, 0xdddd0, "asm", "CODE_dbdd0_len_2000", 0x001456D0] # frame:0x00000001 header: 0x24000000 trace: Tbl mapped:80147698 - [0xdddd0, 0xdfdd0, "asm", "CODE_dddd0_len_2000", 0x001476D0] # frame:0x00000001 header: 0x0 trace: Tbl mapped:801496b0 - - [0xdfdd0, 0xe1dd0, "asm", "CODE_dfdd0_len_2000", 0x001496D0] # frame:0x00000001 header: 0x8e000000 trace: Tbl mapped:8014ad34 - - [0xe1dd0, 0xe3dd0, "bin", "___e1dd0_len_2000"] # (DRAM:0x0014B6D0) (frame:0x00000001) header: 0xfc000000 trace: + - [0xdfdd0, 0xe16b0, "asm", "CODE_dfdd0_len_2000", 0x001496D0] # frame:0x00000001 header: 0x8e000000 trace: Tbl mapped:8014ad34 + - [0xe16b0, 0xe3dd0, "bin", "___e1dd0_len_2000"] # (DRAM:0x0014B6D0) (frame:0x00000001) header: 0xfc000000 trace: - [0xe3dd0, 0xe5dd0, "bin", "___e3dd0_len_2000"] # (DRAM:0x0014D6D0) (frame:0x00000001) header: 0xff000000 trace: - [0xe5dd0, 0xe79b0, "bin", "___e5dd0_len_1be0"] # (DRAM:0x0014F6D0) (frame:0x00000001) header: 0x0 trace: - [0xe79b0, 0xe99b0, "asm", "CODE_e79b0_len_2000", 0x002C3000] # frame:0x00000001 header: 0x27000000 trace: Tbl mapped:802c4fbc @@ -104,8 +104,8 @@ ranges: # - [0x133340, 0x135340, "asm", "CODE_133340_len_2000", 0x00240000] # frame:0x00001FB3 header: 0x0 trace: Tbl mapped:80241fb4 - [0x135340, 0x135ee0, "asm", "CODE_135340_len_ba0", 0x00242000] # frame:0x00001FB3 header: 0x0 trace: Tbl mapped:80242ba0 - [0x163400, 0x167400, "asm", "CODE_163400_len_4000", 0x00242BA0] # frame:0x00001FB3 header: 0x28000000 trace: Tbl mapped:80243758 - - [0x167400, 0x16b400, "asm", "CODE_167400_len_4000", 0x00246BA0] # frame:0x00001FB3 header: 0xac000000 trace: Tbl mapped:80249b38 - - [0x16b400, 0x16c8e0, "bin", "___16b400_len_14e0"] # (DRAM:0x0024ABA0) (frame:0x00001FB3) header: 0x0 trace: + - [0x167400, 0x16a3e0, "asm", "CODE_167400_len_4000", 0x00246BA0] # frame:0x00001FB3 header: 0xac000000 trace: Tbl mapped:80249b38 + - [0x16a3e0, 0x16c8e0, "bin", "___16b400_len_14e0"] # (DRAM:0x0024ABA0) (frame:0x00001FB3) header: 0x0 trace: - [0x1e0350, 0x1e0550, "bin", "___1e0350_len_200"] # (DRAM:0x002FE090) (frame:0x0000301F) header: 0x0 trace: - [0x1e0550, 0x1e0570, "bin", "_I__1e0550_len_20"] # (DRAM:0x002FE290) (frame:0x0000301F) header: I 0x49000000 trace: - [0x1e1310, 0x1e1510, "bin", "___1e1310_len_200"] # (DRAM:0x002FDE70) (frame:0x00003290) header: 0x0 trace: @@ -205,7 +205,7 @@ ranges: - [0x2435f0, 0x2455f0, "bin", "___2435f0_len_2000"] # (DRAM:0x002A7BE0) (frame:0x00000286) header: 0xf0000000 trace: - [0x2455f0, 0x2475f0, "bin", "___2455f0_len_2000"] # (DRAM:0x002A9BE0) (frame:0x00000286) header: 0xf0000000 trace: - [0x2475f0, 0x2495f0, "bin", "___2475f0_len_2000"] # (DRAM:0x002ABBE0) (frame:0x00000286) header: 0x0 trace: - - [0x2495f0, 0x24b5f0, "asm", "CODE_2495f0_len_2000", 0x002ADBE0] # frame:0x00000286 header: 0x0 trace: Tbl mapped:802ae15c + - [0x2495f0, 0x24b5f0, "bin", "___2495f0_len_2000"] # frame:0x00000286 header: 0x0 trace: Tbl mapped:802ae15c - [0x24b5f0, 0x24b7f0, "bin", "___24b5f0_len_200"] # (DRAM:0x002AFBE0) (frame:0x00000286) header: 0x94000000 trace: - [0x263a00, 0x263ad8, "bin", "___263a00_len_d8"] # (DRAM:0x00319750) (frame:0x00002F57) header: 0xff000000 trace: - [0x263ad8, 0x263bb0, "bin", "___263ad8_len_d8"] # (DRAM:0x00319750) (frame:0x00002F59) header: 0xff000000 trace: @@ -366,9 +366,9 @@ ranges: - [0xabf290, 0xac1290, "bin", "___abf290_len_2000"] # (DRAM:0x00244000) (frame:0x00003508) header: 0x0 trace: - [0xac1290, 0xac3290, "bin", "___ac1290_len_2000"] # (DRAM:0x00246000) (frame:0x00003508) header: 0x0 trace: - [0xac3290, 0xac5170, "bin", "___ac3290_len_1ee0"] # (DRAM:0x00248000) (frame:0x00003508) header: 0x0 trace: - - [0xe20eb0, 0xe21870, "asm", "CODE_e20eb0_len_9c0", 0x002B7000] # frame:0x00003767 header: 0x3c000000 trace: Tbl mapped:802b76f8 - - [0xe23260, 0xe236e0, "asm", "CODE_e23260_len_480", 0x002B6000] # frame:0x0000027E header: 0x27000000 trace: Tbl mapped:802b6478 - # - [0xe236e0, 0xe24040, "asm", "CODE_e236e0_len_960", 0x002B6000] # frame:0x00002948 header: 0x27000000 trace: Tbl mapped:802b6750 + - [0xe20eb0, 0xe215c0, "asm", "CODE_e20eb0_len_9c0", 0x002B7000] # frame:0x00003767 header: 0x3c000000 trace: Tbl mapped:802b76f8 + - [0xe215c0, 0xe236e0, "bin", "CODE_e23260_len_480", 0x002B6000] # frame:0x0000027E header: 0x27000000 trace: Tbl mapped:802b6478 + - [0xe236e0, 0xe24040, "bin", "CODE_e236e0_len_960", 0x002B6000] # frame:0x00002948 header: 0x27000000 trace: Tbl mapped:802b6750 - [0xe24040, 0xe245d0, "bin", "___e24040_len_590"] # (DRAM:0x002B6000) (frame:0x00001B20) header: 0x27000000 trace: - [0xe24920, 0xe24ed0, "bin", "___e24920_len_5b0"] # (DRAM:0x002B6000) (frame:0x00002F44) header: 0x27000000 trace: - [0xe28a30, 0xe291a0, "bin", "___e28a30_len_770"] # (DRAM:0x002B6000) (frame:0x000037ED) header: 0x27000000 trace: diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000000..4ba33eac6b --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,11 @@ +version: "3" +services: + pm: + volumes: + - pm-sync:/pm:nocopy + image: "pm:latest" + tty: true + +volumes: + pm-sync: + external: true diff --git a/docker-sync.yml b/docker-sync.yml new file mode 100644 index 0000000000..f6d17727bf --- /dev/null +++ b/docker-sync.yml @@ -0,0 +1,5 @@ +version: "2" + +syncs: + pm-sync: + src: '.' diff --git a/n64splitter b/n64splitter index b099282615..cb76d9bb3c 160000 --- a/n64splitter +++ b/n64splitter @@ -1 +1 @@ -Subproject commit b09928261526490d54c101a773a8c888d617b86c +Subproject commit cb76d9bb3c359c4b3b4e1cb313c721e2cc4c55aa diff --git a/papermario/Makefile b/papermario/Makefile index 47fe0c7c3b..74b567e5f9 100644 --- a/papermario/Makefile +++ b/papermario/Makefile @@ -6,7 +6,7 @@ BUILD_DIR = build ##################### Compiler Options ####################### -CROSS = mipsel-elf- +CROSS = mips-linux-gnu- AS = $(CROSS)as CC = $(CROSS)gcc LD = $(CROSS)ld diff --git a/papermario/PAPERMARIO.ld b/papermario/PAPERMARIO.ld index ae68e7d5cd..bfe9bd2075 100644 --- a/papermario/PAPERMARIO.ld +++ b/papermario/PAPERMARIO.ld @@ -1,8 +1,6 @@ /* Paper Mario (U) [!] linker script * generated by n64split v0.4a - N64 ROM splitter */ -OUTPUT_FORMAT ("elf32-bigmips", "elf32-bigmips", "elf32-littlemips") -OUTPUT_ARCH (mips) SECTIONS { @@ -128,7 +126,7 @@ SECTIONS * (.text001476D0); } - /* 0x001496D0 0DFDD0-0E1DD0 [2000] */ + /* 0x001496D0 0DFDD0-0E16B0 [18E0] */ .text001496D0 0x001496D0 : AT(0x0DFDD0) { * (.text001496D0); } @@ -233,16 +231,11 @@ SECTIONS * (.text00242BA0); } - /* 0x00246BA0 167400-16B400 [4000] */ + /* 0x00246BA0 167400-16A3E0 [2FE0] */ .text00246BA0 0x00246BA0 : AT(0x167400) { * (.text00246BA0); } - /* 0x002ADBE0 2495F0-24B5F0 [2000] */ - .text002ADBE0 0x002ADBE0 : AT(0x2495F0) { - * (.text002ADBE0); - } - /* 0x00200000 3169F0-316A70 [80] */ .text00200000 0x00200000 : AT(0x3169F0) { * (.text00200000); @@ -268,14 +261,9 @@ SECTIONS * (.text00282000); } - /* 0x002B7000 E20EB0-E21870 [9C0] */ + /* 0x002B7000 E20EB0-E215C0 [710] */ .text002B7000 0x002B7000 : AT(0xE20EB0) { * (.text002B7000); } - /* 0x002B6000 E23260-E236E0 [480] */ - .text002B6000 0x002B6000 : AT(0xE23260) { - * (.text002B6000); - } - } diff --git a/papermario/PAPERMARIO.s b/papermario/PAPERMARIO.s index fe807e0a20..76d0ae39c2 100644 --- a/papermario/PAPERMARIO.s +++ b/papermario/PAPERMARIO.s @@ -158,7 +158,7 @@ ___b9dd0_len_2000_end: .include "asm/CODE_dddd0_len_2000.s" .include "asm/CODE_dfdd0_len_2000.s" ___e1dd0_len_2000: -.incbin "bin/PAPERMARIO.0E1DD0.___e1dd0_len_2000.bin" +.incbin "bin/PAPERMARIO.0E16B0.___e1dd0_len_2000.bin" ___e1dd0_len_2000_end: ___e3dd0_len_2000: .incbin "bin/PAPERMARIO.0E3DD0.___e3dd0_len_2000.bin" @@ -227,7 +227,7 @@ ___11a240_len_200_end: .include "asm/CODE_163400_len_4000.s" .include "asm/CODE_167400_len_4000.s" ___16b400_len_14e0: -.incbin "bin/PAPERMARIO.16B400.___16b400_len_14e0.bin" +.incbin "bin/PAPERMARIO.16A3E0.___16b400_len_14e0.bin" ___16b400_len_14e0_end: # Unknown region 16C8E0-1E0350 [73A70] .incbin "bin/PAPERMARIO.16C8E0.bin" @@ -559,7 +559,9 @@ ___2455f0_len_2000_end: ___2475f0_len_2000: .incbin "bin/PAPERMARIO.2475F0.___2475f0_len_2000.bin" ___2475f0_len_2000_end: -.include "asm/CODE_2495f0_len_2000.s" +___2495f0_len_2000: +.incbin "bin/PAPERMARIO.2495F0.___2495f0_len_2000.bin" +___2495f0_len_2000_end: ___24b5f0_len_200: .incbin "bin/PAPERMARIO.24B5F0.___24b5f0_len_200.bin" ___24b5f0_len_200_end: @@ -1100,13 +1102,12 @@ ___ac3290_len_1ee0_end: .incbin "bin/PAPERMARIO.AC5170.bin" .include "asm/CODE_e20eb0_len_9c0.s" -# Unknown region E21870-E23260 [19F0] -.incbin "bin/PAPERMARIO.E21870.bin" - -.include "asm/CODE_e23260_len_480.s" -# Unknown region E236E0-E24040 [960] -.incbin "bin/PAPERMARIO.E236E0.bin" - +CODE_e23260_len_480: +.incbin "bin/PAPERMARIO.E215C0.CODE_e23260_len_480.bin" +CODE_e23260_len_480_end: +CODE_e236e0_len_960: +.incbin "bin/PAPERMARIO.E236E0.CODE_e236e0_len_960.bin" +CODE_e236e0_len_960_end: ___e24040_len_590: .incbin "bin/PAPERMARIO.E24040.___e24040_len_590.bin" ___e24040_len_590_end: diff --git a/papermario/asm/CODE_1000_len_100004.s b/papermario/asm/CODE_1000_len_100004.s index 36b0f4d7b6..d69c2bf722 100644 --- a/papermario/asm/CODE_1000_len_100004.s +++ b/papermario/asm/CODE_1000_len_100004.s @@ -74131,7 +74131,8 @@ func_000674A0: /* 0428F0 000674F0 00000000 */ nop /* 0428F4 000674F4 00000000 */ nop /* 0428F8 000674F8 00000000 */ nop -/* 0428FC 000674FC 00000000 */ nop +/* 0428FC 000674FC 00000000 */ nop +glabel func_00067500 func_00067500: /* 042900 00067500 3C014780 */ li $at, 0x47800000 # 65536.000000 /* 042904 00067504 44810000 */ mtc1 $at, $f0 diff --git a/papermario/asm/CODE_100e30_len_17e0.s b/papermario/asm/CODE_100e30_len_17e0.s index c6f225c6ac..b7d2ca8374 100644 --- a/papermario/asm/CODE_100e30_len_17e0.s +++ b/papermario/asm/CODE_100e30_len_17e0.s @@ -24,7 +24,7 @@ /* 100E80 002DDD90 24A5FE98 */ addiu $a1, $a1, -0x168 .L002DDD94: /* 100E84 002DDD94 28A2FE98 */ slti $v0, $a1, -0x168 -/* 100E88 002DDD98 54400001 */ bnel $v0, $zero, .L002DDDA0 +/* 100E88 002DDD98 54400001 */ bnezl $v0, .L002DDDA0 /* 100E8C 002DDD9C 24A50168 */ addiu $a1, $a1, 0x168 .L002DDDA0: /* 100E90 002DDDA0 24A2FFA5 */ addiu $v0, $a1, -0x5b @@ -73,7 +73,7 @@ func_002DDDD4: /* 100F1C 002DDE2C 8E10F588 */ lw $s0, -0xa78($s0) /* 100F20 002DDE30 3C022000 */ lui $v0, 0x2000 /* 100F24 002DDE34 00821024 */ and $v0, $a0, $v0 -/* 100F28 002DDE38 54400001 */ bnel $v0, $zero, .L002DDE40 +/* 100F28 002DDE38 54400001 */ bnezl $v0, .L002DDE40 /* 100F2C 002DDE3C 00E0B02D */ move $s6, $a3 .L002DDE40: /* 100F30 002DDE40 8E030000 */ lw $v1, ($s0) @@ -298,7 +298,7 @@ func_002DDFF8: /* 10123C 002DE14C 2463F530 */ addiu $v1, %lo(D_802DF530) # addiu $v1, $v1, -0xad0 /* 101240 002DE150 8C620000 */ lw $v0, ($v1) /* 101244 002DE154 0044102A */ slt $v0, $v0, $a0 -/* 101248 002DE158 54400001 */ bnel $v0, $zero, .L002DE160 +/* 101248 002DE158 54400001 */ bnezl $v0, .L002DE160 /* 10124C 002DE15C AC640000 */ sw $a0, ($v1) .L002DE160: /* 101250 002DE160 24020033 */ li $v0, 51 @@ -536,7 +536,7 @@ func_002DE288: /* 1015B8 002DE4C8 24A5FE98 */ addiu $a1, $a1, -0x168 .L002DE4CC: /* 1015BC 002DE4CC 28A2FE98 */ slti $v0, $a1, -0x168 -/* 1015C0 002DE4D0 54400001 */ bnel $v0, $zero, .L002DE4D8 +/* 1015C0 002DE4D0 54400001 */ bnezl $v0, .L002DE4D8 /* 1015C4 002DE4D4 24A50168 */ addiu $a1, $a1, 0x168 .L002DE4D8: /* 1015C8 002DE4D8 24A2FFA5 */ addiu $v0, $a1, -0x5b @@ -573,7 +573,7 @@ func_002DE50C: /* 101628 002DE538 8E10FA4C */ lw $s0, -0x5b4($s0) /* 10162C 002DE53C 3C022000 */ lui $v0, 0x2000 /* 101630 002DE540 00821024 */ and $v0, $a0, $v0 -/* 101634 002DE544 54400001 */ bnel $v0, $zero, .L002DE54C +/* 101634 002DE544 54400001 */ bnezl $v0, .L002DE54C /* 101638 002DE548 00E0A02D */ move $s4, $a3 .L002DE54C: /* 10163C 002DE54C 8E030000 */ lw $v1, ($s0) @@ -1622,7 +1622,7 @@ func_002DF2D8: /* 102480 002DF390 FFF00038 */ sd $s0, 0x38($ra) /* 102484 002DF394 00000000 */ nop /* 102488 002DF398 00000000 */ nop -/* 10248C 002DF39C F0F0F0FF */ scd $s0, -0xf01($a3) +/* 10248C 002DF39C F0F0F0FF */ scd $a3, (-0xf01) /* 102490 002DF3A0 00100038 */ dsll $zero, $s0, 0 /* 102494 002DF3A4 00000000 */ nop /* 102498 002DF3A8 04000000 */ bltz $zero, .L002DF3AC @@ -1635,46 +1635,45 @@ func_002DF2D8: /* 1024B4 002DF3C4 00000000 */ nop /* 1024B8 002DF3C8 00000700 */ sll $zero, $zero, 0x1c /* 1024BC 002DF3CC 787878FF */ .byte 0x78, 0x78, 0x78, 0xff -/* 1024C0 002DF3D0 028001E0 */ /* 1024C4 002DF3D4 01FF0000 */ /* 1024C8 002DF3D8 028001E0 */ /* 1024CC 002DF3DC 01FF0000 */ /* 1024D0 002DF3E0 028001E0 */ /* 1024D4 002DF3E4 01FF0000 */ /* 1024D8 002DF3E8 028001E0 */ /* 1024DC 002DF3EC 02000000 */ /* 1024E0 002DF3F0 D9FDF9FF */ .byte 0xD9,0xFD,0xF9,0xFF /* Because of invalid n64 opcode bbit032 */ -/* 1024E4 002DF3F4 00000000 */ /* 1024E8 002DF3F8 FCFFFFFF */ sd $ra, -1($a3) +/* 1024C0 002DF3D0 028001E0 */ /* 1024C4 002DF3D4 01FF0000 */ /* 1024C8 002DF3D8 028001E0 */ /* 1024CC 002DF3DC 01FF0000 */ /* 1024D0 002DF3E0 028001E0 */ /* 1024D4 002DF3E4 01FF0000 */ /* 1024D8 002DF3E8 028001E0 */ /* 1024DC 002DF3EC 02000000 */ /* 1024E0 002DF3F0 D9FDF9FF */ /* 1024E4 002DF3F4 00000000 */ nop +/* 1024E8 002DF3F8 FCFFFFFF */ sd $ra, -1($a3) /* 1024EC 002DF3FC FFFCF279 */ sd $gp, -0xd87($ra) /* 1024F0 002DF400 D7000002 */ ldc1 $f0, 2($t8) /* 1024F4 002DF404 FFFFFFFF */ sd $ra, -1($ra) -.L002DF408: -/* 1024F8 002DF408 D9FFFFFF */ .byte 0xD9,0xFF,0xFF,0xFF /* Because of invalid n64 opcode bbit032 */ +/* 1024F8 002DF408 D9FFFFFF */ ldc2 $31, -1($t7) /* 1024FC 002DF40C 00200005 */ .byte 0x00,0x20,0x00,0x05 /* Because of invalid n64 opcode lsa */ /* 102500 002DF410 E200001C */ /* 102504 002DF414 00551238 */ .byte 0x00, 0x55, 0x12, 0x38 /* 102508 002DF418 E3000A11 */ /* 10250C 002DF41C 0008ACF0 */ tge $zero, $t0, 0x2b3 /* 102510 002DF420 DF000000 */ ld $zero, ($t8) /* 102514 002DF424 00000000 */ nop -/* 102518 002DF428 D9FDF9FF */ .byte 0xD9,0xFD,0xF9,0xFF /* Because of invalid n64 opcode bbit032 */ -/* 10251C 002DF42C 00000000 */ /* 102520 002DF430 FCFF97FF */ sd $ra, -0x6801($a3) +/* 102518 002DF428 D9FDF9FF */ ldc2 $29, -0x601($t7) +/* 10251C 002DF42C 00000000 */ nop +/* 102520 002DF430 FCFF97FF */ sd $ra, -0x6801($a3) /* 102524 002DF434 FF2CFE7F */ sd $t4, -0x181($t9) /* 102528 002DF438 D7000002 */ ldc1 $f0, 2($t8) /* 10252C 002DF43C FFFFFFFF */ sd $ra, -1($ra) -.L002DF440: -/* 102530 002DF440 D9FFFFFF */ .byte 0xD9,0xFF,0xFF,0xFF /* Because of invalid n64 opcode bbit032 */ +/* 102530 002DF440 D9FFFFFF */ ldc2 $31, -1($t7) /* 102534 002DF444 00200005 */ .byte 0x00,0x20,0x00,0x05 /* Because of invalid n64 opcode lsa */ /* 102538 002DF448 E200001C */ /* 10253C 002DF44C 00504B50 */ .byte 0x00, 0x50, 0x4b, 0x50 /* 102540 002DF450 E3000A11 */ /* 102544 002DF454 0008ACF0 */ tge $zero, $t0, 0x2b3 /* 102548 002DF458 DF000000 */ ld $zero, ($t8) /* 10254C 002DF45C 00000000 */ nop -/* 102550 002DF460 D9FDF9FF */ .byte 0xD9,0xFD,0xF9,0xFF /* Because of invalid n64 opcode bbit032 */ -/* 102554 002DF464 00000000 */ /* 102558 002DF468 D7000002 */ ldc1 $f0, 2($t8) +/* 102550 002DF460 D9FDF9FF */ ldc2 $29, -0x601($t7) +/* 102554 002DF464 00000000 */ nop +/* 102558 002DF468 D7000002 */ ldc1 $f0, 2($t8) /* 10255C 002DF46C FFFFFFFF */ sd $ra, -1($ra) -.L002DF470: -/* 102560 002DF470 D9FFFFFF */ .byte 0xD9,0xFF,0xFF,0xFF /* Because of invalid n64 opcode bbit032 */ +/* 102560 002DF470 D9FFFFFF */ ldc2 $31, -1($t7) /* 102564 002DF474 00200005 */ .byte 0x00,0x20,0x00,0x05 /* Because of invalid n64 opcode lsa */ /* 102568 002DF478 E200001C */ /* 10256C 002DF47C 0C191238 */ jal func_006448E0 /* 102570 002DF480 E3000A11 */ sc $zero, 0xa11($t8) /* 102574 002DF484 0018ACF0 */ tge $zero, $t8, 0x2b3 /* 102578 002DF488 DF000000 */ ld $zero, ($t8) /* 10257C 002DF48C 00000000 */ nop -/* 102580 002DF490 D9FDF9FF */ .byte 0xD9,0xFD,0xF9,0xFF /* Because of invalid n64 opcode bbit032 */ -/* 102584 002DF494 00000000 */ /* 102588 002DF498 D7000002 */ ldc1 $f0, 2($t8) +/* 102580 002DF490 D9FDF9FF */ ldc2 $29, -0x601($t7) +/* 102584 002DF494 00000000 */ nop +/* 102588 002DF498 D7000002 */ ldc1 $f0, 2($t8) /* 10258C 002DF49C FFFFFFFF */ sd $ra, -1($ra) -.L002DF4A0: -/* 102590 002DF4A0 D9FFFFFF */ .byte 0xD9,0xFF,0xFF,0xFF /* Because of invalid n64 opcode bbit032 */ +/* 102590 002DF4A0 D9FFFFFF */ ldc2 $31, -1($t7) /* 102594 002DF4A4 00200005 */ .byte 0x00,0x20,0x00,0x05 /* Because of invalid n64 opcode lsa */ /* 102598 002DF4A8 E200001C */ /* 10259C 002DF4AC 0C184B50 */ jal func_00612D40 /* 1025A0 002DF4B0 E3000A11 */ sc $zero, 0xa11($t8) diff --git a/papermario/asm/CODE_104610_len_2000.s b/papermario/asm/CODE_104610_len_2000.s index a04874e671..baf49f0569 100644 --- a/papermario/asm/CODE_104610_len_2000.s +++ b/papermario/asm/CODE_104610_len_2000.s @@ -1097,7 +1097,7 @@ func_002E3D08: /* 1055B4 002E3D34 3C028011 */ lui $v0, %hi(D_8010F290) # $v0, 0x8011 /* 1055B8 002E3D38 8042F290 */ lb $v0, %lo(D_8010F290)($v0) /* 1055BC 002E3D3C 28420002 */ slti $v0, $v0, 2 -/* 1055C0 002E3D40 54400007 */ bnel $v0, $zero, .L002E3D60 +/* 1055C0 002E3D40 54400007 */ bnezl $v0, .L002E3D60 /* 1055C4 002E3D44 0000802D */ move $s0, $zero /* 1055C8 002E3D48 080B8F58 */ j func_002E3D60 /* 1055CC 002E3D4C 00000000 */ nop @@ -2101,7 +2101,7 @@ func_002E4B60: /* 106418 002E4B98 0C04417A */ jal func_001105E8 /* 10641C 002E4B9C 92040000 */ lbu $a0, ($s0) /* 106420 002E4BA0 92020009 */ lbu $v0, 9($s0) -/* 106424 002E4BA4 54400009 */ bnel $v0, $zero, .L002E4BCC +/* 106424 002E4BA4 54400009 */ bnezl $v0, .L002E4BCC /* 106428 002E4BA8 A2000001 */ sb $zero, 1($s0) /* 10642C 002E4BAC 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 106430 002E4BB0 44810000 */ mtc1 $at, $f0 diff --git a/papermario/asm/CODE_106610_len_2000.s b/papermario/asm/CODE_106610_len_2000.s index 253d6c169a..e1e20f841b 100644 --- a/papermario/asm/CODE_106610_len_2000.s +++ b/papermario/asm/CODE_106610_len_2000.s @@ -1145,7 +1145,7 @@ func_002E58FC: /* 1076E4 002E5E64 0C0B9607 */ jal func_002E581C /* 1076E8 002E5E68 8E300040 */ lw $s0, 0x40($s1) /* 1076EC 002E5E6C 9202000A */ lbu $v0, 0xa($s0) -/* 1076F0 002E5E70 54400001 */ bnel $v0, $zero, .L002E5E78 +/* 1076F0 002E5E70 54400001 */ bnezl $v0, .L002E5E78 /* 1076F4 002E5E74 AE20003C */ sw $zero, 0x3c($s1) .L002E5E78: /* 1076F8 002E5E78 C62C0064 */ lwc1 $f12, 0x64($s1) @@ -1983,7 +1983,7 @@ func_002E69D8: /* 108350 002E6AD0 AC430000 */ sw $v1, ($v0) func_002E6AD4: .L002E6AD4: -/* 108354 002E6AD4 56400002 */ bnel $s2, $zero, .L002E6AE0 +/* 108354 002E6AD4 56400002 */ bnezl $s2, .L002E6AE0 /* 108358 002E6AD8 E6340068 */ swc1 $f20, 0x68($s1) /* 10835C 002E6ADC E6340060 */ swc1 $f20, 0x60($s1) .L002E6AE0: diff --git a/papermario/asm/CODE_163400_len_4000.s b/papermario/asm/CODE_163400_len_4000.s index 565ff35e98..5a43e835df 100644 --- a/papermario/asm/CODE_163400_len_4000.s +++ b/papermario/asm/CODE_163400_len_4000.s @@ -3381,7 +3381,7 @@ func_00245B70: /* 16647C 00245C1C 00000000 */ nop /* 166480 00245C20 92620002 */ lbu $v0, 2($s3) /* 166484 00245C24 2C420002 */ sltiu $v0, $v0, 2 -/* 166488 00245C28 54400010 */ bnel $v0, $zero, .L00245C6C +/* 166488 00245C28 54400010 */ bnezl $v0, .L00245C6C /* 16648C 00245C2C A2600001 */ sb $zero, 1($s3) /* 166490 00245C30 0809171B */ j func_00245C6C /* 166494 00245C34 00000000 */ nop @@ -3392,7 +3392,7 @@ func_00245B70: /* 1664A4 00245C44 00000000 */ nop /* 1664A8 00245C48 92620002 */ lbu $v0, 2($s3) /* 1664AC 00245C4C 2C420002 */ sltiu $v0, $v0, 2 -/* 1664B0 00245C50 54400001 */ bnel $v0, $zero, .L00245C58 +/* 1664B0 00245C50 54400001 */ bnezl $v0, .L00245C58 /* 1664B4 00245C54 A2600001 */ sb $zero, 1($s3) .L00245C58: /* 1664B8 00245C58 82630002 */ lb $v1, 2($s3) diff --git a/papermario/asm/CODE_167400_len_4000.s b/papermario/asm/CODE_167400_len_4000.s index dd86edaa9d..89480018a4 100644 --- a/papermario/asm/CODE_167400_len_4000.s +++ b/papermario/asm/CODE_167400_len_4000.s @@ -3358,880 +3358,3 @@ func_00249AB8: /* 16A3D8 00249B78 00000000 */ nop /* 16A3DC 00249B7C 00000000 */ nop -/* 16A3E0 00249B80 80241ECC */ lb $a0, 0x1ecc($at) -/* 16A3E4 00249B84 8024A098 */ lb $a0, -0x5f68($at) -/* 16A3E8 00249B88 8024A114 */ lb $a0, -0x5eec($at) -/* 16A3EC 00249B8C 8024A158 */ lb $a0, -0x5ea8($at) -/* 16A3F0 00249B90 8024A1D8 */ lb $a0, -0x5e28($at) -/* 16A3F4 00249B94 000000A0 */ .byte 0x00, 0x00, 0x00, 0xa0 -/* 16A3F8 00249B98 FFFFFF88 */ /* 16A3FC 00249B9C 00000000 */ nop -/* 16A400 00249BA0 000000A0 */ .byte 0x00, 0x00, 0x00, 0xa0 -/* 16A404 00249BA4 FFFFFF88 */ /* 16A408 00249BA8 00000000 */ nop -/* 16A40C 00249BAC 00000000 */ nop -/* 16A410 00249BB0 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ -/* 16A414 00249BB4 00000000 */ /* 16A418 00249BB8 00000000 */ nop -/* 16A41C 00249BBC 013B012F */ .byte 0x01, 0x3b, 0x01, 0x2f -/* 16A420 00249BC0 011B0104 */ /* 16A424 00249BC4 00EB00D2 */ /* 16A428 00249BC8 00B900A0 */ /* 16A42C 00249BCC 0087006E */ /* 16A430 00249BD0 0055003C */ /* 16A434 00249BD4 00250011 */ /* 16A438 00249BD8 00050000 */ /* 16A43C 00249BDC 013B012F */ .byte 0x01, 0x3b, 0x01, 0x2f -/* 16A440 00249BE0 011B0104 */ /* 16A444 00249BE4 00EB00D2 */ /* 16A448 00249BE8 00B900A0 */ /* 16A44C 00249BEC 0087006E */ /* 16A450 00249BF0 0055003C */ /* 16A454 00249BF4 00250011 */ /* 16A458 00249BF8 00050000 */ /* 16A45C 00249BFC 009D0097 */ .byte 0x00, 0x9d, 0x00, 0x97 -/* 16A460 00249C00 008D0082 */ /* 16A464 00249C04 00750069 */ /* 16A468 00249C08 005C0050 */ /* 16A46C 00249C0C 00430037 */ /* 16A470 00249C10 002A001E */ /* 16A474 00249C14 00120008 */ .byte 0x00, 0x12, 0x00, 0x08 -/* 16A478 00249C18 00020000 */ /* 16A47C 00249C1C 009D0097 */ .byte 0x00, 0x9d, 0x00, 0x97 -/* 16A480 00249C20 008D0082 */ /* 16A484 00249C24 00750069 */ /* 16A488 00249C28 005C0050 */ /* 16A48C 00249C2C 00430037 */ /* 16A490 00249C30 002A001E */ /* 16A494 00249C34 00120008 */ .byte 0x00, 0x12, 0x00, 0x08 -/* 16A498 00249C38 00020000 */ /* 16A49C 00249C3C 003F003C */ .byte 0x00, 0x3f, 0x00, 0x3c -/* 16A4A0 00249C40 00380034 */ /* 16A4A4 00249C44 002F002A */ slt $zero, $at, $t7 -/* 16A4A8 00249C48 00250020 */ add $zero, $at, $a1 -/* 16A4AC 00249C4C 001B0016 */ dsrlv $zero, $k1, $zero -/* 16A4B0 00249C50 0011000C */ syscall 0x4400 -/* 16A4B4 00249C54 00070003 */ sra $zero, $a3, 0 -/* 16A4B8 00249C58 00010000 */ sll $zero, $at, 0 -/* 16A4BC 00249C5C 003F003C */ .byte 0x00, 0x3f, 0x00, 0x3c -/* 16A4C0 00249C60 00380034 */ /* 16A4C4 00249C64 002F002A */ slt $zero, $at, $t7 -/* 16A4C8 00249C68 00250020 */ add $zero, $at, $a1 -/* 16A4CC 00249C6C 001B0016 */ dsrlv $zero, $k1, $zero -/* 16A4D0 00249C70 0011000C */ syscall 0x4400 -/* 16A4D4 00249C74 00070003 */ sra $zero, $a3, 0 -/* 16A4D8 00249C78 00010000 */ sll $zero, $at, 0 -/* 16A4DC 00249C7C FFFBFFEF */ sd $k1, -0x11($ra) -/* 16A4E0 00249C80 FFDBFFC4 */ sd $k1, -0x3c($fp) -/* 16A4E4 00249C84 FFABFF92 */ sd $t3, -0x6e($sp) -/* 16A4E8 00249C88 FF79FF60 */ sd $t9, -0xa0($k1) -/* 16A4EC 00249C8C FF47FF2E */ sd $a3, -0xd2($k0) -/* 16A4F0 00249C90 FFFBFFEF */ sd $k1, -0x11($ra) -/* 16A4F4 00249C94 FFDBFFC4 */ sd $k1, -0x3c($fp) -/* 16A4F8 00249C98 FFABFF92 */ sd $t3, -0x6e($sp) -/* 16A4FC 00249C9C FF79FF60 */ sd $t9, -0xa0($k1) -/* 16A500 00249CA0 FF47FF2E */ sd $a3, -0xd2($k0) -/* 16A504 00249CA4 FFFEFFF8 */ sd $fp, -8($ra) -/* 16A508 00249CA8 FFEEFFE2 */ sd $t6, -0x1e($ra) -/* 16A50C 00249CAC FFD6FFC9 */ sd $s6, -0x37($fp) -/* 16A510 00249CB0 FFBAFFAB */ sd $k0, -0x55($sp) -/* 16A514 00249CB4 FF9CFF8D */ sd $gp, -0x73($gp) -/* 16A518 00249CB8 FFFEFFF8 */ sd $fp, -8($ra) -/* 16A51C 00249CBC FFEEFFE2 */ sd $t6, -0x1e($ra) -/* 16A520 00249CC0 FFD6FFC9 */ sd $s6, -0x37($fp) -/* 16A524 00249CC4 FFBAFFAB */ sd $k0, -0x55($sp) -/* 16A528 00249CC8 FF9CFF8D */ sd $gp, -0x73($gp) -/* 16A52C 00249CCC FFFFFFFD */ sd $ra, -3($ra) -/* 16A530 00249CD0 FFF9FFF4 */ sd $t9, -0xc($ra) -/* 16A534 00249CD4 FFEFFFEA */ sd $t7, -0x16($ra) -/* 16A538 00249CD8 FFE5FFE0 */ sd $a1, -0x20($ra) -/* 16A53C 00249CDC FFDBFFD6 */ sd $k1, -0x2a($fp) -/* 16A540 00249CE0 FFFFFFFD */ sd $ra, -3($ra) -/* 16A544 00249CE4 FFF9FFF4 */ sd $t9, -0xc($ra) -/* 16A548 00249CE8 FFEFFFEA */ sd $t7, -0x16($ra) -/* 16A54C 00249CEC FFE5FFE0 */ sd $a1, -0x20($ra) -/* 16A550 00249CF0 FFDBFFD6 */ sd $k1, -0x2a($fp) -/* 16A554 00249CF4 00B400AD */ .byte 0x00, 0xb4, 0x00, 0xad -/* 16A558 00249CF8 00A10094 */ /* 16A55C 00249CFC 00860078 */ /* 16A560 00249D00 0069005B */ /* 16A564 00249D04 004D003E */ /* 16A568 00249D08 00300022 */ /* 16A56C 00249D0C 00150009 */ .byte 0x00, 0x15, 0x00, 0x09 -/* 16A570 00249D10 00020000 */ /* 16A574 00249D14 00000002 */ srl $zero, $zero, 0 -/* 16A578 00249D18 00090015 */ .byte 0x00,0x09,0x00,0x15 /* Because of invalid n64 opcode dlsa */ -/* 16A57C 00249D1C 00220030 */ /* 16A580 00249D20 003E004D */ break 0x3e, 1 -/* 16A584 00249D24 005B0069 */ .byte 0x00, 0x5b, 0x00, 0x69 -/* 16A588 00249D28 00780086 */ /* 16A58C 00249D2C 009400A1 */ /* 16A590 00249D30 00AD00B4 */ /* 16A594 00249D34 00B900A0 */ .byte 0x00, 0xb9, 0x00, 0xa0 -/* 16A598 00249D38 0087006E */ /* 16A59C 00249D3C 0055003C */ /* 16A5A0 00249D40 00250011 */ /* 16A5A4 00249D44 00050000 */ /* 16A5A8 00249D48 00000005 */ .byte 0x00,0x00,0x00,0x05 /* Because of invalid n64 opcode lsa */ -/* 16A5AC 00249D4C 00110025 */ /* 16A5B0 00249D50 003C0055 */ .byte 0x00,0x3C,0x00,0x55 /* Because of invalid n64 opcode dlsa */ -/* 16A5B4 00249D54 006E0087 */ /* 16A5B8 00249D58 00A000B9 */ /* 16A5BC 00249D5C 00000000 */ /* 16A5C0 00249D60 028001E0 */ .byte 0x02, 0x80, 0x01, 0xe0 -/* 16A5C4 00249D64 01FF0000 */ /* 16A5C8 00249D68 028001E0 */ /* 16A5CC 00249D6C 01FF0000 */ /* 16A5D0 00249D70 40E00000 */ /* 16A5D4 00249D74 41480000 */ /* 16A5D8 00249D78 41500000 */ /* 16A5DC 00249D7C 41680000 */ /* 16A5E0 00249D80 41600000 */ /* 16A5E4 00249D84 41500000 */ /* 16A5E8 00249D88 41380000 */ /* 16A5EC 00249D8C 41180000 */ .byte 0x41,0x18,0x00,0x00 /* Because of invalid n64 opcode bc0f */ -.L00249D90: -/* 16A5F0 00249D90 40F00000 */ /* 16A5F4 00249D94 40B00000 */ .byte 0x40,0xB0,0x00,0x00 /* Because of invalid n64 opcode dmtc0 */ -/* 16A5F8 00249D98 40600000 */ /* 16A5FC 00249D9C 40000000 */ /* 16A600 00249DA0 3F800000 */ .byte 0x3f, 0x80, 0x00, 0x00 -/* 16A604 00249DA4 3F000000 */ /* 16A608 00249DA8 00000000 */ /* 16A60C 00249DAC 2C000010 */ sltiu $zero, $zero, 0x10 -/* 16A610 00249DB0 00180120 */ .byte 0x00, 0x18, 0x01, 0x20 -/* 16A614 00249DB4 00C00000 */ /* 16A618 00249DB8 00000000 */ /* 16A61C 00249DBC 00000000 */ nop -/* 16A620 00249DC0 FF000000 */ sd $zero, ($t8) -/* 16A624 00249DC4 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ -/* 16A628 00249DC8 40000000 */ /* 16A62C 00249DCC 8024BA60 */ lb $a0, -0x45a0($at) -/* 16A630 00249DD0 18000000 */ blez $zero, .L00249DD4 -.L00249DD4: -/* 16A634 00249DD4 00000120 */ .byte 0x00, 0x00, 0x01, 0x20 -/* 16A638 00249DD8 00C00000 */ /* 16A63C 00249DDC 802440BC */ /* 16A640 00249DE0 00000000 */ nop -/* 16A644 00249DE4 2C000000 */ sltiu $zero, $zero, 0 -/* 16A648 00249DE8 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ -/* 16A64C 00249DEC 00000000 */ /* 16A650 00249DF0 8024BA98 */ lb $a0, -0x4568($at) -/* 16A654 00249DF4 17000000 */ bnez $t8, .L00249DF8 -.L00249DF8: -/* 16A658 00249DF8 00000140 */ .byte 0x00,0x00,0x01,0x40 /* Because of invalid n64 opcode pause */ -/* 16A65C 00249DFC 00F00000 */ /* 16A660 00249E00 80244030 */ /* 16A664 00249E04 00000000 */ nop -/* 16A668 00249E08 FF000000 */ sd $zero, ($t8) -/* 16A66C 00249E0C 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ -/* 16A670 00249E10 00000000 */ /* 16A674 00249E14 8024BA98 */ lb $a0, -0x4568($at) -/* 16A678 00249E18 00000000 */ nop -/* 16A67C 00249E1C 00000000 */ nop -/* 16A680 00249E20 802423DC */ lb $a0, 0x23dc($at) -/* 16A684 00249E24 80242434 */ lb $a0, 0x2434($at) -/* 16A688 00249E28 8024248C */ lb $a0, 0x248c($at) -/* 16A68C 00249E2C 802424E4 */ lb $a0, 0x24e4($at) -/* 16A690 00249E30 8024253C */ lb $a0, 0x253c($at) -/* 16A694 00249E34 80242594 */ lb $a0, 0x2594($at) -/* 16A698 00249E38 802425EC */ lb $a0, 0x25ec($at) -/* 16A69C 00249E3C 80242408 */ lb $a0, 0x2408($at) -/* 16A6A0 00249E40 80242460 */ lb $a0, 0x2460($at) -/* 16A6A4 00249E44 802424B8 */ lb $a0, 0x24b8($at) -/* 16A6A8 00249E48 80242510 */ lb $a0, 0x2510($at) -/* 16A6AC 00249E4C 80242568 */ lb $a0, 0x2568($at) -/* 16A6B0 00249E50 802425C0 */ lb $a0, 0x25c0($at) -/* 16A6B4 00249E54 80242618 */ lb $a0, 0x2618($at) -/* 16A6B8 00249E58 802422D4 */ lb $a0, 0x22d4($at) -/* 16A6BC 00249E5C 80242300 */ lb $a0, 0x2300($at) -/* 16A6C0 00249E60 8024232C */ lb $a0, 0x232c($at) -/* 16A6C4 00249E64 80242358 */ lb $a0, 0x2358($at) -/* 16A6C8 00249E68 80242384 */ lb $a0, 0x2384($at) -/* 16A6CC 00249E6C 802423B0 */ lb $a0, 0x23b0($at) -/* 16A6D0 00249E70 00000102 */ srl $zero, $zero, 4 -/* 16A6D4 00249E74 02030405 */ .byte 0x02, 0x03, 0x04, 0x05 -/* 16A6D8 00249E78 06000001 */ /* 16A6DC 00249E7C 02020306 */ .byte 0x02, 0x02, 0x03, 0x06 -.L00249E80: -/* 16A6E0 00249E80 06060000 */ /* 16A6E4 00249E84 01020203 */ /* 16A6E8 00249E88 06060600 */ /* 16A6EC 00249E8C 00010202 */ /* 16A6F0 00249E90 03060606 */ .byte 0x03, 0x06, 0x06, 0x06 -/* 16A6F4 00249E94 00000102 */ /* 16A6F8 00249E98 02030606 */ .byte 0x02, 0x03, 0x06, 0x06 -/* 16A6FC 00249E9C 06000000 */ .L00249EA0: -/* 16A700 00249EA0 2D000000 */ sltiu $zero, $t0, 0 -/* 16A704 00249EA4 00000000 */ nop -/* 16A708 00249EA8 00000000 */ nop -/* 16A70C 00249EAC 80244C30 */ lb $a0, 0x4c30($at) -/* 16A710 00249EB0 00000000 */ nop -/* 16A714 00249EB4 2C000000 */ sltiu $zero, $zero, 0 -/* 16A718 00249EB8 80243550 */ lb $a0, 0x3550($at) -/* 16A71C 00249EBC 00000000 */ nop -/* 16A720 00249EC0 8024BB08 */ lb $a0, -0x44f8($at) -/* 16A724 00249EC4 3300FFFE */ andi $zero, $t8, 0xfffe -/* 16A728 00249EC8 00060044 */ .byte 0x00, 0x06, 0x00, 0x44 -/* 16A72C 00249ECC 00140000 */ /* 16A730 00249ED0 80244CEC */ lb $a0, 0x4cec($at) -/* 16A734 00249ED4 00000000 */ nop -/* 16A738 00249ED8 2C000000 */ sltiu $zero, $zero, 0 -/* 16A73C 00249EDC 802433F4 */ lb $a0, 0x33f4($at) -/* 16A740 00249EE0 00000000 */ nop -/* 16A744 00249EE4 8024BAD0 */ lb $a0, -0x4530($at) -/* 16A748 00249EE8 340000DD */ li $zero, 221 -/* 16A74C 00249EEC 00060044 */ .byte 0x00, 0x06, 0x00, 0x44 -/* 16A750 00249EF0 00140000 */ /* 16A754 00249EF4 80244D60 */ lb $a0, 0x4d60($at) -/* 16A758 00249EF8 00000000 */ nop -/* 16A75C 00249EFC 2C000000 */ sltiu $zero, $zero, 0 -/* 16A760 00249F00 80243468 */ lb $a0, 0x3468($at) -/* 16A764 00249F04 00000000 */ nop -/* 16A768 00249F08 8024BAD0 */ lb $a0, -0x4530($at) -/* 16A76C 00249F0C 35000005 */ ori $zero, $t0, 5 -/* 16A770 00249F10 00AB0058 */ .byte 0x00, 0xab, 0x00, 0x58 -/* 16A774 00249F14 00100000 */ /* 16A778 00249F18 80244DD0 */ lb $a0, 0x4dd0($at) -/* 16A77C 00249F1C 00000000 */ nop -/* 16A780 00249F20 2C000000 */ sltiu $zero, $zero, 0 -/* 16A784 00249F24 802434DC */ lb $a0, 0x34dc($at) -/* 16A788 00249F28 00000000 */ nop -/* 16A78C 00249F2C 8024BB40 */ lb $a0, -0x44c0($at) -/* 16A790 00249F30 36000000 */ ori $zero, $s0, 0 -/* 16A794 00249F34 00AB0058 */ .byte 0x00, 0xab, 0x00, 0x58 -/* 16A798 00249F38 00100000 */ /* 16A79C 00249F3C 80244E54 */ lb $a0, 0x4e54($at) -/* 16A7A0 00249F40 00000000 */ nop -/* 16A7A4 00249F44 2C000000 */ sltiu $zero, $zero, 0 -/* 16A7A8 00249F48 802434DC */ lb $a0, 0x34dc($at) -/* 16A7AC 00249F4C 00000000 */ nop -/* 16A7B0 00249F50 8024BB78 */ lb $a0, -0x4488($at) -/* 16A7B4 00249F54 370000C3 */ ori $zero, $t8, 0xc3 -/* 16A7B8 00249F58 00AB0058 */ .byte 0x00, 0xab, 0x00, 0x58 -/* 16A7BC 00249F5C 00100000 */ /* 16A7C0 00249F60 80244F44 */ lb $a0, 0x4f44($at) -/* 16A7C4 00249F64 00000000 */ nop -/* 16A7C8 00249F68 2C000000 */ sltiu $zero, $zero, 0 -/* 16A7CC 00249F6C 802434DC */ lb $a0, 0x34dc($at) -/* 16A7D0 00249F70 00000000 */ nop -/* 16A7D4 00249F74 8024BBB0 */ lb $a0, -0x4450($at) -/* 16A7D8 00249F78 3A000009 */ xori $zero, $s0, 9 -/* 16A7DC 00249F7C 006E0082 */ .byte 0x00, 0x6e, 0x00, 0x82 -/* 16A7E0 00249F80 00360000 */ /* 16A7E4 00249F84 80245628 */ /* 16A7E8 00249F88 00000000 */ nop -/* 16A7EC 00249F8C 2C000000 */ sltiu $zero, $zero, 0 -/* 16A7F0 00249F90 802433F4 */ lb $a0, 0x33f4($at) -/* 16A7F4 00249F94 00000000 */ nop -/* 16A7F8 00249F98 8024BC58 */ lb $a0, -0x43a8($at) -/* 16A7FC 00249F9C 3E000003 */ .byte 0x3e, 0x00, 0x00, 0x03 -/* 16A800 00249FA0 FFF8007C */ /* 16A804 00249FA4 000F0000 */ sll $zero, $t7, 0 -/* 16A808 00249FA8 80245768 */ lb $a0, 0x5768($at) -/* 16A80C 00249FAC 00000000 */ nop -/* 16A810 00249FB0 3A000000 */ xori $zero, $s0, 0 -/* 16A814 00249FB4 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ -/* 16A818 00249FB8 00000000 */ /* 16A81C 00249FBC 8024BD38 */ lb $a0, -0x42c8($at) -/* 16A820 00249FC0 3B000095 */ xori $zero, $t8, 0x95 -/* 16A824 00249FC4 006E0082 */ .byte 0x00, 0x6e, 0x00, 0x82 -/* 16A828 00249FC8 00360000 */ /* 16A82C 00249FCC 80245678 */ /* 16A830 00249FD0 00000000 */ nop -/* 16A834 00249FD4 2C000000 */ sltiu $zero, $zero, 0 -/* 16A838 00249FD8 80243468 */ lb $a0, 0x3468($at) -/* 16A83C 00249FDC 00000000 */ nop -/* 16A840 00249FE0 8024BC90 */ lb $a0, -0x4370($at) -/* 16A844 00249FE4 3F000003 */ .byte 0x3f, 0x00, 0x00, 0x03 -/* 16A848 00249FE8 FFF8007C */ /* 16A84C 00249FEC 000F0000 */ sll $zero, $t7, 0 -/* 16A850 00249FF0 802457B8 */ lb $a0, 0x57b8($at) -/* 16A854 00249FF4 00000000 */ nop -/* 16A858 00249FF8 3B000000 */ xori $zero, $t8, 0 -/* 16A85C 00249FFC 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ -/* 16A860 0024A000 00000000 */ /* 16A864 0024A004 8024BD70 */ lb $a0, -0x4290($at) -/* 16A868 0024A008 38000009 */ xori $zero, $zero, 9 -/* 16A86C 0024A00C 00290082 */ .byte 0x00,0x29,0x00,0x82 /* Because of invalid n64 opcode rotr */ -/* 16A870 0024A010 00360000 */ /* 16A874 0024A014 80245588 */ /* 16A878 0024A018 00000000 */ nop -/* 16A87C 0024A01C 2C000000 */ sltiu $zero, $zero, 0 -/* 16A880 0024A020 802433F4 */ lb $a0, 0x33f4($at) -/* 16A884 0024A024 00000000 */ nop -/* 16A888 0024A028 8024BBE8 */ lb $a0, -0x4418($at) -/* 16A88C 0024A02C 3C000003 */ lui $zero, 3 -/* 16A890 0024A030 FFF8007C */ sd $t8, 0x7c($ra) -/* 16A894 0024A034 000F0000 */ sll $zero, $t7, 0 -/* 16A898 0024A038 802456C8 */ lb $a0, 0x56c8($at) -/* 16A89C 0024A03C 00000000 */ nop -/* 16A8A0 0024A040 38000000 */ xori $zero, $zero, 0 -/* 16A8A4 0024A044 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ -/* 16A8A8 0024A048 00000000 */ /* 16A8AC 0024A04C 8024BCC8 */ lb $a0, -0x4338($at) -/* 16A8B0 0024A050 39000095 */ xori $zero, $t0, 0x95 -/* 16A8B4 0024A054 00290082 */ .byte 0x00,0x29,0x00,0x82 /* Because of invalid n64 opcode rotr */ -/* 16A8B8 0024A058 00360000 */ /* 16A8BC 0024A05C 802455D8 */ /* 16A8C0 0024A060 00000000 */ nop -/* 16A8C4 0024A064 2C000000 */ sltiu $zero, $zero, 0 -/* 16A8C8 0024A068 80243468 */ lb $a0, 0x3468($at) -/* 16A8CC 0024A06C 00000000 */ nop -/* 16A8D0 0024A070 8024BC20 */ lb $a0, -0x43e0($at) -/* 16A8D4 0024A074 3D000003 */ .byte 0x3d, 0x00, 0x00, 0x03 -/* 16A8D8 0024A078 FFF8007C */ /* 16A8DC 0024A07C 000F0000 */ sll $zero, $t7, 0 -/* 16A8E0 0024A080 80245718 */ lb $a0, 0x5718($at) -/* 16A8E4 0024A084 00000000 */ nop -/* 16A8E8 0024A088 39000000 */ xori $zero, $t0, 0 -/* 16A8EC 0024A08C 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ -/* 16A8F0 0024A090 00000000 */ /* 16A8F4 0024A094 8024BD00 */ lb $a0, -0x4300($at) -/* 16A8F8 0024A098 00000000 */ nop -/* 16A8FC 0024A09C 00030300 */ sll $zero, $v1, 0xc -/* 16A900 0024A0A0 80249E70 */ lb $a0, -0x6190($at) -/* 16A904 0024A0A4 80245808 */ lb $a0, 0x5808($at) -/* 16A908 0024A0A8 80245A40 */ lb $a0, 0x5a40($at) -/* 16A90C 0024A0AC 80246B2C */ lb $a0, 0x6b2c($at) -/* 16A910 0024A0B0 80246CBC */ lb $a0, 0x6cbc($at) -/* 16A914 0024A0B4 00000000 */ nop -/* 16A918 0024A0B8 00000000 */ nop -/* 16A91C 0024A0BC 00000000 */ nop -/* 16A920 0024A0C0 00010001 */ .byte 0x00,0x01,0x00,0x01 /* Because of invalid n64 opcode movt */ -/* 16A924 0024A0C4 00010001 */ .byte 0x00,0x01,0x00,0x01 /* Because of invalid n64 opcode movt */ -/* 16A928 0024A0C8 00010000 */ /* 16A92C 0024A0CC 32000000 */ andi $zero, $s0, 0 -/* 16A930 0024A0D0 00000000 */ nop -/* 16A934 0024A0D4 00004000 */ sll $t0, $zero, 0 -/* 16A938 0024A0D8 80246D10 */ lb $a0, 0x6d10($at) -/* 16A93C 0024A0DC 00000000 */ nop -/* 16A940 0024A0E0 FF000000 */ sd $zero, ($t8) -/* 16A944 0024A0E4 00000002 */ srl $zero, $zero, 0 -/* 16A948 0024A0E8 00000000 */ nop -/* 16A94C 0024A0EC 8024BE88 */ lb $a0, -0x4178($at) -/* 16A950 0024A0F0 2E000000 */ sltiu $zero, $s0, 0 -/* 16A954 0024A0F4 00000000 */ nop -/* 16A958 0024A0F8 00000000 */ nop -/* 16A95C 0024A0FC 80246E24 */ lb $a0, 0x6e24($at) -/* 16A960 0024A100 00000000 */ nop -/* 16A964 0024A104 32000000 */ andi $zero, $s0, 0 -/* 16A968 0024A108 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ -/* 16A96C 0024A10C 00000000 */ /* 16A970 0024A110 8024BE88 */ lb $a0, -0x4178($at) -/* 16A974 0024A114 00000000 */ nop -/* 16A978 0024A118 00010200 */ sll $zero, $at, 8 -/* 16A97C 0024A11C 8024A0C0 */ lb $a0, -0x5f40($at) -/* 16A980 0024A120 80247198 */ lb $a0, 0x7198($at) -/* 16A984 0024A124 802471EC */ lb $a0, 0x71ec($at) -/* 16A988 0024A128 80247D14 */ lb $a0, 0x7d14($at) -/* 16A98C 0024A12C 80247D1C */ lb $a0, 0x7d1c($at) -/* 16A990 0024A130 00000000 */ nop -/* 16A994 0024A134 2F000000 */ sltiu $zero, $t8, 0 -/* 16A998 0024A138 00000000 */ nop -/* 16A99C 0024A13C 00004000 */ sll $t0, $zero, 0 -/* 16A9A0 0024A140 80247D30 */ lb $a0, 0x7d30($at) -/* 16A9A4 0024A144 00000000 */ nop -/* 16A9A8 0024A148 FF000000 */ sd $zero, ($t8) -/* 16A9AC 0024A14C 00000002 */ srl $zero, $zero, 0 -/* 16A9B0 0024A150 00000000 */ nop -/* 16A9B4 0024A154 8024BEC0 */ lb $a0, -0x4140($at) -/* 16A9B8 0024A158 00000000 */ nop -/* 16A9BC 0024A15C 00010100 */ sll $zero, $at, 4 -/* 16A9C0 0024A160 8024A130 */ lb $a0, -0x5ed0($at) -/* 16A9C4 0024A164 80247FD0 */ lb $a0, 0x7fd0($at) -/* 16A9C8 0024A168 80248024 */ lb $a0, -0x7fdc($at) -/* 16A9CC 0024A16C 80248160 */ lb $a0, -0x7ea0($at) -/* 16A9D0 0024A170 80248168 */ lb $a0, -0x7e98($at) -/* 16A9D4 0024A174 00000000 */ nop -/* 16A9D8 0024A178 00000000 */ nop -/* 16A9DC 0024A17C 00000000 */ nop -/* 16A9E0 0024A180 80241F70 */ lb $a0, 0x1f70($at) -/* 16A9E4 0024A184 80241FBC */ lb $a0, 0x1fbc($at) -/* 16A9E8 0024A188 80242B74 */ lb $a0, 0x2b74($at) -/* 16A9EC 0024A18C FFFFFFFC */ sd $ra, -4($ra) -/* 16A9F0 0024A190 30000044 */ andi $zero, $zero, 0x44 -/* 16A9F4 0024A194 000A00A4 */ .byte 0x00, 0x0a, 0x00, 0xa4 -/* 16A9F8 0024A198 002E4000 */ /* 16A9FC 0024A19C 802481B8 */ /* 16AA00 0024A1A0 00000000 */ nop -/* 16AA04 0024A1A4 2C000000 */ sltiu $zero, $zero, 0 -/* 16AA08 0024A1A8 00000002 */ srl $zero, $zero, 0 -/* 16AA0C 0024A1AC 00000000 */ nop -/* 16AA10 0024A1B0 8024BEF8 */ lb $a0, -0x4108($at) -/* 16AA14 0024A1B4 3100000C */ andi $zero, $t0, 0xc -/* 16AA18 0024A1B8 00430106 */ .byte 0x00, 0x43, 0x01, 0x06 -/* 16AA1C 0024A1BC 00714000 */ /* 16AA20 0024A1C0 8024830C */ /* 16AA24 0024A1C4 00000000 */ nop -/* 16AA28 0024A1C8 2C000000 */ sltiu $zero, $zero, 0 -/* 16AA2C 0024A1CC 00000002 */ srl $zero, $zero, 0 -/* 16AA30 0024A1D0 00000000 */ nop -/* 16AA34 0024A1D4 8024BF30 */ lb $a0, -0x40d0($at) -/* 16AA38 0024A1D8 00000000 */ nop -/* 16AA3C 0024A1DC 000D0600 */ sll $zero, $t5, 0x18 -/* 16AA40 0024A1E0 8024B978 */ lb $a0, -0x4688($at) -/* 16AA44 0024A1E4 80248A80 */ lb $a0, -0x7580($at) -/* 16AA48 0024A1E8 80248BF4 */ lb $a0, -0x740c($at) -/* 16AA4C 0024A1EC 80249324 */ lb $a0, -0x6cdc($at) -/* 16AA50 0024A1F0 8024932C */ lb $a0, -0x6cd4($at) -/* 16AA54 0024A1F4 00000000 */ nop -/* 16AA58 0024A1F8 00000000 */ nop -/* 16AA5C 0024A1FC 00000000 */ nop -/* 16AA60 0024A200 00000000 */ nop -/* 16AA64 0024A204 00000000 */ nop -/* 16AA68 0024A208 00000000 */ nop -/* 16AA6C 0024A20C 00000000 */ nop -/* 16AA70 0024A210 00000000 */ nop -/* 16AA74 0024A214 00000000 */ nop -/* 16AA78 0024A218 00000000 */ nop -/* 16AA7C 0024A21C 00000000 */ nop -/* 16AA80 0024A220 00000000 */ nop -/* 16AA84 0024A224 00000000 */ nop -/* 16AA88 0024A228 00000000 */ nop -/* 16AA8C 0024A22C 00000000 */ nop -/* 16AA90 0024A230 00000000 */ nop -/* 16AA94 0024A234 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ -/* 16AA98 0024A238 00000000 */ /* 16AA9C 0024A23C 00000000 */ nop -/* 16AAA0 0024A240 00000000 */ nop -/* 16AAA4 0024A244 00000000 */ nop -/* 16AAA8 0024A248 00000000 */ nop -/* 16AAAC 0024A24C 00000000 */ nop -/* 16AAB0 0024A250 00000000 */ nop -/* 16AAB4 0024A254 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ -/* 16AAB8 0024A258 10000000 */ .L0024A25C: -/* 16AABC 0024A25C 00000000 */ nop -/* 16AAC0 0024A260 00000000 */ nop -/* 16AAC4 0024A264 00000000 */ nop -/* 16AAC8 0024A268 00000000 */ nop -/* 16AACC 0024A26C 00000000 */ nop -/* 16AAD0 0024A270 00000000 */ nop -/* 16AAD4 0024A274 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ -/* 16AAD8 0024A278 11000000 */ .L0024A27C: -/* 16AADC 0024A27C 00000000 */ nop -/* 16AAE0 0024A280 00000000 */ nop -/* 16AAE4 0024A284 00000000 */ nop -/* 16AAE8 0024A288 00000000 */ nop -/* 16AAEC 0024A28C 00000000 */ nop -/* 16AAF0 0024A290 00000000 */ nop -/* 16AAF4 0024A294 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ -/* 16AAF8 0024A298 11100000 */ .L0024A29C: -/* 16AAFC 0024A29C 00000000 */ nop -/* 16AB00 0024A2A0 00000000 */ nop -/* 16AB04 0024A2A4 00000000 */ nop -/* 16AB08 0024A2A8 00000000 */ nop -/* 16AB0C 0024A2AC 00000000 */ nop -/* 16AB10 0024A2B0 00000000 */ nop -/* 16AB14 0024A2B4 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ -/* 16AB18 0024A2B8 11110000 */ .L0024A2BC: -/* 16AB1C 0024A2BC 00000000 */ nop -/* 16AB20 0024A2C0 00000000 */ nop -/* 16AB24 0024A2C4 00000000 */ nop -/* 16AB28 0024A2C8 00000000 */ nop -/* 16AB2C 0024A2CC 00000000 */ nop -/* 16AB30 0024A2D0 00000000 */ nop -/* 16AB34 0024A2D4 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ -/* 16AB38 0024A2D8 1F111000 */ /* 16AB3C 0024A2DC 00000000 */ /* 16AB40 0024A2E0 00000000 */ nop -/* 16AB44 0024A2E4 00000000 */ nop -/* 16AB48 0024A2E8 00000000 */ nop -/* 16AB4C 0024A2EC 00000000 */ nop -/* 16AB50 0024A2F0 00000000 */ nop -/* 16AB54 0024A2F4 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ -/* 16AB58 0024A2F8 1FF11100 */ /* 16AB5C 0024A2FC 00000000 */ /* 16AB60 0024A300 00000000 */ nop -/* 16AB64 0024A304 00000000 */ nop -/* 16AB68 0024A308 00000000 */ nop -/* 16AB6C 0024A30C 00000000 */ nop -/* 16AB70 0024A310 00000000 */ nop -/* 16AB74 0024A314 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ -/* 16AB78 0024A318 1FFF1110 */ /* 16AB7C 0024A31C 00000000 */ /* 16AB80 0024A320 00000000 */ nop -/* 16AB84 0024A324 00000000 */ nop -/* 16AB88 0024A328 00000000 */ nop -/* 16AB8C 0024A32C 00000000 */ nop -/* 16AB90 0024A330 00000000 */ nop -/* 16AB94 0024A334 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ -/* 16AB98 0024A338 1FFFF111 */ /* 16AB9C 0024A33C 00000000 */ /* 16ABA0 0024A340 11111111 */ beq $t0, $s1, .L0024E788 -/* 16ABA4 0024A344 11111111 */ beq $t0, $s1, .L0024E78C -/* 16ABA8 0024A348 11111111 */ beq $t0, $s1, .L0024E790 -/* 16ABAC 0024A34C 11111111 */ beq $t0, $s1, .L0024E794 -/* 16ABB0 0024A350 11111111 */ beq $t0, $s1, .L0024E798 -/* 16ABB4 0024A354 11111111 */ beq $t0, $s1, .L0024E79C -/* 16ABB8 0024A358 1FFFFF11 */ .byte 0x1f, 0xff, 0xff, 0x11 -/* 16ABBC 0024A35C 10000000 */ .L0024A360: -/* 16ABC0 0024A360 11111111 */ beq $t0, $s1, .L0024E7A8 -/* 16ABC4 0024A364 11111111 */ beq $t0, $s1, .L0024E7AC -/* 16ABC8 0024A368 11111111 */ beq $t0, $s1, .L0024E7B0 -/* 16ABCC 0024A36C 11111111 */ beq $t0, $s1, .L0024E7B4 -/* 16ABD0 0024A370 11111111 */ beq $t0, $s1, .L0024E7B8 -/* 16ABD4 0024A374 11111111 */ beq $t0, $s1, .L0024E7BC -/* 16ABD8 0024A378 1FFFFFF1 */ .byte 0x1f, 0xff, 0xff, 0xf1 -/* 16ABDC 0024A37C 11000000 */ .L0024A380: -/* 16ABE0 0024A380 11FFFFFF */ beq $t7, $ra, .L0024A380 -/* 16ABE4 0024A384 FFFFFFFF */ sd $ra, -1($ra) -/* 16ABE8 0024A388 FFFFFFFF */ sd $ra, -1($ra) -/* 16ABEC 0024A38C FFFFFFFF */ sd $ra, -1($ra) -/* 16ABF0 0024A390 FFFFFFFF */ sd $ra, -1($ra) -/* 16ABF4 0024A394 FFFFFFFF */ sd $ra, -1($ra) -/* 16ABF8 0024A398 FFFFFFFF */ sd $ra, -1($ra) -/* 16ABFC 0024A39C 11100000 */ beq $t0, $s0, .L0024A3A0 -.L0024A3A0: -/* 16AC00 0024A3A0 11FFFFFF */ beq $t7, $ra, .L0024A3A0 -/* 16AC04 0024A3A4 FFFFFFFF */ sd $ra, -1($ra) -/* 16AC08 0024A3A8 FFFFFFFF */ sd $ra, -1($ra) -/* 16AC0C 0024A3AC FFFFFFFF */ sd $ra, -1($ra) -/* 16AC10 0024A3B0 FFFFFFFF */ sd $ra, -1($ra) -/* 16AC14 0024A3B4 FFFFFFFF */ sd $ra, -1($ra) -/* 16AC18 0024A3B8 FFFFFFFF */ sd $ra, -1($ra) -/* 16AC1C 0024A3BC F1110000 */ scd $s1, ($t0) -.L0024A3C0: -/* 16AC20 0024A3C0 11FFFFFF */ beq $t7, $ra, .L0024A3C0 -/* 16AC24 0024A3C4 FFFFFFFF */ sd $ra, -1($ra) -/* 16AC28 0024A3C8 FFFFFFFF */ sd $ra, -1($ra) -/* 16AC2C 0024A3CC FFFFFFFF */ sd $ra, -1($ra) -/* 16AC30 0024A3D0 FFFFFFFF */ sd $ra, -1($ra) -/* 16AC34 0024A3D4 FFFFFFFF */ sd $ra, -1($ra) -/* 16AC38 0024A3D8 FFFFFFFF */ sd $ra, -1($ra) -/* 16AC3C 0024A3DC FF111000 */ sd $s1, 0x1000($t8) -.L0024A3E0: -/* 16AC40 0024A3E0 11FFFFFF */ beq $t7, $ra, .L0024A3E0 -/* 16AC44 0024A3E4 FFFFFFFF */ sd $ra, -1($ra) -/* 16AC48 0024A3E8 FFFFFFFF */ sd $ra, -1($ra) -/* 16AC4C 0024A3EC FFFFFFFF */ sd $ra, -1($ra) -/* 16AC50 0024A3F0 FFFFFFFF */ sd $ra, -1($ra) -/* 16AC54 0024A3F4 FFFFFFFF */ sd $ra, -1($ra) -/* 16AC58 0024A3F8 FFFFFFFF */ sd $ra, -1($ra) -/* 16AC5C 0024A3FC FFF11100 */ sd $s1, 0x1100($ra) -/* 16AC60 0024A400 90751600 */ lbu $s5, 0x1600($v1) -/* 16AC64 0024A404 90751600 */ lbu $s5, 0x1600($v1) -/* 16AC68 0024A408 90751600 */ lbu $s5, 0x1600($v1) -/* 16AC6C 0024A40C 90751600 */ lbu $s5, 0x1600($v1) -/* 16AC70 0024A410 90751600 */ lbu $s5, 0x1600($v1) -/* 16AC74 0024A414 90751600 */ lbu $s5, 0x1600($v1) -/* 16AC78 0024A418 90751600 */ lbu $s5, 0x1600($v1) -/* 16AC7C 0024A41C 90751600 */ lbu $s5, 0x1600($v1) -/* 16AC80 0024A420 90751600 */ lbu $s5, 0x1600($v1) -/* 16AC84 0024A424 90751600 */ lbu $s5, 0x1600($v1) -/* 16AC88 0024A428 90751600 */ lbu $s5, 0x1600($v1) -/* 16AC8C 0024A42C 90751600 */ lbu $s5, 0x1600($v1) -/* 16AC90 0024A430 90751600 */ lbu $s5, 0x1600($v1) -/* 16AC94 0024A434 90751600 */ lbu $s5, 0x1600($v1) -/* 16AC98 0024A438 90751600 */ lbu $s5, 0x1600($v1) -/* 16AC9C 0024A43C 90751600 */ lbu $s5, 0x1600($v1) -/* 16ACA0 0024A440 90751600 */ lbu $s5, 0x1600($v1) -/* 16ACA4 0024A444 90751600 */ lbu $s5, 0x1600($v1) -/* 16ACA8 0024A448 987F1B20 */ lwr $ra, 0x1b20($v1) -/* 16ACAC 0024A44C B09E297B */ sdl $fp, 0x297b($a0) -/* 16ACB0 0024A450 C3B634C6 */ ll $s6, 0x34c6($sp) -/* 16ACB4 0024A454 D0C73AFF */ lld $a3, 0x3aff($a2) -/* 16ACB8 0024A458 CEC538FF */ .byte 0xCE,0xC5,0x38,0xFF /* Because of invalid n64 opcode pref */ -/* 16ACBC 0024A45C CDC438FF */ .byte 0xCD,0xC4,0x38,0xFF /* Because of invalid n64 opcode pref */ -/* 16ACC0 0024A460 CDC438FF */ .byte 0xCD,0xC4,0x38,0xFF /* Because of invalid n64 opcode pref */ -/* 16ACC4 0024A464 CDC438FF */ .byte 0xCD,0xC4,0x38,0xFF /* Because of invalid n64 opcode pref */ -/* 16ACC8 0024A468 CDC438FF */ .byte 0xCD,0xC4,0x38,0xFF /* Because of invalid n64 opcode pref */ -/* 16ACCC 0024A46C CDC438FF */ .byte 0xCD,0xC4,0x38,0xFF /* Because of invalid n64 opcode pref */ -/* 16ACD0 0024A470 CDC438FF */ .byte 0xCD,0xC4,0x38,0xFF /* Because of invalid n64 opcode pref */ -/* 16ACD4 0024A474 CDC438FF */ .byte 0xCD,0xC4,0x38,0xFF /* Because of invalid n64 opcode pref */ -/* 16ACD8 0024A478 CDC438FF */ .byte 0xCD,0xC4,0x38,0xFF /* Because of invalid n64 opcode pref */ -/* 16ACDC 0024A47C CDC438FF */ .byte 0xCD,0xC4,0x38,0xFF /* Because of invalid n64 opcode pref */ -/* 16ACE0 0024A480 90751600 */ /* 16ACE4 0024A484 987F1A20 */ lwr $ra, 0x1a20($v1) -/* 16ACE8 0024A488 BDAF30B0 */ cache 0xf, 0x30b0($t5) -/* 16ACEC 0024A48C CFC639FF */ .byte 0xCF,0xC6,0x39,0xFF /* Because of invalid n64 opcode pref */ -/* 16ACF0 0024A490 C7BE33FF */ /* 16ACF4 0024A494 C0B72CFF */ ll $s7, 0x2cff($a1) -/* 16ACF8 0024A498 BCB329FF */ cache 0x13, 0x29ff($a1) -/* 16ACFC 0024A49C BBB128FF */ swr $s1, 0x28ff($sp) -/* 16AD00 0024A4A0 BBB128FF */ swr $s1, 0x28ff($sp) -/* 16AD04 0024A4A4 BBB128FF */ swr $s1, 0x28ff($sp) -/* 16AD08 0024A4A8 BBB128FF */ swr $s1, 0x28ff($sp) -/* 16AD0C 0024A4AC BBB128FF */ swr $s1, 0x28ff($sp) -/* 16AD10 0024A4B0 BBB128FF */ swr $s1, 0x28ff($sp) -/* 16AD14 0024A4B4 BBB128FF */ swr $s1, 0x28ff($sp) -/* 16AD18 0024A4B8 BBB128FF */ swr $s1, 0x28ff($sp) -/* 16AD1C 0024A4BC BBB128FF */ swr $s1, 0x28ff($sp) -/* 16AD20 0024A4C0 90751600 */ lbu $s5, 0x1600($v1) -/* 16AD24 0024A4C4 B09F288C */ sdl $ra, 0x288c($a0) -/* 16AD28 0024A4C8 CAC135FF */ .byte 0xCA,0xC1,0x35,0xFF /* Because of invalid n64 opcode bbit0 */ -/* 16AD2C 0024A4CC CBBB38FF */ .byte 0xCB,0xBB,0x38,0xFF /* Because of invalid n64 opcode bbit0 */ -/* 16AD30 0024A4D0 BFAD2CFF */ /* 16AD34 0024A4D4 B29D24FF */ sdl $sp, 0x24ff($s4) -/* 16AD38 0024A4D8 A78F20FF */ sh $t7, 0x20ff($gp) -/* 16AD3C 0024A4DC A2881EFF */ sb $t0, 0x1eff($s4) -/* 16AD40 0024A4E0 A1861DFF */ sb $a2, 0x1dff($t4) -/* 16AD44 0024A4E4 A0851DFF */ sb $a1, 0x1dff($a0) -/* 16AD48 0024A4E8 A0851DFF */ sb $a1, 0x1dff($a0) -/* 16AD4C 0024A4EC A0851DFF */ sb $a1, 0x1dff($a0) -/* 16AD50 0024A4F0 A0851DFF */ sb $a1, 0x1dff($a0) -/* 16AD54 0024A4F4 A0851DFF */ sb $a1, 0x1dff($a0) -/* 16AD58 0024A4F8 A0851DFF */ sb $a1, 0x1dff($a0) -/* 16AD5C 0024A4FC A0851DFF */ sb $a1, 0x1dff($a0) -/* 16AD60 0024A500 90751600 */ lbu $s5, 0x1600($v1) -/* 16AD64 0024A504 BDB22CE1 */ cache 0x12, 0x2ce1($t5) -/* 16AD68 0024A508 BEB52BFF */ cache 0x15, 0x2bff($s5) -/* 16AD6C 0024A50C BCAA29FF */ cache 0xa, 0x29ff($a1) -/* 16AD70 0024A510 9F841CFF */ lwu $a0, 0x1cff($gp) -/* 16AD74 0024A514 876413FF */ lh $a0, 0x13ff($k1) -/* 16AD78 0024A518 78500CFF */ .byte 0x78, 0x50, 0x0c, 0xff -/* 16AD7C 0024A51C 764E0CFF */ /* 16AD80 0024A520 764E0CFF */ jalx 0x93833fc -/* 16AD84 0024A524 764E0CFF */ jalx 0x93833fc -/* 16AD88 0024A528 764E0CFF */ jalx 0x93833fc -/* 16AD8C 0024A52C 764E0CFF */ jalx 0x93833fc -/* 16AD90 0024A530 764E0CFF */ jalx 0x93833fc -/* 16AD94 0024A534 764E0CFF */ jalx 0x93833fc -/* 16AD98 0024A538 764E0CFF */ jalx 0x93833fc -/* 16AD9C 0024A53C 764E0CFF */ jalx 0x93833fc -/* 16ADA0 0024A540 90751600 */ lbu $s5, 0x1600($v1) -/* 16ADA4 0024A544 BDB42AFF */ cache 0x14, 0x2aff($t5) -/* 16ADA8 0024A548 B4AA22FF */ sdr $t2, 0x22ff($a1) -/* 16ADAC 0024A54C A1871DFF */ sb $a3, 0x1dff($t4) -/* 16ADB0 0024A550 7D570FFE */ .byte 0x7d, 0x57, 0x0f, 0xfe -/* 16ADB4 0024A554 4F3408D0 */ /* 16ADB8 0024A558 20150399 */ /* 16ADBC 0024A55C 04020077 */ bltzl $zero, .L0024A73C -/* 16ADC0 0024A560 02010075 */ .byte 0x02, 0x01, 0x00, 0x75 -/* 16ADC4 0024A564 02010075 */ /* 16ADC8 0024A568 02010075 */ /* 16ADCC 0024A56C 02010075 */ /* 16ADD0 0024A570 02010075 */ /* 16ADD4 0024A574 02010075 */ /* 16ADD8 0024A578 02010075 */ /* 16ADDC 0024A57C 02010075 */ /* 16ADE0 0024A580 90751600 */ /* 16ADE4 0024A584 BBB128FF */ swr $s1, 0x28ff($sp) -/* 16ADE8 0024A588 ADA31BFF */ sw $v1, 0x1bff($t5) -/* 16ADEC 0024A58C 8C6B15FF */ lw $t3, 0x15ff($v1) -/* 16ADF0 0024A590 4D3308CF */ .byte 0x4d, 0x33, 0x08, 0xcf -/* 16ADF4 0024A594 0604017A */ /* 16ADF8 0024A598 00000073 */ /* 16ADFC 0024A59C 00000073 */ tltu $zero, $zero, 1 -/* 16AE00 0024A5A0 00000073 */ tltu $zero, $zero, 1 -/* 16AE04 0024A5A4 00000073 */ tltu $zero, $zero, 1 -/* 16AE08 0024A5A8 00000073 */ tltu $zero, $zero, 1 -/* 16AE0C 0024A5AC 00000073 */ tltu $zero, $zero, 1 -/* 16AE10 0024A5B0 00000073 */ tltu $zero, $zero, 1 -/* 16AE14 0024A5B4 00000073 */ tltu $zero, $zero, 1 -/* 16AE18 0024A5B8 00000073 */ tltu $zero, $zero, 1 -/* 16AE1C 0024A5BC 00000073 */ tltu $zero, $zero, 1 -/* 16AE20 0024A5C0 90751600 */ lbu $s5, 0x1600($v1) -/* 16AE24 0024A5C4 BAB127FF */ swr $s1, 0x27ff($s5) -/* 16AE28 0024A5C8 AAA019FF */ swl $zero, 0x19ff($s5) -/* 16AE2C 0024A5CC 866212FF */ lh $v0, 0x12ff($s3) -/* 16AE30 0024A5D0 150E028C */ bne $t0, $t6, .L0024B004 -/* 16AE34 0024A5D4 00000073 */ tltu $zero, $zero, 1 -/* 16AE38 0024A5D8 00000073 */ tltu $zero, $zero, 1 -/* 16AE3C 0024A5DC 00000073 */ tltu $zero, $zero, 1 -/* 16AE40 0024A5E0 00000073 */ tltu $zero, $zero, 1 -/* 16AE44 0024A5E4 00000073 */ tltu $zero, $zero, 1 -/* 16AE48 0024A5E8 00000073 */ tltu $zero, $zero, 1 -/* 16AE4C 0024A5EC 00000073 */ tltu $zero, $zero, 1 -/* 16AE50 0024A5F0 00000073 */ tltu $zero, $zero, 1 -/* 16AE54 0024A5F4 00000073 */ tltu $zero, $zero, 1 -/* 16AE58 0024A5F8 00000073 */ tltu $zero, $zero, 1 -/* 16AE5C 0024A5FC 00000073 */ tltu $zero, $zero, 1 -/* 16AE60 0024A600 90751600 */ lbu $s5, 0x1600($v1) -/* 16AE64 0024A604 BAB127FF */ swr $s1, 0x27ff($s5) -/* 16AE68 0024A608 A99F19FF */ swl $ra, 0x19ff($t4) -/* 16AE6C 0024A60C 876413FF */ lh $a0, 0x13ff($k1) -/* 16AE70 0024A610 02010075 */ .byte 0x02, 0x01, 0x00, 0x75 -/* 16AE74 0024A614 00000073 */ /* 16AE78 0024A618 00000073 */ tltu $zero, $zero, 1 -/* 16AE7C 0024A61C 00000073 */ tltu $zero, $zero, 1 -/* 16AE80 0024A620 00000073 */ tltu $zero, $zero, 1 -/* 16AE84 0024A624 00000073 */ tltu $zero, $zero, 1 -/* 16AE88 0024A628 00000073 */ tltu $zero, $zero, 1 -/* 16AE8C 0024A62C 00000073 */ tltu $zero, $zero, 1 -/* 16AE90 0024A630 00000073 */ tltu $zero, $zero, 1 -/* 16AE94 0024A634 00000073 */ tltu $zero, $zero, 1 -/* 16AE98 0024A638 00000073 */ tltu $zero, $zero, 1 -/* 16AE9C 0024A63C 00000073 */ tltu $zero, $zero, 1 -/* 16AEA0 0024A640 90751600 */ lbu $s5, 0x1600($v1) -/* 16AEA4 0024A644 BAB127FF */ swr $s1, 0x27ff($s5) -/* 16AEA8 0024A648 AAA019FF */ swl $zero, 0x19ff($s5) -/* 16AEAC 0024A64C 896713FF */ lwl $a3, 0x13ff($t3) -/* 16AEB0 0024A650 02010075 */ .byte 0x02, 0x01, 0x00, 0x75 -/* 16AEB4 0024A654 00000073 */ /* 16AEB8 0024A658 00000073 */ tltu $zero, $zero, 1 -/* 16AEBC 0024A65C 00000073 */ tltu $zero, $zero, 1 -/* 16AEC0 0024A660 00000073 */ tltu $zero, $zero, 1 -/* 16AEC4 0024A664 00000073 */ tltu $zero, $zero, 1 -/* 16AEC8 0024A668 00000073 */ tltu $zero, $zero, 1 -/* 16AECC 0024A66C 00000073 */ tltu $zero, $zero, 1 -/* 16AED0 0024A670 00000073 */ tltu $zero, $zero, 1 -/* 16AED4 0024A674 00000073 */ tltu $zero, $zero, 1 -/* 16AED8 0024A678 00000073 */ tltu $zero, $zero, 1 -/* 16AEDC 0024A67C 00000073 */ tltu $zero, $zero, 1 -/* 16AEE0 0024A680 90751600 */ lbu $s5, 0x1600($v1) -/* 16AEE4 0024A684 BAB127FF */ swr $s1, 0x27ff($s5) -/* 16AEE8 0024A688 AAA019FF */ swl $zero, 0x19ff($s5) -/* 16AEEC 0024A68C 8A6814FF */ lwl $t0, 0x14ff($s3) -/* 16AEF0 0024A690 02020075 */ .byte 0x02, 0x02, 0x00, 0x75 -/* 16AEF4 0024A694 00000073 */ /* 16AEF8 0024A698 00000073 */ tltu $zero, $zero, 1 -/* 16AEFC 0024A69C 00000073 */ tltu $zero, $zero, 1 -/* 16AF00 0024A6A0 00000073 */ tltu $zero, $zero, 1 -/* 16AF04 0024A6A4 00000073 */ tltu $zero, $zero, 1 -/* 16AF08 0024A6A8 00000073 */ tltu $zero, $zero, 1 -/* 16AF0C 0024A6AC 00000073 */ tltu $zero, $zero, 1 -/* 16AF10 0024A6B0 00000073 */ tltu $zero, $zero, 1 -/* 16AF14 0024A6B4 00000073 */ tltu $zero, $zero, 1 -/* 16AF18 0024A6B8 00000073 */ tltu $zero, $zero, 1 -/* 16AF1C 0024A6BC 00000073 */ tltu $zero, $zero, 1 -/* 16AF20 0024A6C0 90751600 */ lbu $s5, 0x1600($v1) -/* 16AF24 0024A6C4 BAB127FF */ swr $s1, 0x27ff($s5) -/* 16AF28 0024A6C8 AAA019FF */ swl $zero, 0x19ff($s5) -/* 16AF2C 0024A6CC 8A6814FF */ lwl $t0, 0x14ff($s3) -/* 16AF30 0024A6D0 02020075 */ .byte 0x02, 0x02, 0x00, 0x75 -/* 16AF34 0024A6D4 00000073 */ /* 16AF38 0024A6D8 00000073 */ tltu $zero, $zero, 1 -/* 16AF3C 0024A6DC 00000073 */ tltu $zero, $zero, 1 -/* 16AF40 0024A6E0 00000073 */ tltu $zero, $zero, 1 -/* 16AF44 0024A6E4 00000073 */ tltu $zero, $zero, 1 -/* 16AF48 0024A6E8 00000073 */ tltu $zero, $zero, 1 -/* 16AF4C 0024A6EC 00000073 */ tltu $zero, $zero, 1 -/* 16AF50 0024A6F0 00000073 */ tltu $zero, $zero, 1 -/* 16AF54 0024A6F4 00000073 */ tltu $zero, $zero, 1 -/* 16AF58 0024A6F8 00000073 */ tltu $zero, $zero, 1 -/* 16AF5C 0024A6FC 00000073 */ tltu $zero, $zero, 1 -/* 16AF60 0024A700 90751600 */ lbu $s5, 0x1600($v1) -/* 16AF64 0024A704 BAB127FF */ swr $s1, 0x27ff($s5) -/* 16AF68 0024A708 AAA019FF */ swl $zero, 0x19ff($s5) -/* 16AF6C 0024A70C 8A6814FF */ lwl $t0, 0x14ff($s3) -/* 16AF70 0024A710 02020075 */ .byte 0x02, 0x02, 0x00, 0x75 -/* 16AF74 0024A714 00000073 */ /* 16AF78 0024A718 00000073 */ tltu $zero, $zero, 1 -/* 16AF7C 0024A71C 00000073 */ tltu $zero, $zero, 1 -/* 16AF80 0024A720 00000073 */ tltu $zero, $zero, 1 -/* 16AF84 0024A724 00000073 */ tltu $zero, $zero, 1 -/* 16AF88 0024A728 00000073 */ tltu $zero, $zero, 1 -/* 16AF8C 0024A72C 00000073 */ tltu $zero, $zero, 1 -/* 16AF90 0024A730 00000073 */ tltu $zero, $zero, 1 -/* 16AF94 0024A734 00000073 */ tltu $zero, $zero, 1 -/* 16AF98 0024A738 00000073 */ tltu $zero, $zero, 1 -.L0024A73C: -/* 16AF9C 0024A73C 00000073 */ tltu $zero, $zero, 1 -/* 16AFA0 0024A740 90751600 */ lbu $s5, 0x1600($v1) -/* 16AFA4 0024A744 BAB127FF */ swr $s1, 0x27ff($s5) -/* 16AFA8 0024A748 AAA019FF */ swl $zero, 0x19ff($s5) -/* 16AFAC 0024A74C 8A6814FF */ lwl $t0, 0x14ff($s3) -/* 16AFB0 0024A750 02020075 */ .byte 0x02, 0x02, 0x00, 0x75 -/* 16AFB4 0024A754 00000073 */ /* 16AFB8 0024A758 00000073 */ tltu $zero, $zero, 1 -/* 16AFBC 0024A75C 00000073 */ tltu $zero, $zero, 1 -/* 16AFC0 0024A760 00000073 */ tltu $zero, $zero, 1 -/* 16AFC4 0024A764 00000073 */ tltu $zero, $zero, 1 -/* 16AFC8 0024A768 00000073 */ tltu $zero, $zero, 1 -/* 16AFCC 0024A76C 00000073 */ tltu $zero, $zero, 1 -/* 16AFD0 0024A770 00000073 */ tltu $zero, $zero, 1 -/* 16AFD4 0024A774 00000073 */ tltu $zero, $zero, 1 -/* 16AFD8 0024A778 00000073 */ tltu $zero, $zero, 1 -/* 16AFDC 0024A77C 00000073 */ tltu $zero, $zero, 1 -/* 16AFE0 0024A780 90751600 */ lbu $s5, 0x1600($v1) -/* 16AFE4 0024A784 BAB127FF */ swr $s1, 0x27ff($s5) -/* 16AFE8 0024A788 AAA019FF */ swl $zero, 0x19ff($s5) -/* 16AFEC 0024A78C 896713FF */ lwl $a3, 0x13ff($t3) -/* 16AFF0 0024A790 02020075 */ .byte 0x02, 0x02, 0x00, 0x75 -/* 16AFF4 0024A794 00000073 */ /* 16AFF8 0024A798 00000073 */ tltu $zero, $zero, 1 -/* 16AFFC 0024A79C 00000073 */ tltu $zero, $zero, 1 -/* 16B000 0024A7A0 00000073 */ tltu $zero, $zero, 1 -/* 16B004 0024A7A4 00000073 */ tltu $zero, $zero, 1 -/* 16B008 0024A7A8 00000073 */ tltu $zero, $zero, 1 -/* 16B00C 0024A7AC 00000073 */ tltu $zero, $zero, 1 -/* 16B010 0024A7B0 00000073 */ tltu $zero, $zero, 1 -/* 16B014 0024A7B4 00000073 */ tltu $zero, $zero, 1 -/* 16B018 0024A7B8 00000073 */ tltu $zero, $zero, 1 -/* 16B01C 0024A7BC 00000073 */ tltu $zero, $zero, 1 -/* 16B020 0024A7C0 90751600 */ lbu $s5, 0x1600($v1) -/* 16B024 0024A7C4 BAB127FF */ swr $s1, 0x27ff($s5) -/* 16B028 0024A7C8 AAA019FF */ swl $zero, 0x19ff($s5) -/* 16B02C 0024A7CC 896713FF */ lwl $a3, 0x13ff($t3) -/* 16B030 0024A7D0 02020075 */ .byte 0x02, 0x02, 0x00, 0x75 -/* 16B034 0024A7D4 00000073 */ /* 16B038 0024A7D8 00000073 */ tltu $zero, $zero, 1 -/* 16B03C 0024A7DC 00000073 */ tltu $zero, $zero, 1 -/* 16B040 0024A7E0 00000073 */ tltu $zero, $zero, 1 -/* 16B044 0024A7E4 00000073 */ tltu $zero, $zero, 1 -/* 16B048 0024A7E8 00000073 */ tltu $zero, $zero, 1 -/* 16B04C 0024A7EC 00000073 */ tltu $zero, $zero, 1 -/* 16B050 0024A7F0 00000073 */ tltu $zero, $zero, 1 -/* 16B054 0024A7F4 00000073 */ tltu $zero, $zero, 1 -/* 16B058 0024A7F8 00000073 */ tltu $zero, $zero, 1 -/* 16B05C 0024A7FC 00000073 */ tltu $zero, $zero, 1 -/* 16B060 0024A800 90751600 */ lbu $s5, 0x1600($v1) -/* 16B064 0024A804 90751600 */ lbu $s5, 0x1600($v1) -/* 16B068 0024A808 90751600 */ lbu $s5, 0x1600($v1) -/* 16B06C 0024A80C 90751600 */ lbu $s5, 0x1600($v1) -/* 16B070 0024A810 90751600 */ lbu $s5, 0x1600($v1) -/* 16B074 0024A814 90751600 */ lbu $s5, 0x1600($v1) -/* 16B078 0024A818 90751600 */ lbu $s5, 0x1600($v1) -/* 16B07C 0024A81C 90751600 */ lbu $s5, 0x1600($v1) -/* 16B080 0024A820 90751600 */ lbu $s5, 0x1600($v1) -/* 16B084 0024A824 90751600 */ lbu $s5, 0x1600($v1) -/* 16B088 0024A828 90751600 */ lbu $s5, 0x1600($v1) -/* 16B08C 0024A82C 90751600 */ lbu $s5, 0x1600($v1) -/* 16B090 0024A830 90751600 */ lbu $s5, 0x1600($v1) -/* 16B094 0024A834 90751600 */ lbu $s5, 0x1600($v1) -/* 16B098 0024A838 90751600 */ lbu $s5, 0x1600($v1) -/* 16B09C 0024A83C 90751600 */ lbu $s5, 0x1600($v1) -/* 16B0A0 0024A840 CDC438FF */ .byte 0xCD,0xC4,0x38,0xFF /* Because of invalid n64 opcode pref */ -/* 16B0A4 0024A844 CDC438FF */ .byte 0xCD,0xC4,0x38,0xFF /* Because of invalid n64 opcode pref */ -/* 16B0A8 0024A848 CDC438FF */ .byte 0xCD,0xC4,0x38,0xFF /* Because of invalid n64 opcode pref */ -/* 16B0AC 0024A84C CDC438FF */ .byte 0xCD,0xC4,0x38,0xFF /* Because of invalid n64 opcode pref */ -/* 16B0B0 0024A850 CDC438FF */ .byte 0xCD,0xC4,0x38,0xFF /* Because of invalid n64 opcode pref */ -/* 16B0B4 0024A854 CDC438FF */ .byte 0xCD,0xC4,0x38,0xFF /* Because of invalid n64 opcode pref */ -/* 16B0B8 0024A858 CDC438FF */ .byte 0xCD,0xC4,0x38,0xFF /* Because of invalid n64 opcode pref */ -/* 16B0BC 0024A85C CDC438FF */ .byte 0xCD,0xC4,0x38,0xFF /* Because of invalid n64 opcode pref */ -/* 16B0C0 0024A860 CDC438FF */ .byte 0xCD,0xC4,0x38,0xFF /* Because of invalid n64 opcode pref */ -/* 16B0C4 0024A864 CCC337FF */ .byte 0xCC,0xC3,0x37,0xFF /* Because of invalid n64 opcode pref */ -/* 16B0C8 0024A868 C8BF34F8 */ .byte 0xC8,0xBF,0x34,0xF8 /* Because of invalid n64 opcode bbit0 */ -/* 16B0CC 0024A86C BAAD2CC6 */ /* 16B0D0 0024A870 A794207B */ sh $s4, 0x207b($gp) -/* 16B0D4 0024A874 957C1820 */ lhu $gp, 0x1820($t3) -/* 16B0D8 0024A878 90751600 */ lbu $s5, 0x1600($v1) -/* 16B0DC 0024A87C 90751600 */ lbu $s5, 0x1600($v1) -/* 16B0E0 0024A880 BBB128FF */ swr $s1, 0x28ff($sp) -/* 16B0E4 0024A884 BBB128FF */ swr $s1, 0x28ff($sp) -/* 16B0E8 0024A888 BBB128FF */ swr $s1, 0x28ff($sp) -/* 16B0EC 0024A88C BBB128FF */ swr $s1, 0x28ff($sp) -/* 16B0F0 0024A890 BBB128FF */ swr $s1, 0x28ff($sp) -/* 16B0F4 0024A894 BBB128FF */ swr $s1, 0x28ff($sp) -/* 16B0F8 0024A898 BBB128FF */ swr $s1, 0x28ff($sp) -/* 16B0FC 0024A89C BBB128FF */ swr $s1, 0x28ff($sp) -/* 16B100 0024A8A0 BBB128FF */ swr $s1, 0x28ff($sp) -/* 16B104 0024A8A4 BBB128FF */ swr $s1, 0x28ff($sp) -/* 16B108 0024A8A8 BBB228FF */ swr $s2, 0x28ff($sp) -/* 16B10C 0024A8AC BCB229FF */ cache 0x12, 0x29ff($a1) -/* 16B110 0024A8B0 B8AF26FF */ swr $t7, 0x26ff($a1) -/* 16B114 0024A8B4 A6971CB0 */ sh $s7, 0x1cb0($s4) -/* 16B118 0024A8B8 937A1620 */ lbu $k0, 0x1620($k1) -/* 16B11C 0024A8BC 90751600 */ lbu $s5, 0x1600($v1) -/* 16B120 0024A8C0 A0851DFF */ sb $a1, 0x1dff($a0) -/* 16B124 0024A8C4 A0851DFF */ sb $a1, 0x1dff($a0) -/* 16B128 0024A8C8 A0851DFF */ sb $a1, 0x1dff($a0) -/* 16B12C 0024A8CC A0851DFF */ sb $a1, 0x1dff($a0) -/* 16B130 0024A8D0 A0851DFF */ sb $a1, 0x1dff($a0) -/* 16B134 0024A8D4 A0851DFF */ sb $a1, 0x1dff($a0) -/* 16B138 0024A8D8 A0851DFF */ sb $a1, 0x1dff($a0) -/* 16B13C 0024A8DC A1871DFF */ sb $a3, 0x1dff($t4) -/* 16B140 0024A8E0 A58C1FFF */ sh $t4, 0x1fff($t4) -/* 16B144 0024A8E4 AD9622FF */ sw $s6, 0x22ff($t4) -/* 16B148 0024A8E8 B6A226FF */ sdr $v0, 0x26ff($s5) -/* 16B14C 0024A8EC BDAB2AFF */ cache 0xb, 0x2aff($t5) -/* 16B150 0024A8F0 AFA51DFF */ sw $a1, 0x1dff($sp) -/* 16B154 0024A8F4 A69A18FF */ sh $k0, 0x18ff($s4) -/* 16B158 0024A8F8 947F158C */ lhu $ra, 0x158c($v1) -/* 16B15C 0024A8FC 90751600 */ lbu $s5, 0x1600($v1) -/* 16B160 0024A900 764E0CFF */ jalx 0x93833fc -/* 16B164 0024A904 764E0CFF */ jalx 0x93833fc -/* 16B168 0024A908 764E0CFF */ jalx 0x93833fc -/* 16B16C 0024A90C 764E0CFF */ jalx 0x93833fc -/* 16B170 0024A910 764E0CFF */ jalx 0x93833fc -/* 16B174 0024A914 764E0CFF */ jalx 0x93833fc -/* 16B178 0024A918 764E0CFF */ jalx 0x93833fc -/* 16B17C 0024A91C 764E0CFF */ jalx 0x93833fc -/* 16B180 0024A920 79510DFF */ .byte 0x79, 0x51, 0x0d, 0xff -/* 16B184 0024A924 886513FF */ /* 16B188 0024A928 9D811BFF */ lwu $at, 0x1bff($t4) -/* 16B18C 0024A92C B09A23FF */ sdl $k0, 0x23ff($a0) -/* 16B190 0024A930 A99F19FF */ swl $ra, 0x19ff($t4) -/* 16B194 0024A934 9F9116FF */ lwu $s1, 0x16ff($gp) -/* 16B198 0024A938 8B7311E1 */ lwl $s3, 0x11e1($k1) -/* 16B19C 0024A93C 90751600 */ lbu $s5, 0x1600($v1) -/* 16B1A0 0024A940 02010075 */ .byte 0x02, 0x01, 0x00, 0x75 -/* 16B1A4 0024A944 02010075 */ /* 16B1A8 0024A948 02010075 */ /* 16B1AC 0024A94C 02010075 */ /* 16B1B0 0024A950 02010075 */ /* 16B1B4 0024A954 02010075 */ /* 16B1B8 0024A958 02010075 */ /* 16B1BC 0024A95C 02010075 */ /* 16B1C0 0024A960 0604017A */ /* 16B1C4 0024A964 22180499 */ /* 16B1C8 0024A968 5F490FD0 */ .byte 0x5f, 0x49, 0x0f, 0xd0 -/* 16B1CC 0024A96C A38A1FFE */ /* 16B1D0 0024A970 A49817FF */ sh $t8, 0x17ff($a0) -/* 16B1D4 0024A974 9C8D15FF */ lwu $t5, 0x15ff($a0) -/* 16B1D8 0024A978 82680DFF */ lb $t0, 0xdff($s3) -/* 16B1DC 0024A97C 90751600 */ lbu $s5, 0x1600($v1) -/* 16B1E0 0024A980 00000073 */ tltu $zero, $zero, 1 -/* 16B1E4 0024A984 00000073 */ tltu $zero, $zero, 1 -/* 16B1E8 0024A988 00000073 */ tltu $zero, $zero, 1 -/* 16B1EC 0024A98C 00000073 */ tltu $zero, $zero, 1 -/* 16B1F0 0024A990 00000073 */ tltu $zero, $zero, 1 -/* 16B1F4 0024A994 00000073 */ tltu $zero, $zero, 1 -/* 16B1F8 0024A998 00000073 */ tltu $zero, $zero, 1 -/* 16B1FC 0024A99C 00000073 */ tltu $zero, $zero, 1 -/* 16B200 0024A9A0 00000073 */ tltu $zero, $zero, 1 -/* 16B204 0024A9A4 00000073 */ tltu $zero, $zero, 1 -/* 16B208 0024A9A8 0807017A */ j func_001C05E8 -/* 16B20C 0024A9AC 6F6016CF */ ldr $zero, 0x16cf($k1) - -/* 16B210 0024A9B0 A69A18FF */ sh $k0, 0x18ff($s4) -/* 16B214 0024A9B4 9C8D15FF */ lwu $t5, 0x15ff($a0) -/* 16B218 0024A9B8 7E630CFF */ .byte 0x7e, 0x63, 0x0c, 0xff -/* 16B21C 0024A9BC 90751600 */ /* 16B220 0024A9C0 00000073 */ tltu $zero, $zero, 1 -/* 16B224 0024A9C4 00000073 */ tltu $zero, $zero, 1 -/* 16B228 0024A9C8 00000073 */ tltu $zero, $zero, 1 -/* 16B22C 0024A9CC 00000073 */ tltu $zero, $zero, 1 -/* 16B230 0024A9D0 00000073 */ tltu $zero, $zero, 1 -/* 16B234 0024A9D4 00000073 */ tltu $zero, $zero, 1 -/* 16B238 0024A9D8 00000073 */ tltu $zero, $zero, 1 -/* 16B23C 0024A9DC 00000073 */ tltu $zero, $zero, 1 -/* 16B240 0024A9E0 00000073 */ tltu $zero, $zero, 1 -/* 16B244 0024A9E4 00000073 */ tltu $zero, $zero, 1 -/* 16B248 0024A9E8 00000073 */ tltu $zero, $zero, 1 -/* 16B24C 0024A9EC 221E078C */ addi $fp, $s0, 0x78c -/* 16B250 0024A9F0 AEA41DFF */ sw $a0, 0x1dff($s5) -/* 16B254 0024A9F4 A19316FF */ sb $s3, 0x16ff($t4) -/* 16B258 0024A9F8 7D620CFF */ .byte 0x7d, 0x62, 0x0c, 0xff -/* 16B25C 0024A9FC 90751600 */ /* 16B260 0024AA00 00000073 */ tltu $zero, $zero, 1 -/* 16B264 0024AA04 00000073 */ tltu $zero, $zero, 1 -/* 16B268 0024AA08 00000073 */ tltu $zero, $zero, 1 -/* 16B26C 0024AA0C 00000073 */ tltu $zero, $zero, 1 -/* 16B270 0024AA10 00000073 */ tltu $zero, $zero, 1 -/* 16B274 0024AA14 00000073 */ tltu $zero, $zero, 1 -/* 16B278 0024AA18 00000073 */ tltu $zero, $zero, 1 -/* 16B27C 0024AA1C 00000073 */ tltu $zero, $zero, 1 -/* 16B280 0024AA20 00000073 */ tltu $zero, $zero, 1 -/* 16B284 0024AA24 00000073 */ tltu $zero, $zero, 1 -/* 16B288 0024AA28 00000073 */ tltu $zero, $zero, 1 -/* 16B28C 0024AA2C 03030175 */ .byte 0x03, 0x03, 0x01, 0x75 -/* 16B290 0024AA30 B6AC23FF */ /* 16B294 0024AA34 A69B18FF */ sh $k1, 0x18ff($s4) -/* 16B298 0024AA38 7D620CFF */ .byte 0x7d, 0x62, 0x0c, 0xff -/* 16B29C 0024AA3C 90751600 */ /* 16B2A0 0024AA40 00000073 */ tltu $zero, $zero, 1 -/* 16B2A4 0024AA44 00000073 */ tltu $zero, $zero, 1 -/* 16B2A8 0024AA48 00000073 */ tltu $zero, $zero, 1 -/* 16B2AC 0024AA4C 00000073 */ tltu $zero, $zero, 1 -/* 16B2B0 0024AA50 00000073 */ tltu $zero, $zero, 1 -/* 16B2B4 0024AA54 00000073 */ tltu $zero, $zero, 1 -/* 16B2B8 0024AA58 00000073 */ tltu $zero, $zero, 1 -/* 16B2BC 0024AA5C 00000073 */ tltu $zero, $zero, 1 -/* 16B2C0 0024AA60 00000073 */ tltu $zero, $zero, 1 -/* 16B2C4 0024AA64 00000073 */ tltu $zero, $zero, 1 -/* 16B2C8 0024AA68 00000073 */ tltu $zero, $zero, 1 -/* 16B2CC 0024AA6C 02020175 */ .byte 0x02, 0x02, 0x01, 0x75 -/* 16B2D0 0024AA70 B9B026FF */ /* 16B2D4 0024AA74 A99F19FF */ swl $ra, 0x19ff($t4) -/* 16B2D8 0024AA78 7D620CFF */ .byte 0x7d, 0x62, 0x0c, 0xff -/* 16B2DC 0024AA7C 90751600 */ /* 16B2E0 0024AA80 00000073 */ tltu $zero, $zero, 1 -/* 16B2E4 0024AA84 00000073 */ tltu $zero, $zero, 1 -/* 16B2E8 0024AA88 00000073 */ tltu $zero, $zero, 1 -/* 16B2EC 0024AA8C 00000073 */ tltu $zero, $zero, 1 -/* 16B2F0 0024AA90 00000073 */ tltu $zero, $zero, 1 -/* 16B2F4 0024AA94 00000073 */ tltu $zero, $zero, 1 -/* 16B2F8 0024AA98 00000073 */ tltu $zero, $zero, 1 -/* 16B2FC 0024AA9C 00000073 */ tltu $zero, $zero, 1 -/* 16B300 0024AAA0 00000073 */ tltu $zero, $zero, 1 -/* 16B304 0024AAA4 00000073 */ tltu $zero, $zero, 1 -/* 16B308 0024AAA8 00000073 */ tltu $zero, $zero, 1 -/* 16B30C 0024AAAC 03030175 */ .byte 0x03, 0x03, 0x01, 0x75 -/* 16B310 0024AAB0 BAB127FF */ /* 16B314 0024AAB4 AAA019FF */ swl $zero, 0x19ff($s5) -/* 16B318 0024AAB8 7D620CFF */ .byte 0x7d, 0x62, 0x0c, 0xff -/* 16B31C 0024AABC 90751600 */ /* 16B320 0024AAC0 00000073 */ tltu $zero, $zero, 1 -/* 16B324 0024AAC4 00000073 */ tltu $zero, $zero, 1 -/* 16B328 0024AAC8 00000073 */ tltu $zero, $zero, 1 -/* 16B32C 0024AACC 00000073 */ tltu $zero, $zero, 1 -/* 16B330 0024AAD0 00000073 */ tltu $zero, $zero, 1 -/* 16B334 0024AAD4 00000073 */ tltu $zero, $zero, 1 -/* 16B338 0024AAD8 00000073 */ tltu $zero, $zero, 1 -/* 16B33C 0024AADC 00000073 */ tltu $zero, $zero, 1 -/* 16B340 0024AAE0 00000073 */ tltu $zero, $zero, 1 -/* 16B344 0024AAE4 00000073 */ tltu $zero, $zero, 1 -/* 16B348 0024AAE8 00000073 */ tltu $zero, $zero, 1 -/* 16B34C 0024AAEC 03030175 */ .byte 0x03, 0x03, 0x01, 0x75 -/* 16B350 0024AAF0 BAB127FF */ /* 16B354 0024AAF4 AAA019FF */ swl $zero, 0x19ff($s5) -/* 16B358 0024AAF8 7D620CFF */ .byte 0x7d, 0x62, 0x0c, 0xff -/* 16B35C 0024AAFC 90751600 */ /* 16B360 0024AB00 00000073 */ tltu $zero, $zero, 1 -/* 16B364 0024AB04 00000073 */ tltu $zero, $zero, 1 -/* 16B368 0024AB08 00000073 */ tltu $zero, $zero, 1 -/* 16B36C 0024AB0C 00000073 */ tltu $zero, $zero, 1 -/* 16B370 0024AB10 00000073 */ tltu $zero, $zero, 1 -/* 16B374 0024AB14 00000073 */ tltu $zero, $zero, 1 -/* 16B378 0024AB18 00000073 */ tltu $zero, $zero, 1 -/* 16B37C 0024AB1C 00000073 */ tltu $zero, $zero, 1 -/* 16B380 0024AB20 00000073 */ tltu $zero, $zero, 1 -/* 16B384 0024AB24 00000073 */ tltu $zero, $zero, 1 -/* 16B388 0024AB28 00000073 */ tltu $zero, $zero, 1 -/* 16B38C 0024AB2C 03030175 */ .byte 0x03, 0x03, 0x01, 0x75 -/* 16B390 0024AB30 BAB127FF */ /* 16B394 0024AB34 AAA019FF */ swl $zero, 0x19ff($s5) -/* 16B398 0024AB38 7D620CFF */ .byte 0x7d, 0x62, 0x0c, 0xff -/* 16B39C 0024AB3C 90751600 */ /* 16B3A0 0024AB40 00000073 */ tltu $zero, $zero, 1 -/* 16B3A4 0024AB44 00000073 */ tltu $zero, $zero, 1 -/* 16B3A8 0024AB48 00000073 */ tltu $zero, $zero, 1 -/* 16B3AC 0024AB4C 00000073 */ tltu $zero, $zero, 1 -/* 16B3B0 0024AB50 00000073 */ tltu $zero, $zero, 1 -/* 16B3B4 0024AB54 00000073 */ tltu $zero, $zero, 1 -/* 16B3B8 0024AB58 00000073 */ tltu $zero, $zero, 1 -/* 16B3BC 0024AB5C 00000073 */ tltu $zero, $zero, 1 -/* 16B3C0 0024AB60 00000073 */ tltu $zero, $zero, 1 -/* 16B3C4 0024AB64 00000073 */ tltu $zero, $zero, 1 -/* 16B3C8 0024AB68 00000073 */ tltu $zero, $zero, 1 -/* 16B3CC 0024AB6C 03030175 */ .byte 0x03, 0x03, 0x01, 0x75 -/* 16B3D0 0024AB70 BAB127FF */ /* 16B3D4 0024AB74 AAA019FF */ swl $zero, 0x19ff($s5) -/* 16B3D8 0024AB78 7D620CFF */ .byte 0x7d, 0x62, 0x0c, 0xff -/* 16B3DC 0024AB7C 90751600 */ /* 16B3E0 0024AB80 00000073 */ tltu $zero, $zero, 1 -/* 16B3E4 0024AB84 00000073 */ tltu $zero, $zero, 1 -/* 16B3E8 0024AB88 00000073 */ tltu $zero, $zero, 1 -/* 16B3EC 0024AB8C 00000073 */ tltu $zero, $zero, 1 -/* 16B3F0 0024AB90 00000073 */ tltu $zero, $zero, 1 -/* 16B3F4 0024AB94 00000073 */ tltu $zero, $zero, 1 -/* 16B3F8 0024AB98 00000073 */ tltu $zero, $zero, 1 -/* 16B3FC 0024AB9C 00000073 */ tltu $zero, $zero, 1 diff --git a/papermario/asm/CODE_2495f0_len_2000.s b/papermario/asm/CODE_2495f0_len_2000.s index b00001098f..da7cb61a59 100644 --- a/papermario/asm/CODE_2495f0_len_2000.s +++ b/papermario/asm/CODE_2495f0_len_2000.s @@ -221,8 +221,9 @@ /* 24997C 002ADF6C 00000000 */ nop /* 249980 002ADF70 00000000 */ nop /* 249984 002ADF74 C7C5C8C9 */ lwc1 $f5, -0x3737($fp) -/* 249988 002ADF78 CA202020 */ .byte 0xCA,0x20,0x20,0x20 /* Because of invalid n64 opcode bbit0 */ -/* 24998C 002ADF7C 20202020 */ /* 249990 002ADF80 20202020 */ addi $zero, $at, 0x2020 +/* 249988 002ADF78 CA202020 */ lwc2 $0, 0x2020($s1) +/* 24998C 002ADF7C 20202020 */ addi $zero, $at, 0x2020 +/* 249990 002ADF80 20202020 */ addi $zero, $at, 0x2020 /* 249994 002ADF84 20202020 */ addi $zero, $at, 0x2020 /* 249998 002ADF88 20202020 */ addi $zero, $at, 0x2020 /* 24999C 002ADF8C 20202020 */ addi $zero, $at, 0x2020 @@ -251,8 +252,8 @@ /* 2499FC 002ADFEC 00000000 */ nop /* 249A00 002ADFF0 00000000 */ nop /* 249A04 002ADFF4 008883CB */ .byte 0x00, 0x88, 0x83, 0xcb -/* 249A08 002ADFF8 CA202020 */ .byte 0xCA,0x20,0x20,0x20 /* Because of invalid n64 opcode bbit0 */ -/* 249A0C 002ADFFC 20202020 */ func_002AE000: +/* 249A08 002ADFF8 CA202020 */ /* 249A0C 002ADFFC 20202020 */ addi $zero, $at, 0x2020 +func_002AE000: /* 249A10 002AE000 20202020 */ addi $zero, $at, 0x2020 /* 249A14 002AE004 20202020 */ addi $zero, $at, 0x2020 /* 249A18 002AE008 20202020 */ addi $zero, $at, 0x2020 @@ -1029,8 +1030,9 @@ /* 24A67C 002AEC6C 00000000 */ nop /* 24A680 002AEC70 00000000 */ nop /* 24A684 002AEC74 0000D3CD */ break 0, 0x34f -/* 24A688 002AEC78 D9202020 */ .byte 0xD9,0x20,0x20,0x20 /* Because of invalid n64 opcode bbit032 */ -/* 24A68C 002AEC7C 20202020 */ /* 24A690 002AEC80 20202020 */ addi $zero, $at, 0x2020 +/* 24A688 002AEC78 D9202020 */ ldc2 $0, 0x2020($t1) +/* 24A68C 002AEC7C 20202020 */ addi $zero, $at, 0x2020 +/* 24A690 002AEC80 20202020 */ addi $zero, $at, 0x2020 /* 24A694 002AEC84 20202020 */ addi $zero, $at, 0x2020 /* 24A698 002AEC88 20202020 */ addi $zero, $at, 0x2020 /* 24A69C 002AEC8C 20202020 */ addi $zero, $at, 0x2020 @@ -1060,8 +1062,8 @@ /* 24A6FC 002AECEC 00000000 */ nop /* 24A700 002AECF0 00000000 */ nop /* 24A704 002AECF4 000000D7 */ .byte 0x00, 0x00, 0x00, 0xd7 -/* 24A708 002AECF8 DBD52020 */ .byte 0xDB,0xD5,0x20,0x20 /* Because of invalid n64 opcode bbit032 */ -/* 24A70C 002AECFC 20202020 */ /* 24A710 002AED00 20202020 */ addi $zero, $at, 0x2020 +/* 24A708 002AECF8 DBD52020 */ /* 24A70C 002AECFC 20202020 */ addi $zero, $at, 0x2020 +/* 24A710 002AED00 20202020 */ addi $zero, $at, 0x2020 /* 24A714 002AED04 20202020 */ addi $zero, $at, 0x2020 /* 24A718 002AED08 20202020 */ addi $zero, $at, 0x2020 /* 24A71C 002AED0C 20202020 */ addi $zero, $at, 0x2020 @@ -1109,8 +1111,9 @@ /* 24A7C8 002AEDB8 20202020 */ addi $zero, $at, 0x2020 /* 24A7CC 002AEDBC 20202020 */ addi $zero, $at, 0x2020 /* 24A7D0 002AEDC0 20202020 */ addi $zero, $at, 0x2020 -/* 24A7D4 002AEDC4 D9DBDB00 */ .byte 0xD9,0xDB,0xDB,0x00 /* Because of invalid n64 opcode bbit032 */ -/* 24A7D8 002AEDC8 00000000 */ /* 24A7DC 002AEDCC 00000000 */ nop +/* 24A7D4 002AEDC4 D9DBDB00 */ ldc2 $27, -0x2500($t6) +/* 24A7D8 002AEDC8 00000000 */ nop +/* 24A7DC 002AEDCC 00000000 */ nop /* 24A7E0 002AEDD0 00000000 */ nop /* 24A7E4 002AEDD4 00000000 */ nop /* 24A7E8 002AEDD8 00000000 */ nop @@ -1172,9 +1175,9 @@ /* 24A8C8 002AEEB8 20202020 */ addi $zero, $at, 0x2020 /* 24A8CC 002AEEBC 20202020 */ addi $zero, $at, 0x2020 /* 24A8D0 002AEEC0 2020B3D8 */ addi $zero, $at, -0x4c28 -/* 24A8D4 002AEEC4 DBD30000 */ .byte 0xDB,0xD3,0x00,0x00 /* Because of invalid n64 opcode bbit032 */ -.L002AEEC8: -/* 24A8D8 002AEEC8 00000000 */ /* 24A8DC 002AEECC 00000000 */ nop +/* 24A8D4 002AEEC4 DBD30000 */ ldc2 $19, ($fp) +/* 24A8D8 002AEEC8 00000000 */ nop +/* 24A8DC 002AEECC 00000000 */ nop /* 24A8E0 002AEED0 00000000 */ nop /* 24A8E4 002AEED4 00000000 */ nop /* 24A8E8 002AEED8 00000000 */ nop @@ -1216,8 +1219,9 @@ /* 24A980 002AEF70 00000000 */ nop /* 24A984 002AEF74 00000000 */ nop /* 24A988 002AEF78 0000D3CD */ break 0, 0x34f -/* 24A98C 002AEF7C D9202020 */ .byte 0xD9,0x20,0x20,0x20 /* Because of invalid n64 opcode bbit032 */ -/* 24A990 002AEF80 20202020 */ /* 24A994 002AEF84 20202020 */ addi $zero, $at, 0x2020 +/* 24A98C 002AEF7C D9202020 */ ldc2 $0, 0x2020($t1) +/* 24A990 002AEF80 20202020 */ addi $zero, $at, 0x2020 +/* 24A994 002AEF84 20202020 */ addi $zero, $at, 0x2020 /* 24A998 002AEF88 20202020 */ addi $zero, $at, 0x2020 /* 24A99C 002AEF8C 20202020 */ addi $zero, $at, 0x2020 /* 24A9A0 002AEF90 20202020 */ addi $zero, $at, 0x2020 @@ -1247,8 +1251,8 @@ /* 24AA00 002AEFF0 00000000 */ nop /* 24AA04 002AEFF4 00000000 */ nop /* 24AA08 002AEFF8 000000D3 */ .byte 0x00, 0x00, 0x00, 0xd3 -/* 24AA0C 002AEFFC DBD42020 */ .byte 0xDB,0xD4,0x20,0x20 /* Because of invalid n64 opcode bbit032 */ -/* 24AA10 002AF000 20202020 */ /* 24AA14 002AF004 20202020 */ addi $zero, $at, 0x2020 +/* 24AA0C 002AEFFC DBD42020 */ /* 24AA10 002AF000 20202020 */ addi $zero, $at, 0x2020 +/* 24AA14 002AF004 20202020 */ addi $zero, $at, 0x2020 /* 24AA18 002AF008 20202020 */ addi $zero, $at, 0x2020 /* 24AA1C 002AF00C 20202020 */ addi $zero, $at, 0x2020 /* 24AA20 002AF010 20202020 */ addi $zero, $at, 0x2020 @@ -1529,8 +1533,8 @@ /* 24AE8C 002AF47C 00000000 */ nop /* 24AE90 002AF480 00000000 */ nop /* 24AE94 002AF484 0000DEDF */ .byte 0x00, 0x00, 0xde, 0xdf -/* 24AE98 002AF488 DBD42020 */ .byte 0xDB,0xD4,0x20,0x20 /* Because of invalid n64 opcode bbit032 */ -/* 24AE9C 002AF48C 20202020 */ /* 24AEA0 002AF490 20202020 */ addi $zero, $at, 0x2020 +/* 24AE98 002AF488 DBD42020 */ /* 24AE9C 002AF48C 20202020 */ addi $zero, $at, 0x2020 +/* 24AEA0 002AF490 20202020 */ addi $zero, $at, 0x2020 /* 24AEA4 002AF494 20202020 */ addi $zero, $at, 0x2020 /* 24AEA8 002AF498 20202020 */ addi $zero, $at, 0x2020 /* 24AEAC 002AF49C 20202020 */ addi $zero, $at, 0x2020 @@ -1591,7 +1595,7 @@ /* 24AF8C 002AF57C 00000000 */ nop /* 24AF90 002AF580 00000000 */ nop /* 24AF94 002AF584 A0BEE776 */ sb $fp, -0x188a($a1) -/* 24AF98 002AF588 5420D5D0 */ bnel $at, $zero, .L002A4CCC +/* 24AF98 002AF588 5420D5D0 */ bnezl $at, .L002A4CCC /* 24AF9C 002AF58C DCD52020 */ ld $s5, 0x2020($a2) /* 24AFA0 002AF590 20202020 */ addi $zero, $at, 0x2020 /* 24AFA4 002AF594 20202020 */ addi $zero, $at, 0x2020 @@ -1785,7 +1789,7 @@ /* 24B2B4 002AF8A4 62625420 */ daddi $v0, $s3, 0x5420 /* 24B2B8 002AF8A8 20202020 */ addi $zero, $at, 0x2020 /* 24B2BC 002AF8AC 20202020 */ addi $zero, $at, 0x2020 -/* 24B2C0 002AF8B0 5460705F */ bnel $v1, $zero, .L002CBA30 +/* 24B2C0 002AF8B0 5460705F */ bnezl $v1, .L002CBA30 /* 24B2C4 002AF8B4 75758800 */ jalx 0x5d62000 /* 24B2C8 002AF8B8 00000000 */ nop /* 24B2CC 002AF8BC 00000000 */ nop @@ -1807,8 +1811,9 @@ /* 24B30C 002AF8FC 00000000 */ nop /* 24B310 002AF900 00000000 */ nop /* 24B314 002AF904 00000000 */ nop -/* 24B318 002AF908 EAC5AC7F */ .byte 0xEA,0xC5,0xAC,0x7F /* Because of invalid n64 opcode bbit1 */ -/* 24B31C 002AF90C 7F7A7A7A */ /* 24B320 002AF910 E7E77A7A */ /* 24B324 002AF914 7F797FE7 */ .byte 0x7f, 0x79, 0x7f, 0xe7 +/* 24B318 002AF908 EAC5AC7F */ swc2 $5, -0x5381($s6) +/* 24B31C 002AF90C 7F7A7A7A */ .byte 0x7f, 0x7a, 0x7a, 0x7a +/* 24B320 002AF910 E7E77A7A */ /* 24B324 002AF914 7F797FE7 */ .byte 0x7f, 0x79, 0x7f, 0xe7 /* 24B328 002AF918 60202020 */ /* 24B32C 002AF91C 20202020 */ addi $zero, $at, 0x2020 /* 24B330 002AF920 20202070 */ addi $zero, $at, 0x2070 /* 24B334 002AF924 75755F5E */ jalx 0x5d57d78 diff --git a/papermario/asm/CODE_7e0e80_len_2000.s b/papermario/asm/CODE_7e0e80_len_2000.s index f8ddf6a9d0..227f861533 100644 --- a/papermario/asm/CODE_7e0e80_len_2000.s +++ b/papermario/asm/CODE_7e0e80_len_2000.s @@ -336,7 +336,7 @@ func_0028035C: /* 7E1354 002804D4 3C048028 */ lui $a0, %hi(D_80286524) # $a0, 0x8028 /* 7E1358 002804D8 0C0B1059 */ jal func_002C4164 /* 7E135C 002804DC 8C846524 */ lw $a0, %lo(D_80286524)($a0) -/* 7E1360 002804E0 54400008 */ bnel $v0, $zero, .L00280504 +/* 7E1360 002804E0 54400008 */ bnezl $v0, .L00280504 /* 7E1364 002804E4 0000102D */ move $v0, $zero /* 7E1368 002804E8 96020000 */ lhu $v0, ($s0) /* 7E136C 002804EC 3042FFF7 */ andi $v0, $v0, 0xfff7 diff --git a/papermario/asm/CODE_7e2e80_len_2000.s b/papermario/asm/CODE_7e2e80_len_2000.s index 938e1e55d0..cfb3ce0c91 100644 --- a/papermario/asm/CODE_7e2e80_len_2000.s +++ b/papermario/asm/CODE_7e2e80_len_2000.s @@ -288,7 +288,7 @@ func_00282264: /* 7E32AC 0028242C 10A0000A */ beqz $a1, .L00282458 /* 7E32B0 00282430 8E320088 */ lw $s2, 0x88($s1) /* 7E32B4 00282434 8E220084 */ lw $v0, 0x84($s1) -/* 7E32B8 00282438 54400007 */ bnel $v0, $zero, .L00282458 +/* 7E32B8 00282438 54400007 */ bnezl $v0, .L00282458 /* 7E32BC 0028243C AE200074 */ sw $zero, 0x74($s1) /* 7E32C0 00282440 962400C2 */ lhu $a0, 0xc2($s1) /* 7E32C4 00282444 2405FFFF */ li $a1, -1 @@ -1210,7 +1210,7 @@ func_0028306C: .L002831B4: /* 7E4034 002831B4 8CA20004 */ lw $v0, 4($a1) /* 7E4038 002831B8 30420001 */ andi $v0, $v0, 1 -/* 7E403C 002831BC 54400003 */ bnel $v0, $zero, .L002831CC +/* 7E403C 002831BC 54400003 */ bnezl $v0, .L002831CC /* 7E4040 002831C0 AC8000B8 */ sw $zero, 0xb8($a0) /* 7E4044 002831C4 24020001 */ li $v0, 1 /* 7E4048 002831C8 AC8200B8 */ sw $v0, 0xb8($a0) diff --git a/papermario/asm/CODE_bbdd0_len_2000.s b/papermario/asm/CODE_bbdd0_len_2000.s index 54177e821e..65d815024d 100644 --- a/papermario/asm/CODE_bbdd0_len_2000.s +++ b/papermario/asm/CODE_bbdd0_len_2000.s @@ -907,13 +907,13 @@ func_001262EC: /* 0BCA20 00126320 94A40000 */ lhu $a0, ($a1) /* 0BCA24 00126324 97A800FE */ lhu $t0, 0xfe($sp) /* 0BCA28 00126328 0104102B */ sltu $v0, $t0, $a0 -/* 0BCA2C 0012632C 54400001 */ bnel $v0, $zero, .L00126334 +/* 0BCA2C 0012632C 54400001 */ bnezl $v0, .L00126334 /* 0BCA30 00126330 A7A400FE */ sh $a0, 0xfe($sp) .L00126334: /* 0BCA34 00126334 94C40000 */ lhu $a0, ($a2) /* 0BCA38 00126338 97A90106 */ lhu $t1, 0x106($sp) /* 0BCA3C 0012633C 0124102B */ sltu $v0, $t1, $a0 -/* 0BCA40 00126340 54400001 */ bnel $v0, $zero, .L00126348 +/* 0BCA40 00126340 54400001 */ bnezl $v0, .L00126348 /* 0BCA44 00126344 A7A40106 */ sh $a0, 0x106($sp) .L00126348: /* 0BCA48 00126348 24C60002 */ addiu $a2, $a2, 2 @@ -937,7 +937,7 @@ func_001262EC: /* 0BCA80 00126380 94830000 */ lhu $v1, ($a0) /* 0BCA84 00126384 97A20108 */ lhu $v0, 0x108($sp) /* 0BCA88 00126388 0043102B */ sltu $v0, $v0, $v1 -/* 0BCA8C 0012638C 54400001 */ bnel $v0, $zero, .L00126394 +/* 0BCA8C 0012638C 54400001 */ bnezl $v0, .L00126394 /* 0BCA90 00126390 A7A30108 */ sh $v1, 0x108($sp) .L00126394: /* 0BCA94 00126394 26100001 */ addiu $s0, $s0, 1 @@ -1069,7 +1069,7 @@ func_001264EC: /* 0BCC54 00126554 24160002 */ li $s6, 2 /* 0BCC58 00126558 24130001 */ li $s3, 1 .L0012655C: -/* 0BCC5C 0012655C 54400001 */ bnel $v0, $zero, .L00126564 +/* 0BCC5C 0012655C 54400001 */ bnezl $v0, .L00126564 /* 0BCC60 00126560 36D60001 */ ori $s6, $s6, 1 .L00126564: /* 0BCC64 00126564 27B10020 */ addiu $s1, $sp, 0x20 diff --git a/papermario/asm/CODE_bddd0_len_2000.s b/papermario/asm/CODE_bddd0_len_2000.s index 6cc6cbb9b0..aaf85c0097 100644 --- a/papermario/asm/CODE_bddd0_len_2000.s +++ b/papermario/asm/CODE_bddd0_len_2000.s @@ -822,7 +822,7 @@ func_0012829C: /* 0BE9A8 001282A8 24100100 */ li $s0, 256 .L001282AC: /* 0BE9AC 001282AC 2A020046 */ slti $v0, $s0, 0x46 -/* 0BE9B0 001282B0 54400001 */ bnel $v0, $zero, .L001282B8 +/* 0BE9B0 001282B0 54400001 */ bnezl $v0, .L001282B8 /* 0BE9B4 001282B4 24100046 */ li $s0, 70 .L001282B8: /* 0BE9B8 001282B8 2610FFF4 */ addiu $s0, $s0, -0xc @@ -839,7 +839,7 @@ func_0012829C: /* 0BE9E4 001282E4 24110044 */ li $s1, 68 .L001282E8: /* 0BE9E8 001282E8 2A220024 */ slti $v0, $s1, 0x24 -/* 0BE9EC 001282EC 54400001 */ bnel $v0, $zero, .L001282F4 +/* 0BE9EC 001282EC 54400001 */ bnezl $v0, .L001282F4 /* 0BE9F0 001282F0 24110024 */ li $s1, 36 .L001282F4: /* 0BE9F4 001282F4 97C40514 */ lhu $a0, 0x514($fp) @@ -862,7 +862,7 @@ func_0012829C: /* 0BEA30 00128330 24A30026 */ addiu $v1, $a1, 0x26 /* 0BEA34 00128334 00432023 */ subu $a0, $v0, $v1 /* 0BEA38 00128338 28820014 */ slti $v0, $a0, 0x14 -/* 0BEA3C 0012833C 54400001 */ bnel $v0, $zero, .L00128344 +/* 0BEA3C 0012833C 54400001 */ bnezl $v0, .L00128344 /* 0BEA40 00128340 24040014 */ li $a0, 20 .L00128344: /* 0BEA44 00128344 00851021 */ addu $v0, $a0, $a1 @@ -1374,11 +1374,11 @@ func_00128928: /* 0BF1F0 00128AF0 44116000 */ mfc1 $s1, $f12 /* 0BF1F4 00128AF4 4620030D */ trunc.w.d $f12, $f0 /* 0BF1F8 00128AF8 44106000 */ mfc1 $s0, $f12 -/* 0BF1FC 00128AFC 54400001 */ bnel $v0, $zero, .L00128B04 +/* 0BF1FC 00128AFC 54400001 */ bnezl $v0, .L00128B04 /* 0BF200 00128B00 24120018 */ li $s2, 24 .L00128B04: /* 0BF204 00128B04 2A620018 */ slti $v0, $s3, 0x18 -/* 0BF208 00128B08 54400001 */ bnel $v0, $zero, .L00128B10 +/* 0BF208 00128B08 54400001 */ bnezl $v0, .L00128B10 /* 0BF20C 00128B0C 24130018 */ li $s3, 24 .L00128B10: /* 0BF210 00128B10 3C018015 */ lui $at, 0x8015 diff --git a/papermario/asm/CODE_bfdd0_len_2000.s b/papermario/asm/CODE_bfdd0_len_2000.s index cf008ca9e1..4cb9a64d01 100644 --- a/papermario/asm/CODE_bfdd0_len_2000.s +++ b/papermario/asm/CODE_bfdd0_len_2000.s @@ -333,7 +333,7 @@ func_00129ACC: /* 0C02A8 00129BA8 0062102A */ slt $v0, $v1, $v0 /* 0C02AC 00129BAC 1040000C */ beqz $v0, .L00129BE0 /* 0C02B0 00129BB0 2C620011 */ sltiu $v0, $v1, 0x11 -/* 0C02B4 00129BB4 54400001 */ bnel $v0, $zero, .L00129BBC +/* 0C02B4 00129BB4 54400001 */ bnezl $v0, .L00129BBC /* 0C02B8 00129BB8 24040038 */ li $a0, 56 .L00129BBC: /* 0C02BC 00129BBC 97C204CC */ lhu $v0, 0x4cc($fp) diff --git a/papermario/asm/CODE_c1dd0_len_2000.s b/papermario/asm/CODE_c1dd0_len_2000.s index 116439c9c2..c6fd0bd734 100644 --- a/papermario/asm/CODE_c1dd0_len_2000.s +++ b/papermario/asm/CODE_c1dd0_len_2000.s @@ -611,7 +611,7 @@ func_0012BF70: /* 0C26C8 0012BFC8 00000000 */ nop .L0012BFCC: -/* 0C26CC 0012BFCC 54800001 */ bnel $a0, $zero, .L0012BFD4 +/* 0C26CC 0012BFCC 54800001 */ bnezl $a0, .L0012BFD4 /* 0C26D0 0012BFD0 24060001 */ li $a2, 1 .L0012BFD4: /* 0C26D4 0012BFD4 93C30533 */ lbu $v1, 0x533($fp) diff --git a/papermario/asm/CODE_c3dd0_len_2000.s b/papermario/asm/CODE_c3dd0_len_2000.s index b3e8a8148b..deed53c91f 100644 --- a/papermario/asm/CODE_c3dd0_len_2000.s +++ b/papermario/asm/CODE_c3dd0_len_2000.s @@ -1759,7 +1759,7 @@ func_0012EF34: /* 0C5720 0012F020 A7B60004 */ sh $s6, 4($sp) /* 0C5724 0012F024 A7B5000C */ sh $s5, 0xc($sp) .L0012F028: -/* 0C5728 0012F028 57C0004D */ bnel $fp, $zero, .L0012F160 +/* 0C5728 0012F028 57C0004D */ bnezl $fp, .L0012F160 /* 0C572C 0012F02C 24020002 */ li $v0, 2 /* 0C5730 0012F030 8D050000 */ lw $a1, ($t0) /* 0C5734 0012F034 00A0182D */ move $v1, $a1 diff --git a/papermario/asm/CODE_c5dd0_len_2000.s b/papermario/asm/CODE_c5dd0_len_2000.s index b250225d4e..a098d558e8 100644 --- a/papermario/asm/CODE_c5dd0_len_2000.s +++ b/papermario/asm/CODE_c5dd0_len_2000.s @@ -700,7 +700,7 @@ func_001300C4: /* 0C680C 0013010C 0040882D */ move $s1, $v0 /* 0C6810 00130110 3223FFFF */ andi $v1, $s1, 0xffff /* 0C6814 00130114 0263102B */ sltu $v0, $s3, $v1 -/* 0C6818 00130118 54400006 */ bnel $v0, $zero, .L00130134 +/* 0C6818 00130118 54400006 */ bnezl $v0, .L00130134 /* 0C681C 0013011C 0260882D */ move $s1, $s3 /* 0C6820 00130120 2C620002 */ sltiu $v0, $v1, 2 /* 0C6824 00130124 10400003 */ beqz $v0, .L00130134 @@ -923,7 +923,7 @@ func_00130424: /* 0C6B44 00130444 240B0001 */ li $t3, 1 .L00130448: -/* 0C6B48 00130448 54400001 */ bnel $v0, $zero, .L00130450 +/* 0C6B48 00130448 54400001 */ bnezl $v0, .L00130450 /* 0C6B4C 0013044C AFAF002C */ sw $t7, 0x2c($sp) func_00130450: .L00130450: @@ -2068,7 +2068,7 @@ func_001313F4: /* 0C7B9C 0013149C 24840004 */ addiu $a0, $a0, 4 /* 0C7BA0 001314A0 28620100 */ slti $v0, $v1, 0x100 .L001314A4: -/* 0C7BA4 001314A4 54400003 */ bnel $v0, $zero, .L001314B4 +/* 0C7BA4 001314A4 54400003 */ bnezl $v0, .L001314B4 /* 0C7BA8 001314A8 2404005C */ li $a0, 92 func_001314AC: /* 0C7BAC 001314AC 0804C52B */ j func_001314AC diff --git a/papermario/asm/CODE_c7dd0_len_2000.s b/papermario/asm/CODE_c7dd0_len_2000.s index ea069c99f9..48b48cfd82 100644 --- a/papermario/asm/CODE_c7dd0_len_2000.s +++ b/papermario/asm/CODE_c7dd0_len_2000.s @@ -330,7 +330,7 @@ func_00131B00: /* 0C8258 00131B58 24840004 */ addiu $a0, $a0, 4 /* 0C825C 00131B5C 28620100 */ slti $v0, $v1, 0x100 .L00131B60: -/* 0C8260 00131B60 54400003 */ bnel $v0, $zero, .L00131B70 +/* 0C8260 00131B60 54400003 */ bnezl $v0, .L00131B70 /* 0C8264 00131B64 2404005C */ li $a0, 92 func_00131B68: /* 0C8268 00131B68 0804C6DA */ j func_00131B68 @@ -1518,7 +1518,7 @@ func_00132BFC: /* 0C93D4 00132CD4 8CA40000 */ lw $a0, ($a1) /* 0C93D8 00132CD8 10800021 */ beqz $a0, .L00132D60 /* 0C93DC 00132CDC 30820040 */ andi $v0, $a0, 0x40 -/* 0C93E0 00132CE0 54400020 */ bnel $v0, $zero, .L00132D64 +/* 0C93E0 00132CE0 54400020 */ bnezl $v0, .L00132D64 /* 0C93E4 00132CE4 26310001 */ addiu $s1, $s1, 1 /* 0C93E8 00132CE8 3C02800A */ lui $v0, %hi(D_8009A634) # $v0, 0x800a /* 0C93EC 00132CEC 8442A634 */ lh $v0, %lo(D_8009A634)($v0) @@ -1526,7 +1526,7 @@ func_00132BFC: /* 0C93F4 00132CF4 00821024 */ and $v0, $a0, $v0 /* 0C93F8 00132CF8 10400019 */ beqz $v0, .L00132D60 /* 0C93FC 00132CFC 00941024 */ and $v0, $a0, $s4 -/* 0C9400 00132D00 54400018 */ bnel $v0, $zero, .L00132D64 +/* 0C9400 00132D00 54400018 */ bnezl $v0, .L00132D64 /* 0C9404 00132D04 26310001 */ addiu $s1, $s1, 1 /* 0C9408 00132D08 80A3001D */ lb $v1, 0x1d($a1) /* 0C940C 00132D0C 10730006 */ beq $v1, $s3, .L00132D28 @@ -1655,7 +1655,7 @@ func_00132E38: /* 0C95C4 00132EC4 8E430000 */ lw $v1, ($s2) /* 0C95C8 00132EC8 10600288 */ beqz $v1, .L001338EC /* 0C95CC 00132ECC 30620040 */ andi $v0, $v1, 0x40 -/* 0C95D0 00132ED0 54400287 */ bnel $v0, $zero, .L001338F0 +/* 0C95D0 00132ED0 54400287 */ bnezl $v0, .L001338F0 /* 0C95D4 00132ED4 26D60001 */ addiu $s6, $s6, 1 /* 0C95D8 00132ED8 3C020010 */ lui $v0, 0x10 /* 0C95DC 00132EDC 00621024 */ and $v0, $v1, $v0 diff --git a/papermario/asm/CODE_c9dd0_len_2000.s b/papermario/asm/CODE_c9dd0_len_2000.s index 62858e956a..7ebc3c3c65 100644 --- a/papermario/asm/CODE_c9dd0_len_2000.s +++ b/papermario/asm/CODE_c9dd0_len_2000.s @@ -663,10 +663,10 @@ func_00133F90: /* 0CA788 00134088 50520021 */ beql $v0, $s2, .L00134110 /* 0CA78C 0013408C 26100001 */ addiu $s0, $s0, 1 /* 0CA790 00134090 30620040 */ andi $v0, $v1, 0x40 -/* 0CA794 00134094 5440001E */ bnel $v0, $zero, .L00134110 +/* 0CA794 00134094 5440001E */ bnezl $v0, .L00134110 /* 0CA798 00134098 26100001 */ addiu $s0, $s0, 1 /* 0CA79C 0013409C 00711024 */ and $v0, $v1, $s1 -/* 0CA7A0 001340A0 5440001B */ bnel $v0, $zero, .L00134110 +/* 0CA7A0 001340A0 5440001B */ bnezl $v0, .L00134110 /* 0CA7A4 001340A4 26100001 */ addiu $s0, $s0, 1 /* 0CA7A8 001340A8 C4800008 */ lwc1 $f0, 8($a0) /* 0CA7AC 001340AC 46140001 */ sub.s $f0, $f0, $f20 @@ -1966,7 +1966,7 @@ func_00135134: /* 0CB9E8 001352E8 00021603 */ sra $v0, $v0, 0x18 /* 0CB9EC 001352EC 0062182A */ slt $v1, $v1, $v0 /* 0CB9F0 001352F0 92620003 */ lbu $v0, 3($s3) -/* 0CB9F4 001352F4 54600001 */ bnel $v1, $zero, .L001352FC +/* 0CB9F4 001352F4 54600001 */ bnezl $v1, .L001352FC /* 0CB9F8 001352F8 A2620002 */ sb $v0, 2($s3) .L001352FC: /* 0CB9FC 001352FC C6400010 */ lwc1 $f0, 0x10($s2) @@ -2007,7 +2007,7 @@ func_00135134: /* 0CBA7C 0013537C 00021603 */ sra $v0, $v0, 0x18 /* 0CBA80 00135380 0062182A */ slt $v1, $v1, $v0 /* 0CBA84 00135384 92620006 */ lbu $v0, 6($s3) -/* 0CBA88 00135388 54600001 */ bnel $v1, $zero, .L00135390 +/* 0CBA88 00135388 54600001 */ bnezl $v1, .L00135390 /* 0CBA8C 0013538C A2620005 */ sb $v0, 5($s3) .L00135390: /* 0CBA90 00135390 C6400010 */ lwc1 $f0, 0x10($s2) @@ -2059,7 +2059,7 @@ func_00135398: /* 0CBB38 00135438 24420001 */ addiu $v0, $v0, 1 /* 0CBB3C 0013543C AE6202B4 */ sw $v0, 0x2b4($s3) /* 0CBB40 00135440 0062102B */ sltu $v0, $v1, $v0 -/* 0CBB44 00135444 54400020 */ bnel $v0, $zero, .L001354C8 +/* 0CBB44 00135444 54400020 */ bnezl $v0, .L001354C8 /* 0CBB48 00135448 AE6302B4 */ sw $v1, 0x2b4($s3) /* 0CBB4C 0013544C 0804D533 */ j func_001354CC /* 0CBB50 00135450 0240202D */ move $a0, $s2 diff --git a/papermario/asm/CODE_cbdd0_len_2000.s b/papermario/asm/CODE_cbdd0_len_2000.s index 6f8d82b9c4..5f665d9ec6 100644 --- a/papermario/asm/CODE_cbdd0_len_2000.s +++ b/papermario/asm/CODE_cbdd0_len_2000.s @@ -394,20 +394,20 @@ func_00135AB4: /* 0CC344 00135C44 00621821 */ addu $v1, $v1, $v0 /* 0CC348 00135C48 946378F8 */ lhu $v1, 0x78f8($v1) /* 0CC34C 00135C4C 30620040 */ andi $v0, $v1, 0x40 -/* 0CC350 00135C50 54400013 */ bnel $v0, $zero, .L00135CA0 +/* 0CC350 00135C50 54400013 */ bnezl $v0, .L00135CA0 /* 0CC354 00135C54 3C040006 */ lui $a0, 6 /* 0CC358 00135C58 30620008 */ andi $v0, $v1, 8 -/* 0CC35C 00135C5C 54400010 */ bnel $v0, $zero, .L00135CA0 +/* 0CC35C 00135C5C 54400010 */ bnezl $v0, .L00135CA0 /* 0CC360 00135C60 3C040006 */ lui $a0, 6 /* 0CC364 00135C64 2402015C */ li $v0, 348 /* 0CC368 00135C68 1082000C */ beq $a0, $v0, .L00135C9C /* 0CC36C 00135C6C 30620020 */ andi $v0, $v1, 0x20 -/* 0CC370 00135C70 5440000B */ bnel $v0, $zero, .L00135CA0 +/* 0CC370 00135C70 5440000B */ bnezl $v0, .L00135CA0 /* 0CC374 00135C74 3C040006 */ lui $a0, 6 /* 0CC378 00135C78 8E220000 */ lw $v0, ($s1) /* 0CC37C 00135C7C 3C030400 */ lui $v1, 0x400 /* 0CC380 00135C80 00431024 */ and $v0, $v0, $v1 -/* 0CC384 00135C84 54400006 */ bnel $v0, $zero, .L00135CA0 +/* 0CC384 00135C84 54400006 */ bnezl $v0, .L00135CA0 /* 0CC388 00135C88 3C040006 */ lui $a0, 6 /* 0CC38C 00135C8C 96220006 */ lhu $v0, 6($s1) /* 0CC390 00135C90 30420002 */ andi $v0, $v0, 2 @@ -975,7 +975,7 @@ func_001363A0: /* 0CCB94 00136494 00621821 */ addu $v1, $v1, $v0 /* 0CCB98 00136498 946378F8 */ lhu $v1, 0x78f8($v1) /* 0CCB9C 0013649C 30620008 */ andi $v0, $v1, 8 -/* 0CCBA0 001364A0 5440000F */ bnel $v0, $zero, .L001364E0 +/* 0CCBA0 001364A0 5440000F */ bnezl $v0, .L001364E0 /* 0CCBA4 001364A4 0240202D */ move $a0, $s2 /* 0CCBA8 001364A8 2402015C */ li $v0, 348 /* 0CCBAC 001364AC 1082000B */ beq $a0, $v0, .L001364DC @@ -1271,10 +1271,10 @@ func_00136888: /* 0CCFB0 001368B0 00C23021 */ addu $a2, $a2, $v0 /* 0CCFB4 001368B4 84C6C6E4 */ lh $a2, -0x391c($a2) /* 0CCFB8 001368B8 30830040 */ andi $v1, $a0, 0x40 -/* 0CCFBC 001368BC 5460000E */ bnel $v1, $zero, .L001368F8 +/* 0CCFBC 001368BC 5460000E */ bnezl $v1, .L001368F8 /* 0CCFC0 001368C0 0200202D */ move $a0, $s0 /* 0CCFC4 001368C4 30820008 */ andi $v0, $a0, 8 -/* 0CCFC8 001368C8 5440000B */ bnel $v0, $zero, .L001368F8 +/* 0CCFC8 001368C8 5440000B */ bnezl $v0, .L001368F8 /* 0CCFCC 001368CC 0200202D */ move $a0, $s0 /* 0CCFD0 001368D0 2402015C */ li $v0, 348 /* 0CCFD4 001368D4 10A20007 */ beq $a1, $v0, .L001368F4 diff --git a/papermario/asm/CODE_cfdd0_len_2000.s b/papermario/asm/CODE_cfdd0_len_2000.s index 65b46c5c26..024f4a4e6d 100644 --- a/papermario/asm/CODE_cfdd0_len_2000.s +++ b/papermario/asm/CODE_cfdd0_len_2000.s @@ -1065,7 +1065,7 @@ func_0013A650: /* 0D0D7C 0013A67C 2442FFFF */ addiu $v0, $v0, -1 /* 0D0D80 0013A680 A2020004 */ sb $v0, 4($s0) /* 0D0D84 0013A684 304200FF */ andi $v0, $v0, 0xff -/* 0D0D88 0013A688 5440000F */ bnel $v0, $zero, .L0013A6C8 +/* 0D0D88 0013A688 5440000F */ bnezl $v0, .L0013A6C8 /* 0D0D8C 0013A68C 26100008 */ addiu $s0, $s0, 8 /* 0D0D90 0013A690 92020005 */ lbu $v0, 5($s0) /* 0D0D94 0013A694 10400005 */ beqz $v0, .L0013A6AC @@ -1154,7 +1154,7 @@ func_0013A704: /* 0D0EA8 0013A7A8 02231021 */ addu $v0, $s1, $v1 /* 0D0EAC 0013A7AC 8C420014 */ lw $v0, 0x14($v0) /* 0D0EB0 0013A7B0 30420001 */ andi $v0, $v0, 1 -/* 0D0EB4 0013A7B4 54400019 */ bnel $v0, $zero, .L0013A81C +/* 0D0EB4 0013A7B4 54400019 */ bnezl $v0, .L0013A81C /* 0D0EB8 0013A7B8 26100001 */ addiu $s0, $s0, 1 /* 0D0EBC 0013A7BC 16600004 */ bnez $s3, .L0013A7D0 /* 0D0EC0 0013A7C0 00041140 */ sll $v0, $a0, 5 @@ -1277,7 +1277,7 @@ func_0013A93C: /* 0D1044 0013A944 0080802D */ move $s0, $a0 /* 0D1048 0013A948 AFBF0014 */ sw $ra, 0x14($sp) /* 0D104C 0013A94C 8E020064 */ lw $v0, 0x64($s0) -/* 0D1050 0013A950 54400001 */ bnel $v0, $zero, .L0013A958 +/* 0D1050 0013A950 54400001 */ bnezl $v0, .L0013A958 /* 0D1054 0013A954 AE000064 */ sw $zero, 0x64($s0) .L0013A958: /* 0D1058 0013A958 8E040068 */ lw $a0, 0x68($s0) @@ -1976,7 +1976,7 @@ func_0013B1B0: /* 0D19D4 0013B2D4 90430008 */ lbu $v1, 8($v0) /* 0D19D8 0013B2D8 8C460004 */ lw $a2, 4($v0) /* 0D19DC 0013B2DC 30630001 */ andi $v1, $v1, 1 -/* 0D19E0 0013B2E0 54600001 */ bnel $v1, $zero, .L0013B2E8 +/* 0D19E0 0013B2E0 54600001 */ bnezl $v1, .L0013B2E8 /* 0D19E4 0013B2E4 24090001 */ li $t1, 1 .L0013B2E8: /* 0D19E8 0013B2E8 3C028015 */ lui $v0, %hi(D_8014EE10) # $v0, 0x8015 diff --git a/papermario/asm/CODE_d1dd0_len_2000.s b/papermario/asm/CODE_d1dd0_len_2000.s index 6d3a151339..4436e1dc66 100644 --- a/papermario/asm/CODE_d1dd0_len_2000.s +++ b/papermario/asm/CODE_d1dd0_len_2000.s @@ -412,7 +412,7 @@ func_0013BC88: /* 0D23C4 0013BCC4 00006812 */ mflo $t5 /* 0D23C8 0013BCC8 9483000A */ lhu $v1, 0xa($a0) /* 0D23CC 0013BCCC 006D102A */ slt $v0, $v1, $t5 -/* 0D23D0 0013BCD0 54400001 */ bnel $v0, $zero, .L0013BCD8 +/* 0D23D0 0013BCD0 54400001 */ bnezl $v0, .L0013BCD8 /* 0D23D4 0013BCD4 0060682D */ move $t5, $v1 .L0013BCD8: /* 0D23D8 0013BCD8 01A0502D */ move $t2, $t5 @@ -708,7 +708,7 @@ func_0013C048: /* 0D2830 0013C130 00000000 */ nop /* 0D2834 0013C134 46800020 */ cvt.s.w $f0, $f0 /* 0D2838 0013C138 0066102A */ slt $v0, $v1, $a2 -/* 0D283C 0013C13C 5440002E */ bnel $v0, $zero, .L0013C1F8 +/* 0D283C 0013C13C 5440002E */ bnezl $v0, .L0013C1F8 /* 0D2840 0013C140 46023181 */ sub.s $f6, $f6, $f2 /* 0D2844 0013C144 4600330D */ trunc.w.s $f12, $f6 /* 0D2848 0013C148 440A6000 */ mfc1 $t2, $f12 diff --git a/papermario/asm/CODE_d3dd0_len_2000.s b/papermario/asm/CODE_d3dd0_len_2000.s index a16ee846f0..83648247de 100644 --- a/papermario/asm/CODE_d3dd0_len_2000.s +++ b/papermario/asm/CODE_d3dd0_len_2000.s @@ -806,7 +806,7 @@ func_0013E1EC: /* 0D4998 0013E298 92830003 */ lbu $v1, 3($s4) /* 0D499C 0013E29C 26520001 */ addiu $s2, $s2, 1 /* 0D49A0 0013E2A0 0243102A */ slt $v0, $s2, $v1 -/* 0D49A4 0013E2A4 5440FE4F */ bnel $v0, $zero, .L0013DBE4 +/* 0D49A4 0013E2A4 5440FE4F */ bnezl $v0, .L0013DBE4 /* 0D49A8 0013E2A8 24630001 */ addiu $v1, $v1, 1 .L0013E2AC: /* 0D49AC 0013E2AC 92820004 */ lbu $v0, 4($s4) diff --git a/papermario/asm/CODE_d5dd0_len_2000.s b/papermario/asm/CODE_d5dd0_len_2000.s index e5d689663f..e5b80219fe 100644 --- a/papermario/asm/CODE_d5dd0_len_2000.s +++ b/papermario/asm/CODE_d5dd0_len_2000.s @@ -110,7 +110,7 @@ func_0013F704: /* 0D5F54 0013F854 00A2402B */ sltu $t0, $a1, $v0 /* 0D5F58 0013F858 AFA80008 */ sw $t0, 8($sp) .L0013F85C: -/* 0D5F5C 0013F85C 54800005 */ bnel $a0, $zero, .L0013F874 +/* 0D5F5C 0013F85C 54800005 */ bnezl $a0, .L0013F874 /* 0D5F60 0013F860 24020001 */ li $v0, 1 /* 0D5F64 0013F864 14A20003 */ bne $a1, $v0, .L0013F874 /* 0D5F68 0013F868 24020001 */ li $v0, 1 @@ -588,7 +588,7 @@ func_0013FE9C: /* 0D65EC 0013FEEC 24090002 */ li $t1, 2 func_0013FEF0: -/* 0D65F0 0013FEF0 56C00001 */ bnel $s6, $zero, .L0013FEF8 +/* 0D65F0 0013FEF0 56C00001 */ bnezl $s6, .L0013FEF8 /* 0D65F4 0013FEF4 24090003 */ li $t1, 3 func_0013FEF8: .L0013FEF8: @@ -1197,7 +1197,7 @@ func_0014073C: /* 0D6ED8 001407D8 16C000FE */ bnez $s6, .L00140BD4 /* 0D6EDC 001407DC 34A50100 */ ori $a1, (0x07040100 & 0xFFFF) # ori $a1, $a1, 0x100 /* 0D6EE0 001407E0 8FA800D4 */ lw $t0, 0xd4($sp) -/* 0D6EE4 001407E4 550000C3 */ bnel $t0, $zero, .L00140AF4 +/* 0D6EE4 001407E4 550000C3 */ bnezl $t0, .L00140AF4 /* 0D6EE8 001407E8 3C040708 */ lui $a0, 0x708 /* 0D6EEC 001407EC 24160001 */ li $s6, 1 /* 0D6EF0 001407F0 1136003A */ beq $t1, $s6, .L001408DC @@ -1933,7 +1933,7 @@ func_001411CC: .L00141228: /* 0D7928 00141228 3C028015 */ lui $v0, %hi(D_8014EFC0) # $v0, 0x8015 /* 0D792C 0014122C 8C42EFC0 */ lw $v0, %lo(D_8014EFC0)($v0) -/* 0D7930 00141230 5440000D */ bnel $v0, $zero, .L00141268 +/* 0D7930 00141230 5440000D */ bnezl $v0, .L00141268 /* 0D7934 00141234 0000202D */ move $a0, $zero /* 0D7938 00141238 3C048015 */ lui $a0, %hi(D_8014EFC4) # $a0, 0x8015 /* 0D793C 0014123C 8C84EFC4 */ lw $a0, %lo(D_8014EFC4)($a0) @@ -1943,7 +1943,7 @@ func_001411CC: /* 0D794C 0014124C 00042043 */ sra $a0, $a0, 1 /* 0D7950 00141250 3C018015 */ lui $at, %hi(D_80151314) # $at, 0x8015 /* 0D7954 00141254 AC221314 */ sw $v0, %lo(D_80151314)($at) -/* 0D7958 00141258 54400005 */ bnel $v0, $zero, .L00141270 +/* 0D7958 00141258 54400005 */ bnezl $v0, .L00141270 /* 0D795C 0014125C 0000202D */ move $a0, $zero func_00141260: /* 0D7960 00141260 08050498 */ j func_00141260 @@ -2226,7 +2226,7 @@ func_00141530: /* 0D7D48 00141648 8E030000 */ lw $v1, ($s0) /* 0D7D4C 0014164C 10600023 */ beqz $v1, .L001416DC /* 0D7D50 00141650 30620002 */ andi $v0, $v1, 2 -/* 0D7D54 00141654 54400022 */ bnel $v0, $zero, .L001416E0 +/* 0D7D54 00141654 54400022 */ bnezl $v0, .L001416E0 /* 0D7D58 00141658 26310001 */ addiu $s1, $s1, 1 /* 0D7D5C 0014165C 00721024 */ and $v0, $v1, $s2 /* 0D7D60 00141660 10400005 */ beqz $v0, .L00141678 diff --git a/papermario/asm/CODE_d7dd0_len_2000.s b/papermario/asm/CODE_d7dd0_len_2000.s index 4f1e0bce75..92a18abbd0 100644 --- a/papermario/asm/CODE_d7dd0_len_2000.s +++ b/papermario/asm/CODE_d7dd0_len_2000.s @@ -843,13 +843,13 @@ func_001421F4: /* 0D89B4 001422B4 50600011 */ beql $v1, $zero, .L001422FC /* 0D89B8 001422B8 26F70001 */ addiu $s7, $s7, 1 /* 0D89BC 001422BC 30620002 */ andi $v0, $v1, 2 -/* 0D89C0 001422C0 5440000E */ bnel $v0, $zero, .L001422FC +/* 0D89C0 001422C0 5440000E */ bnezl $v0, .L001422FC /* 0D89C4 001422C4 26F70001 */ addiu $s7, $s7, 1 /* 0D89C8 001422C8 00671024 */ and $v0, $v1, $a3 -/* 0D89CC 001422CC 5440000B */ bnel $v0, $zero, .L001422FC +/* 0D89CC 001422CC 5440000B */ bnezl $v0, .L001422FC /* 0D89D0 001422D0 26F70001 */ addiu $s7, $s7, 1 /* 0D89D4 001422D4 30620040 */ andi $v0, $v1, 0x40 -/* 0D89D8 001422D8 54400008 */ bnel $v0, $zero, .L001422FC +/* 0D89D8 001422D8 54400008 */ bnezl $v0, .L001422FC /* 0D89DC 001422DC 26F70001 */ addiu $s7, $s7, 1 /* 0D89E0 001422E0 82020045 */ lb $v0, 0x45($s0) /* 0D89E4 001422E4 04420005 */ bltzl $v0, .L001422FC @@ -1187,10 +1187,10 @@ func_001426D4: /* 0D8EA0 001427A0 50600011 */ beql $v1, $zero, .L001427E8 /* 0D8EA4 001427A4 26F70001 */ addiu $s7, $s7, 1 /* 0D8EA8 001427A8 30620002 */ andi $v0, $v1, 2 -/* 0D8EAC 001427AC 5440000E */ bnel $v0, $zero, .L001427E8 +/* 0D8EAC 001427AC 5440000E */ bnezl $v0, .L001427E8 /* 0D8EB0 001427B0 26F70001 */ addiu $s7, $s7, 1 /* 0D8EB4 001427B4 00671024 */ and $v0, $v1, $a3 -/* 0D8EB8 001427B8 5440000B */ bnel $v0, $zero, .L001427E8 +/* 0D8EB8 001427B8 5440000B */ bnezl $v0, .L001427E8 /* 0D8EBC 001427BC 26F70001 */ addiu $s7, $s7, 1 /* 0D8EC0 001427C0 30620040 */ andi $v0, $v1, 0x40 /* 0D8EC4 001427C4 50400008 */ beql $v0, $zero, .L001427E8 @@ -1789,7 +1789,7 @@ func_00142D90: /* 0D9764 00143064 00E3182B */ sltu $v1, $a3, $v1 /* 0D9768 00143068 0062382B */ sltu $a3, $v1, $v0 .L0014306C: -/* 0D976C 0014306C 54800004 */ bnel $a0, $zero, .L00143080 +/* 0D976C 0014306C 54800004 */ bnezl $a0, .L00143080 /* 0D9770 00143070 24020001 */ li $v0, 1 /* 0D9774 00143074 50620001 */ beql $v1, $v0, .L0014307C /* 0D9778 00143078 24070002 */ li $a3, 2 diff --git a/papermario/asm/CODE_d9dd0_len_2000.s b/papermario/asm/CODE_d9dd0_len_2000.s index 6ab428ede3..26abb27ff4 100644 --- a/papermario/asm/CODE_d9dd0_len_2000.s +++ b/papermario/asm/CODE_d9dd0_len_2000.s @@ -19,25 +19,25 @@ /* 0D9E08 00143708 5060001A */ beql $v1, $zero, .L00143774 /* 0D9E0C 0014370C 26310001 */ addiu $s1, $s1, 1 /* 0D9E10 00143710 30620002 */ andi $v0, $v1, 2 -/* 0D9E14 00143714 54400017 */ bnel $v0, $zero, .L00143774 +/* 0D9E14 00143714 54400017 */ bnezl $v0, .L00143774 /* 0D9E18 00143718 26310001 */ addiu $s1, $s1, 1 /* 0D9E1C 0014371C 00691024 */ and $v0, $v1, $t1 -/* 0D9E20 00143720 54400014 */ bnel $v0, $zero, .L00143774 +/* 0D9E20 00143720 54400014 */ bnezl $v0, .L00143774 /* 0D9E24 00143724 26310001 */ addiu $s1, $s1, 1 /* 0D9E28 00143728 00681024 */ and $v0, $v1, $t0 /* 0D9E2C 0014372C 50400011 */ beql $v0, $zero, .L00143774 /* 0D9E30 00143730 26310001 */ addiu $s1, $s1, 1 /* 0D9E34 00143734 00671024 */ and $v0, $v1, $a3 -/* 0D9E38 00143738 5440000E */ bnel $v0, $zero, .L00143774 +/* 0D9E38 00143738 5440000E */ bnezl $v0, .L00143774 /* 0D9E3C 0014373C 26310001 */ addiu $s1, $s1, 1 /* 0D9E40 00143740 30620040 */ andi $v0, $v1, 0x40 -/* 0D9E44 00143744 5440000B */ bnel $v0, $zero, .L00143774 +/* 0D9E44 00143744 5440000B */ bnezl $v0, .L00143774 /* 0D9E48 00143748 26310001 */ addiu $s1, $s1, 1 /* 0D9E4C 0014374C 80820045 */ lb $v0, 0x45($a0) /* 0D9E50 00143750 04420008 */ bltzl $v0, .L00143774 /* 0D9E54 00143754 26310001 */ addiu $s1, $s1, 1 /* 0D9E58 00143758 30620080 */ andi $v0, $v1, 0x80 -/* 0D9E5C 0014375C 54400005 */ bnel $v0, $zero, .L00143774 +/* 0D9E5C 0014375C 54400005 */ bnezl $v0, .L00143774 /* 0D9E60 00143760 26310001 */ addiu $s1, $s1, 1 /* 0D9E64 00143764 ACB10000 */ sw $s1, ($a1) /* 0D9E68 00143768 24A50004 */ addiu $a1, $a1, 4 @@ -202,10 +202,10 @@ /* 0DA0BC 001439BC 5060001A */ beql $v1, $zero, .L00143A28 /* 0DA0C0 001439C0 26310001 */ addiu $s1, $s1, 1 /* 0DA0C4 001439C4 30620002 */ andi $v0, $v1, 2 -/* 0DA0C8 001439C8 54400017 */ bnel $v0, $zero, .L00143A28 +/* 0DA0C8 001439C8 54400017 */ bnezl $v0, .L00143A28 /* 0DA0CC 001439CC 26310001 */ addiu $s1, $s1, 1 /* 0DA0D0 001439D0 00691024 */ and $v0, $v1, $t1 -/* 0DA0D4 001439D4 54400014 */ bnel $v0, $zero, .L00143A28 +/* 0DA0D4 001439D4 54400014 */ bnezl $v0, .L00143A28 /* 0DA0D8 001439D8 26310001 */ addiu $s1, $s1, 1 /* 0DA0DC 001439DC 00681024 */ and $v0, $v1, $t0 /* 0DA0E0 001439E0 50400011 */ beql $v0, $zero, .L00143A28 @@ -214,13 +214,13 @@ /* 0DA0EC 001439EC 5040000E */ beql $v0, $zero, .L00143A28 /* 0DA0F0 001439F0 26310001 */ addiu $s1, $s1, 1 /* 0DA0F4 001439F4 30620040 */ andi $v0, $v1, 0x40 -/* 0DA0F8 001439F8 5440000B */ bnel $v0, $zero, .L00143A28 +/* 0DA0F8 001439F8 5440000B */ bnezl $v0, .L00143A28 /* 0DA0FC 001439FC 26310001 */ addiu $s1, $s1, 1 /* 0DA100 00143A00 80820045 */ lb $v0, 0x45($a0) /* 0DA104 00143A04 04420008 */ bltzl $v0, .L00143A28 /* 0DA108 00143A08 26310001 */ addiu $s1, $s1, 1 /* 0DA10C 00143A0C 30620080 */ andi $v0, $v1, 0x80 -/* 0DA110 00143A10 54400005 */ bnel $v0, $zero, .L00143A28 +/* 0DA110 00143A10 54400005 */ bnezl $v0, .L00143A28 /* 0DA114 00143A14 26310001 */ addiu $s1, $s1, 1 /* 0DA118 00143A18 ACB10000 */ sw $s1, ($a1) /* 0DA11C 00143A1C 24A50004 */ addiu $a1, $a1, 4 @@ -2026,7 +2026,7 @@ func_001453E0: /* 0DBB28 00145428 8CA40FB0 */ lw $a0, 0xfb0($a1) /* 0DBB2C 0014542C 00621004 */ sllv $v0, $v0, $v1 /* 0DBB30 00145430 00821824 */ and $v1, $a0, $v0 -/* 0DBB34 00145434 54600001 */ bnel $v1, $zero, .L0014543C +/* 0DBB34 00145434 54600001 */ bnezl $v1, .L0014543C /* 0DBB38 00145438 24030001 */ li $v1, 1 .L0014543C: /* 0DBB3C 0014543C 00021027 */ nor $v0, $zero, $v0 @@ -2059,7 +2059,7 @@ func_00145450: /* 0DBB98 00145498 8CA40FB0 */ lw $a0, 0xfb0($a1) /* 0DBB9C 0014549C 00621004 */ sllv $v0, $v0, $v1 /* 0DBBA0 001454A0 00821824 */ and $v1, $a0, $v0 -/* 0DBBA4 001454A4 54600001 */ bnel $v1, $zero, .L001454AC +/* 0DBBA4 001454A4 54600001 */ bnezl $v1, .L001454AC /* 0DBBA8 001454A8 24030001 */ li $v1, 1 .L001454AC: /* 0DBBAC 001454AC 00821025 */ or $v0, $a0, $v0 @@ -2091,7 +2091,7 @@ func_001454BC: /* 0DBC04 00145504 8C23BC70 */ lw $v1, -0x4390($at) /* 0DBC08 00145508 00821004 */ sllv $v0, $v0, $a0 /* 0DBC0C 0014550C 00621024 */ and $v0, $v1, $v0 -/* 0DBC10 00145510 54400001 */ bnel $v0, $zero, .L00145518 +/* 0DBC10 00145510 54400001 */ bnezl $v0, .L00145518 /* 0DBC14 00145514 24020001 */ li $v0, 1 .L00145518: /* 0DBC18 00145518 03E00008 */ jr $ra @@ -2128,7 +2128,7 @@ func_0014554C: /* 0DBC78 00145578 8CA412B0 */ lw $a0, 0x12b0($a1) /* 0DBC7C 0014557C 00621004 */ sllv $v0, $v0, $v1 /* 0DBC80 00145580 00821824 */ and $v1, $a0, $v0 -/* 0DBC84 00145584 54600001 */ bnel $v1, $zero, .L0014558C +/* 0DBC84 00145584 54600001 */ bnezl $v1, .L0014558C /* 0DBC88 00145588 24030001 */ li $v1, 1 .L0014558C: /* 0DBC8C 0014558C 00021027 */ nor $v0, $zero, $v0 @@ -2153,7 +2153,7 @@ func_001455A0: /* 0DBCCC 001455CC 8CA412B0 */ lw $a0, 0x12b0($a1) /* 0DBCD0 001455D0 00621004 */ sllv $v0, $v0, $v1 /* 0DBCD4 001455D4 00821824 */ and $v1, $a0, $v0 -/* 0DBCD8 001455D8 54600001 */ bnel $v1, $zero, .L001455E0 +/* 0DBCD8 001455D8 54600001 */ bnezl $v1, .L001455E0 /* 0DBCDC 001455DC 24030001 */ li $v1, 1 .L001455E0: /* 0DBCE0 001455E0 00821025 */ or $v0, $a0, $v0 @@ -2177,7 +2177,7 @@ func_001455F0: /* 0DBD1C 0014561C 8C23BF70 */ lw $v1, -0x4090($at) /* 0DBD20 00145620 00821004 */ sllv $v0, $v0, $a0 /* 0DBD24 00145624 00621024 */ and $v0, $v1, $v0 -/* 0DBD28 00145628 54400001 */ bnel $v0, $zero, .L00145630 +/* 0DBD28 00145628 54400001 */ bnezl $v0, .L00145630 /* 0DBD2C 0014562C 24020001 */ li $v0, 1 .L00145630: /* 0DBD30 00145630 03E00008 */ jr $ra diff --git a/papermario/asm/CODE_dbdd0_len_2000.s b/papermario/asm/CODE_dbdd0_len_2000.s index 159ea48797..3db497d2d0 100644 --- a/papermario/asm/CODE_dbdd0_len_2000.s +++ b/papermario/asm/CODE_dbdd0_len_2000.s @@ -228,7 +228,7 @@ func_001457F4: /* 0DC0EC 001459EC 3C028011 */ lui $v0, %hi(D_8010EFC8) # $v0, 0x8011 /* 0DC0F0 001459F0 8C42EFC8 */ lw $v0, %lo(D_8010EFC8)($v0) /* 0DC0F4 001459F4 30422000 */ andi $v0, $v0, 0x2000 -/* 0DC0F8 001459F8 5440005A */ bnel $v0, $zero, .L00145B64 +/* 0DC0F8 001459F8 5440005A */ bnezl $v0, .L00145B64 /* 0DC0FC 001459FC 26730001 */ addiu $s3, $s3, 1 /* 0DC100 00145A00 30821000 */ andi $v0, $a0, 0x1000 .L00145A04: @@ -498,7 +498,7 @@ func_00145D58: /* 0DC4A4 00145DA4 24A5F120 */ addiu $a1, %lo(D_8014F120) # addiu $a1, $a1, -0xee0 /* 0DC4A8 00145DA8 0C01BB5C */ jal func_0006ED70 /* 0DC4AC 00145DAC 0200202D */ move $a0, $s0 -/* 0DC4B0 00145DB0 54400004 */ bnel $v0, $zero, .L00145DC4 +/* 0DC4B0 00145DB0 54400004 */ bnezl $v0, .L00145DC4 /* 0DC4B4 00145DB4 0200202D */ move $a0, $s0 /* 0DC4B8 00145DB8 3C108015 */ lui $s0, %hi(D_8014F128) # $s0, 0x8015 /* 0DC4BC 00145DBC 2610F128 */ addiu $s0, %lo(D_8014F128) # addiu $s0, $s0, -0xed8 @@ -626,7 +626,7 @@ func_00145E98: /* 0DC67C 00145F7C 0C046FA0 */ jal func_0011BE80 /* 0DC680 00145F80 27A7002B */ addiu $a3, $sp, 0x2b /* 0DC684 00145F84 93A2002B */ lbu $v0, 0x2b($sp) -/* 0DC688 00145F88 54400020 */ bnel $v0, $zero, .L0014600C +/* 0DC688 00145F88 54400020 */ bnezl $v0, .L0014600C /* 0DC68C 00145F8C 36100002 */ ori $s0, $s0, 2 /* 0DC690 00145F90 08051804 */ j func_00146010 /* 0DC694 00145F94 3203FFFF */ andi $v1, $s0, 0xffff @@ -652,10 +652,10 @@ func_00145E98: /* 0DC6DC 00145FDC 5443000B */ bnel $v0, $v1, .L0014600C /* 0DC6E0 00145FE0 36100004 */ ori $s0, $s0, 4 /* 0DC6E4 00145FE4 93A2002C */ lbu $v0, 0x2c($sp) -/* 0DC6E8 00145FE8 54400008 */ bnel $v0, $zero, .L0014600C +/* 0DC6E8 00145FE8 54400008 */ bnezl $v0, .L0014600C /* 0DC6EC 00145FEC 36100004 */ ori $s0, $s0, 4 /* 0DC6F0 00145FF0 93A2002D */ lbu $v0, 0x2d($sp) -/* 0DC6F4 00145FF4 54400005 */ bnel $v0, $zero, .L0014600C +/* 0DC6F4 00145FF4 54400005 */ bnezl $v0, .L0014600C /* 0DC6F8 00145FF8 36100004 */ ori $s0, $s0, 4 /* 0DC6FC 00145FFC 93A2002E */ lbu $v0, 0x2e($sp) /* 0DC700 00146000 10400003 */ beqz $v0, .L00146010 diff --git a/papermario/asm/CODE_dddd0_len_2000.s b/papermario/asm/CODE_dddd0_len_2000.s index afdbd9bbd1..6105f8441c 100644 --- a/papermario/asm/CODE_dddd0_len_2000.s +++ b/papermario/asm/CODE_dddd0_len_2000.s @@ -22,7 +22,7 @@ /* 0DDE14 00147714 504000DB */ beql $v0, $zero, .L00147A84 /* 0DDE18 00147718 26D60001 */ addiu $s6, $s6, 1 /* 0DDE1C 0014771C 30420020 */ andi $v0, $v0, 0x20 -/* 0DDE20 00147720 544000D8 */ bnel $v0, $zero, .L00147A84 +/* 0DDE20 00147720 544000D8 */ bnezl $v0, .L00147A84 /* 0DDE24 00147724 26D60001 */ addiu $s6, $s6, 1 /* 0DDE28 00147728 8E250004 */ lw $a1, 4($s1) /* 0DDE2C 0014772C 50A000D5 */ beql $a1, $zero, .L00147A84 @@ -133,7 +133,7 @@ func_00147878: /* 0DDFB8 001478B8 45030072 */ .byte 0x45,0x03,0x00,0x72 /* Because of invalid n64 opcode bc1tl */ /* 0DDFBC 001478BC 26D60001 */ /* 0DDFC0 001478C0 92220000 */ lbu $v0, ($s1) /* 0DDFC4 001478C4 30420004 */ andi $v0, $v0, 4 -/* 0DDFC8 001478C8 5440006E */ bnel $v0, $zero, .L00147A84 +/* 0DDFC8 001478C8 5440006E */ bnezl $v0, .L00147A84 /* 0DDFCC 001478CC 26D60001 */ addiu $s6, $s6, 1 /* 0DDFD0 001478D0 8FA300B8 */ lw $v1, 0xb8($sp) /* 0DDFD4 001478D4 8FAB0104 */ lw $t3, 0x104($sp) @@ -193,7 +193,7 @@ func_00147878: /* 0DE09C 0014799C 92220000 */ lbu $v0, ($s1) /* 0DE0A0 001479A0 8FA40090 */ lw $a0, 0x90($sp) /* 0DE0A4 001479A4 30420040 */ andi $v0, $v0, 0x40 -/* 0DE0A8 001479A8 54400001 */ bnel $v0, $zero, .L001479B0 +/* 0DE0A8 001479A8 54400001 */ bnezl $v0, .L001479B0 /* 0DE0AC 001479AC 34840002 */ ori $a0, $a0, 2 .L001479B0: /* 0DE0B0 001479B0 8FA60094 */ lw $a2, 0x94($sp) @@ -224,7 +224,7 @@ func_00147878: /* 0DE114 00147A14 AFB0004C */ sw $s0, 0x4c($sp) /* 0DE118 00147A18 0C03D4B8 */ jal func_000F52E0 /* 0DE11C 00147A1C E7A00034 */ swc1 $f0, 0x34($sp) -/* 0DE120 00147A20 54400018 */ bnel $v0, $zero, .L00147A84 +/* 0DE120 00147A20 54400018 */ bnezl $v0, .L00147A84 /* 0DE124 00147A24 26D60001 */ addiu $s6, $s6, 1 /* 0DE128 00147A28 8FA20090 */ lw $v0, 0x90($sp) /* 0DE12C 00147A2C 14400004 */ bnez $v0, .L00147A40 diff --git a/papermario/asm/CODE_dfdd0_len_2000.s b/papermario/asm/CODE_dfdd0_len_2000.s index f3a6700dcb..9b3891b7f4 100644 --- a/papermario/asm/CODE_dfdd0_len_2000.s +++ b/papermario/asm/CODE_dfdd0_len_2000.s @@ -1144,7 +1144,7 @@ func_0014A61C: /* 0E0D60 0014A660 8E040016 */ lw $a0, 0x16($s0) /* 0E0D64 0014A664 0C01567F */ jal func_000559FC /* 0E0D68 0014A668 00000000 */ nop -/* 0E0D6C 0014A66C 5440004D */ bnel $v0, $zero, .L0014A7A4 +/* 0E0D6C 0014A66C 5440004D */ bnezl $v0, .L0014A7A4 /* 0E0D70 0014A670 26520001 */ addiu $s2, $s2, 1 /* 0E0D74 0014A674 96220000 */ lhu $v0, ($s1) /* 0E0D78 0014A678 3042FFFE */ andi $v0, $v0, 0xfffe @@ -1199,7 +1199,7 @@ func_0014A720: /* 0E0E20 0014A720 8E040016 */ lw $a0, 0x16($s0) /* 0E0E24 0014A724 0C01565C */ jal func_00055970 /* 0E0E28 0014A728 8E050012 */ lw $a1, 0x12($s0) -/* 0E0E2C 0014A72C 5440001D */ bnel $v0, $zero, .L0014A7A4 +/* 0E0E2C 0014A72C 5440001D */ bnezl $v0, .L0014A7A4 /* 0E0E30 0014A730 26520001 */ addiu $s2, $s2, 1 /* 0E0E34 0014A734 96220000 */ lhu $v0, ($s1) /* 0E0E38 0014A738 34420001 */ ori $v0, $v0, 1 @@ -1219,7 +1219,7 @@ func_0014A720: /* 0E0E60 0014A760 8E04002A */ lw $a0, 0x2a($s0) /* 0E0E64 0014A764 0C0156CA */ jal func_00055B28 /* 0E0E68 0014A768 00000000 */ nop -/* 0E0E6C 0014A76C 5440000D */ bnel $v0, $zero, .L0014A7A4 +/* 0E0E6C 0014A76C 5440000D */ bnezl $v0, .L0014A7A4 /* 0E0E70 0014A770 26520001 */ addiu $s2, $s2, 1 /* 0E0E74 0014A774 8E020022 */ lw $v0, 0x22($s0) /* 0E0E78 0014A778 8E030026 */ lw $v1, 0x26($s0) @@ -1632,7 +1632,7 @@ func_0014AC94: /* 0E13D4 0014ACD4 0043102A */ slt $v0, $v0, $v1 /* 0E13D8 0014ACD8 3C038016 */ lui $v1, %hi(D_80159AE4) # $v1, 0x8016 /* 0E13DC 0014ACDC 94639AE4 */ lhu $v1, %lo(D_80159AE4)($v1) -/* 0E13E0 0014ACE0 54400001 */ bnel $v0, $zero, .L0014ACE8 +/* 0E13E0 0014ACE0 54400001 */ bnezl $v0, .L0014ACE8 /* 0E13E4 0014ACE4 0060202D */ move $a0, $v1 .L0014ACE8: /* 0E13E8 0014ACE8 3C058016 */ lui $a1, %hi(D_80159AE6) # $a1, 0x8016 @@ -1839,402 +1839,3 @@ func_0014AF8C: /* 0E16A8 0014AFA8 00000000 */ nop /* 0E16AC 0014AFAC 00000000 */ nop -/* 0E16B0 0014AFB0 000000FF */ dsra32 $zero, $zero, 3 -/* 0E16B4 0014AFB4 00000000 */ nop -/* 0E16B8 0014AFB8 00000000 */ nop -/* 0E16BC 0014AFBC 00000000 */ nop -/* 0E16C0 0014AFC0 8014B7F8 */ lb $s4, -0x4808($zero) -/* 0E16C4 0014AFC4 8014B910 */ lb $s4, -0x46f0($zero) -/* 0E16C8 0014AFC8 8014B820 */ lb $s4, -0x47e0($zero) -/* 0E16CC 0014AFCC 8014B938 */ lb $s4, -0x46c8($zero) -/* 0E16D0 0014AFD0 8014B848 */ lb $s4, -0x47b8($zero) -/* 0E16D4 0014AFD4 8014B960 */ lb $s4, -0x46a0($zero) -/* 0E16D8 0014AFD8 8014B870 */ lb $s4, -0x4790($zero) -/* 0E16DC 0014AFDC 8014B988 */ lb $s4, -0x4678($zero) -/* 0E16E0 0014AFE0 8014B898 */ lb $s4, -0x4768($zero) -/* 0E16E4 0014AFE4 8014BA20 */ lb $s4, -0x45e0($zero) -/* 0E16E8 0014AFE8 8014B9B0 */ lb $s4, -0x4650($zero) -/* 0E16EC 0014AFEC 8014BAC0 */ lb $s4, -0x4540($zero) -/* 0E16F0 0014AFF0 8014B8C0 */ lb $s4, -0x4740($zero) -/* 0E16F4 0014AFF4 8014B9D8 */ lb $s4, -0x4628($zero) -/* 0E16F8 0014AFF8 8014B8E8 */ lb $s4, -0x4718($zero) -/* 0E16FC 0014AFFC 8014BA00 */ lb $s4, -0x4600($zero) -/* 0E1700 0014B000 8014BB60 */ lb $s4, -0x44a0($zero) -/* 0E1704 0014B004 8014BC78 */ lb $s4, -0x4388($zero) -/* 0E1708 0014B008 8014BB88 */ lb $s4, -0x4478($zero) -/* 0E170C 0014B00C 8014BCA0 */ lb $s4, -0x4360($zero) -/* 0E1710 0014B010 8014BBB0 */ lb $s4, -0x4450($zero) -/* 0E1714 0014B014 8014BCC8 */ lb $s4, -0x4338($zero) -/* 0E1718 0014B018 8014BBD8 */ lb $s4, -0x4428($zero) -/* 0E171C 0014B01C 8014BCF8 */ lb $s4, -0x4308($zero) -/* 0E1720 0014B020 8014BC00 */ lb $s4, -0x4400($zero) -/* 0E1724 0014B024 8014BD88 */ lb $s4, -0x4278($zero) -/* 0E1728 0014B028 8014BD18 */ lb $s4, -0x42e8($zero) -/* 0E172C 0014B02C 8014BC28 */ lb $s4, -0x43d8($zero) -/* 0E1730 0014B030 8014BD40 */ lb $s4, -0x42c0($zero) -/* 0E1734 0014B034 8014BC50 */ lb $s4, -0x43b0($zero) -/* 0E1738 0014B038 8014BD68 */ lb $s4, -0x4298($zero) -/* 0E173C 0014B03C 8014BE78 */ lb $s4, -0x4188($zero) -/* 0E1740 0014B040 8014BF90 */ lb $s4, -0x4070($zero) -/* 0E1744 0014B044 8014BEA0 */ lb $s4, -0x4160($zero) -/* 0E1748 0014B048 8014BFB8 */ lb $s4, -0x4048($zero) -/* 0E174C 0014B04C 8014BEC8 */ lb $s4, -0x4138($zero) -/* 0E1750 0014B050 8014BFE0 */ lb $s4, -0x4020($zero) -/* 0E1754 0014B054 8014BEF0 */ lb $s4, -0x4110($zero) -/* 0E1758 0014B058 8014C008 */ lb $s4, -0x3ff8($zero) -/* 0E175C 0014B05C 8014BF18 */ lb $s4, -0x40e8($zero) -/* 0E1760 0014B060 8014C098 */ lb $s4, -0x3f68($zero) -/* 0E1764 0014B064 8014C028 */ lb $s4, -0x3fd8($zero) -/* 0E1768 0014B068 8014BF40 */ lb $s4, -0x40c0($zero) -/* 0E176C 0014B06C 8014C050 */ lb $s4, -0x3fb0($zero) -/* 0E1770 0014B070 8014BF68 */ lb $s4, -0x4098($zero) -/* 0E1774 0014B074 8014C078 */ lb $s4, -0x3f88($zero) -/* 0E1778 0014B078 8014BA48 */ lb $s4, -0x45b8($zero) -/* 0E177C 0014B07C 8014BA70 */ lb $s4, -0x4590($zero) -/* 0E1780 0014B080 8014BA98 */ lb $s4, -0x4568($zero) -/* 0E1784 0014B084 8014BDB0 */ lb $s4, -0x4250($zero) -/* 0E1788 0014B088 8014BDD8 */ lb $s4, -0x4228($zero) -/* 0E178C 0014B08C 8014BE00 */ lb $s4, -0x4200($zero) -/* 0E1790 0014B090 8014C0C0 */ lb $s4, -0x3f40($zero) -/* 0E1794 0014B094 8014C0E8 */ lb $s4, -0x3f18($zero) -/* 0E1798 0014B098 8014C110 */ lb $s4, -0x3ef0($zero) -/* 0E179C 0014B09C 8014BB10 */ lb $s4, -0x44f0($zero) -/* 0E17A0 0014B0A0 8014BB38 */ lb $s4, -0x44c8($zero) -/* 0E17A4 0014B0A4 8014BE28 */ lb $s4, -0x41d8($zero) -/* 0E17A8 0014B0A8 8014BE50 */ lb $s4, -0x41b0($zero) -/* 0E17AC 0014B0AC 8014C138 */ lb $s4, -0x3ec8($zero) -/* 0E17B0 0014B0B0 8014C160 */ lb $s4, -0x3ea0($zero) -/* 0E17B4 0014B0B4 00000000 */ nop -/* 0E17B8 0014B0B8 FCFFFFFF */ sd $ra, -1($a3) -/* 0E17BC 0014B0BC FFFE793C */ sd $fp, 0x793c($ra) -/* 0E17C0 0014B0C0 FCFFFFFF */ sd $ra, -1($a3) -/* 0E17C4 0014B0C4 FFFE7838 */ sd $fp, 0x7838($ra) -/* 0E17C8 0014B0C8 FCFFFFFF */ sd $ra, -1($a3) -/* 0E17CC 0014B0CC FFFE7838 */ sd $fp, 0x7838($ra) -/* 0E17D0 0014B0D0 FC457FFF */ sd $a1, 0x7fff($v0) -/* 0E17D4 0014B0D4 FFFDF838 */ sd $sp, -0x7c8($ra) -/* 0E17D8 0014B0D8 FC41FFFF */ sd $at, -1($v0) -/* 0E17DC 0014B0DC FFFEF838 */ sd $fp, -0x7c8($ra) -/* 0E17E0 0014B0E0 FC121824 */ sd $s2, 0x1824($zero) -/* 0E17E4 0014B0E4 FF33FFFF */ sd $s3, -1($t9) -/* 0E17E8 0014B0E8 FC127FFF */ sd $s2, 0x7fff($zero) -/* 0E17EC 0014B0EC FFFFF238 */ sd $ra, -0xdc8($ra) -/* 0E17F0 0014B0F0 FC1219FF */ sd $s2, 0x19ff($zero) -/* 0E17F4 0014B0F4 FFFFFE38 */ sd $ra, -0x1c8($ra) -/* 0E17F8 0014B0F8 FC127E0A */ sd $s2, 0x7e0a($zero) -/* 0E17FC 0014B0FC F3FFF238 */ scd $ra, -0xdc8($ra) -/* 0E1800 0014B100 FC121803 */ sd $s2, 0x1803($zero) -/* 0E1804 0014B104 FFFFFF78 */ sd $ra, -0x88($ra) -/* 0E1808 0014B108 FC147E28 */ sd $s4, 0x7e28($zero) -/* 0E180C 0014B10C 44FE793C */ .byte 0x44, 0xfe, 0x79, 0x3c -/* 0E1810 0014B110 FC147FFF */ /* 0E1814 0014B114 4FFE7838 */ .byte 0x4F,0xFE,0x78,0x38 /* Because of invalid n64 opcode nmsub.s */ -/* 0E1818 0014B118 FC147FFF */ /* 0E181C 0014B11C 4FFE7838 */ .byte 0x4F,0xFE,0x78,0x38 /* Because of invalid n64 opcode nmsub.s */ -/* 0E1820 0014B120 FC147E0A */ /* 0E1824 0014B124 4FFE72F8 */ .byte 0x4F,0xFE,0x72,0xF8 /* Because of invalid n64 opcode nmsub.s */ -/* 0E1828 0014B128 FC147E03 */ /* 0E182C 0014B12C 4FFE7978 */ .byte 0x4F,0xFE,0x79,0x78 /* Because of invalid n64 opcode nmsub.s */ -/* 0E1830 0014B130 FCFFFFFF */ /* 0E1834 0014B134 FFFCF279 */ sd $gp, -0xd87($ra) -/* 0E1838 0014B138 FCFFFFFF */ sd $ra, -1($a3) -/* 0E183C 0014B13C FFFCF238 */ sd $gp, -0xdc8($ra) -/* 0E1840 0014B140 FCFFFFFF */ sd $ra, -1($a3) -/* 0E1844 0014B144 FFFCF238 */ sd $gp, -0xdc8($ra) -/* 0E1848 0014B148 FC157FFF */ sd $s5, 0x7fff($zero) -/* 0E184C 0014B14C FFFDF238 */ sd $sp, -0xdc8($ra) -/* 0E1850 0014B150 FCFFFE03 */ sd $ra, -0x1fd($a3) -/* 0E1854 0014B154 FFFCF378 */ sd $gp, -0xc88($ra) -/* 0E1858 0014B158 FC26A004 */ sd $a2, -0x5ffc($at) -/* 0E185C 0014B15C 1F1093FF */ .byte 0x1f, 0x10, 0x93, 0xff -/* 0E1860 0014B160 FC26A004 */ /* 0E1864 0014B164 1FFC93F8 */ .byte 0x1f, 0xfc, 0x93, 0xf8 -/* 0E1868 0014B168 FC26A004 */ /* 0E186C 0014B16C 1F1093FF */ .byte 0x1f, 0x10, 0x93, 0xff -/* 0E1870 0014B170 FC26A004 */ /* 0E1874 0014B174 1FFC92F8 */ .byte 0x1f, 0xfc, 0x92, 0xf8 -/* 0E1878 0014B178 FC26A003 */ /* 0E187C 0014B17C 1FFC9378 */ .byte 0x1f, 0xfc, 0x93, 0x78 -/* 0E1880 0014B180 FC26A004 */ /* 0E1884 0014B184 1F1093FF */ .byte 0x1f, 0x10, 0x93, 0xff -/* 0E1888 0014B188 FC26A004 */ /* 0E188C 0014B18C 1FFC93F8 */ .byte 0x1f, 0xfc, 0x93, 0xf8 -/* 0E1890 0014B190 FC26A004 */ /* 0E1894 0014B194 1F1093FF */ .byte 0x1f, 0x10, 0x93, 0xff -/* 0E1898 0014B198 FC26A004 */ /* 0E189C 0014B19C 1FFC92F8 */ .byte 0x1f, 0xfc, 0x92, 0xf8 -/* 0E18A0 0014B1A0 FC26A003 */ /* 0E18A4 0014B1A4 1FFC9378 */ .byte 0x1f, 0xfc, 0x93, 0x78 -/* 0E18A8 0014B1A8 FC26A004 */ /* 0E18AC 0014B1AC 1F1093FF */ .byte 0x1f, 0x10, 0x93, 0xff -/* 0E18B0 0014B1B0 FC26A004 */ /* 0E18B4 0014B1B4 1FFC93F8 */ .byte 0x1f, 0xfc, 0x93, 0xf8 -/* 0E18B8 0014B1B8 FC26A004 */ /* 0E18BC 0014B1BC 1F1093FF */ .byte 0x1f, 0x10, 0x93, 0xff -/* 0E18C0 0014B1C0 FC26A004 */ /* 0E18C4 0014B1C4 1FFC92F8 */ .byte 0x1f, 0xfc, 0x92, 0xf8 -/* 0E18C8 0014B1C8 FC26A003 */ /* 0E18CC 0014B1CC 1FFC9378 */ .byte 0x1f, 0xfc, 0x93, 0x78 -/* 0E18D0 0014B1D0 FC20A204 */ /* 0E18D4 0014B1D4 FF13FFFF */ sd $s3, -1($t8) -/* 0E18D8 0014B1D8 FC111404 */ sd $s1, 0x1404($zero) -/* 0E18DC 0014B1DC FFFFFFF8 */ sd $ra, -8($ra) -/* 0E18E0 0014B1E0 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E18E4 0014B1E4 FF13FFFF */ sd $s3, -1($t8) -/* 0E18E8 0014B1E8 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E18EC 0014B1EC FF13FFFF */ sd $s3, -1($t8) -/* 0E18F0 0014B1F0 FC20A203 */ sd $zero, -0x5dfd($at) -/* 0E18F4 0014B1F4 FF13FF7F */ sd $s3, -0x81($t8) -/* 0E18F8 0014B1F8 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E18FC 0014B1FC FF13FFFF */ sd $s3, -1($t8) -/* 0E1900 0014B200 FC111404 */ sd $s1, 0x1404($zero) -/* 0E1904 0014B204 FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1908 0014B208 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E190C 0014B20C FF13FFFF */ sd $s3, -1($t8) -/* 0E1910 0014B210 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1914 0014B214 FF13FFFF */ sd $s3, -1($t8) -/* 0E1918 0014B218 FC20A203 */ sd $zero, -0x5dfd($at) -/* 0E191C 0014B21C FF13FF7F */ sd $s3, -0x81($t8) -/* 0E1920 0014B220 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1924 0014B224 FF13FFFF */ sd $s3, -1($t8) -/* 0E1928 0014B228 FC111404 */ sd $s1, 0x1404($zero) -/* 0E192C 0014B22C FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1930 0014B230 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1934 0014B234 FF13FFFF */ sd $s3, -1($t8) -/* 0E1938 0014B238 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E193C 0014B23C FF13FFFF */ sd $s3, -1($t8) -/* 0E1940 0014B240 FC20A203 */ sd $zero, -0x5dfd($at) -/* 0E1944 0014B244 FF13FF7F */ sd $s3, -0x81($t8) -/* 0E1948 0014B248 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E194C 0014B24C FF13FFFF */ sd $s3, -1($t8) -/* 0E1950 0014B250 FC111404 */ sd $s1, 0x1404($zero) -/* 0E1954 0014B254 FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1958 0014B258 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E195C 0014B25C FF13FFFF */ sd $s3, -1($t8) -/* 0E1960 0014B260 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1964 0014B264 FF13FFFF */ sd $s3, -1($t8) -/* 0E1968 0014B268 FC20A203 */ sd $zero, -0x5dfd($at) -/* 0E196C 0014B26C FF13FF7F */ sd $s3, -0x81($t8) -/* 0E1970 0014B270 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1974 0014B274 FF13FFFF */ sd $s3, -1($t8) -/* 0E1978 0014B278 FC111404 */ sd $s1, 0x1404($zero) -/* 0E197C 0014B27C FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1980 0014B280 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1984 0014B284 FF13FFFF */ sd $s3, -1($t8) -/* 0E1988 0014B288 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E198C 0014B28C FF13FFFF */ sd $s3, -1($t8) -/* 0E1990 0014B290 FC20A203 */ sd $zero, -0x5dfd($at) -/* 0E1994 0014B294 FF13FF7F */ sd $s3, -0x81($t8) -/* 0E1998 0014B298 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E199C 0014B29C FF13FFFF */ sd $s3, -1($t8) -/* 0E19A0 0014B2A0 FC111404 */ sd $s1, 0x1404($zero) -/* 0E19A4 0014B2A4 FFFFFFF8 */ sd $ra, -8($ra) -/* 0E19A8 0014B2A8 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E19AC 0014B2AC FF13FFFF */ sd $s3, -1($t8) -/* 0E19B0 0014B2B0 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E19B4 0014B2B4 FF13FFFF */ sd $s3, -1($t8) -/* 0E19B8 0014B2B8 FC20A203 */ sd $zero, -0x5dfd($at) -/* 0E19BC 0014B2BC FF13FF7F */ sd $s3, -0x81($t8) -/* 0E19C0 0014B2C0 FCFF99FF */ sd $ra, -0x6601($a3) -/* 0E19C4 0014B2C4 FFFFAF38 */ sd $ra, -0x50c8($ra) -/* 0E19C8 0014B2C8 FCFF99FF */ sd $ra, -0x6601($a3) -/* 0E19CC 0014B2CC FFFFAF38 */ sd $ra, -0x50c8($ra) -/* 0E19D0 0014B2D0 FCFF99FF */ sd $ra, -0x6601($a3) -/* 0E19D4 0014B2D4 FFFFAF38 */ sd $ra, -0x50c8($ra) -/* 0E19D8 0014B2D8 FCFF99FF */ sd $ra, -0x6601($a3) -/* 0E19DC 0014B2DC FFFFAF38 */ sd $ra, -0x50c8($ra) -/* 0E19E0 0014B2E0 FCFF9883 */ sd $ra, -0x677d($a3) -/* 0E19E4 0014B2E4 FFFFAF78 */ sd $ra, -0x5088($ra) -/* 0E19E8 0014B2E8 FC15FFFF */ sd $s5, -1($zero) -/* 0E19EC 0014B2EC 2FFD7238 */ sltiu $sp, $ra, 0x7238 -/* 0E19F0 0014B2F0 FC15FFFF */ sd $s5, -1($zero) -/* 0E19F4 0014B2F4 2FFD7238 */ sltiu $sp, $ra, 0x7238 -/* 0E19F8 0014B2F8 FC15FFFF */ sd $s5, -1($zero) -/* 0E19FC 0014B2FC 2FFD7238 */ sltiu $sp, $ra, 0x7238 -/* 0E1A00 0014B300 FC15FFFF */ sd $s5, -1($zero) -/* 0E1A04 0014B304 2FFD7238 */ sltiu $sp, $ra, 0x7238 -/* 0E1A08 0014B308 FC15FE03 */ sd $s5, -0x1fd($zero) -/* 0E1A0C 0014B30C 2FFD7378 */ sltiu $sp, $ra, 0x7378 -/* 0E1A10 0014B310 FC61E4C1 */ sd $at, -0x1b3f($v1) -/* 0E1A14 0014B314 12FC9238 */ beq $s7, $gp, .L0012FBF8 -/* 0E1A18 0014B318 FC61E4C1 */ sd $at, -0x1b3f($v1) -/* 0E1A1C 0014B31C 12FC9238 */ beq $s7, $gp, .L0012FC00 -/* 0E1A20 0014B320 FC61E4C1 */ sd $at, -0x1b3f($v1) -/* 0E1A24 0014B324 12FC9238 */ beq $s7, $gp, .L0012FC08 -/* 0E1A28 0014B328 FC61E4C1 */ sd $at, -0x1b3f($v1) -/* 0E1A2C 0014B32C 12FC9238 */ beq $s7, $gp, .L0012FC10 -/* 0E1A30 0014B330 FC61E4C1 */ sd $at, -0x1b3f($v1) -/* 0E1A34 0014B334 12FC9238 */ beq $s7, $gp, .L0012FC18 -/* 0E1A38 0014B338 FC61FEC3 */ sd $at, -0x13d($v1) -/* 0E1A3C 0014B33C 11FCF279 */ beq $t7, $gp, .L00147D24 -/* 0E1A40 0014B340 FC61FFFF */ sd $at, -1($v1) -/* 0E1A44 0014B344 1FFCF238 */ .byte 0x1f, 0xfc, 0xf2, 0x38 -/* 0E1A48 0014B348 FC61FFFF */ /* 0E1A4C 0014B34C 1FFCF238 */ .byte 0x1f, 0xfc, 0xf2, 0x38 -/* 0E1A50 0014B350 FC61FFFF */ /* 0E1A54 0014B354 1FFCF238 */ .byte 0x1f, 0xfc, 0xf2, 0x38 -/* 0E1A58 0014B358 FC61FE03 */ /* 0E1A5C 0014B35C 1FFCF378 */ .byte 0x1f, 0xfc, 0xf3, 0x78 -/* 0E1A60 0014B360 FC10E228 */ /* 0E1A64 0014B364 40C8A449 */ .byte 0x40, 0xc8, 0xa4, 0x49 -/* 0E1A68 0014B368 FC10E228 */ /* 0E1A6C 0014B36C 40C8A449 */ .byte 0x40, 0xc8, 0xa4, 0x49 -/* 0E1A70 0014B370 FC10E228 */ /* 0E1A74 0014B374 40C8A449 */ .byte 0x40, 0xc8, 0xa4, 0x49 -/* 0E1A78 0014B378 FC10E228 */ /* 0E1A7C 0014B37C 40C8A449 */ .byte 0x40, 0xc8, 0xa4, 0x49 -/* 0E1A80 0014B380 FC10E228 */ /* 0E1A84 0014B384 40C8A449 */ .byte 0x40, 0xc8, 0xa4, 0x49 -/* 0E1A88 0014B388 FC75FEEB */ /* 0E1A8C 0014B38C FFFFFDFE */ sd $ra, -0x202($ra) -/* 0E1A90 0014B390 FC75FEEB */ sd $s5, -0x115($v1) -/* 0E1A94 0014B394 FFFFFDFE */ sd $ra, -0x202($ra) -/* 0E1A98 0014B398 FC75FEEB */ sd $s5, -0x115($v1) -/* 0E1A9C 0014B39C FFFFFDFE */ sd $ra, -0x202($ra) -/* 0E1AA0 0014B3A0 FC75FEEB */ sd $s5, -0x115($v1) -/* 0E1AA4 0014B3A4 FFFFFDFE */ sd $ra, -0x202($ra) -/* 0E1AA8 0014B3A8 FC75FEEB */ sd $s5, -0x115($v1) -/* 0E1AAC 0014B3AC FFFFFDFE */ sd $ra, -0x202($ra) -/* 0E1AB0 0014B3B0 FC75FEEB */ sd $s5, -0x115($v1) -/* 0E1AB4 0014B3B4 FFFFFDFE */ sd $ra, -0x202($ra) -/* 0E1AB8 0014B3B8 FC75FEEB */ sd $s5, -0x115($v1) -/* 0E1ABC 0014B3BC FFFFFDFE */ sd $ra, -0x202($ra) -/* 0E1AC0 0014B3C0 FC75FEEB */ sd $s5, -0x115($v1) -/* 0E1AC4 0014B3C4 FFFFFDFE */ sd $ra, -0x202($ra) -/* 0E1AC8 0014B3C8 FC75FEEB */ sd $s5, -0x115($v1) -/* 0E1ACC 0014B3CC FFFFFDFE */ sd $ra, -0x202($ra) -/* 0E1AD0 0014B3D0 FC75FEEB */ sd $s5, -0x115($v1) -/* 0E1AD4 0014B3D4 FFFFFDFE */ sd $ra, -0x202($ra) -/* 0E1AD8 0014B3D8 FC75FEEB */ sd $s5, -0x115($v1) -/* 0E1ADC 0014B3DC FFFFFDFE */ sd $ra, -0x202($ra) -/* 0E1AE0 0014B3E0 FC75FEEB */ sd $s5, -0x115($v1) -/* 0E1AE4 0014B3E4 FFFFFDFE */ sd $ra, -0x202($ra) -/* 0E1AE8 0014B3E8 FC75FEEB */ sd $s5, -0x115($v1) -/* 0E1AEC 0014B3EC FFFFFDFE */ sd $ra, -0x202($ra) -/* 0E1AF0 0014B3F0 FC75FEEB */ sd $s5, -0x115($v1) -/* 0E1AF4 0014B3F4 FFFFFDFE */ sd $ra, -0x202($ra) -/* 0E1AF8 0014B3F8 FC75FEEB */ sd $s5, -0x115($v1) -/* 0E1AFC 0014B3FC FFFFFDFE */ sd $ra, -0x202($ra) -/* 0E1B00 0014B400 FCFFFFFF */ sd $ra, -1($a3) -/* 0E1B04 0014B404 FFFE793C */ sd $fp, 0x793c($ra) -/* 0E1B08 0014B408 FCFFFFFF */ sd $ra, -1($a3) -/* 0E1B0C 0014B40C FFFE7838 */ sd $fp, 0x7838($ra) -/* 0E1B10 0014B410 FCFFFFFF */ sd $ra, -1($a3) -/* 0E1B14 0014B414 FFFE7838 */ sd $fp, 0x7838($ra) -/* 0E1B18 0014B418 FC457FFF */ sd $a1, 0x7fff($v0) -/* 0E1B1C 0014B41C FFFDF838 */ sd $sp, -0x7c8($ra) -/* 0E1B20 0014B420 FC41FFFF */ sd $at, -1($v0) -/* 0E1B24 0014B424 FFFEF838 */ sd $fp, -0x7c8($ra) -/* 0E1B28 0014B428 FC127E24 */ sd $s2, 0x7e24($zero) -/* 0E1B2C 0014B42C FFFFF3F9 */ sd $ra, -0xc07($ra) -/* 0E1B30 0014B430 FC127FFF */ sd $s2, 0x7fff($zero) -/* 0E1B34 0014B434 FFFFF238 */ sd $ra, -0xdc8($ra) -/* 0E1B38 0014B438 FC127FFF */ sd $s2, 0x7fff($zero) -/* 0E1B3C 0014B43C FFFFF238 */ sd $ra, -0xdc8($ra) -/* 0E1B40 0014B440 FC127E0A */ sd $s2, 0x7e0a($zero) -/* 0E1B44 0014B444 F3FFF238 */ scd $ra, -0xdc8($ra) -/* 0E1B48 0014B448 FC127E03 */ sd $s2, 0x7e03($zero) -/* 0E1B4C 0014B44C FFFFF378 */ sd $ra, -0xc88($ra) -/* 0E1B50 0014B450 FC147E28 */ sd $s4, 0x7e28($zero) -/* 0E1B54 0014B454 44FE793C */ .byte 0x44, 0xfe, 0x79, 0x3c -/* 0E1B58 0014B458 FC147FFF */ /* 0E1B5C 0014B45C 4FFE7838 */ .byte 0x4F,0xFE,0x78,0x38 /* Because of invalid n64 opcode nmsub.s */ -/* 0E1B60 0014B460 FC147FFF */ /* 0E1B64 0014B464 4FFE7838 */ .byte 0x4F,0xFE,0x78,0x38 /* Because of invalid n64 opcode nmsub.s */ -/* 0E1B68 0014B468 FC147E0A */ /* 0E1B6C 0014B46C 4FFE72F8 */ .byte 0x4F,0xFE,0x72,0xF8 /* Because of invalid n64 opcode nmsub.s */ -/* 0E1B70 0014B470 FC147E03 */ /* 0E1B74 0014B474 4FFE7978 */ .byte 0x4F,0xFE,0x79,0x78 /* Because of invalid n64 opcode nmsub.s */ -/* 0E1B78 0014B478 FCFFFFFF */ /* 0E1B7C 0014B47C FFFCF279 */ sd $gp, -0xd87($ra) -/* 0E1B80 0014B480 FCFFFFFF */ sd $ra, -1($a3) -/* 0E1B84 0014B484 FFFCF238 */ sd $gp, -0xdc8($ra) -/* 0E1B88 0014B488 FCFFFFFF */ sd $ra, -1($a3) -/* 0E1B8C 0014B48C FFFCF238 */ sd $gp, -0xdc8($ra) -/* 0E1B90 0014B490 FC157FFF */ sd $s5, 0x7fff($zero) -/* 0E1B94 0014B494 FFFDF238 */ sd $sp, -0xdc8($ra) -/* 0E1B98 0014B498 FCFFFE03 */ sd $ra, -0x1fd($a3) -/* 0E1B9C 0014B49C FFFCF378 */ sd $gp, -0xc88($ra) -/* 0E1BA0 0014B4A0 FC26A004 */ sd $a2, -0x5ffc($at) -/* 0E1BA4 0014B4A4 1FFC93FC */ .byte 0x1f, 0xfc, 0x93, 0xfc -/* 0E1BA8 0014B4A8 FC26A004 */ /* 0E1BAC 0014B4AC 1FFC93F8 */ .byte 0x1f, 0xfc, 0x93, 0xf8 -/* 0E1BB0 0014B4B0 FC26A004 */ /* 0E1BB4 0014B4B4 1FFC93FC */ .byte 0x1f, 0xfc, 0x93, 0xfc -/* 0E1BB8 0014B4B8 FC26A004 */ /* 0E1BBC 0014B4BC 1FFC92F8 */ .byte 0x1f, 0xfc, 0x92, 0xf8 -/* 0E1BC0 0014B4C0 FC26A003 */ /* 0E1BC4 0014B4C4 1FFC9378 */ .byte 0x1f, 0xfc, 0x93, 0x78 -/* 0E1BC8 0014B4C8 FC26A004 */ /* 0E1BCC 0014B4CC 1F1093FF */ .byte 0x1f, 0x10, 0x93, 0xff -/* 0E1BD0 0014B4D0 FC26A004 */ /* 0E1BD4 0014B4D4 1FFC93F8 */ .byte 0x1f, 0xfc, 0x93, 0xf8 -/* 0E1BD8 0014B4D8 FC26A004 */ /* 0E1BDC 0014B4DC 1F1093FF */ .byte 0x1f, 0x10, 0x93, 0xff -/* 0E1BE0 0014B4E0 FC26A004 */ /* 0E1BE4 0014B4E4 1FFC92F8 */ .byte 0x1f, 0xfc, 0x92, 0xf8 -/* 0E1BE8 0014B4E8 FC26A003 */ /* 0E1BEC 0014B4EC 1FFC9378 */ .byte 0x1f, 0xfc, 0x93, 0x78 -/* 0E1BF0 0014B4F0 FC26A004 */ /* 0E1BF4 0014B4F4 1F1093FF */ .byte 0x1f, 0x10, 0x93, 0xff -/* 0E1BF8 0014B4F8 FC26A004 */ /* 0E1BFC 0014B4FC 1FFC93F8 */ .byte 0x1f, 0xfc, 0x93, 0xf8 -/* 0E1C00 0014B500 FC26A004 */ /* 0E1C04 0014B504 1F1093FF */ .byte 0x1f, 0x10, 0x93, 0xff -/* 0E1C08 0014B508 FC26A004 */ /* 0E1C0C 0014B50C 1FFC92F8 */ .byte 0x1f, 0xfc, 0x92, 0xf8 -/* 0E1C10 0014B510 FC26A003 */ /* 0E1C14 0014B514 1FFC9378 */ .byte 0x1f, 0xfc, 0x93, 0x78 -/* 0E1C18 0014B518 FC20A204 */ /* 0E1C1C 0014B51C FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1C20 0014B520 FC111404 */ sd $s1, 0x1404($zero) -/* 0E1C24 0014B524 FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1C28 0014B528 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1C2C 0014B52C FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1C30 0014B530 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1C34 0014B534 FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1C38 0014B538 FC20A203 */ sd $zero, -0x5dfd($at) -/* 0E1C3C 0014B53C FF13FF7F */ sd $s3, -0x81($t8) -/* 0E1C40 0014B540 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1C44 0014B544 FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1C48 0014B548 FC111404 */ sd $s1, 0x1404($zero) -/* 0E1C4C 0014B54C FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1C50 0014B550 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1C54 0014B554 FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1C58 0014B558 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1C5C 0014B55C FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1C60 0014B560 FC20A203 */ sd $zero, -0x5dfd($at) -/* 0E1C64 0014B564 FFFFFF78 */ sd $ra, -0x88($ra) -/* 0E1C68 0014B568 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1C6C 0014B56C FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1C70 0014B570 FC111404 */ sd $s1, 0x1404($zero) -/* 0E1C74 0014B574 FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1C78 0014B578 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1C7C 0014B57C FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1C80 0014B580 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1C84 0014B584 FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1C88 0014B588 FC20A203 */ sd $zero, -0x5dfd($at) -/* 0E1C8C 0014B58C FFFFFF78 */ sd $ra, -0x88($ra) -/* 0E1C90 0014B590 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1C94 0014B594 FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1C98 0014B598 FC111404 */ sd $s1, 0x1404($zero) -/* 0E1C9C 0014B59C FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1CA0 0014B5A0 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1CA4 0014B5A4 FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1CA8 0014B5A8 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1CAC 0014B5AC FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1CB0 0014B5B0 FC20A203 */ sd $zero, -0x5dfd($at) -/* 0E1CB4 0014B5B4 FFFFFF78 */ sd $ra, -0x88($ra) -/* 0E1CB8 0014B5B8 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1CBC 0014B5BC FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1CC0 0014B5C0 FC111404 */ sd $s1, 0x1404($zero) -/* 0E1CC4 0014B5C4 FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1CC8 0014B5C8 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1CCC 0014B5CC FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1CD0 0014B5D0 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1CD4 0014B5D4 FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1CD8 0014B5D8 FC20A203 */ sd $zero, -0x5dfd($at) -/* 0E1CDC 0014B5DC FFFFFF78 */ sd $ra, -0x88($ra) -/* 0E1CE0 0014B5E0 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1CE4 0014B5E4 FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1CE8 0014B5E8 FC111404 */ sd $s1, 0x1404($zero) -/* 0E1CEC 0014B5EC FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1CF0 0014B5F0 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1CF4 0014B5F4 FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1CF8 0014B5F8 FC20A204 */ sd $zero, -0x5dfc($at) -/* 0E1CFC 0014B5FC FFFFFFF8 */ sd $ra, -8($ra) -/* 0E1D00 0014B600 FC20A203 */ sd $zero, -0x5dfd($at) -/* 0E1D04 0014B604 FFFFFF78 */ sd $ra, -0x88($ra) -/* 0E1D08 0014B608 FCFF99FF */ sd $ra, -0x6601($a3) -/* 0E1D0C 0014B60C FFFFAF38 */ sd $ra, -0x50c8($ra) -/* 0E1D10 0014B610 FCFF99FF */ sd $ra, -0x6601($a3) -/* 0E1D14 0014B614 FFFFAF38 */ sd $ra, -0x50c8($ra) -/* 0E1D18 0014B618 FCFF99FF */ sd $ra, -0x6601($a3) -/* 0E1D1C 0014B61C FFFFAF38 */ sd $ra, -0x50c8($ra) -/* 0E1D20 0014B620 FCFF99FF */ sd $ra, -0x6601($a3) -/* 0E1D24 0014B624 FFFFAF38 */ sd $ra, -0x50c8($ra) -/* 0E1D28 0014B628 FCFF9883 */ sd $ra, -0x677d($a3) -/* 0E1D2C 0014B62C FFFFAF78 */ sd $ra, -0x5088($ra) -/* 0E1D30 0014B630 FC15FFFF */ sd $s5, -1($zero) -/* 0E1D34 0014B634 2FFD7238 */ sltiu $sp, $ra, 0x7238 -/* 0E1D38 0014B638 FC15FFFF */ sd $s5, -1($zero) -/* 0E1D3C 0014B63C 2FFD7238 */ sltiu $sp, $ra, 0x7238 -/* 0E1D40 0014B640 FC15FFFF */ sd $s5, -1($zero) -/* 0E1D44 0014B644 2FFD7238 */ sltiu $sp, $ra, 0x7238 -/* 0E1D48 0014B648 FC15FFFF */ sd $s5, -1($zero) -/* 0E1D4C 0014B64C 2FFD7238 */ sltiu $sp, $ra, 0x7238 -/* 0E1D50 0014B650 FC15FE03 */ sd $s5, -0x1fd($zero) -/* 0E1D54 0014B654 2FFD7378 */ sltiu $sp, $ra, 0x7378 -/* 0E1D58 0014B658 FC61E4C1 */ sd $at, -0x1b3f($v1) -/* 0E1D5C 0014B65C 12FC9238 */ beq $s7, $gp, .L0012FF40 -/* 0E1D60 0014B660 FC61E4C1 */ sd $at, -0x1b3f($v1) -/* 0E1D64 0014B664 12FC9238 */ beq $s7, $gp, .L0012FF48 -/* 0E1D68 0014B668 FC61E4C1 */ sd $at, -0x1b3f($v1) -/* 0E1D6C 0014B66C 12FC9238 */ beq $s7, $gp, .L0012FF50 -/* 0E1D70 0014B670 FC61E4C1 */ sd $at, -0x1b3f($v1) -/* 0E1D74 0014B674 12FC9238 */ beq $s7, $gp, .L0012FF58 -/* 0E1D78 0014B678 FC61E4C1 */ sd $at, -0x1b3f($v1) -/* 0E1D7C 0014B67C 12FC9238 */ beq $s7, $gp, .L0012FF60 -/* 0E1D80 0014B680 FC61FEC3 */ sd $at, -0x13d($v1) -/* 0E1D84 0014B684 11FCF279 */ beq $t7, $gp, .L0014806C -/* 0E1D88 0014B688 FC61FFFF */ sd $at, -1($v1) -/* 0E1D8C 0014B68C 1FFCF238 */ .byte 0x1f, 0xfc, 0xf2, 0x38 -/* 0E1D90 0014B690 FC61FFFF */ /* 0E1D94 0014B694 1FFCF238 */ .byte 0x1f, 0xfc, 0xf2, 0x38 -/* 0E1D98 0014B698 FC61FFFF */ /* 0E1D9C 0014B69C 1FFCF238 */ .byte 0x1f, 0xfc, 0xf2, 0x38 -/* 0E1DA0 0014B6A0 FC61FE03 */ /* 0E1DA4 0014B6A4 1FFCF378 */ .byte 0x1f, 0xfc, 0xf3, 0x78 -/* 0E1DA8 0014B6A8 FC10E228 */ /* 0E1DAC 0014B6AC 40C8A449 */ .byte 0x40, 0xc8, 0xa4, 0x49 -/* 0E1DB0 0014B6B0 FC10E228 */ /* 0E1DB4 0014B6B4 40C8A449 */ .byte 0x40, 0xc8, 0xa4, 0x49 -/* 0E1DB8 0014B6B8 FC10E228 */ /* 0E1DBC 0014B6BC 40C8A449 */ .byte 0x40, 0xc8, 0xa4, 0x49 -/* 0E1DC0 0014B6C0 FC10E228 */ /* 0E1DC4 0014B6C4 40C8A449 */ .byte 0x40, 0xc8, 0xa4, 0x49 -/* 0E1DC8 0014B6C8 FC10E228 */ /* 0E1DCC 0014B6CC 40C8A449 */ .byte 0x40, 0xc8, 0xa4, 0x49 diff --git a/papermario/asm/CODE_e20eb0_len_9c0.s b/papermario/asm/CODE_e20eb0_len_9c0.s index bcc27a0e2e..0271733fae 100644 --- a/papermario/asm/CODE_e20eb0_len_9c0.s +++ b/papermario/asm/CODE_e20eb0_len_9c0.s @@ -479,157 +479,3 @@ func_002B76F8: /* E215B8 002B7708 00000000 */ nop /* E215BC 002B770C 00000000 */ nop -/* E215C0 002B7710 00000000 */ nop -/* E215C4 002B7714 00000000 */ nop -/* E215C8 002B7718 00000000 */ nop -/* E215CC 002B771C 00000000 */ nop -/* E215D0 002B7720 00000000 */ nop -/* E215D4 002B7724 00000000 */ nop -/* E215D8 002B7728 00000000 */ nop -/* E215DC 002B772C 00000000 */ nop -/* E215E0 002B7730 00000000 */ nop -/* E215E4 002B7734 00111111 */ .byte 0x00, 0x11, 0x11, 0x11 -/* E215E8 002B7738 11111100 */ /* E215EC 002B773C 00000000 */ nop -/* E215F0 002B7740 00000000 */ nop -/* E215F4 002B7744 11111111 */ beq $t0, $s1, .L002BBB8C -/* E215F8 002B7748 11111111 */ beq $t0, $s1, .L002BBB90 -/* E215FC 002B774C 00000000 */ nop -/* E21600 002B7750 00000011 */ mthi $zero -/* E21604 002B7754 11345222 */ beq $t1, $s4, .L002CBFE0 -/* E21608 002B7758 22254311 */ addi $a1, $s1, 0x4311 -/* E2160C 002B775C 11000000 */ beqz $t0, .L002B7760 -.L002B7760: -/* E21610 002B7760 00000111 */ .byte 0x00, 0x00, 0x01, 0x11 -/* E21614 002B7764 45222222 */ /* E21618 002B7768 22222254 */ /* E2161C 002B776C 11100000 */ beq $t0, $s0, .L002B7770 -.L002B7770: -/* E21620 002B7770 00001135 */ .byte 0x00, 0x00, 0x11, 0x35 -/* E21624 002B7774 22222222 */ /* E21628 002B7778 22222222 */ addi $v0, $s1, 0x2222 -/* E2162C 002B777C 53110000 */ beql $t8, $s1, .L002B7780 -.L002B7780: -/* E21630 002B7780 00011342 */ srl $v0, $at, 0xd -/* E21634 002B7784 22222222 */ addi $v0, $s1, 0x2222 -/* E21638 002B7788 22222222 */ addi $v0, $s1, 0x2222 -/* E2163C 002B778C 24311000 */ addiu $s1, $at, 0x1000 -/* E21640 002B7790 00113422 */ .byte 0x00, 0x11, 0x34, 0x22 -/* E21644 002B7794 22222222 */ /* E21648 002B7798 22222222 */ addi $v0, $s1, 0x2222 -/* E2164C 002B779C 22431100 */ addi $v1, $s2, 0x1100 -/* E21650 002B77A0 00115222 */ .byte 0x00, 0x11, 0x52, 0x22 -/* E21654 002B77A4 22222222 */ /* E21658 002B77A8 22222222 */ addi $v0, $s1, 0x2222 -/* E2165C 002B77AC 22241100 */ addi $a0, $s1, 0x1100 -/* E21660 002B77B0 01132222 */ .byte 0x01, 0x13, 0x22, 0x22 -/* E21664 002B77B4 22222222 */ /* E21668 002B77B8 22222222 */ addi $v0, $s1, 0x2222 -/* E2166C 002B77BC 22223110 */ addi $v0, $s1, 0x3110 -/* E21670 002B77C0 01142225 */ .byte 0x01, 0x14, 0x22, 0x25 -/* E21674 002B77C4 52222225 */ /* E21678 002B77C8 52222225 */ beql $s1, $v0, .L002C0060 -/* E2167C 002B77CC 52224110 */ beql $s1, $v0, .L002C7C10 -/* E21680 002B77D0 01142241 */ .byte 0x01, 0x14, 0x22, 0x41 -/* E21684 002B77D4 14222241 */ /* E21688 002B77D8 14222241 */ bne $at, $v0, .L002C00E0 -/* E2168C 002B77DC 14224110 */ bne $at, $v0, .L002C7C20 -/* E21690 002B77E0 01142231 */ tgeu $t0, $s4, 0x88 -/* E21694 002B77E4 13222231 */ beq $t9, $v0, .L002C00AC -/* E21698 002B77E8 13222231 */ beq $t9, $v0, .L002C00B0 -/* E2169C 002B77EC 13224110 */ beq $t9, $v0, .L002C7C30 -/* E216A0 002B77F0 01142241 */ .byte 0x01, 0x14, 0x22, 0x41 -/* E216A4 002B77F4 14222241 */ /* E216A8 002B77F8 14222241 */ bne $at, $v0, .L002C0100 -/* E216AC 002B77FC 14224110 */ bne $at, $v0, .L002C7C40 -/* E216B0 002B7800 01142225 */ .byte 0x01, 0x14, 0x22, 0x25 -/* E216B4 002B7804 52222225 */ /* E216B8 002B7808 52222225 */ beql $s1, $v0, .L002C00A0 -/* E216BC 002B780C 52224110 */ beql $s1, $v0, .L002C7C50 -/* E216C0 002B7810 01134222 */ .byte 0x01, 0x13, 0x42, 0x22 -/* E216C4 002B7814 22222222 */ /* E216C8 002B7818 22222222 */ addi $v0, $s1, 0x2222 -/* E216CC 002B781C 22243110 */ addi $a0, $s1, 0x3110 -/* E216D0 002B7820 00113422 */ .byte 0x00, 0x11, 0x34, 0x22 -/* E216D4 002B7824 22222222 */ /* E216D8 002B7828 22222222 */ addi $v0, $s1, 0x2222 -/* E216DC 002B782C 22431100 */ addi $v1, $s2, 0x1100 -/* E216E0 002B7830 00111342 */ srl $v0, $s1, 0xd -/* E216E4 002B7834 22222222 */ addi $v0, $s1, 0x2222 -/* E216E8 002B7838 22222222 */ addi $v0, $s1, 0x2222 -/* E216EC 002B783C 24311100 */ addiu $s1, $at, 0x1100 -/* E216F0 002B7840 00011114 */ .byte 0x00, 0x01, 0x11, 0x14 -/* E216F4 002B7844 52222222 */ /* E216F8 002B7848 22222225 */ addi $v0, $s1, 0x2225 -/* E216FC 002B784C 41111000 */ .byte 0x41,0x11,0x10,0x00 /* Because of invalid n64 opcode bc0t */ -/* E21700 002B7850 00001111 */ /* E21704 002B7854 14522222 */ /* E21708 002B7858 22222541 */ addi $v0, $s1, 0x2541 -/* E2170C 002B785C 11110000 */ beq $t0, $s1, .L002B7860 -.L002B7860: -/* E21710 002B7860 00000011 */ mthi $zero -/* E21714 002B7864 11152222 */ beq $t0, $s5, .L002C00F0 -/* E21718 002B7868 22225111 */ addi $v0, $s1, 0x5111 -/* E2171C 002B786C 11000000 */ beqz $t0, .L002B7870 -.L002B7870: -/* E21720 002B7870 00000000 */ nop -/* E21724 002B7874 11111522 */ beq $t0, $s1, .L002BCD00 -/* E21728 002B7878 22211111 */ addi $at, $s1, 0x1111 -/* E2172C 002B787C 00000000 */ nop -/* E21730 002B7880 00000000 */ nop -/* E21734 002B7884 00111122 */ .byte 0x00, 0x11, 0x11, 0x22 -/* E21738 002B7888 22111100 */ /* E2173C 002B788C 00000000 */ nop -/* E21740 002B7890 00000000 */ nop -/* E21744 002B7894 00001152 */ .byte 0x00, 0x00, 0x11, 0x52 -/* E21748 002B7898 25110000 */ /* E2174C 002B789C 00000000 */ nop -/* E21750 002B78A0 00000000 */ nop -/* E21754 002B78A4 00001112 */ .byte 0x00, 0x00, 0x11, 0x12 -/* E21758 002B78A8 21110000 */ /* E2175C 002B78AC 00000000 */ nop -/* E21760 002B78B0 00000000 */ nop -/* E21764 002B78B4 00000115 */ .byte 0x00, 0x00, 0x01, 0x15 -/* E21768 002B78B8 51100000 */ .L002B78BC: -/* E2176C 002B78BC 00000000 */ nop -/* E21770 002B78C0 00000000 */ nop -/* E21774 002B78C4 00000113 */ .byte 0x00, 0x00, 0x01, 0x13 -/* E21778 002B78C8 31100000 */ /* E2177C 002B78CC 00000000 */ nop -/* E21780 002B78D0 00000000 */ nop -/* E21784 002B78D4 00000011 */ mthi $zero -/* E21788 002B78D8 11000000 */ beqz $t0, .L002B78DC -.L002B78DC: -/* E2178C 002B78DC 00000000 */ nop -/* E21790 002B78E0 00000000 */ nop -/* E21794 002B78E4 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ -/* E21798 002B78E8 10000000 */ .L002B78EC: -/* E2179C 002B78EC 00000000 */ nop -/* E217A0 002B78F0 00000000 */ nop -/* E217A4 002B78F4 00000000 */ nop -/* E217A8 002B78F8 00000000 */ nop -/* E217AC 002B78FC 00000000 */ nop -/* E217B0 002B7900 00000000 */ nop -/* E217B4 002B7904 00000000 */ nop -/* E217B8 002B7908 00000000 */ nop -/* E217BC 002B790C 00000000 */ nop -/* E217C0 002B7910 294A0001 */ slti $t2, $t2, 1 -/* E217C4 002B7914 FFFF5AD7 */ sd $ra, 0x5ad7($ra) -/* E217C8 002B7918 AD6BC631 */ sw $t3, -0x39cf($t3) -/* E217CC 002B791C F561F49F */ sdc1 $f1, -0xb61($t3) -/* E217D0 002B7920 EBED88D7 */ .byte 0xEB,0xED,0x88,0xD7 /* Because of invalid n64 opcode bbit1 */ -/* E217D4 002B7924 EBE1ED6D */ .byte 0xEB,0xE1,0xED,0x6D /* Because of invalid n64 opcode bbit1 */ -/* E217D8 002B7928 F669F72F */ /* E217DC 002B792C 00010001 */ .byte 0x00,0x01,0x00,0x01 /* Because of invalid n64 opcode movt */ -/* E217E0 002B7930 E7000000 */ /* E217E4 002B7934 00000000 */ nop -/* E217E8 002B7938 E3000A01 */ sc $zero, 0xa01($t8) -/* E217EC 002B793C 00000000 */ nop -/* E217F0 002B7940 D9C0F9FB */ .byte 0xD9,0xC0,0xF9,0xFB /* Because of invalid n64 opcode bbit032 */ -/* E217F4 002B7944 00000000 */ .L002B7948: -/* E217F8 002B7948 D9FFFFFF */ .byte 0xD9,0xFF,0xFF,0xFF /* Because of invalid n64 opcode bbit032 */ -/* E217FC 002B794C 00200005 */ .byte 0x00,0x20,0x00,0x05 /* Because of invalid n64 opcode lsa */ -/* E21800 002B7950 D7000002 */ /* E21804 002B7954 FFFFFFFF */ sd $ra, -1($ra) -/* E21808 002B7958 E3000F00 */ sc $zero, 0xf00($t8) -/* E2180C 002B795C 00000000 */ nop -/* E21810 002B7960 E3001001 */ sc $zero, 0x1001($t8) -/* E21814 002B7964 00008000 */ sll $s0, $zero, 0 -/* E21818 002B7968 E3000C00 */ sc $zero, 0xc00($t8) -/* E2181C 002B796C 00080000 */ sll $zero, $t0, 0 -/* E21820 002B7970 E3001201 */ sc $zero, 0x1201($t8) -/* E21824 002B7974 00002000 */ sll $a0, $zero, 0 -/* E21828 002B7978 E3001801 */ sc $zero, 0x1801($t8) -/* E2182C 002B797C 000000C0 */ ehb -/* E21830 002B7980 E3000D01 */ sc $zero, 0xd01($t8) -/* E21834 002B7984 00000000 */ nop -/* E21838 002B7988 E3001402 */ sc $zero, 0x1402($t8) -/* E2183C 002B798C 00000C00 */ sll $at, $zero, 0x10 -/* E21840 002B7990 E3001700 */ sc $zero, 0x1700($t8) -/* E21844 002B7994 00000000 */ nop -/* E21848 002B7998 E2001E01 */ sc $zero, 0x1e01($s0) -/* E2184C 002B799C 00000000 */ nop -/* E21850 002B79A0 DF000000 */ ld $zero, ($t8) -/* E21854 002B79A4 00000000 */ nop -/* E21858 002B79A8 802B79C0 */ lb $t3, 0x79c0($at) -/* E2185C 002B79AC 00000000 */ nop -/* E21860 002B79B0 3FA99999 */ .byte 0x3f, 0xa9, 0x99, 0x99 -/* E21864 002B79B4 9999999A */ /* E21868 002B79B8 3FE19999 */ .byte 0x3f, 0xe1, 0x99, 0x99 -/* E2186C 002B79BC 9999999A */ \ No newline at end of file diff --git a/papermario/asm/CODE_e23260_len_480.s b/papermario/asm/CODE_e23260_len_480.s index 89cad40a06..6939f2b8ca 100644 --- a/papermario/asm/CODE_e23260_len_480.s +++ b/papermario/asm/CODE_e23260_len_480.s @@ -45,7 +45,7 @@ .L002B609C: /* E232FC 002B609C 30820001 */ andi $v0, $a0, 1 -/* E23300 002B60A0 54400004 */ bnel $v0, $zero, .L002B60B4 +/* E23300 002B60A0 54400004 */ bnezl $v0, .L002B60B4 /* E23304 002B60A4 3C040006 */ lui $a0, 6 /* E23308 002B60A8 3C040001 */ lui $a0, (0x00010007 >> 16) # lui $a0, 1 /* E2330C 002B60AC 080AD832 */ j func_002B60C8 diff --git a/papermario/asm/CODE_e79b0_len_2000.s b/papermario/asm/CODE_e79b0_len_2000.s index 99408f1416..04d179b6d6 100644 --- a/papermario/asm/CODE_e79b0_len_2000.s +++ b/papermario/asm/CODE_e79b0_len_2000.s @@ -584,7 +584,7 @@ func_002C37C8: /* 0E81C4 002C3814 24840004 */ addiu $a0, $a0, 4 /* 0E81C8 002C3818 28620080 */ slti $v0, $v1, 0x80 .L002C381C: -/* 0E81CC 002C381C 54400003 */ bnel $v0, $zero, .L002C382C +/* 0E81CC 002C381C 54400003 */ bnezl $v0, .L002C382C /* 0E81D0 002C3820 24040168 */ li $a0, 360 func_002C3824: /* 0E81D4 002C3824 080B0E09 */ j func_002C3824 @@ -738,7 +738,7 @@ func_002C39F8: /* 0E83F4 002C3A44 24840004 */ addiu $a0, $a0, 4 /* 0E83F8 002C3A48 28620080 */ slti $v0, $v1, 0x80 .L002C3A4C: -/* 0E83FC 002C3A4C 54400003 */ bnel $v0, $zero, .L002C3A5C +/* 0E83FC 002C3A4C 54400003 */ bnezl $v0, .L002C3A5C /* 0E8400 002C3A50 24040168 */ li $a0, 360 func_002C3A54: /* 0E8404 002C3A54 080B0E95 */ j func_002C3A54 @@ -1006,7 +1006,7 @@ func_002C3D04: /* 0E87D8 002C3E28 5040001B */ beql $v0, $zero, .L002C3E98 /* 0E87DC 002C3E2C 26940004 */ addiu $s4, $s4, 4 /* 0E87E0 002C3E30 30420092 */ andi $v0, $v0, 0x92 -/* 0E87E4 002C3E34 54400018 */ bnel $v0, $zero, .L002C3E98 +/* 0E87E4 002C3E34 54400018 */ bnezl $v0, .L002C3E98 /* 0E87E8 002C3E38 26940004 */ addiu $s4, $s4, 4 /* 0E87EC 002C3E3C C6020154 */ lwc1 $f2, 0x154($s0) /* 0E87F0 002C3E40 C6000150 */ lwc1 $f0, 0x150($s0) diff --git a/papermario/asm/CODE_e99b0_len_2000.s b/papermario/asm/CODE_e99b0_len_2000.s index f669132f24..77cf71c6c0 100644 --- a/papermario/asm/CODE_e99b0_len_2000.s +++ b/papermario/asm/CODE_e99b0_len_2000.s @@ -136,7 +136,7 @@ func_002C5168: /* 0E9B58 002C51A8 AE220008 */ sw $v0, 8($s1) .L002C51AC: -/* 0E9B5C 002C51AC 54400004 */ bnel $v0, $zero, .L002C51C0 +/* 0E9B5C 002C51AC 54400004 */ bnezl $v0, .L002C51C0 /* 0E9B60 002C51B0 A0800110 */ sb $zero, 0x110($a0) /* 0E9B64 002C51B4 0C0B2298 */ jal func_002C8A60 /* 0E9B68 002C51B8 0220202D */ move $a0, $s1 @@ -226,7 +226,7 @@ func_002C5288: /* 0E9C78 002C52C8 AE220008 */ sw $v0, 8($s1) .L002C52CC: -/* 0E9C7C 002C52CC 54400004 */ bnel $v0, $zero, .L002C52E0 +/* 0E9C7C 002C52CC 54400004 */ bnezl $v0, .L002C52E0 /* 0E9C80 002C52D0 A0800110 */ sb $zero, 0x110($a0) /* 0E9C84 002C52D4 0C0B2298 */ jal func_002C8A60 /* 0E9C88 002C52D8 0220202D */ move $a0, $s1 @@ -399,7 +399,7 @@ func_002C54BC: /* 0E9E9C 002C54EC AE020008 */ sw $v0, 8($s0) .L002C54F0: -/* 0E9EA0 002C54F0 54400004 */ bnel $v0, $zero, .L002C5504 +/* 0E9EA0 002C54F0 54400004 */ bnezl $v0, .L002C5504 /* 0E9EA4 002C54F4 A0A00110 */ sb $zero, 0x110($a1) /* 0E9EA8 002C54F8 0C0B2298 */ jal func_002C8A60 /* 0E9EAC 002C54FC 0200202D */ move $a0, $s0 diff --git a/papermario/asm/CODE_eb9b0_len_2000.s b/papermario/asm/CODE_eb9b0_len_2000.s index 5162a714e6..988b1768d5 100644 --- a/papermario/asm/CODE_eb9b0_len_2000.s +++ b/papermario/asm/CODE_eb9b0_len_2000.s @@ -1077,7 +1077,7 @@ func_002C7DA8: /* 0EC790 002C7DE0 3C02F414 */ lui $v0, (0xF4143E00 >> 16) # lui $v0, 0xf414 /* 0EC794 002C7DE4 34423E00 */ ori $v0, (0xF4143E00 & 0xFFFF) # ori $v0, $v0, 0x3e00 /* 0EC798 002C7DE8 0045102A */ slt $v0, $v0, $a1 -/* 0EC79C 002C7DEC 54400005 */ bnel $v0, $zero, .L002C7E04 +/* 0EC79C 002C7DEC 54400005 */ bnezl $v0, .L002C7E04 /* 0EC7A0 002C7DF0 3C02F545 */ lui $v0, 0xf545 /* 0EC7A4 002C7DF4 3C020C84 */ lui $v0, (0x0C845880 >> 16) # lui $v0, 0xc84 /* 0EC7A8 002C7DF8 34425880 */ ori $v0, (0x0C845880 & 0xFFFF) # ori $v0, $v0, 0x5880 @@ -1087,7 +1087,7 @@ func_002C7DA8: .L002C7E04: /* 0EC7B4 002C7E04 34426B00 */ ori $v0, $v0, 0x6b00 /* 0EC7B8 002C7E08 0045102A */ slt $v0, $v0, $a1 -/* 0EC7BC 002C7E0C 54400005 */ bnel $v0, $zero, .L002C7E24 +/* 0EC7BC 002C7E0C 54400005 */ bnezl $v0, .L002C7E24 /* 0EC7C0 002C7E10 3C02F676 */ lui $v0, 0xf676 /* 0EC7C4 002C7E14 3C020B53 */ lui $v0, (0x0B532B80 >> 16) # lui $v0, 0xb53 /* 0EC7C8 002C7E18 34422B80 */ ori $v0, (0x0B532B80 & 0xFFFF) # ori $v0, $v0, 0x2b80 @@ -1097,7 +1097,7 @@ func_002C7DA8: .L002C7E24: /* 0EC7D4 002C7E24 34429800 */ ori $v0, $v0, 0x9800 /* 0EC7D8 002C7E28 0045102A */ slt $v0, $v0, $a1 -/* 0EC7DC 002C7E2C 54400005 */ bnel $v0, $zero, .L002C7E44 +/* 0EC7DC 002C7E2C 54400005 */ bnezl $v0, .L002C7E44 /* 0EC7E0 002C7E30 3C02F7A7 */ lui $v0, 0xf7a7 /* 0EC7E4 002C7E34 3C020A21 */ lui $v0, (0x0A21FE80 >> 16) # lui $v0, 0xa21 /* 0EC7E8 002C7E38 3442FE80 */ ori $v0, (0x0A21FE80 & 0xFFFF) # ori $v0, $v0, 0xfe80 @@ -1107,7 +1107,7 @@ func_002C7DA8: .L002C7E44: /* 0EC7F4 002C7E44 3442C500 */ ori $v0, $v0, 0xc500 /* 0EC7F8 002C7E48 0045102A */ slt $v0, $v0, $a1 -/* 0EC7FC 002C7E4C 54400005 */ bnel $v0, $zero, .L002C7E64 +/* 0EC7FC 002C7E4C 54400005 */ bnezl $v0, .L002C7E64 /* 0EC800 002C7E50 3C02F8D8 */ lui $v0, 0xf8d8 /* 0EC804 002C7E54 3C0208F0 */ lui $v0, (0x08F0D180 >> 16) # lui $v0, 0x8f0 /* 0EC808 002C7E58 3442D180 */ ori $v0, (0x08F0D180 & 0xFFFF) # ori $v0, $v0, 0xd180 @@ -1117,7 +1117,7 @@ func_002C7DA8: .L002C7E64: /* 0EC814 002C7E64 3442F200 */ ori $v0, $v0, 0xf200 /* 0EC818 002C7E68 0045102A */ slt $v0, $v0, $a1 -/* 0EC81C 002C7E6C 54400005 */ bnel $v0, $zero, .L002C7E84 +/* 0EC81C 002C7E6C 54400005 */ bnezl $v0, .L002C7E84 /* 0EC820 002C7E70 3C02FA0A */ lui $v0, 0xfa0a /* 0EC824 002C7E74 3C0207BF */ lui $v0, (0x07BFA480 >> 16) # lui $v0, 0x7bf /* 0EC828 002C7E78 3442A480 */ ori $v0, (0x07BFA480 & 0xFFFF) # ori $v0, $v0, 0xa480 @@ -1127,7 +1127,7 @@ func_002C7DA8: .L002C7E84: /* 0EC834 002C7E84 34421F00 */ ori $v0, $v0, 0x1f00 /* 0EC838 002C7E88 0045102A */ slt $v0, $v0, $a1 -/* 0EC83C 002C7E8C 54400005 */ bnel $v0, $zero, .L002C7EA4 +/* 0EC83C 002C7E8C 54400005 */ bnezl $v0, .L002C7EA4 /* 0EC840 002C7E90 3C02FB3B */ lui $v0, 0xfb3b /* 0EC844 002C7E94 3C02068E */ lui $v0, (0x068E7780 >> 16) # lui $v0, 0x68e /* 0EC848 002C7E98 34427780 */ ori $v0, (0x068E7780 & 0xFFFF) # ori $v0, $v0, 0x7780 @@ -1137,7 +1137,7 @@ func_002C7DA8: .L002C7EA4: /* 0EC854 002C7EA4 34424C00 */ ori $v0, $v0, 0x4c00 /* 0EC858 002C7EA8 0045102A */ slt $v0, $v0, $a1 -/* 0EC85C 002C7EAC 54400005 */ bnel $v0, $zero, .L002C7EC4 +/* 0EC85C 002C7EAC 54400005 */ bnezl $v0, .L002C7EC4 /* 0EC860 002C7EB0 3C02FC6C */ lui $v0, 0xfc6c /* 0EC864 002C7EB4 3C02055D */ lui $v0, (0x055D4A80 >> 16) # lui $v0, 0x55d /* 0EC868 002C7EB8 34424A80 */ ori $v0, (0x055D4A80 & 0xFFFF) # ori $v0, $v0, 0x4a80 @@ -1147,7 +1147,7 @@ func_002C7DA8: .L002C7EC4: /* 0EC874 002C7EC4 34427900 */ ori $v0, $v0, 0x7900 /* 0EC878 002C7EC8 0045102A */ slt $v0, $v0, $a1 -/* 0EC87C 002C7ECC 54400005 */ bnel $v0, $zero, .L002C7EE4 +/* 0EC87C 002C7ECC 54400005 */ bnezl $v0, .L002C7EE4 /* 0EC880 002C7ED0 3C02FD9D */ lui $v0, 0xfd9d /* 0EC884 002C7ED4 3C02042C */ lui $v0, (0x042C1D80 >> 16) # lui $v0, 0x42c /* 0EC888 002C7ED8 34421D80 */ ori $v0, (0x042C1D80 & 0xFFFF) # ori $v0, $v0, 0x1d80 @@ -1157,7 +1157,7 @@ func_002C7DA8: .L002C7EE4: /* 0EC894 002C7EE4 3442A600 */ ori $v0, $v0, 0xa600 /* 0EC898 002C7EE8 0045102A */ slt $v0, $v0, $a1 -/* 0EC89C 002C7EEC 54400005 */ bnel $v0, $zero, .L002C7F04 +/* 0EC89C 002C7EEC 54400005 */ bnezl $v0, .L002C7F04 /* 0EC8A0 002C7EF0 3C02FECE */ lui $v0, 0xfece /* 0EC8A4 002C7EF4 3C0202FA */ lui $v0, (0x02FAF080 >> 16) # lui $v0, 0x2fa /* 0EC8A8 002C7EF8 3442F080 */ ori $v0, (0x02FAF080 & 0xFFFF) # ori $v0, $v0, 0xf080 @@ -1193,7 +1193,7 @@ func_002C7DA8: /* 0EC908 002C7F58 3C02F414 */ lui $v0, (0xF4143E00 >> 16) # lui $v0, 0xf414 /* 0EC90C 002C7F5C 34423E00 */ ori $v0, (0xF4143E00 & 0xFFFF) # ori $v0, $v0, 0x3e00 /* 0EC910 002C7F60 0044102A */ slt $v0, $v0, $a0 -/* 0EC914 002C7F64 54400005 */ bnel $v0, $zero, .L002C7F7C +/* 0EC914 002C7F64 54400005 */ bnezl $v0, .L002C7F7C /* 0EC918 002C7F68 3C02F545 */ lui $v0, 0xf545 /* 0EC91C 002C7F6C 3C020C84 */ lui $v0, (0x0C845880 >> 16) # lui $v0, 0xc84 /* 0EC920 002C7F70 34425880 */ ori $v0, (0x0C845880 & 0xFFFF) # ori $v0, $v0, 0x5880 @@ -1203,7 +1203,7 @@ func_002C7DA8: .L002C7F7C: /* 0EC92C 002C7F7C 34426B00 */ ori $v0, $v0, 0x6b00 /* 0EC930 002C7F80 0044102A */ slt $v0, $v0, $a0 -/* 0EC934 002C7F84 54400005 */ bnel $v0, $zero, .L002C7F9C +/* 0EC934 002C7F84 54400005 */ bnezl $v0, .L002C7F9C /* 0EC938 002C7F88 3C02F676 */ lui $v0, 0xf676 /* 0EC93C 002C7F8C 3C020B53 */ lui $v0, (0x0B532B80 >> 16) # lui $v0, 0xb53 /* 0EC940 002C7F90 34422B80 */ ori $v0, (0x0B532B80 & 0xFFFF) # ori $v0, $v0, 0x2b80 @@ -1213,7 +1213,7 @@ func_002C7DA8: .L002C7F9C: /* 0EC94C 002C7F9C 34429800 */ ori $v0, $v0, 0x9800 /* 0EC950 002C7FA0 0044102A */ slt $v0, $v0, $a0 -/* 0EC954 002C7FA4 54400005 */ bnel $v0, $zero, .L002C7FBC +/* 0EC954 002C7FA4 54400005 */ bnezl $v0, .L002C7FBC /* 0EC958 002C7FA8 3C02F7A7 */ lui $v0, 0xf7a7 /* 0EC95C 002C7FAC 3C020A21 */ lui $v0, (0x0A21FE80 >> 16) # lui $v0, 0xa21 /* 0EC960 002C7FB0 3442FE80 */ ori $v0, (0x0A21FE80 & 0xFFFF) # ori $v0, $v0, 0xfe80 @@ -1223,7 +1223,7 @@ func_002C7DA8: .L002C7FBC: /* 0EC96C 002C7FBC 3442C500 */ ori $v0, $v0, 0xc500 /* 0EC970 002C7FC0 0044102A */ slt $v0, $v0, $a0 -/* 0EC974 002C7FC4 54400005 */ bnel $v0, $zero, .L002C7FDC +/* 0EC974 002C7FC4 54400005 */ bnezl $v0, .L002C7FDC /* 0EC978 002C7FC8 3C02F8D8 */ lui $v0, 0xf8d8 /* 0EC97C 002C7FCC 3C0208F0 */ lui $v0, (0x08F0D180 >> 16) # lui $v0, 0x8f0 /* 0EC980 002C7FD0 3442D180 */ ori $v0, (0x08F0D180 & 0xFFFF) # ori $v0, $v0, 0xd180 @@ -1233,7 +1233,7 @@ func_002C7DA8: .L002C7FDC: /* 0EC98C 002C7FDC 3442F200 */ ori $v0, $v0, 0xf200 /* 0EC990 002C7FE0 0044102A */ slt $v0, $v0, $a0 -/* 0EC994 002C7FE4 54400005 */ bnel $v0, $zero, .L002C7FFC +/* 0EC994 002C7FE4 54400005 */ bnezl $v0, .L002C7FFC /* 0EC998 002C7FE8 3C02FA0A */ lui $v0, 0xfa0a /* 0EC99C 002C7FEC 3C0207BF */ lui $v0, (0x07BFA480 >> 16) # lui $v0, 0x7bf /* 0EC9A0 002C7FF0 3442A480 */ ori $v0, (0x07BFA480 & 0xFFFF) # ori $v0, $v0, 0xa480 @@ -1243,7 +1243,7 @@ func_002C7DA8: .L002C7FFC: /* 0EC9AC 002C7FFC 34421F00 */ ori $v0, $v0, 0x1f00 /* 0EC9B0 002C8000 0044102A */ slt $v0, $v0, $a0 -/* 0EC9B4 002C8004 54400005 */ bnel $v0, $zero, .L002C801C +/* 0EC9B4 002C8004 54400005 */ bnezl $v0, .L002C801C /* 0EC9B8 002C8008 3C02FB3B */ lui $v0, 0xfb3b /* 0EC9BC 002C800C 3C02068E */ lui $v0, (0x068E7780 >> 16) # lui $v0, 0x68e /* 0EC9C0 002C8010 34427780 */ ori $v0, (0x068E7780 & 0xFFFF) # ori $v0, $v0, 0x7780 @@ -1253,7 +1253,7 @@ func_002C7DA8: .L002C801C: /* 0EC9CC 002C801C 34424C00 */ ori $v0, $v0, 0x4c00 /* 0EC9D0 002C8020 0044102A */ slt $v0, $v0, $a0 -/* 0EC9D4 002C8024 54400005 */ bnel $v0, $zero, .L002C803C +/* 0EC9D4 002C8024 54400005 */ bnezl $v0, .L002C803C /* 0EC9D8 002C8028 3C02FC6C */ lui $v0, 0xfc6c /* 0EC9DC 002C802C 3C02055D */ lui $v0, (0x055D4A80 >> 16) # lui $v0, 0x55d /* 0EC9E0 002C8030 34424A80 */ ori $v0, (0x055D4A80 & 0xFFFF) # ori $v0, $v0, 0x4a80 @@ -1263,7 +1263,7 @@ func_002C7DA8: .L002C803C: /* 0EC9EC 002C803C 34427900 */ ori $v0, $v0, 0x7900 /* 0EC9F0 002C8040 0044102A */ slt $v0, $v0, $a0 -/* 0EC9F4 002C8044 54400005 */ bnel $v0, $zero, .L002C805C +/* 0EC9F4 002C8044 54400005 */ bnezl $v0, .L002C805C /* 0EC9F8 002C8048 3C02FD9D */ lui $v0, 0xfd9d /* 0EC9FC 002C804C 3C02042C */ lui $v0, (0x042C1D80 >> 16) # lui $v0, 0x42c /* 0ECA00 002C8050 34421D80 */ ori $v0, (0x042C1D80 & 0xFFFF) # ori $v0, $v0, 0x1d80 @@ -1273,7 +1273,7 @@ func_002C7DA8: .L002C805C: /* 0ECA0C 002C805C 3442A600 */ ori $v0, $v0, 0xa600 /* 0ECA10 002C8060 0044102A */ slt $v0, $v0, $a0 -/* 0ECA14 002C8064 54400005 */ bnel $v0, $zero, .L002C807C +/* 0ECA14 002C8064 54400005 */ bnezl $v0, .L002C807C /* 0ECA18 002C8068 3C02FECE */ lui $v0, 0xfece /* 0ECA1C 002C806C 3C0202FA */ lui $v0, (0x02FAF080 >> 16) # lui $v0, 0x2fa /* 0ECA20 002C8070 3442F080 */ ori $v0, (0x02FAF080 & 0xFFFF) # ori $v0, $v0, 0xf080 @@ -1317,7 +1317,7 @@ func_002C8098: .L002C80F4: /* 0ECAA4 002C80F4 34423E00 */ ori $v0, (0xF4143E00 & 0xFFFF) # ori $v0, $v0, 0x3e00 /* 0ECAA8 002C80F8 0050102A */ slt $v0, $v0, $s0 -/* 0ECAAC 002C80FC 54400017 */ bnel $v0, $zero, .L002C815C +/* 0ECAAC 002C80FC 54400017 */ bnezl $v0, .L002C815C /* 0ECAB0 002C8100 3C02F545 */ lui $v0, 0xf545 /* 0ECAB4 002C8104 3C020C84 */ lui $v0, (0x0C845880 >> 16) # lui $v0, 0xc84 /* 0ECAB8 002C8108 34425880 */ ori $v0, (0x0C845880 & 0xFFFF) # ori $v0, $v0, 0x5880 @@ -1443,7 +1443,7 @@ func_002C8098: .L002C82A0: /* 0ECC50 002C82A0 34424C00 */ ori $v0, (0x068E4C00 & 0xFFFF) # ori $v0, $v0, 0x4c00 /* 0ECC54 002C82A4 0050102A */ slt $v0, $v0, $s0 -/* 0ECC58 002C82A8 54400021 */ bnel $v0, $zero, .L002C8330 +/* 0ECC58 002C82A8 54400021 */ bnezl $v0, .L002C8330 /* 0ECC5C 002C82AC 3C02FC6C */ lui $v0, 0xfc6c /* 0ECC60 002C82B0 3C02055D */ lui $v0, (0x055D4A80 >> 16) # lui $v0, 0x55d /* 0ECC64 002C82B4 34424A80 */ ori $v0, (0x055D4A80 & 0xFFFF) # ori $v0, $v0, 0x4a80 @@ -1488,7 +1488,7 @@ func_002C8328: .L002C8330: /* 0ECCE0 002C8330 34427900 */ ori $v0, $v0, 0x7900 /* 0ECCE4 002C8334 0050102A */ slt $v0, $v0, $s0 -/* 0ECCE8 002C8338 5440001C */ bnel $v0, $zero, .L002C83AC +/* 0ECCE8 002C8338 5440001C */ bnezl $v0, .L002C83AC /* 0ECCEC 002C833C 3C02FD9D */ lui $v0, 0xfd9d /* 0ECCF0 002C8340 3C02042C */ lui $v0, (0x042C1D80 >> 16) # lui $v0, 0x42c /* 0ECCF4 002C8344 34421D80 */ ori $v0, (0x042C1D80 & 0xFFFF) # ori $v0, $v0, 0x1d80 @@ -1759,7 +1759,7 @@ func_002C8640: .L002C86C4: /* 0ED074 002C86C4 34424C00 */ ori $v0, $v0, 0x4c00 /* 0ED078 002C86C8 0045102A */ slt $v0, $v0, $a1 -/* 0ED07C 002C86CC 54400025 */ bnel $v0, $zero, .L002C8764 +/* 0ED07C 002C86CC 54400025 */ bnezl $v0, .L002C8764 /* 0ED080 002C86D0 3C02FC6C */ lui $v0, 0xfc6c /* 0ED084 002C86D4 3C02055D */ lui $v0, (0x055D4A80 >> 16) # lui $v0, 0x55d /* 0ED088 002C86D8 34424A80 */ ori $v0, (0x055D4A80 & 0xFFFF) # ori $v0, $v0, 0x4a80 @@ -1806,7 +1806,7 @@ func_002C875C: .L002C8764: /* 0ED114 002C8764 34427900 */ ori $v0, $v0, 0x7900 /* 0ED118 002C8768 0045102A */ slt $v0, $v0, $a1 -/* 0ED11C 002C876C 54400020 */ bnel $v0, $zero, .L002C87F0 +/* 0ED11C 002C876C 54400020 */ bnezl $v0, .L002C87F0 /* 0ED120 002C8770 3C02FD9D */ lui $v0, 0xfd9d /* 0ED124 002C8774 3C02042C */ lui $v0, (0x042C1D80 >> 16) # lui $v0, 0x42c /* 0ED128 002C8778 34421D80 */ ori $v0, (0x042C1D80 & 0xFFFF) # ori $v0, $v0, 0x1d80 @@ -2042,7 +2042,7 @@ func_002C8A40: /* 0ED3FC 002C8A4C 24A50001 */ addiu $a1, $a1, 1 .L002C8A50: -/* 0ED400 002C8A50 54A0FFEA */ bnel $a1, $zero, .L002C89FC +/* 0ED400 002C8A50 54A0FFEA */ bnezl $a1, .L002C89FC /* 0ED404 002C8A54 00C0202D */ move $a0, $a2 /* 0ED408 002C8A58 03E00008 */ jr $ra /* 0ED40C 002C8A5C 0080102D */ move $v0, $a0 @@ -2078,7 +2078,7 @@ func_002C8AB0: /* 0ED46C 002C8ABC 24A50001 */ addiu $a1, $a1, 1 /* 0ED470 002C8AC0 24A5FFFF */ addiu $a1, $a1, -1 -/* 0ED474 002C8AC4 54A0FFEC */ bnel $a1, $zero, .L002C8A78 +/* 0ED474 002C8AC4 54A0FFEC */ bnezl $a1, .L002C8A78 /* 0ED478 002C8AC8 00C0202D */ move $a0, $a2 /* 0ED47C 002C8ACC 03E00008 */ jr $ra /* 0ED480 002C8AD0 0080102D */ move $v0, $a0 diff --git a/papermario/asm/CODE_ed9b0_len_2000.s b/papermario/asm/CODE_ed9b0_len_2000.s index a760847394..a3ecebf203 100644 --- a/papermario/asm/CODE_ed9b0_len_2000.s +++ b/papermario/asm/CODE_ed9b0_len_2000.s @@ -466,7 +466,7 @@ func_002C965C: /* 0EE058 002C96A8 8FB1001C */ lw $s1, 0x1c($sp) /* 0EE05C 002C96AC 0250102A */ slt $v0, $s2, $s0 /* 0EE060 002C96B0 8E330000 */ lw $s3, ($s1) -/* 0EE064 002C96B4 54400011 */ bnel $v0, $zero, .L002C96FC +/* 0EE064 002C96B4 54400011 */ bnezl $v0, .L002C96FC /* 0EE068 002C96B8 AE330000 */ sw $s3, ($s1) /* 0EE06C 002C96BC 27A40010 */ addiu $a0, $sp, 0x10 .L002C96C0: diff --git a/papermario/asm/CODE_f19b0_len_2000.s b/papermario/asm/CODE_f19b0_len_2000.s index 3088c5f3ea..0011f96978 100644 --- a/papermario/asm/CODE_f19b0_len_2000.s +++ b/papermario/asm/CODE_f19b0_len_2000.s @@ -995,7 +995,7 @@ func_002CDD8C: /* 0F2854 002CDEA4 0200282D */ move $a1, $s0 /* 0F2858 002CDEA8 0C0B36B0 */ jal func_002CDAC0 /* 0F285C 002CDEAC 46000506 */ mov.s $f20, $f0 -/* 0F2860 002CDEB0 54400001 */ bnel $v0, $zero, .L002CDEB8 +/* 0F2860 002CDEB0 54400001 */ bnezl $v0, .L002CDEB8 /* 0F2864 002CDEB4 E4540050 */ swc1 $f20, 0x50($v0) .L002CDEB8: /* 0F2868 002CDEB8 24020002 */ li $v0, 2 @@ -1110,7 +1110,7 @@ func_002CDD8C: /* 0F2A08 002CE058 0200282D */ move $a1, $s0 /* 0F2A0C 002CE05C 0C0B36B0 */ jal func_002CDAC0 /* 0F2A10 002CE060 46000506 */ mov.s $f20, $f0 -/* 0F2A14 002CE064 54400001 */ bnel $v0, $zero, .L002CE06C +/* 0F2A14 002CE064 54400001 */ bnezl $v0, .L002CE06C /* 0F2A18 002CE068 E4540018 */ swc1 $f20, 0x18($v0) .L002CE06C: /* 0F2A1C 002CE06C 24020002 */ li $v0, 2 @@ -1139,7 +1139,7 @@ func_002CDD8C: /* 0F2A74 002CE0C4 0200282D */ move $a1, $s0 /* 0F2A78 002CE0C8 0C0B36B0 */ jal func_002CDAC0 /* 0F2A7C 002CE0CC 46000506 */ mov.s $f20, $f0 -/* 0F2A80 002CE0D0 54400001 */ bnel $v0, $zero, .L002CE0D8 +/* 0F2A80 002CE0D0 54400001 */ bnezl $v0, .L002CE0D8 /* 0F2A84 002CE0D4 E4540014 */ swc1 $f20, 0x14($v0) .L002CE0D8: /* 0F2A88 002CE0D8 24020002 */ li $v0, 2 @@ -1223,7 +1223,7 @@ func_002CDD8C: /* 0F2BAC 002CE1FC 0200282D */ move $a1, $s0 /* 0F2BB0 002CE200 0C0B36B0 */ jal func_002CDAC0 /* 0F2BB4 002CE204 46000506 */ mov.s $f20, $f0 -/* 0F2BB8 002CE208 54400001 */ bnel $v0, $zero, .L002CE210 +/* 0F2BB8 002CE208 54400001 */ bnezl $v0, .L002CE210 /* 0F2BBC 002CE20C E4540030 */ swc1 $f20, 0x30($v0) .L002CE210: /* 0F2BC0 002CE210 24020002 */ li $v0, 2 @@ -1243,7 +1243,7 @@ func_002CDD8C: /* 0F2BF4 002CE244 F7B60028 */ sdc1 $f22, 0x28($sp) /* 0F2BF8 002CE248 F7B40020 */ sdc1 $f20, 0x20($sp) /* 0F2BFC 002CE24C 8E51000C */ lw $s1, 0xc($s2) -/* 0F2C00 002CE250 54A00001 */ bnel $a1, $zero, .L002CE258 +/* 0F2C00 002CE250 54A00001 */ bnezl $a1, .L002CE258 /* 0F2C04 002CE254 AE400070 */ sw $zero, 0x70($s2) .L002CE258: /* 0F2C08 002CE258 8E420070 */ lw $v0, 0x70($s2) @@ -1276,7 +1276,7 @@ func_002CDD8C: /* 0F2C74 002CE2C4 0C0B36B0 */ jal func_002CDAC0 /* 0F2C78 002CE2C8 0040882D */ move $s1, $v0 /* 0F2C7C 002CE2CC 0040802D */ move $s0, $v0 -/* 0F2C80 002CE2D0 56000003 */ bnel $s0, $zero, .L002CE2E0 +/* 0F2C80 002CE2D0 56000003 */ bnezl $s0, .L002CE2E0 /* 0F2C84 002CE2D4 AE500074 */ sw $s0, 0x74($s2) /* 0F2C88 002CE2D8 080B3905 */ j func_002CE414 /* 0F2C8C 002CE2DC 24020002 */ li $v0, 2 @@ -1431,7 +1431,7 @@ func_002CE434: /* 0F2EAC 002CE4FC 0C0B36B0 */ jal func_002CDAC0 /* 0F2EB0 002CE500 0040882D */ move $s1, $v0 /* 0F2EB4 002CE504 0040802D */ move $s0, $v0 -/* 0F2EB8 002CE508 56000003 */ bnel $s0, $zero, .L002CE518 +/* 0F2EB8 002CE508 56000003 */ bnezl $s0, .L002CE518 /* 0F2EBC 002CE50C AE500074 */ sw $s0, 0x74($s2) /* 0F2EC0 002CE510 080B39A6 */ j func_002CE698 /* 0F2EC4 002CE514 24020002 */ li $v0, 2 @@ -1590,7 +1590,7 @@ func_002CE698: /* 0F30F8 002CE748 0C0B36B0 */ jal func_002CDAC0 /* 0F30FC 002CE74C 0040282D */ move $a1, $v0 /* 0F3100 002CE750 0040882D */ move $s1, $v0 -/* 0F3104 002CE754 56200003 */ bnel $s1, $zero, .L002CE764 +/* 0F3104 002CE754 56200003 */ bnezl $s1, .L002CE764 /* 0F3108 002CE758 AE510074 */ sw $s1, 0x74($s2) /* 0F310C 002CE75C 080B3A7A */ j func_002CE9E8 /* 0F3110 002CE760 24020002 */ li $v0, 2 diff --git a/papermario/asm/CODE_f39b0_len_2000.s b/papermario/asm/CODE_f39b0_len_2000.s index 5d19004396..78b73056b3 100644 --- a/papermario/asm/CODE_f39b0_len_2000.s +++ b/papermario/asm/CODE_f39b0_len_2000.s @@ -132,7 +132,7 @@ func_002CF0D4: /* 0F3B8C 002CF1DC 8E310000 */ lw $s1, ($s1) /* 0F3B90 002CF1E0 0C0B36B0 */ jal func_002CDAC0 /* 0F3B94 002CF1E4 0040282D */ move $a1, $v0 -/* 0F3B98 002CF1E8 54400001 */ bnel $v0, $zero, .L002CF1F0 +/* 0F3B98 002CF1E8 54400001 */ bnezl $v0, .L002CF1F0 /* 0F3B9C 002CF1EC AC510080 */ sw $s1, 0x80($v0) .L002CF1F0: /* 0F3BA0 002CF1F0 24020002 */ li $v0, 2 @@ -981,7 +981,7 @@ func_002CFC48: /* 0F4804 002CFE54 8E310000 */ lw $s1, ($s1) /* 0F4808 002CFE58 0C0B36B0 */ jal func_002CDAC0 /* 0F480C 002CFE5C 0040282D */ move $a1, $v0 -/* 0F4810 002CFE60 54400001 */ bnel $v0, $zero, .L002CFE68 +/* 0F4810 002CFE60 54400001 */ bnezl $v0, .L002CFE68 /* 0F4814 002CFE64 A45100A2 */ sh $s1, 0xa2($v0) .L002CFE68: /* 0F4818 002CFE68 24020002 */ li $v0, 2 @@ -1912,7 +1912,7 @@ func_002D0844: /* 0F5578 002D0BC8 AE020084 */ sw $v0, 0x84($s0) /* 0F557C 002D0BCC 8C6204FC */ lw $v0, 0x4fc($v1) /* 0F5580 002D0BD0 30420040 */ andi $v0, $v0, 0x40 -/* 0F5584 002D0BD4 54400004 */ bnel $v0, $zero, .L002D0BE8 +/* 0F5584 002D0BD4 54400004 */ bnezl $v0, .L002D0BE8 /* 0F5588 002D0BD8 24020001 */ li $v0, 1 /* 0F558C 002D0BDC 8E020074 */ lw $v0, 0x74($s0) /* 0F5590 002D0BE0 38420001 */ xori $v0, $v0, 1 diff --git a/papermario/asm/CODE_f79b0_len_2000.s b/papermario/asm/CODE_f79b0_len_2000.s index d8d07100c7..3312050b3e 100644 --- a/papermario/asm/CODE_f79b0_len_2000.s +++ b/papermario/asm/CODE_f79b0_len_2000.s @@ -53,7 +53,7 @@ /* 0F7A6C 002D30BC 00000000 */ nop /* 0F7A70 002D30C0 8C420000 */ lw $v0, ($v0) /* 0F7A74 002D30C4 30420008 */ andi $v0, $v0, 8 -/* 0F7A78 002D30C8 54400034 */ bnel $v0, $zero, .L002D319C +/* 0F7A78 002D30C8 54400034 */ bnezl $v0, .L002D319C /* 0F7A7C 002D30CC 26520001 */ addiu $s2, $s2, 1 /* 0F7A80 002D30D0 8E050004 */ lw $a1, 4($s0) /* 0F7A84 002D30D4 8E060008 */ lw $a2, 8($s0) @@ -704,7 +704,7 @@ func_002D33C4: /* 0F8430 002D3A80 F7B60028 */ sdc1 $f22, 0x28($sp) /* 0F8434 002D3A84 F7B40020 */ sdc1 $f20, 0x20($sp) /* 0F8438 002D3A88 8E51000C */ lw $s1, 0xc($s2) -/* 0F843C 002D3A8C 54A00001 */ bnel $a1, $zero, .L002D3A94 +/* 0F843C 002D3A8C 54A00001 */ bnezl $a1, .L002D3A94 /* 0F8440 002D3A90 AE400070 */ sw $zero, 0x70($s2) .L002D3A94: /* 0F8444 002D3A94 8E420070 */ lw $v0, 0x70($s2) @@ -838,7 +838,7 @@ func_002D3C30: /* 0F862C 002D3C7C F7B60028 */ sdc1 $f22, 0x28($sp) /* 0F8630 002D3C80 F7B40020 */ sdc1 $f20, 0x20($sp) /* 0F8634 002D3C84 8E51000C */ lw $s1, 0xc($s2) -/* 0F8638 002D3C88 54A00001 */ bnel $a1, $zero, .L002D3C90 +/* 0F8638 002D3C88 54A00001 */ bnezl $a1, .L002D3C90 /* 0F863C 002D3C8C AE400070 */ sw $zero, 0x70($s2) .L002D3C90: /* 0F8640 002D3C90 8E420070 */ lw $v0, 0x70($s2) @@ -990,7 +990,7 @@ func_002D3E8C: /* 0F8870 002D3EC0 0080802D */ move $s0, $a0 /* 0F8874 002D3EC4 AFBF0014 */ sw $ra, 0x14($sp) /* 0F8878 002D3EC8 8E03000C */ lw $v1, 0xc($s0) -/* 0F887C 002D3ECC 54A00001 */ bnel $a1, $zero, .L002D3ED4 +/* 0F887C 002D3ECC 54A00001 */ bnezl $a1, .L002D3ED4 /* 0F8880 002D3ED0 AE000070 */ sw $zero, 0x70($s0) .L002D3ED4: /* 0F8884 002D3ED4 8E020070 */ lw $v0, 0x70($s0) diff --git a/papermario/asm/CODE_f99b0_len_2000.s b/papermario/asm/CODE_f99b0_len_2000.s index 524118d340..40ca455257 100644 --- a/papermario/asm/CODE_f99b0_len_2000.s +++ b/papermario/asm/CODE_f99b0_len_2000.s @@ -1378,7 +1378,7 @@ func_002D5A18: /* 0FADF4 002D6444 AFBF0020 */ sw $ra, 0x20($sp) /* 0FADF8 002D6448 AFB20018 */ sw $s2, 0x18($sp) /* 0FADFC 002D644C 8E12014C */ lw $s2, 0x14c($s0) -/* 0FAE00 002D6450 54A00001 */ bnel $a1, $zero, .L002D6458 +/* 0FAE00 002D6450 54A00001 */ bnezl $a1, .L002D6458 /* 0FAE04 002D6454 AE000070 */ sw $zero, 0x70($s0) .L002D6458: /* 0FAE08 002D6458 8E030070 */ lw $v1, 0x70($s0) @@ -1536,7 +1536,7 @@ func_002D6620: /* 0FB010 002D6660 AFBF0020 */ sw $ra, 0x20($sp) /* 0FB014 002D6664 AFB20018 */ sw $s2, 0x18($sp) /* 0FB018 002D6668 8E12014C */ lw $s2, 0x14c($s0) -/* 0FB01C 002D666C 54A00001 */ bnel $a1, $zero, .L002D6674 +/* 0FB01C 002D666C 54A00001 */ bnezl $a1, .L002D6674 /* 0FB020 002D6670 AE000070 */ sw $zero, 0x70($s0) .L002D6674: /* 0FB024 002D6674 8E030070 */ lw $v1, 0x70($s0) diff --git a/papermario/asm/CODE_fb9b0_len_2000.s b/papermario/asm/CODE_fb9b0_len_2000.s index b784e8cbce..6450dcd7a6 100644 --- a/papermario/asm/CODE_fb9b0_len_2000.s +++ b/papermario/asm/CODE_fb9b0_len_2000.s @@ -257,7 +257,7 @@ func_002D71FC: /* 0FBD64 002D73B4 AFB10014 */ sw $s1, 0x14($sp) /* 0FBD68 002D73B8 AFB00010 */ sw $s0, 0x10($sp) /* 0FBD6C 002D73BC 8E51000C */ lw $s1, 0xc($s2) -/* 0FBD70 002D73C0 54A00001 */ bnel $a1, $zero, .L002D73C8 +/* 0FBD70 002D73C0 54A00001 */ bnezl $a1, .L002D73C8 /* 0FBD74 002D73C4 AE400070 */ sw $zero, 0x70($s2) .L002D73C8: /* 0FBD78 002D73C8 8E430070 */ lw $v1, 0x70($s2) diff --git a/papermario/asm/CODE_fd9b0_len_1480.s b/papermario/asm/CODE_fd9b0_len_1480.s index 1633e9f3e4..68c41fd2c7 100644 --- a/papermario/asm/CODE_fd9b0_len_1480.s +++ b/papermario/asm/CODE_fd9b0_len_1480.s @@ -884,7 +884,7 @@ func_002D9A7C: /* 0FE674 002D9CC4 802CB2A8 */ /* 0FE678 002D9CC8 FE363C80 */ sd $s6, 0x3c80($s1) /* 0FE67C 002D9CCC FE363C81 */ sd $s6, 0x3c81($s1) /* 0FE680 002D9CD0 FE363C82 */ sd $s6, 0x3c82($s1) -/* 0FE684 002D9CD4 F24A7E80 */ scd $t2, 0x7e80($s2) +/* 0FE684 002D9CD4 F24A7E80 */ scd $s2, (0x7e80) /* 0FE688 002D9CD8 00000002 */ srl $zero, $zero, 0 /* 0FE68C 002D9CDC 00000000 */ nop /* 0FE690 002D9CE0 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */ diff --git a/papermario/asm/CODE_fee30_len_2000.s b/papermario/asm/CODE_fee30_len_2000.s index cc397b820d..6cf21f3453 100644 --- a/papermario/asm/CODE_fee30_len_2000.s +++ b/papermario/asm/CODE_fee30_len_2000.s @@ -1944,7 +1944,7 @@ func_002DD89C: /* 1009C4 002DD8D4 8C830000 */ lw $v1, ($a0) /* 1009C8 002DD8D8 8C420008 */ lw $v0, 8($v0) /* 1009CC 002DD8DC 0062182A */ slt $v1, $v1, $v0 -/* 1009D0 002DD8E0 54600001 */ bnel $v1, $zero, .L002DD8E8 +/* 1009D0 002DD8E0 54600001 */ bnezl $v1, .L002DD8E8 /* 1009D4 002DD8E4 AC820000 */ sw $v0, ($a0) .L002DD8E8: /* 1009D8 002DD8E8 8FBF0014 */ lw $ra, 0x14($sp) @@ -1978,7 +1978,7 @@ func_002DD89C: /* 100A40 002DD950 AC20F580 */ sw $zero, %lo(D_802DF580)($at) /* 100A44 002DD954 9042007E */ lbu $v0, 0x7e($v0) /* 100A48 002DD958 30420001 */ andi $v0, $v0, 1 -/* 100A4C 002DD95C 54400001 */ bnel $v0, $zero, .L002DD964 +/* 100A4C 002DD95C 54400001 */ bnezl $v0, .L002DD964 /* 100A50 002DD960 24110004 */ li $s1, 4 .L002DD964: /* 100A54 002DD964 24100001 */ li $s0, 1 diff --git a/papermario/asm/boot.s b/papermario/asm/boot.s index 4d02224c9e..52eea7ec31 100644 --- a/papermario/asm/boot.s +++ b/papermario/asm/boot.s @@ -324,7 +324,7 @@ D_000001E4: .L000004A8: /* 0004E8 000004A8 8D080010 */ lw $t0, %lo(D_A4600010)($t0) /* 0004EC 000004AC 31080002 */ andi $t0, $t0, 2 -/* 0004F0 000004B0 5500FFFD */ bnel $t0, $zero, .L000004A8 +/* 0004F0 000004B0 5500FFFD */ bnezl $t0, .L000004A8 /* 0004F4 000004B4 3C08A460 */ lui $t0, 0xa460 /* 0004F8 000004B8 24081000 */ li $t0, 4096 /* 0004FC 000004BC 010B4020 */ add $t0, $t0, $t3 @@ -630,7 +630,7 @@ func_00000620: /* 000950 00000910 00031842 */ srl $v1, $v1, 1 /* 000954 00000914 27DE0001 */ addiu $fp, $fp, 1 /* 000958 00000918 2BDA000A */ slti $k0, $fp, 0xa -/* 00095C 0000091C 5740FFEF */ bnel $k0, $zero, .L000008DC +/* 00095C 0000091C 5740FFEF */ bnezl $k0, .L000008DC /* 000960 00000920 241AFFFF */ li $k0, -1 /* 000964 00000924 8FBF001C */ lw $ra, 0x1c($sp) /* 000968 00000928 27BD0028 */ addiu $sp, $sp, 0x28 @@ -647,7 +647,7 @@ func_00000620: /* 000990 00000950 00007025 */ move $t6, $zero /* 000994 00000954 29DA0040 */ slti $k0, $t6, 0x40 .L00000958: -/* 000998 00000958 57400004 */ bnel $k0, $zero, .L0000096C +/* 000998 00000958 57400004 */ bnezl $k0, .L0000096C /* 00099C 0000095C 01C02025 */ move $a0, $t6 /* 0009A0 00000960 10000020 */ b .L000009E4 /* 0009A4 00000964 00001025 */ move $v0, $zero @@ -681,7 +681,7 @@ func_00000620: /* 000A08 000009C8 014E1021 */ addu $v0, $t2, $t6 /* 000A0C 000009CC 25CE0001 */ addiu $t6, $t6, 1 /* 000A10 000009D0 29DB0041 */ slti $k1, $t6, 0x41 -/* 000A14 000009D4 5760FFE0 */ bnel $k1, $zero, .L00000958 +/* 000A14 000009D4 5760FFE0 */ bnezl $k1, .L00000958 /* 000A18 000009D8 29DA0040 */ slti $k0, $t6, 0x40 /* 000A1C 000009DC 014E1021 */ addu $v0, $t2, $t6 .L000009E0: diff --git a/papermario/build/sm64.map b/papermario/build/sm64.map deleted file mode 100644 index 1dda6179b2..0000000000 --- a/papermario/build/sm64.map +++ /dev/null @@ -1,250 +0,0 @@ - -Memory Configuration - -Name Origin Length Attributes -*default* 0x0000000000000000 0xffffffffffffffff - -Linker script and memory map - - -.header 0x0000000000000000 0x40 - *(.header) - .header 0x0000000000000000 0x40 build/PAPERMARIO.o - *(.boot) - -.rodata 0x0000000000800000 0x20 - FILL mask 0x01 - *(.mio0) - .mio0 0x0000000000800000 0x0 build/PAPERMARIO.o - *(.rodata) - *(.data) - .data 0x0000000000800000 0x0 build/PAPERMARIO.o - *(.MIPS.abiflags) - .MIPS.abiflags - 0x0000000000800000 0x18 build/PAPERMARIO.o - 0x0000000000800020 . = ALIGN (0x10) - *fill* 0x0000000000800018 0x8 01 - -.behavior 0x0000000013000000 0x3fffe0 load address 0x0000000000800020 - FILL mask 0x01 - *(.behavior) - 0x0000000000000000 behavior_length = (. - 0x13000000) - 0x00000000003fffe0 . = (0x400000 - SIZEOF (.rodata)) - *fill* 0x0000000013000000 0x3fffe0 01 - 0x0000000000800020 __load_behavior_data = LOADADDR (.behavior) - 0x0000000000800020 __load_behavior_data_end = (LOADADDR (.behavior) + behavior_length) - -.text00000000 0x0000000000000000 0xbbd90 load address 0x0000000000000040 - *(.text00000000) - .text00000000 0x0000000000000000 0xbbd90 build/PAPERMARIO.o - -.text001256D0 0x00000000001256d0 0x1fe4 load address 0x00000000000bbdd0 - *(.text001256D0) - .text001256D0 0x00000000001256d0 0x1fe4 build/PAPERMARIO.o - -.text001276D0 0x00000000001276d0 0x1ff4 load address 0x00000000000bddd0 - *(.text001276D0) - .text001276D0 0x00000000001276d0 0x1ff4 build/PAPERMARIO.o - -.text001296D0 0x00000000001296d0 0x1ff0 load address 0x00000000000bfdd0 - *(.text001296D0) - .text001296D0 0x00000000001296d0 0x1ff0 build/PAPERMARIO.o - -.text0012B6D0 0x000000000012b6d0 0x1fd8 load address 0x00000000000c1dd0 - *(.text0012B6D0) - .text0012B6D0 0x000000000012b6d0 0x1fd8 build/PAPERMARIO.o - -.text0012D6D0 0x000000000012d6d0 0x1ff4 load address 0x00000000000c3dd0 - *(.text0012D6D0) - .text0012D6D0 0x000000000012d6d0 0x1ff4 build/PAPERMARIO.o - -.text0012F6D0 0x000000000012f6d0 0x1fec load address 0x00000000000c5dd0 - *(.text0012F6D0) - .text0012F6D0 0x000000000012f6d0 0x1fec build/PAPERMARIO.o - -.text001316D0 0x00000000001316d0 0x2000 load address 0x00000000000c7dd0 - *(.text001316D0) - .text001316D0 0x00000000001316d0 0x2000 build/PAPERMARIO.o - -.text001336D0 0x00000000001336d0 0x1fa8 load address 0x00000000000c9dd0 - *(.text001336D0) - .text001336D0 0x00000000001336d0 0x1fa8 build/PAPERMARIO.o - -.text001356D0 0x00000000001356d0 0x1fec load address 0x00000000000cbdd0 - *(.text001356D0) - .text001356D0 0x00000000001356d0 0x1fec build/PAPERMARIO.o - -.text001376D0 0x00000000001376d0 0x1fe4 load address 0x00000000000cddd0 - *(.text001376D0) - .text001376D0 0x00000000001376d0 0x1fe4 build/PAPERMARIO.o - -.text001396D0 0x00000000001396d0 0x1fb8 load address 0x00000000000cfdd0 - *(.text001396D0) - .text001396D0 0x00000000001396d0 0x1fb8 build/PAPERMARIO.o - -.text0013B6D0 0x000000000013b6d0 0x1ff8 load address 0x00000000000d1dd0 - *(.text0013B6D0) - .text0013B6D0 0x000000000013b6d0 0x1ff8 build/PAPERMARIO.o - -.text0013D6D0 0x000000000013d6d0 0x1fe4 load address 0x00000000000d3dd0 - *(.text0013D6D0) - .text0013D6D0 0x000000000013d6d0 0x1fe4 build/PAPERMARIO.o - -.text0013F6D0 0x000000000013f6d0 0x2000 load address 0x00000000000d5dd0 - *(.text0013F6D0) - .text0013F6D0 0x000000000013f6d0 0x2000 build/PAPERMARIO.o - -.text001416D0 0x00000000001416d0 0x1ff8 load address 0x00000000000d7dd0 - *(.text001416D0) - .text001416D0 0x00000000001416d0 0x1ff8 build/PAPERMARIO.o - -.text001436D0 0x00000000001436d0 0x1ff8 load address 0x00000000000d9dd0 - *(.text001436D0) - .text001436D0 0x00000000001436d0 0x1ff8 build/PAPERMARIO.o - -.text001456D0 0x00000000001456d0 0x1ff0 load address 0x00000000000dbdd0 - *(.text001456D0) - .text001456D0 0x00000000001456d0 0x1ff0 build/PAPERMARIO.o - -.text001476D0 0x00000000001476d0 0x1f6c load address 0x00000000000dddd0 - *(.text001476D0) - .text001476D0 0x00000000001476d0 0x1f6c build/PAPERMARIO.o - -.text001496D0 0x00000000001496d0 0x7af8 load address 0x00000000000dfdd0 - *(.text001496D0) - .text001496D0 0x00000000001496d0 0x7af8 build/PAPERMARIO.o - -.text002C3000 0x00000000002c3000 0x1ffc load address 0x00000000000e79b0 - *(.text002C3000) - .text002C3000 0x00000000002c3000 0x1ffc build/PAPERMARIO.o - -.text002C5000 0x00000000002c5000 0x2000 load address 0x00000000000e99b0 - *(.text002C5000) - .text002C5000 0x00000000002c5000 0x2000 build/PAPERMARIO.o - -.text002C7000 0x00000000002c7000 0x1ff8 load address 0x00000000000eb9b0 - *(.text002C7000) - .text002C7000 0x00000000002c7000 0x1ff8 build/PAPERMARIO.o - -.text002C9000 0x00000000002c9000 0x1ffc load address 0x00000000000ed9b0 - *(.text002C9000) - .text002C9000 0x00000000002c9000 0x1ffc build/PAPERMARIO.o - -.text002CB000 0x00000000002cb000 0x1fe8 load address 0x00000000000ef9b0 - *(.text002CB000) - .text002CB000 0x00000000002cb000 0x1fe8 build/PAPERMARIO.o - -.text002CD000 0x00000000002cd000 0x1fd0 load address 0x00000000000f19b0 - *(.text002CD000) - .text002CD000 0x00000000002cd000 0x1fd0 build/PAPERMARIO.o - -.text002CF000 0x00000000002cf000 0x1ff0 load address 0x00000000000f39b0 - *(.text002CF000) - .text002CF000 0x00000000002cf000 0x1ff0 build/PAPERMARIO.o - -.text002D1000 0x00000000002d1000 0x1fcc load address 0x00000000000f59b0 - *(.text002D1000) - .text002D1000 0x00000000002d1000 0x1fcc build/PAPERMARIO.o - -.text002D3000 0x00000000002d3000 0x1fdc load address 0x00000000000f79b0 - *(.text002D3000) - .text002D3000 0x00000000002d3000 0x1fdc build/PAPERMARIO.o - -.text002D5000 0x00000000002d5000 0x1ffc load address 0x00000000000f99b0 - *(.text002D5000) - .text002D5000 0x00000000002d5000 0x1ffc build/PAPERMARIO.o - -.text002D7000 0x00000000002d7000 0x2000 load address 0x00000000000fb9b0 - *(.text002D7000) - .text002D7000 0x00000000002d7000 0x2000 build/PAPERMARIO.o - -.text002D9000 0x00000000002d9000 0x1404 load address 0x00000000000fd9b0 - *(.text002D9000) - .text002D9000 0x00000000002d9000 0x1404 build/PAPERMARIO.o - -.text002DBD40 0x00000000002dbd40 0x1fdc load address 0x00000000000fee30 - *(.text002DBD40) - .text002DBD40 0x00000000002dbd40 0x1fdc build/PAPERMARIO.o - -.text002DDD40 0x00000000002ddd40 0x1784 load address 0x0000000000100e30 - *(.text002DDD40) - .text002DDD40 0x00000000002ddd40 0x1784 build/PAPERMARIO.o - -.text002E0D90 0x00000000002e0d90 0x1f78 load address 0x0000000000102610 - *(.text002E0D90) - .text002E0D90 0x00000000002e0d90 0x1f78 build/PAPERMARIO.o - -.text002E2D90 0x00000000002e2d90 0x1fd0 load address 0x0000000000104610 - *(.text002E2D90) - .text002E2D90 0x00000000002e2d90 0x1fd0 build/PAPERMARIO.o - -.text002E4D90 0x00000000002e4d90 0x1f8c load address 0x0000000000106610 - *(.text002E4D90) - .text002E4D90 0x00000000002e4d90 0x1f8c build/PAPERMARIO.o - -.text002E6D90 0x00000000002e6d90 0x2cce0 load address 0x0000000000108610 - *(.text002E6D90) - .text002E6D90 0x00000000002e6d90 0x2cce0 build/PAPERMARIO.o - -.text00242000 0x0000000000242000 0x2e068 load address 0x0000000000135340 - *(.text00242000) - .text00242000 0x0000000000242000 0x2e068 build/PAPERMARIO.o - -.text00242BA0 0x0000000000242ba0 0x4000 load address 0x0000000000163400 - *(.text00242BA0) - .text00242BA0 0x0000000000242ba0 0x4000 build/PAPERMARIO.o - -.text00246BA0 0x0000000000246ba0 0xe1f44 load address 0x0000000000167400 - *(.text00246BA0) - .text00246BA0 0x0000000000246ba0 0xe1f44 build/PAPERMARIO.o - -.text002ADBE0 0x00000000002adbe0 0xcd2dc load address 0x00000000002495f0 - *(.text002ADBE0) - .text002ADBE0 0x00000000002adbe0 0xcd2dc build/PAPERMARIO.o - -.text00200000 0x0000000000200000 0x80 load address 0x00000000003169f0 - *(.text00200000) - .text00200000 0x0000000000200000 0x80 build/PAPERMARIO.o - -.text00200080 0x0000000000200080 0x4c0 load address 0x0000000000316a70 - *(.text00200080) - .text00200080 0x0000000000200080 0x4c0 build/PAPERMARIO.o - -.text002B2000 0x00000000002b2000 0x4c9f50 load address 0x0000000000316f30 - *(.text002B2000) - .text002B2000 0x00000000002b2000 0x4c9f50 build/PAPERMARIO.o - -.text00280000 0x0000000000280000 0x1ff8 load address 0x00000000007e0e80 - *(.text00280000) - .text00280000 0x0000000000280000 0x1ff8 build/PAPERMARIO.o - -.text00282000 0x0000000000282000 0x63dfe4 load address 0x00000000007e2e80 - *(.text00282000) - .text00282000 0x0000000000282000 0x63dfe4 build/PAPERMARIO.o - -.text002B7000 0x00000000002b7000 0x2318 load address 0x0000000000e20eb0 - *(.text002B7000) - .text002B7000 0x00000000002b7000 0x2318 build/PAPERMARIO.o - -.text002B6000 0x00000000002b6000 0x19c3f06 load address 0x0000000000e23260 - *(.text002B6000) - .text002B6000 0x00000000002b6000 0x19c3f06 build/PAPERMARIO.o -LOAD build/PAPERMARIO.o -OUTPUT(build/PAPERMARIO.elf elf32-bigmips) - -.text 0x0000000001c79f08 0x0 load address 0x00000000027e7168 - .text 0x0000000001c79f08 0x0 build/PAPERMARIO.o - -.bss 0x0000000001c79f06 0x0 load address 0x00000000027e7166 - .bss 0x0000000001c79f06 0x0 build/PAPERMARIO.o - -.reginfo 0x0000000000000000 0x18 - .reginfo 0x0000000000000000 0x18 build/PAPERMARIO.o - -.pdr 0x0000000000000000 0x0 - .pdr 0x0000000000000000 0x0 build/PAPERMARIO.o - -.gnu.attributes - 0x0000000000000000 0x10 - .gnu.attributes - 0x0000000000000000 0x10 build/PAPERMARIO.o diff --git a/splitrom.sh b/splitrom.sh index 7572dddac8..7dba7e0433 100755 --- a/splitrom.sh +++ b/splitrom.sh @@ -7,4 +7,4 @@ then make cd .. fi -./n64splitter/bin/n64split -v -o papermario -c PAPER_MARIO.u.yaml Paper\ Mario\ \(U\)\ \[\!\].z64 \ No newline at end of file +./n64splitter/bin/n64split -v -o papermario -c PAPER_MARIO.u.yaml baserom.z64