pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

more fixes

Browse Source
This commit is contained in:
Ethan Roseman 2020-04-24 02:17:00 -04:00
parent 73c649b4d6
commit 722897188c
8 changed files with 10 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PAPER_MARIO.u.yaml
View File

@ -307,8 +307,8 @@ ranges:
- [0x40b3f0, 0x40bba0, "bin", "___40b3f0_len_7b0"] # (DRAM:0x00197000) (frame:0x00002B54) header: 0x27000000 trace:
- [0x40bba0, 0x40c5a0, "bin", "___40bba0_len_a00"] # (DRAM:0x00315610) (frame:0x00002B54) header: 0x0 trace:
- [0x7e0e80, 0x7e2e80, "asm", "CODE_7e0e80_len_2000", 0x00280000] # frame:0x0000027D header: 0x3c000000 trace: Tbl mapped:80281df4
- [0x7e2e80, 0x7e4e80, "asm", "CODE_7e2e80_len_2000", 0x00282000] # frame:0x0000027D header: 0xc7000000 trace: Tbl mapped:80282274
- [0x7e4e80, 0x7e6e80, "bin", "___7e4e80_len_2000"] # (DRAM:0x00284000) (frame:0x0000027D) header: 0x0 trace:
- [0x7e2e80, 0x7e4d00, "asm", "CODE_7e2e80_len_2000", 0x00282000] # frame:0x0000027D header: 0xc7000000 trace: Tbl mapped:80282274
- [0x7e4d00, 0x7e6e80, "bin", "___7e4e80_len_2000"] # (DRAM:0x00284000) (frame:0x0000027D) header: 0x0 trace:
- [0x7e6e80, 0x7e73a0, "bin", "___7e6e80_len_520"] # (DRAM:0x00286000) (frame:0x0000027D) header: 0x0 trace:
- [0x7ead10, 0x7ecd10, "bin", "___7ead10_len_2000"] # (DRAM:0x00240000) (frame:0x00003019) header: 0x3c000000 trace:
- [0x7ecd10, 0x7eed10, "bin", "___7ecd10_len_2000"] # (DRAM:0x00242000) (frame:0x00003019) header: 0x0 trace:

2
papermario/Makefile
View File

@ -15,7 +15,7 @@ OBJCOPY = $(CROSS)objcopy
ASFLAGS = -EB -mtune=vr4300 -march=vr4300
CFLAGS = -Wall -O2 -mtune=vr4300 -march=vr4300 -G 0 -c
LDFLAGS = -T undefined_syms.txt -T $(LD_SCRIPT) -Map $(BUILD_DIR)/sm64.map
LDFLAGS = -T undefined_syms.txt -T $(LD_SCRIPT) -Map $(BUILD_DIR)/sm64.map
####################### Other Tools #########################

4
papermario/PAPERMARIO.ld
View File

@ -1,7 +1,5 @@
/* Paper Mario (U) [!] linker script
* generated by n64split v0.4a - N64 ROM splitter */
SECTIONS
{
/* header and boot */
@ -256,7 +254,7 @@ SECTIONS
* (.text00280000);
}
/* 0x00282000 7E2E80-7E4E80 [2000] */
/* 0x00282000 7E2E80-7E4D00 [1E80] */
.text00282000 0x00282000 : AT(0x7E2E80) {
* (.text00282000);
}

2
papermario/PAPERMARIO.s
View File

@ -910,7 +910,7 @@ ___40bba0_len_a00_end:
.include "asm/CODE_7e0e80_len_2000.s"
.include "asm/CODE_7e2e80_len_2000.s"
___7e4e80_len_2000:
.incbin "bin/PAPERMARIO.7E4E80.___7e4e80_len_2000.bin"
.incbin "bin/PAPERMARIO.7E4D00.___7e4e80_len_2000.bin"
___7e4e80_len_2000_end:
___7e6e80_len_520:
.incbin "bin/PAPERMARIO.7E6E80.___7e6e80_len_520.bin"

81
papermario/asm/CODE_7e2e80_len_2000.s
View File

@ -2083,84 +2083,3 @@ func_00283DD0:
/* 7E4CF8 00283E78 00000000 */ nop
/* 7E4CFC 00283E7C 00000000 */ nop
/* 7E4D00 00283E80 00000043 */ sra $zero, $zero, 1
/* 7E4D04 00283E84 00000006 */ srlv $zero, $zero, $zero
/* 7E4D08 00283E88 802D02B0 */ lb $t5, 0x2b0($at)
/* 7E4D0C 00283E8C FE363C81 */ sd $s6, 0x3c81($s1)
/* 7E4D10 00283E90 FE363C82 */ sd $s6, 0x3c82($s1)
/* 7E4D14 00283E94 FE363C83 */ sd $s6, 0x3c83($s1)
/* 7E4D18 00283E98 00000000 */ nop
/* 7E4D1C 00283E9C FE363C80 */ sd $s6, 0x3c80($s1)
/* 7E4D20 00283EA0 00000002 */ srl $zero, $zero, 0
/* 7E4D24 00283EA4 00000000 */ nop
/* 7E4D28 00283EA8 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */
/* 7E4D2C 00283EAC 00000000 */ /* 7E4D30 00283EB0 00000043 */ sra $zero, $zero, 1
/* 7E4D34 00283EB4 00000006 */ srlv $zero, $zero, $zero
/* 7E4D38 00283EB8 802D02E8 */ lb $t5, 0x2e8($at)
/* 7E4D3C 00283EBC FE363C81 */ sd $s6, 0x3c81($s1)
/* 7E4D40 00283EC0 FE363C82 */ sd $s6, 0x3c82($s1)
/* 7E4D44 00283EC4 FE363C83 */ sd $s6, 0x3c83($s1)
/* 7E4D48 00283EC8 00000000 */ nop
/* 7E4D4C 00283ECC FE363C80 */ sd $s6, 0x3c80($s1)
/* 7E4D50 00283ED0 00000002 */ srl $zero, $zero, 0
/* 7E4D54 00283ED4 00000000 */ nop
/* 7E4D58 00283ED8 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */
/* 7E4D5C 00283EDC 00000000 */ /* 7E4D60 00283EE0 00000043 */ sra $zero, $zero, 1
/* 7E4D64 00283EE4 00000005 */ .byte 0x00,0x00,0x00,0x05 /* Because of invalid n64 opcode lsa */
/* 7E4D68 00283EE8 802D02CC */ /* 7E4D6C 00283EEC FE363C81 */ sd $s6, 0x3c81($s1)
/* 7E4D70 00283EF0 FE363C82 */ sd $s6, 0x3c82($s1)
/* 7E4D74 00283EF4 FE363C83 */ sd $s6, 0x3c83($s1)
/* 7E4D78 00283EF8 00000000 */ nop
/* 7E4D7C 00283EFC 00000043 */ sra $zero, $zero, 1
/* 7E4D80 00283F00 00000006 */ srlv $zero, $zero, $zero
/* 7E4D84 00283F04 802D02B0 */ lb $t5, 0x2b0($at)
/* 7E4D88 00283F08 FE363C81 */ sd $s6, 0x3c81($s1)
/* 7E4D8C 00283F0C FE363C82 */ sd $s6, 0x3c82($s1)
/* 7E4D90 00283F10 FE363C83 */ sd $s6, 0x3c83($s1)
/* 7E4D94 00283F14 00000000 */ nop
/* 7E4D98 00283F18 FE363C80 */ sd $s6, 0x3c80($s1)
/* 7E4D9C 00283F1C 00000002 */ srl $zero, $zero, 0
/* 7E4DA0 00283F20 00000000 */ nop
/* 7E4DA4 00283F24 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */
/* 7E4DA8 00283F28 00000000 */ /* 7E4DAC 00283F2C 00000043 */ sra $zero, $zero, 1
/* 7E4DB0 00283F30 00000005 */ .byte 0x00,0x00,0x00,0x05 /* Because of invalid n64 opcode lsa */
/* 7E4DB4 00283F34 802D02CC */ /* 7E4DB8 00283F38 FE363C80 */ sd $s6, 0x3c80($s1)
/* 7E4DBC 00283F3C FE363C81 */ sd $s6, 0x3c81($s1)
/* 7E4DC0 00283F40 FE363C82 */ sd $s6, 0x3c82($s1)
/* 7E4DC4 00283F44 00000000 */ nop
/* 7E4DC8 00283F48 00000002 */ srl $zero, $zero, 0
/* 7E4DCC 00283F4C 00000000 */ nop
/* 7E4DD0 00283F50 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */
/* 7E4DD4 00283F54 00000000 */ /* 7E4DD8 00283F58 00000043 */ sra $zero, $zero, 1
/* 7E4DDC 00283F5C 00000002 */ srl $zero, $zero, 0
/* 7E4DE0 00283F60 802D2B0C */ lb $t5, 0x2b0c($at)
/* 7E4DE4 00283F64 FE363C81 */ sd $s6, 0x3c81($s1)
/* 7E4DE8 00283F68 0000000A */ .byte 0x00,0x00,0x00,0x0A /* Because of invalid n64 opcode movz */
/* 7E4DEC 00283F6C 00000002 */ /* 7E4DF0 00283F70 FE363C81 */ sd $s6, 0x3c81($s1)
/* 7E4DF4 00283F74 00000000 */ nop
/* 7E4DF8 00283F78 00000004 */ sllv $zero, $zero, $zero
/* 7E4DFC 00283F7C 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */
/* 7E4E00 00283F80 0000000A */ .byte 0x00,0x00,0x00,0x0A /* Because of invalid n64 opcode movz */
/* 7E4E04 00283F84 00000013 */ /* 7E4E08 00283F88 00000000 */ nop
/* 7E4E0C 00283F8C 0000000A */ .byte 0x00,0x00,0x00,0x0A /* Because of invalid n64 opcode movz */
/* 7E4E10 00283F90 00000002 */ /* 7E4E14 00283F94 FE363C81 */ sd $s6, 0x3c81($s1)
/* 7E4E18 00283F98 00000002 */ srl $zero, $zero, 0
/* 7E4E1C 00283F9C 00000004 */ sllv $zero, $zero, $zero
/* 7E4E20 00283FA0 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */
/* 7E4E24 00283FA4 0000000A */ .byte 0x00,0x00,0x00,0x0A /* Because of invalid n64 opcode movz */
/* 7E4E28 00283FA8 00000013 */ /* 7E4E2C 00283FAC 00000000 */ nop
/* 7E4E30 00283FB0 0000000A */ .byte 0x00,0x00,0x00,0x0A /* Because of invalid n64 opcode movz */
/* 7E4E34 00283FB4 00000002 */ /* 7E4E38 00283FB8 FE363C81 */ sd $s6, 0x3c81($s1)
/* 7E4E3C 00283FBC 00000003 */ sra $zero, $zero, 0
/* 7E4E40 00283FC0 00000004 */ sllv $zero, $zero, $zero
/* 7E4E44 00283FC4 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */
/* 7E4E48 00283FC8 0000000A */ .byte 0x00,0x00,0x00,0x0A /* Because of invalid n64 opcode movz */
/* 7E4E4C 00283FCC 00000013 */ /* 7E4E50 00283FD0 00000000 */ nop
/* 7E4E54 00283FD4 00000002 */ srl $zero, $zero, 0
/* 7E4E58 00283FD8 00000000 */ nop
/* 7E4E5C 00283FDC 00000003 */ sra $zero, $zero, 0
/* 7E4E60 00283FE0 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */
/* 7E4E64 00283FE4 0000000A */ .byte 0x00,0x00,0x00,0x0A /* Because of invalid n64 opcode movz */
/* 7E4E68 00283FE8 00000043 */ /* 7E4E6C 00283FEC 00000001 */ .byte 0x00,0x00,0x00,0x01 /* Because of invalid n64 opcode movf */
/* 7E4E70 00283FF0 802803C8 */ /* 7E4E74 00283FF4 0000000A */ .byte 0x00,0x00,0x00,0x0A /* Because of invalid n64 opcode movz */
/* 7E4E78 00283FF8 00000002 */ /* 7E4E7C 00283FFC FE363C82 */ sd $s6, 0x3c82($s1)

4
papermario/asm/CODE_c3dd0_len_2000.s
View File

@ -1164,7 +1164,7 @@ func_0012E528:
/* 0C4E9C 0012E79C 00431825 */ or $v1, $v0, $v1
.L0012E7A0:
/* 0C4EA0 0012E7A0 3C03E400 */ lui $v1, %hi(D_E4000004) # $v1, 0xe400
/* 0C4EA0 0012E7A0 3C03E400 */ lui $v1, 0xe400
func_0012E7A4:
/* 0C4EA4 0012E7A4 85A2000E */ lh $v0, 0xe($t5)
/* 0C4EA8 0012E7A8 18400002 */ blez $v0, .L0012E7B4
@ -1196,7 +1196,7 @@ func_0012E7D4:
/* 0C4EFC 0012E7FC AC620000 */ sw $v0, ($v1)
/* 0C4F00 0012E800 85A20002 */ lh $v0, 2($t5)
/* 0C4F04 0012E804 04410007 */ bgez $v0, .L0012E824
/* 0C4F08 0012E808 24630004 */ addiu $v1, %lo(D_E4000004) # addiu $v1, $v1, 4
/* 0C4F08 0012E808 24630004 */ addiu $v1, $v1, 4
/* 0C4F0C 0012E80C 000210C0 */ sll $v0, $v0, 3
/* 0C4F10 0012E810 5C400001 */ bgtzl $v0, .L0012E818
/* 0C4F14 0012E814 0000102D */ move $v0, $zero

2
papermario/asm/CODE_c5dd0_len_2000.s
View File

@ -1127,7 +1127,7 @@ func_00130450:
.L00130748:
/* 0C6E48 00130748 15C2005F */ bne $t6, $v0, .L001308C8
/* 0C6E4C 0013074C 3C03E400 */ lui $v1, %hi(D_E4000004) # $v1, 0xe400
/* 0C6E4C 0013074C 3C03E400 */ lui $v1, 0xe400
/* 0C6E50 00130750 3C02FD18 */ lui $v0, 0xfd18
/* 0C6E54 00130754 02421025 */ or $v0, $s2, $v0
/* 0C6E58 00130758 8CE50000 */ lw $a1, ($a3)

4
papermario/asm/CODE_cfdd0_len_2000.s
View File

@ -246,7 +246,7 @@ func_00139A28:
/* 0D017C 00139A7C 00441021 */ addu $v0, $v0, $a0
/* 0D0180 00139A80 00021080 */ sll $v0, $v0, 2
/* 0D0184 00139A84 30420FFF */ andi $v0, $v0, 0xfff
/* 0D0188 00139A88 3C04E400 */ lui $a0, %hi(D_E4000004) # $a0, 0xe400
/* 0D0188 00139A88 3C04E400 */ lui $a0, 0xe400
/* 0D018C 00139A8C 00441025 */ or $v0, $v0, $a0
/* 0D0190 00139A90 00621825 */ or $v1, $v1, $v0
/* 0D0194 00139A94 ACE30000 */ sw $v1, ($a3)
@ -397,7 +397,7 @@ func_00139C50:
/* 0D03BC 00139CBC 00441021 */ addu $v0, $v0, $a0
/* 0D03C0 00139CC0 00021080 */ sll $v0, $v0, 2
/* 0D03C4 00139CC4 30420FFF */ andi $v0, $v0, 0xfff
/* 0D03C8 00139CC8 3C04E400 */ lui $a0, %hi(D_E4000004) # $a0, 0xe400
/* 0D03C8 00139CC8 3C04E400 */ lui $a0, 0xe400
/* 0D03CC 00139CCC 00441025 */ or $v0, $v0, $a0
/* 0D03D0 00139CD0 00621825 */ or $v1, $v1, $v0
/* 0D03D4 00139CD4 ACE30000 */ sw $v1, ($a3)