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

Splat update (#195)

Browse Source 
* data, splat fixes

* fix .gitrepo?

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "fb8315b319"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "fb8315b319"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* audio updates (thanks Clover)

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "c56195a9c5"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "c56195a9c5"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
This commit is contained in:
Ethan Roseman 2021-02-26 11:10:11 -05:00 committed by GitHub
parent 698cf99458
commit 96af288878
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/code_1370_len_7d0.c
View File

@ -1,6 +1,8 @@
#include "common.h"
#include "nu/nusys.h"
s16 D_80074010 = 8; // might be an array, could be size 1-8
void gfxRetrace_Callback(s32);
void gfxPreNMI_Callback(void);
void gfx_task_main(void);

6
src/code_25f00_len_940.c
View File

@ -9,13 +9,13 @@ s32 D_80078170 = 0;
NUAuPreNMIFunc nuAuPreNMIFunc = NULL;
s32 nuAuDmaNext = 0;
u32 nuAuFrameCounter = 0;
u8 D_80078180 = 1;
u8 nuAuTaskStop = 1;
u8 D_80078181 = 1;
//bss
//static u16 D_800A0F50;
INCLUDE_ASM(s32, "code_25f00_len_940", func_8004AB00);
INCLUDE_ASM(s32, "code_25f00_len_940", create_audio_system);
void nuAuPreNMIFuncSet(NUAuPreNMIFunc func) {
OSIntMask mask = osSetIntMask(OS_IM_NONE);
@ -103,7 +103,7 @@ void func_8004B328(s16 arg0, s32 arg1) {
func_80056D44(temp_s0);
if (temp_s0 == 0) {
D_80078180 = 0;
nuAuTaskStop = 0;
}
break;
}

2
src/code_31650.c
View File

@ -208,7 +208,7 @@ void func_80057ED0(s16 arg0) {
D_800A3FE8 = 0;
}
INCLUDE_ASM(s32, "code_31650", func_80057F20);
INCLUDE_ASM(void, "code_31650", alHeapInit, ALHeap *hp, u8 *base, s32 len);
void* alHeapAlloc(ALHeap* heap, s32 arg1, s32 size) {
void* ret = NULL;

2
tools/splat/.gitrepo
View File

@ -7,6 +7,6 @@
remote = https://github.com/ethteck/splat.git
branch = master
commit = c56195a9c53db272350ee7796535c1b50174d62d
parent = bf6979cc3548ff93fcaaa5bd0f229fa9efc573b7
parent = b82530ae1f4d1dc90072317b9e5b63ad1d06ddb2
method = merge
cmdver = 0.4.3

2
ver/us/asm/data/battle/partner/watt_704A80.data.s
View File

File diff suppressed because one or more lines are too long

3
ver/us/asm/data/code_1000_len_60.data.s
View File

@ -19,6 +19,3 @@ glabel D_80073E0A
glabel D_80073E10
.word 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
glabel D_80074010
.short 0x0008, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000

5
ver/us/asm/data/code_31650.data.s → ver/us/asm/data/code_542E0.data.s
View File

@ -540,10 +540,7 @@ glabel D_8008F064
.word 0x00000000, 0x00000000
glabel D_8008F06C
.word 0x00000000
glabel D_8008F070
.byte 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00
glabel D_8008F071
.byte 0x00

8
ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238E5C_70494C.s
View File

@ -83,7 +83,7 @@ glabel func_80238E5C_70494C
/* 704A64 80238F74 8FB00010 */ lw $s0, 0x10($sp)
/* 704A68 80238F78 24020002 */ addiu $v0, $zero, 2
/* 704A6C 80238F7C 03E00008 */ jr $ra
/* 704A70 80238F80 27BD0038 */ addiu $sp, $sp, 0x38
nop
nop
nop
/* 704A70 80238F80 27BD0038 */ addiu $sp, $sp, 0x38
/* 704A74 80238F84 00000000 */ nop
/* 704A78 80238F88 00000000 */ nop
/* 704A7C 80238F8C 00000000 */ nop

16
ver/us/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s → ver/us/asm/nonmatchings/code_25f00_len_940/create_audio_system.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8004AB00
glabel create_audio_system
/* 25F00 8004AB00 27BDFFC0 */ addiu $sp, $sp, -0x40
/* 25F04 8004AB04 AFB00030 */ sw $s0, 0x30($sp)
/* 25F08 8004AB08 3C10800E */ lui $s0, %hi(D_800D9248)
@ -14,11 +14,11 @@ glabel func_8004AB00
/* 25F24 8004AB24 AFBF003C */ sw $ra, 0x3c($sp)
/* 25F28 8004AB28 AFB20038 */ sw $s2, 0x38($sp)
/* 25F2C 8004AB2C AFB10034 */ sw $s1, 0x34($sp)
/* 25F30 8004AB30 3C018008 */ lui $at, %hi(D_80078180)
/* 25F34 8004AB34 A0228180 */ sb $v0, %lo(D_80078180)($at)
/* 25F30 8004AB30 3C018008 */ lui $at, %hi(nuAuTaskStop)
/* 25F34 8004AB34 A0228180 */ sb $v0, %lo(nuAuTaskStop)($at)
/* 25F38 8004AB38 3C018008 */ lui $at, %hi(D_80078170)
/* 25F3C 8004AB3C A0208170 */ sb $zero, %lo(D_80078170)($at)
/* 25F40 8004AB40 0C015FC8 */ jal func_80057F20
/* 25F40 8004AB40 0C015FC8 */ jal alHeapInit
/* 25F44 8004AB44 34C66000 */ ori $a2, $a2, 0x6000
/* 25F48 8004AB48 24047D00 */ addiu $a0, $zero, 0x7d00
/* 25F4C 8004AB4C 24020018 */ addiu $v0, $zero, 0x18
@ -56,8 +56,8 @@ glabel func_8004AB00
/* 25FCC 8004ABCC 000210C0 */ sll $v0, $v0, 3
/* 25FD0 8004ABD0 00431023 */ subu $v0, $v0, $v1
/* 25FD4 8004ABD4 000210C0 */ sll $v0, $v0, 3
/* 25FD8 8004ABD8 3C01800A */ lui $at, %hi(D_800A3634)
/* 25FDC 8004ABDC AC223634 */ sw $v0, %lo(D_800A3634)($at)
/* 25FD8 8004ABD8 3C01800A */ lui $at, %hi(nuAuFrameSampleSize)
/* 25FDC 8004ABDC AC223634 */ sw $v0, %lo(nuAuFrameSampleSize)($at)
/* 25FE0 8004ABE0 2442FF48 */ addiu $v0, $v0, -0xb8
/* 25FE4 8004ABE4 3C01800A */ lui $at, %hi(D_800A3638)
/* 25FE8 8004ABE8 AC223638 */ sw $v0, %lo(D_800A3638)($at)
@ -108,8 +108,8 @@ glabel func_8004AB00
.L8004AC94:
/* 26094 8004AC94 24050001 */ addiu $a1, $zero, 1
/* 26098 8004AC98 02258821 */ addu $s1, $s1, $a1
/* 2609C 8004AC9C 3C06800A */ lui $a2, %hi(D_800A3634)
/* 260A0 8004ACA0 8CC63634 */ lw $a2, %lo(D_800A3634)($a2)
/* 2609C 8004AC9C 3C06800A */ lui $a2, %hi(nuAuFrameSampleSize)
/* 260A0 8004ACA0 8CC63634 */ lw $a2, %lo(nuAuFrameSampleSize)($a2)
/* 260A4 8004ACA4 8FA4002C */ lw $a0, 0x2c($sp)
/* 260A8 8004ACA8 0C015FE4 */ jal alHeapAlloc
/* 260AC 8004ACAC 00063080 */ sll $a2, $a2, 2

12
ver/us/asm/nonmatchings/code_25f00_len_940/func_8004AE08.s
View File

@ -60,8 +60,8 @@ glabel func_8004AE08
/* 262D4 8004AED4 8FA20078 */ lw $v0, 0x78($sp)
/* 262D8 8004AED8 10400021 */ beqz $v0, .L8004AF60
/* 262DC 8004AEDC 24080001 */ addiu $t0, $zero, 1
/* 262E0 8004AEE0 3C028008 */ lui $v0, %hi(D_80078180)
/* 262E4 8004AEE4 90428180 */ lbu $v0, %lo(D_80078180)($v0)
/* 262E0 8004AEE0 3C028008 */ lui $v0, %hi(nuAuTaskStop)
/* 262E4 8004AEE4 90428180 */ lbu $v0, %lo(nuAuTaskStop)($v0)
/* 262E8 8004AEE8 1448001D */ bne $v0, $t0, .L8004AF60
/* 262EC 8004AEEC 0100302D */ daddu $a2, $t0, $zero
/* 262F0 8004AEF0 8FA80080 */ lw $t0, 0x80($sp)
@ -106,8 +106,8 @@ glabel func_8004AE08
/* 26380 8004AF80 8FA30078 */ lw $v1, 0x78($sp)
/* 26384 8004AF84 10600011 */ beqz $v1, .L8004AFCC
/* 26388 8004AF88 00028082 */ srl $s0, $v0, 2
/* 2638C 8004AF8C 3C028008 */ lui $v0, %hi(D_80078180)
/* 26390 8004AF90 90428180 */ lbu $v0, %lo(D_80078180)($v0)
/* 2638C 8004AF8C 3C028008 */ lui $v0, %hi(nuAuTaskStop)
/* 26390 8004AF90 90428180 */ lbu $v0, %lo(nuAuTaskStop)($v0)
/* 26394 8004AF94 24080001 */ addiu $t0, $zero, 1
/* 26398 8004AF98 1448000D */ bne $v0, $t0, .L8004AFD0
/* 2639C 8004AF9C 2A0200B8 */ slti $v0, $s0, 0xb8
@ -130,8 +130,8 @@ glabel func_8004AE08
/* 263D8 8004AFD8 12C00005 */ beqz $s6, .L8004AFF0
/* 263DC 8004AFDC 24160001 */ addiu $s6, $zero, 1
.L8004AFE0:
/* 263E0 8004AFE0 3C15800A */ lui $s5, %hi(D_800A3634)
/* 263E4 8004AFE4 8EB53634 */ lw $s5, %lo(D_800A3634)($s5)
/* 263E0 8004AFE0 3C15800A */ lui $s5, %hi(nuAuFrameSampleSize)
/* 263E4 8004AFE4 8EB53634 */ lw $s5, %lo(nuAuFrameSampleSize)($s5)
/* 263E8 8004AFE8 08012BFE */ j .L8004AFF8
/* 263EC 8004AFEC 0000B02D */ daddu $s6, $zero, $zero
.L8004AFF0:

12
ver/us/asm/nonmatchings/code_25f00_len_940/func_8004B328.s
View File

@ -11,14 +11,14 @@ glabel func_8004B328
/* 26740 8004B340 AFB00010 */ sw $s0, 0x10($sp)
/* 26744 8004B344 24020002 */ addiu $v0, $zero, 2
/* 26748 8004B348 14820024 */ bne $a0, $v0, .L8004B3DC
/* 2674C 8004B34C 00000000 */ nop
/* 2674C 8004B34C 00000000 */ nop
/* 26750 8004B350 0C015B54 */ jal func_80056D50
/* 26754 8004B354 00000000 */ nop
/* 26754 8004B354 00000000 */ nop
/* 26758 8004B358 3C01800A */ lui $at, %hi(D_800A0F50)
/* 2675C 8004B35C 0C015B4D */ jal func_80056D34
/* 26760 8004B360 A4220F50 */ sh $v0, %lo(D_800A0F50)($at)
/* 26764 8004B364 08012CF7 */ j .L8004B3DC
/* 26768 8004B368 00000000 */ nop
/* 26768 8004B368 00000000 */ nop
.L8004B36C:
/* 2676C 8004B36C 3C026666 */ lui $v0, 0x6666
/* 26770 8004B370 3C03800A */ lui $v1, %hi(D_800A0F50)
@ -46,9 +46,9 @@ glabel func_8004B328
/* 267C4 8004B3C4 0C015B51 */ jal func_80056D44
/* 267C8 8004B3C8 00042403 */ sra $a0, $a0, 0x10
/* 267CC 8004B3CC 16000003 */ bnez $s0, .L8004B3DC
/* 267D0 8004B3D0 00000000 */ nop
/* 267D4 8004B3D4 3C018008 */ lui $at, %hi(D_80078180)
/* 267D8 8004B3D8 A0208180 */ sb $zero, %lo(D_80078180)($at)
/* 267D0 8004B3D0 00000000 */ nop
/* 267D4 8004B3D4 3C018008 */ lui $at, %hi(nuAuTaskStop)
/* 267D8 8004B3D8 A0208180 */ sb $zero, %lo(nuAuTaskStop)($at)
.L8004B3DC:
/* 267DC 8004B3DC 8FBF0014 */ lw $ra, 0x14($sp)
/* 267E0 8004B3E0 8FB00010 */ lw $s0, 0x10($sp)

2
ver/us/asm/nonmatchings/code_31650/func_80057F20.s → ver/us/asm/nonmatchings/code_31650/alHeapInit.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80057F20
glabel alHeapInit
/* 33320 80057F20 30A3000F */ andi $v1, $a1, 0xf
/* 33324 80057F24 24020010 */ addiu $v0, $zero, 0x10
/* 33328 80057F28 00431823 */ subu $v1, $v0, $v1

5
ver/us/splat.yaml
View File

@ -234,14 +234,15 @@ segments:
- [0x4a360, c, os/code_4a360_len_930]
- [0x4ac90, c, os/code_4ac90_len_3910]
- [0x4E5A0, data, code_1000_len_60]
- [0x4F410, .data, code_1b40_len_20b0]
- [0x4F410, .data, code_1370_len_7d0]
- [0x4F420, .data, code_1b40_len_20b0]
- [0x4F660, .data, code_42e0_len_1f60]
- [0x4F9D0, data, code_6240_len_c00]
- [0x53570, .data, code_25f00_len_940]
- [0x53590, data, code_26840_len_20d0]
- [0x541B0, .data, code_30450]
- [0x54250, .data, code_31650]
- [0x542E0, data, code_31650]
- [0x542E0, data]
- [0x6B450, .data, world/world]
- [0x6EAC0, data] # has scripts
- [0x6F0E0, .data, os/nusys/nuContRmbMgr]

10
ver/us/symbol_addrs.txt
View File

@ -480,7 +480,7 @@ DoBasicAI = 0x8004A47C; // type:func rom:0x2587C
func_8004A6F0 = 0x8004A6F0; // type:func rom:0x25AF0
func_8004A73C = 0x8004A73C; // type:func rom:0x25B3C
func_8004A784 = 0x8004A784; // type:func rom:0x25B84
func_8004AB00 = 0x8004AB00; // type:func rom:0x25F00
create_audio_system = 0x8004AB00; // type:func rom:0x25F00
nuAuPreNMIFuncSet = 0x8004ADD0; // type:func rom:0x261D0
func_8004AE08 = 0x8004AE08; // type:func rom:0x26208
nuAuDmaCallBack = 0x8004B074; // type:func rom:0x26474
@ -782,7 +782,7 @@ func_80057E08 = 0x80057E08; // type:func rom:0x33208
func_80057E5C = 0x80057E5C; // type:func rom:0x3325C
func_80057EB0 = 0x80057EB0; // type:func rom:0x332B0
func_80057ED0 = 0x80057ED0; // type:func rom:0x332D0
func_80057F20 = 0x80057F20; // type:func rom:0x33320
alHeapInit = 0x80057F20; // type:func rom:0x33320
alHeapAlloc = 0x80057F90; // type:func rom:0x33390
func_80057FD8 = 0x80057FD8; // type:func rom:0x333D8
func_80058004 = 0x80058004; // type:func rom:0x33404
@ -14838,7 +14838,7 @@ D_80077A24 = 0x80077A24; // type:data
EnemyNpcHit = 0x80077F70; //
EnemyNpcDefeat = 0x8007809C; //
D_80078170 = 0x80078170; // type:data
D_80078180 = 0x80078180; // type:data
nuAuTaskStop = 0x80078180; // type:data
D_80078181 = 0x80078181; // type:data
D_80078DB6 = 0x80078DB6; // type:data
D_80078DB8 = 0x80078DB8; // type:data
@ -15069,7 +15069,7 @@ D_800A15CC = 0x800A15CC; // type:data
D_800A3510 = 0x800A3510; // type:data
D_800A3520 = 0x800A3520; // type:data
D_800A3628 = 0x800A3628; // type:data
D_800A3634 = 0x800A3634; // type:data
nuAuFrameSampleSize = 0x800A3634; // type:data
D_800A3638 = 0x800A3638; // type:data
D_800A3640 = 0x800A3640; // type:data
D_800A3658 = 0x800A3658; // type:data
@ -15217,7 +15217,7 @@ D_800D91DC = 0x800D91DC; // type:data
D_800D91E0 = 0x800D91E0; // type:data
D_800D91F8 = 0x800D91F8; // type:data
D_800D9230 = 0x800D9230; // type:data
D_800D9248 = 0x800D9248; // type:data
D_800D9248 = 0x800D9248; // type:data // struct:ALHeap
D_800D9278 = 0x800D9278; // type:data
D_800D95E8 = 0x800D95E8; // type:data
D_800D9620 = 0x800D9620; // type:data

4
ver/us/undefined_syms_auto.txt
View File

@ -1915,7 +1915,7 @@ D_800743E0 = 0x800743E0;
D_80074414 = 0x80074414;
D_80074580 = 0x80074580;
D_80078170 = 0x80078170;
D_80078180 = 0x80078180;
nuAuTaskStop = 0x80078180;
D_80078181 = 0x80078181;
D_80078DB6 = 0x80078DB6;
D_80078DB8 = 0x80078DB8;
@ -2094,7 +2094,7 @@ D_800A15CC = 0x800A15CC;
D_800A3510 = 0x800A3510;
D_800A3520 = 0x800A3520;
D_800A3628 = 0x800A3628;
D_800A3634 = 0x800A3634;
nuAuFrameSampleSize = 0x800A3634;
D_800A3638 = 0x800A3638;
D_800A3640 = 0x800A3640;
D_800A3658 = 0x800A3658;