pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 20:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

some progrs

Browse Source
This commit is contained in:
Ethan Roseman 2020-12-12 15:56:00 +09:00
parent d8911cabc3
commit 02654be743
7 changed files with 466 additions and 502 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

468
asm/data/code_1000_len_60.data.s
View File

File diff suppressed because one or more lines are too long

453
asm/data/code_31650.data.s Normal file
View File

File diff suppressed because one or more lines are too long

8
asm/nonmatchings/code_31650/func_80056D34.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80056D34
/* 32134 80056D34 24020001 */ addiu $v0, $zero, 1
/* 32138 80056D38 3C018008 */ lui $at, %hi(D_80078E58)
/* 3213C 80056D3C 03E00008 */ jr $ra
/* 32140 80056D40 A0228E58 */ sb $v0, %lo(D_80078E58)($at)

7
asm/nonmatchings/code_31650/func_80056D44.s
View File

@ -1,7 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80056D44
/* 32144 80056D44 3C018008 */ lui $at, %hi(D_80078E5A)
/* 32148 80056D48 03E00008 */ jr $ra
/* 3214C 80056D4C A4248E5A */ sh $a0, %lo(D_80078E5A)($at)

7
asm/nonmatchings/code_31650/func_80056D50.s
View File

@ -1,7 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80056D50
/* 32150 80056D50 3C028008 */ lui $v0, %hi(D_80078E5A)
/* 32154 80056D54 03E00008 */ jr $ra
/* 32158 80056D58 84428E5A */ lh $v0, %lo(D_80078E5A)($v0)

23
src/code_31650.c
View File

@ -1,6 +1,17 @@
#include "common.h" #include "common.h"
#include "audio.h" #include "audio.h"
s32 D_80078E50 = 0;
UnkAl0* D_80078E54 = 0;
s8 D_80078E58 = 0;
s16 D_80078E5A = 0x7FFF;
s8 D_80078E5C = 0;
s32 D_80078E60[] = { 0x7FFF7FFC, 0x7FF57FE8, 0x7FD77FC0, 0x7FA57F84, 0x7F5F7F34, 0x7F057ED0, 0x7E977E58, 0x7E157DCD,
0x7D7F7D2D, 0x7CD67C7A, 0x7C1A7BB4, 0x7B497ADA, 0x7A6679ED, 0x796F78ED, 0x786677DA, 0x774976B4, 0x761A757B,
0x74D87430, 0x738472D3, 0x721E7164, 0x70A66FE3, 0x6F1C6E51, 0x6D816CAD, 0x6BD56AF9, 0x6A186933, 0x684A675D,
0x666C6577, 0x647E6381, 0x6280617C, 0x60735F67, 0x5E575D43, 0x5C2C5B11, };
INCLUDE_ASM(s32, "code_31650", func_80056250); INCLUDE_ASM(s32, "code_31650", func_80056250);
void func_800565A4(void) { void func_800565A4(void) {
@ -13,29 +24,17 @@ void func_800565A4(void) {
INCLUDE_ASM(Acmd*, "code_31650", alAudioFrame, Acmd* cmdList, s32* cmdLen, s16* outBuf, s32 outLen); INCLUDE_ASM(Acmd*, "code_31650", alAudioFrame, Acmd* cmdList, s32* cmdLen, s16* outBuf, s32 outLen);
#ifdef NON_MATCHING
void func_80056D34(void) { void func_80056D34(void) {
D_80078E58 = 1; D_80078E58 = 1;
} }
#else
INCLUDE_ASM(s32, "code_31650", func_80056D34);
#endif
#ifdef NON_MATCHING
void func_80056D44(s16 arg0) { void func_80056D44(s16 arg0) {
D_80078E5A = arg0; D_80078E5A = arg0;
} }
#else
INCLUDE_ASM(s16, "code_31650", func_80056D44);
#endif
#ifdef NON_MATCHING
s16 func_80056D50(void) { s16 func_80056D50(void) {
return D_80078E5A; return D_80078E5A;
} }
#else
INCLUDE_ASM(s16, "code_31650", func_80056D50);
#endif
#ifdef NON_MATCHING #ifdef NON_MATCHING
void func_80056D5C(s8 arg0) { void func_80056D5C(s8 arg0) {

2
tools/splat.yaml
View File

@ -206,6 +206,8 @@ segments:
- [0x4a360, c, os/code_4a360_len_930] - [0x4a360, c, os/code_4a360_len_930]
- [0x4ac90, c, os/code_4ac90_len_3910] - [0x4ac90, c, os/code_4ac90_len_3910]
- [0x4E5A0, data, code_1000_len_60] # data until world - [0x4E5A0, data, code_1000_len_60] # data until world
- [0x54250, .data, code_31650]
- [0x542E0, data, code_31650]
- [0x6B450, .data, world/world] - [0x6B450, .data, world/world]
- [0x6EAC0, bin] # has scripts - [0x6EAC0, bin] # has scripts
- [0x70E30, bin, battle/battle] - [0x70E30, bin, battle/battle]