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

1 more

Browse Source
This commit is contained in:
Ethan Roseman 2020-12-09 13:24:00 +09:00
parent 3528a01b2b
commit dcdab9710c
5 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
asm/nonmatchings/code_303c0_len_3e10/func_800565A4.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_800565A4
/* 319A4 800565A4 3C038008 */ lui $v1, %hi(D_80078E50)
/* 319A8 800565A8 24638E50 */ addiu $v1, $v1, %lo(D_80078E50)
/* 319AC 800565AC 8C620000 */ lw $v0, ($v1)
/* 319B0 800565B0 54400001 */ bnel $v0, $zero, .L800565B8
/* 319B4 800565B4 AC600000 */ sw $zero, ($v1)
.L800565B8:
/* 319B8 800565B8 03E00008 */ jr $ra
/* 319BC 800565BC 00000000 */ nop

12
asm/nonmatchings/code_31650/func_800565A4.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_800565A4
/* 319A4 800565A4 3C038008 */ lui $v1, %hi(D_80078E50)
/* 319A8 800565A8 24638E50 */ addiu $v1, $v1, %lo(D_80078E50)
/* 319AC 800565AC 8C620000 */ lw $v0, ($v1)
/* 319B0 800565B0 54400001 */ bnel $v0, $zero, .L800565B8
/* 319B4 800565B4 AC600000 */ sw $zero, ($v1)
.L800565B8:
/* 319B8 800565B8 03E00008 */ jr $ra
/* 319BC 800565BC 00000000 */ nop

3
src/audio.h
View File

@ -28,7 +28,7 @@ typedef struct UnkAl2 {
} UnkAl2;
typedef struct UnkLen18 {
/* 0x00 */ s16 unk_00;
/* 0x00 */ u16 unk_00;
/* 0x02 */ char unk_02[0x2];
/* 0x04 */ s32 unk_04;
/* 0x08 */ s32 unk_08;
@ -314,6 +314,7 @@ typedef struct UnkAl834 {
/* 0x021 */ char unk_21[0x813];
} UnkAl834;
extern s32 D_80078E50;
extern UnkAl0* D_80078E54;
extern s8* D_80078181;
extern s32* D_80078190;

15
src/code_31650.c
View File

@ -3,7 +3,13 @@
INCLUDE_ASM(s32, "code_31650", func_80056250);
INCLUDE_ASM(s32, "code_31650", func_800565A4);
void func_800565A4(void) {
s32 *sym = &D_80078E50;
if (*sym != 0) {
*sym = 0;
}
}
INCLUDE_ASM(Acmd*, "code_31650", alAudioFrame, Acmd* cmdList, s32* cmdLen, s16* outBuf, s32 outLen);
@ -31,7 +37,14 @@ s16 func_80056D50(void) {
INCLUDE_ASM(s16, "code_31650", func_80056D50);
#endif
#ifdef NON_MATCHING
void func_80056D5C(s8 arg0) {
D_80078181 = arg0;
D_80078E5C = 1;
}
#else
INCLUDE_ASM(s32, "code_31650", func_80056D5C);
#endif
#ifdef NON_MATCHING
void func_80056D78(u8 arg0, u16 arg1) {

2
tools/splat.yaml
View File

@ -206,7 +206,7 @@ segments:
- [0x4a360, c, os/code_4a360_len_930]
- [0x4ac90, c, os/code_4ac90_len_3910]
- [0x4E5A0, data, code_1000_len_60]
- [0x52D50, bin]
- [0x52D50, data, code_10400_len_d30]
- [0x6B450, .data, world/world]
- [0x6EAC0, bin] # has scripts
- [0x70E30, bin, battle/battle]