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

Fixing func_80025F44 (#250)

Browse Source 
* Fixing func_80025F44 in us and jp

* revert JP

* Webhook test
This commit is contained in:
Ethan Roseman 2021-04-03 19:29:56 +09:00 committed by GitHub
parent 287332d2db
commit eacb7bfc55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/code_1060_len_310.c
View File

@ -79,9 +79,14 @@ u32 func_80025D74(void* arg0, const unsigned char* str, s32 count) {
return 1;
}
extern const char D_80097D30[];
//const char D_80097D30[] = "File:%s Line:%d %s \n\0\0\0";
void func_80025F44(char* arg0, char* file, s32 line, char* arg3) {
func_80025CFC(D_80097D30, file, line, arg0);
// Nop issue with the rodata string
#ifdef NON_MATCHING
void func_80025F44(char* arg0, char* file, s32 line) {
func_80025CFC("File:%s Line:%d %s \n", file, line, arg0);
PANIC();
}
#else
INCLUDE_ASM(void, "code_1060_len_310", func_80025F44, char* arg0, char* file, s32 line);
#endif

2
src/jp/main_1060.c
View File

@ -79,9 +79,7 @@ u32 func_80025D74(void* arg0, const unsigned char* str, s32 count) {
return 1;
}
extern const char D_80097D10[]; // "File:%s Line:%d %s \n\0\0\0"
void func_80025F44(char* arg0, char* file, s32 line, char* arg3) {
func_80025CFC(D_80097D10, file, line, arg0);
PANIC();

23
ver/us/asm/nonmatchings/code_1060_len_310/func_80025F44.s Normal file
View File

@ -0,0 +1,23 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
glabel D_80097D30
.ascii "File:%s Line:%d %s \n"
.section .text
glabel func_80025F44
/* 1344 80025F44 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 1348 80025F48 AFBF0010 */ sw $ra, 0x10($sp)
/* 134C 80025F4C 0080382D */ daddu $a3, $a0, $zero
/* 1350 80025F50 3C048009 */ lui $a0, %hi(D_80097D30)
/* 1354 80025F54 24847D30 */ addiu $a0, $a0, %lo(D_80097D30)
/* 1358 80025F58 0C00973F */ jal func_80025CFC
/* 135C 80025F5C 00000000 */ nop
.L80025F60:
/* 1360 80025F60 080097D8 */ j .L80025F60
/* 1364 80025F64 00000000 */ nop
/* 1368 80025F68 00000000 */ nop
/* 136C 80025F6C 00000000 */ nop

2
ver/us/splat.yaml
View File

@ -268,7 +268,7 @@ segments:
- [0x6FA70, data] # has scripts?
- [0x70E30, .data, battle/battle]
- [0x71430, data]
- [0x73130, rodata, code_1060_len_310]
- [0x73130, .rodata, code_1060_len_310]
- [0x73148, .rodata, code_1b40_len_20b0]
- [0x73160, .rodata, code_43F0]
- [0x73200, .rodata, code_6e40_len_500]