Game-Decompilation/kirby64
1
0
Fork 0
mirror of https://github.com/farisawan-2000/kirby64.git synced 2024-11-26 22:50:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libnaudio from libreultra fork integrated; n_synaddplayer.c

Browse Source
This commit is contained in:
farisawan-2000 2020-12-23 01:15:13 -05:00
parent 9f87b2716b
commit d2974d9528
8 changed files with 3246 additions and 3260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -180,6 +180,10 @@ $(BUILD_DIR)/libultra.a: libreultra/build/2.0I/libultra_rom.a
cp $< $@
$(TOOLS_DIR)/patch_libultra_math $@
$(BUILD_DIR)/libn_audio.a: libreultra/build/2.0I/libn_audio.a
cp $< $@
$(TOOLS_DIR)/patch_libultra_math $@
$(BUILD_DIR)/$(UCODE_BASE_DIR)/$(GRUCODE)/$(GRUCODE).%.o: f3dex2/$(GRUCODE)/$(GRUCODE).%
$(OBJCOPY) -I binary -O elf32-big $< $@
@ -205,8 +209,8 @@ $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT) $(UCODE_LD)
$(CPP) $(VERSION_CFLAGS) -MMD -MP -MT $@ -MF $@.d -o $@ $< \
-DBUILD_DIR=$(BUILD_DIR)
$(BUILD_DIR)/$(TARGET).elf: $(O_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(BUILD_DIR)/libultra.a $(UCODE_TEXT_O_FILES) $(UCODE_DATA_O_FILES)
$(LD) -L $(BUILD_DIR) $(LDFLAGS) -o $@ $(O_FILES) $(LIBS) -lultra
$(BUILD_DIR)/$(TARGET).elf: $(O_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(BUILD_DIR)/libultra.a $(BUILD_DIR)/libn_audio.a $(UCODE_TEXT_O_FILES) $(UCODE_DATA_O_FILES)
$(LD) -L $(BUILD_DIR) $(LDFLAGS) -o $@ $(O_FILES) $(LIBS) -lultra -ln_audio
# final z64 updates checksum
$(BUILD_DIR)/$(TARGET).z64: $(BUILD_DIR)/$(TARGET).elf

3300
asm/ovl0/ovl0_9.s
View File

File diff suppressed because it is too large Load Diff

3181
asm/ovl0/ovl0_9_2.s Normal file
View File

File diff suppressed because it is too large Load Diff

3
kirby.us.ld
View File

@ -69,7 +69,8 @@ SECTIONS
BUILD_DIR/src/ovl0/ovl0_8.o(.text);
BUILD_DIR/asm/ovl0/ovl0_9.o(.text);
BUILD_DIR/libn_audio.a:n_synaddplayer.o(.text);
BUILD_DIR/asm/ovl0/ovl0_9_2.o(.text);
BUILD_DIR/libultra.a:setintmask.o(.text);
BUILD_DIR/libultra.a:sinf.o(.text);

2
libreultra

@ -1 +1 @@
Subproject commit 0e502fd422aabe22f5c8fab7bfd4d1e0a9b430db
Subproject commit e2471ab8e3c14446a0f86eeac2602502c58d2cb7

3
libultra_unused.txt
View File

@ -12,3 +12,6 @@ EXTERN(guMtxIdent);
EXTERN(guMtxL2F);
EXTERN(osPfsAllocateFile);
EXTERN(__osPfsDeclearPage);
EXTERN(n_alSynAddPlayer);
EXTERN(n_alSynAddSndPlayer);
EXTERN(n_alSynAddSeqPlayer);

5
src/ovl0/ovl0_9.c
View File

@ -65,8 +65,9 @@ s16 D_8003FA10[0x80] = {
0x0B11, 0x097D, 0x07E9, 0x0654, 0x04C0, 0x032A, 0x0195, 0x0000,
};
u32 D_8003FB10 = 0x00000000;
u32 D_8003FB14 = 0x00000000;
u32 n_alGlobals = 0x00000000;
u32 n_syn = 0x00000000;
f32 D_8003FB18 = 1.0f;
u32 D_8003FB1C = 0xFFFF0000;
u32 D_8003FB20 = 0x00000001;

4
undefined_syms.txt
View File

@ -693,7 +693,7 @@ func_80026060 = 0x80026060;
D_80097920 = 0x80097920;
D_800978E0 = 0x800978E0;
D_80026698 = 0x80026698;
func_8002A998 = 0x8002A998;
n_alSynAddSndPlayer = 0x8002A998;
func_80023794 = 0x80023794;
D_8009792E = 0x8009792E;
D_80097930 = 0x80097930;
@ -758,7 +758,7 @@ func_8002B158 = 0x8002B158;
func_800261B0 = 0x800261B0;
func_80026260 = 0x80026260;
D_8002901C = 0x8002901C;
func_8002A910 = 0x8002A910;
n_alSynAddSeqPlayer = 0x8002A910;
func_80029938 = 0x80029938;
func_800299AC = 0x800299AC;
func_80029888 = 0x80029888;