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

match _set_music_track

Browse Source
This commit is contained in:
Alex Bates 2020-10-29 01:33:45 +00:00
parent 9eef0b0273
commit e0c8108543
No known key found for this signature in database
GPG Key ID: 5E11C2DB78877706
6 changed files with 53 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
asm/nonmatchings/code_e0b30_len_b80/_set_music_track.s
View File

@ -1,88 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel _set_music_track
/* E0EE0 8014A7E0 27BDFFD0 */ addiu $sp, $sp, -0x30
/* E0EE4 8014A7E4 AFB20018 */ sw $s2, 0x18($sp)
/* E0EE8 8014A7E8 00A0902D */ daddu $s2, $a1, $zero
/* E0EEC 8014A7EC 3C058007 */ lui $a1, %hi(gGameStatusPtr)
/* E0EF0 8014A7F0 8CA5419C */ lw $a1, %lo(gGameStatusPtr)($a1)
/* E0EF4 8014A7F4 AFB3001C */ sw $s3, 0x1c($sp)
/* E0EF8 8014A7F8 8FB30040 */ lw $s3, 0x40($sp)
/* E0EFC 8014A7FC AFB10014 */ sw $s1, 0x14($sp)
/* E0F00 8014A800 00C0882D */ daddu $s1, $a2, $zero
/* E0F04 8014A804 AFB50024 */ sw $s5, 0x24($sp)
/* E0F08 8014A808 00E0A82D */ daddu $s5, $a3, $zero
/* E0F0C 8014A80C AFBF0028 */ sw $ra, 0x28($sp)
/* E0F10 8014A810 AFB40020 */ sw $s4, 0x20($sp)
/* E0F14 8014A814 AFB00010 */ sw $s0, 0x10($sp)
/* E0F18 8014A818 80A20071 */ lb $v0, 0x71($a1)
/* E0F1C 8014A81C 10400003 */ beqz $v0, .L8014A82C
/* E0F20 8014A820 0260A02D */ daddu $s4, $s3, $zero
/* E0F24 8014A824 08052A3D */ j .L8014A8F4
/* E0F28 8014A828 24020001 */ addiu $v0, $zero, 1
.L8014A82C:
/* E0F2C 8014A82C 3C028016 */ lui $v0, 0x8016
/* E0F30 8014A830 24429AF0 */ addiu $v0, $v0, -0x6510
/* E0F34 8014A834 00041840 */ sll $v1, $a0, 1
/* E0F38 8014A838 00641821 */ addu $v1, $v1, $a0
/* E0F3C 8014A83C 00031900 */ sll $v1, $v1, 4
/* E0F40 8014A840 80A4007A */ lb $a0, 0x7a($a1)
/* E0F44 8014A844 14800008 */ bnez $a0, .L8014A868
/* E0F48 8014A848 00628021 */ addu $s0, $v1, $v0
/* E0F4C 8014A84C 8E040018 */ lw $a0, 0x18($s0)
/* E0F50 8014A850 0C015671 */ jal func_800559C4
/* E0F54 8014A854 00000000 */ nop
/* E0F58 8014A858 96030000 */ lhu $v1, ($s0)
/* E0F5C 8014A85C 24020001 */ addiu $v0, $zero, 1
/* E0F60 8014A860 08052A3C */ j .L8014A8F0
/* E0F64 8014A864 3063FFFE */ andi $v1, $v1, 0xfffe
.L8014A868:
/* E0F68 8014A868 0C05290C */ jal get_default_variation_for_song
/* E0F6C 8014A86C 0240202D */ daddu $a0, $s2, $zero
/* E0F70 8014A870 04430001 */ bgezl $v0, .L8014A878
/* E0F74 8014A874 0040882D */ daddu $s1, $v0, $zero
.L8014A878:
/* E0F78 8014A878 8E020010 */ lw $v0, 0x10($s0)
/* E0F7C 8014A87C 14520013 */ bne $v0, $s2, .L8014A8CC
/* E0F80 8014A880 24020001 */ addiu $v0, $zero, 1
/* E0F84 8014A884 8E020014 */ lw $v0, 0x14($s0)
/* E0F88 8014A888 14510010 */ bne $v0, $s1, .L8014A8CC
/* E0F8C 8014A88C 24020001 */ addiu $v0, $zero, 1
/* E0F90 8014A890 00132400 */ sll $a0, $s3, 0x10
/* E0F94 8014A894 0C052B21 */ jal func_8014AC84
/* E0F98 8014A898 00042403 */ sra $a0, $a0, 0x10
/* E0F9C 8014A89C 96020000 */ lhu $v0, ($s0)
/* E0FA0 8014A8A0 30420004 */ andi $v0, $v0, 4
/* E0FA4 8014A8A4 50400013 */ beql $v0, $zero, .L8014A8F4
/* E0FA8 8014A8A8 24020002 */ addiu $v0, $zero, 2
/* E0FAC 8014A8AC 8E040018 */ lw $a0, 0x18($s0)
/* E0FB0 8014A8B0 0C0156E0 */ jal func_80055B80
/* E0FB4 8014A8B4 00000000 */ nop
/* E0FB8 8014A8B8 96020000 */ lhu $v0, ($s0)
/* E0FBC 8014A8BC 3042FFFB */ andi $v0, $v0, 0xfffb
/* E0FC0 8014A8C0 A6020000 */ sh $v0, ($s0)
/* E0FC4 8014A8C4 08052A3D */ j .L8014A8F4
/* E0FC8 8014A8C8 24020002 */ addiu $v0, $zero, 2
.L8014A8CC:
/* E0FCC 8014A8CC 96030000 */ lhu $v1, ($s0)
/* E0FD0 8014A8D0 0040202D */ daddu $a0, $v0, $zero
/* E0FD4 8014A8D4 3C018016 */ lui $at, 0x8016
/* E0FD8 8014A8D8 A4349AE0 */ sh $s4, -0x6520($at)
/* E0FDC 8014A8DC AE120010 */ sw $s2, 0x10($s0)
/* E0FE0 8014A8E0 AE110014 */ sw $s1, 0x14($s0)
/* E0FE4 8014A8E4 AE150004 */ sw $s5, 4($s0)
/* E0FE8 8014A8E8 A6040002 */ sh $a0, 2($s0)
/* E0FEC 8014A8EC 3063FFFD */ andi $v1, $v1, 0xfffd
.L8014A8F0:
/* E0FF0 8014A8F0 A6030000 */ sh $v1, ($s0)
.L8014A8F4:
/* E0FF4 8014A8F4 8FBF0028 */ lw $ra, 0x28($sp)
/* E0FF8 8014A8F8 8FB50024 */ lw $s5, 0x24($sp)
/* E0FFC 8014A8FC 8FB40020 */ lw $s4, 0x20($sp)
/* E1000 8014A900 8FB3001C */ lw $s3, 0x1c($sp)
/* E1004 8014A904 8FB20018 */ lw $s2, 0x18($sp)
/* E1008 8014A908 8FB10014 */ lw $s1, 0x14($sp)
/* E100C 8014A90C 8FB00010 */ lw $s0, 0x10($sp)
/* E1010 8014A910 03E00008 */ jr $ra
/* E1014 8014A914 27BD0030 */ addiu $sp, $sp, 0x30

5
include/common_structs.h
View File

@ -308,13 +308,14 @@ typedef struct StaticEntityData {
typedef struct MusicPlayer { typedef struct MusicPlayer {
/* 0x00 */ u16 unkFlags; /* 0x00 */ u16 unkFlags;
/* 0x02 */ char unk_02[2]; /* 0x02 */ u16 unk_02;
/* 0x04 */ s32 fadeOutTime; /* 0x04 */ s32 fadeOutTime;
/* 0x08 */ s32 fadeInTime; /* 0x08 */ s32 fadeInTime;
/* 0x0C */ char unk_0C[4]; /* 0x0C */ char unk_0C[4];
/* 0x10 */ s32 songID; /* 0x10 */ s32 songID;
/* 0x14 */ s32 variation; /* 0x14 */ s32 variation;
/* 0x18 */ char unk_18[24]; /* 0x18 */ s32 unk_18;
/* 0x1C */ char unk_1C[20];
} MusicPlayer; // size = 0x30 } MusicPlayer; // size = 0x30
typedef struct MenuIcon { typedef struct MenuIcon {

1
include/variables.h
View File

@ -165,6 +165,7 @@ extern Bytecode* SCRIPT_NpcDefeat;
extern Bytecode* ShakeCam1; extern Bytecode* ShakeCam1;
extern Bytecode* ShakeCamX; extern Bytecode* ShakeCamX;
extern s16 gMusicVolume;
extern MusicPlayer gMusicPlayers[]; extern MusicPlayer gMusicPlayers[];
#endif #endif

49
src/code_e0b30_len_b80.c
View File

@ -1,5 +1,8 @@
#include "common.h" #include "common.h"
void func_8014AC84(s16 volume);
INCLUDE_ASM(s32, "code_e0b30_len_b80", get_default_variation_for_song); INCLUDE_ASM(s32, "code_e0b30_len_b80", get_default_variation_for_song);
INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A498); INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A498);
@ -11,10 +14,52 @@ void func_8014A52C(void) {
INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A548); INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A548);
INCLUDE_ASM(s32, "code_e0b30_len_b80", _set_music_track, s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 volume); s32 _set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 volume) {
GameStatus* gameStatus = GAME_STATUS;
if (gameStatus->demoState != 0) {
return 1;
} else {
MusicPlayer* musicPlayers = &gMusicPlayers;
MusicPlayer* musicPlayer = &musicPlayers[playerIndex];
if (!gameStatus->musicEnabled) {
func_800559C4(musicPlayer->unk_18);
musicPlayer->unkFlags &= ~1;
return 1;
} else {
s32 defaultVariation = get_default_variation_for_song(songID);
if (defaultVariation >= 0) {
variation = defaultVariation;
}
if (musicPlayer->songID == songID && musicPlayer->variation == variation) {
func_8014AC84(volume); // transition volume to?
if (musicPlayer->unkFlags & 4) {
func_80055B80(musicPlayer->unk_18);
musicPlayer->unkFlags &= ~4;
}
return 2;
}
gMusicVolume = volume;
musicPlayer->songID = songID;
musicPlayer->variation = variation;
musicPlayer->fadeOutTime = unk;
musicPlayer->unk_02 = 1;
musicPlayer->unkFlags &= ~2;
return 1;
}
}
}
void set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 volume) { void set_music_track(s32 playerIndex, s32 songID, s32 variation, s32 unk, s16 volume) {
MusicPlayer* musicPlayers = &gMusicPlayers; MusicPlayer* musicPlayers = &gMusicPlayers;
musicPlayers[playerIndex].unkFlags &= ~8; musicPlayers[playerIndex].unkFlags &= ~8;
_set_music_track(playerIndex, songID, variation, unk, volume); _set_music_track(playerIndex, songID, variation, unk, volume);
@ -36,7 +81,7 @@ INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC5C);
INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC70); INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC70);
INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC84); INCLUDE_ASM(void, "code_e0b30_len_b80", func_8014AC84, s16 volume);
INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC94); INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC94);

1
tools/symbol_addrs.txt
View File

@ -1899,4 +1899,5 @@ EnemyNpcHit;0x80077F70
EnemyNpcDefeat;0x8007809C EnemyNpcDefeat;0x8007809C
D_80078DB0;0x80078DB0 D_80078DB0;0x80078DB0
D_80078DB4;0x80078DB4 D_80078DB4;0x80078DB4
gMusicVolume;0x80159AE0
gMusicPlayers;0x80159AF0 gMusicPlayers;0x80159AF0

1
undefined_syms.txt
View File

@ -264,4 +264,5 @@ EnemyNpcDefeat = 0x8007809C;
D_80078DB0 = 0x80078DB0; D_80078DB0 = 0x80078DB0;
D_80078DB4 = 0x80078DB4; D_80078DB4 = 0x80078DB4;
gMusicVolume = 0x80159AE0;
gMusicPlayers = 0x80159AF0; gMusicPlayers = 0x80159AF0;