Skip to content

feat(d_snd_harp_song_mrg): isPlayingHarpRelated and ancestors #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elijah-thomas774 merged 5 commits into from
Nov 16, 2025
Merged

feat(d_snd_harp_song_mrg): isPlayingHarpRelated and ancestors #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bbde89f
feat(d_snd_harp_song_mrg): isPlayingHarpRelated and ancestors
Asiern Nov 12, 2025
03bc279
refactor(harp): change field_0x042 type to bool
Asiern Nov 14, 2025
3ef83f2
refactor: rename fun_80381150 to fn_80381150
Asiern Nov 15, 2025
6794547
feat: map symbols
Asiern Nov 15, 2025
26f4a90
reorder functions
Asiern Nov 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions config/SOUE01/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20902,9 +20902,9 @@ fn_80380DA0 = .text:0x80380DA0; // type:function size:0x7C
fn_80380E20 = .text:0x80380E20; // type:function size:0x70
fn_80380E90 = .text:0x80380E90; // type:function size:0x230
fn_803810C0 = .text:0x803810C0; // type:function size:0x40
isContinuousStrumming = .text:0x80381100; // type:function size:0x14
isPlayingHarpRelated = .text:0x80381120; // type:function size:0x28
fn_80381150 = .text:0x80381150; // type:function size:0x40
isContinuousStrumming__17dSndHarpSongMgr_cFv = .text:0x80381100; // type:function size:0x14
isPlayingHarpRelated__17dSndHarpSongMgr_cFv = .text:0x80381120; // type:function size:0x28
fn_80381150__17dSndHarpSongMgr_cFv = .text:0x80381150; // type:function size:0x40
fn_80381190 = .text:0x80381190; // type:function size:0x5C
fn_803811F0 = .text:0x803811F0; // type:function size:0x12C
fn_80381320 = .text:0x80381320; // type:function size:0x188
Expand Down
7 changes: 5 additions & 2 deletions include/d/snd/d_snd_harp_song_mgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#define D_SND_HARP_SONG_MGR_H

#include "common.h"
#include "d/snd/d_snd_util.h"
#include "d/snd/d_snd_types.h"
#include "d/snd/d_snd_util.h"
#include "nw4r/snd/snd_SoundHandle.h"

SND_DISPOSER_FORWARD_DECL(dSndHarpSongMgr_c);
Expand Down Expand Up @@ -31,6 +31,9 @@ class dSndHarpSongMgr_c {
void shiftFloat2(f32 val);
void resetFloatArr1();
void resetFloatArr2();
bool isContinuousStrumming();
bool isPlayingHarpRelated();
bool fn_80381150();

/* 0x010 */ u8 field_0x010;
/* 0x011 */ u8 field_0x011;
Expand All @@ -48,7 +51,7 @@ class dSndHarpSongMgr_c {
/* 0x03C */ f32 field_0x03C;
/* 0x040 */ u8 field_0x040;
/* 0x041 */ u8 field_0x041;
/* 0x042 */ u8 field_0x042;
/* 0x042 */ bool field_0x042;
/* 0x043 */ u8 field_0x043;
/* 0x044 */ u8 field_0x044;
/* 0x048 */ UNKWORD field_0x048;
Expand Down
15 changes: 15 additions & 0 deletions src/d/snd/d_snd_harp_song_mgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,18 @@ void dSndHarpSongMgr_c::resetFloatArr2() {
field_0x52C[i] = 0.0f;
}
}

bool dSndHarpSongMgr_c::isContinuousStrumming() {
return field_0x01C;
}

bool dSndHarpSongMgr_c::isPlayingHarpRelated() {
return fn_80381150() == false;
}

bool dSndHarpSongMgr_c::fn_80381150() {
if (isContinuousStrumming()) {
return field_0x042;
}
return true;
}